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/opam.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/opam.scm')
| -rw-r--r-- | guix/import/opam.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/guix/import/opam.scm b/guix/import/opam.scm index 394415fdd4..87c823a98c 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu> +;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -311,8 +312,8 @@ or #f on failure." dependencies)))))))) (define (opam-recursive-import package-name) - (recursive-import package-name #f - #:repo->guix-package (lambda (name repo) + (recursive-import package-name + #:repo->guix-package (lambda (name . _) (opam->guix-package name)) #:guix-name ocaml-name->guix-name)) |