From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:1008:1e59::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id iF7MEP+sm2XMxAAAkFu2QA (envelope-from ) for ; Mon, 08 Jan 2024 09:06:23 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 6LcRDf+sm2X2MwAA62LTzQ (envelope-from ) for ; Mon, 08 Jan 2024 09:06:23 +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=1704701183; 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-type:content-type: 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=kTNLqv2v+WXhpyFrmeaafsCSTJs3J7iEubT7simbEC4=; b=jQHh/EQgwcjwlnIrWjUOlRt1cfESfByzsawuIusQ7Tp44uYGUHbjKq2KEdJ7Z7JJ/MpbAt Qwjgo+W1zEgYBenkSEodulM1z6zyagOJ+58BQ7ej26rwCzMVIhzgq6lGm09kJ+EWleA36V L3lkC+OLlsvy4UgH6Nz6fuZRmTS6ueNH5X5OgxBNKV2BDNiRzKHO+JUaFULFBIzdYXW5yg kMWfv9XtOvDuCXbBYKhG7bxdqrcP9MnCOtOcpNL+X6ayM+sFsEZgjB831uzMy9vXdTdXmY Duh0DAfAQZtfSK3vrM8pFqNEI7Rc8jmLz6WdUQwbZur8NUcvre5OdGWhAo4Wrg== 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=1704701183; a=rsa-sha256; cv=none; b=Y7MSI3DTFPkul2/O5hzgk5ekf9f8R3VhWLz25ZfSKeAxo2tbxmm8kbyrksS80hIdU7rpFW fEMVs3JmtYQUuqus0dgT9p4EEgOfAk2tmaW4kbXcbSGIoct9EblKb49pcKIFQu7MC/0ezK m5JwBGMYV9K7+V30/RHvn1noRYKzLMB/nRqyiY1v842osObqSgNIAzQygLGhEUR2vkb9/2 EAQuUtMWQ47pQ6B3ROUVI2FyNhYdis+Q8FYC/lie8DefRFVtDWkCyuNf/fl4o/Er0SksNH GLZ5Ib4DgSF5lKfTPwHzySuD1RSGk3FvhLFkiaPaB5SrV5nQVCKmZ2oLiCjunA== 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 0D0451406F for ; Mon, 8 Jan 2024 09:06:23 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMkdL-0003bE-Lk; Mon, 08 Jan 2024 03:05:19 -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 1rMkdI-0003Xw-Ix for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:16 -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 1rMkdI-00034A-AB for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:16 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMkdO-000865-B4 for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:22 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH 42/48] build-system: scons: Redefine scons-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 08:05:22 +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.170470110530816 (code B ref 68315); Mon, 08 Jan 2024 08:05:22 +0000 Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:05:05 +0000 Received: from localhost ([127.0.0.1]:35031 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkd7-00080p-20 for submit@debbugs.gnu.org; Mon, 08 Jan 2024 03:05:05 -0500 Received: from 13.mo561.mail-out.ovh.net ([188.165.33.202]:48357) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcz-0007yW-MR for 68315@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:58 -0500 Received: from director9.ghost.mail-out.ovh.net (unknown [10.109.148.49]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id 6B3CC29812 for <68315@debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:50 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-zll2p (unknown [10.110.168.217]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 1B4E51FEAF; Mon, 8 Jan 2024 08:04:50 +0000 (UTC) Received: from ngraves.fr ([37.59.142.107]) by ghost-submission-6684bf9d7b-zll2p with ESMTPSA id OnuvA6Ksm2XrCwAAna9euQ (envelope-from ); Mon, 08 Jan 2024 08:04:50 +0000 X-OVh-ClientIp: 81.67.146.208 Date: Mon, 8 Jan 2024 09:03:14 +0100 Message-ID: <20240108080350.1665-42-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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 12439505122536973026 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedugeelfeekhedugedvieffleekgeffiefhkeejudelveeuuefhheevtefghedtheenucffohhmrghinhepghhnuhdrohhrghenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeiuddpmhhouggvpehsmhhtphhouhht 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.79 X-Spam-Score: -6.79 X-Migadu-Queue-Id: 0D0451406F X-TUID: vyLMfk90XnR0 * guix/build-system/scons.scm (scons-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Ic8c99d06ac53b2ba80a02a191d18de92e9c74e6b --- guix/build-system/scons.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/guix/build-system/scons.scm b/guix/build-system/scons.scm index 046ddef740..8bf2e5ee2f 100644 --- a/guix/build-system/scons.scm +++ b/guix/build-system/scons.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2021 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,6 +19,7 @@ ;;; along with GNU Guix. If not, see . (define-module (guix build-system scons) + #:use-module (guix store) #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix monads) @@ -117,11 +119,8 @@ (define builder (map search-path-specification->sexp search-paths))))))) - (gexp->derivation name builder - #:system system - #:target #f - #:graft? #f - #:guile-for-build guile)) + (mbegin %store-monad + (return builder))) (define scons-build-system (build-system -- 2.41.0