From patchwork Sat Aug 27 18:55:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 42007 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 206E727BBE9; Sat, 27 Aug 2022 19:58:59 +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 7985227BBEA for ; Sat, 27 Aug 2022 19:58:58 +0100 (BST) Received: from localhost ([::1]:44856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oS11F-000527-K4 for patchwork@mira.cbaines.net; Sat, 27 Aug 2022 14:58:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34364) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oS10N-0004Jh-Qk for guix-patches@gnu.org; Sat, 27 Aug 2022 14:58:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39106) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oS10N-0001hu-I8 for guix-patches@gnu.org; Sat, 27 Aug 2022 14:58:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oS10N-0008JA-Ej for guix-patches@gnu.org; Sat, 27 Aug 2022 14:58:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57050] [PATCH v4 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: Sat, 27 Aug 2022 18:58: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.166162665331845 (code B ref 57050); Sat, 27 Aug 2022 18:58:03 +0000 Received: (at 57050) by debbugs.gnu.org; 27 Aug 2022 18:57:33 +0000 Received: from localhost ([127.0.0.1]:57075 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oS0zt-0008HS-2S for submit@debbugs.gnu.org; Sat, 27 Aug 2022 14:57:33 -0400 Received: from mail-vs1-f53.google.com ([209.85.217.53]:35493) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oS0zO-0008Ei-7l for 57050@debbugs.gnu.org; Sat, 27 Aug 2022 14:57:06 -0400 Received: by mail-vs1-f53.google.com with SMTP id 67so4692381vsv.2 for <57050@debbugs.gnu.org>; Sat, 27 Aug 2022 11:57:02 -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=Vpg1kVv2RsCkOOUO0vfSDWLRAHPx5MeoI8LkLnezS/0qTrbGpEMwY44tbRweLXALX+ m+WijpXL80yH2cunYfb9R+VmB8/E/9xPRlDVQJkDbbRkjd1gIHwbLUCkzOXaPCEuEE/0 EmUHJPwlRni86v6kRvJiIAMp/eXWz9zlOyTlCebtnJwjY41HVRzhzjOYfaigSh0FGKdr GfEc6egS7TlZPhuH9MutwOZCFbffbWM70Lqxtt1U1yJPfXj+VX31+bBsqrg+A9m+wOHF NbexCJs4Ovha2mFCQEA0RXBjsM1GapnI8tQFGFAr28rhJw+wKVB7WENvdil0MhXy674W yBuA== 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=b/bTtxpPI7bv2SdMnSFCWhE4vCU0rdj/tboemdORKElgJiNQe1sXWV362DjI/8zGu2 iOfGGi4TnRdqrtdT0jul9+dGkBKcOoEEWG8eCUS+TjHUfJSG1eVEh3+UjfQGrjnxYyPP ehepcPJ9Dja9sCEkaIxovTi5dwHCO55+Mj/qdp8mOwjz1HKtqEzhjb+dF5OWXP7yHYER NhOFZuzHsNLjHMy1vh/w/8Z5TlOwtGGd7Zzcmf6iOHboyG9W35kwPlMNJnJ1kqxQhU8N BrUmNDoA9948/bgmmCbxIDkZzWgfXhyJicztyfQEE01C9yvhkVBIT4eWsXP8woZ8Lvux Loiw== X-Gm-Message-State: ACgBeo3fX0Mt8W1vXyPGPK8+MMXejkv9q1mLNHF9AOCQCSS7sSdjO5Re s/87UIZs1u2IcNbOheaODAn1h5CT1sx/A6qg X-Google-Smtp-Source: AA6agR58yzC0hSDiKMv/fZL/R/Af9f73UEoEkqoLiuBIx4ZCKBpbnwpP9WOPipFgTuXiIBpLG+5HEA== X-Received: by 2002:a05:6102:3e1f:b0:388:9dab:9bef with SMTP id j31-20020a0561023e1f00b003889dab9befmr1364522vsv.38.1661626616720; Sat, 27 Aug 2022 11:56:56 -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 g80-20020a1f9d53000000b00382d5e1b95esm737344vke.35.2022.08.27.11.56.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 27 Aug 2022 11:56:56 -0700 (PDT) From: Philip McGrath Date: Sat, 27 Aug 2022 14:55:49 -0400 Message-Id: <0f44a1c29bd332808927cc4bf679fd11dc88cf98.1661626113.git.philip@philipmcgrath.com> 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)