diff options
| author | Martin Becze <mjbecze@riseup.net> | 2020-02-04 07:18:18 -0500 |
|---|---|---|
| committer | Guix Patches Tester <> | 2020-03-21 18:38:11 +0000 |
| commit | b34b16d814573b29fde03adc876f269247e293ce (patch) | |
| tree | d8924d471ad4b81a25aa02da175aab6133fcfddb /tests/import-utils.scm | |
| parent | de1d778ef50304e00d8c339b6be6be66f860d7e9 (diff) | |
| download | guix-patches-b34b16d814573b29fde03adc876f269247e293ce.tar guix-patches-b34b16d814573b29fde03adc876f269247e293ce.tar.gz | |
guix: import: (recursive-import) Allow for version numbers
This adds a key VERSION to (recursive-import) and move the paramter REPO to a
key. This also changes all the things that rely on (recursive-import)
* guix/import/utils.scm (package->definition): added optional `append-version?`
* guix/import/utils.scm (recursive-import): added key `version` and
moved `repo` to be a key
* guix/import/cran.scm (cran->guix-package): change `repo` to a key
* guix/import/cran.scm (cran-recursive-import): change `repo` to a key
* guix/scripts/import/cran.scm: change `repo` to a key
* guix/import/elpa.scm (elpa->guix-pakcage): change `repo` to a key
* guix/import/elpa.scm (elpa-recursive-import): change `repo` to a key
* guix/scripts/import/elpa.scm: change `repo` to a key
* guix/import/gem.scm (gem->guix-package): change `repo` to a key
* guix/import/gem.scm (recursive-import): change `repo` to a key
* guix/import/opam.scm (opam-recurive-import): change `repo` to a key
* guix/import/pypi.scm (pypi-recursive-import): change `repo` to a key
* guix/import/stackage.scm (stackage-recursive-import): change `repo` to a key
Diffstat (limited to 'tests/import-utils.scm')
| -rw-r--r-- | tests/import-utils.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/import-utils.scm b/tests/import-utils.scm index 87dda3238f..2357ea5c40 100644 --- a/tests/import-utils.scm +++ b/tests/import-utils.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com> +;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -48,15 +49,16 @@ (package (name "foo") (inputs `(("bar" ,bar))))) - (recursive-import "foo" 'repo + (recursive-import "foo" + #:repo 'repo #:repo->guix-package (match-lambda* - (("foo" 'repo) + (("foo" #:version #f #:repo 'repo) (values '(package (name "foo") (inputs `(("bar" ,bar)))) '("bar"))) - (("bar" 'repo) + (("bar" #:version #f #:repo 'repo) (values '(package (name "bar")) '()))) |