[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
84/272: gnu: ghc-test-framework: Update to 0.8.2.0.
From: |
Ricardo Wurmus |
Subject: |
84/272: gnu: ghc-test-framework: Update to 0.8.2.0. |
Date: |
Mon, 1 Oct 2018 06:13:20 -0400 (EDT) |
rekado pushed a commit to branch master
in repository guix.
commit bc8bda501cb8d9156afe001a440589b893d7b110
Author: Timothy Sample <address@hidden>
Date: Tue Aug 28 22:37:21 2018 -0400
gnu: ghc-test-framework: Update to 0.8.2.0.
* gnu/packages/haskell.scm (ghc-semigroups-bootstrap,
ghc-hashable-bootstrap,
ghc-nats-bootstrap, ghc-unordered-containers-bootstrap): New variables for
breaking a dependency cycle with ghc-test-framework.
* gnu/packages/haskell-check.scm (ghc-test-framework): Update to 0.8.2.0.
[arguments]: Add a phase to patch the Cabal file to allow a newer
QuickCheck.
[inputs]: Add ghc-semigroups-bootstrap.
---
gnu/packages/haskell-check.scm | 16 ++++++++++++----
gnu/packages/haskell.scm | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 49 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm
index 57e7f0e..a9ff6af 100644
--- a/gnu/packages/haskell-check.scm
+++ b/gnu/packages/haskell-check.scm
@@ -452,7 +452,7 @@ expressed in Haskell, using combinators defined in the
QuickCheck library.")
(define-public ghc-test-framework
(package
(name "ghc-test-framework")
- (version "0.8.1.1")
+ (version "0.8.2.0")
(source
(origin
(method url-fetch)
@@ -460,10 +460,17 @@ expressed in Haskell, using combinators defined in the
QuickCheck library.")
"test-framework-" version ".tar.gz"))
(sha256
(base32
- "0wxjgdvb1c4ykazw774zlx86550848wbsvgjgcrdzcgbb9m650vq"))))
+ "1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm"))))
(build-system haskell-build-system)
(arguments
- `(#:configure-flags (list "--allow-newer=time")))
+ `(#:tests? #f ; FIXME: Tests do not build.
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'update-constraints
+ (lambda _
+ (substitute* "test-framework.cabal"
+ (("QuickCheck >= 2\\.3 && < 2\\.10")
+ "QuickCheck >= 2.3 && < 2.12")))))))
(native-inputs
`(("ghc-hunit" ,ghc-hunit)
("ghc-quickcheck" ,ghc-quickcheck)))
@@ -475,7 +482,8 @@ expressed in Haskell, using combinators defined in the
QuickCheck library.")
("ghc-random" ,ghc-random)
("ghc-regex-posix" ,ghc-regex-posix)
("ghc-xml" ,ghc-xml)
- ("ghc-libxml" ,ghc-libxml)))
+ ("ghc-libxml" ,ghc-libxml)
+ ("ghc-semigroups" ,ghc-semigroups-bootstrap)))
(home-page "https://batterseapower.github.io/test-framework/")
(synopsis "Framework for running and organising tests")
(description
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 6036a12..a12e7e8 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -2266,6 +2266,14 @@ data structures. The package provides instances for
basic types and a way to
combine hash values.")
(license license:bsd-3)))
+(define-public ghc-hashable-bootstrap
+ (package
+ (inherit ghc-hashable)
+ (name "ghc-hashable-bootstrap")
+ (arguments `(#:tests? #f))
+ (native-inputs '())
+ (properties '((hidden? #t)))))
+
(define-public ghc-hashable-time
(package
(name "ghc-hashable-time")
@@ -3580,6 +3588,15 @@ optimized for performance critical use, both in terms of
large data quantities
and high speed.")
(license license:bsd-3)))
+(define-public ghc-unordered-containers-bootstrap
+ (package
+ (inherit ghc-unordered-containers)
+ (name "ghc-unordered-containers-bootstrap")
+ (arguments `(#:tests? #f))
+ (inputs
+ `(("ghc-hashable" ,ghc-hashable-bootstrap)))
+ (properties '(hidden? #t))))
+
(define-public ghc-uniplate
(package
(name "ghc-uniplate")
@@ -4569,6 +4586,14 @@ Compatibility package for older packages.")
(description "This library provides the natural numbers for Haskell.")
(license license:bsd-3)))
+(define-public ghc-nats-bootstrap
+ (package
+ (inherit ghc-nats)
+ (name "ghc-nats-bootstrap")
+ (inputs
+ `(("ghc-hashable" ,ghc-hashable-bootstrap)))
+ (properties '((hidden? #t)))))
+
(define-public ghc-void
(package
(name "ghc-void")
@@ -4889,6 +4914,18 @@ where every element did not have to have an inverse,
thus the name
semigroup.")
(license license:bsd-3)))
+(define-public ghc-semigroups-bootstrap
+ (package
+ (inherit ghc-semigroups)
+ (name "ghc-semigroups-bootstrap")
+ (inputs
+ `(("ghc-nats" ,ghc-nats-bootstrap)
+ ("ghc-tagged" ,ghc-tagged)
+ ("ghc-unordered-containers" ,ghc-unordered-containers-bootstrap)
+ ("ghc-text" ,ghc-text)
+ ("ghc-hashable" ,ghc-hashable-bootstrap)))
+ (properties '(hidden? #t))))
+
(define-public ghc-free
(package
(name "ghc-free")
- 62/272: gnu: ghc-unix-time: Update to 0.3.8., (continued)
- 62/272: gnu: ghc-unix-time: Update to 0.3.8., Ricardo Wurmus, 2018/10/01
- 63/272: gnu: ghc-alex: Update to 3.2.4., Ricardo Wurmus, 2018/10/01
- 81/272: gnu: ghc-language-c: Update to 0.8.1., Ricardo Wurmus, 2018/10/01
- 89/272: gnu: ghc-cereal: Update to 0.5.7.0., Ricardo Wurmus, 2018/10/01
- 87/272: gnu: ghc-x11: Update to 1.9., Ricardo Wurmus, 2018/10/01
- 75/272: gnu: ghc-split: Update to 0.2.3.3., Ricardo Wurmus, 2018/10/01
- 65/272: gnu: ghc-chell-quickcheck: Allow newer QuickCheck., Ricardo Wurmus, 2018/10/01
- 99/272: gnu: ghc-errors: Update to 2.3.0., Ricardo Wurmus, 2018/10/01
- 104/272: gnu: ghc-unordered-containers: Update to 0.2.9.0., Ricardo Wurmus, 2018/10/01
- 96/272: gnu: ghc-async: Update to 2.2.1., Ricardo Wurmus, 2018/10/01
- 84/272: gnu: ghc-test-framework: Update to 0.8.2.0.,
Ricardo Wurmus <=
- 98/272: gnu: ghc-crypto-api: Update to 0.13.3., Ricardo Wurmus, 2018/10/01
- 121/272: gnu: ghc-cookie: Update to 0.4.4., Ricardo Wurmus, 2018/10/01
- 123/272: gnu: ghc-cryptohash-sha1: Update Cabal file to r2., Ricardo Wurmus, 2018/10/01
- 126/272: gnu: ghc-tar: Update to 0.5.1.0., Ricardo Wurmus, 2018/10/01
- 125/272: gnu: ghc-integer-logarithms: Replace "--allow-newer" flag., Ricardo Wurmus, 2018/10/01
- 115/272: gnu: ghc-contravariant-extras: Update to 0.3.4., Ricardo Wurmus, 2018/10/01
- 135/272: gnu: ghc-base-orphans: Update to 0.7., Ricardo Wurmus, 2018/10/01
- 137/272: gnu: ghc-fgl: Replace "--allow-newer" flags., Ricardo Wurmus, 2018/10/01
- 138/272: gnu: ghc-generic-deriving: Update to 1.12.2., Ricardo Wurmus, 2018/10/01
- 133/272: gnu: ghc-uuid: Update Cabal file to r2 and relax dependencies., Ricardo Wurmus, 2018/10/01