From 5b9a7fc95a0ed8f60c6bd9e302fc5c25e3282477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 23 Feb 2013 12:32:15 +0100 Subject: [PATCH 01/57] my-env/default.nix: fix "sdl-env" vs "env-sdl" typo my-env/default.nix lists an example on how to create an SDL environment that can be installed with "nix-env -i sdl-env". That is actually wrong and will not work. The correct command is "nix-env -i env-sdl". --- pkgs/misc/my-env/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index 19c105bf4f02..39fd99792667 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -12,7 +12,7 @@ } # Then you can install it by: - # $ nix-env -i sdl-env + # $ nix-env -i env-sdl # And you can load it simply calling: # $ load-env-sdl # and this will update your env vars to have 'make' and 'gcc' finding the SDL From c18e2ea90282b56b9407323fd740fa191b708c9d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 23:41:08 +0100 Subject: [PATCH 02/57] pkgs/build-support/cabal: filter internal 'testDepends' field from the expression to avoid unnecessary hash changes --- pkgs/build-support/cabal/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index 650807c324a2..9fe917a35f12 100644 --- a/pkgs/build-support/cabal/default.nix +++ b/pkgs/build-support/cabal/default.nix @@ -8,7 +8,7 @@ # environment overly, but also to keep hash-backwards-compatible with the old cabal.nix. internalAttrs = [ "internalAttrs" "buildDepends" "buildTools" "extraLibraries" "pkgconfigDepends" - "isLibrary" "isExecutable" + "isLibrary" "isExecutable" "testDepends" ]; # Stuff happening after the user preferences have been processed. We remove From d8974b47cb7069fa6e0b4e1d1b93d8695ff1e510 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 23:43:34 +0100 Subject: [PATCH 03/57] pkgs/build-support/cabal: filter 'doCheck=false' field from the expression to avoid unnecessary hash changes In the master branch, doCheck defaults to 'false', which means that no package will change its hash unless its doCheck field is set to 'true' explicitly. In the stdenv-updates branch, however, all Haskell packages have a default setting of 'doCheck=true'. Once that branch has been merged, filtering doCheck is no longer necessary. --- pkgs/build-support/cabal/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index 9fe917a35f12..706c9caca1cc 100644 --- a/pkgs/build-support/cabal/default.nix +++ b/pkgs/build-support/cabal/default.nix @@ -9,7 +9,7 @@ internalAttrs = [ "internalAttrs" "buildDepends" "buildTools" "extraLibraries" "pkgconfigDepends" "isLibrary" "isExecutable" "testDepends" - ]; + ] ++ stdenv.lib.optional (!args.doCheck or false) "doCheck"; # Stuff happening after the user preferences have been processed. We remove # internal attributes and strip null elements from the dependency lists, all From d0bfd6936e640db813c21d6c6fc34421ff49e941 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 00:31:34 +0100 Subject: [PATCH 04/57] pkgs/build-support/cabal: add 'testDepends' to 'extraBuildInputs' if 'doCheck' is set to 'true' --- pkgs/build-support/cabal/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index 706c9caca1cc..7dc58a0adfe3 100644 --- a/pkgs/build-support/cabal/default.nix +++ b/pkgs/build-support/cabal/default.nix @@ -55,6 +55,7 @@ # but often propagatedBuildInputs is preferable anyway buildInputs = [ghc Cabal] ++ self.extraBuildInputs; extraBuildInputs = self.buildTools ++ + (stdenv.lib.optionals (self.doCheck or false) self.testDepends) ++ (if self.pkgconfigDepends == [] then [] else [pkgconfig]) ++ (if self.isLibrary then [] else self.buildDepends ++ self.extraLibraries ++ self.pkgconfigDepends); From a30df956918aab12b7e83539ca98dafa9a829af4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:09:07 +0100 Subject: [PATCH 05/57] Re-generate all Haskell packages with the latest version of cabal2nix. This change brings support for building and running the regressions test suites. --- pkgs/applications/editors/leksah/default.nix | 1 + .../libraries/haskell/Cabal/1.14.0.nix | 8 +++++++- .../libraries/haskell/Cabal/1.16.0.3.nix | 8 +++++++- .../libraries/haskell/CouchDB/default.nix | 3 ++- .../libraries/haskell/HTTP/4000.2.1.nix | 7 ++++++- .../libraries/haskell/HTTP/4000.2.2.nix | 7 ++++++- .../libraries/haskell/HTTP/4000.2.3.nix | 7 ++++++- .../libraries/haskell/HTTP/4000.2.5.nix | 9 ++++++++- .../libraries/haskell/HTTP/4000.2.8.nix | 9 ++++++++- .../libraries/haskell/IORefCAS/default.nix | 3 ++- .../libraries/haskell/ReadArgs/default.nix | 3 ++- .../haskell/SafeSemaphore/default.nix | 3 ++- .../libraries/haskell/active/default.nix | 7 ++++++- .../libraries/haskell/aeson/default.nix | 7 ++++++- .../libraries/haskell/async/2.0.1.3.nix | 3 ++- .../libraries/haskell/async/2.0.1.4.nix | 3 ++- .../haskell/attoparsec-conduit/default.nix | 4 +++- .../libraries/haskell/attoparsec/default.nix | 7 ++++++- .../haskell/base64-bytestring/default.nix | 8 +++++++- .../haskell/base64-conduit/default.nix | 6 +++++- .../libraries/haskell/binary/default.nix | 7 ++++++- .../haskell/blaze-builder-conduit/default.nix | 7 ++++++- .../libraries/haskell/blaze-html/default.nix | 8 +++++++- .../libraries/haskell/blaze-markup/default.nix | 8 +++++++- .../haskell/blaze-textual/default.nix | 8 +++++++- .../libraries/haskell/bson/default.nix | 8 ++++++-- .../haskell/case-insensitive/default.nix | 5 ++++- .../libraries/haskell/cipher-aes/default.nix | 5 ++++- .../libraries/haskell/cipher-rc4/default.nix | 5 ++++- .../haskell/classy-prelude-conduit/default.nix | 5 +++-- .../haskell/classy-prelude/default.nix | 5 +++-- .../haskell/clientsession/default.nix | 3 ++- .../libraries/haskell/conduit/default.nix | 7 +++++-- .../haskell/crypto-conduit/default.nix | 8 +++++++- .../haskell/crypto-numbers/default.nix | 8 +++++++- .../haskell/crypto-pubkey/default.nix | 7 ++++++- .../libraries/haskell/cryptocipher/default.nix | 9 +++++++-- .../libraries/haskell/cryptohash/default.nix | 8 +++++++- .../libraries/haskell/css-text/default.nix | 3 ++- .../libraries/haskell/deepseq-th/default.nix | 1 + .../libraries/haskell/diagrams/contrib.nix | 9 +++++++-- .../haskell/digestive-functors/default.nix | 3 ++- .../haskell/distributed-process/default.nix | 12 +++++++++--- .../libraries/haskell/distributive/default.nix | 3 ++- .../libraries/haskell/doctest/default.nix | 8 +++++++- .../haskell/double-conversion/default.nix | 3 ++- .../haskell/email-validate/default.nix | 8 +++++++- .../haskell/exception-transformers/default.nix | 3 ++- .../libraries/haskell/fast-logger/default.nix | 4 +++- .../libraries/haskell/file-embed/default.nix | 3 ++- .../haskell/filesystem-conduit/default.nix | 6 +++++- .../libraries/haskell/fsnotify/default.nix | 8 +++++++- .../libraries/haskell/ghc-events/default.nix | 1 + .../libraries/haskell/graphviz/default.nix | 8 ++++++-- .../libraries/haskell/hakyll/default.nix | 13 ++++++++++--- .../libraries/haskell/hamlet/default.nix | 5 +++-- .../haskell/happstack/happstack-server.nix | 8 +++++--- .../libraries/haskell/hashable/1.1.2.5.nix | 7 ++++++- .../libraries/haskell/hastache/default.nix | 3 ++- .../libraries/haskell/hjsmin/default.nix | 8 +++++++- .../libraries/haskell/hsemail/default.nix | 3 ++- .../haskell/hspec-expectations/default.nix | 3 ++- .../libraries/haskell/hspec/default.nix | 9 +++++++-- .../libraries/haskell/html-conduit/default.nix | 6 ++++-- .../libraries/haskell/http-conduit/default.nix | 16 ++++++++++++---- .../libraries/haskell/http-date/default.nix | 3 ++- .../haskell/http-reverse-proxy/default.nix | 9 +++++++-- .../libraries/haskell/http-types/default.nix | 3 ++- .../libraries/haskell/io-choice/default.nix | 4 +++- .../libraries/haskell/iproute/default.nix | 7 ++++++- .../haskell/language-c-quote/default.nix | 6 +++++- .../haskell/language-javascript/default.nix | 8 +++++++- .../libraries/haskell/largeword/default.nix | 8 +++++++- .../libraries/haskell/leksah/leksah-server.nix | 5 +++-- .../libraries/haskell/lens/default.nix | 18 +++++++++++++----- .../libraries/haskell/libmpd/default.nix | 7 ++++++- .../libraries/haskell/lifted-base/default.nix | 8 +++++++- .../haskell/math-functions/default.nix | 8 +++++++- .../libraries/haskell/minimorph/default.nix | 3 ++- .../libraries/haskell/miniutter/default.nix | 4 +++- .../libraries/haskell/monad-par/0.3.4.nix | 11 +++++++++-- .../libraries/haskell/mwc-random/default.nix | 8 +++++++- .../haskell/network-conduit/default.nix | 1 + .../haskell/network-transport-tcp/default.nix | 12 +++++++++++- .../libraries/haskell/network/2.3.0.13.nix | 3 ++- .../libraries/haskell/network/2.3.1.0.nix | 3 ++- .../libraries/haskell/network/2.4.1.2.nix | 7 ++++++- .../libraries/haskell/numbers/default.nix | 5 ++++- .../haskell/optparse-applicative/default.nix | 7 ++++++- .../libraries/haskell/path-pieces/default.nix | 3 ++- .../libraries/haskell/pem/default.nix | 7 ++++++- .../haskell/persistent-template/default.nix | 5 ++++- .../libraries/haskell/persistent/default.nix | 8 +++++--- .../haskell/postgresql-simple/default.nix | 6 ++++-- .../haskell/project-template/default.nix | 7 ++++++- .../haskell/publicsuffixlist/default.nix | 3 ++- .../haskell/reactive-banana/default.nix | 8 +++++++- .../libraries/haskell/resourcet/default.nix | 3 ++- .../libraries/haskell/setenv/default.nix | 3 ++- .../haskell/shakespeare-css/default.nix | 3 ++- .../haskell/shakespeare-js/default.nix | 3 ++- .../haskell/shakespeare-text/default.nix | 3 ++- .../libraries/haskell/shakespeare/default.nix | 3 ++- .../libraries/haskell/shelly/default.nix | 6 +++++- .../libraries/haskell/silently/default.nix | 3 ++- .../haskell/simple-sendfile/default.nix | 3 ++- .../libraries/haskell/skein/default.nix | 3 ++- .../libraries/haskell/split/0.2.1.1.nix | 3 ++- .../libraries/haskell/split/0.2.1.2.nix | 3 ++- .../libraries/haskell/statistics/default.nix | 10 ++++++++-- .../haskell/stylish-haskell/default.nix | 8 ++++++-- .../haskell/tagstream-conduit/default.nix | 4 +++- .../libraries/haskell/text/0.11.1.13.nix | 8 +++++++- .../libraries/haskell/text/0.11.2.0.nix | 8 +++++++- .../libraries/haskell/text/0.11.2.3.nix | 8 +++++++- .../libraries/haskell/threads/default.nix | 8 +++++++- .../libraries/haskell/time/1.4.0.2.nix | 7 ++++++- .../libraries/haskell/tls/default.nix | 9 +++++++-- .../libraries/haskell/unix-time/default.nix | 3 ++- .../haskell/unordered-containers/default.nix | 8 +++++++- .../libraries/haskell/utility-ht/default.nix | 3 ++- .../libraries/haskell/uuid/default.nix | 7 ++++++- .../libraries/haskell/vty/default.nix | 8 ++++++-- .../haskell/wai-app-static/default.nix | 10 +++++++--- .../libraries/haskell/wai-extra/default.nix | 9 +++++++-- .../libraries/haskell/warp/default.nix | 10 ++++++++-- .../libraries/haskell/word8/default.nix | 3 ++- .../libraries/haskell/xml-conduit/default.nix | 7 +++++-- .../libraries/haskell/xml-hamlet/default.nix | 3 ++- .../libraries/haskell/xss-sanitize/default.nix | 7 ++++++- .../libraries/haskell/yaml/default.nix | 7 +++++-- .../libraries/haskell/yesod-core/default.nix | 14 +++++++++----- .../libraries/haskell/yesod-form/default.nix | 3 ++- .../libraries/haskell/yesod-routes/default.nix | 3 ++- .../libraries/haskell/yesod-static/default.nix | 7 ++++++- .../libraries/haskell/yesod-test/default.nix | 1 + .../haskell/zeromq-haskell/default.nix | 7 ++++++- .../haskell/zeromq3-haskell/default.nix | 7 ++++++- .../libraries/haskell/zip-archive/default.nix | 5 ++++- .../haskell/zlib-bindings/default.nix | 3 ++- .../libraries/haskell/zlib-conduit/default.nix | 5 ++++- .../tools/documentation/haddock/2.10.0.nix | 1 + .../tools/documentation/haddock/2.11.0.nix | 1 + .../tools/documentation/haddock/2.12.0.nix | 1 + .../tools/documentation/haddock/2.13.1.nix | 1 + .../tools/documentation/haddock/2.9.4.nix | 4 +++- 146 files changed, 680 insertions(+), 180 deletions(-) diff --git a/pkgs/applications/editors/leksah/default.nix b/pkgs/applications/editors/leksah/default.nix index 81fbf5ad98a1..86f0106ed050 100644 --- a/pkgs/applications/editors/leksah/default.nix +++ b/pkgs/applications/editors/leksah/default.nix @@ -16,6 +16,7 @@ cabal.mkDerivation (self: { QuickCheck regexBase regexTdfa strict text time transformers utf8String ]; + testDepends = [ Cabal QuickCheck ]; noHaddock = true; meta = { homepage = "http://www.leksah.org"; diff --git a/pkgs/development/libraries/haskell/Cabal/1.14.0.nix b/pkgs/development/libraries/haskell/Cabal/1.14.0.nix index b424551a2f95..09171ab25706 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.14.0.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.14.0.nix @@ -1,10 +1,16 @@ -{ cabal, filepath }: +{ cabal, extensibleExceptions, filepath, HUnit, QuickCheck +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "Cabal"; version = "1.14.0"; sha256 = "1r5b4x1ham5gdg9m9l8idpvr9czlk1q21vqmg0di4adkp2fhlm3j"; buildDepends = [ filepath ]; + testDepends = [ + extensibleExceptions filepath HUnit QuickCheck testFramework + testFrameworkHunit testFrameworkQuickcheck2 + ]; meta = { homepage = "http://www.haskell.org/cabal/"; description = "A framework for packaging Haskell software"; diff --git a/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix b/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix index 68b985507b6f..2814eae845f2 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix @@ -1,10 +1,16 @@ -{ cabal, filepath }: +{ cabal, extensibleExceptions, filepath, HUnit, QuickCheck +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "Cabal"; version = "1.16.0.3"; sha256 = "11lzqgdjaix8n7nabmafl3jf9gisb04c025cmdycfihfajfn49zg"; buildDepends = [ filepath ]; + testDepends = [ + extensibleExceptions filepath HUnit QuickCheck testFramework + testFrameworkHunit testFrameworkQuickcheck2 + ]; meta = { homepage = "http://www.haskell.org/cabal/"; description = "A framework for packaging Haskell software"; diff --git a/pkgs/development/libraries/haskell/CouchDB/default.nix b/pkgs/development/libraries/haskell/CouchDB/default.nix index 705a0a5fdea4..4a413e2e7b85 100644 --- a/pkgs/development/libraries/haskell/CouchDB/default.nix +++ b/pkgs/development/libraries/haskell/CouchDB/default.nix @@ -1,10 +1,11 @@ -{ cabal, HTTP, json, mtl, network, utf8String }: +{ cabal, HTTP, HUnit, json, mtl, network, utf8String }: cabal.mkDerivation (self: { pname = "CouchDB"; version = "1.2"; sha256 = "0a9g0iblfyqppcy1ni3ac8f3yv5km95bfblhwqlsk6khydi5ka98"; buildDepends = [ HTTP json mtl network utf8String ]; + testDepends = [ HTTP HUnit json mtl network utf8String ]; meta = { homepage = "http://github.com/arjunguha/haskell-couchdb/"; description = "CouchDB interface"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix index 5c6057ace9e9..0c7fa0bfa789 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix @@ -1,10 +1,15 @@ -{ cabal, mtl, network, parsec }: +{ cabal, httpdShed, HUnit, mtl, network, parsec, split +, testFramework, testFrameworkHunit +}: cabal.mkDerivation (self: { pname = "HTTP"; version = "4000.2.1"; sha256 = "01076rk7ly5228pszn54x4nqc6rqq1xw11ij9ajvhzf419islh0a"; buildDepends = [ mtl network parsec ]; + testDepends = [ + httpdShed HUnit network split testFramework testFrameworkHunit + ]; meta = { homepage = "https://github.com/haskell/HTTP"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix index 5fbb2ed8a843..805bf36f5df8 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix @@ -1,10 +1,15 @@ -{ cabal, mtl, network, parsec }: +{ cabal, httpdShed, HUnit, mtl, network, parsec, split +, testFramework, testFrameworkHunit +}: cabal.mkDerivation (self: { pname = "HTTP"; version = "4000.2.2"; sha256 = "0qrr9wdj25sdfxifppmw0w14g8skpgf42ic4iqcqylxxzfa8v7vh"; buildDepends = [ mtl network parsec ]; + testDepends = [ + httpdShed HUnit network split testFramework testFrameworkHunit + ]; meta = { homepage = "https://github.com/haskell/HTTP"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix index cff762864bc6..a0b328d702cc 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix @@ -1,10 +1,15 @@ -{ cabal, mtl, network, parsec }: +{ cabal, httpdShed, HUnit, mtl, network, parsec, split +, testFramework, testFrameworkHunit +}: cabal.mkDerivation (self: { pname = "HTTP"; version = "4000.2.3"; sha256 = "1z7s5rkyljwdl95cwqbqg64i207wjwxgpksrdmvcv82k39srzx80"; buildDepends = [ mtl network parsec ]; + testDepends = [ + httpdShed HUnit network split testFramework testFrameworkHunit + ]; meta = { homepage = "https://github.com/haskell/HTTP"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix index f345e7c98e1c..4adae562476e 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix @@ -1,10 +1,17 @@ -{ cabal, mtl, network, parsec }: +{ cabal, caseInsensitive, conduit, deepseq, httpdShed, httpTypes +, HUnit, mtl, network, parsec, pureMD5, split, testFramework +, testFrameworkHunit, wai, warp +}: cabal.mkDerivation (self: { pname = "HTTP"; version = "4000.2.5"; sha256 = "03ij1zkykc438x2r1szz6ddvfhrjywlx61nrz377srcpbdmhxpb7"; buildDepends = [ mtl network parsec ]; + testDepends = [ + caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl + network pureMD5 split testFramework testFrameworkHunit wai warp + ]; meta = { homepage = "https://github.com/haskell/HTTP"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix index 6cb7ed57b4c4..f0c103622a9e 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix @@ -1,10 +1,17 @@ -{ cabal, mtl, network, parsec }: +{ cabal, caseInsensitive, conduit, deepseq, httpdShed, httpTypes +, HUnit, mtl, network, parsec, pureMD5, split, testFramework +, testFrameworkHunit, wai, warp +}: cabal.mkDerivation (self: { pname = "HTTP"; version = "4000.2.8"; sha256 = "0p0cwzjw2102bsyfaga6m8b53s6qnhd6byg2j2qla653f6kjlsh8"; buildDepends = [ mtl network parsec ]; + testDepends = [ + caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl + network pureMD5 split testFramework testFrameworkHunit wai warp + ]; meta = { homepage = "https://github.com/haskell/HTTP"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/IORefCAS/default.nix b/pkgs/development/libraries/haskell/IORefCAS/default.nix index fc9b09bd0d74..beec7ded7893 100644 --- a/pkgs/development/libraries/haskell/IORefCAS/default.nix +++ b/pkgs/development/libraries/haskell/IORefCAS/default.nix @@ -1,10 +1,11 @@ -{ cabal, bitsAtomic }: +{ cabal, bitsAtomic, HUnit, QuickCheck }: cabal.mkDerivation (self: { pname = "IORefCAS"; version = "0.2"; sha256 = "18hyy3jqr9yky5r873816fqnywrwba90sq6zx61i2vkqlfbll1k9"; buildDepends = [ bitsAtomic ]; + testDepends = [ bitsAtomic HUnit QuickCheck ]; meta = { description = "Atomic compare and swap for IORefs and STRefs"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/ReadArgs/default.nix b/pkgs/development/libraries/haskell/ReadArgs/default.nix index 4b8a513914a1..12c3e34571e8 100644 --- a/pkgs/development/libraries/haskell/ReadArgs/default.nix +++ b/pkgs/development/libraries/haskell/ReadArgs/default.nix @@ -1,4 +1,4 @@ -{ cabal, systemFilepath, text }: +{ cabal, hspec, systemFilepath, text }: cabal.mkDerivation (self: { pname = "ReadArgs"; @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ systemFilepath text ]; + testDepends = [ hspec systemFilepath text ]; meta = { homepage = "http://github.com/rampion/ReadArgs"; description = "Simple command line argument parsing"; diff --git a/pkgs/development/libraries/haskell/SafeSemaphore/default.nix b/pkgs/development/libraries/haskell/SafeSemaphore/default.nix index ad161f971024..d4cc74902776 100644 --- a/pkgs/development/libraries/haskell/SafeSemaphore/default.nix +++ b/pkgs/development/libraries/haskell/SafeSemaphore/default.nix @@ -1,10 +1,11 @@ -{ cabal, stm }: +{ cabal, HUnit, stm }: cabal.mkDerivation (self: { pname = "SafeSemaphore"; version = "0.9.0"; sha256 = "1xa30cciw8wmri675kdsz4pb5qwrh592pzylbhawqsvsarf80gz4"; buildDepends = [ stm ]; + testDepends = [ HUnit ]; meta = { homepage = "https://github.com/ChrisKuklewicz/SafeSemaphore"; description = "Much safer replacement for QSemN, QSem, and SampleVar"; diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix index d3307d0a30d3..19afa5ab75e6 100644 --- a/pkgs/development/libraries/haskell/active/default.nix +++ b/pkgs/development/libraries/haskell/active/default.nix @@ -1,10 +1,15 @@ -{ cabal, newtype, semigroupoids, semigroups, vectorSpace }: +{ cabal, newtype, QuickCheck, semigroupoids, semigroups +, vectorSpace +}: cabal.mkDerivation (self: { pname = "active"; version = "0.1.0.3"; sha256 = "0jarc270z6raak1vz30jy2gl0pkj9a2x3ib5hq7vsl2ljbvbgyqi"; buildDepends = [ newtype semigroupoids semigroups vectorSpace ]; + testDepends = [ + newtype QuickCheck semigroupoids semigroups vectorSpace + ]; jailbreak = true; meta = { description = "Abstractions for animation"; diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix index b0f89619b1c5..515cec37a995 100644 --- a/pkgs/development/libraries/haskell/aeson/default.nix +++ b/pkgs/development/libraries/haskell/aeson/default.nix @@ -1,5 +1,6 @@ { cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, mtl -, syb, text, time, unorderedContainers, vector +, QuickCheck, syb, testFramework, testFrameworkQuickcheck2, text +, time, unorderedContainers, vector }: cabal.mkDerivation (self: { @@ -10,6 +11,10 @@ cabal.mkDerivation (self: { attoparsec blazeBuilder deepseq dlist hashable mtl syb text time unorderedContainers vector ]; + testDepends = [ + attoparsec QuickCheck testFramework testFrameworkQuickcheck2 text + time + ]; meta = { homepage = "https://github.com/bos/aeson"; description = "Fast JSON parsing and encoding"; diff --git a/pkgs/development/libraries/haskell/async/2.0.1.3.nix b/pkgs/development/libraries/haskell/async/2.0.1.3.nix index a0da6384e958..1b943208dea4 100644 --- a/pkgs/development/libraries/haskell/async/2.0.1.3.nix +++ b/pkgs/development/libraries/haskell/async/2.0.1.3.nix @@ -1,10 +1,11 @@ -{ cabal, stm }: +{ cabal, HUnit, stm, testFramework, testFrameworkHunit }: cabal.mkDerivation (self: { pname = "async"; version = "2.0.1.3"; sha256 = "1rbjr6xw5sp8npw17fxg0942kikssv2hyci2sy26r0na98483mkh"; buildDepends = [ stm ]; + testDepends = [ HUnit testFramework testFrameworkHunit ]; meta = { homepage = "https://github.com/simonmar/async"; description = "Run IO operations asynchronously and wait for their results"; diff --git a/pkgs/development/libraries/haskell/async/2.0.1.4.nix b/pkgs/development/libraries/haskell/async/2.0.1.4.nix index c5caa55e97f0..5dd76b4d6e00 100644 --- a/pkgs/development/libraries/haskell/async/2.0.1.4.nix +++ b/pkgs/development/libraries/haskell/async/2.0.1.4.nix @@ -1,10 +1,11 @@ -{ cabal, stm }: +{ cabal, HUnit, stm, testFramework, testFrameworkHunit }: cabal.mkDerivation (self: { pname = "async"; version = "2.0.1.4"; sha256 = "1hi40bjwpl65mz7zj0sgh16bp9dwafbm5ysi2q8fzwwq5l0zxpa1"; buildDepends = [ stm ]; + testDepends = [ HUnit testFramework testFrameworkHunit ]; meta = { homepage = "https://github.com/simonmar/async"; description = "Run IO operations asynchronously and wait for their results"; diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix index 916f38f66c57..37af5eec0af5 100644 --- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix @@ -1,10 +1,12 @@ -{ cabal, attoparsec, conduit, text, transformers }: +{ cabal, attoparsec, conduit, hspec, resourcet, text, transformers +}: cabal.mkDerivation (self: { pname = "attoparsec-conduit"; version = "1.0.0"; sha256 = "1aw071qcwhxwpd6azhgaiia97rhj50rms4pysbc19iihmdih3ib8"; buildDepends = [ attoparsec conduit text transformers ]; + testDepends = [ attoparsec conduit hspec resourcet text ]; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Consume attoparsec parsers via conduit"; diff --git a/pkgs/development/libraries/haskell/attoparsec/default.nix b/pkgs/development/libraries/haskell/attoparsec/default.nix index fda3ae1474b2..c352ce7ca8ec 100644 --- a/pkgs/development/libraries/haskell/attoparsec/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec/default.nix @@ -1,10 +1,15 @@ -{ cabal, deepseq, text }: +{ cabal, deepseq, QuickCheck, testFramework +, testFrameworkQuickcheck2, text +}: cabal.mkDerivation (self: { pname = "attoparsec"; version = "0.10.4.0"; sha256 = "0inkcrl40j9kgcmmi0xkcszayqjd5yn7i9fyvv0ywfqwpl6lxf5n"; buildDepends = [ deepseq text ]; + testDepends = [ + QuickCheck testFramework testFrameworkQuickcheck2 text + ]; meta = { homepage = "https://github.com/bos/attoparsec"; description = "Fast combinator parsing for bytestrings and text"; diff --git a/pkgs/development/libraries/haskell/base64-bytestring/default.nix b/pkgs/development/libraries/haskell/base64-bytestring/default.nix index 5891131d7e85..67450dc88874 100644 --- a/pkgs/development/libraries/haskell/base64-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base64-bytestring/default.nix @@ -1,9 +1,15 @@ -{ cabal }: +{ cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "base64-bytestring"; version = "1.0.0.1"; sha256 = "0l1v4ddjdsgi9nqzyzcxxj76rwar3lzx8gmwf2r54bqan3san9db"; + testDepends = [ + HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; meta = { homepage = "https://github.com/bos/base64-bytestring"; description = "Fast base64 encoding and decoding for ByteStrings"; diff --git a/pkgs/development/libraries/haskell/base64-conduit/default.nix b/pkgs/development/libraries/haskell/base64-conduit/default.nix index c6d25384be22..3a2d044de64d 100644 --- a/pkgs/development/libraries/haskell/base64-conduit/default.nix +++ b/pkgs/development/libraries/haskell/base64-conduit/default.nix @@ -1,10 +1,14 @@ -{ cabal, base64Bytestring, conduit }: +{ cabal, base64Bytestring, conduit, hspec, QuickCheck, transformers +}: cabal.mkDerivation (self: { pname = "base64-conduit"; version = "1.0.0"; sha256 = "10wjgdixk5da48jpm2i91vy3ckdqpbpgba6hzn7ak6d3qac22m9q"; buildDepends = [ base64Bytestring conduit ]; + testDepends = [ + base64Bytestring conduit hspec QuickCheck transformers + ]; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Base64-encode and decode streams of bytes"; diff --git a/pkgs/development/libraries/haskell/binary/default.nix b/pkgs/development/libraries/haskell/binary/default.nix index ef95d13809f1..b4f205e41b21 100644 --- a/pkgs/development/libraries/haskell/binary/default.nix +++ b/pkgs/development/libraries/haskell/binary/default.nix @@ -1,9 +1,14 @@ -{ cabal }: +{ cabal, QuickCheck, random, testFramework +, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "binary"; version = "0.6.4.0"; sha256 = "0vq80fzhwil5bx4a2vbd3jvfh1awhg1pwxgvq3lvbi37yzl0ydgh"; + testDepends = [ + QuickCheck random testFramework testFrameworkQuickcheck2 + ]; meta = { homepage = "https://github.com/kolmodin/binary"; description = "Binary serialisation for Haskell values using lazy ByteStrings"; diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix index 89ff67fac37c..16c352b7a332 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix @@ -1,10 +1,15 @@ -{ cabal, blazeBuilder, conduit, text, transformers }: +{ cabal, blazeBuilder, conduit, hspec, QuickCheck, text +, transformers +}: cabal.mkDerivation (self: { pname = "blaze-builder-conduit"; version = "1.0.0"; sha256 = "15q0b0k5dxrp9cw2b4qf9mmjwz1mmxrn3890df5rc9z6yajajrc6"; buildDepends = [ blazeBuilder conduit text transformers ]; + testDepends = [ + blazeBuilder conduit hspec QuickCheck transformers + ]; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Convert streams of builders to streams of bytestrings"; diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix index 44f0e0b0e236..59e0f7187515 100644 --- a/pkgs/development/libraries/haskell/blaze-html/default.nix +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -1,10 +1,16 @@ -{ cabal, blazeBuilder, blazeMarkup, text }: +{ cabal, blazeBuilder, blazeMarkup, HUnit, QuickCheck +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text +}: cabal.mkDerivation (self: { pname = "blaze-html"; version = "0.6.0.0"; sha256 = "0n8jpmslcs29pfyb8jhp43dg4058ahd9y3kf2p2wr3r6b9yr5dll"; buildDepends = [ blazeBuilder blazeMarkup text ]; + testDepends = [ + blazeBuilder blazeMarkup HUnit QuickCheck testFramework + testFrameworkHunit testFrameworkQuickcheck2 text + ]; meta = { homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast HTML combinator library for Haskell"; diff --git a/pkgs/development/libraries/haskell/blaze-markup/default.nix b/pkgs/development/libraries/haskell/blaze-markup/default.nix index becd1a24ec60..afd607fe5e82 100644 --- a/pkgs/development/libraries/haskell/blaze-markup/default.nix +++ b/pkgs/development/libraries/haskell/blaze-markup/default.nix @@ -1,10 +1,16 @@ -{ cabal, blazeBuilder, text }: +{ cabal, blazeBuilder, HUnit, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, text +}: cabal.mkDerivation (self: { pname = "blaze-markup"; version = "0.5.1.4"; sha256 = "0g316qhk7yv6y680w93613apfhm458a01g3jmq42yv4ndydkv4rr"; buildDepends = [ blazeBuilder text ]; + testDepends = [ + blazeBuilder HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 text + ]; meta = { homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast markup combinator library for Haskell"; diff --git a/pkgs/development/libraries/haskell/blaze-textual/default.nix b/pkgs/development/libraries/haskell/blaze-textual/default.nix index 65f39c8cc081..ede82e5c2ed3 100644 --- a/pkgs/development/libraries/haskell/blaze-textual/default.nix +++ b/pkgs/development/libraries/haskell/blaze-textual/default.nix @@ -1,10 +1,16 @@ -{ cabal, blazeBuilder, text, time, vector }: +{ cabal, blazeBuilder, doubleConversion, QuickCheck, testFramework +, testFrameworkQuickcheck2, text, time, vector +}: cabal.mkDerivation (self: { pname = "blaze-textual"; version = "0.2.0.8"; sha256 = "0zzqh53ywzz8ss58glp3i8is8gry5yqzvdjw4xh95fbbzcz4cgc7"; buildDepends = [ blazeBuilder text time vector ]; + testDepends = [ + blazeBuilder doubleConversion QuickCheck testFramework + testFrameworkQuickcheck2 + ]; meta = { homepage = "http://github.com/bos/blaze-textual"; description = "Fast rendering of common datatypes"; diff --git a/pkgs/development/libraries/haskell/bson/default.nix b/pkgs/development/libraries/haskell/bson/default.nix index 20107eb17844..6b76aee47a1e 100644 --- a/pkgs/development/libraries/haskell/bson/default.nix +++ b/pkgs/development/libraries/haskell/bson/default.nix @@ -1,5 +1,5 @@ -{ cabal, binary, cryptohash, dataBinaryIeee754, mtl, network, text -, time +{ cabal, binary, cryptohash, dataBinaryIeee754, mtl, network +, QuickCheck, testFramework, testFrameworkQuickcheck2, text, time }: cabal.mkDerivation (self: { @@ -9,6 +9,10 @@ cabal.mkDerivation (self: { buildDepends = [ binary cryptohash dataBinaryIeee754 mtl network text time ]; + testDepends = [ + binary cryptohash dataBinaryIeee754 mtl network QuickCheck + testFramework testFrameworkQuickcheck2 text time + ]; meta = { homepage = "http://github.com/selectel/bson-haskell"; description = "BSON documents are JSON-like objects with a standard binary encoding"; diff --git a/pkgs/development/libraries/haskell/case-insensitive/default.nix b/pkgs/development/libraries/haskell/case-insensitive/default.nix index 58e0ebbbe000..51425084e1c3 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/default.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/default.nix @@ -1,10 +1,13 @@ -{ cabal, deepseq, hashable, text }: +{ cabal, deepseq, hashable, HUnit, testFramework +, testFrameworkHunit, text +}: cabal.mkDerivation (self: { pname = "case-insensitive"; version = "1.0"; sha256 = "1x437b5yyh930a5dr642lvfdgpx12w4ms70whiw1ffjjhssb88zk"; buildDepends = [ deepseq hashable text ]; + testDepends = [ HUnit testFramework testFrameworkHunit text ]; meta = { homepage = "https://github.com/basvandijk/case-insensitive"; description = "Case insensitive string comparison"; diff --git a/pkgs/development/libraries/haskell/cipher-aes/default.nix b/pkgs/development/libraries/haskell/cipher-aes/default.nix index bae237375854..ca2f36159292 100644 --- a/pkgs/development/libraries/haskell/cipher-aes/default.nix +++ b/pkgs/development/libraries/haskell/cipher-aes/default.nix @@ -1,9 +1,12 @@ -{ cabal }: +{ cabal, QuickCheck, testFramework, testFrameworkQuickcheck2 }: cabal.mkDerivation (self: { pname = "cipher-aes"; version = "0.1.7"; sha256 = "1iai9c4rvxframylvc0xwx2nk6s0rsj4dc42wi334xyinilvfyng"; + testDepends = [ + QuickCheck testFramework testFrameworkQuickcheck2 + ]; meta = { homepage = "http://github.com/vincenthz/hs-cipher-aes"; description = "Fast AES cipher implementation with advanced mode of operations"; diff --git a/pkgs/development/libraries/haskell/cipher-rc4/default.nix b/pkgs/development/libraries/haskell/cipher-rc4/default.nix index 234491cde368..7d3cacdd67a9 100644 --- a/pkgs/development/libraries/haskell/cipher-rc4/default.nix +++ b/pkgs/development/libraries/haskell/cipher-rc4/default.nix @@ -1,9 +1,12 @@ -{ cabal }: +{ cabal, QuickCheck, testFramework, testFrameworkQuickcheck2 }: cabal.mkDerivation (self: { pname = "cipher-rc4"; version = "0.1.2"; sha256 = "0nyrqms7h3hq236h03sjjjqdcxn3iz3fg4ifqj43f4nb8gv0ifb1"; + testDepends = [ + QuickCheck testFramework testFrameworkQuickcheck2 + ]; meta = { homepage = "http://github.com/vincenthz/hs-cipher-rc4"; description = "Fast RC4 cipher implementation"; diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix index 85a1fb7bdef5..6af68223834b 100644 --- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix @@ -1,5 +1,5 @@ -{ cabal, classyPrelude, conduit, monadControl, resourcet -, transformers, void, xmlConduit +{ cabal, classyPrelude, conduit, hspec, monadControl, QuickCheck +, resourcet, transformers, void, xmlConduit }: cabal.mkDerivation (self: { @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { classyPrelude conduit monadControl resourcet transformers void xmlConduit ]; + testDepends = [ conduit hspec QuickCheck transformers ]; meta = { homepage = "https://github.com/snoyberg/classy-prelude"; description = "conduit instances for classy-prelude"; diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index 01c26aab79f3..4c2f076039ee 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -1,5 +1,5 @@ -{ cabal, basicPrelude, hashable, liftedBase, systemFilepath, text -, transformers, unorderedContainers, vector +{ cabal, basicPrelude, hashable, hspec, liftedBase, QuickCheck +, systemFilepath, text, transformers, unorderedContainers, vector }: cabal.mkDerivation (self: { @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { basicPrelude hashable liftedBase systemFilepath text transformers unorderedContainers vector ]; + testDepends = [ hspec QuickCheck transformers ]; meta = { homepage = "https://github.com/snoyberg/classy-prelude"; description = "A typeclass-based Prelude"; diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index 81ae5ebddb09..edbb079eec42 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -1,5 +1,5 @@ { cabal, base64Bytestring, cereal, cipherAes, cprngAes, cryptoApi -, entropy, skein, tagged +, entropy, hspec, HUnit, QuickCheck, skein, tagged, transformers }: cabal.mkDerivation (self: { @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { base64Bytestring cereal cipherAes cprngAes cryptoApi entropy skein tagged ]; + testDepends = [ cereal hspec HUnit QuickCheck transformers ]; meta = { homepage = "http://github.com/yesodweb/clientsession/tree/master"; description = "Securely store session data in a client-side cookie"; diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 3ea60db5fb56..4dada2457914 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -1,5 +1,5 @@ -{ cabal, liftedBase, monadControl, resourcet, text, transformers -, transformersBase, void +{ cabal, doctest, hspec, liftedBase, monadControl, QuickCheck +, resourcet, text, transformers, transformersBase, void }: cabal.mkDerivation (self: { @@ -10,6 +10,9 @@ cabal.mkDerivation (self: { liftedBase monadControl resourcet text transformers transformersBase void ]; + testDepends = [ + doctest hspec QuickCheck resourcet text transformers void + ]; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming data processing library"; diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index 29163f897370..69351a2a5aa3 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -1,10 +1,16 @@ -{ cabal, cereal, conduit, cryptoApi, transformers }: +{ cabal, cereal, conduit, cryptoApi, cryptocipher, cryptohash +, hspec, skein, transformers +}: cabal.mkDerivation (self: { pname = "crypto-conduit"; version = "0.5.0"; sha256 = "0mlf2l784w0wyfjqsxzfdwmn1wb0z1s6mb8kdhw8x1z4a8gy9a92"; buildDepends = [ cereal conduit cryptoApi transformers ]; + testDepends = [ + cereal conduit cryptoApi cryptocipher cryptohash hspec skein + transformers + ]; meta = { homepage = "https://github.com/meteficha/crypto-conduit"; description = "Conduit interface for cryptographic operations (from crypto-api)"; diff --git a/pkgs/development/libraries/haskell/crypto-numbers/default.nix b/pkgs/development/libraries/haskell/crypto-numbers/default.nix index 70cd3f44252a..af6985cd9ede 100644 --- a/pkgs/development/libraries/haskell/crypto-numbers/default.nix +++ b/pkgs/development/libraries/haskell/crypto-numbers/default.nix @@ -1,10 +1,16 @@ -{ cabal, cryptoRandomApi, vector }: +{ cabal, cryptoRandomApi, HUnit, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, vector +}: cabal.mkDerivation (self: { pname = "crypto-numbers"; version = "0.1.3"; sha256 = "115lgnay3ly5r53flh3v5jygqks0rg1i8qmbvrqf9nkmnmw6a5x1"; buildDepends = [ cryptoRandomApi vector ]; + testDepends = [ + cryptoRandomApi HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 vector + ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-numbers"; description = "Cryptographic numbers: functions and algorithms"; diff --git a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix index dc6d83a765de..b095b1ea5f4e 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix @@ -1,5 +1,6 @@ { cabal, cryptohash, cryptoNumbers, cryptoPubkeyTypes -, cryptoRandomApi +, cryptoRandomApi, HUnit, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2 }: cabal.mkDerivation (self: { @@ -9,6 +10,10 @@ cabal.mkDerivation (self: { buildDepends = [ cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandomApi ]; + testDepends = [ + cryptohash cryptoNumbers cryptoRandomApi HUnit QuickCheck + testFramework testFrameworkHunit testFrameworkQuickcheck2 + ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-pubkey"; description = "Public Key cryptography"; diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix index 275622d3cad8..dba34752611e 100644 --- a/pkgs/development/libraries/haskell/cryptocipher/default.nix +++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix @@ -1,5 +1,6 @@ -{ cabal, cereal, cipherAes, cipherRc4, cpu, cryptoApi -, cryptoPubkeyTypes, primitive, tagged, vector +{ cabal, cereal, cipherAes, cipherRc4, cpu, cryptoApi, cryptohash +, cryptoPubkeyTypes, entropy, primitive, QuickCheck, tagged +, testFramework, testFrameworkQuickcheck2, vector }: cabal.mkDerivation (self: { @@ -12,6 +13,10 @@ cabal.mkDerivation (self: { cereal cipherAes cipherRc4 cpu cryptoApi cryptoPubkeyTypes primitive tagged vector ]; + testDepends = [ + cryptoApi cryptohash entropy QuickCheck testFramework + testFrameworkQuickcheck2 vector + ]; meta = { homepage = "http://github.com/vincenthz/hs-cryptocipher"; description = "Symmetrical block and stream ciphers"; diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix index 2dc0cad97729..81b361a24779 100644 --- a/pkgs/development/libraries/haskell/cryptohash/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash/default.nix @@ -1,10 +1,16 @@ -{ cabal, cereal, cryptoApi, tagged }: +{ cabal, cereal, cryptoApi, HUnit, QuickCheck, tagged +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "cryptohash"; version = "0.8.3"; sha256 = "1fcqbbclii2hmbhi7h64v0nnbc34zzs107m3lqq38iiyy5fvqqv2"; buildDepends = [ cereal cryptoApi tagged ]; + testDepends = [ + HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; meta = { homepage = "http://github.com/vincenthz/hs-cryptohash"; description = "collection of crypto hashes, fast, pure and practical"; diff --git a/pkgs/development/libraries/haskell/css-text/default.nix b/pkgs/development/libraries/haskell/css-text/default.nix index 9970d87fbe04..f59a80b2b65a 100644 --- a/pkgs/development/libraries/haskell/css-text/default.nix +++ b/pkgs/development/libraries/haskell/css-text/default.nix @@ -1,10 +1,11 @@ -{ cabal, attoparsec, text }: +{ cabal, attoparsec, hspec, HUnit, QuickCheck, text }: cabal.mkDerivation (self: { pname = "css-text"; version = "0.1.1"; sha256 = "10vb08rnfq987w7wrirw8ib1kzafxaaancswm4xpw46ha3rq1m0y"; buildDepends = [ attoparsec text ]; + testDepends = [ attoparsec hspec HUnit QuickCheck text ]; meta = { homepage = "http://www.yesodweb.com/"; description = "CSS parser and renderer"; diff --git a/pkgs/development/libraries/haskell/deepseq-th/default.nix b/pkgs/development/libraries/haskell/deepseq-th/default.nix index 2af4bb9f3f1b..228fcd28c785 100644 --- a/pkgs/development/libraries/haskell/deepseq-th/default.nix +++ b/pkgs/development/libraries/haskell/deepseq-th/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.1.0.4"; sha256 = "12wk8higrp12b22zzz1b4ar1q5h7flk22bp2rvswsqri2zkbi965"; buildDepends = [ deepseq ]; + testDepends = [ deepseq ]; meta = { description = "Template Haskell based deriver for optimised NFData instances"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix index a25603453a75..3ecfe2db8527 100644 --- a/pkgs/development/libraries/haskell/diagrams/contrib.nix +++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix @@ -1,5 +1,6 @@ -{ cabal, colour, dataDefault, diagramsLib, forceLayout, lens, mtl -, vectorSpace +{ cabal, colour, dataDefault, diagramsLib, forceLayout, HUnit, lens +, mtl, QuickCheck, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, vectorSpace }: cabal.mkDerivation (self: { @@ -9,6 +10,10 @@ cabal.mkDerivation (self: { buildDepends = [ colour dataDefault diagramsLib forceLayout lens mtl vectorSpace ]; + testDepends = [ + diagramsLib HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; meta = { homepage = "http://projects.haskell.org/diagrams/"; description = "Collection of user contributions to diagrams EDSL"; diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix index 4ba8b16ec46e..0b956680a84f 100644 --- a/pkgs/development/libraries/haskell/digestive-functors/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix @@ -1,10 +1,11 @@ -{ cabal, mtl, text }: +{ cabal, HUnit, mtl, testFramework, testFrameworkHunit, text }: cabal.mkDerivation (self: { pname = "digestive-functors"; version = "0.6.0.1"; sha256 = "1ni1hfmpz14yvgjphwz64hqhg7xbhvvqbdnapspipplvnl0rcmhi"; buildDepends = [ mtl text ]; + testDepends = [ HUnit mtl testFramework testFrameworkHunit text ]; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "A practical formlet library"; diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix index 1e83cbaa8d95..0427a937f840 100644 --- a/pkgs/development/libraries/haskell/distributed-process/default.nix +++ b/pkgs/development/libraries/haskell/distributed-process/default.nix @@ -1,6 +1,7 @@ -{ cabal, binary, dataAccessor, distributedStatic, mtl -, networkTransport, random, rank1dynamic, stm, syb, time -, transformers +{ cabal, ansiTerminal, binary, dataAccessor, distributedStatic +, HUnit, mtl, network, networkTransport, networkTransportTcp +, random, rank1dynamic, stm, syb, testFramework, testFrameworkHunit +, time, transformers }: cabal.mkDerivation (self: { @@ -13,6 +14,11 @@ cabal.mkDerivation (self: { binary dataAccessor distributedStatic mtl networkTransport random rank1dynamic stm syb time transformers ]; + testDepends = [ + ansiTerminal binary distributedStatic HUnit network + networkTransport networkTransportTcp random stm testFramework + testFrameworkHunit + ]; noHaddock = true; meta = { homepage = "http://github.com/haskell-distributed/distributed-process"; diff --git a/pkgs/development/libraries/haskell/distributive/default.nix b/pkgs/development/libraries/haskell/distributive/default.nix index 6709569b0540..bd8b64aa509a 100644 --- a/pkgs/development/libraries/haskell/distributive/default.nix +++ b/pkgs/development/libraries/haskell/distributive/default.nix @@ -1,10 +1,11 @@ -{ cabal, transformers, transformersCompat }: +{ cabal, doctest, filepath, transformers, transformersCompat }: cabal.mkDerivation (self: { pname = "distributive"; version = "0.3"; sha256 = "0z6vwak2n91vpx9ps9j1pbiw0zlh9jmds84yx1yqssbqx8npi32f"; buildDepends = [ transformers transformersCompat ]; + testDepends = [ doctest filepath ]; meta = { homepage = "http://github.com/ekmett/distributive/"; description = "Haskell 98 Distributive functors -- Dual to Traversable"; diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix index df92c4a6cf50..5dffb52ce1ed 100644 --- a/pkgs/development/libraries/haskell/doctest/default.nix +++ b/pkgs/development/libraries/haskell/doctest/default.nix @@ -1,4 +1,6 @@ -{ cabal, deepseq, filepath, ghcPaths, syb, transformers }: +{ cabal, baseCompat, deepseq, filepath, ghcPaths, hspec, HUnit +, QuickCheck, setenv, silently, stringbuilder, syb, transformers +}: cabal.mkDerivation (self: { pname = "doctest"; @@ -7,6 +9,10 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ deepseq filepath ghcPaths syb transformers ]; + testDepends = [ + baseCompat deepseq filepath ghcPaths hspec HUnit QuickCheck setenv + silently stringbuilder syb transformers + ]; meta = { homepage = "https://github.com/sol/doctest-haskell#readme"; description = "Test interactive Haskell examples"; diff --git a/pkgs/development/libraries/haskell/double-conversion/default.nix b/pkgs/development/libraries/haskell/double-conversion/default.nix index 878eba660a06..cad61e52ee0c 100644 --- a/pkgs/development/libraries/haskell/double-conversion/default.nix +++ b/pkgs/development/libraries/haskell/double-conversion/default.nix @@ -1,10 +1,11 @@ -{ cabal, text }: +{ cabal, testFramework, testFrameworkQuickcheck2, text }: cabal.mkDerivation (self: { pname = "double-conversion"; version = "0.2.0.6"; sha256 = "1c6hy0ghdqf44fvhdpdxjbcr0ahimw283x5fnvjxja36i71qshjp"; buildDepends = [ text ]; + testDepends = [ testFramework testFrameworkQuickcheck2 text ]; meta = { homepage = "https://github.com/bos/double-conversion"; description = "Fast conversion between double precision floating point and text"; diff --git a/pkgs/development/libraries/haskell/email-validate/default.nix b/pkgs/development/libraries/haskell/email-validate/default.nix index 482fd766487f..3ba059261794 100644 --- a/pkgs/development/libraries/haskell/email-validate/default.nix +++ b/pkgs/development/libraries/haskell/email-validate/default.nix @@ -1,10 +1,16 @@ -{ cabal, attoparsec }: +{ cabal, attoparsec, HUnit, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "email-validate"; version = "1.0.0"; sha256 = "0sj1cvn9ap0m8d4cg4cqavvmkd74vp86lyyra9g6f17815sxdbsg"; buildDepends = [ attoparsec ]; + testDepends = [ + HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; meta = { homepage = "http://porg.es/blog/email-address-validation-simpler-faster-more-correct"; description = "Validating an email address string against RFC 5322"; diff --git a/pkgs/development/libraries/haskell/exception-transformers/default.nix b/pkgs/development/libraries/haskell/exception-transformers/default.nix index 5c4a9402020b..a4d0cfd247a1 100644 --- a/pkgs/development/libraries/haskell/exception-transformers/default.nix +++ b/pkgs/development/libraries/haskell/exception-transformers/default.nix @@ -1,10 +1,11 @@ -{ cabal, stm, transformers }: +{ cabal, HUnit, stm, transformers }: cabal.mkDerivation (self: { pname = "exception-transformers"; version = "0.3.0.3"; sha256 = "0z3z5pppaqqbndd4fgv1czr8f9f4a8r86bwc3bcv88yf7y8cfbwz"; buildDepends = [ stm transformers ]; + testDepends = [ HUnit transformers ]; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; description = "Type classes and monads for unchecked extensible exceptions"; diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix index e266aa15ff87..c9544b2c1f69 100644 --- a/pkgs/development/libraries/haskell/fast-logger/default.nix +++ b/pkgs/development/libraries/haskell/fast-logger/default.nix @@ -1,10 +1,12 @@ -{ cabal, blazeBuilder, dateCache, filepath, text, unixTime }: +{ cabal, blazeBuilder, dateCache, filepath, hspec, text, unixTime +}: cabal.mkDerivation (self: { pname = "fast-logger"; version = "0.3.1"; sha256 = "0sjn3vad0fbchv1fhap71wfnihlwnfhk6p9h9hpnbr0i4b32f1ks"; buildDepends = [ blazeBuilder dateCache filepath text unixTime ]; + testDepends = [ hspec ]; meta = { description = "A fast logging system"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix index 119d9d185e55..145d3c1c203d 100644 --- a/pkgs/development/libraries/haskell/file-embed/default.nix +++ b/pkgs/development/libraries/haskell/file-embed/default.nix @@ -1,10 +1,11 @@ -{ cabal, filepath }: +{ cabal, filepath, HUnit }: cabal.mkDerivation (self: { pname = "file-embed"; version = "0.0.4.7"; sha256 = "1hn08499kay0y6ik5z1s58s8r9h1nzf116avgi6ia4b565wpzkvi"; buildDepends = [ filepath ]; + testDepends = [ filepath HUnit ]; meta = { homepage = "https://github.com/snoyberg/file-embed"; description = "Use Template Haskell to embed file contents directly"; diff --git a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix index 681ee6820739..46ae27fc0901 100644 --- a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix +++ b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix @@ -1,4 +1,5 @@ -{ cabal, conduit, systemFileio, systemFilepath, text, transformers +{ cabal, blazeBuilder, conduit, hspec, QuickCheck, systemFileio +, systemFilepath, text, transformers }: cabal.mkDerivation (self: { @@ -8,6 +9,9 @@ cabal.mkDerivation (self: { buildDepends = [ conduit systemFileio systemFilepath text transformers ]; + testDepends = [ + blazeBuilder conduit hspec QuickCheck text transformers + ]; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Use system-filepath data types with conduits"; diff --git a/pkgs/development/libraries/haskell/fsnotify/default.nix b/pkgs/development/libraries/haskell/fsnotify/default.nix index 80b6760a3b7b..142b513e5924 100644 --- a/pkgs/development/libraries/haskell/fsnotify/default.nix +++ b/pkgs/development/libraries/haskell/fsnotify/default.nix @@ -1,10 +1,16 @@ -{ cabal, hinotify, systemFileio, systemFilepath, text, time }: +{ cabal, Cabal, Glob, hinotify, hspec, QuickCheck, random +, systemFileio, systemFilepath, text, time, uniqueid +}: cabal.mkDerivation (self: { pname = "fsnotify"; version = "0.0.6"; sha256 = "0ib6ansj3vaq9hxxbsq5jw14w2b61wp4jfahzb3c3x46mdb1bqw5"; buildDepends = [ hinotify systemFileio systemFilepath text time ]; + testDepends = [ + Cabal Glob hinotify hspec QuickCheck random systemFileio + systemFilepath text time uniqueid + ]; meta = { description = "Cross platform library for file creation, modification, and deletion notification"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix index 7eb49668e3cb..1c12e5dbb0b0 100644 --- a/pkgs/development/libraries/haskell/ghc-events/default.nix +++ b/pkgs/development/libraries/haskell/ghc-events/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ binary mtl ]; + testDepends = [ binary mtl ]; meta = { description = "Library and tool for parsing .eventlog files from GHC"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix index 609863e808fa..9d370993a22c 100644 --- a/pkgs/development/libraries/haskell/graphviz/default.nix +++ b/pkgs/development/libraries/haskell/graphviz/default.nix @@ -1,5 +1,5 @@ -{ cabal, colour, dlist, fgl, filepath, polyparse, temporary, text -, transformers, wlPprintText +{ cabal, colour, dlist, fgl, filepath, polyparse, QuickCheck +, temporary, text, transformers, wlPprintText }: cabal.mkDerivation (self: { @@ -10,6 +10,10 @@ cabal.mkDerivation (self: { colour dlist fgl filepath polyparse temporary text transformers wlPprintText ]; + testDepends = [ + colour dlist fgl filepath polyparse QuickCheck temporary text + transformers wlPprintText + ]; meta = { homepage = "http://projects.haskell.org/graphviz/"; description = "Bindings to Graphviz for graph visualisation"; diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 68b79bdcc3b5..59a32b0d290b 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -1,7 +1,8 @@ { cabal, binary, blazeHtml, blazeMarkup, citeprocHs, cmdargs -, cryptohash, deepseq, filepath, httpConduit, httpTypes, lrucache -, mtl, pandoc, parsec, random, regexBase, regexTdfa, snapCore -, snapServer, tagsoup, text, time +, cryptohash, deepseq, filepath, httpConduit, httpTypes, HUnit +, lrucache, mtl, pandoc, parsec, QuickCheck, random, regexBase +, regexTdfa, snapCore, snapServer, tagsoup, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, text, time }: cabal.mkDerivation (self: { @@ -15,6 +16,12 @@ cabal.mkDerivation (self: { filepath httpConduit httpTypes lrucache mtl pandoc parsec random regexBase regexTdfa snapCore snapServer tagsoup text time ]; + testDepends = [ + binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash deepseq + filepath httpConduit httpTypes HUnit lrucache mtl pandoc parsec + QuickCheck random regexBase regexTdfa tagsoup testFramework + testFrameworkHunit testFrameworkQuickcheck2 text time + ]; jailbreak = true; meta = { homepage = "http://jaspervdj.be/hakyll"; diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index 28881da84c38..7b61aee26dfa 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -1,5 +1,5 @@ -{ cabal, blazeBuilder, blazeHtml, blazeMarkup, failure, parsec -, shakespeare, text +{ cabal, blazeBuilder, blazeHtml, blazeMarkup, failure, hspec +, HUnit, parsec, shakespeare, text }: cabal.mkDerivation (self: { @@ -9,6 +9,7 @@ cabal.mkDerivation (self: { buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; + testDepends = [ blazeHtml blazeMarkup hspec HUnit parsec text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "Haml-like template files that are compile-time checked"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 3a0b9ab59b92..dba052a0fc1e 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -1,7 +1,8 @@ { cabal, base64Bytestring, blazeHtml, extensibleExceptions -, filepath, hslogger, html, monadControl, mtl, network, parsec -, sendfile, syb, systemFilepath, text, threads, time, timeCompat -, transformers, transformersBase, utf8String, xhtml, zlib +, filepath, hslogger, html, HUnit, monadControl, mtl, network +, parsec, sendfile, syb, systemFilepath, text, threads, time +, timeCompat, transformers, transformersBase, utf8String, xhtml +, zlib }: cabal.mkDerivation (self: { @@ -14,6 +15,7 @@ cabal.mkDerivation (self: { text threads time timeCompat transformers transformersBase utf8String xhtml zlib ]; + testDepends = [ HUnit parsec zlib ]; meta = { homepage = "http://happstack.com"; description = "Web related tools and services"; diff --git a/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix b/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix index 96fe7ae0eb13..ffb3f98e8b33 100644 --- a/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix +++ b/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix @@ -1,10 +1,15 @@ -{ cabal, text }: +{ cabal, QuickCheck, random, testFramework +, testFrameworkQuickcheck2, text +}: cabal.mkDerivation (self: { pname = "hashable"; version = "1.1.2.5"; sha256 = "0gbiaj5ck2bvvinndp2pg7qsm2h2izbnz9wi97dbm7i8r4qd9d9z"; buildDepends = [ text ]; + testDepends = [ + QuickCheck random testFramework testFrameworkQuickcheck2 text + ]; meta = { homepage = "http://github.com/tibbe/hashable"; description = "A class for types that can be converted to a hash value"; diff --git a/pkgs/development/libraries/haskell/hastache/default.nix b/pkgs/development/libraries/haskell/hastache/default.nix index ff8aa25bd2d2..15d32de346df 100644 --- a/pkgs/development/libraries/haskell/hastache/default.nix +++ b/pkgs/development/libraries/haskell/hastache/default.nix @@ -1,4 +1,4 @@ -{ cabal, blazeBuilder, filepath, ieee754, mtl, syb, text +{ cabal, blazeBuilder, filepath, HUnit, ieee754, mtl, syb, text , transformers, utf8String }: @@ -9,6 +9,7 @@ cabal.mkDerivation (self: { buildDepends = [ blazeBuilder filepath ieee754 mtl syb text transformers utf8String ]; + testDepends = [ HUnit mtl syb text ]; meta = { homepage = "http://github.com/lymar/hastache"; description = "Haskell implementation of Mustache templates"; diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix index 6538e17c41ab..9551581dadf6 100644 --- a/pkgs/development/libraries/haskell/hjsmin/default.nix +++ b/pkgs/development/libraries/haskell/hjsmin/default.nix @@ -1,10 +1,16 @@ -{ cabal, blazeBuilder, languageJavascript, text }: +{ cabal, blazeBuilder, Cabal, HUnit, languageJavascript, QuickCheck +, testFramework, testFrameworkHunit, text +}: cabal.mkDerivation (self: { pname = "hjsmin"; version = "0.1.4.1"; sha256 = "0r73hd6kn37mdbm2i3g6v3qqm696kyflqs6ajq68qr5sr62sjb1a"; buildDepends = [ blazeBuilder languageJavascript text ]; + testDepends = [ + blazeBuilder Cabal HUnit languageJavascript QuickCheck + testFramework testFrameworkHunit text + ]; meta = { homepage = "http://github.com/alanz/hjsmin"; description = "Haskell implementation of a javascript minifier"; diff --git a/pkgs/development/libraries/haskell/hsemail/default.nix b/pkgs/development/libraries/haskell/hsemail/default.nix index bffe1ad58096..3880537e7eaf 100644 --- a/pkgs/development/libraries/haskell/hsemail/default.nix +++ b/pkgs/development/libraries/haskell/hsemail/default.nix @@ -1,10 +1,11 @@ -{ cabal, mtl, parsec }: +{ cabal, doctest, hspec, mtl, parsec }: cabal.mkDerivation (self: { pname = "hsemail"; version = "1.7.5"; sha256 = "0ls6y48bndwgb7ng29wxim4h36rs6b07dqi6ic4hqgbb7lg6fma4"; buildDepends = [ mtl parsec ]; + testDepends = [ doctest hspec parsec ]; meta = { homepage = "http://gitorious.org/hsemail"; description = "Internet Message Parsers"; diff --git a/pkgs/development/libraries/haskell/hspec-expectations/default.nix b/pkgs/development/libraries/haskell/hspec-expectations/default.nix index e7d5756b7599..4b84ad627840 100644 --- a/pkgs/development/libraries/haskell/hspec-expectations/default.nix +++ b/pkgs/development/libraries/haskell/hspec-expectations/default.nix @@ -1,10 +1,11 @@ -{ cabal, HUnit }: +{ cabal, hspec, HUnit, markdownUnlit, silently }: cabal.mkDerivation (self: { pname = "hspec-expectations"; version = "0.3.0.3"; sha256 = "1ppcbfmcgrd1lwswa293fxwny6khhg4blygfbcsawrvgc5ji0q74"; buildDepends = [ HUnit ]; + testDepends = [ hspec HUnit markdownUnlit silently ]; meta = { homepage = "https://github.com/sol/hspec-expectations#readme"; description = "Catchy combinators for HUnit"; diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index 4c897f20ef7e..949874bfa910 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -1,5 +1,6 @@ -{ cabal, ansiTerminal, filepath, hspecExpectations, HUnit -, QuickCheck, setenv, silently, time, transformers +{ cabal, ansiTerminal, doctest, filepath, ghcPaths +, hspecExpectations, hspecMeta, HUnit, QuickCheck, setenv, silently +, time, transformers }: cabal.mkDerivation (self: { @@ -12,6 +13,10 @@ cabal.mkDerivation (self: { ansiTerminal filepath hspecExpectations HUnit QuickCheck setenv silently time transformers ]; + testDepends = [ + ansiTerminal doctest filepath ghcPaths hspecExpectations hspecMeta + HUnit QuickCheck setenv silently time transformers + ]; meta = { homepage = "http://hspec.github.com/"; description = "Behavior-Driven Development for Haskell"; diff --git a/pkgs/development/libraries/haskell/html-conduit/default.nix b/pkgs/development/libraries/haskell/html-conduit/default.nix index ff4b03c1e6ab..eaf1754b6223 100644 --- a/pkgs/development/libraries/haskell/html-conduit/default.nix +++ b/pkgs/development/libraries/haskell/html-conduit/default.nix @@ -1,5 +1,6 @@ -{ cabal, conduit, filesystemConduit, resourcet, systemFilepath -, tagstreamConduit, text, transformers, xmlConduit, xmlTypes +{ cabal, conduit, filesystemConduit, hspec, HUnit, resourcet +, systemFilepath, tagstreamConduit, text, transformers, xmlConduit +, xmlTypes }: cabal.mkDerivation (self: { @@ -10,6 +11,7 @@ cabal.mkDerivation (self: { conduit filesystemConduit resourcet systemFilepath tagstreamConduit text transformers xmlConduit xmlTypes ]; + testDepends = [ hspec HUnit xmlConduit ]; meta = { homepage = "https://github.com/snoyberg/xml"; description = "Parse HTML documents using xml-conduit datatypes"; diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index ebb44f1512b3..5ff4b4cd95ed 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -1,10 +1,10 @@ { cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring , blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate , conduit, cookie, cprngAes, dataDefault, deepseq, failure -, filepath, httpTypes, liftedBase, mimeTypes, monadControl, mtl -, network, random, regexCompat, resourcet, socks, text, time, tls -, tlsExtra, transformers, transformersBase, utf8String, void -, zlibConduit +, filepath, hspec, httpTypes, HUnit, liftedBase, mimeTypes +, monadControl, mtl, network, networkConduit, random, regexCompat +, resourcet, socks, text, time, tls, tlsExtra, transformers +, transformersBase, utf8String, void, wai, warp, zlibConduit }: cabal.mkDerivation (self: { @@ -19,6 +19,14 @@ cabal.mkDerivation (self: { socks text time tls tlsExtra transformers transformersBase utf8String void zlibConduit ]; + testDepends = [ + asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder + blazeBuilderConduit caseInsensitive certificate conduit cookie + cprngAes dataDefault deepseq failure filepath hspec httpTypes HUnit + liftedBase mimeTypes monadControl mtl network networkConduit random + regexCompat resourcet socks text time tls tlsExtra transformers + transformersBase utf8String void wai warp zlibConduit + ]; meta = { homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; diff --git a/pkgs/development/libraries/haskell/http-date/default.nix b/pkgs/development/libraries/haskell/http-date/default.nix index 58d4dd7ecbfd..3571c160f6b7 100644 --- a/pkgs/development/libraries/haskell/http-date/default.nix +++ b/pkgs/development/libraries/haskell/http-date/default.nix @@ -1,10 +1,11 @@ -{ cabal, attoparsec }: +{ cabal, attoparsec, doctest, hspec, time }: cabal.mkDerivation (self: { pname = "http-date"; version = "0.0.4"; sha256 = "1pbm066i1cpa3z2kfsqpva0qixnx87s76dpafz3wf6dkaqj8n8i5"; buildDepends = [ attoparsec ]; + testDepends = [ doctest hspec time ]; meta = { description = "HTTP Date parser/formatter"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index 618438e927f6..39091256ec0f 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -1,6 +1,7 @@ { cabal, blazeBuilder, caseInsensitive, classyPrelude, conduit -, dataDefault, httpConduit, httpTypes, liftedBase, monadControl -, network, networkConduit, text, wai, warp, word8 +, dataDefault, hspec, httpConduit, httpTypes, liftedBase +, monadControl, network, networkConduit, text, transformers, wai +, warp, word8 }: cabal.mkDerivation (self: { @@ -12,6 +13,10 @@ cabal.mkDerivation (self: { httpConduit httpTypes liftedBase monadControl network networkConduit text wai warp word8 ]; + testDepends = [ + blazeBuilder conduit hspec httpConduit httpTypes liftedBase network + networkConduit transformers wai warp + ]; meta = { homepage = "https://github.com/fpco/http-reverse-proxy"; description = "Reverse proxy HTTP requests, either over raw sockets or with WAI"; diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix index d0837d21bff4..c4c064fbf811 100644 --- a/pkgs/development/libraries/haskell/http-types/default.nix +++ b/pkgs/development/libraries/haskell/http-types/default.nix @@ -1,10 +1,11 @@ -{ cabal, blazeBuilder, caseInsensitive, text }: +{ cabal, blazeBuilder, caseInsensitive, hspec, QuickCheck, text }: cabal.mkDerivation (self: { pname = "http-types"; version = "0.8.0"; sha256 = "14d1gzgwhinkwx3lmc6hvqj6ivjrvy4m6fm2walnyk1zv24zli75"; buildDepends = [ blazeBuilder caseInsensitive text ]; + testDepends = [ blazeBuilder hspec QuickCheck text ]; meta = { homepage = "https://github.com/aristidb/http-types"; description = "Generic HTTP types for Haskell (for both client and server code)"; diff --git a/pkgs/development/libraries/haskell/io-choice/default.nix b/pkgs/development/libraries/haskell/io-choice/default.nix index f8b1f1d51a42..cdf269b0d3c3 100644 --- a/pkgs/development/libraries/haskell/io-choice/default.nix +++ b/pkgs/development/libraries/haskell/io-choice/default.nix @@ -1,4 +1,5 @@ -{ cabal, liftedBase, monadControl, transformers, transformersBase +{ cabal, hspec, liftedBase, monadControl, transformers +, transformersBase }: cabal.mkDerivation (self: { @@ -8,6 +9,7 @@ cabal.mkDerivation (self: { buildDepends = [ liftedBase monadControl transformers transformersBase ]; + testDepends = [ hspec liftedBase monadControl transformers ]; meta = { description = "Choice for IO and lifted IO"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/iproute/default.nix b/pkgs/development/libraries/haskell/iproute/default.nix index c342f80a6c25..1ec2b659f0c5 100644 --- a/pkgs/development/libraries/haskell/iproute/default.nix +++ b/pkgs/development/libraries/haskell/iproute/default.nix @@ -1,10 +1,15 @@ -{ cabal, appar, byteorder, network }: +{ cabal, appar, byteorder, doctest, hspec, network, QuickCheck +, Safe +}: cabal.mkDerivation (self: { pname = "iproute"; version = "1.2.10"; sha256 = "1ni91llvq1mfdsjmw1laqhk964y4vlpyk5s25j8klsfn27mq6c68"; buildDepends = [ appar byteorder network ]; + testDepends = [ + appar byteorder doctest hspec network QuickCheck Safe + ]; meta = { homepage = "http://www.mew.org/~kazu/proj/iproute/"; description = "IP Routing Table"; diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix index fc569f996a89..fc8c15edf570 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/default.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -1,5 +1,6 @@ { cabal, alex, exceptionMtl, exceptionTransformers, filepath, happy -, haskellSrcMeta, mainlandPretty, mtl, srcloc, syb, symbol +, haskellSrcMeta, HUnit, mainlandPretty, mtl, srcloc, syb, symbol +, testFramework, testFrameworkHunit }: cabal.mkDerivation (self: { @@ -10,6 +11,9 @@ cabal.mkDerivation (self: { exceptionMtl exceptionTransformers filepath haskellSrcMeta mainlandPretty mtl srcloc syb symbol ]; + testDepends = [ + HUnit srcloc symbol testFramework testFrameworkHunit + ]; buildTools = [ alex happy ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix index e05b93655e41..4571b869e3bd 100644 --- a/pkgs/development/libraries/haskell/language-javascript/default.nix +++ b/pkgs/development/libraries/haskell/language-javascript/default.nix @@ -1,10 +1,16 @@ -{ cabal, blazeBuilder, happy, mtl, utf8Light, utf8String }: +{ cabal, blazeBuilder, Cabal, happy, HUnit, mtl, QuickCheck +, testFramework, testFrameworkHunit, utf8Light, utf8String +}: cabal.mkDerivation (self: { pname = "language-javascript"; version = "0.5.7"; sha256 = "0mndz0bqxkayzm7g92cvai9ahb9msr99syp9djhaya1d45595ad3"; buildDepends = [ blazeBuilder mtl utf8Light utf8String ]; + testDepends = [ + blazeBuilder Cabal HUnit mtl QuickCheck testFramework + testFrameworkHunit utf8Light utf8String + ]; buildTools = [ happy ]; meta = { homepage = "http://github.com/alanz/language-javascript"; diff --git a/pkgs/development/libraries/haskell/largeword/default.nix b/pkgs/development/libraries/haskell/largeword/default.nix index 991213067f65..aa3cd5fcdf60 100644 --- a/pkgs/development/libraries/haskell/largeword/default.nix +++ b/pkgs/development/libraries/haskell/largeword/default.nix @@ -1,9 +1,15 @@ -{ cabal }: +{ cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "largeword"; version = "1.0.4"; sha256 = "19nrzbbbmsvxdhfhh6wc53lbk0xyjvbcwvjw0snym666j1w2b2l5"; + testDepends = [ + HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; meta = { homepage = "https://github.com/idontgetoutmuch/largeword"; description = "Provides Word128, Word192 and Word256 and a way of producing other large words if required"; diff --git a/pkgs/development/libraries/haskell/leksah/leksah-server.nix b/pkgs/development/libraries/haskell/leksah/leksah-server.nix index cfcc69641b5d..1a907a384f1f 100644 --- a/pkgs/development/libraries/haskell/leksah/leksah-server.nix +++ b/pkgs/development/libraries/haskell/leksah/leksah-server.nix @@ -1,6 +1,6 @@ { cabal, attoparsec, attoparsecEnumerator, binary, binaryShared -, Cabal, deepseq, enumerator, filepath, haddock, hslogger, ltk -, network, parsec, processLeksah, strict, time, transformers +, Cabal, deepseq, enumerator, filepath, haddock, hslogger, HUnit +, ltk, network, parsec, processLeksah, strict, time, transformers }: cabal.mkDerivation (self: { @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { enumerator filepath haddock hslogger ltk network parsec processLeksah strict time transformers ]; + testDepends = [ enumerator hslogger HUnit transformers ]; meta = { homepage = "http://leksah.org"; description = "Metadata collection for leksah"; diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index b5f8851796e7..bba846689584 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -1,9 +1,11 @@ { cabal, bifunctors, comonad, comonadsFd, comonadTransformers -, contravariant, distributive, filepath, genericDeriving, hashable -, MonadCatchIOTransformers, mtl, parallel, profunctorExtras -, profunctors, reflection, semigroupoids, semigroups, split, tagged -, text, transformers, transformersCompat, unorderedContainers -, vector, void +, contravariant, deepseq, distributive, doctest, filepath +, genericDeriving, hashable, HUnit, MonadCatchIOTransformers, mtl +, nats, parallel, profunctorExtras, profunctors, QuickCheck +, reflection, semigroupoids, semigroups, simpleReflect, split +, tagged, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, testFrameworkTh, text, transformers +, transformersCompat, unorderedContainers, vector, void }: cabal.mkDerivation (self: { @@ -17,6 +19,12 @@ cabal.mkDerivation (self: { reflection semigroupoids semigroups split tagged text transformers transformersCompat unorderedContainers vector void ]; + testDepends = [ + deepseq doctest filepath genericDeriving HUnit mtl nats parallel + QuickCheck semigroups simpleReflect split testFramework + testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text + transformers unorderedContainers vector + ]; meta = { homepage = "http://github.com/ekmett/lens/"; description = "Lenses, Folds and Traversals"; diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix index fc77388727fd..7402d6f31db3 100644 --- a/pkgs/development/libraries/haskell/libmpd/default.nix +++ b/pkgs/development/libraries/haskell/libmpd/default.nix @@ -1,10 +1,15 @@ -{ cabal, filepath, mtl, network, text, time, utf8String }: +{ cabal, dataDefault, filepath, hspec, HUnit, mtl, network +, QuickCheck, text, time, utf8String +}: cabal.mkDerivation (self: { pname = "libmpd"; version = "0.8.0.2"; sha256 = "1phlbb5lsapw2hb0db7906ddlmvnpyk1xbgxvl9zp9zfd0sn40aj"; buildDepends = [ filepath mtl network text time utf8String ]; + testDepends = [ + dataDefault hspec HUnit mtl network QuickCheck text time utf8String + ]; meta = { homepage = "http://github.com/joachifm/libmpd-haskell"; description = "An MPD client library"; diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix index fbb09db9bb87..1d675e88d874 100644 --- a/pkgs/development/libraries/haskell/lifted-base/default.nix +++ b/pkgs/development/libraries/haskell/lifted-base/default.nix @@ -1,4 +1,6 @@ -{ cabal, baseUnicodeSymbols, monadControl, transformersBase }: +{ cabal, baseUnicodeSymbols, HUnit, monadControl, testFramework +, testFrameworkHunit, transformers, transformersBase +}: cabal.mkDerivation (self: { pname = "lifted-base"; @@ -7,6 +9,10 @@ cabal.mkDerivation (self: { buildDepends = [ baseUnicodeSymbols monadControl transformersBase ]; + testDepends = [ + HUnit monadControl testFramework testFrameworkHunit transformers + transformersBase + ]; meta = { homepage = "https://github.com/basvandijk/lifted-base"; description = "lifted IO operations from the base library"; diff --git a/pkgs/development/libraries/haskell/math-functions/default.nix b/pkgs/development/libraries/haskell/math-functions/default.nix index 158feeee18a7..2e29269a9fdf 100644 --- a/pkgs/development/libraries/haskell/math-functions/default.nix +++ b/pkgs/development/libraries/haskell/math-functions/default.nix @@ -1,10 +1,16 @@ -{ cabal, erf, vector }: +{ cabal, erf, HUnit, ieee754, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, vector +}: cabal.mkDerivation (self: { pname = "math-functions"; version = "0.1.3.0"; sha256 = "06wxr8fbhmsgkpyx2vimx9l6apk0p27mwrxrvbjk0b7m9vsg3ay5"; buildDepends = [ erf vector ]; + testDepends = [ + HUnit ieee754 QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 vector + ]; meta = { homepage = "https://github.com/bos/math-functions"; description = "Special functions and Chebyshev polynomials"; diff --git a/pkgs/development/libraries/haskell/minimorph/default.nix b/pkgs/development/libraries/haskell/minimorph/default.nix index 54fc100b7dd8..06dcfaa11390 100644 --- a/pkgs/development/libraries/haskell/minimorph/default.nix +++ b/pkgs/development/libraries/haskell/minimorph/default.nix @@ -1,10 +1,11 @@ -{ cabal, text }: +{ cabal, HUnit, testFramework, testFrameworkHunit, text }: cabal.mkDerivation (self: { pname = "minimorph"; version = "0.1.4.0"; sha256 = "16ri9hfriszrgqcm111b1pp5x65s034hrc35kjz5qax32mnc9rn6"; buildDepends = [ text ]; + testDepends = [ HUnit testFramework testFrameworkHunit text ]; meta = { homepage = "http://darcsden.com/kowey/minimorph"; description = "English spelling functions with an emphasis on simplicity"; diff --git a/pkgs/development/libraries/haskell/miniutter/default.nix b/pkgs/development/libraries/haskell/miniutter/default.nix index b06ee1363c87..22018087226e 100644 --- a/pkgs/development/libraries/haskell/miniutter/default.nix +++ b/pkgs/development/libraries/haskell/miniutter/default.nix @@ -1,10 +1,12 @@ -{ cabal, minimorph, text }: +{ cabal, HUnit, minimorph, testFramework, testFrameworkHunit, text +}: cabal.mkDerivation (self: { pname = "miniutter"; version = "0.4.0"; sha256 = "1l275aad8svrqp22jv9s0mmlam7wbdlf6m4m97658rm8ks4j2mbx"; buildDepends = [ minimorph text ]; + testDepends = [ HUnit testFramework testFrameworkHunit text ]; meta = { homepage = "https://github.com/Mikolaj/miniutter"; description = "Simple English clause creation from arbitrary words"; diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.nix index 8407daef6423..f22ae9e106fc 100644 --- a/pkgs/development/libraries/haskell/monad-par/0.3.4.nix +++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.nix @@ -1,5 +1,7 @@ -{ cabal, abstractDeque, abstractPar, deepseq, monadParExtras, mtl -, mwcRandom, parallel +{ cabal, abstractDeque, abstractPar, deepseq, HUnit, monadParExtras +, mtl, mwcRandom, parallel, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, testFrameworkTh +, time }: cabal.mkDerivation (self: { @@ -10,6 +12,11 @@ cabal.mkDerivation (self: { abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom parallel ]; + testDepends = [ + abstractDeque abstractPar deepseq HUnit monadParExtras mtl + mwcRandom QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 testFrameworkTh time + ]; meta = { homepage = "https://github.com/simonmar/monad-par"; description = "A library for parallel programming based on a monad"; diff --git a/pkgs/development/libraries/haskell/mwc-random/default.nix b/pkgs/development/libraries/haskell/mwc-random/default.nix index 1e2d56147c33..d20f4f061e4e 100644 --- a/pkgs/development/libraries/haskell/mwc-random/default.nix +++ b/pkgs/development/libraries/haskell/mwc-random/default.nix @@ -1,10 +1,16 @@ -{ cabal, primitive, time, vector }: +{ cabal, HUnit, primitive, QuickCheck, statistics, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, time, vector +}: cabal.mkDerivation (self: { pname = "mwc-random"; version = "0.12.0.1"; sha256 = "1sq4yxi231ka8rzwsihqziibs7amvl27ycr018wymm3yz36vsy7c"; buildDepends = [ primitive time vector ]; + testDepends = [ + HUnit QuickCheck statistics testFramework testFrameworkHunit + testFrameworkQuickcheck2 vector + ]; meta = { homepage = "https://github.com/bos/mwc-random"; description = "Fast, high quality pseudo random number generation"; diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix index 67d44bd1ebb5..032592f974ba 100644 --- a/pkgs/development/libraries/haskell/network-conduit/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit/default.nix @@ -8,6 +8,7 @@ cabal.mkDerivation (self: { buildDepends = [ conduit liftedBase monadControl network transformers ]; + testDepends = [ conduit ]; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Stream socket data using conduits"; diff --git a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix index fb313005bdaf..840712e34160 100644 --- a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix +++ b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix @@ -1,10 +1,20 @@ -{ cabal, dataAccessor, network, networkTransport }: +{ cabal, dataAccessor, dataAccessorTransformers, HUnit +, lockfreeQueue, mtl, network, networkTransport +, networkTransportTests, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, transformers +}: cabal.mkDerivation (self: { pname = "network-transport-tcp"; version = "0.3.1"; sha256 = "15i4qbx1s3dxaixn6kd2z1hsymfvpqzf4jpqd3mcbpjlgrn6craf"; buildDepends = [ dataAccessor network networkTransport ]; + testDepends = [ + dataAccessor dataAccessorTransformers HUnit lockfreeQueue mtl + network networkTransport networkTransportTests QuickCheck + testFramework testFrameworkHunit testFrameworkQuickcheck2 + transformers + ]; meta = { homepage = "http://github.com/haskell-distributed/distributed-process"; description = "TCP instantiation of Network.Transport"; diff --git a/pkgs/development/libraries/haskell/network/2.3.0.13.nix b/pkgs/development/libraries/haskell/network/2.3.0.13.nix index 29452da7b2e7..557dea081fdb 100644 --- a/pkgs/development/libraries/haskell/network/2.3.0.13.nix +++ b/pkgs/development/libraries/haskell/network/2.3.0.13.nix @@ -1,10 +1,11 @@ -{ cabal, parsec }: +{ cabal, HUnit, parsec, testFramework, testFrameworkHunit }: cabal.mkDerivation (self: { pname = "network"; version = "2.3.0.13"; sha256 = "0xw53czvcw8k49aqxmchc1rcd6pyxp4icwgp64625fnm3l4yjiq7"; buildDepends = [ parsec ]; + testDepends = [ HUnit testFramework testFrameworkHunit ]; meta = { homepage = "http://github.com/haskell/network"; description = "Low-level networking interface"; diff --git a/pkgs/development/libraries/haskell/network/2.3.1.0.nix b/pkgs/development/libraries/haskell/network/2.3.1.0.nix index 28fa50d83424..dc0c1811e591 100644 --- a/pkgs/development/libraries/haskell/network/2.3.1.0.nix +++ b/pkgs/development/libraries/haskell/network/2.3.1.0.nix @@ -1,10 +1,11 @@ -{ cabal, parsec }: +{ cabal, HUnit, parsec, testFramework, testFrameworkHunit }: cabal.mkDerivation (self: { pname = "network"; version = "2.3.1.0"; sha256 = "1fp25wkl5cc4kx0jv5w02b7pzgqadjg1yrknzzwsqxc5s3cpyz6l"; buildDepends = [ parsec ]; + testDepends = [ HUnit testFramework testFrameworkHunit ]; meta = { homepage = "http://github.com/haskell/network"; description = "Low-level networking interface"; diff --git a/pkgs/development/libraries/haskell/network/2.4.1.2.nix b/pkgs/development/libraries/haskell/network/2.4.1.2.nix index 4009bbd94641..6f245cf18400 100644 --- a/pkgs/development/libraries/haskell/network/2.4.1.2.nix +++ b/pkgs/development/libraries/haskell/network/2.4.1.2.nix @@ -1,10 +1,15 @@ -{ cabal, parsec }: +{ cabal, HUnit, parsec, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "network"; version = "2.4.1.2"; sha256 = "0f7ykdv7xbsr5m3h2ml0hw3nlbnq785m0gr624pwk2s289jwakdh"; buildDepends = [ parsec ]; + testDepends = [ + HUnit testFramework testFrameworkHunit testFrameworkQuickcheck2 + ]; meta = { homepage = "https://github.com/haskell/network"; description = "Low-level networking interface"; diff --git a/pkgs/development/libraries/haskell/numbers/default.nix b/pkgs/development/libraries/haskell/numbers/default.nix index d1485b7cf1f1..002f68eded7c 100644 --- a/pkgs/development/libraries/haskell/numbers/default.nix +++ b/pkgs/development/libraries/haskell/numbers/default.nix @@ -1,9 +1,12 @@ -{ cabal }: +{ cabal, QuickCheck, testFramework, testFrameworkQuickcheck2 }: cabal.mkDerivation (self: { pname = "numbers"; version = "3000.1.0.1"; sha256 = "0r2s47nfdxasnp8j7giwpxls9v48f6ld0gc2hg2p7y2ar5xfrcc4"; + testDepends = [ + QuickCheck testFramework testFrameworkQuickcheck2 + ]; meta = { homepage = "https://github.com/DanBurton/numbers"; description = "Various number types"; diff --git a/pkgs/development/libraries/haskell/optparse-applicative/default.nix b/pkgs/development/libraries/haskell/optparse-applicative/default.nix index 3e04a33990e3..46f530b8cd4f 100644 --- a/pkgs/development/libraries/haskell/optparse-applicative/default.nix +++ b/pkgs/development/libraries/haskell/optparse-applicative/default.nix @@ -1,10 +1,15 @@ -{ cabal, transformers }: +{ cabal, HUnit, testFramework, testFrameworkHunit +, testFrameworkThPrime, transformers +}: cabal.mkDerivation (self: { pname = "optparse-applicative"; version = "0.5.2.1"; sha256 = "0w4mk851mx8dch8lnck0g82asmzrsc47xrf34jygh0f6v4kbj40i"; buildDepends = [ transformers ]; + testDepends = [ + HUnit testFramework testFrameworkHunit testFrameworkThPrime + ]; meta = { homepage = "https://github.com/pcapriotti/optparse-applicative"; description = "Utilities and combinators for parsing command line options"; diff --git a/pkgs/development/libraries/haskell/path-pieces/default.nix b/pkgs/development/libraries/haskell/path-pieces/default.nix index 5abc63091464..14b9f8d70813 100644 --- a/pkgs/development/libraries/haskell/path-pieces/default.nix +++ b/pkgs/development/libraries/haskell/path-pieces/default.nix @@ -1,10 +1,11 @@ -{ cabal, text, time }: +{ cabal, fileLocation, hspec, HUnit, QuickCheck, text, time }: cabal.mkDerivation (self: { pname = "path-pieces"; version = "0.1.2"; sha256 = "1cxsa8lq1f2jf86iv6f17nraiav8k2vzjxln1y7z45qhcp1sbbaa"; buildDepends = [ text time ]; + testDepends = [ fileLocation hspec HUnit QuickCheck text ]; meta = { description = "Components of paths"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/pem/default.nix b/pkgs/development/libraries/haskell/pem/default.nix index b82dc4ed83df..16b47a9c8ae0 100644 --- a/pkgs/development/libraries/haskell/pem/default.nix +++ b/pkgs/development/libraries/haskell/pem/default.nix @@ -1,10 +1,15 @@ -{ cabal, attoparsec, base64Bytestring, cereal, mtl }: +{ cabal, attoparsec, base64Bytestring, cereal, mtl, QuickCheck +, testFramework, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "pem"; version = "0.1.2"; sha256 = "1p2sw36b9w6lf53jzj86ibyy9a48fjd786mx3x8mvc5lczx8v78m"; buildDepends = [ attoparsec base64Bytestring cereal mtl ]; + testDepends = [ + QuickCheck testFramework testFrameworkQuickcheck2 + ]; meta = { homepage = "http://github.com/vincenthz/hs-pem"; description = "Privacy Enhanced Mail (PEM) format reader and writer"; diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index 2816a38c4130..117a63618d4a 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -1,10 +1,13 @@ -{ cabal, aeson, monadControl, persistent, text, transformers }: +{ cabal, aeson, hspec, monadControl, persistent, QuickCheck, text +, transformers +}: cabal.mkDerivation (self: { pname = "persistent-template"; version = "1.1.2.4"; sha256 = "0fsqyv5r6h356shmah6bs75fzds0fsmyizbnvj5ywzhc003jv5h9"; buildDepends = [ aeson monadControl persistent text transformers ]; + testDepends = [ aeson hspec persistent QuickCheck text ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, non-relational, multi-backend persistence"; diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index f7812a2692da..036deebae20d 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -1,7 +1,8 @@ { cabal, aeson, attoparsec, base64Bytestring, blazeHtml -, blazeMarkup, conduit, liftedBase, monadControl, monadLogger -, pathPieces, poolConduit, resourcet, silently, sqlite, text, time -, transformers, transformersBase, unorderedContainers, vector +, blazeMarkup, conduit, hspec, liftedBase, monadControl +, monadLogger, pathPieces, poolConduit, resourcet, silently, sqlite +, text, time, transformers, transformersBase, unorderedContainers +, vector }: cabal.mkDerivation (self: { @@ -14,6 +15,7 @@ cabal.mkDerivation (self: { resourcet silently text time transformers transformersBase unorderedContainers vector ]; + testDepends = [ hspec text ]; extraLibraries = [ sqlite ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index 3e3a1b7dbfd6..29c74d84015f 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -1,5 +1,6 @@ -{ cabal, attoparsec, blazeBuilder, blazeTextual, postgresqlLibpq -, text, time, transformers, vector +{ cabal, attoparsec, base16Bytestring, blazeBuilder, blazeTextual +, cryptohash, HUnit, postgresqlLibpq, text, time, transformers +, vector }: cabal.mkDerivation (self: { @@ -10,6 +11,7 @@ cabal.mkDerivation (self: { attoparsec blazeBuilder blazeTextual postgresqlLibpq text time transformers vector ]; + testDepends = [ base16Bytestring cryptohash HUnit text time ]; meta = { description = "Mid-Level PostgreSQL client library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/project-template/default.nix b/pkgs/development/libraries/haskell/project-template/default.nix index 541fa2026d98..fa60370f1f5e 100644 --- a/pkgs/development/libraries/haskell/project-template/default.nix +++ b/pkgs/development/libraries/haskell/project-template/default.nix @@ -1,5 +1,6 @@ { cabal, base64Bytestring, base64Conduit, classyPrelude, conduit -, mtl, resourcet, systemFileio, systemFilepath, text, transformers +, hspec, mtl, QuickCheck, resourcet, systemFileio, systemFilepath +, text, transformers }: cabal.mkDerivation (self: { @@ -10,6 +11,10 @@ cabal.mkDerivation (self: { base64Bytestring base64Conduit classyPrelude conduit mtl resourcet systemFileio systemFilepath text transformers ]; + testDepends = [ + base64Bytestring classyPrelude conduit hspec QuickCheck + transformers + ]; meta = { homepage = "https://github.com/fpco/haskell-ide"; description = "Specify Haskell project templates and generate files"; diff --git a/pkgs/development/libraries/haskell/publicsuffixlist/default.nix b/pkgs/development/libraries/haskell/publicsuffixlist/default.nix index 53b7062cd0d8..1f38962ddd3a 100644 --- a/pkgs/development/libraries/haskell/publicsuffixlist/default.nix +++ b/pkgs/development/libraries/haskell/publicsuffixlist/default.nix @@ -1,10 +1,11 @@ -{ cabal, cereal, dataDefault, text, utf8String }: +{ cabal, cereal, dataDefault, HUnit, idna, text, utf8String }: cabal.mkDerivation (self: { pname = "publicsuffixlist"; version = "0.0.3"; sha256 = "1drsm1zp30629rzy0693ggzcx46b7ydzzafmf07mjanmn1kyyqci"; buildDepends = [ cereal dataDefault text utf8String ]; + testDepends = [ cereal dataDefault HUnit idna text utf8String ]; meta = { homepage = "https://github.com/litherum/publicsuffixlist"; description = "Is a given string a domain suffix?"; diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix index ef4016d003d5..8d62f67a1281 100644 --- a/pkgs/development/libraries/haskell/reactive-banana/default.nix +++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix @@ -1,10 +1,16 @@ -{ cabal, hashable, transformers, unorderedContainers, vault }: +{ cabal, hashable, HUnit, testFramework, testFrameworkHunit +, transformers, unorderedContainers, vault +}: cabal.mkDerivation (self: { pname = "reactive-banana"; version = "0.7.1.1"; sha256 = "0d4dqpzglzkygy2hhn1j1c7vk2782mk66f8aqaadkyhijn7kc6i5"; buildDepends = [ hashable transformers unorderedContainers vault ]; + testDepends = [ + hashable HUnit testFramework testFrameworkHunit transformers + unorderedContainers vault + ]; meta = { homepage = "http://haskell.org/haskellwiki/Reactive-banana"; description = "Practical library for functional reactive programming (FRP)"; diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index f657f4e0ca52..35b7fec32765 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -1,4 +1,4 @@ -{ cabal, liftedBase, monadControl, mtl, transformers +{ cabal, hspec, liftedBase, monadControl, mtl, transformers , transformersBase }: @@ -9,6 +9,7 @@ cabal.mkDerivation (self: { buildDepends = [ liftedBase monadControl mtl transformers transformersBase ]; + testDepends = [ hspec liftedBase transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Deterministic allocation and freeing of scarce resources"; diff --git a/pkgs/development/libraries/haskell/setenv/default.nix b/pkgs/development/libraries/haskell/setenv/default.nix index 8ce0b1254166..fd94874e3642 100644 --- a/pkgs/development/libraries/haskell/setenv/default.nix +++ b/pkgs/development/libraries/haskell/setenv/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, hspec, QuickCheck }: cabal.mkDerivation (self: { pname = "setenv"; version = "0.1.0"; sha256 = "04w42bpfbrs5crjp19zzi9dg61xpz4wvmjs2vc7q7qxblyhdfdsy"; + testDepends = [ hspec QuickCheck ]; meta = { description = "A cross-platform library for setting environment variables"; license = self.stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 5016b816ff73..56174254c219 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -1,10 +1,11 @@ -{ cabal, parsec, shakespeare, text, transformers }: +{ cabal, hspec, HUnit, parsec, shakespeare, text, transformers }: cabal.mkDerivation (self: { pname = "shakespeare-css"; version = "1.0.3"; sha256 = "0zk4nb4v9x04vkkgbzqanfpqgw9pqinf76l7d85fzclfgwacd0bz"; buildDepends = [ parsec shakespeare text transformers ]; + testDepends = [ hspec HUnit shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "Stick your haskell variables into css at compile time"; diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index 01bf73fd5013..55bf276d1f82 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -1,10 +1,11 @@ -{ cabal, aeson, shakespeare, text }: +{ cabal, aeson, hspec, HUnit, shakespeare, text }: cabal.mkDerivation (self: { pname = "shakespeare-js"; version = "1.1.2"; sha256 = "0iwajn0d0yngzp10j9qbb2gpq1g7r390yqd7pj5dri35rjc6mr8n"; buildDepends = [ aeson shakespeare text ]; + testDepends = [ aeson hspec HUnit shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "Stick your haskell variables into javascript/coffeescript at compile time"; diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix index 4e9516d107cb..d4cc135cc62a 100644 --- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix @@ -1,10 +1,11 @@ -{ cabal, shakespeare, text }: +{ cabal, hspec, HUnit, shakespeare, text }: cabal.mkDerivation (self: { pname = "shakespeare-text"; version = "1.0.0.5"; sha256 = "176yzx43sh0fnxpszn8kximd6i96yf2s374z55kvc1kspf7jk736"; buildDepends = [ shakespeare text ]; + testDepends = [ hspec HUnit text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "Interpolation with quasi-quotation: put variables strings"; diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 0e04ff4fd448..d38002eebdaa 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -1,10 +1,11 @@ -{ cabal, parsec, text }: +{ cabal, hspec, parsec, text }: cabal.mkDerivation (self: { pname = "shakespeare"; version = "1.0.3.1"; sha256 = "08w1g19k9v9dvdy45j32kdic8vjhc10ad4g20q5ya0id4cd13qfs"; buildDepends = [ parsec text ]; + testDepends = [ hspec parsec text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "A toolkit for making compile-time interpolated templates"; diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 15245bfe0bcd..325021c1cca3 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -1,4 +1,5 @@ -{ cabal, mtl, systemFileio, systemFilepath, text, time, unixCompat +{ cabal, hspec, HUnit, mtl, systemFileio, systemFilepath, text +, time, unixCompat }: cabal.mkDerivation (self: { @@ -8,6 +9,9 @@ cabal.mkDerivation (self: { buildDepends = [ mtl systemFileio systemFilepath text time unixCompat ]; + testDepends = [ + hspec HUnit mtl systemFileio systemFilepath text time unixCompat + ]; meta = { homepage = "https://github.com/yesodweb/Shelly.hs"; description = "shell-like (systems) programming in Haskell"; diff --git a/pkgs/development/libraries/haskell/silently/default.nix b/pkgs/development/libraries/haskell/silently/default.nix index c8223cecac4f..fcd7a0a872a5 100644 --- a/pkgs/development/libraries/haskell/silently/default.nix +++ b/pkgs/development/libraries/haskell/silently/default.nix @@ -1,10 +1,11 @@ -{ cabal, deepseq }: +{ cabal, deepseq, nanospec }: cabal.mkDerivation (self: { pname = "silently"; version = "1.2.4.1"; sha256 = "035dw3zg680ykyz5rqkkrjn51wkznbc4jb45a8l2gh3vgqzgbf52"; buildDepends = [ deepseq ]; + testDepends = [ deepseq nanospec ]; meta = { homepage = "https://github.com/trystan/silently"; description = "Prevent or capture writing to stdout and other handles"; diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix index 7ecd70f25f7f..9ad2bd4405b1 100644 --- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix +++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix @@ -1,10 +1,11 @@ -{ cabal, network }: +{ cabal, conduit, hspec, HUnit, network, networkConduit }: cabal.mkDerivation (self: { pname = "simple-sendfile"; version = "0.2.11"; sha256 = "1q9m9lxv9jfkn6a1lf07jcl4li3n5996df1qrfkfjq2n0bvn4qfj"; buildDepends = [ network ]; + testDepends = [ conduit hspec HUnit network networkConduit ]; meta = { description = "Cross platform library for the sendfile system call"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index cc910711768b..7fdb7e3a1dcc 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -1,10 +1,11 @@ -{ cabal, cereal, cryptoApi, tagged }: +{ cabal, cereal, cryptoApi, filepath, hspec, tagged }: cabal.mkDerivation (self: { pname = "skein"; version = "0.1.0.12"; sha256 = "1nx0ad0y7zmljc7phwin2aph6frs70hvz3di8q52kzpi5m1h3g3a"; buildDepends = [ cereal cryptoApi tagged ]; + testDepends = [ cereal cryptoApi filepath hspec tagged ]; meta = { homepage = "https://github.com/meteficha/skein"; description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well."; diff --git a/pkgs/development/libraries/haskell/split/0.2.1.1.nix b/pkgs/development/libraries/haskell/split/0.2.1.1.nix index e106b2687f53..0fb28b53ac94 100644 --- a/pkgs/development/libraries/haskell/split/0.2.1.1.nix +++ b/pkgs/development/libraries/haskell/split/0.2.1.1.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, QuickCheck }: cabal.mkDerivation (self: { pname = "split"; version = "0.2.1.1"; sha256 = "1zzp4dwf846s74a4lhw2gf4awsk9iblhl5zcg2zccgv1lr4w2dmz"; + testDepends = [ QuickCheck ]; meta = { description = "Combinator library for splitting lists"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/split/0.2.1.2.nix b/pkgs/development/libraries/haskell/split/0.2.1.2.nix index e88f478f9762..e98e36fe6558 100644 --- a/pkgs/development/libraries/haskell/split/0.2.1.2.nix +++ b/pkgs/development/libraries/haskell/split/0.2.1.2.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, QuickCheck }: cabal.mkDerivation (self: { pname = "split"; version = "0.2.1.2"; sha256 = "0wjw4j9wgk66h7filzfh0py9b0wwmaynvwqvd6kinxgms86fpvyi"; + testDepends = [ QuickCheck ]; meta = { description = "Combinator library for splitting lists"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix index de1fd4533ef4..923cdf879a5c 100644 --- a/pkgs/development/libraries/haskell/statistics/default.nix +++ b/pkgs/development/libraries/haskell/statistics/default.nix @@ -1,5 +1,7 @@ -{ cabal, deepseq, erf, mathFunctions, monadPar, mwcRandom -, primitive, vector, vectorAlgorithms +{ cabal, deepseq, erf, HUnit, ieee754, mathFunctions, monadPar +, mwcRandom, primitive, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, vector +, vectorAlgorithms }: cabal.mkDerivation (self: { @@ -10,6 +12,10 @@ cabal.mkDerivation (self: { deepseq erf mathFunctions monadPar mwcRandom primitive vector vectorAlgorithms ]; + testDepends = [ + erf HUnit ieee754 mathFunctions primitive QuickCheck testFramework + testFrameworkHunit testFrameworkQuickcheck2 vector vectorAlgorithms + ]; meta = { homepage = "https://github.com/bos/statistics"; description = "A library of statistical types, data, and functions"; diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix index 1ca325cbf172..181051249625 100644 --- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix +++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix @@ -1,5 +1,5 @@ -{ cabal, aeson, cmdargs, filepath, haskellSrcExts, mtl, strict, syb -, yaml +{ cabal, aeson, cmdargs, filepath, haskellSrcExts, HUnit, mtl +, strict, syb, testFramework, testFrameworkHunit, yaml }: cabal.mkDerivation (self: { @@ -11,6 +11,10 @@ cabal.mkDerivation (self: { buildDepends = [ aeson cmdargs filepath haskellSrcExts mtl strict syb yaml ]; + testDepends = [ + aeson cmdargs filepath haskellSrcExts HUnit mtl syb testFramework + testFrameworkHunit yaml + ]; meta = { homepage = "https://github.com/jaspervdj/stylish-haskell"; description = "Haskell code prettifier"; diff --git a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix index 38f4375becdf..1b290bd310ba 100644 --- a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix +++ b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix @@ -1,5 +1,6 @@ { cabal, attoparsec, attoparsecConduit, blazeBuilder -, blazeBuilderConduit, caseInsensitive, conduit, text, transformers +, blazeBuilderConduit, caseInsensitive, conduit, hspec, HUnit +, QuickCheck, text, transformers }: cabal.mkDerivation (self: { @@ -10,6 +11,7 @@ cabal.mkDerivation (self: { attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit caseInsensitive conduit text transformers ]; + testDepends = [ conduit hspec HUnit QuickCheck text ]; meta = { homepage = "http://github.com/yihuang/tagstream-conduit"; description = "streamlined html tag parser"; diff --git a/pkgs/development/libraries/haskell/text/0.11.1.13.nix b/pkgs/development/libraries/haskell/text/0.11.1.13.nix index edf109a79cfe..aaf278a0a694 100644 --- a/pkgs/development/libraries/haskell/text/0.11.1.13.nix +++ b/pkgs/development/libraries/haskell/text/0.11.1.13.nix @@ -1,10 +1,16 @@ -{ cabal, deepseq }: +{ cabal, deepseq, HUnit, QuickCheck, random, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "text"; version = "0.11.1.13"; sha256 = "0lbc4yfqpydps0rd1qjymnnhp87sl9w7n1f5vd5lsixby93zjv2f"; buildDepends = [ deepseq ]; + testDepends = [ + deepseq HUnit QuickCheck random testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; meta = { homepage = "https://github.com/bos/text"; description = "An efficient packed Unicode text type"; diff --git a/pkgs/development/libraries/haskell/text/0.11.2.0.nix b/pkgs/development/libraries/haskell/text/0.11.2.0.nix index 213464f3f19e..870438ea31f3 100644 --- a/pkgs/development/libraries/haskell/text/0.11.2.0.nix +++ b/pkgs/development/libraries/haskell/text/0.11.2.0.nix @@ -1,10 +1,16 @@ -{ cabal, deepseq }: +{ cabal, deepseq, HUnit, QuickCheck, random, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "text"; version = "0.11.2.0"; sha256 = "1fx5302m41awzbms410x3gcixsck36rl7i1ma7pz6l5d1pmi538p"; buildDepends = [ deepseq ]; + testDepends = [ + deepseq HUnit QuickCheck random testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; meta = { homepage = "https://github.com/bos/text"; description = "An efficient packed Unicode text type"; diff --git a/pkgs/development/libraries/haskell/text/0.11.2.3.nix b/pkgs/development/libraries/haskell/text/0.11.2.3.nix index e1f0c6ea72d3..a7089c94cfbc 100644 --- a/pkgs/development/libraries/haskell/text/0.11.2.3.nix +++ b/pkgs/development/libraries/haskell/text/0.11.2.3.nix @@ -1,10 +1,16 @@ -{ cabal, deepseq }: +{ cabal, deepseq, HUnit, QuickCheck, random, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "text"; version = "0.11.2.3"; sha256 = "0jrl3qbi91gkcnws9crsa59jsmmbjy91fwvl07qka9m48nq3f9rm"; buildDepends = [ deepseq ]; + testDepends = [ + deepseq HUnit QuickCheck random testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; meta = { homepage = "https://github.com/bos/text"; description = "An efficient packed Unicode text type"; diff --git a/pkgs/development/libraries/haskell/threads/default.nix b/pkgs/development/libraries/haskell/threads/default.nix index 8f5008032f6b..a3327e88ba6c 100644 --- a/pkgs/development/libraries/haskell/threads/default.nix +++ b/pkgs/development/libraries/haskell/threads/default.nix @@ -1,10 +1,16 @@ -{ cabal, baseUnicodeSymbols, stm }: +{ cabal, baseUnicodeSymbols, concurrentExtra, HUnit, stm +, testFramework, testFrameworkHunit +}: cabal.mkDerivation (self: { pname = "threads"; version = "0.5.0.1"; sha256 = "0amyaxa70q6v021nab6v3cfqc40mwj5dr2fwla9d4bm6ppmq6lyy"; buildDepends = [ baseUnicodeSymbols stm ]; + testDepends = [ + baseUnicodeSymbols concurrentExtra HUnit stm testFramework + testFrameworkHunit + ]; meta = { homepage = "https://github.com/basvandijk/threads"; description = "Fork threads and wait for their result"; diff --git a/pkgs/development/libraries/haskell/time/1.4.0.2.nix b/pkgs/development/libraries/haskell/time/1.4.0.2.nix index ce429c8d602b..62232d1aa5a7 100644 --- a/pkgs/development/libraries/haskell/time/1.4.0.2.nix +++ b/pkgs/development/libraries/haskell/time/1.4.0.2.nix @@ -1,10 +1,15 @@ -{ cabal, deepseq }: +{ cabal, Cabal, deepseq, QuickCheck, testFramework +, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "time"; version = "1.4.0.2"; sha256 = "0p4ncankr9968lp4fnbq6pc5xwv2198gxhbds656da9jbv74w7j8"; buildDepends = [ deepseq ]; + testDepends = [ + Cabal deepseq QuickCheck testFramework testFrameworkQuickcheck2 + ]; meta = { homepage = "http://semantic.org/TimeLib/"; description = "A time library"; diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index af7b4c57bb76..a935b8ad4d56 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -1,5 +1,6 @@ -{ cabal, cereal, certificate, cryptohash, cryptoPubkey -, cryptoRandomApi, mtl, network +{ cabal, cereal, certificate, cprngAes, cryptohash, cryptoPubkey +, cryptoRandomApi, mtl, network, QuickCheck, testFramework +, testFrameworkQuickcheck2, time }: cabal.mkDerivation (self: { @@ -10,6 +11,10 @@ cabal.mkDerivation (self: { cereal certificate cryptohash cryptoPubkey cryptoRandomApi mtl network ]; + testDepends = [ + cereal certificate cprngAes cryptoPubkey cryptoRandomApi mtl + QuickCheck testFramework testFrameworkQuickcheck2 time + ]; meta = { homepage = "http://github.com/vincenthz/hs-tls"; description = "TLS/SSL protocol native implementation (Server and Client)"; diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix index 24edaf806268..ddb24e46f4de 100644 --- a/pkgs/development/libraries/haskell/unix-time/default.nix +++ b/pkgs/development/libraries/haskell/unix-time/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, doctest, hspec, QuickCheck, time }: cabal.mkDerivation (self: { pname = "unix-time"; version = "0.1.5"; sha256 = "13xks5kshr51mbs112j8vvhirzhbi3fq6zjw7l4z2iwn8chh4hwg"; + testDepends = [ doctest hspec QuickCheck time ]; meta = { description = "Unix time parser/formatter and utilities"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/unordered-containers/default.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix index 786eb59ec104..2f786eba949e 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/default.nix +++ b/pkgs/development/libraries/haskell/unordered-containers/default.nix @@ -1,10 +1,16 @@ -{ cabal, deepseq, hashable }: +{ cabal, ChasingBottoms, deepseq, hashable, HUnit, QuickCheck +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "unordered-containers"; version = "0.2.3.0"; sha256 = "1vzgjr9jxdkmgq970ng9zi2j60awvx8iv1v6kzjlrkwzxx1a9dpd"; buildDepends = [ deepseq hashable ]; + testDepends = [ + ChasingBottoms hashable HUnit QuickCheck testFramework + testFrameworkHunit testFrameworkQuickcheck2 + ]; meta = { homepage = "https://github.com/tibbe/unordered-containers"; description = "Efficient hashing-based container types"; diff --git a/pkgs/development/libraries/haskell/utility-ht/default.nix b/pkgs/development/libraries/haskell/utility-ht/default.nix index 93b4cc1480e5..c921b4198ed2 100644 --- a/pkgs/development/libraries/haskell/utility-ht/default.nix +++ b/pkgs/development/libraries/haskell/utility-ht/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, QuickCheck }: cabal.mkDerivation (self: { pname = "utility-ht"; version = "0.0.8"; sha256 = "02sm1xj5xa65hpkvl2yk89d9dlg3c2ap8qcviq9zj10asmsbzyd8"; + testDepends = [ QuickCheck ]; meta = { description = "Various small helper functions for Lists, Maybes, Tuples, Functions"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/uuid/default.nix b/pkgs/development/libraries/haskell/uuid/default.nix index 5b939ccb6cc6..55ac6cf9e683 100644 --- a/pkgs/development/libraries/haskell/uuid/default.nix +++ b/pkgs/development/libraries/haskell/uuid/default.nix @@ -1,10 +1,15 @@ -{ cabal, binary, cryptohash, maccatcher, random, time }: +{ cabal, binary, criterion, cryptohash, deepseq, HUnit, maccatcher +, mersenneRandomPure64, QuickCheck, random, time +}: cabal.mkDerivation (self: { pname = "uuid"; version = "1.2.9"; sha256 = "088wbhf21w91774icddbm3a8p8jikwjqgg8zdad0pdv8zbi7flsi"; buildDepends = [ binary cryptohash maccatcher random time ]; + testDepends = [ + criterion deepseq HUnit mersenneRandomPure64 QuickCheck random + ]; meta = { homepage = "http://projects.haskell.org/uuid/"; description = "For creating, comparing, parsing and printing Universally Unique Identifiers"; diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix index e475ca7e8560..9adc35b1bdf8 100644 --- a/pkgs/development/libraries/haskell/vty/default.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -1,5 +1,5 @@ -{ cabal, deepseq, mtl, parallel, parsec, stringQq, terminfo -, utf8String, vector +{ cabal, Cabal, deepseq, mtl, parallel, parsec, QuickCheck, random +, stringQq, terminfo, utf8String, vector }: cabal.mkDerivation (self: { @@ -11,6 +11,10 @@ cabal.mkDerivation (self: { buildDepends = [ deepseq mtl parallel parsec stringQq terminfo utf8String vector ]; + testDepends = [ + Cabal deepseq mtl parallel parsec QuickCheck random terminfo + utf8String vector + ]; meta = { homepage = "https://github.com/coreyoconnor/vty"; description = "A simple terminal UI library"; diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 36ec82d88c39..7feed2df4bc4 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -1,7 +1,7 @@ { cabal, base64Bytestring, blazeBuilder, blazeHtml, blazeMarkup -, cereal, cryptoConduit, cryptohash, fileEmbed, httpDate, httpTypes -, mimeTypes, systemFileio, systemFilepath, text, time, transformers -, unixCompat, wai +, cereal, cryptoConduit, cryptohash, fileEmbed, hspec, httpDate +, httpTypes, mimeTypes, network, systemFileio, systemFilepath, text +, time, transformers, unixCompat, wai, waiTest }: cabal.mkDerivation (self: { @@ -13,6 +13,10 @@ cabal.mkDerivation (self: { cryptoConduit cryptohash fileEmbed httpDate httpTypes mimeTypes systemFileio systemFilepath text time transformers unixCompat wai ]; + testDepends = [ + hspec httpDate httpTypes mimeTypes network text time transformers + unixCompat wai waiTest + ]; meta = { homepage = "http://www.yesodweb.com/book/web-application-interface"; description = "WAI application for static serving"; diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 7a4e18b32956..53a1ccaf55a6 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -1,7 +1,8 @@ { cabal, ansiTerminal, blazeBuilder, blazeBuilderConduit , caseInsensitive, conduit, dataDefault, dateCache, fastLogger -, httpTypes, network, resourcet, stringsearch, text, time -, transformers, void, wai, waiLogger, zlibConduit +, hspec, httpTypes, HUnit, network, resourcet, stringsearch, text +, time, transformers, void, wai, waiLogger, waiTest, zlib +, zlibBindings, zlibConduit }: cabal.mkDerivation (self: { @@ -14,6 +15,10 @@ cabal.mkDerivation (self: { resourcet stringsearch text time transformers void wai waiLogger zlibConduit ]; + testDepends = [ + blazeBuilder conduit dataDefault fastLogger hspec httpTypes HUnit + text transformers wai waiTest zlib zlibBindings + ]; meta = { homepage = "http://github.com/yesodweb/wai"; description = "Provides some basic WAI handlers and middleware"; diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 290e60ff3b71..d924d4f38b07 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -1,6 +1,7 @@ { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive -, conduit, hashable, httpTypes, liftedBase, network, networkConduit -, simpleSendfile, transformers, unixCompat, void, wai +, conduit, hashable, hspec, httpTypes, HUnit, liftedBase, network +, networkConduit, QuickCheck, simpleSendfile, transformers +, unixCompat, void, wai }: cabal.mkDerivation (self: { @@ -12,6 +13,11 @@ cabal.mkDerivation (self: { httpTypes liftedBase network networkConduit simpleSendfile transformers unixCompat void wai ]; + testDepends = [ + blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable + hspec httpTypes HUnit liftedBase network networkConduit QuickCheck + simpleSendfile transformers unixCompat void wai + ]; meta = { homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; diff --git a/pkgs/development/libraries/haskell/word8/default.nix b/pkgs/development/libraries/haskell/word8/default.nix index 4b05c0b70d01..e8abded24381 100644 --- a/pkgs/development/libraries/haskell/word8/default.nix +++ b/pkgs/development/libraries/haskell/word8/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, hspec }: cabal.mkDerivation (self: { pname = "word8"; version = "0.0.3"; sha256 = "1k5sq91pidgw7w8fc62k9gl8iynb65pcza6mjx8pa3n2lslp7125"; + testDepends = [ hspec ]; meta = { description = "Word8 library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index 39bcc63248e5..7ebc0b003e55 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -1,7 +1,7 @@ { cabal, attoparsec, attoparsecConduit, blazeBuilder , blazeBuilderConduit, blazeHtml, blazeMarkup, conduit, dataDefault -, failure, monadControl, resourcet, systemFilepath, text -, transformers, xmlTypes +, failure, hspec, HUnit, monadControl, resourcet, systemFilepath +, text, transformers, xmlTypes }: cabal.mkDerivation (self: { @@ -13,6 +13,9 @@ cabal.mkDerivation (self: { blazeHtml blazeMarkup conduit dataDefault failure monadControl resourcet systemFilepath text transformers xmlTypes ]; + testDepends = [ + blazeMarkup conduit hspec HUnit text transformers xmlTypes + ]; meta = { homepage = "http://github.com/snoyberg/xml"; description = "Pure-Haskell utilities for dealing with XML with the conduit package"; diff --git a/pkgs/development/libraries/haskell/xml-hamlet/default.nix b/pkgs/development/libraries/haskell/xml-hamlet/default.nix index 1be00fa0c0f3..9c85223d654b 100644 --- a/pkgs/development/libraries/haskell/xml-hamlet/default.nix +++ b/pkgs/development/libraries/haskell/xml-hamlet/default.nix @@ -1,10 +1,11 @@ -{ cabal, parsec, shakespeare, text, xmlConduit }: +{ cabal, hspec, HUnit, parsec, shakespeare, text, xmlConduit }: cabal.mkDerivation (self: { pname = "xml-hamlet"; version = "0.4.0.4"; sha256 = "1s4s5z1xir9zmcbfz8mrznf2byclmg0qjjhwmpal2r9ly9g3na98"; buildDepends = [ parsec shakespeare text xmlConduit ]; + testDepends = [ hspec HUnit parsec shakespeare text xmlConduit ]; meta = { homepage = "http://www.yesodweb.com/"; description = "Hamlet-style quasiquoter for XML content"; diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix index f592568cb324..89bdab65b17d 100644 --- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix +++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix @@ -1,4 +1,6 @@ -{ cabal, attoparsec, cssText, network, tagsoup, text, utf8String }: +{ cabal, attoparsec, cssText, hspec, HUnit, network, tagsoup, text +, utf8String +}: cabal.mkDerivation (self: { pname = "xss-sanitize"; @@ -7,6 +9,9 @@ cabal.mkDerivation (self: { buildDepends = [ attoparsec cssText network tagsoup text utf8String ]; + testDepends = [ + attoparsec cssText hspec HUnit network tagsoup text utf8String + ]; meta = { homepage = "http://github.com/yesodweb/haskell-xss-sanitize"; description = "sanitize untrusted HTML to prevent XSS attacks"; diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index 9641cef56aa2..f1cbb7ee7b8b 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -1,5 +1,5 @@ -{ cabal, aeson, attoparsec, conduit, resourcet, text, transformers -, unorderedContainers, vector +{ cabal, aeson, attoparsec, conduit, hspec, HUnit, resourcet, text +, transformers, unorderedContainers, vector }: cabal.mkDerivation (self: { @@ -10,6 +10,9 @@ cabal.mkDerivation (self: { aeson attoparsec conduit resourcet text transformers unorderedContainers vector ]; + testDepends = [ + conduit hspec HUnit text transformers unorderedContainers + ]; meta = { homepage = "http://github.com/snoyberg/yaml/"; description = "Support for parsing and rendering YAML documents"; diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index e2a36c2f1843..a25916316de8 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -1,10 +1,10 @@ { cabal, aeson, blazeBuilder, blazeHtml, blazeMarkup , caseInsensitive, cereal, clientsession, conduit, cookie, failure -, fastLogger, hamlet, httpTypes, liftedBase, monadControl -, monadLogger, parsec, pathPieces, random, resourcet, shakespeare -, shakespeareCss, shakespeareI18n, shakespeareJs, text, time -, transformers, transformersBase, vector, wai, waiExtra -, yesodRoutes +, fastLogger, hamlet, hspec, httpTypes, HUnit, liftedBase +, monadControl, monadLogger, parsec, pathPieces, QuickCheck, random +, resourcet, shakespeare, shakespeareCss, shakespeareI18n +, shakespeareJs, text, time, transformers, transformersBase, vector +, wai, waiExtra, waiTest, yesodRoutes }: cabal.mkDerivation (self: { @@ -19,6 +19,10 @@ cabal.mkDerivation (self: { text time transformers transformersBase vector wai waiExtra yesodRoutes ]; + testDepends = [ + blazeBuilder conduit hamlet hspec httpTypes HUnit QuickCheck random + shakespeareCss shakespeareJs text transformers wai waiTest + ]; meta = { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index d853e217a7f8..adf11916b90d 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -1,5 +1,5 @@ { cabal, aeson, attoparsec, blazeBuilder, blazeHtml, blazeMarkup -, cryptoApi, dataDefault, emailValidate, hamlet, network +, cryptoApi, dataDefault, emailValidate, hamlet, hspec, network , persistent, shakespeareCss, shakespeareJs, text, time , transformers, wai, xssSanitize, yesodCore, yesodPersistent }: @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { shakespeareJs text time transformers wai xssSanitize yesodCore yesodPersistent ]; + testDepends = [ hspec text time ]; meta = { homepage = "http://www.yesodweb.com/"; description = "Form handling support for Yesod Web Framework"; diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index c1dd27e377d7..0ebfeb92bf10 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -1,10 +1,11 @@ -{ cabal, pathPieces, text, vector }: +{ cabal, hspec, HUnit, pathPieces, text, vector }: cabal.mkDerivation (self: { pname = "yesod-routes"; version = "1.1.2"; sha256 = "17yv2z7k1s958xyn552wpk0cwpivsnkvia8477yhgbp4n2d1i5jv"; buildDepends = [ pathPieces text vector ]; + testDepends = [ hspec HUnit pathPieces text ]; meta = { homepage = "http://www.yesodweb.com/"; description = "Efficient routing for Yesod"; diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index a661a83c7318..a7e90de2990a 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -1,5 +1,5 @@ { cabal, base64Bytestring, cereal, conduit, cryptoConduit -, cryptohash, fileEmbed, httpTypes, systemFilepath, text +, cryptohash, fileEmbed, hspec, httpTypes, systemFilepath, text , transformers, unixCompat, wai, waiAppStatic, yesodCore }: @@ -12,6 +12,11 @@ cabal.mkDerivation (self: { httpTypes systemFilepath text transformers unixCompat wai waiAppStatic yesodCore ]; + testDepends = [ + base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed + hspec httpTypes systemFilepath text transformers unixCompat wai + waiAppStatic yesodCore + ]; meta = { homepage = "http://www.yesodweb.com/"; description = "Static file serving subsite for Yesod Web Framework"; diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index b11c88534b28..3753067d958c 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { persistent poolConduit text time transformers wai waiTest xmlConduit xmlTypes ]; + testDepends = [ hspec htmlConduit HUnit xmlConduit ]; meta = { homepage = "http://www.yesodweb.com"; description = "integration testing for WAI/Yesod Applications"; diff --git a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix index f5166f0f1f09..20d414ac6b14 100644 --- a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix @@ -1,9 +1,14 @@ -{ cabal, zeromq }: +{ cabal, QuickCheck, testFramework, testFrameworkQuickcheck2 +, zeromq +}: cabal.mkDerivation (self: { pname = "zeromq-haskell"; version = "0.8.4"; sha256 = "0lvjszi08r5wm5ch03153y7lir6cdgqr2gnhq45j4b0kid6gkpv3"; + testDepends = [ + QuickCheck testFramework testFrameworkQuickcheck2 + ]; extraLibraries = [ zeromq ]; meta = { homepage = "http://github.com/twittner/zeromq-haskell/"; diff --git a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix index 4db350f93b52..3a3e700cfbbb 100644 --- a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix @@ -1,9 +1,14 @@ -{ cabal, zeromq }: +{ cabal, QuickCheck, testFramework, testFrameworkQuickcheck2 +, zeromq +}: cabal.mkDerivation (self: { pname = "zeromq3-haskell"; version = "0.2"; sha256 = "12qljfkcd4l9h3l80jibxgw2an6v782w0sxwvzxqmma29jv6hvky"; + testDepends = [ + QuickCheck testFramework testFrameworkQuickcheck2 + ]; extraLibraries = [ zeromq ]; meta = { homepage = "http://github.com/twittner/zeromq-haskell/"; diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix index 300de9df4c96..6bbe28446127 100644 --- a/pkgs/development/libraries/haskell/zip-archive/default.nix +++ b/pkgs/development/libraries/haskell/zip-archive/default.nix @@ -1,4 +1,6 @@ -{ cabal, binary, digest, filepath, mtl, time, utf8String, zlib }: +{ cabal, binary, digest, filepath, HUnit, mtl, time, utf8String +, zlib +}: cabal.mkDerivation (self: { pname = "zip-archive"; @@ -7,6 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ binary digest filepath mtl time utf8String zlib ]; + testDepends = [ HUnit time ]; meta = { homepage = "http://github.com/jgm/zip-archive"; description = "Library for creating and modifying zip archives"; diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix index d2c3a838adfb..f69be8ae99e2 100644 --- a/pkgs/development/libraries/haskell/zlib-bindings/default.nix +++ b/pkgs/development/libraries/haskell/zlib-bindings/default.nix @@ -1,10 +1,11 @@ -{ cabal, zlib }: +{ cabal, hspec, QuickCheck, zlib }: cabal.mkDerivation (self: { pname = "zlib-bindings"; version = "0.1.1.3"; sha256 = "18jhav7chbapakm9mwn7bn9lgvip7qaz61dw5gwv2nyalvm96qfr"; buildDepends = [ zlib ]; + testDepends = [ hspec QuickCheck zlib ]; meta = { homepage = "http://github.com/snoyberg/zlib-bindings"; description = "Low-level bindings to the zlib package"; diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix index cf62afc6c013..b283c496a299 100644 --- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix +++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix @@ -1,10 +1,13 @@ -{ cabal, conduit, transformers, void, zlibBindings }: +{ cabal, conduit, hspec, QuickCheck, resourcet, transformers, void +, zlibBindings +}: cabal.mkDerivation (self: { pname = "zlib-conduit"; version = "1.0.0"; sha256 = "0q0l4qw1f2cwjj71n4i082ba47x1xba695q8xk0ky2vw5s8cg0bv"; buildDepends = [ conduit transformers void zlibBindings ]; + testDepends = [ conduit hspec QuickCheck resourcet transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming compression/decompression via conduits"; diff --git a/pkgs/development/tools/documentation/haddock/2.10.0.nix b/pkgs/development/tools/documentation/haddock/2.10.0.nix index 5c608c440aaa..8f16c6c65c4f 100644 --- a/pkgs/development/tools/documentation/haddock/2.10.0.nix +++ b/pkgs/development/tools/documentation/haddock/2.10.0.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ Cabal filepath ghcPaths xhtml ]; + testDepends = [ Cabal filepath ]; buildTools = [ alex happy ]; meta = { homepage = "http://www.haskell.org/haddock/"; diff --git a/pkgs/development/tools/documentation/haddock/2.11.0.nix b/pkgs/development/tools/documentation/haddock/2.11.0.nix index 92dccbf05a6b..32b3a5ec8b51 100644 --- a/pkgs/development/tools/documentation/haddock/2.11.0.nix +++ b/pkgs/development/tools/documentation/haddock/2.11.0.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ Cabal filepath ghcPaths xhtml ]; + testDepends = [ Cabal filepath ]; buildTools = [ alex happy ]; meta = { homepage = "http://www.haskell.org/haddock/"; diff --git a/pkgs/development/tools/documentation/haddock/2.12.0.nix b/pkgs/development/tools/documentation/haddock/2.12.0.nix index 39610f9a08c2..b1228dab18a2 100644 --- a/pkgs/development/tools/documentation/haddock/2.12.0.nix +++ b/pkgs/development/tools/documentation/haddock/2.12.0.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; + testDepends = [ Cabal filepath ]; buildTools = [ alex happy ]; meta = { homepage = "http://www.haskell.org/haddock/"; diff --git a/pkgs/development/tools/documentation/haddock/2.13.1.nix b/pkgs/development/tools/documentation/haddock/2.13.1.nix index 1eed852f5370..5b6ddfc1610a 100644 --- a/pkgs/development/tools/documentation/haddock/2.13.1.nix +++ b/pkgs/development/tools/documentation/haddock/2.13.1.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; + testDepends = [ Cabal filepath ]; buildTools = [ alex happy ]; meta = { homepage = "http://www.haskell.org/haddock/"; diff --git a/pkgs/development/tools/documentation/haddock/2.9.4.nix b/pkgs/development/tools/documentation/haddock/2.9.4.nix index 15ed35f5758c..2a29ee950a84 100644 --- a/pkgs/development/tools/documentation/haddock/2.9.4.nix +++ b/pkgs/development/tools/documentation/haddock/2.9.4.nix @@ -1,4 +1,5 @@ -{ cabal, alex, Cabal, filepath, ghcPaths, happy, xhtml }: +{ cabal, alex, Cabal, filepath, ghcPaths, happy, regexCompat, xhtml +}: cabal.mkDerivation (self: { pname = "haddock"; @@ -7,6 +8,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ Cabal filepath ghcPaths xhtml ]; + testDepends = [ Cabal filepath regexCompat ]; buildTools = [ alex happy ]; meta = { homepage = "http://www.haskell.org/haddock/"; From 8be18988ee7601fd434fb7d81867e95dbc9df794 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:09:56 +0100 Subject: [PATCH 06/57] haskell-base-compat: add version 0.2.1 --- .../libraries/haskell/base-compat/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/base-compat/default.nix diff --git a/pkgs/development/libraries/haskell/base-compat/default.nix b/pkgs/development/libraries/haskell/base-compat/default.nix new file mode 100644 index 000000000000..ca208b7c1a34 --- /dev/null +++ b/pkgs/development/libraries/haskell/base-compat/default.nix @@ -0,0 +1,13 @@ +{ cabal, hspec, setenv }: + +cabal.mkDerivation (self: { + pname = "base-compat"; + version = "0.2.1"; + sha256 = "1yssx3nww89dmkw8i55bp1vinbczbxhhh0kh4f3b9fyw5ylnai43"; + testDepends = [ hspec setenv ]; + meta = { + description = "A compatibility layer for base"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4f3cd1b5363b..fbb8b94396da 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -485,6 +485,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); base64Conduit = callPackage ../development/libraries/haskell/base64-conduit {}; + baseCompat = callPackage ../development/libraries/haskell/base-compat {}; + baseUnicodeSymbols = callPackage ../development/libraries/haskell/base-unicode-symbols {}; basicPrelude = callPackage ../development/libraries/haskell/basic-prelude {}; From 6d910bf7255150b1dc2184930c6b2a337dda5546 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:10:08 +0100 Subject: [PATCH 07/57] haskell-ChasingBottoms: add version 1.3.0.5 --- .../libraries/haskell/ChasingBottoms/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/ChasingBottoms/default.nix diff --git a/pkgs/development/libraries/haskell/ChasingBottoms/default.nix b/pkgs/development/libraries/haskell/ChasingBottoms/default.nix new file mode 100644 index 000000000000..48231a1b6d2b --- /dev/null +++ b/pkgs/development/libraries/haskell/ChasingBottoms/default.nix @@ -0,0 +1,15 @@ +{ cabal, mtl, QuickCheck, random, syb }: + +cabal.mkDerivation (self: { + pname = "ChasingBottoms"; + version = "1.3.0.5"; + sha256 = "0g3c52c8gpm0xlnxxdgazz0f7zpnjvdx5vffsv1zr3vcn3kp1xy0"; + isLibrary = true; + isExecutable = true; + buildDepends = [ mtl QuickCheck random syb ]; + meta = { + description = "For testing partial and infinite values"; + license = "unknown"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index fbb8b94396da..efd401f37644 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -582,6 +582,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Chart = callPackage ../development/libraries/haskell/Chart {}; + ChasingBottoms = callPackage ../development/libraries/haskell/ChasingBottoms {}; + citeprocHs = callPackage ../development/libraries/haskell/citeproc-hs {}; cipherAes = callPackage ../development/libraries/haskell/cipher-aes {}; From 1c50ed9441fa9639941d9be871667ef1f0198398 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:10:20 +0100 Subject: [PATCH 08/57] haskell-concurrent-extra: add version 0.7.0.5 --- .../haskell/concurrent-extra/default.nix | 20 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/haskell/concurrent-extra/default.nix diff --git a/pkgs/development/libraries/haskell/concurrent-extra/default.nix b/pkgs/development/libraries/haskell/concurrent-extra/default.nix new file mode 100644 index 000000000000..db380f03b5bd --- /dev/null +++ b/pkgs/development/libraries/haskell/concurrent-extra/default.nix @@ -0,0 +1,20 @@ +{ cabal, baseUnicodeSymbols, HUnit, stm, testFramework +, testFrameworkHunit, unboundedDelays +}: + +cabal.mkDerivation (self: { + pname = "concurrent-extra"; + version = "0.7.0.5"; + sha256 = "0g1ckrwgdyrlp1m352ivplajqzqhw5ymlkb4miiv7c5i9xyyyqnc"; + buildDepends = [ baseUnicodeSymbols stm unboundedDelays ]; + testDepends = [ + baseUnicodeSymbols HUnit stm testFramework testFrameworkHunit + unboundedDelays + ]; + meta = { + homepage = "https://github.com/basvandijk/concurrent-extra"; + description = "Extra concurrency primitives"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index efd401f37644..69f2f4cecef9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -624,6 +624,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); contravariant = callPackage ../development/libraries/haskell/contravariant {}; + concurrentExtra = callPackage ../development/libraries/haskell/concurrent-extra {}; + converge = callPackage ../development/libraries/haskell/converge {}; cookie = callPackage ../development/libraries/haskell/cookie {}; From 258fafaaf5ca3ba7cc7d0f5b55a14ddb22119adb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:10:30 +0100 Subject: [PATCH 09/57] haskell-data-accessor-transformers: add version 0.2.1.4 --- .../data-accessor/data-accessor-transformers.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix new file mode 100644 index 000000000000..83712b858c25 --- /dev/null +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix @@ -0,0 +1,14 @@ +{ cabal, dataAccessor, transformers }: + +cabal.mkDerivation (self: { + pname = "data-accessor-transformers"; + version = "0.2.1.4"; + sha256 = "1bf1j8g5q81zw51bri89hj3i9jnlmhdggw8rhw3n2v103399pf7d"; + buildDepends = [ dataAccessor transformers ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/Record_access"; + description = "Use Accessor to access state in transformers State monad"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 69f2f4cecef9..cd4d09095ea8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -668,6 +668,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); dataAccessorTemplate = callPackage ../development/libraries/haskell/data-accessor/data-accessor-template.nix {}; + dataAccessorTransformers = callPackage ../development/libraries/haskell/data-accessor/data-accessor-transformers.nix {}; + dataBinaryIeee754 = callPackage ../development/libraries/haskell/data-binary-ieee754 {}; dataDefault = callPackage ../development/libraries/haskell/data-default {}; From 45e9ea0424813a088410a9334c3a8d4f75841fc3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:10:41 +0100 Subject: [PATCH 10/57] haskell-encoding: add version 0.6.7.2 --- .../libraries/haskell/encoding/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/encoding/default.nix diff --git a/pkgs/development/libraries/haskell/encoding/default.nix b/pkgs/development/libraries/haskell/encoding/default.nix new file mode 100644 index 000000000000..1b7ef1bcd1dc --- /dev/null +++ b/pkgs/development/libraries/haskell/encoding/default.nix @@ -0,0 +1,16 @@ +{ cabal, binary, extensibleExceptions, HaXml, mtl, regexCompat }: + +cabal.mkDerivation (self: { + pname = "encoding"; + version = "0.6.7.2"; + sha256 = "0b1z5824vdkcc51bd1vgcbaniw3fv9dmd5qczjc89b5lhrl7qq0d"; + buildDepends = [ + binary extensibleExceptions HaXml mtl regexCompat + ]; + meta = { + homepage = "http://code.haskell.org/encoding/"; + description = "A library for various character encodings"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index cd4d09095ea8..68d7d4cee23e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -769,6 +769,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); emailValidate = callPackage ../development/libraries/haskell/email-validate {}; + encoding = callPackage ../development/libraries/haskell/encoding {}; + enumerator = callPackage ../development/libraries/haskell/enumerator {}; entropy = callPackage ../development/libraries/haskell/entropy {}; From 442342e34ea35c012720670ed12aeba7363c2777 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:10:49 +0100 Subject: [PATCH 11/57] haskell-file-location: add version 0.4.5.2 --- .../libraries/haskell/file-location/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/file-location/default.nix diff --git a/pkgs/development/libraries/haskell/file-location/default.nix b/pkgs/development/libraries/haskell/file-location/default.nix new file mode 100644 index 000000000000..8a28d0b27fb1 --- /dev/null +++ b/pkgs/development/libraries/haskell/file-location/default.nix @@ -0,0 +1,15 @@ +{ cabal, liftedBase, transformers }: + +cabal.mkDerivation (self: { + pname = "file-location"; + version = "0.4.5.2"; + sha256 = "0dyzf2lhh0n4hwbh44qfh6bw9snl4hha9sv76c4ndi7v1rvnx197"; + buildDepends = [ liftedBase transformers ]; + testDepends = [ liftedBase transformers ]; + meta = { + homepage = "https://github.com/gregwebs/FileLocation.hs"; + description = "common functions that show file location information"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 68d7d4cee23e..8d9a2d80899b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -792,6 +792,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); filepath_1_3_0_0 = callPackage ../development/libraries/haskell/filepath {}; filepath = null; # a core package in recent GHCs + fileLocation = callPackage ../development/libraries/haskell/file-location {}; + extensibleExceptions_0_1_1_0 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.0.nix {}; extensibleExceptions_0_1_1_2 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.2.nix {}; extensibleExceptions_0_1_1_3 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.3.nix {}; From 7a79bf93d7ac51667a293b22d2c1bff91d877395 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:11:11 +0100 Subject: [PATCH 12/57] haskell-hspec-meta: add version 1.4.4 --- .../libraries/haskell/hspec-meta/default.nix | 22 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/haskell/hspec-meta/default.nix diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix new file mode 100644 index 000000000000..c86db3bf0d72 --- /dev/null +++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix @@ -0,0 +1,22 @@ +{ cabal, ansiTerminal, filepath, hspecExpectations, HUnit +, QuickCheck, setenv, silently, time, transformers +}: + +cabal.mkDerivation (self: { + pname = "hspec-meta"; + version = "1.4.4"; + sha256 = "1p1miiaa38rd92bz695znlwd6wyvs8zpp2idyw5pkzvhqi8w10a1"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + ansiTerminal filepath hspecExpectations HUnit QuickCheck setenv + silently time transformers + ]; + doCheck = false; + meta = { + homepage = "http://hspec.github.com/"; + description = "A version of Hspec which is used to test Hspec itself"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8d9a2d80899b..df71e01d0f2f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1079,6 +1079,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hspecExpectations = callPackage ../development/libraries/haskell/hspec-expectations {}; + hspecMeta = callPackage ../development/libraries/haskell/hspec-meta {}; + hsyslog = callPackage ../development/libraries/haskell/hsyslog {}; html_1_0_1_2 = callPackage ../development/libraries/haskell/html/1.0.1.2.nix {}; From 8aa90c7642aabafe2968839d69cac52415840c79 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:16:16 +0100 Subject: [PATCH 13/57] haskell-idna: add version 0.2 --- pkgs/development/libraries/haskell/idna/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/idna/default.nix diff --git a/pkgs/development/libraries/haskell/idna/default.nix b/pkgs/development/libraries/haskell/idna/default.nix new file mode 100644 index 000000000000..1d5bc92bf6f1 --- /dev/null +++ b/pkgs/development/libraries/haskell/idna/default.nix @@ -0,0 +1,13 @@ +{ cabal, punycode, stringprep, text }: + +cabal.mkDerivation (self: { + pname = "idna"; + version = "0.2"; + sha256 = "0gl1mn2fjyxdpzl024imspf7hk4xvj9r8mvisqnlkdsng8i5jnyz"; + buildDepends = [ punycode stringprep text ]; + meta = { + description = "Implements IDNA (RFC 3490)"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index df71e01d0f2f..62036e55e80b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1112,6 +1112,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hxtUnicode = callPackage ../development/libraries/haskell/hxt-unicode {}; + idna = callPackage ../development/libraries/haskell/idna {}; + IfElse = callPackage ../development/libraries/haskell/IfElse {}; ieee754 = callPackage ../development/libraries/haskell/ieee754 {}; From 4fbd9acbaf115f49342da632af13951c97835364 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:16:25 +0100 Subject: [PATCH 14/57] haskell-lockfree-queue: add version 0.2 --- .../haskell/lockfree-queue/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/lockfree-queue/default.nix diff --git a/pkgs/development/libraries/haskell/lockfree-queue/default.nix b/pkgs/development/libraries/haskell/lockfree-queue/default.nix new file mode 100644 index 000000000000..7efe6b25b391 --- /dev/null +++ b/pkgs/development/libraries/haskell/lockfree-queue/default.nix @@ -0,0 +1,19 @@ +{ cabal, abstractDeque, HUnit, IORefCAS, testFramework +, testFrameworkHunit +}: + +cabal.mkDerivation (self: { + pname = "lockfree-queue"; + version = "0.2"; + sha256 = "0m76wjw13nyj2mpz1dv2crg9sk66nlf62qgk2hbsa7ymydkq797c"; + buildDepends = [ abstractDeque IORefCAS ]; + testDepends = [ + abstractDeque HUnit IORefCAS testFramework testFrameworkHunit + ]; + meta = { + homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki"; + description = "Michael and Scott lock-free queues"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 62036e55e80b..b3686cd26374 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1195,6 +1195,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ltk = callPackage ../development/libraries/haskell/ltk {}; + lockfreeQueue = callPackage ../development/libraries/haskell/lockfree-queue {}; + logfloat = callPackage ../development/libraries/haskell/logfloat {}; logict = callPackage ../development/libraries/haskell/logict {}; From 9a96a358f09b4be96e419ef7d43f732e369ce4c1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:16:38 +0100 Subject: [PATCH 15/57] haskell-markdown-unlit: add version 0.2.0.1 --- .../libraries/haskell/markdown-unlit/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/markdown-unlit/default.nix diff --git a/pkgs/development/libraries/haskell/markdown-unlit/default.nix b/pkgs/development/libraries/haskell/markdown-unlit/default.nix new file mode 100644 index 000000000000..06c1b9e2fcae --- /dev/null +++ b/pkgs/development/libraries/haskell/markdown-unlit/default.nix @@ -0,0 +1,15 @@ +{ cabal, hspec, QuickCheck, silently, stringbuilder }: + +cabal.mkDerivation (self: { + pname = "markdown-unlit"; + version = "0.2.0.1"; + sha256 = "1bc3vcifv2xcddh8liq380c6sxarrs5pf21pfs9i4dx9rfl3hvhq"; + isLibrary = true; + isExecutable = true; + testDepends = [ hspec QuickCheck silently stringbuilder ]; + meta = { + description = "Literate Haskell support for Markdown"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b3686cd26374..cbd62d80f249 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1203,6 +1203,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); maccatcher = callPackage ../development/libraries/haskell/maccatcher {}; + markdownUnlit = callPackage ../development/libraries/haskell/markdown-unlit {}; + mathFunctions = callPackage ../development/libraries/haskell/math-functions {}; mainlandPretty = callPackage ../development/libraries/haskell/mainland-pretty {}; From 59117b299b4f08bfb783ee82af02731ba36fddec Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:16:46 +0100 Subject: [PATCH 16/57] haskell-nanospec: add version 0.1.0 --- .../libraries/haskell/nanospec/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/nanospec/default.nix diff --git a/pkgs/development/libraries/haskell/nanospec/default.nix b/pkgs/development/libraries/haskell/nanospec/default.nix new file mode 100644 index 000000000000..b7f498a35c83 --- /dev/null +++ b/pkgs/development/libraries/haskell/nanospec/default.nix @@ -0,0 +1,14 @@ +{ cabal, hspec, silently }: + +cabal.mkDerivation (self: { + pname = "nanospec"; + version = "0.1.0"; + sha256 = "16qpn199p8nrllg800zryhb8795jgk78znng5fjq1raj8l3snjk0"; + testDepends = [ hspec silently ]; + doCheck = false; + meta = { + description = "A lightweight implementation of a subset of Hspec's API"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index cbd62d80f249..531a81db7829 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1290,6 +1290,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {}; + nanospec = callPackage ../development/libraries/haskell/nanospec {}; + nat = callPackage ../development/libraries/haskell/nat {}; nats = callPackage ../development/libraries/haskell/nats {}; From 7937ea533cd19ffd2edc202a5fcf5001ef5334b2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:16:53 +0100 Subject: [PATCH 17/57] haskell-network-transport-tests: add version 0.1.0.1 --- .../haskell/network-transport-tests/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/network-transport-tests/default.nix diff --git a/pkgs/development/libraries/haskell/network-transport-tests/default.nix b/pkgs/development/libraries/haskell/network-transport-tests/default.nix new file mode 100644 index 000000000000..7aedea7995b7 --- /dev/null +++ b/pkgs/development/libraries/haskell/network-transport-tests/default.nix @@ -0,0 +1,14 @@ +{ cabal, ansiTerminal, mtl, networkTransport, random }: + +cabal.mkDerivation (self: { + pname = "network-transport-tests"; + version = "0.1.0.1"; + sha256 = "15vdkjq10mm378iyci1lpj6b77m7sil5mk3yhzf6vcbfj54pwca6"; + buildDepends = [ ansiTerminal mtl networkTransport random ]; + meta = { + homepage = "http://github.com/haskell-distributed/distributed-process"; + description = "Unit tests for Network.Transport implementations"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 531a81db7829..1029d47918e1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1323,6 +1323,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); networkTransportTcp = callPackage ../development/libraries/haskell/network-transport-tcp {}; + networkTransportTests = callPackage ../development/libraries/haskell/network-transport-tests {}; + newtype = callPackage ../development/libraries/haskell/newtype {}; nonNegative = callPackage ../development/libraries/haskell/non-negative {}; From 9bdefae7c2ab16bdf9c639daa8c51401aca324ef Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:17:01 +0100 Subject: [PATCH 18/57] haskell-punycode: add version 2.0 --- .../libraries/haskell/punycode/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/punycode/default.nix diff --git a/pkgs/development/libraries/haskell/punycode/default.nix b/pkgs/development/libraries/haskell/punycode/default.nix new file mode 100644 index 000000000000..ade7685be6e6 --- /dev/null +++ b/pkgs/development/libraries/haskell/punycode/default.nix @@ -0,0 +1,15 @@ +{ cabal, cereal, encoding, HUnit, mtl, QuickCheck, text }: + +cabal.mkDerivation (self: { + pname = "punycode"; + version = "2.0"; + sha256 = "192jgfixnpxdj6jiiz92kx5bi6ij3c389b76q9f4vyfmvcajj1sr"; + buildDepends = [ cereal mtl text ]; + testDepends = [ cereal encoding HUnit mtl QuickCheck text ]; + meta = { + homepage = "https://github.com/litherum/punycode"; + description = "Encode unicode strings to ascii forms according to RFC 3492"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1029d47918e1..791678ab55c8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1426,6 +1426,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); prettyShow = callPackage ../development/libraries/haskell/pretty-show {}; + punycode = callPackage ../development/libraries/haskell/punycode {}; + primitive_0_4_1 = callPackage ../development/libraries/haskell/primitive/0.4.1.nix {}; primitive_0_5 = callPackage ../development/libraries/haskell/primitive/0.5.nix {}; primitive_0_5_0_1 = callPackage ../development/libraries/haskell/primitive/0.5.0.1.nix {}; From bbb6aa522cc77be27fc541e59b14737ee78db560 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:17:13 +0100 Subject: [PATCH 19/57] haskell-stringbuilder: add version 0.4.0 --- .../libraries/haskell/stringbuilder/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/stringbuilder/default.nix diff --git a/pkgs/development/libraries/haskell/stringbuilder/default.nix b/pkgs/development/libraries/haskell/stringbuilder/default.nix new file mode 100644 index 000000000000..efe0956afc0f --- /dev/null +++ b/pkgs/development/libraries/haskell/stringbuilder/default.nix @@ -0,0 +1,13 @@ +{ cabal, hspec, QuickCheck }: + +cabal.mkDerivation (self: { + pname = "stringbuilder"; + version = "0.4.0"; + sha256 = "0v0lpb13khpiygfdkyzzsf64anxjykwvjsrkds836whm1bv86lhl"; + testDepends = [ hspec QuickCheck ]; + meta = { + description = "A writer monad for multi-line string literals"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 791678ab55c8..1c988362d726 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1677,6 +1677,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); libc = pkgs.stdenv.gcc.libc; }; + stringbuilder = callPackage ../development/libraries/haskell/stringbuilder {}; + symbol = callPackage ../development/libraries/haskell/symbol {}; systemFilepath = callPackage ../development/libraries/haskell/system-filepath {}; From 13f491df4670bc6e7c9189624d002ed9184ef394 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:17:30 +0100 Subject: [PATCH 20/57] haskell-stringprep: add version 0.1.5 --- .../libraries/haskell/stringprep/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/stringprep/default.nix diff --git a/pkgs/development/libraries/haskell/stringprep/default.nix b/pkgs/development/libraries/haskell/stringprep/default.nix new file mode 100644 index 000000000000..f1654751f753 --- /dev/null +++ b/pkgs/development/libraries/haskell/stringprep/default.nix @@ -0,0 +1,13 @@ +{ cabal, ranges, text, textIcu }: + +cabal.mkDerivation (self: { + pname = "stringprep"; + version = "0.1.5"; + sha256 = "1a25b18kd1zx06gi677g3xvsm49izhhf26z2dfljkjfykf05kqmp"; + buildDepends = [ ranges text textIcu ]; + meta = { + description = "Implements the \"StringPrep\" algorithm"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1c988362d726..38ca6684f02e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1604,6 +1604,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); stringQq = callPackage ../development/libraries/haskell/string-qq {}; + stringprep = callPackage ../development/libraries/haskell/stringprep {}; + stringsearch = callPackage ../development/libraries/haskell/stringsearch {}; strptime = callPackage ../development/libraries/haskell/strptime {}; From f99c54d1980ed2707ae73f5b57bd55203f850eb1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:17:41 +0100 Subject: [PATCH 21/57] haskell-Safe: add version 0.1 --- pkgs/development/libraries/haskell/Safe/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/Safe/default.nix diff --git a/pkgs/development/libraries/haskell/Safe/default.nix b/pkgs/development/libraries/haskell/Safe/default.nix new file mode 100644 index 000000000000..f35877cd6568 --- /dev/null +++ b/pkgs/development/libraries/haskell/Safe/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "Safe"; + version = "0.1"; + sha256 = "0ybi5r4635yjx41ig54bm426fbdzrivc5kn8fwqxmzm62ai0v623"; + meta = { + homepage = "http://www-users.cs.york.ac.uk/~ndm/projects/libraries.php"; + description = "Library for safe (pattern match free) functions"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 38ca6684f02e..686c406f00d8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1550,6 +1550,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); safe = callPackage ../development/libraries/haskell/safe {}; + Safe = callPackage ../development/libraries/haskell/Safe {}; + SafeSemaphore = callPackage ../development/libraries/haskell/SafeSemaphore {}; sendfile = callPackage ../development/libraries/haskell/sendfile {}; From b32d4f15ff95f22a757baf9fa41095250bc053f5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:17:49 +0100 Subject: [PATCH 22/57] haskell-text-icu: add version 0.6.3.5 --- .../libraries/haskell/text-icu/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/text-icu/default.nix diff --git a/pkgs/development/libraries/haskell/text-icu/default.nix b/pkgs/development/libraries/haskell/text-icu/default.nix new file mode 100644 index 000000000000..16115809f5b1 --- /dev/null +++ b/pkgs/development/libraries/haskell/text-icu/default.nix @@ -0,0 +1,15 @@ +{ cabal, icu, text }: + +cabal.mkDerivation (self: { + pname = "text-icu"; + version = "0.6.3.5"; + sha256 = "1blfw9377yl732ypbjhkvi3vfg6c1f1rkxcsvwmqyhkdzb2agg0a"; + buildDepends = [ text ]; + extraLibraries = [ icu ]; + meta = { + homepage = "https://bitbucket.org/bos/text-icu"; + description = "Bindings to the ICU library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 686c406f00d8..c3ecfc4290ec 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1731,6 +1731,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); text_0_11_2_3 = callPackage ../development/libraries/haskell/text/0.11.2.3.nix {}; text = self.text_0_11_2_3; + textIcu = callPackage ../development/libraries/haskell/text-icu {}; + thespian = callPackage ../development/libraries/haskell/thespian {}; thExtras = callPackage ../development/libraries/haskell/th-extras {}; From 55ec10fff5e3d35c014e070d8f74b2fd31d3dd91 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:17:56 +0100 Subject: [PATCH 23/57] haskell-unbounded-delays: add version 0.1.0.5 --- .../libraries/haskell/unbounded-delays/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/unbounded-delays/default.nix diff --git a/pkgs/development/libraries/haskell/unbounded-delays/default.nix b/pkgs/development/libraries/haskell/unbounded-delays/default.nix new file mode 100644 index 000000000000..ccccf9d95d38 --- /dev/null +++ b/pkgs/development/libraries/haskell/unbounded-delays/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "unbounded-delays"; + version = "0.1.0.5"; + sha256 = "109swgxlv3ywf5g0wgm3gp2y7azd6mqf2lfb9sk21dfzcz28aq4k"; + meta = { + homepage = "https://github.com/basvandijk/unbounded-delays"; + description = "Unbounded thread delays and timeouts"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c3ecfc4290ec..b35e728f6b4d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1773,6 +1773,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); unbound = callPackage ../development/libraries/haskell/unbound {}; + unboundedDelays = callPackage ../development/libraries/haskell/unbounded-delays {}; + uniplate = callPackage ../development/libraries/haskell/uniplate {}; uniqueid = callPackage ../development/libraries/haskell/uniqueid {}; From ae8288ef88bf5a8414e67f7a3027a015566bc6b0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:18:44 +0100 Subject: [PATCH 24/57] haskell-packages.nix: fix attribute ordering after recent additions --- pkgs/top-level/haskell-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b35e728f6b4d..273cd9403168 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1604,10 +1604,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); stringCombinators = callPackage ../development/libraries/haskell/string-combinators {}; - stringQq = callPackage ../development/libraries/haskell/string-qq {}; - stringprep = callPackage ../development/libraries/haskell/stringprep {}; + stringQq = callPackage ../development/libraries/haskell/string-qq {}; + stringsearch = callPackage ../development/libraries/haskell/stringsearch {}; strptime = callPackage ../development/libraries/haskell/strptime {}; @@ -1677,12 +1677,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); strictConcurrency = callPackage ../development/libraries/haskell/strictConcurrency {}; + stringbuilder = callPackage ../development/libraries/haskell/stringbuilder {}; + svgcairo = callPackage ../development/libraries/haskell/svgcairo { libc = pkgs.stdenv.gcc.libc; }; - stringbuilder = callPackage ../development/libraries/haskell/stringbuilder {}; - symbol = callPackage ../development/libraries/haskell/symbol {}; systemFilepath = callPackage ../development/libraries/haskell/system-filepath {}; From 24dcf491fcac85d7523ceaf373e8b629fbcfa84b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:20:01 +0100 Subject: [PATCH 25/57] haskell-ghc-events: disable 'doCheck' because of test suite failure Running 1 test suites... Test suite test-versions: RUNNING... test-versions: test/queens-ghc-6.12.1.eventlog: openBinaryFile: does not exist (No such file or directory) Test suite test-versions: FAIL Test suite logged to: dist/test/ghc-events-0.4.2.0-test-versions.log 0 of 1 test suites (0 of 1 test cases) passed. --- pkgs/development/libraries/haskell/ghc-events/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix index 1c12e5dbb0b0..5b7decf9416b 100644 --- a/pkgs/development/libraries/haskell/ghc-events/default.nix +++ b/pkgs/development/libraries/haskell/ghc-events/default.nix @@ -8,6 +8,7 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ binary mtl ]; testDepends = [ binary mtl ]; + doCheck = false; meta = { description = "Library and tool for parsing .eventlog files from GHC"; license = self.stdenv.lib.licenses.bsd3; From 1fac9c5a411c8307ef5e1bfb75916e6139f27dd0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:21:54 +0100 Subject: [PATCH 26/57] haddock: disable 'doCheck' to avoid compilation errors The test-suite stanza is incomplete. --- pkgs/development/tools/documentation/haddock/2.10.0.nix | 1 + pkgs/development/tools/documentation/haddock/2.11.0.nix | 1 + pkgs/development/tools/documentation/haddock/2.12.0.nix | 1 + pkgs/development/tools/documentation/haddock/2.13.1.nix | 1 + pkgs/development/tools/documentation/haddock/2.4.2.nix | 1 + pkgs/development/tools/documentation/haddock/2.7.2.nix | 1 + pkgs/development/tools/documentation/haddock/2.9.2.nix | 1 + pkgs/development/tools/documentation/haddock/2.9.4.nix | 1 + 8 files changed, 8 insertions(+) diff --git a/pkgs/development/tools/documentation/haddock/2.10.0.nix b/pkgs/development/tools/documentation/haddock/2.10.0.nix index 8f16c6c65c4f..cfda3b66704a 100644 --- a/pkgs/development/tools/documentation/haddock/2.10.0.nix +++ b/pkgs/development/tools/documentation/haddock/2.10.0.nix @@ -9,6 +9,7 @@ cabal.mkDerivation (self: { buildDepends = [ Cabal filepath ghcPaths xhtml ]; testDepends = [ Cabal filepath ]; buildTools = [ alex happy ]; + doCheck = false; meta = { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; diff --git a/pkgs/development/tools/documentation/haddock/2.11.0.nix b/pkgs/development/tools/documentation/haddock/2.11.0.nix index 32b3a5ec8b51..968efe2260b0 100644 --- a/pkgs/development/tools/documentation/haddock/2.11.0.nix +++ b/pkgs/development/tools/documentation/haddock/2.11.0.nix @@ -9,6 +9,7 @@ cabal.mkDerivation (self: { buildDepends = [ Cabal filepath ghcPaths xhtml ]; testDepends = [ Cabal filepath ]; buildTools = [ alex happy ]; + doCheck = false; meta = { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; diff --git a/pkgs/development/tools/documentation/haddock/2.12.0.nix b/pkgs/development/tools/documentation/haddock/2.12.0.nix index b1228dab18a2..12907a64d214 100644 --- a/pkgs/development/tools/documentation/haddock/2.12.0.nix +++ b/pkgs/development/tools/documentation/haddock/2.12.0.nix @@ -9,6 +9,7 @@ cabal.mkDerivation (self: { buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; testDepends = [ Cabal filepath ]; buildTools = [ alex happy ]; + doCheck = false; meta = { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; diff --git a/pkgs/development/tools/documentation/haddock/2.13.1.nix b/pkgs/development/tools/documentation/haddock/2.13.1.nix index 5b6ddfc1610a..e53ab715992e 100644 --- a/pkgs/development/tools/documentation/haddock/2.13.1.nix +++ b/pkgs/development/tools/documentation/haddock/2.13.1.nix @@ -9,6 +9,7 @@ cabal.mkDerivation (self: { buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; testDepends = [ Cabal filepath ]; buildTools = [ alex happy ]; + doCheck = false; meta = { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; diff --git a/pkgs/development/tools/documentation/haddock/2.4.2.nix b/pkgs/development/tools/documentation/haddock/2.4.2.nix index dd7b9de97254..811ffd2855da 100644 --- a/pkgs/development/tools/documentation/haddock/2.4.2.nix +++ b/pkgs/development/tools/documentation/haddock/2.4.2.nix @@ -8,6 +8,7 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ Cabal filepath ghcPaths ]; buildTools = [ alex happy ]; + doCheck = false; meta = { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; diff --git a/pkgs/development/tools/documentation/haddock/2.7.2.nix b/pkgs/development/tools/documentation/haddock/2.7.2.nix index 0c744d624191..8dd3460b6f8f 100644 --- a/pkgs/development/tools/documentation/haddock/2.7.2.nix +++ b/pkgs/development/tools/documentation/haddock/2.7.2.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self : { sha256 = "4eaaaf62785f0ba3d37ba356cfac4679faef91c0902d8cdbf42837cbe5daab82"; extraBuildInputs = [alex happy makeWrapper]; propagatedBuildInputs = [ghcPaths]; + doCheck = false; postInstall = '' wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.ghcVersion} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" diff --git a/pkgs/development/tools/documentation/haddock/2.9.2.nix b/pkgs/development/tools/documentation/haddock/2.9.2.nix index 8e5b79cd5194..61e457426dec 100644 --- a/pkgs/development/tools/documentation/haddock/2.9.2.nix +++ b/pkgs/development/tools/documentation/haddock/2.9.2.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self : { sha256 = "189vvp173pqc69zgzqqx6vyhvsc13p1s86ql60rs1j5qlhh8ajg8"; extraBuildInputs = [alex happy makeWrapper]; propagatedBuildInputs = [ghcPaths xhtml]; + doCheck = false; postInstall = '' wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.ghcVersion} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" diff --git a/pkgs/development/tools/documentation/haddock/2.9.4.nix b/pkgs/development/tools/documentation/haddock/2.9.4.nix index 2a29ee950a84..8a57dd851c2d 100644 --- a/pkgs/development/tools/documentation/haddock/2.9.4.nix +++ b/pkgs/development/tools/documentation/haddock/2.9.4.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { buildDepends = [ Cabal filepath ghcPaths xhtml ]; testDepends = [ Cabal filepath regexCompat ]; buildTools = [ alex happy ]; + doCheck = false; meta = { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; From a540dd5650c4eab2744bd7fd610e3dc34b665089 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:22:02 +0100 Subject: [PATCH 27/57] alex: disable 'doCheck' to avoid compilation errors The test-suite stanza is incomplete. --- pkgs/development/tools/parsing/alex/2.3.1.nix | 1 + pkgs/development/tools/parsing/alex/2.3.2.nix | 1 + pkgs/development/tools/parsing/alex/2.3.3.nix | 1 + pkgs/development/tools/parsing/alex/2.3.5.nix | 1 + pkgs/development/tools/parsing/alex/3.0.1.nix | 1 + pkgs/development/tools/parsing/alex/3.0.2.nix | 1 + pkgs/development/tools/parsing/alex/3.0.4.nix | 1 + 7 files changed, 7 insertions(+) diff --git a/pkgs/development/tools/parsing/alex/2.3.1.nix b/pkgs/development/tools/parsing/alex/2.3.1.nix index e1d77561eb1f..7dc17cd4153a 100644 --- a/pkgs/development/tools/parsing/alex/2.3.1.nix +++ b/pkgs/development/tools/parsing/alex/2.3.1.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { isLibrary = false; isExecutable = true; buildTools = [ perl ]; + doCheck = false; meta = { homepage = "http://www.haskell.org/alex/"; description = "Alex is a tool for generating lexical analysers in Haskell"; diff --git a/pkgs/development/tools/parsing/alex/2.3.2.nix b/pkgs/development/tools/parsing/alex/2.3.2.nix index 5a79036b0823..5d10dbd69951 100644 --- a/pkgs/development/tools/parsing/alex/2.3.2.nix +++ b/pkgs/development/tools/parsing/alex/2.3.2.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { isLibrary = false; isExecutable = true; buildTools = [ perl ]; + doCheck = false; meta = { homepage = "http://www.haskell.org/alex/"; description = "Alex is a tool for generating lexical analysers in Haskell"; diff --git a/pkgs/development/tools/parsing/alex/2.3.3.nix b/pkgs/development/tools/parsing/alex/2.3.3.nix index b0b40fecbede..bbe413d478ff 100644 --- a/pkgs/development/tools/parsing/alex/2.3.3.nix +++ b/pkgs/development/tools/parsing/alex/2.3.3.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { isLibrary = false; isExecutable = true; buildTools = [ perl ]; + doCheck = false; meta = { homepage = "http://www.haskell.org/alex/"; description = "Alex is a tool for generating lexical analysers in Haskell"; diff --git a/pkgs/development/tools/parsing/alex/2.3.5.nix b/pkgs/development/tools/parsing/alex/2.3.5.nix index cda273167929..3fb843e69557 100644 --- a/pkgs/development/tools/parsing/alex/2.3.5.nix +++ b/pkgs/development/tools/parsing/alex/2.3.5.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { isLibrary = false; isExecutable = true; buildTools = [ perl ]; + doCheck = false; meta = { homepage = "http://www.haskell.org/alex/"; description = "Alex is a tool for generating lexical analysers in Haskell"; diff --git a/pkgs/development/tools/parsing/alex/3.0.1.nix b/pkgs/development/tools/parsing/alex/3.0.1.nix index 85e0474b7453..cdcaead86356 100644 --- a/pkgs/development/tools/parsing/alex/3.0.1.nix +++ b/pkgs/development/tools/parsing/alex/3.0.1.nix @@ -8,6 +8,7 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ QuickCheck ]; buildTools = [ perl ]; + doCheck = false; meta = { homepage = "http://www.haskell.org/alex/"; description = "Alex is a tool for generating lexical analysers in Haskell"; diff --git a/pkgs/development/tools/parsing/alex/3.0.2.nix b/pkgs/development/tools/parsing/alex/3.0.2.nix index ec56c74db772..9011db12c7dd 100644 --- a/pkgs/development/tools/parsing/alex/3.0.2.nix +++ b/pkgs/development/tools/parsing/alex/3.0.2.nix @@ -8,6 +8,7 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ QuickCheck ]; buildTools = [ perl ]; + doCheck = false; meta = { homepage = "http://www.haskell.org/alex/"; description = "Alex is a tool for generating lexical analysers in Haskell"; diff --git a/pkgs/development/tools/parsing/alex/3.0.4.nix b/pkgs/development/tools/parsing/alex/3.0.4.nix index bc82079aa791..3160570b240d 100644 --- a/pkgs/development/tools/parsing/alex/3.0.4.nix +++ b/pkgs/development/tools/parsing/alex/3.0.4.nix @@ -8,6 +8,7 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ QuickCheck ]; buildTools = [ perl ]; + doCheck = false; meta = { homepage = "http://www.haskell.org/alex/"; description = "Alex is a tool for generating lexical analysers in Haskell"; From e3bf440ae9d1babd2c00c78038a6bb51abc82f90 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:23:26 +0100 Subject: [PATCH 28/57] haskell-text: disable 'doCheck' to avoid infinite evaluation loop Some of the 'testDepends' of these packages end up depending on 'text' again. --- pkgs/development/libraries/haskell/text/0.11.0.5.nix | 1 + pkgs/development/libraries/haskell/text/0.11.0.6.nix | 1 + pkgs/development/libraries/haskell/text/0.11.1.13.nix | 1 + pkgs/development/libraries/haskell/text/0.11.1.5.nix | 1 + pkgs/development/libraries/haskell/text/0.11.2.0.nix | 1 + pkgs/development/libraries/haskell/text/0.11.2.3.nix | 1 + 6 files changed, 6 insertions(+) diff --git a/pkgs/development/libraries/haskell/text/0.11.0.5.nix b/pkgs/development/libraries/haskell/text/0.11.0.5.nix index 0b415d28aead..59644d057201 100644 --- a/pkgs/development/libraries/haskell/text/0.11.0.5.nix +++ b/pkgs/development/libraries/haskell/text/0.11.0.5.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.11.0.5"; sha256 = "1a5y2i7qrkyyvm112q44rhd7jbqxvfxssz2g5ngbx11yypl3hcdv"; buildDepends = [ deepseq ]; + doCheck = false; meta = { homepage = "http://bitbucket.org/bos/text"; description = "An efficient packed Unicode text type"; diff --git a/pkgs/development/libraries/haskell/text/0.11.0.6.nix b/pkgs/development/libraries/haskell/text/0.11.0.6.nix index 354621fd5cd4..04fd250dfe9f 100644 --- a/pkgs/development/libraries/haskell/text/0.11.0.6.nix +++ b/pkgs/development/libraries/haskell/text/0.11.0.6.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.11.0.6"; sha256 = "103l1c8jfwpddsqzwj9jqh89vay8ax1znxqgjqprv2fvr7s0zvkp"; buildDepends = [ deepseq ]; + doCheck = false; meta = { homepage = "http://bitbucket.org/bos/text"; description = "An efficient packed Unicode text type"; diff --git a/pkgs/development/libraries/haskell/text/0.11.1.13.nix b/pkgs/development/libraries/haskell/text/0.11.1.13.nix index aaf278a0a694..71d0c28e48d7 100644 --- a/pkgs/development/libraries/haskell/text/0.11.1.13.nix +++ b/pkgs/development/libraries/haskell/text/0.11.1.13.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { deepseq HUnit QuickCheck random testFramework testFrameworkHunit testFrameworkQuickcheck2 ]; + doCheck = false; meta = { homepage = "https://github.com/bos/text"; description = "An efficient packed Unicode text type"; diff --git a/pkgs/development/libraries/haskell/text/0.11.1.5.nix b/pkgs/development/libraries/haskell/text/0.11.1.5.nix index 3f4132a87a23..03c2d90ff8da 100644 --- a/pkgs/development/libraries/haskell/text/0.11.1.5.nix +++ b/pkgs/development/libraries/haskell/text/0.11.1.5.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.11.1.5"; sha256 = "0fxxhw932gdvaqafsbw7dfzccc43hv92yhxppzp6jrg0npbyz04l"; buildDepends = [ deepseq ]; + doCheck = false; meta = { homepage = "https://bitbucket.org/bos/text"; description = "An efficient packed Unicode text type"; diff --git a/pkgs/development/libraries/haskell/text/0.11.2.0.nix b/pkgs/development/libraries/haskell/text/0.11.2.0.nix index 870438ea31f3..ab784807bfa2 100644 --- a/pkgs/development/libraries/haskell/text/0.11.2.0.nix +++ b/pkgs/development/libraries/haskell/text/0.11.2.0.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { deepseq HUnit QuickCheck random testFramework testFrameworkHunit testFrameworkQuickcheck2 ]; + doCheck = false; meta = { homepage = "https://github.com/bos/text"; description = "An efficient packed Unicode text type"; diff --git a/pkgs/development/libraries/haskell/text/0.11.2.3.nix b/pkgs/development/libraries/haskell/text/0.11.2.3.nix index a7089c94cfbc..afa0e7eb5d3d 100644 --- a/pkgs/development/libraries/haskell/text/0.11.2.3.nix +++ b/pkgs/development/libraries/haskell/text/0.11.2.3.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { deepseq HUnit QuickCheck random testFramework testFrameworkHunit testFrameworkQuickcheck2 ]; + doCheck = false; meta = { homepage = "https://github.com/bos/text"; description = "An efficient packed Unicode text type"; From 3ac39413ac8635e0b9952a78db21ac843c3ab0e0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:24:55 +0100 Subject: [PATCH 29/57] Disable 'doCheck' in more packages to avoid infinite evaluation loops. --- pkgs/development/libraries/haskell/doctest/default.nix | 1 + .../development/libraries/haskell/hspec-expectations/default.nix | 1 + pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix | 1 + pkgs/development/libraries/haskell/monad-par/0.3.4.nix | 1 + pkgs/development/libraries/haskell/mwc-random/default.nix | 1 + pkgs/development/libraries/haskell/setenv/default.nix | 1 + pkgs/development/libraries/haskell/uuid/default.nix | 1 + 7 files changed, 7 insertions(+) diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix index 5dffb52ce1ed..3c8988400bcb 100644 --- a/pkgs/development/libraries/haskell/doctest/default.nix +++ b/pkgs/development/libraries/haskell/doctest/default.nix @@ -13,6 +13,7 @@ cabal.mkDerivation (self: { baseCompat deepseq filepath ghcPaths hspec HUnit QuickCheck setenv silently stringbuilder syb transformers ]; + doCheck = false; meta = { homepage = "https://github.com/sol/doctest-haskell#readme"; description = "Test interactive Haskell examples"; diff --git a/pkgs/development/libraries/haskell/hspec-expectations/default.nix b/pkgs/development/libraries/haskell/hspec-expectations/default.nix index 4b84ad627840..8c9885d4378f 100644 --- a/pkgs/development/libraries/haskell/hspec-expectations/default.nix +++ b/pkgs/development/libraries/haskell/hspec-expectations/default.nix @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1ppcbfmcgrd1lwswa293fxwny6khhg4blygfbcsawrvgc5ji0q74"; buildDepends = [ HUnit ]; testDepends = [ hspec HUnit markdownUnlit silently ]; + doCheck = false; meta = { homepage = "https://github.com/sol/hspec-expectations#readme"; description = "Catchy combinators for HUnit"; diff --git a/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix b/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix index 1bfac2b13d2a..8692d6267cbe 100644 --- a/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix +++ b/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.1.0.3"; sha256 = "1c0yclil152hv06c2sbgam9amd63nnzh7a4xsnxb05wgy93qs2mg"; buildDepends = [ deepseq HUnit ]; + doCheck = false; meta = { homepage = "https://github.com/simonmar/monad-par"; description = "A library for parallel programming based on a monad"; diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.nix index f22ae9e106fc..342bea47f6b1 100644 --- a/pkgs/development/libraries/haskell/monad-par/0.3.4.nix +++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.nix @@ -17,6 +17,7 @@ cabal.mkDerivation (self: { mwcRandom QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh time ]; + doCheck = false; meta = { homepage = "https://github.com/simonmar/monad-par"; description = "A library for parallel programming based on a monad"; diff --git a/pkgs/development/libraries/haskell/mwc-random/default.nix b/pkgs/development/libraries/haskell/mwc-random/default.nix index d20f4f061e4e..3e9be2c5e587 100644 --- a/pkgs/development/libraries/haskell/mwc-random/default.nix +++ b/pkgs/development/libraries/haskell/mwc-random/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { HUnit QuickCheck statistics testFramework testFrameworkHunit testFrameworkQuickcheck2 vector ]; + doCheck = false; meta = { homepage = "https://github.com/bos/mwc-random"; description = "Fast, high quality pseudo random number generation"; diff --git a/pkgs/development/libraries/haskell/setenv/default.nix b/pkgs/development/libraries/haskell/setenv/default.nix index fd94874e3642..b19728820aad 100644 --- a/pkgs/development/libraries/haskell/setenv/default.nix +++ b/pkgs/development/libraries/haskell/setenv/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.1.0"; sha256 = "04w42bpfbrs5crjp19zzi9dg61xpz4wvmjs2vc7q7qxblyhdfdsy"; testDepends = [ hspec QuickCheck ]; + doCheck = false; meta = { description = "A cross-platform library for setting environment variables"; license = self.stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/haskell/uuid/default.nix b/pkgs/development/libraries/haskell/uuid/default.nix index 55ac6cf9e683..ed7e23f6c219 100644 --- a/pkgs/development/libraries/haskell/uuid/default.nix +++ b/pkgs/development/libraries/haskell/uuid/default.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { testDepends = [ criterion deepseq HUnit mersenneRandomPure64 QuickCheck random ]; + doCheck = false; meta = { homepage = "http://projects.haskell.org/uuid/"; description = "For creating, comparing, parsing and printing Universally Unique Identifiers"; From 8c58bef5dd226378039b0451e1c3e9af60db9f1c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:36:44 +0100 Subject: [PATCH 30/57] haskell-simple-sendfile: disable 'doCheck' because of test suite failure Running 1 test suites... Test suite spec: RUNNING... Sendfile sendfile spec: test/inputFile: openFd: does not exist (No such file or directory) - sends an entire file FAILED [1] spec: test/inputFile: openFd: does not exist (No such file or directory) - sends a part of file FAILED [2] spec: test/inputFile: openFd: does not exist (No such file or directory) - terminates even if length is over spec: test/inputFile: openFd: does not exist (No such file or directory) - terminates even if offset is over - terminates even if the file is truncated FAILED [3] sendfileWithHeader spec: test/inputFile: openFd: does not exist (No such file or directory) - sends an header and an entire file FAILED [4] spec: test/inputFile: openFd: does not exist (No such file or directory) - sends an header and a part of file FAILED [5] spec: test/inputFile: openFd: does not exist (No such file or directory) - sends a large header and an entire file FAILED [6] spec: test/inputFile: openFd: does not exist (No such file or directory) - sends a large header and a part of file FAILED [7] spec: test/inputFile: openFd: does not exist (No such file or directory) - terminates even if length is over spec: test/inputFile: openFd: does not exist (No such file or directory) - terminates even if offset is over - terminates even if the file is truncated FAILED [8] 1) Sendfile.sendfile sends an entire file FAILED (uncaught exception) IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory)) 2) Sendfile.sendfile sends a part of file FAILED (uncaught exception) IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory)) 3) Sendfile.sendfile terminates even if the file is truncated FAILED (uncaught exception) IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory)) 4) Sendfile.sendfileWithHeader sends an header and an entire file FAILED (uncaught exception) IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory)) 5) Sendfile.sendfileWithHeader sends an header and a part of file FAILED (uncaught exception) IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory)) 6) Sendfile.sendfileWithHeader sends a large header and an entire file FAILED (uncaught exception) IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory)) 7) Sendfile.sendfileWithHeader sends a large header and a part of file FAILED (uncaught exception) IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory)) 8) Sendfile.sendfileWithHeader terminates even if the file is truncated FAILED (uncaught exception) IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory)) --- pkgs/development/libraries/haskell/simple-sendfile/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix index 9ad2bd4405b1..9e8f638c65cf 100644 --- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix +++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1q9m9lxv9jfkn6a1lf07jcl4li3n5996df1qrfkfjq2n0bvn4qfj"; buildDepends = [ network ]; testDepends = [ conduit hspec HUnit network networkConduit ]; + doCheck = false; meta = { description = "Cross platform library for the sendfile system call"; license = self.stdenv.lib.licenses.bsd3; From 28a0367f9ee59267866de0f70782c436492e5a26 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:41:52 +0100 Subject: [PATCH 31/57] haskell-HTTP: disable 'doCheck' to avoid compilation errors Setup: At least the following dependencies are missing: case-insensitive ==0.4.*, conduit >=0.4 && <0.6, http-types >=0.6 && <0.8, wai >=1.2 && <1.4 --- pkgs/development/libraries/haskell/HTTP/4000.0.6.nix | 1 + pkgs/development/libraries/haskell/HTTP/4000.0.9.nix | 1 + pkgs/development/libraries/haskell/HTTP/4000.1.1.nix | 1 + pkgs/development/libraries/haskell/HTTP/4000.1.2.nix | 1 + pkgs/development/libraries/haskell/HTTP/4000.2.1.nix | 1 + pkgs/development/libraries/haskell/HTTP/4000.2.2.nix | 1 + pkgs/development/libraries/haskell/HTTP/4000.2.3.nix | 1 + pkgs/development/libraries/haskell/HTTP/4000.2.5.nix | 1 + pkgs/development/libraries/haskell/HTTP/4000.2.8.nix | 1 + 9 files changed, 9 insertions(+) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix index c87b38af4523..ac4ac232edf8 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "4000.0.6"; sha256 = "75af1ac4dc21b10c8a1a54a33179ea822e591887bab7278360a3d6b38304d39b"; buildDepends = [ mtl network parsec ]; + doCheck = false; meta = { homepage = "http://projects.haskell.org/http/"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix index 493da3337b91..0beebbfe2944 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "4000.0.9"; sha256 = "1e2b4a8b782ad1417c8755bb0d248851bc142b351366ed460e07f2945a5e95ba"; buildDepends = [ mtl network parsec ]; + doCheck = false; meta = { homepage = "http://projects.haskell.org/http/"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix index 28a3bd5fe956..31cfdddac79e 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "4000.1.1"; sha256 = "09khx5fb673a0d7m3bl39xjdxvc60m52rmm4865cha2mby0zidy3"; buildDepends = [ mtl network parsec ]; + doCheck = false; meta = { homepage = "http://projects.haskell.org/http/"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix index a75c72f6a285..8d4a39526b2a 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "4000.1.2"; sha256 = "19vcy8xinrvn01caly6sg1p1yvbbf7nwq10kxmnwqssnl4h5cwn8"; buildDepends = [ mtl network parsec ]; + doCheck = false; meta = { homepage = "http://projects.haskell.org/http/"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix index 0c7fa0bfa789..f3da4a5ccf22 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { testDepends = [ httpdShed HUnit network split testFramework testFrameworkHunit ]; + doCheck = false; meta = { homepage = "https://github.com/haskell/HTTP"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix index 805bf36f5df8..e6238a5e738f 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { testDepends = [ httpdShed HUnit network split testFramework testFrameworkHunit ]; + doCheck = false; meta = { homepage = "https://github.com/haskell/HTTP"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix index a0b328d702cc..d9e422f9e895 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { testDepends = [ httpdShed HUnit network split testFramework testFrameworkHunit ]; + doCheck = false; meta = { homepage = "https://github.com/haskell/HTTP"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix index 4adae562476e..93ba5e949db8 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl network pureMD5 split testFramework testFrameworkHunit wai warp ]; + doCheck = false; meta = { homepage = "https://github.com/haskell/HTTP"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix index f0c103622a9e..1b52261dea08 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl network pureMD5 split testFramework testFrameworkHunit wai warp ]; + doCheck = false; meta = { homepage = "https://github.com/haskell/HTTP"; description = "A library for client-side HTTP"; From 86b96bd0e9e0b143e3ddeb8f6f764103dfae4d09 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:42:15 +0100 Subject: [PATCH 32/57] haskell-cautious-file: disable 'doCheck' because of test suite failure --- pkgs/development/libraries/haskell/cautious-file/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/cautious-file/default.nix b/pkgs/development/libraries/haskell/cautious-file/default.nix index aa6e87565aee..44ed255bb634 100644 --- a/pkgs/development/libraries/haskell/cautious-file/default.nix +++ b/pkgs/development/libraries/haskell/cautious-file/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "1.0.2"; sha256 = "1sw5ngwrarq1lsd4c6v2wdmgbhkkq6kpybb62r8ccm11ddgn3yiq"; buildDepends = [ filepath ]; + doCheck = false; meta = { description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures"; license = self.stdenv.lib.licenses.bsd3; From b7324d79eb11a3fcd08e85fd455801378e20733f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:44:48 +0100 Subject: [PATCH 33/57] zeromq3-haskell: disable 'doCheck' because of build errors in test program --- pkgs/development/libraries/haskell/zeromq3-haskell/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix index 3a3e700cfbbb..82dae54839ff 100644 --- a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { QuickCheck testFramework testFrameworkQuickcheck2 ]; extraLibraries = [ zeromq ]; + doCheck = false; meta = { homepage = "http://github.com/twittner/zeromq-haskell/"; description = "Bindings to ZeroMQ 3.x"; From b15b0690dc73694af03dc5aee26ee5f0f0bb6746 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:54:36 +0100 Subject: [PATCH 34/57] haskell-filestore: disable 'doCheck' because of test suite failures running tests /bin/sh: ./dist/build/test-filestore/test-filestore: No such file or directory --- pkgs/development/libraries/haskell/filestore/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index d114a5aa3afd..468a9f711e1e 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { buildDepends = [ Diff filepath HUnit mtl parsec split time utf8String xml ]; + doCheck = false; jailbreak = true; meta = { description = "Interface for versioning file stores"; From 8a7a2c4e6c538c395a1ea55ac92c46d80f00f491 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 23:10:17 +0100 Subject: [PATCH 35/57] haskell-src-exts: disable 'doCheck' because of test suite build errors Test/Runner.hs:5:8: Could not find module `Language.Haskell.Exts.Annotated' Use -v to see a list of the files searched for. Setup: Pattern match failure in do expression at Setup.hs:6:5-15 --- pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix | 1 + pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix index 9df67a70c6c5..1918260cc62f 100644 --- a/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix +++ b/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1jqf8l81zw7x5ryf8h2n0b2636yhxkfp3j4ndbqw6hc7i5q581m6"; buildDepends = [ cpphs ]; buildTools = [ happy ]; + doCheck = false; meta = { homepage = "http://code.haskell.org/haskell-src-exts"; description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix index 16f6d6362a1e..5521e037b4eb 100644 --- a/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix +++ b/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "03bzhfp7l9f5hh61qdrr83331nbfgj3jfsfylwmnmcknpisdqnkw"; buildDepends = [ cpphs ]; buildTools = [ happy ]; + doCheck = false; meta = { homepage = "http://code.haskell.org/haskell-src-exts"; description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; From 50b94835e41198d41af153f5d0a46965918b65ca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 23:10:34 +0100 Subject: [PATCH 36/57] haskell-filestore: cosmetic --- pkgs/development/libraries/haskell/filestore/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index 468a9f711e1e..5e93300b23cb 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { buildDepends = [ Diff filepath HUnit mtl parsec split time utf8String xml ]; - doCheck = false; jailbreak = true; + doCheck = false; meta = { description = "Interface for versioning file stores"; license = self.stdenv.lib.licenses.bsd3; From 07dd027e6376c9317ba4e8d0a54653f69cbfd672 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 23:20:53 +0100 Subject: [PATCH 37/57] haskell-vty: disable 'doCheck' because of build errors Setup: At least the following dependencies are missing: Cabal ==1.17.* --- pkgs/development/libraries/haskell/vty/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix index 9adc35b1bdf8..3121399b3a90 100644 --- a/pkgs/development/libraries/haskell/vty/default.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -15,6 +15,7 @@ cabal.mkDerivation (self: { Cabal deepseq mtl parallel parsec QuickCheck random terminfo utf8String vector ]; + doCheck = false; meta = { homepage = "https://github.com/coreyoconnor/vty"; description = "A simple terminal UI library"; From 0b8ee12f09110e735088b9db0c12a2ee36939de8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 23:24:48 +0100 Subject: [PATCH 38/57] haskell-hashed-storage: disable 'doCheck' because of test suite errors running tests /bin/sh: dist/build/hashed-storage-test/hashed-storage-test: No such file or directory --- pkgs/development/libraries/haskell/hashed-storage/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/hashed-storage/default.nix b/pkgs/development/libraries/haskell/hashed-storage/default.nix index 161e81eb3754..77a4251259d3 100644 --- a/pkgs/development/libraries/haskell/hashed-storage/default.nix +++ b/pkgs/development/libraries/haskell/hashed-storage/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { buildDepends = [ binary dataenc extensibleExceptions filepath mmap mtl zlib ]; + doCheck = false; meta = { description = "Hashed file storage support code"; license = self.stdenv.lib.licenses.bsd3; From 68d4be424d5e2bb6499ad3706bf7f9f430886b7c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 23:25:00 +0100 Subject: [PATCH 39/57] haskell-sendfile: update to version 0.7.9 --- pkgs/development/libraries/haskell/sendfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/sendfile/default.nix b/pkgs/development/libraries/haskell/sendfile/default.nix index 455328ec9cb2..dc1f24757af2 100644 --- a/pkgs/development/libraries/haskell/sendfile/default.nix +++ b/pkgs/development/libraries/haskell/sendfile/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "sendfile"; - version = "0.7.8"; - sha256 = "0xy9ciikr444gblh3r8z3w4h4rcrfjfciw3dvxgzbygqs5dy6yxl"; + version = "0.7.9"; + sha256 = "0hnw1ym81cff49dwww19kgbs4s0kpandbvn6h5cml3y0p1nxybqh"; buildDepends = [ network ]; meta = { homepage = "http://hub.darcs.net/stepcut/sendfile"; From 34b48b6c3bdec664368d033864666b436d4719eb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 23:31:32 +0100 Subject: [PATCH 40/57] haskell-numbers: disable 'doCheck' to avoid build errors Setup: At least the following dependencies are missing: test-framework ==0.6.*, test-framework-quickcheck2 ==0.2.* --- pkgs/development/libraries/haskell/numbers/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/numbers/default.nix b/pkgs/development/libraries/haskell/numbers/default.nix index 002f68eded7c..e0136ad5d45d 100644 --- a/pkgs/development/libraries/haskell/numbers/default.nix +++ b/pkgs/development/libraries/haskell/numbers/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { testDepends = [ QuickCheck testFramework testFrameworkQuickcheck2 ]; + doCheck = false; meta = { homepage = "https://github.com/DanBurton/numbers"; description = "Various number types"; From d440431d19f93662d3ec7b6912180b237597dec2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 23:33:12 +0100 Subject: [PATCH 41/57] haskell-tls: disable 'doCheck' to avoid build errors Tests/Tests.hs:41:0: error: missing binary operator before token "(" --- pkgs/development/libraries/haskell/tls/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index a935b8ad4d56..72e0976ceaff 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -15,6 +15,7 @@ cabal.mkDerivation (self: { cereal certificate cprngAes cryptoPubkey cryptoRandomApi mtl QuickCheck testFramework testFrameworkQuickcheck2 time ]; + doCheck = false; meta = { homepage = "http://github.com/vincenthz/hs-tls"; description = "TLS/SSL protocol native implementation (Server and Client)"; From bc0ab2e5952855c7036afb0402abc56255f3d11d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 23:34:35 +0100 Subject: [PATCH 42/57] haskell-zip-archive: disable 'doCheck' to avoid test suite failures Test suite test-zip-archive: RUNNING... Cases: 7 Tried: 1 Errors: 0 Failures: 0/bin/sh: /usr/bin/zip: No such file or directory ### Error in: 1 test-temp/test4.zip: openBinaryFile: does not exist (No such file or directory) Cases: 7 Tried: 4 Errors: 1 Failures: 0 adding: LICENSE (deflated 46%) adding: Codec/ (stored 0%) adding: LICENSE (deflated 46%) adding: Codec/ (stored 0%) adding: Codec/Archive/ (stored 0%) adding: Codec/Archive/Zip.hs (deflated 74%) Cases: 7 Tried: 6 Errors: 1 Failures: 0 creating: test-temp/dir1 extracting: test-temp/dir1/hi creating: test-temp/dir1/dir2 inflating: test-temp/dir1/dir2/hello Cases: 7 Tried: 7 Errors: 1 Failures: 0 Test suite test-zip-archive: FAIL Test suite logged to: dist/test/zip-archive-0.1.3.3-test-zip-archive.log 0 of 1 test suites (0 of 1 test cases) passed. --- pkgs/development/libraries/haskell/zip-archive/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix index 6bbe28446127..45f2ac96319d 100644 --- a/pkgs/development/libraries/haskell/zip-archive/default.nix +++ b/pkgs/development/libraries/haskell/zip-archive/default.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ binary digest filepath mtl time utf8String zlib ]; testDepends = [ HUnit time ]; + doCheck = false; meta = { homepage = "http://github.com/jgm/zip-archive"; description = "Library for creating and modifying zip archives"; From a0919feeadf20b0c03022add9644f83f459acab4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 23:39:43 +0100 Subject: [PATCH 43/57] haskell-permutation: disable 'doCheck' to avoid build errors Test/Permute.hs:20:8: Could not find module `Test.QuickCheck' Use -v to see a list of the files searched for. --- pkgs/development/libraries/haskell/permutation/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/permutation/default.nix b/pkgs/development/libraries/haskell/permutation/default.nix index 5903cb27f715..4f38dfcaa12f 100644 --- a/pkgs/development/libraries/haskell/permutation/default.nix +++ b/pkgs/development/libraries/haskell/permutation/default.nix @@ -4,6 +4,7 @@ cabal.mkDerivation (self: { pname = "permutation"; version = "0.4.1"; sha256 = "0fgw4ivs8sa18fyphwr3mzp2v7ha2nz2yf3a7jmz9ymqdf2xws97"; + doCheck = false; meta = { homepage = "http://stat.stanford.edu/~patperry/code/permutation"; description = "A library for permutations and combinations"; From 1b25d43132a88ebe44ad7c81bb8b6c45795a1275 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 23:48:22 +0100 Subject: [PATCH 44/57] haskell-distributed-process: disable 'doCheck' to avoid build errors Setup: At least the following dependencies are missing: ansi-terminal ==0.5.* --- .../libraries/haskell/distributed-process/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix index 0427a937f840..d23a5ef0228d 100644 --- a/pkgs/development/libraries/haskell/distributed-process/default.nix +++ b/pkgs/development/libraries/haskell/distributed-process/default.nix @@ -20,6 +20,7 @@ cabal.mkDerivation (self: { testFrameworkHunit ]; noHaddock = true; + doCheck = false; meta = { homepage = "http://github.com/haskell-distributed/distributed-process"; description = "Cloud Haskell: Erlang-style concurrency in Haskell"; From 1420012eca10cb70e383bff734093d036f44ca6c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 00:03:34 +0100 Subject: [PATCH 45/57] darcs: disable test suite to avoid 127 exit code --- pkgs/applications/version-management/darcs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix index 86f9be93f685..468e45fcff16 100644 --- a/pkgs/applications/version-management/darcs/default.nix +++ b/pkgs/applications/version-management/darcs/default.nix @@ -19,6 +19,7 @@ cabal.mkDerivation (self: { mkdir -p $out/etc/bash_completion.d mv contrib/darcs_completion $out/etc/bash_completion.d/darcs ''; + doCheck = false; meta = { homepage = "http://darcs.net/"; description = "a distributed, interactive, smart revision control system"; From b313b3f1c38b39745b5fc5439b2fa46e452f2d69 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 00:06:11 +0100 Subject: [PATCH 46/57] haskell-statistics: disable 'doCheck' to avoid test suite failures Running 1 test suites... Test suite tests: RUNNING... Tests for all distributions: Tests for: BetaDistribution: C.D.F. sanity: [OK, passed 100 tests] CDF limit at +tests: : commitBuffer: invalid argument (invalid character) Test suite tests: FAIL Test suite logged to: dist/test/statistics-0.10.2.0-tests.log --- pkgs/development/libraries/haskell/statistics/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix index 923cdf879a5c..f53e7a341d6e 100644 --- a/pkgs/development/libraries/haskell/statistics/default.nix +++ b/pkgs/development/libraries/haskell/statistics/default.nix @@ -16,6 +16,7 @@ cabal.mkDerivation (self: { erf HUnit ieee754 mathFunctions primitive QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 vector vectorAlgorithms ]; + doCheck = false; meta = { homepage = "https://github.com/bos/statistics"; description = "A library of statistical types, data, and functions"; From bab62f09e0b24ddeefefcad1b0b2939998ea837a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 00:11:16 +0100 Subject: [PATCH 47/57] haskell-threads: disable 'doCheck' to avoid test suite build errors Setup: At least the following dependencies are missing: test-framework >=0.2.4 && <0.7, test-framework-hunit >=0.2.4 && <0.3 --- pkgs/development/libraries/haskell/threads/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/threads/default.nix b/pkgs/development/libraries/haskell/threads/default.nix index a3327e88ba6c..533a67c99c82 100644 --- a/pkgs/development/libraries/haskell/threads/default.nix +++ b/pkgs/development/libraries/haskell/threads/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { baseUnicodeSymbols concurrentExtra HUnit stm testFramework testFrameworkHunit ]; + doCheck = false; meta = { homepage = "https://github.com/basvandijk/threads"; description = "Fork threads and wait for their result"; From 94d3f2c692150a775c87952f88ba2049485d26ac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 00:13:30 +0100 Subject: [PATCH 48/57] haskell-happstack-server: disable 'doCheck' to avoid test suite build errors tests/Test.hs:3:8: Could not find module `Happstack.Server.Tests' Perhaps you meant Happstack.Server.Types (from happstack-server-7.1.6) Happstack.Server.Auth (from happstack-server-7.1.6) Happstack.Server.Client (from happstack-server-7.1.6) Use -v to see a list of the files searched for. --- .../development/libraries/haskell/happstack/happstack-server.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index dba052a0fc1e..8d8261df97e3 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -16,6 +16,7 @@ cabal.mkDerivation (self: { utf8String xhtml zlib ]; testDepends = [ HUnit parsec zlib ]; + doCheck = false; meta = { homepage = "http://happstack.com"; description = "Web related tools and services"; From e906a6e437e8e95d518561b8f059c203b093d9a3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 00:23:57 +0100 Subject: [PATCH 49/57] haskell-pandoc: disable 'doCheck' to avoid test suite build errors Configuring pandoc-1.10.1... Setup: At least the following dependencies are missing: Diff ==0.2.*, HUnit ==1.2.*, QuickCheck >=2.4 && <2.6, ansi-terminal >=0.5 && <0.7, test-framework >=0.3 && <0.9, test-framework-hunit >=0.2 && <0.4, test-framework-quickcheck2 >=0.2.9 && <0.4 --- pkgs/development/libraries/haskell/pandoc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index df24b4ac0222..93f7e8add429 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -20,6 +20,7 @@ cabal.mkDerivation (self: { patchPhase = '' sed -r -i -e 's|blaze-html >= 0.5 && < 0.6,|blaze-html >= 0.5,|' pandoc.cabal ''; + doCheck = false; meta = { homepage = "http://johnmacfarlane.net/pandoc"; description = "Conversion between markup formats"; From 42db9ae872a138a7d5cded3dc982630baccda17b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 00:26:18 +0100 Subject: [PATCH 50/57] haskell-fsnotify: disable 'doCheck' to avoid test suite failures Test suite test: RUNNING... canonicalizeDirPath - Absolute path keeps trailing slash FAILED [1] - Absolute path gains trailing slash FAILED [2] - Relative path keeps trailing slash - Relative path gains trailing slash canonicalizePath - Absolute path keeps trailing slash FAILED [3] - Relative path keeps trailing slash findFiles - Non-recursive - Recursive findDirs - Non-recursive - Recursive watchDir - Create file - Modify file - Remove file - Rename file - Debounce watchDirChan - Create file - Modify file - Remove file - Rename file watchTree - Create file (pre-existing directory) - Create file (create directory) - Modify file - Remove file - Rename file watchTreeChan - Create file (pre-existing directory) - Create file (create directory) - Modify file - Remove file - Rename file 1) canonicalizeDirPath Absolute path keeps trailing slash FAILED (uncaught exception) IOException (/home/: canonicalizePath: does not exist (No such file or directory)) 2) canonicalizeDirPath Absolute path gains trailing slash FAILED (uncaught exception) IOException (/home: canonicalizePath: does not exist (No such file or directory)) 3) canonicalizePath Absolute path keeps trailing slash FAILED (uncaught exception) IOException (/home/: canonicalizePath: does not exist (No such file or directory)) Finished in 37.1526 seconds 29 examples, 3 failures Test suite test: FAIL Test suite logged to: dist/test/fsnotify-0.0.6-test.log --- pkgs/development/libraries/haskell/fsnotify/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/fsnotify/default.nix b/pkgs/development/libraries/haskell/fsnotify/default.nix index 142b513e5924..cfc80c4d547a 100644 --- a/pkgs/development/libraries/haskell/fsnotify/default.nix +++ b/pkgs/development/libraries/haskell/fsnotify/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { Cabal Glob hinotify hspec QuickCheck random systemFileio systemFilepath text time uniqueid ]; + doCheck = false; meta = { description = "Cross platform library for file creation, modification, and deletion notification"; license = self.stdenv.lib.licenses.bsd3; From 2399599a7091e2c855bee188be8cd3e870854e8d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 00:34:56 +0100 Subject: [PATCH 51/57] haskell-postgresql-simple: disable 'doCheck' to avoid test suite failure Test suite test: RUNNING... test: SqlError {sqlState = "", sqlNativeError = -1, sqlErrorMsg = "could not connect to server: No such file or directory\n\tIs the server running locally and accepting\n\tconnections on Unix domain socket \"/tmp/.s.PGSQL.5432\"?\n"} Test suite test: FAIL Test suite logged to: dist/test/postgresql-simple-0.2.4.1-test.log 0 of 1 test suites (0 of 1 test cases) passed. --- pkgs/development/libraries/haskell/postgresql-simple/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index 29c74d84015f..81a5f67c45b9 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { transformers vector ]; testDepends = [ base16Bytestring cryptohash HUnit text time ]; + doCheck = false; meta = { description = "Mid-Level PostgreSQL client library"; license = self.stdenv.lib.licenses.bsd3; From 606d867a60768a0253d634a81772ea788a501c60 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 00:49:27 +0100 Subject: [PATCH 52/57] haskell-crypto-conduit: disable 'doCheck' to avoid test suite build errors --- pkgs/development/libraries/haskell/crypto-conduit/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index 69351a2a5aa3..2b967a5b5649 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { cereal conduit cryptoApi cryptocipher cryptohash hspec skein transformers ]; + doCheck = false; meta = { homepage = "https://github.com/meteficha/crypto-conduit"; description = "Conduit interface for cryptographic operations (from crypto-api)"; From d38183c803bc15bc9000199b26e534f9d13f58ac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 00:50:31 +0100 Subject: [PATCH 53/57] haskell-unordered-containers: disable 'doCheck' to avoid test suite build errors tests/HashSetProperties.hs:76:0: error: missing binary operator before token "(" tests/HashSetProperties.hs:86:0: error: missing binary operator before token "(" --- .../libraries/haskell/unordered-containers/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/unordered-containers/default.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix index 2f786eba949e..288e559ce980 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/default.nix +++ b/pkgs/development/libraries/haskell/unordered-containers/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { ChasingBottoms hashable HUnit QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 ]; + doCheck = false; meta = { homepage = "https://github.com/tibbe/unordered-containers"; description = "Efficient hashing-based container types"; From 6789f4c59c744e0a484a147cc3cfea655f4f88ca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 00:57:13 +0100 Subject: [PATCH 54/57] haskell-lens: disable 'doCheck' to avoid test suite failures Running 4 test suites... Test suite doctests: RUNNING... ### Error in src/Data/Complex/Lens.hs:33: expression `let { a doctests: : hPutChar: invalid argument (invalid character) Test suite doctests: FAIL Test suite logged to: dist/test/lens-3.8.7.3-doctests.log Test suite hunit: RUNNING... Test suite hunit: PASS Test suite logged to: dist/test/lens-3.8.7.3-hunit.log Test suite properties: RUNNING... Test suite properties: PASS Test suite logged to: dist/test/lens-3.8.7.3-properties.log Test suite templates: RUNNING... Test suite templates: PASS Test suite logged to: dist/test/lens-3.8.7.3-templates.log 3 of 4 test suites (3 of 4 test cases) passed. --- pkgs/development/libraries/haskell/lens/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index bba846689584..84a66d019dcc 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -25,6 +25,7 @@ cabal.mkDerivation (self: { testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text transformers unorderedContainers vector ]; + doCheck = false; meta = { homepage = "http://github.com/ekmett/lens/"; description = "Lenses, Folds and Traversals"; From f8cc6962392b0347133882d53dfb8127af2f21fd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 00:58:28 +0100 Subject: [PATCH 55/57] haskell-graphviz: disable 'doCheck' to avoid test suite failures Test suite graphviz-testsuite: RUNNING... This is the test suite for the graphviz library. If any of these tests fail, please inform the maintainer, including full output of this test suite. ====================================================================== Running test: "Printing and parsing of Attributes". The most common source of errors in printing and parsing are for Attributes. +++ OK, passed 200 tests. All tests for "Printing and parsing of Attributes" were successful! ====================================================================== Running test: "Printing generalised Dot code". When generalising "DotGraph" values to other "DotRepr" values, the generated Dot code should be identical. +++ OK, passed 200 tests. All tests for "Printing generalised Dot code" were successful! ====================================================================== Running test: "Printing and Parsing DotReprs". The graphviz library should be able to parse back in its own generated Dot code for any "DotRepr" instance +++ OK, passed 200 tests. +++ OK, passed 200 tests. +++ OK, passed 200 tests. All tests for "Printing and Parsing DotReprs" were successful! ====================================================================== Running test: "Pre-processing Dot code". When parsing Dot code, some pre-processing is done to remove items such as comments and to join together multi-line strings. This test verifies that this pre-processing doesn't affect actual Dot code by running the pre-processor on generated Dot code. This test is not run on generalised Dot graphs as if it works for normal dot graphs then it should also work for generalised ones. +++ OK, passed 200 tests. All tests for "Pre-processing Dot code" were successful! ====================================================================== Running test: "Augmenting FGL Graphs". The various Graph to Graph functions in Data.GraphViz should only _augment_ the graph labels and not change the graphs themselves. This test compares the original graphs to these augmented graphs and verifies that they are the same. *** Failed! (after 1 test): Exception: Error running utility program: Error messages from neato: -1:']'->[] The tests for "Augmenting FGL Graphs" failed! Not attempting any further tests. Test suite graphviz-testsuite: FAIL Test suite logged to: dist/test/graphviz-2999.16.0.0-graphviz-testsuite.log 0 of 1 test suites (0 of 1 test cases) passed. --- pkgs/development/libraries/haskell/graphviz/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix index 9d370993a22c..77245ec8c91b 100644 --- a/pkgs/development/libraries/haskell/graphviz/default.nix +++ b/pkgs/development/libraries/haskell/graphviz/default.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { colour dlist fgl filepath polyparse QuickCheck temporary text transformers wlPprintText ]; + doCheck = false; meta = { homepage = "http://projects.haskell.org/graphviz/"; description = "Bindings to Graphviz for graph visualisation"; From e993649477b97694ba129d9361532d8d4c006d42 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 01:13:44 +0100 Subject: [PATCH 56/57] haskell-cabal2nix: update to version 1.44 --- pkgs/development/tools/haskell/cabal2nix/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index e3b6378e3d91..ed26e3358708 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -1,12 +1,14 @@ -{ cabal, Cabal, filepath, hackageDb, HTTP, mtl, regexPosix }: +{ cabal, Cabal, doctest, filepath, hackageDb, HTTP, mtl, regexPosix +}: cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.43"; - sha256 = "00blyn8hxj7d0ib7gg0a2gk36scm1isr5m4xsi9nvqay3261b068"; + version = "1.44"; + sha256 = "1j2w5g75nir0ax9pvn1fyj5l1c4s84mbj400any9v0bpv624mffm"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; + testDepends = [ doctest ]; meta = { homepage = "http://github.com/NixOS/cabal2nix"; description = "Convert Cabal files into Nix build instructions"; From 7aad2ce1013b7bbe5c4dca02d720c08aba982d42 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 01:25:05 +0100 Subject: [PATCH 57/57] haskell-defaults.nix: fix build of cabal2nix on GHC versions older than 6.12.x Cabal2nix needs version 1.10.x or later of the Cabal library. --- pkgs/top-level/haskell-defaults.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index a03f0a6fe466..f99e790de946 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -85,6 +85,7 @@ deepseq = self.deepseq_1_1_0_2; # deviating from Haskell platform here, to make some packages (notably statistics) compile jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; }; + cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_14_0; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; }; ghc6121Prefs = @@ -95,6 +96,7 @@ deepseq = self.deepseq_1_1_0_2; monadPar = self.monadPar_0_1_0_3; jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; }; + cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_14_0; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; # deviating from Haskell platform here, to make some packages (notably statistics) compile }; @@ -108,6 +110,7 @@ deepseq = self.deepseq_1_1_0_2; monadPar = self.monadPar_0_1_0_3; jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; }; + cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_14_0; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; # deviating from Haskell platform here, to make some packages (notably statistics) compile };