From 737d1b4fb132e9a50d496830d12febd5b1316b5a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Nov 2024 16:51:13 +0900 Subject: [PATCH] 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 --- guix/import/stackage.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/guix/import/stackage.scm b/guix/import/stackage.scm index 61012bed28c90872b2fcb7225e6564d1cdfac932..9554c3d7a45f1fa2507ca63cb2d36fd4acc3817b 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)