diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-06-18 23:28:54 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-06-19 23:35:41 +0200 |
| commit | 9b762b8d7cd6b90bde5bc21c1d63601aad3d3885 (patch) | |
| tree | d9123201d3d563581731c68fc00f5faff9fef049 /gnu/system.scm | |
| parent | eef4096c14568deae818287d23ad5da6a2f41d92 (diff) | |
| download | gnu-guix-9b762b8d7cd6b90bde5bc21c1d63601aad3d3885.tar gnu-guix-9b762b8d7cd6b90bde5bc21c1d63601aad3d3885.tar.gz | |
system: Prefer packages from %FINAL-INPUTS.
* gnu/packages/base.scm (canonical-package): New procedure.
* gnu/system.scm (%base-packages): Pass BASH, COREUTILS, FINDUTILS,
GREP, and SED through 'canonical-package'.
Diffstat (limited to 'gnu/system.scm')
| -rw-r--r-- | gnu/system.scm | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index 4dc6ebd5a7..c2be74b6d5 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -216,12 +216,16 @@ explicitly appear in OS." (define %base-packages ;; Default set of packages globally visible. It should include anything ;; required for basic administrator tasks. - (list bash coreutils findutils grep sed - procps psmisc less zile - guile-final (@ (gnu packages admin) dmd) guix - util-linux inetutils isc-dhcp - net-tools ; XXX: remove when Inetutils suffices - module-init-tools kbd)) + (cons* procps psmisc less zile + guile-final (@ (gnu packages admin) dmd) guix + util-linux inetutils isc-dhcp + net-tools ; XXX: remove when Inetutils suffices + module-init-tools kbd + + ;; 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)))) (define %default-issue ;; Default contents for /etc/issue. |