amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

system: Split %BASE-PACKAGES in smaller parts.

Browse source 
* gnu/system.scm: (%base-packages-interactive, %base-packages-linux,
%base-packages-networking, %base-packages-utils): New variables.
(%base-packages): Use those new variables.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Brice Waegeneire 2020-04-04 09:59:48 +02:00 • committed by Ludovic Courtès
parent 3183148992
commit 93664feee1
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 56 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

75
gnu/system.scm
View file

@ -6,6 +6,7 @@
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Meiyo Peng <meiyo.peng@gmail.com> ;;; Copyright © 2019 Meiyo Peng <meiyo.peng@gmail.com>
;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -142,6 +143,10 @@
%setuid-programs %setuid-programs
%sudoers-specification %sudoers-specification
%base-packages %base-packages
%base-packages-interactive
%base-packages-linux
%base-packages-networking
%base-packages-utils
%base-firmware)) %base-firmware))
;;; Commentary: ;;; Commentary:
@ -575,42 +580,16 @@ of PROVENANCE-SERVICE-TYPE to its services."
(list ath9k-htc-firmware (list ath9k-htc-firmware
openfwwf-firmware)) openfwwf-firmware))
(define %base-packages (define %base-packages-utils
;; Default set of packages globally visible. It should include anything ;; Default set of utilities packages.
;; required for basic administrator tasks. (cons* procps psmisc which
(cons* procps psmisc which less zile nano
pciutils usbutils
util-linux+udev
inetutils isc-dhcp
(@ (gnu packages admin) shadow) ;for 'passwd' (@ (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 ;; XXX: We don't use (canonical-package guile-2.2) here because that
;; would create a collision in the global profile between the GMP ;; would create a collision in the global profile between the GMP
;; variant propagated by 'guile-final' and the GMP variant propagated ;; variant propagated by 'guile-final' and the GMP variant propagated
;; by 'gnutls', itself propagated by 'guix'. ;; by 'gnutls', itself propagated by 'guix'.
guile-2.2 guile-2.2
guile-readline guile-colorized
;; The packages below are also in %FINAL-INPUTS, so take them from ;; The packages below are also in %FINAL-INPUTS, so take them from
;; there to avoid duplication. ;; there to avoid duplication.
@ -618,6 +597,44 @@ of PROVENANCE-SERVICE-TYPE to its services."
(list bash coreutils findutils grep sed (list bash coreutils findutils grep sed
diffutils patch gawk tar gzip bzip2 xz lzip)))) 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.
(append (list e2fsprogs)
%base-packages-interactive
%base-packages-linux
%base-packages-networking
%base-packages-utils))
(define %default-issue (define %default-issue
;; Default contents for /etc/issue. ;; Default contents for /etc/issue.
" "