summaryrefslogtreecommitdiff
path: root/guix/import/stackage.scm
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2020-02-17 12:03:09 +0200
committerGuix Patches Tester <>2020-02-17 10:05:06 +0000
commitdb7d225f04e53db2ca2c8a7fc441bf55306d741e (patch)
treecb68d19e3bc2c1f8c4b092a185b42916681e8f1d /guix/import/stackage.scm
parentdb9979e7f9a8f94885ce593d78fe02de6dd71717 (diff)
downloadpatches-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 'guix/import/stackage.scm')
-rw-r--r--guix/import/stackage.scm5
1 files changed, 3 insertions, 2 deletions
diff --git a/guix/import/stackage.scm b/guix/import/stackage.scm
index 14150201b5..6091cf2c64 100644
--- a/guix/import/stackage.scm
+++ b/guix/import/stackage.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -108,8 +109,8 @@ included in the Stackage LTS release."
(leave-with-message "~a: Stackage package not found" package-name))))))
(define (stackage-recursive-import package-name . args)
- (recursive-import package-name #f
- #:repo->guix-package (lambda (name repo)
+ (recursive-import package-name
+ #:repo->guix-package (lambda (name . _)
(apply stackage->guix-package (cons name args)))
#:guix-name hackage-name->package-name))