[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/31: import: hackage: Allow version at the beginning of cabal file.
From: |
guix-commits |
Subject: |
01/31: import: hackage: Allow version at the beginning of cabal file. |
Date: |
Sun, 26 Feb 2023 04:44:35 -0500 (EST) |
lbraun pushed a commit to branch master
in repository guix.
commit 3e3f888dd3d3c06f20e566263f55791dd2316c25
Author: Lars-Dominik Braun <lars@6xq.net>
AuthorDate: Sat Jun 11 11:02:52 2022 +0200
import: hackage: Allow version at the beginning of cabal file.
Fix a corner case, uncovered by the hedgehog package, which has the
version field at the beginning of its cabal file. This causes a pattern
match failure.
* guix/import/hackage.scm (latest-release): Match version at beginning
of expression too.
---
guix/import/hackage.scm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm
index 7bc2908405..e915aac58d 100644
--- a/guix/import/hackage.scm
+++ b/guix/import/hackage.scm
@@ -378,7 +378,10 @@ respectively."
"warning: failed to parse ~a~%"
(hackage-cabal-url hackage-name))
#f)
- ((_ *** ("version" (version)))
+ ;; Cabal files have no particular order and while usually the version
+ ;; as somewhere in the middle it can also be at the beginning,
+ ;; requiring two pattern.
+ ((or (_ *** ("version" (version))) (("version" (version)) _ ...))
(let ((url (hackage-uri hackage-name version)))
(upstream-source
(package (package-name package))
- branch master updated (c08e9599ef -> 2c0537d374), guix-commits, 2023/02/26
- 02/31: build: haskell-build-system: Remove trailing #t., guix-commits, 2023/02/26
- 03/31: build: haskell-build-system: Support multiple libraries., guix-commits, 2023/02/26
- 06/31: import: hackage: Add upstream-name property., guix-commits, 2023/02/26
- 07/31: gnu: Add upstream-name property to Haskell packages., guix-commits, 2023/02/26
- 04/31: gnu: Switch default to GHC 9.2., guix-commits, 2023/02/26
- 01/31: import: hackage: Allow version at the beginning of cabal file.,
guix-commits <=
- 05/31: import: stackage: Update to release 20.5., guix-commits, 2023/02/26
- 09/31: gnu: Use HACKAGE-URI for packages from Hackage., guix-commits, 2023/02/26
- 10/31: import: haskell: Add new internal library for GHC 9.2., guix-commits, 2023/02/26
- 13/31: Upgrade Haskell packages., guix-commits, 2023/02/26
- 18/31: gnu: elm: Support GHC 9.2., guix-commits, 2023/02/26
- 08/31: import: hackage: Use upstream-name property., guix-commits, 2023/02/26
- 11/31: build: haskell-build-system: Process all transitive dependencies., guix-commits, 2023/02/26
- 12/31: build: haskell-build-system: Remove unused linker flags., guix-commits, 2023/02/26
- 14/31: gnu: ghc-9.2: Increase make verbosity., guix-commits, 2023/02/26
- 15/31: gnu: Remove unused Haskell packages., guix-commits, 2023/02/26