diff options
| author | Arun Isaac <arunisaac@systemreboot.net> | 2017-06-13 00:10:01 +0530 |
|---|---|---|
| committer | Arun Isaac <arunisaac@systemreboot.net> | 2017-06-20 18:10:35 +0530 |
| commit | 148585c240f848ad08f6541ede7db3fca3411007 (patch) | |
| tree | 888fb2606c8ef9c9b3371bc390704d185ed606d0 /guix/build-system | |
| parent | 2e701cd3841d4449b3963d4337c543be99ed7bcc (diff) | |
| download | gnu-guix-148585c240f848ad08f6541ede7db3fca3411007.tar gnu-guix-148585c240f848ad08f6541ede7db3fca3411007.tar.gz | |
gnu: Move contents of zip module into compression module.
* gnu/packages/zip.scm (zip, unzip, zziplib, perl-zip): Move to...
* gnu/packages/compression.scm: ...here.
* gnu/packages/zip.scm: Delete file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Unregister deleted file.
* po/packages/POTFILES.in: Unregister deleted file.
* gnu/packages/{audio, avr, bioinformatics, busybox, cdrom, ci, compression,
docbook, documentation, fonts, fpga, game-development, games, gl, gnome,
gnuzilla, graphics, guile, haskell, image, java, kodi, ldc, libreoffice,
markup, maths, mc, monitoring, music, php, pretty-print, python, scheme,
smalltalk, statistics, synergy, tex, textutils, video, web-browsers, xml,
zip}.scm, guix/build-system/{ant, font}.scm, guix/{download, packages}.scm:
Adapt module import.
Diffstat (limited to 'guix/build-system')
| -rw-r--r-- | guix/build-system/ant.scm | 2 | ||||
| -rw-r--r-- | guix/build-system/font.scm | 2 |
2 files changed, 2 insertions, 2 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) |