From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:700:3204::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id mFGpOh6tm2W7qwAAkFu2QA (envelope-from ) for ; Mon, 08 Jan 2024 09:06:55 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id cJYVNB6tm2V2PgAAe85BDQ (envelope-from ) for ; Mon, 08 Jan 2024 09:06:54 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1704701214; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=AxDdCYld3GLVudWRqa/84ZjsngS8LLxgU9yOFPG4E54=; b=LikzLFjem/c2pMQgDu9ylm94VXZpYznGWJQx7p72ZLXHry//7+wRVYusS+1FY1JQdH/vvg tCimEQQUzlmlczPOGN51py1sQBw7uN2/8v72vfu2JFZ2REybL7JS3jtDMD3bVHFqSs8AWi Encxb0n78VZbS5SRd2mQ2CjZeS0b9icaDossGNziJt55EBaflwX2NoOT16hnt2Z+h3gbgK piRuIuUgoAUfumklpTMUdqmkivHL/BR08uB0/7xURbE2fstSk61N9oMSPyKCi6wJX8bYqm TZTz3x5ApNCgBf0jLIlB6dmeQI5XalsXT3SPvvTdohdQ1/jhpkPvtX0DH09CDA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1704701214; a=rsa-sha256; cv=none; b=OLOUDUkZ9DpYOiVUF6j6Aq8eWiHMWlXmIgWcNuiRpSzSIdY8uABFeEwPHw3BzM2Rm90I/S hsKaX0CNdkLbHEEd5HNdJVnM9+pVSZ2OzTlkAWU/+bWn6Ob8DhaYIELdkmJYZMVOUK9IkA iX6oa4hdF9KGh0KLW/nYfYvkxCdBK77H4diqSDq7F7zfYKXdM0Lh14XThkMF8Mq43A7E7o xZ4miZe2bY9krSCN8IQFHGj1f27zAh792SbcdeTorjbDsWCd1jKsJPL6xBztTZRm786gik 5crWyeHKaZiwBFQXXSz3FAFehKuLp3HR51uUQcxEBJwuFVtqqRnW/CU56Yg3GA== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B88A414074 for ; Mon, 8 Jan 2024 09:06:54 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMkd1-0003Fu-Kx; Mon, 08 Jan 2024 03:04:59 -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 1rMkd0-0003EJ-5E for guix-patches@gnu.org; Mon, 08 Jan 2024 03:04:58 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rMkcz-0002lq-S8 for guix-patches@gnu.org; Mon, 08 Jan 2024 03:04:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMkd5-00080H-F8 for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH 03/48] build-system: gnu: Redefine gnu-build and gnu-cross-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 08:05:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68315 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68315@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.170470105130134 (code B ref 68315); Mon, 08 Jan 2024 08:05:03 +0000 Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:11 +0000 Received: from localhost ([127.0.0.1]:34904 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcE-0007pv-Kj for submit@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:10 -0500 Received: from 4.mo550.mail-out.ovh.net ([46.105.76.26]:45947) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcB-0007pP-SN for 68315@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:09 -0500 Received: from director3.ghost.mail-out.ovh.net (unknown [10.109.139.129]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 3BF252775E for <68315@debbugs.gnu.org>; Mon, 8 Jan 2024 08:03:59 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-m5qnx (unknown [10.110.96.89]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id D68F91FEB7; Mon, 8 Jan 2024 08:03:58 +0000 (UTC) Received: from ngraves.fr ([37.59.142.101]) by ghost-submission-6684bf9d7b-m5qnx with ESMTPSA id lr8fLW6sm2U2RgAAxu9BGQ (envelope-from ); Mon, 08 Jan 2024 08:03:58 +0000 X-OVh-ClientIp: 81.67.146.208 Date: Mon, 8 Jan 2024 09:02:35 +0100 Message-ID: <20240108080350.1665-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240108080350.1665-1-ngraves@ngraves.fr> References: <20240108080350.1665-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 12425149897607144162 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrddutddunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeikeefudehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtpdhmohguvgepshhmthhpohhuth 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches From: Nicolas Graves via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -6.29 X-Spam-Score: -6.29 X-Migadu-Queue-Id: B88A414074 X-TUID: AS69Us2+hfyx * guix/build-system/gnu.scm (gnu-build): Monadic procedure returns a gexp instead of a derivation. (gnu-cross-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: I6bf922ecd1474df104f959989db315d7ddc278b6 --- guix/build-system/gnu.scm | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index c3de5c2544..f753aeea28 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -421,18 +421,8 @@ (define builder #:strip-flags #$strip-flags #:strip-directories #$strip-directories))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - ;; Note: Always pass #:graft? #f. Without it, ALLOWED-REFERENCES & - ;; co. would be interpreted as referring to grafted packages. - (gexp->derivation name builder - #:system system - #:target #f - #:graft? #f - #:substitutable? substitutable? - #:allowed-references allowed-references - #:disallowed-references disallowed-references - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) ;;; @@ -564,16 +554,8 @@ (define %outputs #:strip-flags #$strip-flags #:strip-directories #$strip-directories)))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:target target - #:graft? #f - #:substitutable? substitutable? - #:allowed-references allowed-references - #:disallowed-references disallowed-references - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define gnu-build-system (build-system -- 2.41.0