lbraun pushed a commit to branch wip-haskell
in repository guix.
commit a2d8285b160c38cbd697eb90fba940d820bcff95
Author: Lars-Dominik Braun <[email protected]>
AuthorDate: Thu Sep 16 08:12:17 2021 +0200
import: stackage: Support input changes.
* guix/import/stackage.scm (latest-lts-release): Rename package to pkg
to avoid name conflict and add input-changes.
---
guix/import/stackage.scm | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/guix/import/stackage.scm b/guix/import/stackage.scm
index c7247f5..f58c6b1 100644
--- a/guix/import/stackage.scm
+++ b/guix/import/stackage.scm
@@ -139,10 +139,10 @@ included in the Stackage LTS release."
(mlambda ()
(stackage-lts-packages
(stackage-lts-info-fetch %default-lts-version)))))
- (lambda* (package)
+ (lambda* (pkg)
"Return an <upstream-source> for the latest Stackage LTS release of
PACKAGE or #f if the package is not included in the Stackage LTS release."
- (let* ((hackage-name (guix-package->hackage-name package))
+ (let* ((hackage-name (guix-package->hackage-name pkg))
(version (lts-package-version (packages) hackage-name))
(name-version (hackage-name-version hackage-name version)))
(match (and=> name-version hackage-fetch)
@@ -152,9 +152,13 @@ PACKAGE or #f if the package is not included in the
Stackage LTS release."
#f)
(_ (let ((url (hackage-source-url hackage-name version)))
(upstream-source
- (package (package-name package))
+ (package (package-name pkg))
(version version)
- (urls (list url))))))))))
+ (urls (list url))
+ (input-changes
+ (changed-inputs
+ pkg
+ (stackage->guix-package hackage-name #:packages
(packages))))))))))))
(define (stackage-lts-package? package)
"Return whether PACKAGE is available on the default Stackage LTS release."
