diff options
| author | Mathieu Lirzin <mthl@gnu.org> | 2016-02-28 23:11:36 +0100 |
|---|---|---|
| committer | Mathieu Lirzin <mthl@gnu.org> | 2016-03-02 21:41:41 +0100 |
| commit | 1b846da8c372bee78851439fd9e72b2499115e5a (patch) | |
| tree | 64702b006ce99e7bfd95538152218a63decf3152 /tests/guix-package.sh | |
| parent | fad155d47ea22c7ffd042ffddd03b0a6babd3b65 (diff) | |
| download | guix-1b846da8c372bee78851439fd9e72b2499115e5a.tar guix-1b846da8c372bee78851439fd9e72b2499115e5a.tar.gz | |
utils: Use '@' for separating package names and version numbers.
This provides the ability to use numbers in package names.
Fixes <http://bugs.gnu.org/19219>.
* guix/utils.scm (package-name->name+version): New procedure.
* gnu/packages.scm (%find-package): Add a FALLBACK? keyword argument.
Use the previous method when no package is found.
(specification->package+output, specification->package): Adapt
documentation to new syntax.
* doc/guix.texi (Invoking guix package, Invoking guix import): Likewise.
* guix/ui.scm (package-specification->name+version+output): Likewise.
* guix/scripts/import/hackage.scm (show-help): Likewise.
* tests/guix-build.sh: Adapt to new syntax.
* tests/guix-lint.sh: Likewise.
* tests/guix-package.sh: Likewise.
* tests/ui.scm ("package-specification->name+version+output"): Likewise.
* tests/utils.scm ("package-name->name+version"): Likewise.
* NEWS: Mention new syntax.
Diffstat (limited to 'tests/guix-package.sh')
| -rw-r--r-- | tests/guix-package.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/guix-package.sh b/tests/guix-package.sh index d75008448b..28c34dbc6a 100644 --- a/tests/guix-package.sh +++ b/tests/guix-package.sh @@ -207,13 +207,13 @@ cat > "$module_dir/foo.scm"<<EOF EOF guix package -A emacs-foo-bar -L "$module_dir" | grep 42 -guix package -i emacs-foo-bar-42 -n -L "$module_dir" +guix package -i emacs-foo-bar@42 -n -L "$module_dir" # Same thing using the 'GUIX_PACKAGE_PATH' environment variable. GUIX_PACKAGE_PATH="$module_dir" export GUIX_PACKAGE_PATH guix package -A emacs-foo-bar | grep 42 -guix package -i emacs-foo-bar-42 -n +guix package -i emacs-foo-bar@42 -n # Make sure patches that live under $GUIX_PACKAGE_PATH are found. cat > "$module_dir/emacs.patch"<<EOF |