diff options
author | Marius Bakke <marius@gnu.org> | 2021-08-12 00:30:27 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2021-08-12 00:30:27 +0200 |
commit | c4133c43c7cfe2476ebfae87f9e4d10d96de9bc7 (patch) | |
tree | 47bd773d2f434384b54e56916c1a287dd8e51511 /guix/scripts/import/elpa.scm | |
parent | ffa01e68859bb7a6daa9fcffdc8d77ca35db4bc0 (diff) | |
parent | 4eb0a5146ae5a195a29c79f586fcc1e58f7fa69b (diff) | |
download | guix-patches-c4133c43c7cfe2476ebfae87f9e4d10d96de9bc7.tar guix-patches-c4133c43c7cfe2476ebfae87f9e4d10d96de9bc7.tar.gz |
Merge branch 'master' into core-updates-frozen
Conflicts:
gnu/packages/algebra.scm
gnu/packages/games.scm
gnu/packages/golang.scm
gnu/packages/kerberos.scm
gnu/packages/mail.scm
gnu/packages/python.scm
gnu/packages/ruby.scm
gnu/packages/scheme.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
Diffstat (limited to 'guix/scripts/import/elpa.scm')
-rw-r--r-- | guix/scripts/import/elpa.scm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/guix/scripts/import/elpa.scm b/guix/scripts/import/elpa.scm index d6b38e5c4b..052b0cc0e7 100644 --- a/guix/scripts/import/elpa.scm +++ b/guix/scripts/import/elpa.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net> +;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev> ;;; ;;; This file is part of GNU Guix. ;;; @@ -80,12 +81,8 @@ Import the latest package named PACKAGE-NAME from an ELPA repository.\n")) (define (guix-import-elpa . args) (define (parse-options) ;; Return the alist of option values. - (args-fold* args %options - (lambda (opt name arg result) - (leave (G_ "~A: unrecognized option~%") name)) - (lambda (arg result) - (alist-cons 'argument arg result)) - %default-options)) + (parse-command-line args %options (list %default-options) + #:build-options? #f)) (let* ((opts (parse-options)) (args (filter-map (match-lambda |