rekado pushed a commit to branch master
in repository guix.
commit 9d1944a4939ae006b6f53c4203c49bc727c55dfd
Author: Timothy Sample <samp...@ngyro.com>
Date: Wed Sep 5 14:22:28 2018 -0400
gnu: ghc-tasty: Update to 1.1.0.3.
* gnu/packages/haskell.scm (ghc-integer-logarithms-bootstrap,
ghc-scientific-bootstrap, ghc-attoparsec-bootstrap,
ghc-wcwidth-bootstrap): New variables to break a dependency cycle from
ghc-tasty.
* gnu/packages/haskell-check.scm (ghc-tasty): Update to 1.1.0.3.
[inputs]: Add ghc-wcwidth-bootstrap; remove ghc-regex-tdfa-rc.
---
gnu/packages/haskell-check.scm | 8 ++++----
gnu/packages/haskell.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm
index ef19645..913835a 100644
--- a/gnu/packages/haskell-check.scm
+++ b/gnu/packages/haskell-check.scm
@@ -181,7 +181,7 @@ timer functions of different operating systems via a
unified API.")
(define-public ghc-tasty
(package
(name "ghc-tasty")
- (version "0.11.0.4")
+ (version "1.1.0.3")
(source
(origin
(method url-fetch)
@@ -191,18 +191,18 @@ timer functions of different operating systems via a
unified API.")
".tar.gz"))
(sha256
(base32
- "05pxjzgbgjdn7477xry0ssjrnmnsydqiq6nm6ck8n2da1baliqp0"))))
+ "14riid753hjqr6lca1kgxpnvq0wykf0k3qc5jpag42hh8bszav22"))))
(build-system haskell-build-system)
(inputs
`(("ghc-stm" ,ghc-stm)
("ghc-tagged" ,ghc-tagged)
("ghc-regex-tdfa" ,ghc-regex-tdfa)
- ("ghc-regex-tdfa-rc" ,ghc-regex-tdfa-rc)
("ghc-optparse-applicative" ,ghc-optparse-applicative)
("ghc-unbounded-delays" ,ghc-unbounded-delays)
("ghc-async" ,ghc-async)
("ghc-ansi-terminal" ,ghc-ansi-terminal)
- ("ghc-clock-bootstrap" ,ghc-clock-bootstrap)))
+ ("ghc-clock-bootstrap" ,ghc-clock-bootstrap)
+ ("ghc-wcwidth" ,ghc-wcwidth-bootstrap)))
(home-page "http://documentup.com/feuerbach/tasty";)
(synopsis "Modern and extensible testing framework")
(description "Tasty is a modern testing framework for Haskell. It lets
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 5ea7ed8..b50bf3d 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -2877,6 +2877,17 @@ aimed particularly at dealing efficiently with network
protocols and
complicated text/binary file formats.")
(license license:bsd-3)))
+(define-public ghc-attoparsec-bootstrap
+ (package
+ (inherit ghc-attoparsec)
+ (name "ghc-attoparsec-bootstrap")
+ (arguments `(#:tests? #f))
+ (inputs
+ `(("ghc-scientific" ,ghc-scientific-bootstrap)
+ ("ghc-text" ,ghc-text)))
+ (native-inputs '())
+ (properties '(hidden? #t))))
+
(define-public ghc-zip-archive
(package
(name "ghc-zip-archive")
@@ -5227,6 +5238,14 @@ occurrences of a substring (the first in case of
overlaps) with another.")
in migrated modules.")
(license license:expat)))
+(define-public ghc-integer-logarithms-bootstrap
+ (package
+ (inherit ghc-integer-logarithms)
+ (name "ghc-integer-logarithms-bootstrap")
+ (arguments `(#:tests? #f))
+ (native-inputs '())
+ (properties '(hidden? #t))))
+
(define-public ghc-scientific
(package
(name "ghc-scientific")
@@ -5264,6 +5283,19 @@ and space efficient. They are represented using
notation}.")
(license license:bsd-3)))
+(define-public ghc-scientific-bootstrap
+ (package
+ (inherit ghc-scientific)
+ (name "ghc-scientific-bootstrap")
+ (arguments `(#:tests? #f))
+ (inputs
+ `(("ghc-integer-logarithms" ,ghc-integer-logarithms-bootstrap)
+ ("ghc-text" ,ghc-text)
+ ("ghc-hashable" ,ghc-hashable)
+ ("ghc-primitive" ,ghc-primitive)))
+ (native-inputs '())
+ (properties '(hidden? #t))))
+
(define-public ghc-boxes
(package
(name "ghc-boxes")
@@ -10199,4 +10231,14 @@ The command line tool can compile a width table to
Haskell code that assigns
widths to the Char type.")
(license license:bsd-3)))
+(define-public ghc-wcwidth-bootstrap
+ (package
+ (inherit ghc-wcwidth)
+ (name "ghc-wcwidth-bootstrap")
+ (inputs
+ `(("ghc-setlocale" ,ghc-setlocale)
+ ("ghc-utf8-string" ,ghc-utf8-string)
+ ("ghc-attoparsec" ,ghc-attoparsec-bootstrap)))
+ (properties '(hidden? #t))))
+
;;; haskell.scm ends here
