diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-05-01 15:45:41 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-05-01 17:27:54 +0200 |
| commit | e30c2be10da8929e42aafc7770257e84de49ffbb (patch) | |
| tree | b231b51f23698b095a096a52614ae179162591c5 /gnu/packages.scm | |
| parent | 6d1a5e5ffdbb7d15ffad7918213d96ee8c6e9164 (diff) | |
| download | guix-e30c2be10da8929e42aafc7770257e84de49ffbb.tar guix-e30c2be10da8929e42aafc7770257e84de49ffbb.tar.gz | |
packages: Remove support for PACKAGE-VERSION deprecated syntax.
This syntax had been deprecated since 2016-02-28.
* gnu/packages.scm (%find-package): Remove #:fallback? parameter and handling.
* tests/guix-build.sh: Remove test for "time-1.7" syntax.
* doc/guix.texi (Invoking guix lint): Update 'guix lint' output in example.
Diffstat (limited to 'gnu/packages.scm')
| -rw-r--r-- | gnu/packages.scm | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/gnu/packages.scm b/gnu/packages.scm index 92bab7228a..bec8163b2b 100644 --- a/gnu/packages.scm +++ b/gnu/packages.scm @@ -306,7 +306,7 @@ return its return value." ;;; Package specification. ;;; -(define* (%find-package spec name version #:key fallback?) +(define* (%find-package spec name version) (match (find-best-packages-by-name name version) ((pkg . pkg*) (unless (null? pkg*) @@ -314,10 +314,6 @@ return its return value." (warning (_ "choosing ~a@~a from ~a~%") (package-name pkg) (package-version pkg) (location->string (package-location pkg)))) - (when fallback? - (warning (_ "deprecated NAME-VERSION syntax; \ -use NAME@VERSION instead~%"))) - (match (package-superseded pkg) ((? package? new) (info (_ "package '~a' has been superseded by '~a'~%") @@ -328,16 +324,7 @@ use NAME@VERSION instead~%"))) (x (if version (leave (_ "~A: package not found for version ~a~%") name version) - (if (not fallback?) - ;; XXX: Fallback to the older specification style with an hyphen - ;; between NAME and VERSION, for backward compatibility. - (call-with-values - (lambda () - (hyphen-separated-name->name+version name)) - (cut %find-package spec <> <> #:fallback? #t)) - - ;; The fallback case didn't find anything either, so bail out. - (leave (_ "~A: unknown package~%") name)))))) + (leave (_ "~A: unknown package~%") name))))) (define (specification->package spec) "Return a package matching SPEC. SPEC may be a package name, or a package |