From 9c4b522f1572db2c5dab81976982b95d5da51e6e Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 24 Aug 2018 00:36:15 +0530 Subject: gnu: Add ghc-wcwidth. * gnu/packages/haskell.scm (ghc-wcwidth): New variable. --- gnu/packages/haskell.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages/haskell.scm') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a07bb049a2..6e19cd67ee 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10152,4 +10152,29 @@ tools are not needed to actually run Gtk2Hs programs.") backends provided by the @code{Cairo} and @code{Diagrams} libraries.") (license license:bsd-3))) +(define-public ghc-wcwidth + (package + (name "ghc-wcwidth") + (version "0.0.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/wcwidth/wcwidth-" + version ".tar.gz")) + (sha256 + (base32 + "1n1fq7v64b59ajf5g50iqj9sa34wm7s2j3viay0kxpmvlcv8gipz")))) + (build-system haskell-build-system) + (inputs + `(("ghc-setlocale" ,ghc-setlocale) + ("ghc-utf8-string" ,ghc-utf8-string) + ("ghc-attoparsec" ,ghc-attoparsec))) + (home-page "https://github.com/solidsnack/wcwidth/") + (synopsis "Haskell bindings to wcwidth") + (description "This package provides Haskell bindings to your system's +native wcwidth and a command line tool to examine the widths assigned by it. +The command line tool can compile a width table to Haskell code that assigns +widths to the Char type.") + (license license:bsd-3))) + ;;; haskell.scm ends here -- cgit v1.2.3 From 3ad6b8909025a8f4d3e1f1f5ea16bcd0cace557c Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 24 Aug 2018 12:14:17 +0530 Subject: gnu: ghc-tasty: Update to 1.1.0.3. * gnu/packages/haskell-check.scm (ghc-tasty): Update to 1.1.0.3. [inputs]: Add ghc-wcwidth. (ghc-attoparsec-bootstrap, ghc-integer-logarithms-bootstrap, ghc-scientific-bootstrap): New variables. (ghc-wcwidth)[inputs]: Replace ghc-attoparsec with ghc-attoparsec-bootstrap. (ghc-scientific)[inputs]: Replace ghc-integer-logarithms with ghc-integer-logarithms-bootstrap. (ghc-attoparsec)[inputs]: Replace ghc-scientific with ghc-scientific-bootstrap. --- gnu/packages/haskell-check.scm | 7 ++++--- gnu/packages/haskell.scm | 27 ++++++++++++++++++++++++--- 2 files changed, 28 insertions(+), 6 deletions(-) (limited to 'gnu/packages/haskell.scm') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index c3ef85f3f0..1064872fec 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -183,7 +183,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) @@ -193,7 +193,7 @@ 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) @@ -205,7 +205,8 @@ timer functions of different operating systems via a unified API.") ("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))) (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 6e19cd67ee..70929ddae6 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2866,7 +2866,7 @@ with slicing and Clang-style colored diagnostics.") ;; re-enable them. (arguments `(#:tests? #f)) (inputs - `(("ghc-scientific" ,ghc-scientific) + `(("ghc-scientific-bootstrap" ,ghc-scientific-bootstrap) ("ghc-text" ,ghc-text))) (native-inputs `(("ghc-tasty" ,ghc-tasty) @@ -2881,6 +2881,13 @@ aimed particularly at dealing efficiently with network protocols and complicated text/binary file formats.") (license license:bsd-3))) +(define ghc-attoparsec-bootstrap + (package + (inherit ghc-attoparsec) + (name "ghc-attoparsec-bootstrap") + (arguments '(#:tests? #f)) + (native-inputs '()))) + (define-public ghc-zip-archive (package (name "ghc-zip-archive") @@ -5208,6 +5215,13 @@ occurrences of a substring (the first in case of overlaps) with another.") in migrated modules.") (license license:expat))) +(define ghc-integer-logarithms-bootstrap + (package + (inherit ghc-integer-logarithms) + (name "ghc-integer-logarithms-bootstrap") + (arguments `(#:tests? #f)) + (native-inputs '()))) + (define-public ghc-scientific (package (name "ghc-scientific") @@ -5224,7 +5238,7 @@ in migrated modules.") "03ql2f0ac8bsl524idy9xxa3kxisb2sj3avflzw580j5hzy0m397")))) (build-system haskell-build-system) (inputs - `(("ghc-integer-logarithms" ,ghc-integer-logarithms) + `(("ghc-integer-logarithms-bootstrap" ,ghc-integer-logarithms-bootstrap) ("ghc-text" ,ghc-text) ("ghc-hashable" ,ghc-hashable) ("ghc-primitive" ,ghc-primitive))) @@ -5245,6 +5259,13 @@ and space efficient. They are represented using notation}.") (license license:bsd-3))) +(define ghc-scientific-bootstrap + (package + (inherit ghc-scientific) + (name "ghc-scientific-bootstrap") + (arguments `(#:tests? #f)) + (native-inputs '()))) + (define-public ghc-boxes (package (name "ghc-boxes") @@ -10168,7 +10189,7 @@ backends provided by the @code{Cairo} and @code{Diagrams} libraries.") (inputs `(("ghc-setlocale" ,ghc-setlocale) ("ghc-utf8-string" ,ghc-utf8-string) - ("ghc-attoparsec" ,ghc-attoparsec))) + ("ghc-attoparsec-bootstrap" ,ghc-attoparsec-bootstrap))) (home-page "https://github.com/solidsnack/wcwidth/") (synopsis "Haskell bindings to wcwidth") (description "This package provides Haskell bindings to your system's -- cgit v1.2.3 From 6300ba5b6669e6e1a3864144390a358b8c260296 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 4 Sep 2018 15:24:32 +0530 Subject: gnu: ghc-integer-logarithms: Allow building with newer tasty. * gnu/packages/haskell.scm (ghc-integer-logarithms)[arguments]: Allow building with newer tasty. --- gnu/packages/haskell.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/haskell.scm') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 70929ddae6..e7072633de 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5197,6 +5197,8 @@ occurrences of a substring (the first in case of overlaps) with another.") (base32 "1wj8kgjg5bn2yrs4zh9qfjv85cx6w998j9pi39yrbv305944mb9j")))) (build-system haskell-build-system) + (arguments + `(#:configure-flags (list "--allow-newer=tasty"))) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) ("ghc-smallcheck" ,ghc-smallcheck) -- cgit v1.2.3 From 906a396bff28ba46b37014a0efc5d4fbf417dc82 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 4 Sep 2018 17:26:14 +0530 Subject: gnu: ghc-zlib: Enable tests. * gnu/packages/haskell.scm (ghc-zlib)[arguments]: Enable tests. Allow building with newer tasty. [native-inputs]: Add ghc-quickcheck, ghc-tasty, ghc-tasty-hunit and ghc-tasty-quickcheck. --- gnu/packages/haskell.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages/haskell.scm') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index e7072633de..b8ae26346e 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2078,9 +2078,13 @@ literals.") (base32 "1vbzf0awb6zb456xf48za1kl22018646cfzq4frvxgb9ay97vk0d")))) (build-system haskell-build-system) - ;; Tests require older versions of testy. - (arguments `(#:tests? #f)) + (arguments `(#:configure-flags (list "--allow-newer=tasty"))) (inputs `(("zlib" ,zlib))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) (home-page "https://hackage.haskell.org/package/zlib") (synopsis "Compression and decompression in the gzip and zlib formats") -- cgit v1.2.3 From 90708323a13c94bf36a56735da9c21a2203e9fde Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 18:39:43 +0200 Subject: Revert "gnu: ghc-base-compat: Update to 0.10.4." This reverts commit 0fa2c552fcd5176b0484b77b7f7c94d82d46415e. We may not upgrade base-compat at this point because we haven't upgraded the default GHC yet. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/haskell.scm') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b8ae26346e..31a0d6d7ee 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4231,7 +4231,7 @@ system.") (define-public ghc-base-compat (package (name "ghc-base-compat") - (version "0.10.4") + (version "0.9.3") (source (origin (method url-fetch) @@ -4241,7 +4241,7 @@ system.") ".tar.gz")) (sha256 (base32 - "0ksp990gxs731mq19rzbxrbs43nazfljjc8krlx5bjqblw3kfs8d")))) + "0452l6zf6fjhy4kxqwv6i6hhg6yfx4wcg450k3axpyj30l7jnq3x")))) (build-system haskell-build-system) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From f9f4578ba0c4b5b22cdac86e8183dc542d66cc85 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 18:43:11 +0200 Subject: Revert "gnu: ghc-tasty: Update to 1.1.0.3." This reverts commit 3ad6b8909025a8f4d3e1f1f5ea16bcd0cace557c. --- gnu/packages/haskell-check.scm | 7 +++---- gnu/packages/haskell.scm | 27 +++------------------------ 2 files changed, 6 insertions(+), 28 deletions(-) (limited to 'gnu/packages/haskell.scm') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 65333f8269..31407ca259 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -183,7 +183,7 @@ timer functions of different operating systems via a unified API.") (define-public ghc-tasty (package (name "ghc-tasty") - (version "1.1.0.3") + (version "0.11.0.4") (source (origin (method url-fetch) @@ -193,7 +193,7 @@ timer functions of different operating systems via a unified API.") ".tar.gz")) (sha256 (base32 - "14riid753hjqr6lca1kgxpnvq0wykf0k3qc5jpag42hh8bszav22")))) + "05pxjzgbgjdn7477xry0ssjrnmnsydqiq6nm6ck8n2da1baliqp0")))) (build-system haskell-build-system) (inputs `(("ghc-stm" ,ghc-stm) @@ -205,8 +205,7 @@ timer functions of different operating systems via a unified API.") ("ghc-unbounded-delays" ,ghc-unbounded-delays) ("ghc-async" ,ghc-async) ("ghc-ansi-terminal" ,ghc-ansi-terminal) - ("ghc-clock-bootstrap" ,ghc-clock-bootstrap) - ("ghc-wcwidth" ,ghc-wcwidth))) + ("ghc-clock-bootstrap" ,ghc-clock-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 31a0d6d7ee..eb629cf138 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2870,7 +2870,7 @@ with slicing and Clang-style colored diagnostics.") ;; re-enable them. (arguments `(#:tests? #f)) (inputs - `(("ghc-scientific-bootstrap" ,ghc-scientific-bootstrap) + `(("ghc-scientific" ,ghc-scientific) ("ghc-text" ,ghc-text))) (native-inputs `(("ghc-tasty" ,ghc-tasty) @@ -2885,13 +2885,6 @@ aimed particularly at dealing efficiently with network protocols and complicated text/binary file formats.") (license license:bsd-3))) -(define ghc-attoparsec-bootstrap - (package - (inherit ghc-attoparsec) - (name "ghc-attoparsec-bootstrap") - (arguments '(#:tests? #f)) - (native-inputs '()))) - (define-public ghc-zip-archive (package (name "ghc-zip-archive") @@ -5221,13 +5214,6 @@ occurrences of a substring (the first in case of overlaps) with another.") in migrated modules.") (license license:expat))) -(define ghc-integer-logarithms-bootstrap - (package - (inherit ghc-integer-logarithms) - (name "ghc-integer-logarithms-bootstrap") - (arguments `(#:tests? #f)) - (native-inputs '()))) - (define-public ghc-scientific (package (name "ghc-scientific") @@ -5244,7 +5230,7 @@ in migrated modules.") "03ql2f0ac8bsl524idy9xxa3kxisb2sj3avflzw580j5hzy0m397")))) (build-system haskell-build-system) (inputs - `(("ghc-integer-logarithms-bootstrap" ,ghc-integer-logarithms-bootstrap) + `(("ghc-integer-logarithms" ,ghc-integer-logarithms) ("ghc-text" ,ghc-text) ("ghc-hashable" ,ghc-hashable) ("ghc-primitive" ,ghc-primitive))) @@ -5265,13 +5251,6 @@ and space efficient. They are represented using notation}.") (license license:bsd-3))) -(define ghc-scientific-bootstrap - (package - (inherit ghc-scientific) - (name "ghc-scientific-bootstrap") - (arguments `(#:tests? #f)) - (native-inputs '()))) - (define-public ghc-boxes (package (name "ghc-boxes") @@ -10195,7 +10174,7 @@ backends provided by the @code{Cairo} and @code{Diagrams} libraries.") (inputs `(("ghc-setlocale" ,ghc-setlocale) ("ghc-utf8-string" ,ghc-utf8-string) - ("ghc-attoparsec-bootstrap" ,ghc-attoparsec-bootstrap))) + ("ghc-attoparsec" ,ghc-attoparsec))) (home-page "https://github.com/solidsnack/wcwidth/") (synopsis "Haskell bindings to wcwidth") (description "This package provides Haskell bindings to your system's -- cgit v1.2.3