From dfc8ccbf5da96a67eb1cade499f0def21e7fdb02 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 31 Dec 2019 09:56:51 +0100 Subject: system: Stop using canonical-package. Usage of canonical-package outside of thunked fields breaks cross-compilation, see: https://lists.gnu.org/archive/html/guix-devel/2019-12/msg00410.html. * gnu/installer.scm (installer-program): Remove canonical-package. * gnu/services/base.scm (): Ditto, (%base-services): ditto. * gnu/services/xorg.scm: Remove useless canonical-package import. * gnu/system.scm (%base-packages): Remove canonical-package. * gnu/system/install.scm (%installation-services): Ditto, (installation-os): ditto. * gnu/system/locale.scm (single-locale-directory): Ditto. --- gnu/system.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'gnu/system.scm') diff --git a/gnu/system.scm b/gnu/system.scm index 01baa248a2..d3f2b82519 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -590,18 +590,13 @@ of PROVENANCE-SERVICE-TYPE to its services." 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)))) + (list bash coreutils findutils grep sed + diffutils patch gawk tar gzip bzip2 xz lzip))) (define %default-issue ;; Default contents for /etc/issue. -- cgit v1.2.3 From c95f5f0af7f3a2c674c17812fb2787112c84981e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Mar 2020 17:23:01 +0100 Subject: system: Switch to Guile 3.0. * gnu/system.scm (%base-packages): Change from GUILE-2.2 to GUILE-3.0. --- gnu/system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/system.scm') diff --git a/gnu/system.scm b/gnu/system.scm index 023007a0e6..77cc0076c1 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -594,7 +594,7 @@ of PROVENANCE-SERVICE-TYPE to its services." bash-completion - guile-2.2 + guile-3.0 guile-readline guile-colorized ;; The packages below are also in %FINAL-INPUTS, so take them from -- cgit v1.2.3