aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Patterson <ajpatter@uwaterloo.ca>2018-10-02 04:57:31 -0400
committerLudovic Courtès <ludo@gnu.org>2018-10-02 14:53:39 +0200
commita7b751965f8420c871ae24aee25f1eb7a217e608 (patch)
treebb076afd4b56fec8e4be85e9c1943966da01c4ce
parent1df4abc7dcf03f0655fc2fa26de7a6c91bac8b4e (diff)
downloadguix-a7b751965f8420c871ae24aee25f1eb7a217e608.tar
guix-a7b751965f8420c871ae24aee25f1eb7a217e608.tar.gz
build-system/asdf: Properly handle dependency specification casing.
* guix/build/lisp-utils.scm (normalize-dependency): Modify match clauses to match the upper-case symbols that lisp produces. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--guix/build/lisp-utils.scm7
1 files changed, 4 insertions, 3 deletions
diff --git a/guix/build/lisp-utils.scm b/guix/build/lisp-utils.scm
index 6470cfec97..97bc6197a3 100644
--- a/guix/build/lisp-utils.scm
+++ b/guix/build/lisp-utils.scm
@@ -84,11 +84,12 @@
(define (normalize-dependency dependency)
"Normalize the name of DEPENDENCY. Handles dependency definitions of the
dependency-def form described by
-<https://common-lisp.net/project/asdf/asdf.html#The-defsystem-grammar>."
+<https://common-lisp.net/project/asdf/asdf.html#The-defsystem-grammar>.
+Assume that any symbols in DEPENDENCY will be in upper-case."
(match dependency
- ((':version name rest ...)
+ ((':VERSION name rest ...)
`(:version ,(normalize-string name) ,@rest))
- ((':feature feature-specification dependency-specification)
+ ((':FEATURE feature-specification dependency-specification)
`(:feature
,feature-specification
,(normalize-dependency dependency-specification)))