diff options
author | Ludovic Courtès <ludo@gnu.org> | 2016-03-23 22:32:44 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2016-03-23 23:43:50 +0100 |
commit | 9a2a20052a1a9c384a1b877d7c71d2d239f9467e (patch) | |
tree | e63fda1b5dac94a569372d67b0a9ed986f9959c0 /guix/scripts/build.scm | |
parent | 7b150a24feb96bb803d4caf50846c6ac8b2c4ad0 (diff) | |
download | gnu-guix-9a2a20052a1a9c384a1b877d7c71d2d239f9467e.tar gnu-guix-9a2a20052a1a9c384a1b877d7c71d2d239f9467e.tar.gz |
guix build: '--with-source' correctly matches versioned file names.
* guix/scripts/build.scm: Use the right 'package-name->name+version'
procedure. Fixes a regression introduced in
1b846da8c372bee78851439fd9e72b2499115e5a.
* tests/scripts-build.scm ("options->transformation, with-source, with
version"): New test.
Diffstat (limited to 'guix/scripts/build.scm')
-rw-r--r-- | guix/scripts/build.scm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index b25bf50d2b..9a6b427fc5 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -24,7 +24,11 @@ #:use-module (guix derivations) #:use-module (guix packages) #:use-module (guix grafts) - #:use-module (guix utils) + + ;; Use the procedure that destructures "NAME-VERSION" forms. + #:use-module ((guix utils) #:hide (package-name->name+version)) + #:use-module ((guix build utils) #:select (package-name->name+version)) + #:use-module (guix monads) #:use-module (guix gexp) #:autoload (guix http-client) (http-fetch http-get-error?) |