diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-06-30 22:10:07 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-06-30 22:10:07 +0200 |
| commit | 86f2309263bc6c89e7441315d358204797b90bb5 (patch) | |
| tree | 530f52a102f9c72561d2eb9dc961b6008287f1e8 /gnu/system.scm | |
| parent | e0556f76954cc56b257dad33aaa94588e87695dc (diff) | |
| download | patches-86f2309263bc6c89e7441315d358204797b90bb5.tar patches-86f2309263bc6c89e7441315d358204797b90bb5.tar.gz | |
system: Avoid collision between GMP variants in the global profile.
* gnu/system.scm (%base-packages): Move GUILE-2.2 out of the list passed
to 'canonical-package'.
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 39f8465bcb..e813bfc20c 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 findutils grep sed + (list bash coreutils findutils grep sed diffutils patch gawk tar gzip bzip2 xz lzip)))) (define %default-issue |