mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 15:36:20 -05:00
gnu: Fix packages that were importing Guile modules from the host.
Those packages were importing (ice-9 match) & co. from the host Guile, which could potentially lead to different derivations depending on the Guile in use. Uncovered by the warning emitted by 'gexp-modules'. * gnu/packages/admin.scm (inxi-minimal)[arguments]: Remove Guile modules from #:modules. * gnu/packages/dns.scm (ddclient)[arguments]: Likewise. * gnu/packages/tex.scm (texlive-latex-koma-script)[arguments]: Likewise. * gnu/packages/java.scm (openjdk11)[arguments]: Likewise for #:imported-modules.
This commit is contained in:
parent
2743a0b28d
commit
77eaf5fcd1
4 changed files with 5 additions and 14 deletions
|
@ -3761,10 +3761,7 @@ (define-public inxi-minimal
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("gzip" ,gzip)))
|
`(("gzip" ,gzip)))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:modules
|
`(#:modules ((guix build utils))
|
||||||
((guix build utils)
|
|
||||||
(ice-9 match)
|
|
||||||
(srfi srfi-26))
|
|
||||||
#:builder
|
#:builder
|
||||||
(begin
|
(begin
|
||||||
(use-modules (guix build utils)
|
(use-modules (guix build utils)
|
||||||
|
|
|
@ -1050,9 +1050,7 @@ (define-public ddclient
|
||||||
("perl-digest-sha1" ,perl-digest-sha1)
|
("perl-digest-sha1" ,perl-digest-sha1)
|
||||||
("perl-io-socket-ssl" ,perl-io-socket-ssl)))
|
("perl-io-socket-ssl" ,perl-io-socket-ssl)))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:modules ((guix build utils)
|
`(#:modules ((guix build utils))
|
||||||
(ice-9 match)
|
|
||||||
(srfi srfi-26))
|
|
||||||
#:builder
|
#:builder
|
||||||
(begin
|
(begin
|
||||||
(use-modules (guix build utils)
|
(use-modules (guix build utils)
|
||||||
|
|
|
@ -2107,11 +2107,8 @@ (define-public openjdk11
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(outputs '("out" "jdk" "doc"))
|
(outputs '("out" "jdk" "doc"))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:imported-modules
|
`(#:imported-modules ((guix build syscalls)
|
||||||
((guix build syscalls)
|
,@%gnu-build-system-modules)
|
||||||
(ice-9 binary-ports)
|
|
||||||
(rnrs bytevectors)
|
|
||||||
,@%gnu-build-system-modules)
|
|
||||||
#:tests? #f; requires jtreg
|
#:tests? #f; requires jtreg
|
||||||
;; TODO package jtreg
|
;; TODO package jtreg
|
||||||
#:configure-flags
|
#:configure-flags
|
||||||
|
|
|
@ -6752,8 +6752,7 @@ (define-public texlive-latex-koma-script
|
||||||
"1vz9zg7s5w52xr323zgglzprfrvba2zvyzf6b8vrdf4wdghlpv4z"))))
|
"1vz9zg7s5w52xr323zgglzprfrvba2zvyzf6b8vrdf4wdghlpv4z"))))
|
||||||
(build-system trivial-build-system)
|
(build-system trivial-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:modules ((guix build utils)
|
`(#:modules ((guix build utils))
|
||||||
(ice-9 match))
|
|
||||||
#:builder
|
#:builder
|
||||||
(begin
|
(begin
|
||||||
(use-modules (guix build utils)
|
(use-modules (guix build utils)
|
||||||
|
|
Loading…
Reference in a new issue