[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#61420] [PATCH 08/31] import: hackage: Use upstream-name property.
From: |
Lars-Dominik Braun |
Subject: |
[bug#61420] [PATCH 08/31] import: hackage: Use upstream-name property. |
Date: |
Sat, 11 Feb 2023 11:08:04 +0100 |
* 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.
---
guix/import/hackage.scm | 14 +-------------
guix/import/stackage.scm | 4 ++--
2 files changed, 3 insertions(+), 15 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 @@ (define-module (guix import hackage)
hackage-recursive-import
%hackage-updater
- guix-package->hackage-name
hackage-name->package-name
hackage-fetch
hackage-source-url
@@ -126,17 +125,6 @@ (define (hackage-name->package-name name)
(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 @@ (define* (latest-release package #:key (version #f))
(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
diff --git a/guix/import/stackage.scm b/guix/import/stackage.scm
index 9462e70791..735eeb75f7 100644
--- a/guix/import/stackage.scm
+++ b/guix/import/stackage.scm
@@ -149,7 +149,7 @@ (define latest-lts-release
(formatted-message
(G_ "~a updater doesn't support updating to a specific version,
sorry.")
"stackage")))
- (let* ((hackage-name (guix-package->hackage-name pkg))
+ (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)
@@ -173,7 +173,7 @@ (define (stackage-lts-package? package)
(false-if-networking-error
(let ((packages (stackage-lts-packages
(stackage-lts-info-fetch %default-lts-version)))
- (hackage-name (guix-package->hackage-name package)))
+ (hackage-name (package-upstream-name* package)))
(find (lambda (package)
(string=? (stackage-package-name package) hackage-name))
packages)))))
--
2.38.2
- [bug#61420] [PATCH 00/31] Haskell upgrade to Stackage 20.5, Lars-Dominik Braun, 2023/02/11
- [bug#61420] [PATCH 01/31] import: hackage: Allow version at the beginning of cabal file., Lars-Dominik Braun, 2023/02/11
- [bug#61420] [PATCH 03/31] build: haskell-build-system: Support multiple libraries., Lars-Dominik Braun, 2023/02/11
- [bug#61420] [PATCH 05/31] import: stackage: Update to release 20.5., Lars-Dominik Braun, 2023/02/11
- [bug#61420] [PATCH 04/31] gnu: Switch default to GHC 9.2., Lars-Dominik Braun, 2023/02/11
- [bug#61420] [PATCH 10/31] import: haskell: Add new internal library for GHC 9.2., Lars-Dominik Braun, 2023/02/11
- [bug#61420] [PATCH 15/31] gnu: Remove unused Haskell packages., Lars-Dominik Braun, 2023/02/11
- [bug#61420] [PATCH 22/31] build: haskell-build-system: Build static executables by default., Lars-Dominik Braun, 2023/02/11
- [bug#61420] [PATCH 08/31] import: hackage: Use upstream-name property.,
Lars-Dominik Braun <=
- [bug#61420] [PATCH 02/31] build: haskell-build-system: Remove trailing #t., Lars-Dominik Braun, 2023/02/11
- [bug#61420] [PATCH 12/31] build: haskell-build-system: Remove unused linker flags., Lars-Dominik Braun, 2023/02/11
- [bug#61420] [PATCH 21/31] gnu: ghc-lua: Disable symbol export., Lars-Dominik Braun, 2023/02/11
- [bug#61420] [PATCH 11/31] build: haskell-build-system: Process all transitive dependencies., Lars-Dominik Braun, 2023/02/11
- [bug#61420] [PATCH 16/31] gnu: ghc-parsec: Update to 3.1.15.0., Lars-Dominik Braun, 2023/02/11
- [bug#61420] [PATCH 06/31] import: hackage: Add upstream-name property., Lars-Dominik Braun, 2023/02/11
- [bug#61420] [PATCH 20/31] gnu: ghc-9.2: Support static linking with glibc < 2.34., Lars-Dominik Braun, 2023/02/11
- [bug#61420] [PATCH 18/31] gnu: elm: Support GHC 9.2., Lars-Dominik Braun, 2023/02/11
- [bug#61420] [PATCH 26/31] gnu: git-annex: Drop Haskell documentation., Lars-Dominik Braun, 2023/02/11