nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pack: Add "none" compressor. 

* guix/scripts/pack.scm (%compressors): Add compressor "none"; prepend
extension with ".".
(self-contained-tarball, docker-image): Assume compressor extensions start
with period.
* doc/guix.texi (Invoking guix pack): Document it.
This commit is contained in:
Ricardo Wurmus 2017-08-19 17:56:28 +02:00
parent 2905926285
commit af735661f3
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/guix.texi
View File

@ -2630,7 +2630,7 @@ configuration triplets,, autoconf, Autoconf}).
@item --compression=@var{tool} @item --compression=@var{tool}
@itemx -C @var{tool} @itemx -C @var{tool}
Compress the resulting tarball using @var{tool}---one of @code{gzip}, Compress the resulting tarball using @var{tool}---one of @code{gzip},
@code{bzip2}, @code{xz}, or @code{lzip}. @code{bzip2}, @code{xz}, @code{lzip}, or @code{none} for no compression.
@item --symlink=@var{spec} @item --symlink=@var{spec}
@itemx -S @var{spec} @itemx -S @var{spec}

18
guix/scripts/pack.scm
View File

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -50,19 +51,20 @@
(compressor name extension command) (compressor name extension command)
compressor? compressor?
(name compressor-name) ;string (e.g., "gzip") (name compressor-name) ;string (e.g., "gzip")
(extension compressor-extension) ;string (e.g., "lz") (extension compressor-extension) ;string (e.g., ".lz")
(command compressor-command)) ;gexp (e.g., #~("/gnu/store/…/gzip" "-9n")) (command compressor-command)) ;gexp (e.g., #~("/gnu/store/…/gzip" "-9n"))
(define %compressors (define %compressors
;; Available compression tools. ;; Available compression tools.
(list (compressor "gzip" "gz" (list (compressor "gzip" ".gz"
#~(#+(file-append gzip "/bin/gzip") "-9n")) #~(#+(file-append gzip "/bin/gzip") "-9n"))
(compressor "lzip" "lz" (compressor "lzip" ".lz"
#~(#+(file-append lzip "/bin/lzip") "-9")) #~(#+(file-append lzip "/bin/lzip") "-9"))
(compressor "xz" "xz" (compressor "xz" ".xz"
#~(#+(file-append xz "/bin/xz") "-e -T0")) #~(#+(file-append xz "/bin/xz") "-e -T0"))
(compressor "bzip2" "bz2" (compressor "bzip2" ".bz2"
#~(#+(file-append bzip2 "/bin/bzip2") "-9")))) #~(#+(file-append bzip2 "/bin/bzip2") "-9"))
(compressor "none" "" #f)))
(define (lookup-compressor name) (define (lookup-compressor name)
"Return the compressor object called NAME. Error out if it could not be "Return the compressor object called NAME. Error out if it could not be
@ -180,7 +182,7 @@ added to the pack."
(_ #f)) (_ #f))
directives))))))))) directives)))))))))
(gexp->derivation (string-append name ".tar." (gexp->derivation (string-append name ".tar"
(compressor-extension compressor)) (compressor-extension compressor))
build build
#:references-graphs `(("profile" ,profile)))) #:references-graphs `(("profile" ,profile))))
@ -245,7 +247,7 @@ the image."
#:compressor '#$(compressor-command compressor) #:compressor '#$(compressor-command compressor)
#:creation-time (make-time time-utc 0 1))))) #:creation-time (make-time time-utc 0 1)))))
(gexp->derivation (string-append name ".tar." (gexp->derivation (string-append name ".tar"
(compressor-extension compressor)) (compressor-extension compressor))
build build
#:references-graphs `(("profile" ,profile)))) #:references-graphs `(("profile" ,profile))))