[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/10: import: stackage: Support input changes.
From: |
guix-commits |
Subject: |
05/10: import: stackage: Support input changes. |
Date: |
Mon, 27 Sep 2021 06:56:34 -0400 (EDT) |
lbraun pushed a commit to branch wip-haskell
in repository guix.
commit be6fdd52c4e91086a08e01781107a7d607a40610
Author: Lars-Dominik Braun <lars@6xq.net>
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 427e211..236195a 100644
--- a/guix/import/stackage.scm
+++ b/guix/import/stackage.scm
@@ -124,10 +124,10 @@ included in the Stackage LTS release."
(let ((pkgs-info
(mlambda () (lts-info-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 (pkgs-info) hackage-name))
(name-version (hackage-name-version hackage-name version)))
(match (and=> name-version hackage-fetch)
@@ -137,9 +137,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-info
(pkgs-info))))))))))))
(define %stackage-updater
(upstream-updater
- branch wip-haskell created (now 1c4e765), guix-commits, 2021/09/27
- 01/10: guix: haskell-build-system: Always pass -package-db option., guix-commits, 2021/09/27
- 03/10: import: stackage: Update %default-lts-version to 18.10., guix-commits, 2021/09/27
- 04/10: import: hackage: Update GHC’s standard libraries., guix-commits, 2021/09/27
- 08/10: import: hackage: Support mirror:// URLs, guix-commits, 2021/09/27
- 09/10: build-system/haskell: Explain failure., guix-commits, 2021/09/27
- 06/10: build-system/haskell: Do not rely on compiler name., guix-commits, 2021/09/27
- 10/10: gnu: Update Haskell ecosystem., guix-commits, 2021/09/27
- 05/10: import: stackage: Support input changes.,
guix-commits <=
- 02/10: gnu: ghc-8: Update to 8.10., guix-commits, 2021/09/27
- 07/10: build-system/haskell: Accept line breaks in config files., guix-commits, 2021/09/27