aboutsummaryrefslogtreecommitdiff
path: root/guix/scripts/import
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-09-20 17:51:39 +0900
committerLudovic Courtès <ludo@gnu.org>2016-09-20 23:22:42 +0900
commite465d9e19087ab150f7e31f21c09e4a147b93b36 (patch)
tree83562de5353e39d27afb7270b560428f5285a666 /guix/scripts/import
parent232ccbefc05aa7fbd3ea8b8f71a65bafc178a28a (diff)
downloadgnu-guix-e465d9e19087ab150f7e31f21c09e4a147b93b36.tar
gnu-guix-e465d9e19087ab150f7e31f21c09e4a147b93b36.tar.gz
ui: Do not shadow '_' where it's used as a literal syntax match.
Fixes compilation with Guile 2.1. Reported by Mu Lei. * guix/ui.scm (report-load-error) (warn-about-load-error, read/eval-package-expression): Use 'rest' instead of '_' as the pattern variable name. * gnu/packages.scm (%find-package): Likewise. * guix/scripts/build.scm (transform-package-inputs): Likewise. * guix/scripts/hash.scm (guix-hash): Likewise. * guix/scripts/import/gnu.scm (%options, guix-import-gnu): Likewise. * guix/scripts/import/nix.scm (guix-import-nix): Likewise. * guix/scripts/offload.scm (build-machines): Likewise. * guix/scripts/refresh.scm (%options): Likewise. * guix/scripts/substitute.scm (narinfo-signature->canonical-sexp): Likewise.
Diffstat (limited to 'guix/scripts/import')
-rw-r--r--guix/scripts/import/gnu.scm6
-rw-r--r--guix/scripts/import/nix.scm4
2 files changed, 5 insertions, 5 deletions
diff --git a/guix/scripts/import/gnu.scm b/guix/scripts/import/gnu.scm
index 92bd8305ea..66861f5837 100644
--- a/guix/scripts/import/gnu.scm
+++ b/guix/scripts/import/gnu.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2016 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -68,7 +68,7 @@ Return a package declaration template for PACKAGE, a GNU package.\n"))
((or "interactive" "always" "never")
(alist-cons 'key-download (string->symbol arg)
result))
- (_
+ (x
(leave (_ "unsupported policy: ~a~%")
arg)))))
%standard-import-options))
@@ -99,7 +99,7 @@ Return a package declaration template for PACKAGE, a GNU package.\n"))
(with-error-handling
(gnu->guix-package name
#:key-download (assoc-ref opts 'key-download))))
- (_
+ (x
(leave (_ "wrong number of arguments~%"))))))
;;; gnu.scm ends here
diff --git a/guix/scripts/import/nix.scm b/guix/scripts/import/nix.scm
index dba053b313..05e6e4b85d 100644
--- a/guix/scripts/import/nix.scm
+++ b/guix/scripts/import/nix.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 David Thompson <davet@gnu.org>
;;;
;;; This file is part of GNU Guix.
@@ -86,5 +86,5 @@ Import and convert the Nix expression ATTRIBUTE of NIXPKGS.\n"))
(format #t ";; converted from ~a:~a~%~%"
(location-file loc) (location-line loc))
expr))
- (_
+ (x
(leave (_ "wrong number of arguments~%"))))))