summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMathieu Lirzin <mthl@gnu.org>2016-02-28 23:11:36 +0100
committerMathieu Lirzin <mthl@gnu.org>2016-03-02 21:41:41 +0100
commit1b846da8c372bee78851439fd9e72b2499115e5a (patch)
tree64702b006ce99e7bfd95538152218a63decf3152 /tests
parentfad155d47ea22c7ffd042ffddd03b0a6babd3b65 (diff)
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')
-rw-r--r--tests/guix-build.sh4
-rw-r--r--tests/guix-lint.sh2
-rw-r--r--tests/guix-package.sh4
-rw-r--r--tests/ui.scm6
-rw-r--r--tests/utils.scm5
5 files changed, 11 insertions, 10 deletions
diff --git a/tests/guix-build.sh b/tests/guix-build.sh
index 778911b2f8..5821e509af 100644
--- a/tests/guix-build.sh
+++ b/tests/guix-build.sh
@@ -161,8 +161,8 @@ then false; else true; fi
# Parsing package names and versions.
guix build -n time # PASS
-guix build -n time-1.7 # PASS, version found
-if guix build -n time-3.2; # FAIL, version not found
+guix build -n time@1.7 # PASS, version found
+if guix build -n time@3.2; # FAIL, version not found
then false; else true; fi
if guix build -n something-that-will-never-exist; # FAIL
then false; else true; fi
diff --git a/tests/guix-lint.sh b/tests/guix-lint.sh
index 5015b5cfb5..c105521ec7 100644
--- a/tests/guix-lint.sh
+++ b/tests/guix-lint.sh
@@ -75,4 +75,4 @@ if guix lint -c synopsis,invalid-checker dummy 2>&1 | \
then true; else false; fi
# Make sure specifying multiple packages works.
-guix lint -c inputs-should-be-native dummy dummy-42 dummy
+guix lint -c inputs-should-be-native dummy dummy@42 dummy
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
diff --git a/tests/ui.scm b/tests/ui.scm
index bd4c907525..f28e623ccf 100644
--- a/tests/ui.scm
+++ b/tests/ui.scm
@@ -108,10 +108,10 @@ Second line" 24))
(package-specification->name+version+output spec))
list))
'("guile"
- "guile-2.0.9"
+ "guile@2.0.9"
"guile:debug"
- "guile-2.0.9:debug"
- "guile-cairo-1.4.1")))
+ "guile@2.0.9:debug"
+ "guile-cairo@1.4.1")))
(test-equal "integer"
'(1)
diff --git a/tests/utils.scm b/tests/utils.scm
index a05faabc15..67b3724451 100644
--- a/tests/utils.scm
+++ b/tests/utils.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -59,14 +60,14 @@
((name version)
(let*-values (((full-name)
(if version
- (string-append name "-" version)
+ (string-append name "@" version)
name))
((name* version*)
(package-name->name+version full-name)))
(and (equal? name* name)
(equal? version* version)))))
'(("foo" "0.9.1b")
- ("foo-bar" "1.0")
+ ("foo-14-bar" "320")
("foo-bar2" #f)
("guile" "2.0.6.65-134c9") ; as produced by `git-version-gen'
("nixpkgs" "1.0pre22125_a28fe19")