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 /tests | |
| parent | db9979e7f9a8f94885ce593d78fe02de6dd71717 (diff) | |
| download | patches-db7d225f04e53db2ca2c8a7fc441bf55306d741e.tar patches-db7d225f04e53db2ca2c8a7fc441bf55306d741e.tar.gz | |
guix: import: (recursive-import) Allow for version numbersseries-2923
The tree has moved a bit since you sent the patch, here's a copy I made
that applies.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/elpa.scm | 3 | ||||
| -rw-r--r-- | tests/import-utils.scm | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/tests/elpa.scm b/tests/elpa.scm index b70539bda6..a008cf993c 100644 --- a/tests/elpa.scm +++ b/tests/elpa.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2020 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -51,7 +52,7 @@ (200 "This is the description.") (200 "fake tarball contents")) (parameterize ((current-http-proxy (%local-url))) - (match (elpa->guix-package pkg 'gnu/http) + (match (elpa->guix-package pkg #:repo 'gnu/http) (('package ('name "emacs-auctex") ('version "11.88.6") 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")) '()))) |