From unknown Mon Aug 11 12:53:42 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40423] [PATCH] system: Split %BASE-PACKAGES in smaller parts. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Apr 2020 08:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40423 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40423@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158598720029744 (code B ref -1); Sat, 04 Apr 2020 08:00:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Apr 2020 08:00:00 +0000 Received: from localhost ([127.0.0.1]:43417 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jKdih-0007jf-M5 for submit@debbugs.gnu.org; Sat, 04 Apr 2020 04:00:00 -0400 Received: from lists.gnu.org ([209.51.188.17]:58122) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jKdig-0007jT-2I for submit@debbugs.gnu.org; Sat, 04 Apr 2020 03:59:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44510) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jKdie-00082W-Eq for guix-patches@gnu.org; Sat, 04 Apr 2020 03:59:57 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: * X-Spam-Status: No, score=1.1 required=5.0 tests=BAYES_50,RCVD_IN_DNSWL_LOW, SUBJ_UNNEEDED_HTML,URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jKdic-0007Va-Gw for guix-patches@gnu.org; Sat, 04 Apr 2020 03:59:55 -0400 Received: from relay11.mail.gandi.net ([217.70.178.231]:38703) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jKdic-0007NT-7j for guix-patches@gnu.org; Sat, 04 Apr 2020 03:59:54 -0400 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay11.mail.gandi.net (Postfix) with ESMTPSA id 39D94100004 for ; Sat, 4 Apr 2020 07:59:50 +0000 (UTC) From: Brice Waegeneire Date: Sat, 4 Apr 2020 09:59:48 +0200 Message-Id: <20200404075948.6719-1-brice@waegenei.re> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.70.178.231 X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/system.scm: (%base-packages-interactive, %base-packages-linux, %base-packages-networking, %base-packages-utils): New variables. (%base-packages): Use those new variables. --- This patch split %base-packages to make it more reusable. We talked about it with John Soo on IRC[0] and on the ML[1]. [0]: http://logs.guix.gnu.org/guix/2020-03-18.log#152734 [1]: https://lists.gnu.org/archive/html/guix-devel/2020-04/msg00061.html gnu/system.scm | 95 +++++++++++++++++++++++++++++--------------------- 1 file changed, 56 insertions(+), 39 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index d79ea23f98..ce0c7dbce0 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2019 Meiyo Peng ;;; Copyright © 2020 Danny Milosavljevic +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -142,6 +143,10 @@ %setuid-programs %sudoers-specification %base-packages + %base-packages-interactive + %base-packages-linux + %base-packages-networking + %base-packages-utils %base-firmware)) ;;; Commentary: @@ -575,48 +580,60 @@ of PROVENANCE-SERVICE-TYPE to its services." (list ath9k-htc-firmware openfwwf-firmware)) +(define %base-packages-utils + ;; Default set of utilities packages. + (cons* procps psmisc which + (@ (gnu packages admin) shadow) ;for 'passwd' + + ;; XXX: We don't use (canonical-package guile-2.2) here because that + ;; would create a collision in the global profile between the GMP + ;; variant propagated by 'guile-final' and the GMP variant propagated + ;; by 'gnutls', itself propagated by 'guix'. + guile-2.2 + + ;; The packages below are also in %FINAL-INPUTS, so take them from + ;; there to avoid duplication. + (map canonical-package + (list bash coreutils findutils grep sed + diffutils patch gawk tar gzip bzip2 xz lzip)))) + +(define %base-packages-linux + ;; Default set of linux specific packages. + (list pciutils usbutils + util-linux+udev + ;; Get 'insmod' & co. from kmod, not module-init-tools, since udev + ;; already depends on it anyway. + kmod eudev)) + +(define %base-packages-interactive + ;; Default set of common interactive packages. + (list less zile nano + man-db + info-reader ;the standalone Info reader (no Perl) + bash-completion + kbd + ;; The 'sudo' command is already in %SETUID-PROGRAMS, but we also + ;; want the other commands and the man pages (notably because + ;; auto-completion in Emacs shell relies on man pages.) + sudo + guile-readline guile-colorized)) + +(define %base-packages-networking + ;; Default set of networking packages. + (list inetutils isc-dhcp + iproute + ;; wireless-tools is deprecated in favor of iw, but it's still what + ;; many people are familiar with, so keep it around. + iw wireless-tools)) + (define %base-packages ;; Default set of packages globally visible. It should include anything ;; required for basic administrator tasks. - (cons* procps psmisc which less zile nano - pciutils usbutils - util-linux+udev - inetutils isc-dhcp - (@ (gnu packages admin) shadow) ;for 'passwd' - - ;; wireless-tools is deprecated in favor of iw, but it's still what - ;; many people are familiar with, so keep it around. - iw wireless-tools - - iproute - man-db - info-reader ;the standalone Info reader (no Perl) - - ;; The 'sudo' command is already in %SETUID-PROGRAMS, but we also - ;; want the other commands and the man pages (notably because - ;; auto-completion in Emacs shell relies on man pages.) - sudo - - ;; Get 'insmod' & co. from kmod, not module-init-tools, since udev - ;; already depends on it anyway. - kmod eudev - - e2fsprogs kbd - - bash-completion - - ;; XXX: We don't use (canonical-package guile-2.2) here because that - ;; would create a collision in the global profile between the GMP - ;; variant propagated by 'guile-final' and the GMP variant propagated - ;; by 'gnutls', itself propagated by 'guix'. - guile-2.2 - guile-readline guile-colorized - - ;; The packages below are also in %FINAL-INPUTS, so take them from - ;; there to avoid duplication. - (map canonical-package - (list bash coreutils findutils grep sed - diffutils patch gawk tar gzip bzip2 xz lzip)))) + (append (list e2fsprogs) + %base-packages-interactive + %base-packages-linux + %base-packages-networking + %base-packages-utils)) (define %default-issue ;; Default contents for /etc/issue. -- 2.26.0 From unknown Mon Aug 11 12:53:42 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Brice Waegeneire Subject: bug#40423: closed (Re: [bug#40423] [PATCH] system: Split %BASE-PACKAGES in smaller parts.) Message-ID: References: <87pnbzv7or.fsf@gnu.org> <20200404075948.6719-1-brice@waegenei.re> X-Gnu-PR-Message: they-closed 40423 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 40423@debbugs.gnu.org Date: Wed, 22 Apr 2020 15:54:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1587570842-16855-1" This is a multi-part message in MIME format... ------------=_1587570842-16855-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #40423: [PATCH] system: Split %BASE-PACKAGES in smaller parts. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 40423@debbugs.gnu.org. --=20 40423: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D40423 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1587570842-16855-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 40423-done) by debbugs.gnu.org; 22 Apr 2020 15:53:02 +0000 Received: from localhost ([127.0.0.1]:52985 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRHgM-0004M4-Ju for submit@debbugs.gnu.org; Wed, 22 Apr 2020 11:53:02 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43808) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRHgL-0004La-7r for 40423-done@debbugs.gnu.org; Wed, 22 Apr 2020 11:53:01 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:60485) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRHgE-0006PV-U3; Wed, 22 Apr 2020 11:52:54 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=52828 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jRHgE-00086W-FQ; Wed, 22 Apr 2020 11:52:54 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Brice Waegeneire Subject: Re: [bug#40423] [PATCH] system: Split %BASE-PACKAGES in smaller parts. References: <20200404075948.6719-1-brice@waegenei.re> Date: Wed, 22 Apr 2020 17:52:52 +0200 In-Reply-To: <20200404075948.6719-1-brice@waegenei.re> (Brice Waegeneire's message of "Sat, 4 Apr 2020 09:59:48 +0200") Message-ID: <87pnbzv7or.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40423-done Cc: 40423-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi, Brice Waegeneire skribis: > * gnu/system.scm: (%base-packages-interactive, %base-packages-linux, > %base-packages-networking, %base-packages-utils): New variables. > (%base-packages): Use those new variables. > --- > > This patch split %base-packages to make it more reusable. We talked about= it > with John Soo on IRC[0] and on the ML[1]. > > [0]: http://logs.guix.gnu.org/guix/2020-03-18.log#152734 > [1]: https://lists.gnu.org/archive/html/guix-devel/2020-04/msg00061.html I had completely overlooked this proposal but I think it=E2=80=99s a good i= dea. It=E2=80=99ll also be helpful for GNU/Hurd support: we=E2=80=99ll just have= to drop the %base-packages-linux. Applied, thanks! Ludo=E2=80=99. ------------=_1587570842-16855-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 4 Apr 2020 08:00:00 +0000 Received: from localhost ([127.0.0.1]:43417 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jKdih-0007jf-M5 for submit@debbugs.gnu.org; Sat, 04 Apr 2020 04:00:00 -0400 Received: from lists.gnu.org ([209.51.188.17]:58122) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jKdig-0007jT-2I for submit@debbugs.gnu.org; Sat, 04 Apr 2020 03:59:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44510) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jKdie-00082W-Eq for guix-patches@gnu.org; Sat, 04 Apr 2020 03:59:57 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: * X-Spam-Status: No, score=1.1 required=5.0 tests=BAYES_50,RCVD_IN_DNSWL_LOW, SUBJ_UNNEEDED_HTML,URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jKdic-0007Va-Gw for guix-patches@gnu.org; Sat, 04 Apr 2020 03:59:55 -0400 Received: from relay11.mail.gandi.net ([217.70.178.231]:38703) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jKdic-0007NT-7j for guix-patches@gnu.org; Sat, 04 Apr 2020 03:59:54 -0400 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay11.mail.gandi.net (Postfix) with ESMTPSA id 39D94100004 for ; Sat, 4 Apr 2020 07:59:50 +0000 (UTC) From: Brice Waegeneire To: guix-patches@gnu.org Subject: [PATCH] system: Split %BASE-PACKAGES in smaller parts. Date: Sat, 4 Apr 2020 09:59:48 +0200 Message-Id: <20200404075948.6719-1-brice@waegenei.re> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.70.178.231 X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/system.scm: (%base-packages-interactive, %base-packages-linux, %base-packages-networking, %base-packages-utils): New variables. (%base-packages): Use those new variables. --- This patch split %base-packages to make it more reusable. We talked about it with John Soo on IRC[0] and on the ML[1]. [0]: http://logs.guix.gnu.org/guix/2020-03-18.log#152734 [1]: https://lists.gnu.org/archive/html/guix-devel/2020-04/msg00061.html gnu/system.scm | 95 +++++++++++++++++++++++++++++--------------------- 1 file changed, 56 insertions(+), 39 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index d79ea23f98..ce0c7dbce0 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2019 Meiyo Peng ;;; Copyright © 2020 Danny Milosavljevic +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -142,6 +143,10 @@ %setuid-programs %sudoers-specification %base-packages + %base-packages-interactive + %base-packages-linux + %base-packages-networking + %base-packages-utils %base-firmware)) ;;; Commentary: @@ -575,48 +580,60 @@ of PROVENANCE-SERVICE-TYPE to its services." (list ath9k-htc-firmware openfwwf-firmware)) +(define %base-packages-utils + ;; Default set of utilities packages. + (cons* procps psmisc which + (@ (gnu packages admin) shadow) ;for 'passwd' + + ;; XXX: We don't use (canonical-package guile-2.2) here because that + ;; would create a collision in the global profile between the GMP + ;; variant propagated by 'guile-final' and the GMP variant propagated + ;; by 'gnutls', itself propagated by 'guix'. + guile-2.2 + + ;; The packages below are also in %FINAL-INPUTS, so take them from + ;; there to avoid duplication. + (map canonical-package + (list bash coreutils findutils grep sed + diffutils patch gawk tar gzip bzip2 xz lzip)))) + +(define %base-packages-linux + ;; Default set of linux specific packages. + (list pciutils usbutils + util-linux+udev + ;; Get 'insmod' & co. from kmod, not module-init-tools, since udev + ;; already depends on it anyway. + kmod eudev)) + +(define %base-packages-interactive + ;; Default set of common interactive packages. + (list less zile nano + man-db + info-reader ;the standalone Info reader (no Perl) + bash-completion + kbd + ;; The 'sudo' command is already in %SETUID-PROGRAMS, but we also + ;; want the other commands and the man pages (notably because + ;; auto-completion in Emacs shell relies on man pages.) + sudo + guile-readline guile-colorized)) + +(define %base-packages-networking + ;; Default set of networking packages. + (list inetutils isc-dhcp + iproute + ;; wireless-tools is deprecated in favor of iw, but it's still what + ;; many people are familiar with, so keep it around. + iw wireless-tools)) + (define %base-packages ;; Default set of packages globally visible. It should include anything ;; required for basic administrator tasks. - (cons* procps psmisc which less zile nano - pciutils usbutils - util-linux+udev - inetutils isc-dhcp - (@ (gnu packages admin) shadow) ;for 'passwd' - - ;; wireless-tools is deprecated in favor of iw, but it's still what - ;; many people are familiar with, so keep it around. - iw wireless-tools - - iproute - man-db - info-reader ;the standalone Info reader (no Perl) - - ;; The 'sudo' command is already in %SETUID-PROGRAMS, but we also - ;; want the other commands and the man pages (notably because - ;; auto-completion in Emacs shell relies on man pages.) - sudo - - ;; Get 'insmod' & co. from kmod, not module-init-tools, since udev - ;; already depends on it anyway. - kmod eudev - - e2fsprogs kbd - - bash-completion - - ;; XXX: We don't use (canonical-package guile-2.2) here because that - ;; would create a collision in the global profile between the GMP - ;; variant propagated by 'guile-final' and the GMP variant propagated - ;; by 'gnutls', itself propagated by 'guix'. - guile-2.2 - guile-readline guile-colorized - - ;; The packages below are also in %FINAL-INPUTS, so take them from - ;; there to avoid duplication. - (map canonical-package - (list bash coreutils findutils grep sed - diffutils patch gawk tar gzip bzip2 xz lzip)))) + (append (list e2fsprogs) + %base-packages-interactive + %base-packages-linux + %base-packages-networking + %base-packages-utils)) (define %default-issue ;; Default contents for /etc/issue. -- 2.26.0 ------------=_1587570842-16855-1--