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/import/pypi.scm | |
| 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/import/pypi.scm')
| -rw-r--r-- | guix/import/pypi.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index 6897f42be3..abd933e2e1 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> +;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -429,8 +430,8 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE." description license)))))))) (define (pypi-recursive-import package-name) - (recursive-import package-name #f - #:repo->guix-package (lambda (name repo) + (recursive-import package-name + #:repo->guix-package (lambda (name . _) (pypi->guix-package name)) #:guix-name python->package-name)) |