diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-08-26 15:15:49 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-08-26 15:15:49 +0200 |
| commit | 72e2815d18ad688b0a16ce3b3efba1172423cec4 (patch) | |
| tree | b3d6aa01aec86a7f224e15d97a40b64de4e5cdb8 /gnu/system.scm | |
| parent | c20cd0d24d9b5e8a47b864db9799e0992ffd44b9 (diff) | |
| parent | 2f837cf7fe100b0584fb02cf8f19d4cfb4e14d88 (diff) | |
| download | patches-72e2815d18ad688b0a16ce3b3efba1172423cec4.tar patches-72e2815d18ad688b0a16ce3b3efba1172423cec4.tar.gz | |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/system.scm')
| -rw-r--r-- | gnu/system.scm | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index fdb5be287e..6b35e3c0c7 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -514,10 +514,16 @@ explicitly appear in OS." 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 + ;; The packages below are also in %FINAL-INPUTS, so take them from ;; there to avoid duplication. (map canonical-package - (list guile-2.2 bash coreutils-8.27 findutils grep sed + (list bash coreutils findutils grep sed diffutils patch gawk tar gzip bzip2 xz lzip)))) (define %default-issue |