[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/24: import: hackage: Support mirror:// URLs
From: |
guix-commits |
Subject: |
08/24: import: hackage: Support mirror:// URLs |
Date: |
Thu, 7 Oct 2021 09:21:14 -0400 (EDT) |
lbraun pushed a commit to branch wip-haskell
in repository guix.
commit 73f3ed7ccf6c0566d041f5f6fbc5ffab7eccd03d
Author: Lars-Dominik Braun <lars@6xq.net>
AuthorDate: Fri Sep 17 11:09:04 2021 +0200
import: hackage: Support mirror:// URLs
* guix/import/hackage.scm (guix-package->hackage-name): Support
mirror://-style URI’s.
(hackage-package?): Ditto.
---
guix/import/hackage.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm
index 0a10c42..03881f1 100644
--- a/guix/import/hackage.scm
+++ b/guix/import/hackage.scm
@@ -121,12 +121,12 @@ version is returned."
(string-append package-name-prefix (string-downcase name))))
(define guix-package->hackage-name
- (let ((uri-rx (make-regexp
"https?://hackage.haskell.org/package/([^/]+)/.*"))
+ (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) 1)))
+ (name (match:substring (regexp-exec uri-rx source-url) 2)))
(match (regexp-exec name-rx name)
(#f name)
(m (match:substring m 1)))))))
@@ -353,7 +353,7 @@ respectively."
#:guix-name hackage-name->package-name))
(define hackage-package?
- (let ((hackage-rx (make-regexp "https?://hackage.haskell.org")))
+ (let ((hackage-rx (make-regexp
"(https?://hackage.haskell.org|mirror://hackage/)")))
(url-predicate (cut regexp-exec hackage-rx <>))))
(define (latest-release package)
- 11/24: gnu: cabal-install: Build with GHC 8.10., (continued)
- 11/24: gnu: cabal-install: Build with GHC 8.10., guix-commits, 2021/10/07
- 12/24: gnu: hedgewars: Fix build., guix-commits, 2021/10/07
- 16/24: gnu: ngless: Fix build., guix-commits, 2021/10/07
- 18/24: gnu: ghc-repline: Remove version 0.2.0.0., guix-commits, 2021/10/07
- 15/24: gnu: idris: Fix build., guix-commits, 2021/10/07
- 21/24: gnu: pigx-sars-cov2-ww: Remove dependency on pandoc-citeproc., guix-commits, 2021/10/07
- 14/24: gnu: ghc-silently: Remove unused input., guix-commits, 2021/10/07
- 03/24: import: stackage: Update %default-lts-version to 18.10., guix-commits, 2021/10/07
- 04/24: import: hackage: Update GHC’s standard libraries., guix-commits, 2021/10/07
- 07/24: build-system/haskell: Accept line breaks in config files., guix-commits, 2021/10/07
- 08/24: import: hackage: Support mirror:// URLs,
guix-commits <=
- 06/24: build-system/haskell: Do not rely on compiler name., guix-commits, 2021/10/07
- 13/24: gnu: ruby-pandoc-ruby: Disable tests., guix-commits, 2021/10/07
- 20/24: gnu: pigx-bsseq: Remove dependency on pandoc-citeproc., guix-commits, 2021/10/07
- 17/24: gnu: python-pypandoc: Upgrade to 1.6.4., guix-commits, 2021/10/07
- 19/24: gnu: ghc-haskeline: Remove version postfix from variable name., guix-commits, 2021/10/07
- 24/24: gnu: pigx-scrnaseq: Remove dependency on pandoc-citeproc., guix-commits, 2021/10/07
- 22/24: gnu: pigx-chipseq: Remove dependency on pandoc-citeproc., guix-commits, 2021/10/07
- 23/24: gnu: pigx-rnaseq: Remove dependency on pandoc-citeproc., guix-commits, 2021/10/07