From 8d04a5c968c0600b1d2d1e889d189e82d2278971 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 15 Aug 2018 11:19:06 +0200 Subject: gnu: hspec-discover: Update to 2.5.5. * gnu/packages/haskell-check.scm (hspec-discover): Update to 2.5.5. [arguments]: Enable haddock phase. [inputs]: Move ghc-hspec-meta from here... [native-inputs]: ...to here; add ghc-quickcheck. --- gnu/packages/haskell-check.scm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'gnu/packages/haskell-check.scm') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 7453f9fbf1..f40bc7ce96 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -626,21 +626,20 @@ (define-public ghc-hunit (define-public hspec-discover (package (name "hspec-discover") - (version "2.2.4") + (version "2.5.5") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hspec-discover/hspec-discover-" - version - ".tar.gz")) + (uri (string-append "https://hackage.haskell.org/package/" + "hspec-discover/hspec-discover-" + version ".tar.gz")) (sha256 (base32 - "1bz7wb8v0bx1amiz4bpj34xq97d1ia29n3f654wcrh6lacydp3dv")))) + "04aidzi91ccr9bygmfkjzshz34z9vh8wvqj4zinx2clxq6r7gqfz")))) (build-system haskell-build-system) - (arguments `(#:haddock? #f)) ; Haddock phase fails because there are no - ; documentation files. - (inputs `(("ghc-hspec-meta" ,ghc-hspec-meta))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-hspec-meta" ,ghc-hspec-meta))) (home-page "https://hspec.github.io/") (synopsis "Automatically discover and run Hspec tests") (description "hspec-discover is a tool which automatically discovers and -- cgit v1.2.3 From 3b8e47745d045afd36eadc83eb0a6289ceabc9e5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 15 Aug 2018 11:20:24 +0200 Subject: gnu: ghc-hspec-core: Update to 2.5.5. * gnu/packages/haskell-check.scm (ghc-hspec-core): Update to 2.5.5. [inputs]: Add ghc-clock. --- gnu/packages/haskell-check.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu/packages/haskell-check.scm') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index f40bc7ce96..ef07748daa 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -649,23 +649,22 @@ (define-public hspec-discover (define-public ghc-hspec-core (package (name "ghc-hspec-core") - (version "2.2.4") + (version "2.5.5") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hspec-core/hspec-core-" - version - ".tar.gz")) + (uri (string-append "https://hackage.haskell.org/package/hspec-core/" + "hspec-core-" version ".tar.gz")) (sha256 (base32 - "0x845ngfl6vf65fnpb5mm3wj0ql45pz11bnm0x4gxc4ybd9c52ij")))) + "1vfrqlpn32s9wiykmkxbnrnd5p56yznw20pf8fwzw78ar4wpz55x")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing. (inputs `(("ghc-setenv" ,ghc-setenv) ("ghc-ansi-terminal" ,ghc-ansi-terminal) ("ghc-async" ,ghc-async) + ("ghc-clock" ,ghc-clock) ("ghc-quickcheck-io" ,ghc-quickcheck-io) ("ghc-hunit" ,ghc-hunit) ("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From 31caca659bcbfab5d7b087eebc18af93f13af615 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 15 Aug 2018 11:20:49 +0200 Subject: gnu: ghc-hspec-meta: Update to 2.4.6. * gnu/packages/haskell-check.scm (ghc-hspec-meta): Update to 2.4.6. --- gnu/packages/haskell-check.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu/packages/haskell-check.scm') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index ef07748daa..a2e91d9390 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -679,17 +679,15 @@ (define-public ghc-hspec-core (define-public ghc-hspec-meta (package (name "ghc-hspec-meta") - (version "2.2.1") + (version "2.4.6") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hspec-meta/hspec-meta-" - version - ".tar.gz")) + (uri (string-append "https://hackage.haskell.org/package/hspec-meta/" + "hspec-meta-" version ".tar.gz")) (sha256 (base32 - "1m1pkrxiglxzwv8gdj5jr1bdbhxvvg6sbl9m61w4565d7k1m8yxa")))) + "0qmvk01n79j6skn79r6zalg2pd0x0nqqn9qn8mhg0pgyzcdnfc9b")))) (build-system haskell-build-system) (inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From 33a0785998a2d418ad2d630d067f73959b0f4ade Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 15 Aug 2018 11:21:11 +0200 Subject: gnu: ghc-hspec-contrib: Update to 0.5.0. * gnu/packages/haskell-check.scm (ghc-hspec-contrib): Update to 0.5.0. --- gnu/packages/haskell-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/haskell-check.scm') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index a2e91d9390..dcf79b610f 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -736,7 +736,7 @@ (define-public ghc-hspec (define-public ghc-hspec-contrib (package (name "ghc-hspec-contrib") - (version "0.3.0") + (version "0.5.0") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -744,7 +744,7 @@ (define-public ghc-hspec-contrib version ".tar.gz")) (sha256 (base32 - "006syw8xagfhsx06ws9ywig1qx5lk4cgl7sq6pbid1s64c72mxn4")))) + "13579xdqwbsy8k0vxdcvgy932d4p76mij1rzkzbpqbspfn7399yv")))) (build-system haskell-build-system) (inputs `(("ghc-hspec-core" ,ghc-hspec-core) -- cgit v1.2.3 From 15fb81e58759809659d00b16e8af6c46665cc8a4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 15 Aug 2018 11:21:28 +0200 Subject: gnu: ghc-hspec-expectations: Update to 0.8.2. * gnu/packages/haskell-check.scm (ghc-hspec-expectations): Update to 0.8.2. [arguments]: Disable tests. --- gnu/packages/haskell-check.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages/haskell-check.scm') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index dcf79b610f..a3179cf945 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -762,18 +762,19 @@ (define-public ghc-hspec-contrib (define-public ghc-hspec-expectations (package (name "ghc-hspec-expectations") - (version "0.7.2") + (version "0.8.2") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hspec-expectations/hspec-expectations-" - version - ".tar.gz")) + (uri (string-append "https://hackage.haskell.org/package/" + "hspec-expectations/hspec-expectations-" + version ".tar.gz")) (sha256 (base32 - "1w56jiqfyl237sr207gh3b0l8sr9layy0mdsgd5wknzb49mif6ip")))) + "1vxl9zazbaapijr6zmcj72j9wf7ka1pirrjbwddwwddg3zm0g5l1")))) (build-system haskell-build-system) + ;; Tests depend on ghc-nanospec. + (arguments '(#:tests? #f)) (inputs `(("ghc-hunit" ,ghc-hunit))) (home-page "https://github.com/sol/hspec-expectations") (synopsis "Catchy combinators for HUnit") -- cgit v1.2.3 From c2c8d998fb18d3c8832fefb4594b37d97d85e687 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 15 Aug 2018 11:21:54 +0200 Subject: gnu: ghc-hspec: Update to 2.5.5. * gnu/packages/haskell-check.scm (ghc-hspec): Update to 2.5.5. --- gnu/packages/haskell-check.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu/packages/haskell-check.scm') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index a3179cf945..d6b171d5b3 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -707,17 +707,15 @@ (define-public ghc-hspec-meta (define-public ghc-hspec (package (name "ghc-hspec") - (version "2.2.4") + (version "2.5.5") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hspec/hspec-" - version - ".tar.gz")) + (uri (string-append "https://hackage.haskell.org/package/hspec/" + "hspec-" version ".tar.gz")) (sha256 (base32 - "1cf90gqvg1iknja6ymxqxyabpahcxni3blqllh81ywbir3whljvj")))) + "1yv4k5b5kkig2q3waj28587sq28wms7wfav5a3lq4dra6jybimfm")))) (build-system haskell-build-system) (inputs `(("ghc-hspec-core" ,ghc-hspec-core) -- cgit v1.2.3 From f1ac3bba6648484b096a6792940e0e2c55b151e0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 15 Aug 2018 11:25:45 +0200 Subject: gnu: ghc-hunit: Update to 1.6.0.0. * gnu/packages/haskell-check.scm (ghc-hunit): Update to 1.6.0.0. [inputs]: Add ghc-call-stack-boot. --- gnu/packages/haskell-check.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu/packages/haskell-check.scm') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index d6b171d5b3..b2d352050f 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -603,19 +603,21 @@ (define-public ghc-test-framework-th (define-public ghc-hunit (package (name "ghc-hunit") - (version "1.3.1.2") + (version "1.6.0.0") (outputs '("out" "doc")) (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/HUnit/HUnit-" - version - ".tar.gz")) + (uri (string-append "https://hackage.haskell.org/package/HUnit/" + "HUnit-" version ".tar.gz")) (sha256 (base32 - "10akdh4fl615rrshxi3m5gf414il1q42z4zqyb6q4jasmscvzpms")))) + "1pnhwqq5v8h48gbp3ibv3skfj25mf4zs5svxcavq93p9cswycj3l")))) (build-system haskell-build-system) + (inputs + ;; We cannot use ghc-call-stack there, because it depends on + ;; ghc-nanospec, which depends on ghc-hunit. + `(("ghc-call-stack" ,ghc-call-stack-boot))) (home-page "http://hunit.sourceforge.net/") (synopsis "Unit testing framework for Haskell") (description -- cgit v1.2.3 From a5f7a5f6eddc4a37deadb9988ee8186726f1bc7a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 15 Aug 2018 11:26:10 +0200 Subject: gnu: ghc-test-framework-hunit: Fix build with new HUnit. * gnu/packages/haskell-check.scm (ghc-test-framework-hunit)[arguments]: Allow newer version of HUnit. --- gnu/packages/haskell-check.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/haskell-check.scm') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index b2d352050f..1d673c606a 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -530,6 +530,9 @@ (define-public ghc-test-framework-hunit (base32 "1y0b6vg8nfm43v90lxxcydhi6qlxhfy4vpxbzm5ic2w55bh8xjwm")))) (build-system haskell-build-system) + ;; The official revision of the cabal file allows for HUnit lower than 1.7 + (arguments + `(#:configure-flags (list "--allow-newer=HUnit"))) (inputs `(("ghc-extensible-exceptions" ,ghc-extensible-exceptions) ("ghc-hunit" ,ghc-hunit) -- cgit v1.2.3 From cdccdec1f2a28f9091372141d25eca380e1c1e53 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Thu, 23 Aug 2018 14:37:57 +0530 Subject: gnu: ghc-quickcheck-instances: Update to 0.3.18. * gnu/packages/haskell-check.scm (ghc-quickcheck-instances): Update to 0.3.18. [arguments]: Allow building with newer base-compat. --- gnu/packages/haskell-check.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu/packages/haskell-check.scm') diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 1d673c606a..c3ef85f3f0 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017 rsiddharth ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Tonton +;;; Copyright © 2018 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -342,7 +343,7 @@ (define-public ghc-tasty-expected-failure (define-public ghc-quickcheck-instances (package (name "ghc-quickcheck-instances") - (version "0.3.16.1") + (version "0.3.18") (source (origin (method url-fetch) @@ -352,8 +353,10 @@ (define-public ghc-quickcheck-instances version ".tar.gz")) (sha256 (base32 - "01v5bs7r9yvhkvb4yc9bqnacy8r6cy2gr9lnmwx40n5apgi0gcbz")))) + "1bh1pzz5fdcqvzdcirqxna6fnjms02min5md716299g5niz46w55")))) (build-system haskell-build-system) + (arguments + `(#:configure-flags (list "--allow-newer=base-compat"))) (inputs `(("ghc-quickcheck" ,ghc-quickcheck) ("ghc-base-compat" ,ghc-base-compat) -- cgit v1.2.3