From patchwork Mon Jan 30 16:08:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 46538 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 91C4127BBE9; Mon, 30 Jan 2023 16:09:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 4541C27BBE9 for ; Mon, 30 Jan 2023 16:09:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pMWiO-0004N6-Dt; Mon, 30 Jan 2023 11:09:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMWiM-0004Mi-UY for guix-patches@gnu.org; Mon, 30 Jan 2023 11:09:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pMWiM-0005gb-EP for guix-patches@gnu.org; Mon, 30 Jan 2023 11:09:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pMWiM-0008TP-6I; Mon, 30 Jan 2023 11:09:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61180] [PATCH] build-system: Always pass #:graft? #f to 'gexp->derivation'. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: 60947@debbugs.gnu.org, guix-patches@gnu.org Resent-Date: Mon, 30 Jan 2023 16:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61180 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61180@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , 60947@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: 60947@debbugs.gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167509490632515 (code B ref -1); Mon, 30 Jan 2023 16:09:02 +0000 Received: (at submit) by debbugs.gnu.org; 30 Jan 2023 16:08:26 +0000 Received: from localhost ([127.0.0.1]:50184 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMWhl-0008SM-Rh for submit@debbugs.gnu.org; Mon, 30 Jan 2023 11:08:26 -0500 Received: from lists.gnu.org ([209.51.188.17]:42132) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMWhk-0008SD-7Y for submit@debbugs.gnu.org; Mon, 30 Jan 2023 11:08:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMWhk-0004JI-1Z for guix-patches@gnu.org; Mon, 30 Jan 2023 11:08:24 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMWhj-0005aW-CO; Mon, 30 Jan 2023 11:08:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=BiN/L2lEbzgrjV147QmDXp8Y07TwyxGdkMne5pBsGIE=; b=VcLzjW1KVLrqQFubfZZM nOHYxgts3xhLNpiAAeIF81mywxbkR/OGttxzpOzfV96+NQ8e/Yw8inbqmF/P/SdGhVZge78Yl0bHp TsL9I3h99hPZ2z0lIatozTLf3PK0G48m7TJxVm2bvkQGdpBY+A82kZ1VSIpJ99dHRarmdUeoeQqDQ 3G7xgfdf4IULHNOnTO54avAeARoe6EbDwF892Ie6MkhQTuNjgVfwI4vXNQCbzfNirJ1vO/DcegoWr +fK9muST9IUd8eci5E28TM6AuICOW8kcCdi9Xhh3rYk2/9D5jLrELv/s2oA4GSduehO/HTqJk5mHI ebibWke+2uQQhg==; Received: from [193.50.110.131] (helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pMWhi-0008No-MK; Mon, 30 Jan 2023 11:08:22 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 30 Jan 2023 17:08:10 +0100 Message-Id: <20230130160810.14356-1-ludo@gnu.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <87y1pkypo1.fsf@gnu.org> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Fixes . Fixes a bug whereby packages referred via 'ungexp' in package arguments would be "double-grafted": 'gexp->derivation' would first replace those references by references to the grafted package, only to repeat the grafting process on the result. Build systems such as 'gnu', 'cmake', and 'pyproject' were already doing this. Only the rest of them is affected. * guix/build-system/cargo.scm (cargo-build): Pass #:graft? #f to 'gexp->derivation'. * guix/build-system/copy.scm (copy-build): Likewise. * guix/build-system/dune.scm (dune-build): Likewise. * guix/build-system/font.scm (font-build): Likewise. * guix/build-system/guile.scm (guile-build): Likewise. (guile-cross-build): Likewise. * guix/build-system/ocaml.scm (ocaml-build): Likewise. * guix/build-system/ruby.scm (ruby-build): Likewise. * guix/build-system/scons.scm (scons-build): Likewise. * guix/build-system/texlive.scm (texlive-build): Likewise. * guix/build-system/waf.scm (waf-build): Likewise. --- guix/build-system/cargo.scm | 1 + guix/build-system/copy.scm | 1 + guix/build-system/dune.scm | 1 + guix/build-system/font.scm | 1 + guix/build-system/guile.scm | 2 ++ guix/build-system/ocaml.scm | 1 + guix/build-system/ruby.scm | 1 + guix/build-system/scons.scm | 1 + guix/build-system/texlive.scm | 1 + guix/build-system/waf.scm | 1 + 10 files changed, 11 insertions(+) base-commit: dbf965dd7b76dfa50ee80e037a7404e163b9917c diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm index 60c35eed07..912400a191 100644 --- a/guix/build-system/cargo.scm +++ b/guix/build-system/cargo.scm @@ -123,6 +123,7 @@ (define builder (gexp->derivation name builder #:system system #:target #f + #:graft? #f #:guile-for-build guile)) (define (package-cargo-inputs p) diff --git a/guix/build-system/copy.scm b/guix/build-system/copy.scm index 4894ba46fb..42a48b037c 100644 --- a/guix/build-system/copy.scm +++ b/guix/build-system/copy.scm @@ -129,6 +129,7 @@ (define builder (gexp->derivation name builder #:system system #:target #f + #:graft? #f #:guile-for-build guile))) (define copy-build-system diff --git a/guix/build-system/dune.scm b/guix/build-system/dune.scm index 12100fd8e8..3f81d21441 100644 --- a/guix/build-system/dune.scm +++ b/guix/build-system/dune.scm @@ -157,6 +157,7 @@ (define builder (gexp->derivation name builder #:system system #:target #f + #:graft? #f #:guile-for-build guile)) (define dune-build-system diff --git a/guix/build-system/font.scm b/guix/build-system/font.scm index 74dc80b5db..a99f76c66b 100644 --- a/guix/build-system/font.scm +++ b/guix/build-system/font.scm @@ -112,6 +112,7 @@ (define builder (gexp->derivation name builder #:system system #:target #f + #:graft? #f #:guile-for-build guile))) (define font-build-system diff --git a/guix/build-system/guile.scm b/guix/build-system/guile.scm index 36a88e181a..ffc892260a 100644 --- a/guix/build-system/guile.scm +++ b/guix/build-system/guile.scm @@ -114,6 +114,7 @@ (define builder (gexp->derivation name builder #:system system #:target #f + #:graft? #f #:guile-for-build guile))) (define* (guile-cross-build name @@ -170,6 +171,7 @@ (define %outputs (gexp->derivation name builder #:system system #:target target + #:graft? #f #:guile-for-build guile))) (define guile-build-system diff --git a/guix/build-system/ocaml.scm b/guix/build-system/ocaml.scm index b08985cd4d..921c1f8629 100644 --- a/guix/build-system/ocaml.scm +++ b/guix/build-system/ocaml.scm @@ -310,6 +310,7 @@ (define builder (gexp->derivation name builder #:system system #:target #f + #:graft? #f #:guile-for-build guile)) (define ocaml-build-system diff --git a/guix/build-system/ruby.scm b/guix/build-system/ruby.scm index 342daf7978..0aa273b4f4 100644 --- a/guix/build-system/ruby.scm +++ b/guix/build-system/ruby.scm @@ -114,6 +114,7 @@ (define build (gexp->derivation name build #:system system #:target #f + #:graft? #f #:modules imported-modules #:guile-for-build guile))) diff --git a/guix/build-system/scons.scm b/guix/build-system/scons.scm index 7a02fa8a0f..9af24d40f8 100644 --- a/guix/build-system/scons.scm +++ b/guix/build-system/scons.scm @@ -121,6 +121,7 @@ (define builder (gexp->derivation name builder #:system system #:target #f + #:graft? #f #:guile-for-build guile)) (define scons-build-system diff --git a/guix/build-system/texlive.scm b/guix/build-system/texlive.scm index dbb72cd24a..336e192d83 100644 --- a/guix/build-system/texlive.scm +++ b/guix/build-system/texlive.scm @@ -182,6 +182,7 @@ (define builder (gexp->derivation name builder #:system system #:target #f + #:graft? #f #:substitutable? substitutable? #:guile-for-build guile))) diff --git a/guix/build-system/waf.scm b/guix/build-system/waf.scm index e8cd5520b8..1d520050f6 100644 --- a/guix/build-system/waf.scm +++ b/guix/build-system/waf.scm @@ -111,6 +111,7 @@ (define build (gexp->derivation name build #:system system #:target #f + #:graft? #f #:modules imported-modules #:guile-for-build guile)))