From patchwork Mon Jun 17 19:10:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 65442 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 D945727BBE9; Mon, 17 Jun 2024 20:11:17 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no 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 EEB7627BBE2 for ; Mon, 17 Jun 2024 20:11:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sJHkr-0007VO-Rv; Mon, 17 Jun 2024 15:11:01 -0400 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 1sJHkq-0007Uy-8A for guix-patches@gnu.org; Mon, 17 Jun 2024 15:11:00 -0400 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 1sJHkp-0007i4-W0; Mon, 17 Jun 2024 15:11:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sJHks-00011c-1U; Mon, 17 Jun 2024 15:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71618] [PATCH] guix: gnu-build-system: Add %gnu-build-system-default-modules. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: ludo@gnu.org, guix-patches@gnu.org Resent-Date: Mon, 17 Jun 2024 19:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71618 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71618@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz>, Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by submit@debbugs.gnu.org id=B.17186514603930 (code B ref -1); Mon, 17 Jun 2024 19:11:01 +0000 Received: (at submit) by debbugs.gnu.org; 17 Jun 2024 19:11:00 +0000 Received: from localhost ([127.0.0.1]:35632 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJHkq-00011J-1S for submit@debbugs.gnu.org; Mon, 17 Jun 2024 15:11:00 -0400 Received: from lists.gnu.org ([209.51.188.17]:47264) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1sJHko-000119-8u for submit@debbugs.gnu.org; Mon, 17 Jun 2024 15:10:58 -0400 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 <~@wolfsden.cz>) id 1sJHkl-0007UB-S8 for guix-patches@gnu.org; Mon, 17 Jun 2024 15:10:55 -0400 Received: from wolfsden.cz ([37.205.8.62]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <~@wolfsden.cz>) id 1sJHkj-0007gl-K5 for guix-patches@gnu.org; Mon, 17 Jun 2024 15:10:55 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 49D3E298DD8; Mon, 17 Jun 2024 19:10:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1718651449; bh=2YLUhKzI2GkxBRkicNso0MroRlVJehgqPUCiBNWoVgc=; h=From:To:Cc:Subject:Date; b=QO45ON7YvmoL0hG70d4sOrsLPVd0JuW7f9agPhBwdCjuLraP+tQwiRCLBLPXLRXvs tcclTsBEtfGEQV3Kst1QmLruumyo4v9KSMmo5aC/5EJIJk5vig2kOL9cytsTMoqNzq q3RT3DL5gw7gt3bGJzjVmF9YawFNBmvBkGLvPAOiAbi3R8wR8D2O8ZLLzVGNOrdLYZ wX/iozsB9GGCqYxJoj5VMx3soGdsWEhzGgwcvov7LTsC5AdirstJyAR3N3kUKsgNcr H1HMROHyU8IE25bRlqpfeHZqA16IhpcyJ3Qbr+U/kaDmMgHGYbc56j/uNuvD5ffmPw JcZDgw5rF9FOsXXWTz9EzKpBZ3RX9Vx1Kw359iB17bd7oxdvL/QYh+o/ZPrrqivnIJ wR8VfkkQ1Xg61478c+3X+daa7cj3npfEy5EGJ5y0E/q7T0grhcWtM1vKXlSFta9r9J GNM83xTheOc87CA6oMvrykWmlg61H8v58wRQAhDCTCEJ669By9PD4yPh+N/BdZTcdt 8kGIPKKeVfwaMRIwHLSB8SSDq/J2MEqcjsAmzIPqBmJDxXSGWlEJztdKCZRe0joMT0 OVoORXJo5P7ZO0YCaimIac+n3QBFUzDqiQ6EJd/wNRdcfrG9Lu4MQh4zQl+UVusA68 WtcoHUDmRj4PY/n9E38WUcHw= Received: from localhost (unknown [193.32.127.154]) by wolfsden.cz (Postfix) with ESMTPSA id 65C6829A252; Mon, 17 Jun 2024 19:10:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1718651448; bh=2YLUhKzI2GkxBRkicNso0MroRlVJehgqPUCiBNWoVgc=; h=From:To:Cc:Subject:Date; b=sRyN+qrclJcXW7kX0YJ/XPb7tTzeFoi84ld8dTj9/ZcTAGugkgvl8hlmGDuiHaZO7 0r7T4LA6BoLZhxR6JxXfeU0+ONikj2kJ2zNuhsbA3xSHWXgOZikBVoLkWzziMmYzUC OYpBgvsZypX9hKBdZivKI0UT8AohMy15e2gV2ku9rPHih3f5vgOadhILHGyupLH2+n u21K1qfwn+4st73h+wFXLEiu0/0h3jYKai5EYYolIA6yWrW9Yinnq6XrunMjSdNAvp e46bvkRbGppHCnVG/zCulGstsTullgT3uYgAGa3d6/Tm/oGySOh/qcecPGf88EFNz8 al1ioMVv2f8O5RY8Ac9Nd501uXm3CzRcXlycPgDafKt0fSd6/EoEEDX1CzkcTX8fWn vPKiyedI/GsYe5BCQib5Ig+uwkJQv7Kx8yeTpMtOxwrls1ozxGYMEBsfZa4kw8762v X17gRfxDL3jYANi5NPxdhd6Nr5hQMvVP9bZGZsXlN5dMbmCv38VwJfhkHF9Cn+xp3E hy5jIKSHWEh5vmkTzNqkwRruf2ICbppJCrlGnG8wgfj/4dfX71VqKWNtwbdPH9ndxX lu1JMBi8UwvMe8KyBVsc6Nea3fA8DLKyvVjroR45xfr3q4RotGl2yj5rHOipio3FTs cIf+Vj5hqYHgSjiRYRSotCWQ= From: Tomas Volf <~@wolfsden.cz> Date: Mon, 17 Jun 2024 21:10:35 +0200 Message-ID: X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Received-SPF: pass client-ip=37.205.8.62; envelope-from=~@wolfsden.cz; helo=wolfsden.cz X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 Since there is no exported variable containing the list of default modules, every place that needs it (in #:modules for example) needs to copy&paste it and pray it never changes. This commit provides new variable exposing the default list, allowing constructs like this: #:modules `((srfi srfi-34) ,@%gnu-build-system-default-modules) * guix/build-system/gnu.scm (%gnu-build-system-default-modules): New variable. (define-module)[#:export]: Export it. Change-Id: I1da392019a95aea5edeac0301db26266efbeee9e --- guix/build-system/gnu.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index cdbb547773..53ac2f8cbd 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -28,6 +28,7 @@ (define-module (guix build-system gnu) #:use-module (srfi srfi-1) #:use-module (ice-9 match) #:export (%gnu-build-system-modules + %gnu-build-system-default-modules %strip-flags %strip-directories gnu-build @@ -60,6 +61,8 @@ (define %default-modules '((guix build gnu-build-system) (guix build utils))) +(define %gnu-build-system-default-modules %default-modules) + (define* (package-with-explicit-inputs/deprecated p inputs #:optional (loc (current-source-location))