summary refs log tree commit diff
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2024-11-17 16:51:13 +0900
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2024-11-17 16:54:47 +0900
commit737d1b4fb132e9a50d496830d12febd5b1316b5a (patch)
tree231d5ad71c30aa4deda75da3a03eb95226a6ef91
parentd5107b0c5a52f52b92127f36879ffffdf037cae8 (diff)
downloadguix-737d1b4fb132e9a50d496830d12febd5b1316b5a.tar.gz
import: stackage: Adjust to fix failing lint test.
Commit abc3eb33191 ("import: hackage: Support updating to a specific
version.") modified the signature of hackage-fetch; some code was still
calling `hackage-fetch' with a single argument, breaking the tests/lint.scm
test.

* guix/import/stackage.scm (latest-lts-release): Adjust calls to
`hackage-fetch'.

Change-Id: Ic83ebc12a7948023956fe30cfb8aa22b6d282fc6
-rw-r--r--guix/import/stackage.scm9
1 files changed, 5 insertions, 4 deletions
diff --git a/guix/import/stackage.scm b/guix/import/stackage.scm
index 61012bed28..9554c3d7a4 100644
--- a/guix/import/stackage.scm
+++ b/guix/import/stackage.scm
@@ -151,9 +151,9 @@ PACKAGE or #f if the package is not included in the Stackage LTS release."
           (G_ "~a updater doesn't support updating to a specific version, sorry.")
           "stackage")))
       (let* ((hackage-name (package-upstream-name* pkg))
-             (version (lts-package-version (packages) hackage-name))
-             (name-version (hackage-name-version hackage-name version)))
-        (match (and=> name-version hackage-fetch)
+             (version (lts-package-version (packages) hackage-name)))
+        (match (and hackage-name version
+                    (hackage-fetch hackage-name version))
           (#f
            (warning (G_ "failed to parse ~a~%")
                     (hackage-cabal-url hackage-name))
@@ -164,7 +164,8 @@ PACKAGE or #f if the package is not included in the Stackage LTS release."
                 (version version)
                 (urls (list url))
                 (inputs
-                 (let ((cabal (eval-cabal (hackage-fetch name-version) '())))
+                 (let ((cabal (eval-cabal (hackage-fetch hackage-name version)
+                                          '())))
                    (cabal-package-inputs cabal)))))))))))
 
 (define (stackage-lts-package? package)