From patchwork Fri Mar 22 14:12:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 62127 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 DBD3827BBE2; Fri, 22 Mar 2024 15:10:50 +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=-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 CB26427BBE9 for ; Fri, 22 Mar 2024 15:10:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rngXP-0007ix-JD; Fri, 22 Mar 2024 11:10:31 -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 1rngXJ-0007hX-NL for guix-patches@gnu.org; Fri, 22 Mar 2024 11:10:25 -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 1rngXF-0001Hf-Lw for guix-patches@gnu.org; Fri, 22 Mar 2024 11:10:25 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rngXu-00027s-7z for guix-patches@gnu.org; Fri, 22 Mar 2024 11:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69940] [PATCH 1/2] build-system/channel: Add support for additional channels. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Mar 2024 15:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69940 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69940@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 69940-submit@debbugs.gnu.org id=B69940.17111202178031 (code B ref 69940); Fri, 22 Mar 2024 15:11:02 +0000 Received: (at 69940) by debbugs.gnu.org; 22 Mar 2024 15:10:17 +0000 Received: from localhost ([127.0.0.1]:59173 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rngX9-00025Q-Jn for submit@debbugs.gnu.org; Fri, 22 Mar 2024 11:10:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35852) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rngK6-0001Pe-8h for 69940@debbugs.gnu.org; Fri, 22 Mar 2024 10:56:47 -0400 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 1rnfdZ-0004Mj-99; Fri, 22 Mar 2024 10:12:49 -0400 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=9n5QpEVAXuRd9sg0NtaU91WP4abLcc3vIllInVDB54M=; b=Nj1zI0c5vA0gv5pqeWNp 1mQBNi4LTltCDZ24VS8n7qOzJDyHQrrUTAbN7XNxUdMim1NQ8OS4I+FLbQwIqzvADVQ+dGh6+x5yH YdLXqVxYu+Z//gXWdjxeBMHoln9YWjo2c/aMOwUcsY6veRjQ/UxAgyveeASnVpNMJFFmGBnuQUb2r 48JkngJ1MCI47mEURWsCJVz0SpykqhXeC9FSAFlJp81xgVlbVwBDjYR3C2gXFenIc3hk6GYWdO6pQ 1TeOACNskbdfdXFs3mOndKmEzUdTXbTuxwVaJX5nFNfbHfeDFDuGUjHe3j/20Ea4vsvPNWuJr7YjB BNVRcjtq516YJg==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Fri, 22 Mar 2024 15:12:29 +0100 Message-ID: X-Mailer: git-send-email 2.41.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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Until now, ‘channel-build-system’ would assume a single channel, the ‘guix’ channel. This change lets users specify additional channels using the #:channels parameter. * guix/build-system/channel.scm (build-channels): Add #:channels and honor it. (channel-build-system): In ‘lower’, add #:channels and honor it. * doc/guix.texi (Build Systems): Document it. Change-Id: I36c1d19cbeee02a4d1144de089b78df0390774a0 --- doc/guix.texi | 5 ++++- guix/build-system/channel.scm | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index eda4084e7f..07dc6e24a8 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -10451,7 +10451,10 @@ Build Systems name, in which case an additional @code{#:commit} argument must be supplied to specify the commit being built (a hexadecimal string). -The resulting package is a Guix instance of the given channel, similar +Optionally, a @code{#:channels} argument specifying additional channels +can be provided. + +The resulting package is a Guix instance of the given channel(s), similar to how @command{guix time-machine} would build it. @end defvar diff --git a/guix/build-system/channel.scm b/guix/build-system/channel.scm index 6ad377f930..0607dcf4d7 100644 --- a/guix/build-system/channel.scm +++ b/guix/build-system/channel.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019-2022 Ludovic Courtès +;;; Copyright © 2019-2022, 2024 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,6 +37,7 @@ (define latest-channel-instances* (define* (build-channels name inputs #:key source system commit + (channels '()) (authenticate? #t) #:allow-other-keys) (mlet* %store-monad ((instances @@ -44,7 +45,7 @@ (define* (build-channels name inputs (return (list source))) ((channel? source) (latest-channel-instances* - (list source) + (cons source channels) #:authenticate? authenticate?)) ((string? source) ;; If SOURCE is a store file name, as is the @@ -64,12 +65,14 @@ (define* (build-channels name inputs (define channel-build-system ;; Build system used to "convert" a channel instance to a package. (let ((lower (lambda* (name #:key system source commit (authenticate? #t) + (channels '()) #:allow-other-keys) (bag (name name) (system system) (build build-channels) (arguments `(#:source ,source + #:channels ,channels #:authenticate? ,authenticate? #:commit ,commit)))))) (build-system (name 'channel) From patchwork Fri Mar 22 14:12:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 62126 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 4B70427BBEA; Fri, 22 Mar 2024 14:56:53 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 A6E8F27BBE2 for ; Fri, 22 Mar 2024 14:56:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rngJl-0000su-4y; Fri, 22 Mar 2024 10:56:25 -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 1rngJh-0000rV-K9 for guix-patches@gnu.org; Fri, 22 Mar 2024 10:56:21 -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 1rngJh-0006Dx-8I for guix-patches@gnu.org; Fri, 22 Mar 2024 10:56:21 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rngKL-0001R4-Qd for guix-patches@gnu.org; Fri, 22 Mar 2024 10:57:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69940] [PATCH 2/2] gnu: guix: Define =?utf-8?b?4oCYZ3VpeC1m?= =?utf-8?b?b3ItY2hhbm5lbHPigJk=?= and document its use. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Mar 2024 14:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69940 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69940@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 69940-submit@debbugs.gnu.org id=B69940.17111194145490 (code B ref 69940); Fri, 22 Mar 2024 14:57:01 +0000 Received: (at 69940) by debbugs.gnu.org; 22 Mar 2024 14:56:54 +0000 Received: from localhost ([127.0.0.1]:58529 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rngKD-0001QP-OK for submit@debbugs.gnu.org; Fri, 22 Mar 2024 10:56:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35852) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rngK8-0001Pe-TF for 69940@debbugs.gnu.org; Fri, 22 Mar 2024 10:56:49 -0400 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 1rnfdc-0004N0-C2; Fri, 22 Mar 2024 10:12:52 -0400 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=NVYmcLpqxop05d5wEdrGzU0qvtiUzjTjaPqHhk18IqM=; b=L+qxo95ybN6VKEduY0lr ABSXPM++4ImFYR7PpLITP9B6VAMIR+rjsKk2HsYnOCYd1B3MFgEC+t+XBchhIYwfhk8o8OyKbp26n hsf+DEFnVHe+aPB0POTrw7YZTmlFsqbvsqgCXbKeIi1vx41G+9jM2OJQ01iflYf17b4sLMNRimTbY E+9A+Vi1wU3wGWQCmvV0iBE2FgEptSTnixRAI06wz5v+XQ9jGV1tZw0ewcoA7ouukAmRCicU5/0NM t5tE0NjD1KdBn3xwq7SFXj9WYthZXFEnPlGfYjLMoz8CosEvlkO1fkQstHovahrYnLpFVegjrdJ+7 biNNBjU/VZl01g==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Fri, 22 Mar 2024 15:12:30 +0100 Message-ID: <58fefa1f778d9ead96b669ac258ec978f79d1da2.1711115625.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Ludovic Courtès * gnu/packages/package-management.scm (guix-for-channels): New procedure. * doc/guix.texi (Customizing the System-Wide Guix): New section. (Base Services): Add cross-reference. Change-Id: Ied51c3bf9bf08dfc629bb3f0a152eb20b869a636 --- doc/guix.texi | 62 ++++++++++++++++++++++++++++- gnu/packages/package-management.scm | 14 ++++++- 2 files changed, 74 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 07dc6e24a8..a2d5ef3ffd 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -5514,6 +5514,7 @@ Channels * Specifying Additional Channels:: Extending the package collection. * Using a Custom Guix Channel:: Using a customized Guix. * Replicating Guix:: Running the @emph{exact same} Guix. +* Customizing the System-Wide Guix:: Default channels on Guix System. * Channel Authentication:: How Guix verifies what it fetches. * Channels with Substitutes:: Using channels with available substitutes. * Creating a Channel:: How to write your custom channel. @@ -5671,6 +5672,64 @@ Replicating Guix will---some sort of ``meta reproducibility'' capabilities, if you will. @xref{Inferiors}, for another way to take advantage of these super powers. +@node Customizing the System-Wide Guix +@section Customizing the System-Wide Guix + +@cindex system-wide Guix, customization +@cindex channels, for the default Guix +If you're running Guix System or building system images with it, maybe +you will want to customize the system-wide @command{guix} it +provides---specifically, @file{/run/current-system/profile/bin/guix}. +For example, you might want to provide additional channels or to pin its +revision. + +This can be done using the @code{guix-for-channels} procedure, which +returns a package for the given channels, and using it as part of your +operating system configuration, as in this example: + +@lisp +(use-modules (guix channels)) + +(define my-channels + ;; Channels that should be available to + ;; /run/current-system/profile/bin/guix. + (append + (list (channel + (name 'guix-science) + (url "https://github.com/guix-science/guix-science") + (branch "master"))) + %default-channels)) + +(operating-system + ;; @dots{} + (services + ;; Change the package used by 'guix-service-type'. + (modify-services %base-services + (guix-service-type + config => (guix-configuration + (inherit config) + (channels my-channels) + (guix (guix-for-channels my-channels))))))) +@end lisp + +The resulting operating system will have both the @code{guix} and the +@code{guix-science} channels visible by default. The @code{channels} +field of @code{guix-configuration} above further ensures that +@file{/etc/guix/channels.scm}, which is used by @command{guix pull}, +specifies the same set of channels (@pxref{guix-configuration-channels, +@code{channels} field of @code{guix-configuration}}). + +The @code{(gnu packages package-management)} module exports the +@code{guix-for-channels} procedure, described below. + +@deffn {Procedure} guix-for-channels @var{channels} +Return a package corresponding to @var{channels}. + +The result is a ``regular'' package, which can be used in +@code{guix-configuration} as shown above or in any other place that +expects a package. +@end deffn + @node Channel Authentication @section Channel Authentication @@ -19734,7 +19793,8 @@ Base Services @table @asis @item @code{guix} (default: @var{guix}) -The Guix package to use. +The Guix package to use. @xref{Customizing the System-Wide Guix} to +learn how to provide a package with a pre-configured set of channels. @item @code{build-group} (default: @code{"guixbuild"}) Name of the group for build user accounts. diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index e9dd7427d3..c59f8b2bba 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013-2023 Ludovic Courtès +;;; Copyright © 2013-2024 Ludovic Courtès ;;; Copyright © 2015, 2017, 2020, 2021, 2022, 2023 Ricardo Wurmus ;;; Copyright © 2017 Muriithi Frederick Muriuki ;;; Copyright © 2017, 2018 Oleg Pykhalov @@ -649,6 +649,18 @@ (define-public guix-minimal (modify-inputs (package-propagated-inputs guix) (delete "guile-ssh")))))) +(define-public (guix-for-channels channels) + "Return a package corresponding to CHANNELS." + (package + (inherit guix) + (source (find guix-channel? channels)) + (build-system channel-build-system) + (arguments + `(#:channels ,(remove guix-channel? channels))) + (inputs '()) + (native-inputs '()) + (propagated-inputs '()))) + (define-public current-guix-package ;; This parameter allows callers to override the package that 'current-guix' ;; returns. This is useful when 'current-guix' cannot compute it by itself,