From patchwork Thu Aug 25 08:54:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 41941 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7593F27BBEA; Thu, 25 Aug 2022 09:58:01 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EAB3027BBE9 for ; Thu, 25 Aug 2022 09:58:00 +0100 (BST) Received: from localhost ([::1]:38992 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oR8ga-0002Sn-4b for patchwork@mira.cbaines.net; Thu, 25 Aug 2022 04:58:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43466) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oR8ff-00024W-KE for guix-patches@gnu.org; Thu, 25 Aug 2022 04:57:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59159) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oR8ff-0003CG-7g for guix-patches@gnu.org; Thu, 25 Aug 2022 04:57:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oR8ff-0002cT-4i for guix-patches@gnu.org; Thu, 25 Aug 2022 04:57:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57050] [PATCH v3 09/14] gnu: chez-scheme: Make bootfiles regular inputs. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 25 Aug 2022 08:57:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57050 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57050@debbugs.gnu.org Cc: Philip McGrath , Thiago Jung Bauermann , "\(" , Maxime Devos , Liliana Marie Prikler , Efraim Flashner , Liliana Marie Prikler Received: via spool by 57050-submit@debbugs.gnu.org id=B57050.16614177999999 (code B ref 57050); Thu, 25 Aug 2022 08:57:03 +0000 Received: (at 57050) by debbugs.gnu.org; 25 Aug 2022 08:56:39 +0000 Received: from localhost ([127.0.0.1]:48899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oR8fA-0002aw-6B for submit@debbugs.gnu.org; Thu, 25 Aug 2022 04:56:39 -0400 Received: from mail-vs1-f42.google.com ([209.85.217.42]:46696) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oR8eU-0002VD-5R for 57050@debbugs.gnu.org; Thu, 25 Aug 2022 04:55:57 -0400 Received: by mail-vs1-f42.google.com with SMTP id d126so20182264vsd.13 for <57050@debbugs.gnu.org>; Thu, 25 Aug 2022 01:55:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=y3LQ8K3rzYxXt+MlIQWAr2vQTMgHelN8GYtEuAXdQcM=; b=Xtdzt5ROAjQu+ZZ7r2btRrLBo52cUaJfZnaq9PiQf6OLyhLGWgP3DDMoiW+hz6GZmp uIWDKHCiQf8amISDvp1IGGZDgZQdtwHmplDWzsN7s2xgcmr7w5Xg3BzgHKw5GFvGPsvV XyMXGpjr1Qr/wgxIbR3el6qkrLipP6d5WTyoXJy1DyUD2R1w58i/bf6NiEFA1mfvU0cd M6KjkxDyZxKT1p8xjoVEs2yJcrI9huWkp+2Lcjpa2Y7KW6Q6FE2y2T7W0HCKgEK7wLcl bYuhYtezZhoRxI29bMrVZ/eiJlTz7SVF70+qBsBJUu0QgD+0shTAbGeifzgARhcaDBf+ 8Q2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=y3LQ8K3rzYxXt+MlIQWAr2vQTMgHelN8GYtEuAXdQcM=; b=LPI6GjnUuOZ6KP6m6160uFiSntNf4VLJ/thpUXGe70JDxllIpAB13oGvINMCgy44vS DdcJekU3CJL6f27dcG2WVVw5VwQKmhQoW4O4GwKL7EF2h3lWaZ9FtUZhRv/3+B9sW8mW HQz/Gk65lPdOnjTzA8gUfduLe3UspUUGNcUFgBX47c9R6IPL089VCI3igN+rhk2DuD3k Aqb9htyFoHY61fWGWnU/DXNoTdauTH/nPcrJLWA9hHLlj0UOlKDkQLRTynqzjDcoNVnX fzt1K4HfCZ5bBhO7KEXvQITKw2WVQs+NJs8Oe2PEKDgTG7ekYZAj3rcWL8uSmzwda1Ps BmpA== X-Gm-Message-State: ACgBeo3QraVg0Hyu6/4GcZRCHd/tXrFbNWiADYSNL5bqKB8tL8ztuqkm XnAk87BfkuWiD/AcgKnwDVYC6QFGnJ2usneO X-Google-Smtp-Source: AA6agR7KMLRuRJU4QEgqrPV8VHtUAJ9BPgmZLDhlXMJDMXoui7XPta3e0t32nqyWTa5027Q1GXe3xg== X-Received: by 2002:a67:f145:0:b0:390:2b5b:dd69 with SMTP id t5-20020a67f145000000b003902b5bdd69mr962122vsm.19.1661417749828; Thu, 25 Aug 2022 01:55:49 -0700 (PDT) Received: from localhost (c-73-125-98-51.hsd1.fl.comcast.net. [73.125.98.51]) by smtp.gmail.com with UTF8SMTPSA id t124-20020a1faa82000000b003743e7c87c5sm15447563vke.5.2022.08.25.01.55.49 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 25 Aug 2022 01:55:49 -0700 (PDT) From: Philip McGrath Date: Thu, 25 Aug 2022 04:54:11 -0400 Message-Id: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/chez.scm (chez-scheme)[native-inputs]: Move 'chez-scheme-bootstrap-bootfiles' to ... [inputs]: ... this field. [arguments]<#:phases>: Update 'unpack-bootfiles' accordingly. (chez-scheme-for-racket)[native-inputs]: Move 'chez-scheme-for-racket-bootstrap-bootfiles' to ... [inputs]: ... this field. --- gnu/packages/chez.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index b59398578a..c87786c091 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -293,6 +293,7 @@ (define-public chez-scheme (build-system gnu-build-system) (inputs (list + chez-scheme-bootstrap-bootfiles `(,util-linux "lib") ;<-- libuuid zlib lz4 @@ -300,8 +301,7 @@ (define-public chez-scheme ;; for X11 clipboard support in expeditor: ;; https://github.com/cisco/ChezScheme/issues/9#issuecomment-222057232 libx11)) - (native-inputs (list chez-scheme-bootstrap-bootfiles - chez-nanopass-bootstrap + (native-inputs (list chez-nanopass-bootstrap stex-bootstrap)) (native-search-paths (list (search-path-specification @@ -338,7 +338,7 @@ (define-public chez-scheme (when (directory-exists? "boot") (delete-file-recursively "boot")) (copy-recursively - (search-input-directory (or native-inputs inputs) + (search-input-directory inputs "lib/chez-scheme-bootfiles") "boot"))) ;; NOTE: The custom Chez 'configure' script doesn't allow @@ -449,12 +449,12 @@ (define-public chez-scheme-for-racket (source #f) ; avoid problematic cycle with racket.scm (inputs (modify-inputs (package-inputs chez-scheme) - (delete "libx11" "util-linux:lib"))) + (delete "libx11" "util-linux:lib") + (replace "chez-scheme-bootstrap-bootfiles" + chez-scheme-for-racket-bootstrap-bootfiles))) (native-inputs (modify-inputs (package-native-inputs chez-scheme) - (prepend zuo) - (replace "chez-scheme-bootstrap-bootfiles" - chez-scheme-for-racket-bootstrap-bootfiles))) + (prepend zuo))) (arguments (substitute-keyword-arguments (package-arguments chez-scheme) ((#:out-of-source? _ #f)