diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2020-02-17 12:03:09 +0200 |
|---|---|---|
| committer | Guix Patches Tester <> | 2020-02-17 10:05:06 +0000 |
| commit | db7d225f04e53db2ca2c8a7fc441bf55306d741e (patch) | |
| tree | cb68d19e3bc2c1f8c4b092a185b42916681e8f1d /guix/scripts/import | |
| parent | db9979e7f9a8f94885ce593d78fe02de6dd71717 (diff) | |
| download | guix-patches-db7d225f04e53db2ca2c8a7fc441bf55306d741e.tar guix-patches-db7d225f04e53db2ca2c8a7fc441bf55306d741e.tar.gz | |
guix: import: (recursive-import) Allow for version numbers
The tree has moved a bit since you sent the patch, here's a copy I made
that applies.
Diffstat (limited to 'guix/scripts/import')
| -rw-r--r-- | guix/scripts/import/cran.scm | 5 | ||||
| -rw-r--r-- | guix/scripts/import/elpa.scm | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/guix/scripts/import/cran.scm b/guix/scripts/import/cran.scm index d6f371ef3a..bc266ad9da 100644 --- a/guix/scripts/import/cran.scm +++ b/guix/scripts/import/cran.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015, 2017, 2019 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -98,10 +99,10 @@ Import and convert the CRAN package for PACKAGE-NAME.\n")) ;; Recursive import (map package->definition (cran-recursive-import package-name - (or (assoc-ref opts 'repo) 'cran))) + #:repo (or (assoc-ref opts 'repo) 'cran))) ;; Single import (let ((sexp (cran->guix-package package-name - (or (assoc-ref opts 'repo) 'cran)))) + #:repo (or (assoc-ref opts 'repo) 'cran)))) (unless sexp (leave (G_ "failed to download description for package '~a'~%") package-name)) diff --git a/guix/scripts/import/elpa.scm b/guix/scripts/import/elpa.scm index d270d2b4bc..07ac07a3d5 100644 --- a/guix/scripts/import/elpa.scm +++ b/guix/scripts/import/elpa.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com> +;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -102,7 +103,8 @@ Import the latest package named PACKAGE-NAME from an ELPA repository.\n")) (_ #f)) (elpa-recursive-import package-name (or (assoc-ref opts 'repo) 'gnu))) - (let ((sexp (elpa->guix-package package-name (assoc-ref opts 'repo)))) + (let ((sexp (elpa->guix-package package-name + #:repo (assoc-ref opts 'repo)))) (unless sexp (leave (G_ "failed to download package '~a'~%") package-name)) sexp))) |