diff options
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/build-system/ant.scm | 2 | ||||
| -rw-r--r-- | guix/build-system/font.scm | 2 | ||||
| -rw-r--r-- | guix/download.scm | 2 | ||||
| -rw-r--r-- | guix/packages.scm | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm index 228b4e60d2..e0870a605c 100644 --- a/guix/build-system/ant.scm +++ b/guix/build-system/ant.scm @@ -58,7 +58,7 @@ (define (default-zip) "Return the default ZIP package." ;; Lazily resolve the binding to avoid a circular dependency. - (let ((zip-mod (resolve-interface '(gnu packages zip)))) + (let ((zip-mod (resolve-interface '(gnu packages compression)))) (module-ref zip-mod 'zip))) (define* (lower name diff --git a/guix/build-system/font.scm b/guix/build-system/font.scm index f448c302c2..d40a4985f8 100644 --- a/guix/build-system/font.scm +++ b/guix/build-system/font.scm @@ -56,13 +56,13 @@ '()) ,@inputs ,(list "tar" (module-ref (resolve-interface '(gnu packages base)) 'tar)) - ,(list "unzip" (module-ref (resolve-interface '(gnu packages zip)) 'unzip)) ,@(let ((compression (resolve-interface '(gnu packages compression)))) (map (match-lambda ((name package) (list name (module-ref compression package)))) `(("gzip" gzip) ("bzip2" bzip2) + ("unzip" unzip) ("xz" xz)))))) (build-inputs native-inputs) (outputs outputs) diff --git a/guix/download.scm b/guix/download.scm index bed1f502cf..c1da515477 100644 --- a/guix/download.scm +++ b/guix/download.scm @@ -528,7 +528,7 @@ own. This helper makes it easier to deal with \"zip bombs\"." (_ (basename url)))) (define unzip - (module-ref (resolve-interface '(gnu packages zip)) 'unzip)) + (module-ref (resolve-interface '(gnu packages compression)) 'unzip)) (mlet %store-monad ((drv (url-fetch url hash-algo hash (string-append "zipbomb-" diff --git a/guix/packages.scm b/guix/packages.scm index 76aa43e7d3..464fc433b2 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -401,7 +401,7 @@ object." ("bzip2" ,(ref '(gnu packages compression) 'bzip2)) ("gzip" ,(ref '(gnu packages compression) 'gzip)) ("lzip" ,(ref '(gnu packages compression) 'lzip)) - ("unzip" ,(ref '(gnu packages zip) 'unzip)) + ("unzip" ,(ref '(gnu packages compression) 'unzip)) ("patch" ,(ref '(gnu packages base) 'patch)) ("locales" ,(ref '(gnu packages base) 'glibc-utf8-locales))))) |