[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/09: self: Add dependency on lzlib.
From: |
guix-commits |
Subject: |
06/09: self: Add dependency on lzlib. |
Date: |
Mon, 27 May 2019 16:49:19 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 73ac9098b17e515ab1215c3ada2b3b0c9fb5b28c
Author: Ludovic Courtès <address@hidden>
Date: Fri May 24 10:28:34 2019 +0200
self: Add dependency on lzlib.
* guix/self.scm (compiled-guix): Pass #:lzlib to 'make-config.scm'.
(make-config.scm): Add #:lzlib and honor it.
(specification->package): Add "lzlib".
---
guix/self.scm | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/guix/self.scm b/guix/self.scm
index 8cc82de..b7d8f4e 100644
--- a/guix/self.scm
+++ b/guix/self.scm
@@ -57,6 +57,7 @@
("guile-gcrypt" (ref '(gnu packages gnupg) 'guile-gcrypt))
("gnutls" (ref '(gnu packages tls) 'gnutls))
("zlib" (ref '(gnu packages compression) 'zlib))
+ ("lzlib" (ref '(gnu packages compression) 'lzlib))
("gzip" (ref '(gnu packages compression) 'gzip))
("bzip2" (ref '(gnu packages compression) 'bzip2))
("xz" (ref '(gnu packages compression) 'xz))
@@ -660,6 +661,7 @@ Info manual."
(guile-version (effective-version))
(guile-for-build (default-guile))
(zlib (specification->package "zlib"))
+ (lzlib (specification->package "lzlib"))
(gzip (specification->package "gzip"))
(bzip2 (specification->package "bzip2"))
(xz (specification->package "xz"))
@@ -814,6 +816,7 @@ Info manual."
#:extra-modules
`(((guix config)
=> ,(make-config.scm #:zlib zlib
+ #:lzlib lzlib
#:gzip gzip
#:bzip2 bzip2
#:xz xz
@@ -911,7 +914,7 @@ Info manual."
(variables rest ...))))))
(variables %localstatedir %storedir %sysconfdir)))
-(define* (make-config.scm #:key zlib gzip xz bzip2
+(define* (make-config.scm #:key zlib lzlib gzip xz bzip2
(package-name "GNU Guix")
(package-version "0")
(bug-report-address "address@hidden")
@@ -933,7 +936,7 @@ Info manual."
%store-database-directory
%config-directory
%libz
- ;; TODO: %liblz
+ %liblz
%gzip
%bzip2
%xz))
@@ -980,7 +983,11 @@ Info manual."
(define %libz
#+(and zlib
- (file-append zlib "/lib/libz"))))
+ (file-append zlib "/lib/libz")))
+
+ (define %liblz
+ #+(and lzlib
+ (file-append lzlib "/lib/liblz"))))
;; Guile 2.0 *requires* the 'define-module' to be at the
;; top-level or the 'toplevel-ref' in the resulting .go file are
- branch master updated (8916034 -> 35d1354), guix-commits, 2019/05/27
- 01/09: lzlib: Adjust 'lz-compress-read' docstring., guix-commits, 2019/05/27
- 04/09: utils: Support compression and decompression with lzip., guix-commits, 2019/05/27
- 03/09: utils: Test 'compressed-port' and 'decompressed-port' for both gzip and xz., guix-commits, 2019/05/27
- 02/09: lzlib: Add 'make-lzip-input-port/compressed'., guix-commits, 2019/05/27
- 06/09: self: Add dependency on lzlib.,
guix-commits <=
- 08/09: lzlib: 'lzread!' never returns more than it was asked for., guix-commits, 2019/05/27
- 07/09: gnu: guix: Add dependency on lzlib., guix-commits, 2019/05/27
- 09/09: publish: Display the compression method and level in use., guix-commits, 2019/05/27
- 05/09: publish: Add support for lzip., guix-commits, 2019/05/27