me/guix
Archived
1
0
Fork 0
Code Activity

system: Stop using canonical-package.

Browse source 
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 (<nscd-cache>): 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.
This commit is contained in:
Mathieu Othacehe 2019-12-31 09:56:51 +01:00
parent 7bfb7a5964
commit dfc8ccbf5d
No known key found for this signature in database
GPG key ID: 8354763531769CA6
6 changed files with 23 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnu/installer.scm
View file

@ -291,18 +291,18 @@ selected keymap."
(define set-installer-path (define set-installer-path
;; Add the specified binary to PATH for later use by the installer. ;; Add the specified binary to PATH for later use by the installer.
#~(let* ((inputs #~(let* ((inputs
'#$(append (list bash ;start subshells '#$(list bash ;start subshells
connman ;call connmanctl connman ;call connmanctl
cryptsetup cryptsetup
dosfstools ;mkfs.fat dosfstools ;mkfs.fat
e2fsprogs ;mkfs.ext4 e2fsprogs ;mkfs.ext4
btrfs-progs ;mkfs.btrfs btrfs-progs
jfsutils ;jfs_mkfs jfsutils ;jfs_mkfs
kbd ;chvt kbd ;chvt
guix ;guix system init call guix ;guix system init call
util-linux ;mkwap util-linux ;mkwap
shadow) shadow
(map canonical-package (list coreutils))))) coreutils)))
(with-output-to-port (%make-void-port "w") (with-output-to-port (%make-void-port "w")
(lambda () (lambda ()
(set-path-environment-variable "PATH" '("bin" "sbin") inputs))))) (set-path-environment-variable "PATH" '("bin" "sbin") inputs)))))

10
gnu/services/base.scm
View file

@ -45,7 +45,7 @@
#:select (alsa-utils crda eudev e2fsprogs fuse gpm kbd lvm2 rng-tools)) #:select (alsa-utils crda eudev e2fsprogs fuse gpm kbd lvm2 rng-tools))
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module ((gnu packages base) #:use-module ((gnu packages base)
#:select (canonical-package coreutils glibc glibc-utf8-locales)) #:select (coreutils glibc glibc-utf8-locales))
#:use-module (gnu packages package-management) #:use-module (gnu packages package-management)
#:use-module ((gnu packages gnupg) #:select (guile-gcrypt)) #:use-module ((gnu packages gnupg) #:select (guile-gcrypt))
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
@ -1212,7 +1212,7 @@ the tty to run, among other things."
(name-services nscd-configuration-name-services ;list of <packages> (name-services nscd-configuration-name-services ;list of <packages>
(default '())) (default '()))
(glibc nscd-configuration-glibc ;<package> (glibc nscd-configuration-glibc ;<package>
(default (canonical-package glibc)))) (default glibc)))
(define-record-type* <nscd-cache> nscd-cache make-nscd-cache (define-record-type* <nscd-cache> nscd-cache make-nscd-cache
nscd-cache? nscd-cache?
@ -2445,9 +2445,7 @@ to handle."
(rules (list lvm2 fuse alsa-utils crda)))) (rules (list lvm2 fuse alsa-utils crda))))
(service special-files-service-type (service special-files-service-type
`(("/bin/sh" ,(file-append (canonical-package bash) `(("/bin/sh" ,(file-append bash "/bin/sh"))
"/bin/sh")) ("/usr/bin/env" ,(file-append coreutils "/bin/env"))))))
("/usr/bin/env" ,(file-append (canonical-package coreutils)
"/bin/env"))))))
;;; base.scm ends here ;;; base.scm ends here

2
gnu/services/xorg.scm
View file

@ -29,7 +29,7 @@
#:use-module (gnu system keyboard) #:use-module (gnu system keyboard)
#:use-module (gnu services base) #:use-module (gnu services base)
#:use-module (gnu services dbus) #:use-module (gnu services dbus)
#:use-module ((gnu packages base) #:select (canonical-package)) #:use-module (gnu packages base)
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (gnu packages fonts) #:use-module (gnu packages fonts)

7
gnu/system.scm
View file

@ -590,18 +590,13 @@ of PROVENANCE-SERVICE-TYPE to its services."
bash-completion 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-2.2
guile-readline guile-colorized 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.
(map canonical-package
(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 %default-issue (define %default-issue
;; Default contents for /etc/issue. ;; Default contents for /etc/issue.

7
gnu/system/install.scm
View file

@ -384,8 +384,7 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m
;; Having /bin/sh is a good idea. In particular it allows Tramp ;; Having /bin/sh is a good idea. In particular it allows Tramp
;; connections to this system to work. ;; connections to this system to work.
(service special-files-service-type (service special-files-service-type
`(("/bin/sh" ,(file-append (canonical-package bash) `(("/bin/sh" ,(file-append bash "/bin/sh"))))
"/bin/sh"))))
;; Loopback device, needed by OpenSSH notably. ;; Loopback device, needed by OpenSSH notably.
(service static-networking-service-type (service static-networking-service-type
@ -408,7 +407,7 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m
(list bare-bones-os (list bare-bones-os
glibc-utf8-locales glibc-utf8-locales
texinfo texinfo
(canonical-package guile-2.2)))))) guile-2.2)))))
(define %issue (define %issue
;; Greeting. ;; Greeting.
@ -480,7 +479,7 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m
;; Explicitly allow for empty passwords. ;; Explicitly allow for empty passwords.
(base-pam-services #:allow-empty-passwords? #t)) (base-pam-services #:allow-empty-passwords? #t))
(packages (cons* (canonical-package glibc) ;for 'tzselect' & co. (packages (cons* glibc ;for 'tzselect' & co.
parted gptfdisk ddrescue parted gptfdisk ddrescue
fontconfig fontconfig
font-dejavu font-gnu-unifont font-dejavu font-gnu-unifont

2
gnu/system/locale.scm
View file

@ -86,7 +86,7 @@ or #f on failure."
#f))) #f)))
(define* (single-locale-directory locales (define* (single-locale-directory locales
#:key (libc (canonical-package glibc))) #:key (libc glibc))
"Return a directory containing all of LOCALES for LIBC compiled. "Return a directory containing all of LOCALES for LIBC compiled.
Because locale data formats are incompatible when switching from one libc to Because locale data formats are incompatible when switching from one libc to