diff options
author | Lars-Dominik Braun <lars@6xq.net> | 2023-01-04 09:37:26 +0100 |
---|---|---|
committer | Lars-Dominik Braun <lars@6xq.net> | 2023-02-26 10:20:14 +0100 |
commit | d06ae5301351bf4af71dcebd6dd85b4546e1b677 (patch) | |
tree | 4001b2b800a7a91e95d8eb3295af7d10e1ef5af8 /guix/import/hackage.scm | |
parent | cad6aa8082e99fe60570e3fd53a0e5876a8f243e (diff) | |
download | guix-d06ae5301351bf4af71dcebd6dd85b4546e1b677.tar guix-d06ae5301351bf4af71dcebd6dd85b4546e1b677.tar.gz |
import: hackage: Use upstream-name property.
* guix/import/hackage.scm (guix-package->hackage-name): Removed.
(latest-release): Use package-upstream-name* instead.
* guix/import/stackage.scm (latest-lts-release): Ditto.
(stackage-lts-package?): Ditto.
Diffstat (limited to 'guix/import/hackage.scm')
-rw-r--r-- | guix/import/hackage.scm | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index 9e305cf080..2f901af47b 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -52,7 +52,6 @@ hackage-recursive-import %hackage-updater - guix-package->hackage-name hackage-name->package-name hackage-fetch hackage-source-url @@ -126,17 +125,6 @@ version is returned." (string-downcase name) (string-append package-name-prefix (string-downcase name)))) -(define guix-package->hackage-name - (let ((uri-rx (make-regexp "(https?://hackage.haskell.org|mirror://hackage)/package/([^/]+)/.*")) - (name-rx (make-regexp "(.*)-[0-9\\.]+"))) - (lambda (package) - "Given a Guix package name, return the corresponding Hackage name." - (let* ((source-url (and=> (package-source package) origin-uri)) - (name (match:substring (regexp-exec uri-rx source-url) 2))) - (match (regexp-exec name-rx name) - (#f name) - (m (match:substring m 1))))))) - (define (read-cabal-and-hash port) "Read a Cabal file from PORT and return it and its hash in nix-base32 format as two values." @@ -371,7 +359,7 @@ respectively." (formatted-message (G_ "~a updater doesn't support updating to a specific version, sorry.") "hackage"))) - (let* ((hackage-name (guix-package->hackage-name package)) + (let* ((hackage-name (package-upstream-name* package)) (cabal-meta (hackage-fetch hackage-name))) (match cabal-meta (#f |