diff options
author | Ludovic Courtès <ludo@gnu.org> | 2017-01-11 11:55:51 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2017-01-11 11:58:21 +0100 |
commit | aa042770da2fe6411089a965ea8b2219a99d3448 (patch) | |
tree | ed07d30eb4b79e5f27b34e44b28b75aa0288532b /guix/scripts | |
parent | 69323016d31547356c7322682943b22af4df74ed (diff) | |
download | gnu-guix-aa042770da2fe6411089a965ea8b2219a99d3448.tar gnu-guix-aa042770da2fe6411089a965ea8b2219a99d3448.tar.gz |
guix package: Fix version and output for 'guix package -i /gnu/store/…'.
* guix/utils.scm (package-name->name+version): Add optional 'delimiter'
parameter.
* guix/scripts/package.scm (store-item->manifest-entry): Pass #\- as the
delimiter for 'package-name->name+version'. Use "out" instead of #f for
the 'output' field.
* tests/guix-package.sh: Add test.
Diffstat (limited to 'guix/scripts')
-rw-r--r-- | guix/scripts/package.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index 90e7fa2298..9e5b7f3c75 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2013, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2016 Alex Kost <alezost@gmail.com> @@ -577,11 +577,12 @@ upgrading, #f otherwise." (define (store-item->manifest-entry item) "Return a manifest entry for ITEM, a \"/gnu/store/...\" file name." (let-values (((name version) - (package-name->name+version (store-path-package-name item)))) + (package-name->name+version (store-path-package-name item) + #\-))) (manifest-entry (name name) (version version) - (output #f) + (output "out") ;XXX: wild guess (item item)))) (define (options->installable opts manifest transaction) |