samplet pushed a commit to branch wip-haskell-updates
in repository guix.
commit d5c9858819e0543f0f431312cacb41642ef08eee
Author: Timothy Sample <[email protected]>
Date: Thu Oct 31 13:25:18 2019 -0400
gnu: cabal-install: Update to 2.4.0.0.
* gnu/packages/haskell-apps.scm (cabal-install): Update to 2.4.0.0.
[arguments]: Set Cabal file to r2, enable tests, and add a phase to update
the
Cabal file to allow a newer version of 'zip-archive'.
[inputs]: Add 'ghc-zip-archive'.
---
gnu/packages/haskell-apps.scm | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm
index 2e197f4..eff42a1 100644
--- a/gnu/packages/haskell-apps.scm
+++ b/gnu/packages/haskell-apps.scm
@@ -49,10 +49,14 @@
#:use-module (gnu packages rsync)
#:use-module (gnu packages version-control))
+;; In Stackage LTS 14, this package is at 2.4.1.0. However, that
+;; version requires version 2.4.1.0 of the 'Cabal' package, which is
+;; provided by GHC 8.6.5 at version 2.4.0.1. Hence, we use an older
+;; version to match the compiler's library.
(define-public cabal-install
(package
(name "cabal-install")
- (version "2.2.0.0")
+ (version "2.4.0.0")
(source
(origin
(method url-fetch)
@@ -61,9 +65,19 @@
version
".tar.gz"))
(sha256
- (base32 "1nd3ch7qr4dpfxhgkcq2lnhvszx2kjgnn1kwb44vk9y5jgfs4mn8"))))
- (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing.
+ (base32 "1xmyl0x8wqfrnray6ky5wy0g0samv4264fbdlzxhqsvk9dbfja8k"))))
(build-system haskell-build-system)
+ (arguments
+ `(#:cabal-revision
+ ("2" "1xil5pim6j1ckqj61zz6l7xpfxxr3rkw2hvpws2f7pr9shk645dl")
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'update-constraints
+ (lambda _
+ (substitute* "cabal-install.cabal"
+ (("zip-archive >= 0\\.3\\.2\\.5 && < 0\\.4,")
+ "zip-archive >= 0.3.2.5 && <= 0.4.1,"))
+ #t)))))
(inputs
`(("ghc-async" ,ghc-async)
("ghc-base16-bytestring" ,ghc-base16-bytestring)
@@ -78,6 +92,7 @@
("ghc-random" ,ghc-random)
("ghc-resolv" ,ghc-resolv)
("ghc-tar" ,ghc-tar)
+ ("ghc-zip-archive" ,ghc-zip-archive)
("ghc-zlib" ,ghc-zlib)))
(home-page "https://www.haskell.org/cabal/";)
(synopsis "Command-line interface for Cabal and Hackage")
