aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2021-04-01 22:17:02 +0200
committerLudovic Courtès <ludo@gnu.org>2021-04-01 22:32:28 +0200
commit77eaf5fcd1e9d64c52f6d42d44a5d1ea72344d4e (patch)
treebc7268496b6bb6af8888739588fdf078e00dc68c
parent2743a0b28dc55837f118b87cc04aa2baf1386faf (diff)
downloadguix-77eaf5fcd1e9d64c52f6d42d44a5d1ea72344d4e.tar
guix-77eaf5fcd1e9d64c52f6d42d44a5d1ea72344d4e.tar.gz
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.
-rw-r--r--gnu/packages/admin.scm5
-rw-r--r--gnu/packages/dns.scm4
-rw-r--r--gnu/packages/java.scm7
-rw-r--r--gnu/packages/tex.scm3
4 files changed, 5 insertions, 14 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 292a4bc2a2..d5b4d34323 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -3761,10 +3761,7 @@ Python loading in HPC environments.")
(native-inputs
`(("gzip" ,gzip)))
(arguments
- `(#:modules
- ((guix build utils)
- (ice-9 match)
- (srfi srfi-26))
+ `(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils)
diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index 37f8c3a6be..6d146e6264 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -1050,9 +1050,7 @@ LuaJIT, both a resolver library and a daemon.")
("perl-digest-sha1" ,perl-digest-sha1)
("perl-io-socket-ssl" ,perl-io-socket-ssl)))
(arguments
- `(#:modules ((guix build utils)
- (ice-9 match)
- (srfi srfi-26))
+ `(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 37716e01d5..207f136513 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2107,11 +2107,8 @@ new Date();"))
(build-system gnu-build-system)
(outputs '("out" "jdk" "doc"))
(arguments
- `(#:imported-modules
- ((guix build syscalls)
- (ice-9 binary-ports)
- (rnrs bytevectors)
- ,@%gnu-build-system-modules)
+ `(#:imported-modules ((guix build syscalls)
+ ,@%gnu-build-system-modules)
#:tests? #f; requires jtreg
;; TODO package jtreg
#:configure-flags
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d45fe3045b..ec21221ea1 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6752,8 +6752,7 @@ produce either PostScript or PDF output.")
"1vz9zg7s5w52xr323zgglzprfrvba2zvyzf6b8vrdf4wdghlpv4z"))))
(build-system trivial-build-system)
(arguments
- `(#:modules ((guix build utils)
- (ice-9 match))
+ `(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils)