summaryrefslogtreecommitdiff
path: root/tests/substitute.scm
diff options
context:
space:
mode:
authorMathieu Othacehe <othacehe@gnu.org>2020-07-27 16:36:39 +0200
committerMathieu Othacehe <othacehe@gnu.org>2020-08-24 13:35:24 +0200
commit4c0c65acfade63ce0549115d19db4b639c1e9992 (patch)
treea0ff270d0e480bb6b875413f8ca269f6d6d9568e /tests/substitute.scm
parent5abbf435fce8c2245175dcb9b62e5722cfaadc26 (diff)
Use "guile-zlib" and "guile-lzlib" instead of (guix config).
* Makefile.am (MODULES): Remove guix/zlib.scm and guix/lzlib.scm, (SCM_TESTS): remove tests/zlib.scm, tests/lzlib.scm. * build-aux/build-self.scm (make-config.scm): Remove unused %libz variable. * configure.ac: Remove LIBZ and LIBLZ variables and check instead for Guile-zlib and Guile-lzlib. * doc/guix.texi ("Requirements"): Remove zlib requirement and add Guile-zlib and Guile-lzlib instead. * gnu/packages/package-management.scm (guix)[native-inputs]: Add "guile-zlib" and "guile-lzlib", [inputs]: remove "zlib" and "lzlib", [propagated-inputs]: ditto, [arguments]: add "guile-zlib" and "guile-lzlib" to Guile load path. * guix/config.scm.in (%libz, %liblz): Remove them. * guix/lzlib.scm: Remove it. * guix/man-db.scm: Use (zlib) instead of (guix zlib). * guix/profiles.scm (manual-database): Do not stub (guix config) in imported modules list, instead add "guile-zlib" to the extension list. * guix/scripts/publish.scm: Use (zlib) instead of (guix zlib) and (lzlib) instead of (guix lzlib), (string->compression-type, effective-compression): do not check for zlib and lzlib availability. * guix/scripts/substitute.scm (%compression-methods): Do not check for lzlib availability. * guix/self.scm (specification->package): Add "guile-zlib" and "guile-lzlib" and remove "zlib" and "lzlib", (compiled-guix): remove "zlib" and "lzlib" arguments and add guile-zlib and guile-lzlib to the dependencies, also do not pass "zlib" and "lzlib" to "make-config.scm" procedure, (make-config.scm): remove "zlib" and "lzlib" arguments as well as %libz and %liblz variables. * guix/utils.scm (lzip-port): Use (lzlib) instead of (guix lzlib) and do not check for lzlib availability. * guix/zlib.scm: Remove it. * m4/guix.m4 (GUIX_LIBZ_LIBDIR, GUIX_LIBLZ_FILE_NAME): Remove them. * tests/lzlib.scm: Use (zlib) instead of (guix zlib) and (lzlib) instead of (guix lzlib), and do not check for zlib and lzlib availability. * tests/publish.scm: Ditto. * tests/substitute.scm: Do not check for lzlib availability. * tests/utils.scm: Ditto. * tests/zlib.scm: Remove it.
Diffstat (limited to 'tests/substitute.scm')
-rw-r--r--tests/substitute.scm4
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/substitute.scm b/tests/substitute.scm
index a4246aff824..6560612c403 100644
--- a/tests/substitute.scm
+++ b/tests/substitute.scm
@@ -29,7 +29,6 @@
29 #:use-module ((guix store) #:select (%store-prefix)) 29 #:use-module ((guix store) #:select (%store-prefix))
30 #:use-module ((guix ui) #:select (guix-warning-port)) 30 #:use-module ((guix ui) #:select (guix-warning-port))
31 #:use-module ((guix utils) #:select (call-with-compressed-output-port)) 31 #:use-module ((guix utils) #:select (call-with-compressed-output-port))
32 #:use-module ((guix lzlib) #:select (lzlib-available?))
33 #:use-module ((guix build utils) 32 #:use-module ((guix build utils)
34 #:select (mkdir-p delete-file-recursively dump-port)) 33 #:select (mkdir-p delete-file-recursively dump-port))
35 #:use-module (guix tests http) 34 #:use-module (guix tests http)
@@ -508,8 +507,7 @@ System: mips64el-linux\n")))
508 (let ((nar (string-append %main-substitute-directory 507 (let ((nar (string-append %main-substitute-directory
509 "/example.nar"))) 508 "/example.nar")))
510 (compress nar (string-append nar ".gz") 'gzip) 509 (compress nar (string-append nar ".gz") 'gzip)
511 (when (lzlib-available?) 510 (compress nar (string-append nar ".lz") 'lzip))
512 (compress nar (string-append nar ".lz") 'lzip)))
513 511
514 (parameterize ((substitute-urls 512 (parameterize ((substitute-urls
515 (list (string-append "file://" 513 (list (string-append "file://"