amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-systems/gnu: Allow unpacking/repacking more kind of files.

Browse source 
Before this change, only plain directories, tar or zip archives were supported
as the source of a package for the GNU build system; anything else would cause
the unpack phase to fail.  Origins relying on snippets would suffer from the
same problem.

This change adds the support to use files of the following extensions: .gz,
.Z, .bz2, .lz, and .xz, even when they are not tarballs.  Files of unknown
extensions are treated as uncompressed files and supported as well.

* guix/packages.scm (patch-and-repack): Only add the compressor utility to the
PATH when the file is compressed.  Bind more inputs in the mlet, and use them
for decompressing single files.  Adjust the decompression and compression
routines.
[decompression-type]: Remove nested variable.
* guix/build/utils.scm (compressor, tarball?): New procedures.  Move
%xz-parallel-args to the new 'compression helpers' section.
* tests/packages.scm: Add tests.  Add missing copyright year for Jan.
* guix/build/gnu-build-system.scm (first-subdirectory): Return #f when no
sub-directory was found.
(unpack): Support more file types, including uncompressed plain files.
This commit is contained in:
Maxim Cournoyer 2021-01-18 11:51:21 -05:00
parent 47a6a938c3
commit cfcead2e51
No known key found for this signature in database
GPG key ID: 1260E46482E63562
6 changed files with 256 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

43
guix/tests.scm
View file

@ -20,12 +20,13 @@
#:use-module ((guix config) #:select (%storedir %localstatedir))
#:use-module (guix store)
#:use-module (guix derivations)
#:use-module (guix gexp)
#:use-module (guix packages)
#:use-module (guix base32)
#:use-module (guix serialization)
#:use-module (guix monads)
#:use-module ((guix utils) #:select (substitute-keyword-arguments))
#:use-module ((guix build utils) #:select (mkdir-p))
#:use-module ((guix build utils) #:select (mkdir-p compressor))
#:use-module ((gcrypt hash) #:hide (sha256))
#:use-module (guix build-system gnu)
#:use-module (gnu packages base)
@ -60,7 +61,9 @@
dummy-package
dummy-origin
gnu-make-for-tests))
gnu-make-for-tests
test-file))
;;; Commentary:
;;;
@ -435,6 +438,42 @@ default values, and with EXTRA-FIELDS set as specified."
(native-inputs '()) ;no need for 'pkg-config'
(inputs %bootstrap-inputs-for-tests))))
;;;
;;; Test utility procedures.
(define (test-file store name content)
"Create a simple file in STORE with CONTENT (a string), compressed according
to its file name extension. Return both its file name and its hash."
(let* ((ext (string-index-right name #\.))
(name-sans-ext (if ext
(string-take name (string-index-right name #\.))
name))
(comp (compressor name))
(command #~(if #+comp
(string-append #+%bootstrap-coreutils&co
"/bin/" #+comp)
#f))
(f (with-imported-modules '((guix build utils))
(computed-file name
#~(begin
(use-modules (guix build utils)
(rnrs io simple))
(with-output-to-file #+name-sans-ext
(lambda _
(format #t #+content)))
(when #+command
(invoke #+command #+name-sans-ext))
(copy-file #+name #$output)))))
(file-drv (run-with-store store (lower-object f)))
(file (derivation->output-path file-drv))
(file-drv-outputs (derivation-outputs file-drv))
(_ (build-derivations store (list file-drv)))
(file-hash (derivation-output-hash
(assoc-ref file-drv-outputs "out"))))
(values file file-hash)))
;;;
;; Local Variables:
;; eval: (put 'call-with-derivation-narinfo 'scheme-indent-function 1)
;; eval: (put 'call-with-derivation-substitute 'scheme-indent-function 2)