From 9e4a60d54e5a1c2604f2e379af2574751de96959 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Mon, 9 Dec 2013 23:11:50 +0000 Subject: [PATCH 001/115] haskellPackages.extensibleEffects: New expression --- .../haskell/extensible-effects/default.nix | 20 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/haskell/extensible-effects/default.nix diff --git a/pkgs/development/libraries/haskell/extensible-effects/default.nix b/pkgs/development/libraries/haskell/extensible-effects/default.nix new file mode 100644 index 000000000000..f97b5cd5e28c --- /dev/null +++ b/pkgs/development/libraries/haskell/extensible-effects/default.nix @@ -0,0 +1,20 @@ +{ cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2 +}: + +cabal.mkDerivation (self: { + pname = "extensible-effects"; + version = "1.2.1"; + sha256 = "066977hjhcg44v47hkjpf2gs48xsry74l4h8hp753jsvbfsv0030"; + testDepends = [ + HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; + meta = { + homepage = "https://github.com/RobotGymnast/extensible-effects"; + description = "An Alternative to Monad Transformers"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 747ce660b511..b23b03a3edb0 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -992,6 +992,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x fileLocation = callPackage ../development/libraries/haskell/file-location {}; + extensibleEffects = callPackage ../development/libraries/haskell/extensible-effects {}; + 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 7317135edc20ee57b2bcaaf717d645288208ca36 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Mon, 9 Dec 2013 23:13:44 +0000 Subject: [PATCH 002/115] haskellPackages.IntervalMap: New expression --- .../libraries/haskell/IntervalMap/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/IntervalMap/default.nix diff --git a/pkgs/development/libraries/haskell/IntervalMap/default.nix b/pkgs/development/libraries/haskell/IntervalMap/default.nix new file mode 100644 index 000000000000..e2b94abd7c8d --- /dev/null +++ b/pkgs/development/libraries/haskell/IntervalMap/default.nix @@ -0,0 +1,16 @@ +{ cabal, Cabal, deepseq, QuickCheck }: + +cabal.mkDerivation (self: { + pname = "IntervalMap"; + version = "0.3.0.2"; + sha256 = "14pbq5n2cn9gxjkmqpnbn7dx9963wp3sdbb180wm9l5xqi338s0l"; + buildDepends = [ deepseq ]; + testDepends = [ Cabal deepseq QuickCheck ]; + meta = { + homepage = "http://www.chr-breitkopf.de/comp/IntervalMap"; + description = "Maps from Intervals to values, with efficient search"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 747ce660b511..c8dba1a891c8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1361,6 +1361,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x intervals = callPackage ../development/libraries/haskell/intervals {}; + IntervalMap = callPackage ../development/libraries/haskell/IntervalMap {}; + ioChoice = callPackage ../development/libraries/haskell/io-choice {}; IORefCAS = callPackage ../development/libraries/haskell/IORefCAS {}; From 11668c9273f37e0f7ed2b775373463311d174b89 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Mon, 9 Dec 2013 23:32:00 +0000 Subject: [PATCH 003/115] haskellPackages.exPool: New expression --- .../libraries/haskell/ex-pool/default.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/haskell/ex-pool/default.nix diff --git a/pkgs/development/libraries/haskell/ex-pool/default.nix b/pkgs/development/libraries/haskell/ex-pool/default.nix new file mode 100644 index 000000000000..9bf966e749af --- /dev/null +++ b/pkgs/development/libraries/haskell/ex-pool/default.nix @@ -0,0 +1,17 @@ +{ cabal, exceptions, hashable, stm, time, transformers, vector }: + +cabal.mkDerivation (self: { + pname = "ex-pool"; + version = "0.1.0.2"; + sha256 = "11q63yfr59r6cfzi635xj75nhcc2yi83snc75k638wyamxgvxng4"; + buildDepends = [ + exceptions hashable stm time transformers vector + ]; + meta = { + homepage = "https://github.com/kim/ex-pool"; + description = "Another fork of resource-pool, with a MonadIO and MonadCatch constraint"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 747ce660b511..fc8edf5d7877 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -975,6 +975,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x esqueleto = callPackage ../development/libraries/haskell/esqueleto {}; + exPool = callPackage ../development/libraries/haskell/ex-pool { hashable = self.hashable_1_2_1_0; }; + exceptionMtl = callPackage ../development/libraries/haskell/exception-mtl {}; exceptionTransformers = callPackage ../development/libraries/haskell/exception-transformers {}; From 192cca63ef3bba82e28e0762b75dc651191e3bbb Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Mon, 9 Dec 2013 23:35:59 +0000 Subject: [PATCH 004/115] haskellPackages.haskelldb: New expression --- .../libraries/haskell/haskelldb/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/haskelldb/default.nix diff --git a/pkgs/development/libraries/haskell/haskelldb/default.nix b/pkgs/development/libraries/haskell/haskelldb/default.nix new file mode 100644 index 000000000000..fde1d71b2b03 --- /dev/null +++ b/pkgs/development/libraries/haskell/haskelldb/default.nix @@ -0,0 +1,15 @@ +{ cabal, mtl, time }: + +cabal.mkDerivation (self: { + pname = "haskelldb"; + version = "2.2.2"; + sha256 = "1nwy05wsffagv62kbi8ahm6s591wal7cdl19p0fqi86qz05y9hkm"; + buildDepends = [ mtl time ]; + meta = { + homepage = "https://github.com/m4dc4p/haskelldb"; + description = "A library of combinators for generating and executing SQL statements"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 747ce660b511..2c0b8ebf3dfe 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1170,6 +1170,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hashtables = callPackage ../development/libraries/haskell/hashtables {}; + haskelldb = callPackage ../development/libraries/haskell/haskelldb {}; + haskeline = callPackage ../development/libraries/haskell/haskeline {}; haskelineClass = callPackage ../development/libraries/haskell/haskeline-class {}; From 393dcd9c84e104ab7ff7e35f5612dc221e58d29b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Tue, 10 Dec 2013 11:56:25 +0200 Subject: [PATCH 005/115] gmime: update from 2.6.15 to 2.6.19 --- pkgs/development/libraries/gmime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gmime/default.nix b/pkgs/development/libraries/gmime/default.nix index 99859b9f34ef..a8a3943e409e 100644 --- a/pkgs/development/libraries/gmime/default.nix +++ b/pkgs/development/libraries/gmime/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, zlib, libgpgerror }: stdenv.mkDerivation rec { - name = "gmime-2.6.15"; + name = "gmime-2.6.19"; src = fetchurl { url = "mirror://gnome/sources/gmime/2.6/${name}.tar.xz"; - sha256 = "16n9gmlwn6rphi59hrwy6dpn785s3r13h2kmrn3k61l2kfws1hml"; + sha256 = "0jm1fgbjgh496rsc0il2y46qd4bqq2ln9168p4zzh68mk4ml1yxg"; }; nativeBuildInputs = [ pkgconfig ]; From 36cb2af0570889d57364b3b71f5526a536d41485 Mon Sep 17 00:00:00 2001 From: Arvin Moezzi Date: Fri, 6 Dec 2013 21:23:03 +0100 Subject: [PATCH 006/115] calibre: upgrade 1.13.0 -> 1.14.0 Signed-off-by: Moritz Ulrich --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 41f4b4f09042..6c007aadd320 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-1.13.0"; + name = "calibre-1.14.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "0j0l81jkjzd8n3ciqwxh8zxz945y594xjfsizp3cxjjfhj90aagj"; + sha256 = "1nwrahh8rkllazwjgwv1a5fxcg0x221760ixm3707ikz33i0qvx6"; }; inherit python; From ea20904aefbb7a5bd865abd23b850ccb82e36342 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Dec 2013 12:52:18 +0100 Subject: [PATCH 007/115] cabal: add support for the enableStaticLibrary flag to enable/disable building of static libraries Disabling static libraries is supported only in GHC 7.7 or later. --- pkgs/build-support/cabal/default.nix | 9 +++++++++ pkgs/top-level/haskell-packages.nix | 7 +++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index 9b6d8c4e80ed..14bd01c7346e 100644 --- a/pkgs/build-support/cabal/default.nix +++ b/pkgs/build-support/cabal/default.nix @@ -4,6 +4,7 @@ , enableLibraryProfiling ? false , enableSharedLibraries ? false , enableSharedExecutables ? false +, enableStaticLibraries ? true , enableCheckPhase ? stdenv.lib.versionOlder "7.4" ghc.version }: @@ -25,6 +26,9 @@ assert enableSharedExecutables -> versionOlder "7.4" ghc.version; # Our GHC 6.10.x builds do not provide sharable versions of their core libraries. assert enableSharedLibraries -> versionOlder "6.12" ghc.version; +# Our GHC 6.10.x builds do not provide sharable versions of their core libraries. +assert !enableStaticLibraries -> versionOlder "7.7" ghc.version; + { mkDerivation = args : # arguments for the individual package, can modify the defaults @@ -128,6 +132,10 @@ assert enableSharedLibraries -> versionOlder "6.12" ghc.version; # and run any regression test suites the package might have doCheck = enableCheckPhase; + # pass the '--enable-library-vanilla' flag to cabal in the + # configure stage to enable building shared libraries + inherit enableStaticLibraries; + # pass the '--enable-shared' flag to cabal in the configure # stage to enable building shared libraries inherit enableSharedLibraries; @@ -140,6 +148,7 @@ assert enableSharedLibraries -> versionOlder "6.12" ghc.version; (enableFeature self.enableSplitObjs "split-objs") (enableFeature enableLibraryProfiling "library-profiling") (enableFeature self.enableSharedLibraries "shared") + (optional (versionOlder "7" ghc.version) (enableFeature self.enableStaticLibraries "library-vanilla")) (optional (versionOlder "7.4" ghc.version) (enableFeature self.enableSharedExecutables "executable-dynamic")) (optional (versionOlder "7" ghc.version) (enableFeature self.doCheck "tests")) ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 40446bcd3660..87b99ddf5d98 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -63,6 +63,7 @@ , enableSharedLibraries ? pkgs.stdenv.lib.versionOlder "7.7" ghc.version , enableSharedExecutables ? pkgs.stdenv.lib.versionOlder "7.7" ghc.version , enableCheckPhase ? pkgs.stdenv.lib.versionOlder "7.4" ghc.version +, enableStaticLibraries ? true }: # We redefine callPackage to take into account the new scope. The optional @@ -113,10 +114,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x # packages. It isn't the Cabal library, which is spelled "Cabal". cabal = callPackage ../build-support/cabal { - inherit enableLibraryProfiling; - inherit enableSharedLibraries; - inherit enableSharedExecutables; - inherit enableCheckPhase; + inherit enableLibraryProfiling enableCheckPhase + enableStaticLibraries enableSharedLibraries enableSharedExecutables; glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null; }; From ebdff3841aa5d2fe145b2ff5074c0a23f2657ca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Sun, 17 Nov 2013 13:09:01 +0100 Subject: [PATCH 008/115] haskell: Propagate cabal dependencies to user env Before this commit, if a haskell library X depends on Y, and X was added to systemPackages, only X would be available in the user environment. Y would not be avialable, which causes X to be broken. This commit solves the issue by setting propagatedUserEnvPkgs to all packages X depends on when X is a library. --- pkgs/build-support/cabal/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index 14bd01c7346e..b17f720e5618 100644 --- a/pkgs/build-support/cabal/default.nix +++ b/pkgs/build-support/cabal/default.nix @@ -46,6 +46,7 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version; x : (removeAttrs x internalAttrs) // { buildInputs = filter (y : ! (y == null)) x.buildInputs; propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs; + propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs; doCheck = enableCheckPhase && x.doCheck; }; @@ -96,6 +97,10 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version; # have to check for its existence propagatedBuildInputs = if self.isLibrary then self.buildDepends ++ self.extraLibraries ++ self.pkgconfigDepends else []; + # By default, also propagate all dependencies to the user environment. This is required, otherwise packages would be broken, because + # GHC also needs all dependencies to be available. + propagatedUserEnvPkgs = if self.isLibrary then self.buildDepends else []; + # library directories that have to be added to the Cabal files extraLibDirs = []; From 6b5f1f35fbf68beee4d81556331892e3ba659e3f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 12:57:47 +0100 Subject: [PATCH 009/115] haskell-errorcall-eq-instance: add version 0.1.0 --- .../haskell/errorcall-eq-instance/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix diff --git a/pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix b/pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix new file mode 100644 index 000000000000..e3bfa5c569ea --- /dev/null +++ b/pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix @@ -0,0 +1,13 @@ +{ cabal, hspec, QuickCheck }: + +cabal.mkDerivation (self: { + pname = "errorcall-eq-instance"; + version = "0.1.0"; + sha256 = "1sr2wxbdqzpdawcivvd01nwpki0xbcxylz5qv95b96sq6b296gkk"; + testDepends = [ hspec QuickCheck ]; + meta = { + description = "An orphan Eq instance for ErrorCall"; + 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 87b99ddf5d98..af706d027745 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -966,6 +966,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x erf = callPackage ../development/libraries/haskell/erf {}; + errorcallEqInstance = callPackage ../development/libraries/haskell/errorcall-eq-instance {}; + errors = callPackage ../development/libraries/haskell/errors {}; either = callPackage ../development/libraries/haskell/either {}; From 6ea83a9a66a930f98ed7521ad2b05f75f2be520f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 12:58:19 +0100 Subject: [PATCH 010/115] haskell-case-insensitive: update to version 1.1.0.2 --- .../haskell/case-insensitive/{1.1.0.1.nix => 1.1.0.2.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/libraries/haskell/case-insensitive/{1.1.0.1.nix => 1.1.0.2.nix} (84%) diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.1.0.1.nix b/pkgs/development/libraries/haskell/case-insensitive/1.1.0.2.nix similarity index 84% rename from pkgs/development/libraries/haskell/case-insensitive/1.1.0.1.nix rename to pkgs/development/libraries/haskell/case-insensitive/1.1.0.2.nix index 4f63796850a0..5fd438e320d5 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/1.1.0.1.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/1.1.0.2.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "case-insensitive"; - version = "1.1.0.1"; - sha256 = "1hwkdkpr88r3s7c8w1msw1pawz8cfi0lwj1z9dcsp0xs788yzapp"; + version = "1.1.0.2"; + sha256 = "0200jpz2xs67sw5dczfj8nlz2yp40k05bv3rk1phdc093n13kaww"; buildDepends = [ deepseq hashable text ]; testDepends = [ HUnit testFramework testFrameworkHunit text ]; meta = { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index af706d027745..a8e563c79cb6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -143,7 +143,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x inherit (self) cabal ghc; async = self.async_2_0_1_4; attoparsec = self.attoparsec_0_10_4_0; - caseInsensitive = self.caseInsensitive_1_1_0_1; + caseInsensitive = self.caseInsensitive_1_1_0_2; cgi = self.cgi_3001_1_8_4; fgl = self.fgl_5_4_2_4; GLUT = self.GLUT_2_5_0_2; @@ -686,8 +686,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cassava = callPackage ../development/libraries/haskell/cassava {}; caseInsensitive_1_0_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.0.0.1.nix {}; - caseInsensitive_1_1_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.1.0.1.nix {}; - caseInsensitive = self.caseInsensitive_1_1_0_1; + caseInsensitive_1_1_0_2 = callPackage ../development/libraries/haskell/case-insensitive/1.1.0.2.nix {}; + caseInsensitive = self.caseInsensitive_1_1_0_2; cautiousFile = callPackage ../development/libraries/haskell/cautious-file {}; From 1d56cb64a825e38a7448af16cb0b1adc102acae9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 12:58:47 +0100 Subject: [PATCH 011/115] haskell-http-client-*: new packages --- .../haskell/http-client-conduit/default.nix | 14 ++++++++++ .../haskell/http-client-multipart/default.nix | 19 +++++++++++++ .../haskell/http-client-tls/default.nix | 17 ++++++++++++ .../libraries/haskell/http-client/default.nix | 27 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 8 ++++++ 5 files changed, 85 insertions(+) create mode 100644 pkgs/development/libraries/haskell/http-client-conduit/default.nix create mode 100644 pkgs/development/libraries/haskell/http-client-multipart/default.nix create mode 100644 pkgs/development/libraries/haskell/http-client-tls/default.nix create mode 100644 pkgs/development/libraries/haskell/http-client/default.nix diff --git a/pkgs/development/libraries/haskell/http-client-conduit/default.nix b/pkgs/development/libraries/haskell/http-client-conduit/default.nix new file mode 100644 index 000000000000..df4b49b47f39 --- /dev/null +++ b/pkgs/development/libraries/haskell/http-client-conduit/default.nix @@ -0,0 +1,14 @@ +{ cabal, conduit, httpClient, resourcet, transformers }: + +cabal.mkDerivation (self: { + pname = "http-client-conduit"; + version = "0.2.0.0"; + sha256 = "1pb47mms5qfi185nrz675if4pb7xji97xdqpmyrplqaxqygwih1y"; + buildDepends = [ conduit httpClient resourcet transformers ]; + meta = { + homepage = "https://github.com/snoyberg/http-client"; + description = "Frontend support for using http-client with conduit"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/http-client-multipart/default.nix b/pkgs/development/libraries/haskell/http-client-multipart/default.nix new file mode 100644 index 000000000000..068efdcb543d --- /dev/null +++ b/pkgs/development/libraries/haskell/http-client-multipart/default.nix @@ -0,0 +1,19 @@ +{ cabal, blazeBuilder, filepath, httpClient, httpTypes, mimeTypes +, random, text, transformers +}: + +cabal.mkDerivation (self: { + pname = "http-client-multipart"; + version = "0.2.0.0"; + sha256 = "1bahkysh771p3mrfan1gmm6jyx62w3k57ba4rsnx7h1gwbilm878"; + buildDepends = [ + blazeBuilder filepath httpClient httpTypes mimeTypes random text + transformers + ]; + meta = { + homepage = "https://github.com/snoyberg/http-client"; + description = "Generate multipart uploads for http-client"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/http-client-tls/default.nix b/pkgs/development/libraries/haskell/http-client-tls/default.nix new file mode 100644 index 000000000000..5056a94c5d94 --- /dev/null +++ b/pkgs/development/libraries/haskell/http-client-tls/default.nix @@ -0,0 +1,17 @@ +{ cabal, connection, dataDefault, hspec, httpClient, httpTypes +, network, tls +}: + +cabal.mkDerivation (self: { + pname = "http-client-tls"; + version = "0.2.0.0"; + sha256 = "06ywjmhdgnwdyfj0qvmabb5bvgrdfyf7dfxm0hzqvkh2i104s7g0"; + buildDepends = [ connection dataDefault httpClient network tls ]; + testDepends = [ hspec httpClient httpTypes ]; + meta = { + homepage = "https://github.com/snoyberg/http-client"; + description = "http-client backend using the connection package and tls library"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix new file mode 100644 index 000000000000..fd40ca88e1dc --- /dev/null +++ b/pkgs/development/libraries/haskell/http-client/default.nix @@ -0,0 +1,27 @@ +{ cabal, base64Bytestring, blazeBuilder, caseInsensitive, cookie +, dataDefault, deepseq, failure, hspec, httpTypes, monadControl +, network, publicsuffixlist, text, time, transformers, zlib +, zlibBindings +}: + +cabal.mkDerivation (self: { + pname = "http-client"; + version = "0.2.0.1"; + sha256 = "0iqlq0drylxc9ir362pdbljghh5mxrmqjl51s02381y7jc0mfjs0"; + buildDepends = [ + base64Bytestring blazeBuilder caseInsensitive cookie dataDefault + deepseq failure httpTypes network publicsuffixlist text time + transformers zlibBindings + ]; + testDepends = [ + base64Bytestring blazeBuilder caseInsensitive dataDefault deepseq + failure hspec httpTypes monadControl network text time transformers + zlib zlibBindings + ]; + meta = { + homepage = "https://github.com/snoyberg/http-client"; + description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; + 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 a8e563c79cb6..244ca770c5ae 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1222,6 +1222,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {}; + httpClient = callPackage ../development/libraries/haskell/http-client {}; + + httpClientConduit = callPackage ../development/libraries/haskell/http-client-conduit {}; + + httpClientMultipart = callPackage ../development/libraries/haskell/http-client-multipart {}; + + httpClientTls = callPackage ../development/libraries/haskell/http-client-tls {}; + httpReverseProxy = callPackage ../development/libraries/haskell/http-reverse-proxy {}; hackageDb = callPackage ../development/libraries/haskell/hackage-db {}; From 38ff6648470e3e72e400adde61b6a01e863f3603 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 12:59:50 +0100 Subject: [PATCH 012/115] haskell-parsers: update to version 0.10.1.2 --- .../libraries/haskell/parsers/{0.10.1.1.nix => 0.10.1.2.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/parsers/{0.10.1.1.nix => 0.10.1.2.nix} (83%) diff --git a/pkgs/development/libraries/haskell/parsers/0.10.1.1.nix b/pkgs/development/libraries/haskell/parsers/0.10.1.2.nix similarity index 83% rename from pkgs/development/libraries/haskell/parsers/0.10.1.1.nix rename to pkgs/development/libraries/haskell/parsers/0.10.1.2.nix index db79c81a62d4..0f9c5f6634e7 100644 --- a/pkgs/development/libraries/haskell/parsers/0.10.1.1.nix +++ b/pkgs/development/libraries/haskell/parsers/0.10.1.2.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "parsers"; - version = "0.10.1.1"; - sha256 = "1w3dj3r2l0w54rafngrp7r1spqznbj5yzilkprqxvbvvj3jxgn5a"; + version = "0.10.1.2"; + sha256 = "1malfr2ls7f6di2rj2jcyxyqvjz0vb3p3v06j0r9if1bkjfzfp2j"; buildDepends = [ charset parsec text transformers unorderedContainers ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 244ca770c5ae..6351ea3bcb0f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1706,8 +1706,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x parsec = self.parsec3; parsers_0_9 = callPackage ../development/libraries/haskell/parsers/0.9.nix {}; - parsers_0_10_1_1 = callPackage ../development/libraries/haskell/parsers/0.10.1.1.nix {}; - parsers = self.parsers_0_10_1_1; + parsers_0_10_1_2 = callPackage ../development/libraries/haskell/parsers/0.10.1.2.nix {}; + parsers = self.parsers_0_10_1_2; parsimony = callPackage ../development/libraries/haskell/parsimony {}; From 375c13622e7c44d504842779e0253096b444a02c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:01:16 +0100 Subject: [PATCH 013/115] haskell-text: update to version 1.0.0.0 --- .../libraries/haskell/text/1.0.0.0.nix | 22 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/text/1.0.0.0.nix diff --git a/pkgs/development/libraries/haskell/text/1.0.0.0.nix b/pkgs/development/libraries/haskell/text/1.0.0.0.nix new file mode 100644 index 000000000000..fe740864970b --- /dev/null +++ b/pkgs/development/libraries/haskell/text/1.0.0.0.nix @@ -0,0 +1,22 @@ +{ cabal, deepseq, HUnit, QuickCheck, random, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2 +}: + +cabal.mkDerivation (self: { + pname = "text"; + version = "1.0.0.0"; + sha256 = "13i7xn5xl8lc5hcd08i4n0qp9rx51588jnjn4c68gp87vw1gwvjn"; + buildDepends = [ deepseq ]; + testDepends = [ + deepseq HUnit QuickCheck random testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; + doCheck = false; + meta = { + homepage = "https://github.com/bos/text"; + description = "An efficient packed Unicode text type"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6351ea3bcb0f..ed7dddae7f6d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -167,7 +167,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x split = self.split_0_2_2; stm = self.stm_2_4_2; syb = self.syb_0_4_1; - text = self.text_0_11_3_1; + text = self.text_1_0_0_0; transformers = self.transformers_0_3_0_0; # this has become a core package in GHC 7.7 unorderedContainers = self.unorderedContainers_0_2_3_3; vector = self.vector_0_10_9_1; @@ -2155,7 +2155,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x text_0_11_2_0 = callPackage ../development/libraries/haskell/text/0.11.2.0.nix {}; text_0_11_2_3 = callPackage ../development/libraries/haskell/text/0.11.2.3.nix {}; text_0_11_3_1 = callPackage ../development/libraries/haskell/text/0.11.3.1.nix {}; - text = self.text_0_11_3_1; + text_1_0_0_0 = callPackage ../development/libraries/haskell/text/1.0.0.0.nix {}; + text = self.text_1_0_0_0; textFormat = callPackage ../development/libraries/haskell/text-format {}; From 367b119971fad6314b642c41e8ea6d9216439b85 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:02:23 +0100 Subject: [PATCH 014/115] haskell-pretty-show: update to version 1.6.2 --- .../libraries/haskell/pretty-show/{1.6.1.nix => 1.6.2.nix} | 7 ++++--- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) rename pkgs/development/libraries/haskell/pretty-show/{1.6.1.nix => 1.6.2.nix} (75%) diff --git a/pkgs/development/libraries/haskell/pretty-show/1.6.1.nix b/pkgs/development/libraries/haskell/pretty-show/1.6.2.nix similarity index 75% rename from pkgs/development/libraries/haskell/pretty-show/1.6.1.nix rename to pkgs/development/libraries/haskell/pretty-show/1.6.2.nix index dc31b452a1bb..ea3b7ed27cbf 100644 --- a/pkgs/development/libraries/haskell/pretty-show/1.6.1.nix +++ b/pkgs/development/libraries/haskell/pretty-show/1.6.2.nix @@ -1,12 +1,13 @@ -{ cabal, filepath, haskellLexer }: +{ cabal, filepath, happy, haskellLexer }: cabal.mkDerivation (self: { pname = "pretty-show"; - version = "1.6.1"; - sha256 = "17zdljvpf7ra9x3lny5kbjvmz3psn8y1k9cwbg97m017gh87gsh0"; + version = "1.6.2"; + sha256 = "0xhxyxymdjag2xczjrda5dkjc51m5k1nanpg9dmw0gr6wjaijbnp"; isLibrary = true; isExecutable = true; buildDepends = [ filepath haskellLexer ]; + buildTools = [ happy ]; meta = { homepage = "http://wiki.github.com/yav/pretty-show"; description = "Tools for working with derived `Show` instances and generic inspection of values"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ed7dddae7f6d..f7f2bd9d03b5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1772,8 +1772,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ppm = callPackage ../development/libraries/haskell/ppm {}; prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {}; - prettyShow_1_6_1 = callPackage ../development/libraries/haskell/pretty-show/1.6.1.nix {}; - prettyShow = self.prettyShow_1_6_1; + prettyShow_1_6_2 = callPackage ../development/libraries/haskell/pretty-show/1.6.2.nix {}; + prettyShow = self.prettyShow_1_6_2; punycode = callPackage ../development/libraries/haskell/punycode {}; From 37d68e69a0803050450a70d0bd6e5fba57cb5c85 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:02 +0100 Subject: [PATCH 015/115] haskell-pretty-show: remove obsolete version 1.2 --- .../libraries/haskell/pretty-show/1.2.nix | 16 ---------------- .../pretty-show/{1.6.2.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/pretty-show/1.2.nix rename pkgs/development/libraries/haskell/pretty-show/{1.6.2.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/pretty-show/1.2.nix b/pkgs/development/libraries/haskell/pretty-show/1.2.nix deleted file mode 100644 index 545816a57a02..000000000000 --- a/pkgs/development/libraries/haskell/pretty-show/1.2.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ cabal, haskellLexer }: - -cabal.mkDerivation (self: { - pname = "pretty-show"; - version = "1.2"; - sha256 = "0lbalmyrqisgd2spbvzifsy25lr6cl9sgz78hav8q8r406k7nf2l"; - isLibrary = true; - isExecutable = true; - buildDepends = [ haskellLexer ]; - meta = { - homepage = "http://wiki.github.com/yav/pretty-show"; - description = "Tools for working with derived Show instances"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/pretty-show/1.6.2.nix b/pkgs/development/libraries/haskell/pretty-show/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/pretty-show/1.6.2.nix rename to pkgs/development/libraries/haskell/pretty-show/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f7f2bd9d03b5..f34386fa180b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1771,9 +1771,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ppm = callPackage ../development/libraries/haskell/ppm {}; - prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {}; - prettyShow_1_6_2 = callPackage ../development/libraries/haskell/pretty-show/1.6.2.nix {}; - prettyShow = self.prettyShow_1_6_2; + prettyShow = callPackage ../development/libraries/haskell/pretty-show {}; punycode = callPackage ../development/libraries/haskell/punycode {}; From c0fc46516dd29dff46edcd19843cdcb566969273 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:18 +0100 Subject: [PATCH 016/115] haskell-github-backup: update to version 1.20131203 --- .../git-and-tools/github-backup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix index 0752504278be..e7501baf9b41 100644 --- a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix +++ b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "github-backup"; - version = "1.20131101"; - sha256 = "07l8a3xiy65xicxa5v14li6jnj3niwhndm8gd6q4d7aw14yq8wbn"; + version = "1.20131203"; + sha256 = "0156g7zbqsp58g8hniqsilyc79sam7plwhn3w56wbzf8m380mwba"; isLibrary = false; isExecutable = true; buildDepends = [ From a91e1a6f85e1021ddedbcfbfe8a6fd3febc0bf49 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:18 +0100 Subject: [PATCH 017/115] haskell-DAV: update to version 0.5 --- .../development/libraries/haskell/DAV/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix index c330f082e890..c24ceacc0216 100644 --- a/pkgs/development/libraries/haskell/DAV/default.nix +++ b/pkgs/development/libraries/haskell/DAV/default.nix @@ -1,17 +1,18 @@ -{ cabal, caseInsensitive, httpConduit, httpTypes, lens, liftedBase -, mtl, network, optparseApplicative, resourcet, transformers -, xmlConduit, xmlHamlet +{ cabal, caseInsensitive, httpClient, httpConduit, httpTypes, lens +, liftedBase, mtl, network, optparseApplicative, resourcet +, transformers, xmlConduit, xmlHamlet }: cabal.mkDerivation (self: { pname = "DAV"; - version = "0.4.1"; - sha256 = "0bcrnlixrzvbdvw7ffv2xl2d0k0w71jf0i5ayf97ymxly8ii8s0c"; + version = "0.5"; + sha256 = "1yda3w8rr8p7jnpjpbjafis7xi01wmd1fwrq4fprzpfgghcjidhq"; isLibrary = true; isExecutable = true; buildDepends = [ - caseInsensitive httpConduit httpTypes lens liftedBase mtl network - optparseApplicative resourcet transformers xmlConduit xmlHamlet + caseInsensitive httpClient httpConduit httpTypes lens liftedBase + mtl network optparseApplicative resourcet transformers xmlConduit + xmlHamlet ]; meta = { homepage = "http://floss.scru.org/hDAV"; From 82e26eb2a430ac918d2f9264ab73bd4be6b25500 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:18 +0100 Subject: [PATCH 018/115] haskell-JuicyPixels: update to version 3.1.2 --- pkgs/development/libraries/haskell/JuicyPixels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix index b2947318a1f1..485a80dadb3c 100644 --- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix +++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "JuicyPixels"; - version = "3.1.1.1"; - sha256 = "0lvhaa8pqknkcsfps5gcbwiqx0y1rhasiw9hwy7975vgpsh58dph"; + version = "3.1.2"; + sha256 = "19bal3g3cp4nn8g3zp4yi5g4zw5wnkbi74gcra8mxs4zy99bf8s2"; buildDepends = [ binary deepseq mtl primitive transformers vector zlib ]; From 5afde208e98a40f501025c344d4f6f3612b8237d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: [PATCH 019/115] haskell-authenticate-oauth: update to version 1.4.0.8 --- .../libraries/haskell/authenticate-oauth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix index 2ddd7c05ee99..15c8267ca3e2 100644 --- a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix +++ b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "authenticate-oauth"; - version = "1.4.0.7"; - sha256 = "1pmkj35rpbhgyjrfdg8j51xn9a420aawkwfg28fpxz7kid0cqw8g"; + version = "1.4.0.8"; + sha256 = "1mc36d6lkmqywzsxhzwv4445mmwdz0rr5ibd2a1nbgw5c5jw76fy"; buildDepends = [ base64Bytestring blazeBuilder blazeBuilderConduit conduit cryptoPubkeyTypes dataDefault httpConduit httpTypes monadControl From 5b61f54e0972637c697ea1548c6ee493c1e3b756 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: [PATCH 020/115] haskell-base-compat: update to version 0.3.0 --- pkgs/development/libraries/haskell/base-compat/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/base-compat/default.nix b/pkgs/development/libraries/haskell/base-compat/default.nix index ca208b7c1a34..6ce94b0d6c00 100644 --- a/pkgs/development/libraries/haskell/base-compat/default.nix +++ b/pkgs/development/libraries/haskell/base-compat/default.nix @@ -1,9 +1,10 @@ -{ cabal, hspec, setenv }: +{ cabal, errorcallEqInstance, hspec, setenv }: cabal.mkDerivation (self: { pname = "base-compat"; - version = "0.2.1"; - sha256 = "1yssx3nww89dmkw8i55bp1vinbczbxhhh0kh4f3b9fyw5ylnai43"; + version = "0.3.0"; + sha256 = "0jjj953hr00jj99ld2977al6n6qk67ds9qfzkzwkh5ifgmi6f20i"; + buildDepends = [ errorcallEqInstance ]; testDepends = [ hspec setenv ]; meta = { description = "A compatibility layer for base"; From c22384263d9b5297cf89121ef7b4d7c9df347a9e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: [PATCH 021/115] haskell-blaze-html: update to version 0.6.1.2 --- pkgs/development/libraries/haskell/blaze-html/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix index ec21e3fcd84b..7d799c2ebf62 100644 --- a/pkgs/development/libraries/haskell/blaze-html/default.nix +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "blaze-html"; - version = "0.6.1.1"; - sha256 = "08zfmkvahmm613r0nrabwl5zv9ragcrhdqsa8jfdrfdkrf6ckbrc"; + version = "0.6.1.2"; + sha256 = "09a9gp40y31im763bri755if5j369a8m4kkl3c4wabq8q21y8z7m"; buildDepends = [ blazeBuilder blazeMarkup text ]; testDepends = [ blazeBuilder blazeMarkup HUnit QuickCheck testFramework From 4d90e5aa3afce3056a4b8c207c2c729d6398ca19 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: [PATCH 022/115] haskell-blaze-markup: update to version 0.5.1.6 --- pkgs/development/libraries/haskell/blaze-markup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-markup/default.nix b/pkgs/development/libraries/haskell/blaze-markup/default.nix index 0c544119d5ff..23ea971922b1 100644 --- a/pkgs/development/libraries/haskell/blaze-markup/default.nix +++ b/pkgs/development/libraries/haskell/blaze-markup/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "blaze-markup"; - version = "0.5.1.5"; - sha256 = "0g3smm1ym7h45bkzx94b77ssyg0z0gqfwbnap3ywa2381rb39l74"; + version = "0.5.1.6"; + sha256 = "09w0mwws1xz0h0h99n6ppbdycnrv5y74x6asgzvrzqaslrp5rhvm"; buildDepends = [ blazeBuilder text ]; testDepends = [ blazeBuilder HUnit QuickCheck testFramework testFrameworkHunit From 695c2a345b8f26632607422697be84eaf7df1bb9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: [PATCH 023/115] haskell-cmdargs: update to version 0.10.6 --- pkgs/development/libraries/haskell/cmdargs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index 1814ab99784a..ba8793ebb45c 100644 --- a/pkgs/development/libraries/haskell/cmdargs/default.nix +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cmdargs"; - version = "0.10.5"; - sha256 = "013095w6xzkaj6c09vrkmf24gl07kc995c39yby5jdngpggdxc9h"; + version = "0.10.6"; + sha256 = "1ckzznza8nqidwq7vd6jlxkjgb7xd4rvqi7gm8ca9laj0cvwkclw"; isLibrary = true; isExecutable = true; buildDepends = [ filepath transformers ]; From c9ecf30aac0e11c0394d5bc99464d2ed9f580656 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: [PATCH 024/115] haskell-crypto-pubkey-types: update to version 0.4.1 --- .../libraries/haskell/crypto-pubkey-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix index e4234d1d4cd0..ba5007e789fa 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "crypto-pubkey-types"; - version = "0.4.0"; - sha256 = "0bapzvd0xgv38mbj1xhzcswchnx81sq0wwyax3qqzcpgvcyz28sl"; + version = "0.4.1"; + sha256 = "1zs0hhpqcfsdyfr3z96m8lwxrxr3mf27wvjrpvih9jlvh64vp1pr"; buildDepends = [ asn1Types ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types"; From fa254e5565fd07dcf0b6846a05599936ed20fb3a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: [PATCH 025/115] haskell-crypto-pubkey: update to version 0.2.3 --- .../libraries/haskell/crypto-pubkey/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix index aa400c736cb1..d3355f4c85c8 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix @@ -5,14 +5,15 @@ cabal.mkDerivation (self: { pname = "crypto-pubkey"; - version = "0.2.2"; - sha256 = "084758n5fyh2aigd6055a75pnqjhx42sbjg36hhp2a40vhl7xr2f"; + version = "0.2.3"; + sha256 = "198gpaxlcqkp6wa5cwwnlzdxnrs7j6h7zyizczd4imwbpl0gd2mk"; buildDepends = [ byteable cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandom ]; testDepends = [ - byteable cryptohash cryptoNumbers cryptoRandom HUnit QuickCheck - testFramework testFrameworkHunit testFrameworkQuickcheck2 + byteable cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandom + HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-pubkey"; From a438e431b36194a105758744e52781e8ac949623 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: [PATCH 026/115] haskell-errors: update to version 1.4.4 --- pkgs/development/libraries/haskell/errors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/errors/default.nix b/pkgs/development/libraries/haskell/errors/default.nix index 1b0bc4282a75..1b091d871bb8 100644 --- a/pkgs/development/libraries/haskell/errors/default.nix +++ b/pkgs/development/libraries/haskell/errors/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "errors"; - version = "1.4.3"; - sha256 = "02xvfh0kfca7z5vhnkmqg5gw5i5ad5bc3jf8flxj75ry7wqggfmm"; + version = "1.4.4"; + sha256 = "1mhh5xna5nppqg8aw93iil7nsnpx5j6r21a12bx4mmip8nzr6480"; buildDepends = [ either safe transformers ]; jailbreak = true; meta = { From b9f4a63413549154679e2bb6a88b65589464092f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: [PATCH 027/115] haskell-fast-logger: update to version 2.0.0 --- .../libraries/haskell/fast-logger/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix index fb8714f3e854..ee51859404ce 100644 --- a/pkgs/development/libraries/haskell/fast-logger/default.nix +++ b/pkgs/development/libraries/haskell/fast-logger/default.nix @@ -1,11 +1,10 @@ -{ cabal, blazeBuilder, dateCache, filepath, hspec, text, unixTime -}: +{ cabal, blazeBuilder, filepath, hspec, text }: cabal.mkDerivation (self: { pname = "fast-logger"; - version = "0.3.3"; - sha256 = "0ya9dn9j2nddpclj00w6jgmiq2xx500sws056fa2s4bdsl8vn5rh"; - buildDepends = [ blazeBuilder dateCache filepath text unixTime ]; + version = "2.0.0"; + sha256 = "0a2pmdj2q1mlpkwjszlb4gp6xk2bn8540cqhwjya55arx6rj9vs7"; + buildDepends = [ blazeBuilder filepath text ]; testDepends = [ hspec ]; meta = { description = "A fast logging system"; From fee913a3efc290b36873f6230e25cba28face186 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: [PATCH 028/115] haskell-ghc-vis: update to version 0.7.2 --- pkgs/development/libraries/haskell/ghc-vis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix index 04af52f26790..bfedbdb776d8 100644 --- a/pkgs/development/libraries/haskell/ghc-vis/default.nix +++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-vis"; - version = "0.7.1"; - sha256 = "05j3yw1276wvy4va7r7pbnvhjg1k1mxzp4baxcb9jlb5dxfh0daa"; + version = "0.7.2"; + sha256 = "1mb33fafi212a6wawnd8601r80qjb1bja6nbj6jqrd91y96dxdll"; buildDepends = [ cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text transformers xdot From 8198b87947ff14e02108f81cb1c1e2f7a3994f51 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: [PATCH 029/115] haskell-glade: update to version 0.12.5.0 --- pkgs/development/libraries/haskell/glade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/glade/default.nix b/pkgs/development/libraries/haskell/glade/default.nix index 7c49b956aa98..30711083d2c5 100644 --- a/pkgs/development/libraries/haskell/glade/default.nix +++ b/pkgs/development/libraries/haskell/glade/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "glade"; - version = "0.12.1"; - sha256 = "114gdjz6bzfzqm71j17yb5mq96wcvjdv7ig3k4x4d9mdp97w8990"; + version = "0.12.5.0"; + sha256 = "0dbl7y5rdwzcham16iym9cikfyaphzr1rqcsni9ab6s2368a1vkr"; buildDepends = [ glib gtk ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; From e979b49dd595dcd3766fdc5891124d53d30dd6c3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: [PATCH 030/115] haskell-hakyll: update to version 4.4.2.0 --- pkgs/development/libraries/haskell/hakyll/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 424860c4677f..f7f318e502aa 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.4.1.2"; - sha256 = "0rbl0gl5ds63mv8cbcwb8aj0vic9padqs3zrdxr2ny70md1v9m9y"; + version = "4.4.2.0"; + sha256 = "10rkqnrj9gi4h25wfh1w4giqiir2d63vb85ysbxpc97rkbz3fwsg"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -25,9 +25,6 @@ cabal.mkDerivation (self: { snapCore snapServer systemFilepath tagsoup testFramework testFrameworkHunit testFrameworkQuickcheck2 text time ]; - patchPhase = '' - sed -i -e 's|pandoc-citeproc.*,|pandoc-citeproc,|' hakyll.cabal - ''; doCheck = false; meta = { homepage = "http://jaspervdj.be/hakyll"; From dffb56d5d298a8c7ad1a99d26d191115e945fc34 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: [PATCH 031/115] haskell-hamlet: update to version 1.1.7.5 --- pkgs/development/libraries/haskell/hamlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index b64668b43660..89513e372ea2 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "1.1.7.4"; - sha256 = "01sgd4p2d4irphgpvr7waag6jn8y329yj9zdjswrqklyygpp98hj"; + version = "1.1.7.5"; + sha256 = "1ph92n5l63qr5hpjcvl37j1w857dwwzzgsxn8mdadi2pz35lxm82"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; From 322a1d40f7fe31b22c85ad2dd5bb8951e3f24741 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: [PATCH 032/115] haskell-hexpat: update to version 0.20.5 --- pkgs/development/libraries/haskell/hexpat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hexpat/default.nix b/pkgs/development/libraries/haskell/hexpat/default.nix index 03aa9c16ed24..edded9b7698e 100644 --- a/pkgs/development/libraries/haskell/hexpat/default.nix +++ b/pkgs/development/libraries/haskell/hexpat/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hexpat"; - version = "0.20.4"; - sha256 = "09ixvwgrr1046v806d23ngdhc8xqkf0yadzlbwxcy228ka13xwdw"; + version = "0.20.5"; + sha256 = "09p8mh2b76ymgfv64zpddywdf34n7b78agri6kjnhls0xsk8260a"; buildDepends = [ deepseq List text transformers utf8String ]; meta = { homepage = "http://haskell.org/haskellwiki/Hexpat/"; From fcb89f41c6b91d30df4c33824f1cfdf84f84e961 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: [PATCH 033/115] haskell-hjsmin: update to version 0.1.4.4 --- pkgs/development/libraries/haskell/hjsmin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix index 5980141526b0..008c1766b947 100644 --- a/pkgs/development/libraries/haskell/hjsmin/default.nix +++ b/pkgs/development/libraries/haskell/hjsmin/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hjsmin"; - version = "0.1.4.3"; - sha256 = "1jhpqfvwvzik41i4mi9fr9w1jlrlc1lj2illlbbwg7r3fwr5hnnl"; + version = "0.1.4.4"; + sha256 = "0hzh2xbv9x013s1lhmgapjd0qx8v7n09rjlfxd9b1h5min00k048"; buildDepends = [ blazeBuilder languageJavascript text ]; testDepends = [ blazeBuilder Cabal HUnit languageJavascript QuickCheck From ee04bc15d022a79df473dbeecf5c097b336956ca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: [PATCH 034/115] haskell-hoogle: update to version 4.2.24 --- .../libraries/haskell/hoogle/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index 498e71d06d1e..fb4c33d73374 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -1,14 +1,13 @@ { cabal, aeson, binary, blazeBuilder, Cabal, caseInsensitive -, cmdargs, conduit, deepseq, filepath, haskellSrcExts, hspec -, hspecExpectations, httpTypes, HUnit, parsec, random, safe -, systemFileio, tagsoup, text, time, transformers, uniplate, wai -, warp +, cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes +, parsec, random, safe, tagsoup, text, time, transformers, uniplate +, wai, warp }: cabal.mkDerivation (self: { pname = "hoogle"; - version = "4.2.23"; - sha256 = "1ykjf0w6c3pzsrzdhxs53nxj84aj2px3gpfc8f53dmgqv3wkyii7"; + version = "4.2.24"; + sha256 = "01q0pr82wscnrm7flb1sd9fv8sym1pkdfvdmp6qcfwzzvrcsh5h2"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -16,9 +15,7 @@ cabal.mkDerivation (self: { deepseq filepath haskellSrcExts httpTypes parsec random safe tagsoup text time transformers uniplate wai warp ]; - testDepends = [ - conduit hspec hspecExpectations HUnit systemFileio transformers - ]; + testDepends = [ filepath ]; meta = { homepage = "http://www.haskell.org/hoogle/"; description = "Haskell API Search"; From 7053a3f96a6d03e16f3efe50dfdacb5ecc9a1c12 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: [PATCH 035/115] haskell-hspec-expectations: update to version 0.5.0.1 --- .../libraries/haskell/hspec-expectations/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec-expectations/default.nix b/pkgs/development/libraries/haskell/hspec-expectations/default.nix index 789ff5d7b2a4..5a1462657515 100644 --- a/pkgs/development/libraries/haskell/hspec-expectations/default.nix +++ b/pkgs/development/libraries/haskell/hspec-expectations/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hspec-expectations"; - version = "0.3.3"; - sha256 = "0sg7wkgr9qmwv0bki1q8wvl5jrlsvn0c7sd2qpqp3cccdhwj9c5k"; + version = "0.5.0.1"; + sha256 = "0r1yy94q30gp3wyif7qfa22gn3g2lrszwygsy4wknc396fab7mvj"; buildDepends = [ HUnit ]; testDepends = [ hspec HUnit markdownUnlit silently ]; doCheck = false; From 6f776d29c5119e4116fd59bec09f0b3ef290d880 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: [PATCH 036/115] haskell-hspec-meta: update to version 1.8.1 --- pkgs/development/libraries/haskell/hspec-meta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix index d409501d706b..5374ed7cd80a 100644 --- a/pkgs/development/libraries/haskell/hspec-meta/default.nix +++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hspec-meta"; - version = "1.7.2"; - sha256 = "03ksxx7w61iw3hf055mjb47bjh8srwxpqxs5bxqdqrilfd1cixmj"; + version = "1.8.1"; + sha256 = "03582b79cqv3c2z02ni2xyzb3kccgcw0phmg5lklaphkrarm0g3w"; isLibrary = true; isExecutable = true; buildDepends = [ From bb371962ced717ca4adab49a81c8dd46599ac051 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: [PATCH 037/115] haskell-hspec: update to version 1.8.1.1 --- pkgs/development/libraries/haskell/hspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index 57dab8852fdd..10994799c43d 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hspec"; - version = "1.7.2.1"; - sha256 = "12khyg6ixk2rkbvxjbi210w57cais1s142v337kpcp3dfk6440bk"; + version = "1.8.1.1"; + sha256 = "1gpll1pr8zs7ha1nn13rp579av4nnjkz94rq0js6r1awz69cp0rb"; isLibrary = true; isExecutable = true; buildDepends = [ From 3cb9b9cb3651949fba13a751dcc880b65cd109d9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: [PATCH 038/115] haskell-http-conduit: update to version 2.0.0.1 --- .../haskell/http-conduit/default.nix | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index f0c559839e05..403fdbe59b79 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -1,31 +1,30 @@ { cabal, asn1Data, base64Bytestring, blazeBuilder , blazeBuilderConduit, caseInsensitive, certificate, conduit -, cookie, cprngAes, dataDefault, deepseq, failure, filepath, hspec -, httpTypes, HUnit, liftedBase, mimeTypes, monadControl, mtl -, network, networkConduit, publicsuffixlist, random, regexCompat -, resourcet, socks, text, time, tls, tlsExtra, transformers -, transformersBase, utf8String, void, wai, warp, zlibConduit +, connection, cookie, cprngAes, dataDefault, deepseq, failure +, filepath, hspec, httpClient, httpClientConduit +, httpClientMultipart, httpClientTls, httpTypes, HUnit, liftedBase +, mimeTypes, monadControl, mtl, network, networkConduit +, publicsuffixlist, random, regexCompat, resourcet, socks, text +, time, tls, tlsExtra, transformers, transformersBase, utf8String +, void, wai, warp, warpTls, zlibConduit }: cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.9.5.2"; - sha256 = "0andx8ggcwcd39z10yh5j0rmn7ypypgfzaaibbbh2rhp5v28932b"; + version = "2.0.0.1"; + sha256 = "1xkq11yylh4mdx8ml69h17fldmfpxclriw1kl0j44vddqdryn6zd"; buildDepends = [ - asn1Data base64Bytestring blazeBuilder blazeBuilderConduit - caseInsensitive certificate conduit cookie cprngAes dataDefault - deepseq failure filepath httpTypes liftedBase mimeTypes - monadControl mtl network publicsuffixlist random regexCompat - resourcet socks text time tls tlsExtra transformers - transformersBase utf8String void zlibConduit + conduit httpClient httpClientConduit httpClientTls httpTypes + liftedBase resourcet transformers ]; testDepends = [ asn1Data base64Bytestring blazeBuilder blazeBuilderConduit - caseInsensitive certificate conduit cookie cprngAes dataDefault - deepseq failure filepath hspec httpTypes HUnit liftedBase mimeTypes + caseInsensitive certificate conduit connection cookie cprngAes + dataDefault deepseq failure filepath hspec httpClient + httpClientMultipart httpTypes HUnit liftedBase mimeTypes monadControl mtl network networkConduit publicsuffixlist random regexCompat resourcet socks text time tls tlsExtra transformers - transformersBase utf8String void wai warp zlibConduit + transformersBase utf8String void wai warp warpTls zlibConduit ]; meta = { homepage = "http://www.yesodweb.com/book/http-conduit"; From 4675b82d642864895fa9dcbe8a9bd02b799dc114 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: [PATCH 039/115] haskell-http-reverse-proxy: update to version 0.3.0 --- .../haskell/http-reverse-proxy/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index a4f458f83953..f745554e4891 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -1,17 +1,17 @@ { cabal, basicPrelude, blazeBuilder, caseInsensitive, conduit -, dataDefault, hspec, httpConduit, httpTypes, liftedBase -, monadControl, network, networkConduit, text, transformers, wai -, waiLogger, warp, word8 +, dataDefault, hspec, httpClient, httpConduit, httpTypes +, liftedBase, monadControl, network, networkConduit, resourcet +, text, transformers, wai, waiLogger, warp, word8 }: cabal.mkDerivation (self: { pname = "http-reverse-proxy"; - version = "0.2.1.1"; - sha256 = "12hfbl8239ivrqvd5pi1avlcb381q861958qwyf20jc5jpwvjjgj"; + version = "0.3.0"; + sha256 = "0wwrcm3hhbq9kawk3s12s8ws82vancmc8a5d29f6871jfq3vvzc2"; buildDepends = [ basicPrelude blazeBuilder caseInsensitive conduit dataDefault - httpConduit httpTypes liftedBase monadControl network - networkConduit text wai waiLogger warp word8 + httpClient httpTypes liftedBase monadControl network networkConduit + resourcet text wai waiLogger word8 ]; testDepends = [ blazeBuilder conduit hspec httpConduit httpTypes liftedBase network From ae925636bd09101f455c2e87761091d1093582de Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: [PATCH 040/115] haskell-http-types: update to version 0.8.3 --- pkgs/development/libraries/haskell/http-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix index c099709e0dae..ed24e1ede749 100644 --- a/pkgs/development/libraries/haskell/http-types/default.nix +++ b/pkgs/development/libraries/haskell/http-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "http-types"; - version = "0.8.2"; - sha256 = "1536wpmicmq90qvnvcvq1dzk2vfhj7ls6hz4pqp0ll9aksk3msr1"; + version = "0.8.3"; + sha256 = "02l1lhl2ajbm5f7zq363nlb21dpdg1m0qsy330arccmds7z9g7a2"; buildDepends = [ blazeBuilder caseInsensitive text ]; testDepends = [ blazeBuilder hspec QuickCheck text ]; meta = { From 012a7209e58e73a754e4f86927c0280da23530bf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:21 +0100 Subject: [PATCH 041/115] haskell-language-ecmascript: update to version 0.15.4 --- .../libraries/haskell/language-ecmascript/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-ecmascript/default.nix b/pkgs/development/libraries/haskell/language-ecmascript/default.nix index 458916df9d1b..77165ef104d1 100644 --- a/pkgs/development/libraries/haskell/language-ecmascript/default.nix +++ b/pkgs/development/libraries/haskell/language-ecmascript/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "language-ecmascript"; - version = "0.15.3"; - sha256 = "0ircm20nf321awl0gvy0vh3jplfwpd700br67f0i97rifxx2v40c"; + version = "0.15.4"; + sha256 = "1drivy75lvrwjx7irdbnnqp7y6mbzbm2pbxy7zzc1nfln6g3k9x7"; buildDepends = [ dataDefaultClass Diff mtl parsec QuickCheck uniplate wlPprint ]; From 3c5e50828aaa32a82576ce149a1e79549dfd9339 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:21 +0100 Subject: [PATCH 042/115] haskell-lens: update to version 3.10.0.1 --- pkgs/development/libraries/haskell/lens/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index 60aa29ac089a..fff7f1cc5830 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "lens"; - version = "3.10"; - sha256 = "086kbd59zlx3ldrxilssxd0gr9izwhcfhg5k6bqzm6gwvysrzq3y"; + version = "3.10.0.1"; + sha256 = "0ar19ls0w1x1cnl6aj5qvrlyhfk51v8czahq4k861666rzglqd28"; buildDepends = [ bifunctors comonad contravariant distributive filepath genericDeriving hashable MonadCatchIOTransformers mtl parallel From 832a6b45d6980f5f0680720c1f868dd510fe0bcc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:21 +0100 Subject: [PATCH 043/115] haskell-linear: update to version 1.3.1.1 --- pkgs/development/libraries/haskell/linear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix index feeeaed3be54..99f5de71b619 100644 --- a/pkgs/development/libraries/haskell/linear/default.nix +++ b/pkgs/development/libraries/haskell/linear/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "linear"; - version = "1.3.1"; - sha256 = "1s07qbdi12rc4djk4s0ds5sh79qcqfmgrbwfj1ygskq3ra88qqsa"; + version = "1.3.1.1"; + sha256 = "174pqqc2gx8aigm51hfg7di35qbx65sgcqv6y1p25c2853g9h97y"; buildDepends = [ binary distributive hashable reflection semigroupoids semigroups tagged transformers unorderedContainers vector From 012480b9f4597f80ef1d63f36127ab227d21abf6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:22 +0100 Subject: [PATCH 044/115] haskell-monad-logger: update to version 0.3.3.1 --- pkgs/development/libraries/haskell/monad-logger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix index 0b92ca0bb903..83cd57ce39b7 100644 --- a/pkgs/development/libraries/haskell/monad-logger/default.nix +++ b/pkgs/development/libraries/haskell/monad-logger/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "monad-logger"; - version = "0.3.2.0"; - sha256 = "0pgjayx6h1zqadqrzaf36070kir7qlinha9h4bf532lfx5yc1yxg"; + version = "0.3.3.1"; + sha256 = "1amihx9jl42w7sm01ihnldvgv9cilg89im7gr9l0x2f6q4nbhbl2"; buildDepends = [ conduit fastLogger liftedBase monadControl monadLoops mtl resourcet stm stmChans text transformers transformersBase From 3df57554b5fc4fcdb26050b8562da60ab25916b5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:22 +0100 Subject: [PATCH 045/115] haskell-pandoc: update to version 1.12.2.1 --- pkgs/development/libraries/haskell/pandoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index b5ccc95bd3fd..01ce4cc5bfb8 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "pandoc"; - version = "1.12.1"; - sha256 = "0csyrcfdqv2mc7ngn63lan3c1dd6zy0pb24k0z1lsraqlmmw76nf"; + version = "1.12.2.1"; + sha256 = "1xyvhfsz0cy5f7cwpz4kl0l87vylb8860c06wvk49z9fh2xkg6lf"; isLibrary = true; isExecutable = true; buildDepends = [ From 01a828cbf99608b25396aa1a1f2e9dae69da56f7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:22 +0100 Subject: [PATCH 046/115] haskell-quickcheck-instances: update to version 0.3.4 --- .../libraries/haskell/quickcheck-instances/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix index 647e08718a8c..0b29a55ce5fa 100644 --- a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix +++ b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "quickcheck-instances"; - version = "0.3.3"; - sha256 = "0l5rck5sh3cplqqkkasm00phy962y3wa9l8a44843grp3flnpv72"; + version = "0.3.4"; + sha256 = "10kkjqn530cd4bz5jfnvfvpswk25glyjnmy21qj253db6ja8xns1"; buildDepends = [ QuickCheck text time ]; meta = { homepage = "https://github.com/aslatter/qc-instances"; From 7cc0bad3a45a556f13dd06468f8a8e30102a0032 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:22 +0100 Subject: [PATCH 047/115] haskell-reducers: update to version 3.10.1.1 --- pkgs/development/libraries/haskell/reducers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/reducers/default.nix b/pkgs/development/libraries/haskell/reducers/default.nix index ea1049d2b40a..bc1bf72beea1 100644 --- a/pkgs/development/libraries/haskell/reducers/default.nix +++ b/pkgs/development/libraries/haskell/reducers/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "reducers"; - version = "3.10.1"; - sha256 = "0pgywdgq0rqir95n4z3nzmyx5n54a1df9abyanz4qfv0g080fjkz"; + version = "3.10.1.1"; + sha256 = "1d4zhcqy499pm0wxn76gyw0brbrdycmajblqy4mi49kiy0zlg8a7"; buildDepends = [ comonad fingertree hashable keys pointed semigroupoids semigroups text transformers unorderedContainers From 42f3190cf8614afa8cb8ac757804d992e05fe2b2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:22 +0100 Subject: [PATCH 048/115] haskell-scotty: update to version 0.6.0 --- pkgs/development/libraries/haskell/scotty/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix index ad932df1ac79..3f50ed381523 100644 --- a/pkgs/development/libraries/haskell/scotty/default.nix +++ b/pkgs/development/libraries/haskell/scotty/default.nix @@ -5,14 +5,14 @@ cabal.mkDerivation (self: { pname = "scotty"; - version = "0.5.0"; - sha256 = "177c7nyjwksm2y98j2swgzfn1rmr2h0v4fk6s525kx803iibvfhc"; + version = "0.6.0"; + sha256 = "0h5m84kp3p2bc5q9vi9b8ky7k14d7hhhqgbl1mxrqkpw3m5z95xy"; buildDepends = [ aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes mtl regexCompat resourcet text transformers wai waiExtra warp ]; meta = { - homepage = "https://github.com/ku-fpg/scotty"; + homepage = "https://github.com/scotty-web/scotty"; description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 8a347b892bb748d6d2052412300adef27f7bd6ca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:22 +0100 Subject: [PATCH 049/115] haskell-semigroups: update to version 0.12.1 --- pkgs/development/libraries/haskell/semigroups/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix index f1bc7259b799..a0e79c459d9e 100644 --- a/pkgs/development/libraries/haskell/semigroups/default.nix +++ b/pkgs/development/libraries/haskell/semigroups/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "semigroups"; - version = "0.12"; - sha256 = "0wk8hxak4dl8nbdif4f8z9gvr5bqm95inrvrcrb6ryaxichrn432"; + version = "0.12.1"; + sha256 = "0jxgd487d99cc721wyaxvazphlv567hbb57vdfjn4hq9ly4w464q"; buildDepends = [ hashable nats text unorderedContainers ]; meta = { homepage = "http://github.com/ekmett/semigroups/"; From f664af533756b5293e2f6defd3f162565fe885f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:22 +0100 Subject: [PATCH 050/115] haskell-shakespeare-css: update to version 1.0.6.5 --- .../development/libraries/haskell/shakespeare-css/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 03b6b057cd1e..7dedf465f655 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "1.0.6.4"; - sha256 = "12f2b69grxpwk56b2d7idlg8axqfgzn0rn3m56r1hcpvkjbynlc4"; + version = "1.0.6.5"; + sha256 = "1jmi5rh4a9x7md90sgzk6pmn0pn4h9mn44z8z0haq3fzflravqdk"; buildDepends = [ parsec shakespeare text transformers ]; testDepends = [ hspec HUnit shakespeare text ]; meta = { From d7588eae7925e49a30ee920021aaac9ae4a90972 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:22 +0100 Subject: [PATCH 051/115] haskell-shakespeare-i18n: update to version 1.0.0.5 --- .../libraries/haskell/shakespeare-i18n/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix index b7710d7c3d54..5d7cb8c4abe6 100644 --- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-i18n"; - version = "1.0.0.4"; - sha256 = "1ia73rq9kva2v4vxcyc2nzbvvkrbwrx48gjhnljx39szx1klyk3l"; + version = "1.0.0.5"; + sha256 = "0f6i9pxr1lmqwcarb48swhrgab8hpkr46cv16psmbq67dr6h1dgf"; buildDepends = [ parsec shakespeare text ]; testDepends = [ hspec text ]; meta = { From d20feb0efc1e0dde7cfc1c7b471d63673c0f3028 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: [PATCH 052/115] haskell-shakespeare-text: update to version 1.0.0.10 --- .../libraries/haskell/shakespeare-text/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix index ec60c0375b0c..feadafeb29f2 100644 --- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-text"; - version = "1.0.0.9"; - sha256 = "1rh1dwmc7xam76isa6cwc25rcricakc7ay54hz01fpiy059imx52"; + version = "1.0.0.10"; + sha256 = "0az3l70syb7ch5fb4i0nlibgh7wcrzqnqmlp1w5h68s796g5rjlb"; buildDepends = [ shakespeare text ]; testDepends = [ hspec HUnit text ]; meta = { From de2c3ff933ef2afa2de916890db301c52352d568 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: [PATCH 053/115] haskell-shakespeare: update to version 1.2.0.3 --- pkgs/development/libraries/haskell/shakespeare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 8b5de8ec76b7..f3891e554dd2 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare"; - version = "1.2.0.2"; - sha256 = "1vp7zskxrjxcznj1d0nx9iqkfvwa9xwpbxq46z054bizqfkri96c"; + version = "1.2.0.3"; + sha256 = "1mhycaw8qa4j7q5jing3hbx5vwwa0h4iv41fsx6xibz3y7lpqgmz"; buildDepends = [ parsec systemFileio systemFilepath text time ]; testDepends = [ hspec parsec systemFileio systemFilepath text time From 6ff4ebca323d7b15a2ac97f87c5b7123e500b5ef Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: [PATCH 054/115] haskell-smallcheck: update to version 1.1.0.1 --- pkgs/development/libraries/haskell/smallcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix index df2517a01ace..ef8f0e5e5ba4 100644 --- a/pkgs/development/libraries/haskell/smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/smallcheck/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "smallcheck"; - version = "1.1"; - sha256 = "167dhi0j4mfmf9idjcfx0x1y1jajx4qmgcpiia93vjpmv8ha56j8"; + version = "1.1.0.1"; + sha256 = "02yv4pa6hilxl7fwskayd5nzs4hq46k91wh04sqj4yfk2s3pgb0m"; buildDepends = [ logict mtl ]; meta = { homepage = "https://github.com/feuerbach/smallcheck"; From 8cdd84fac24ecb6e1c721429288e170d0039d9c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: [PATCH 055/115] haskell-snap: update to version 0.13.1.2 --- pkgs/development/libraries/haskell/snap/snap.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 63103471ac2a..3f4751113be5 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap"; - version = "0.13.1.1"; - sha256 = "0nak84xwrfvdcb2ngq71qy8h0h1ih3wifnkgwxabhjbrqmd7ma0x"; + version = "0.13.1.2"; + sha256 = "19s7v9wc988yxynwqdhrhncz8vn9ic6d95gwfi1m0gpxxk5qlzzz"; isLibrary = true; isExecutable = true; buildDepends = [ From b1c6aabdb16fa26b1f2ece03bddaa1d9df310cde Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: [PATCH 056/115] haskell-tasty-ant-xml: update to version 1.0.0.2 --- .../development/libraries/haskell/tasty-ant-xml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix index baabf323723c..3d68e8232755 100644 --- a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix +++ b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix @@ -4,14 +4,14 @@ cabal.mkDerivation (self: { pname = "tasty-ant-xml"; - version = "1.0.0.1"; - sha256 = "1yn337dr9clzrkr8kpvm7x07lyb3v8pcijrddqah08k0ds8zpzcj"; + version = "1.0.0.2"; + sha256 = "1c13gmqsp33cfqim7aqqjypabkx42rmmhmjj8fpcr0ainpmvwkwi"; buildDepends = [ genericDeriving mtl reducers stm tagged tasty transformers xml ]; meta = { homepage = "http://github.com/ocharles/tasty-ant-xml"; - description = "A tasty ingredient to output test results in XML, using the Ant schema. This XML can be consumed by the Jenkins continuous integration framework."; + description = "Render tasty output to XML for Jenkins"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.ocharles ]; From 5fb617876d605c91f586b429752eef840eb71a3f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: [PATCH 057/115] haskell-tasty: update to version 0.4.2 --- pkgs/development/libraries/haskell/tasty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index c2c05a68f075..9ad53093c68b 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty"; - version = "0.4.1.1"; - sha256 = "09xha87ivkllczbf0vf2n8zjn1wa5g8v8j1h9ad3207r45ndzn0w"; + version = "0.4.2"; + sha256 = "06348zdagaxk0axdmfj38r2h6pcacr0kqwx6hz6f499xdj8g74g9"; buildDepends = [ ansiTerminal deepseq mtl optparseApplicative regexPosix stm tagged ]; From 710790a7042968ba5b1374cb73bf3cd2cc21f2be Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: [PATCH 058/115] haskell-vector-algorithms: update to version 0.6.0.1 --- .../libraries/haskell/vector-algorithms/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/vector-algorithms/default.nix b/pkgs/development/libraries/haskell/vector-algorithms/default.nix index dc8c9dd35bae..74b098a3a7f1 100644 --- a/pkgs/development/libraries/haskell/vector-algorithms/default.nix +++ b/pkgs/development/libraries/haskell/vector-algorithms/default.nix @@ -1,10 +1,13 @@ -{ cabal, primitive, vector }: +{ cabal, mtl, mwcRandom, primitive, QuickCheck, vector }: cabal.mkDerivation (self: { pname = "vector-algorithms"; - version = "0.5.4.2"; - sha256 = "08pb6mkghf9h5011vxrfdrfq6g26jk4gxmjh9s3hpdiwybf3ab64"; - buildDepends = [ primitive vector ]; + version = "0.6.0.1"; + sha256 = "0dkiz0c5dmc3a15zz5pxv4rz4n0bw5irb5a148gccfrg5c80vzc5"; + isLibrary = true; + isExecutable = true; + buildDepends = [ mtl mwcRandom primitive vector ]; + testDepends = [ QuickCheck vector ]; meta = { homepage = "http://code.haskell.org/~dolio/"; description = "Efficient algorithms for vector arrays"; From ca19f496b85aaf58dc40e2f375b5c18a7f5d0e6b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: [PATCH 059/115] haskell-wai-app-static: update to version 2.0.0 --- pkgs/development/libraries/haskell/wai-app-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index d88eb2df0bc9..3bcf63e17963 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "1.3.3"; - sha256 = "0lsqfvlh65rggp9z6m5gyx8gv0wk3b44jrk57s8yj2bh74pbr64f"; + version = "2.0.0"; + sha256 = "0zbjwghkg4xsjfxq74s6c041mvkj168r8nhh946yz6n660bkisai"; buildDepends = [ base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal cryptoApi cryptoConduit cryptohashCryptoapi fileEmbed httpDate From 40a309e038d39cca527548e9f8a20c5afef59170 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: [PATCH 060/115] haskell-wai-extra: update to version 2.0.0.1 --- .../libraries/haskell/wai-extra/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 7e3424713e0d..d3b835879650 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -1,23 +1,23 @@ { cabal, ansiTerminal, base64Bytestring, blazeBuilder , blazeBuilderConduit, caseInsensitive, conduit, dataDefault -, dateCache, fastLogger, hspec, httpTypes, HUnit, liftedBase -, network, resourcet, stringsearch, text, time, transformers, void -, wai, waiLogger, waiTest, word8, zlib, zlibBindings, zlibConduit +, fastLogger, hspec, httpTypes, HUnit, liftedBase, network +, resourcet, stringsearch, text, time, transformers, void, wai +, waiLogger, waiTest, word8, zlib, zlibBindings, zlibConduit }: cabal.mkDerivation (self: { pname = "wai-extra"; - version = "1.3.4.6"; - sha256 = "09rk9i2fkk4haiq1c6rhcp1p72zw34j9cxsmqnm4jzh6fdsrkq2k"; + version = "2.0.0.1"; + sha256 = "16m6scz36yzvyhz098lv6ppxdyk6kmavzyzb42iq0bpyk9m0x2qx"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit - caseInsensitive conduit dataDefault dateCache fastLogger httpTypes - liftedBase network resourcet stringsearch text time transformers - void wai waiLogger word8 zlibConduit + caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase + network resourcet stringsearch text time transformers void wai + waiLogger word8 zlibConduit ]; testDepends = [ blazeBuilder conduit dataDefault fastLogger hspec httpTypes HUnit - text transformers wai waiTest zlib zlibBindings + resourcet text transformers wai waiTest zlib zlibBindings ]; meta = { homepage = "http://github.com/yesodweb/wai"; From 350a1e1c968061b3760008c47e5e2392c621c0fe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: [PATCH 061/115] haskell-wai-handler-launch: update to version 2.0.0 --- .../libraries/haskell/wai-handler-launch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix index c4d22a66e006..3ba78e162519 100644 --- a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix +++ b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai-handler-launch"; - version = "1.3.1.5"; - sha256 = "1iz36j7lzl5c9b2hacxv4v5gfzkfvgj7hlb5xz4r14ca4w5fzzfj"; + version = "2.0.0"; + sha256 = "1z03c3hjkh4k6j5dsp4973f05rk2cgl7gazac4vdq4imwfzxj3lg"; buildDepends = [ blazeBuilder blazeBuilderConduit conduit httpTypes transformers wai warp zlibConduit From eb16c02c56b878376f4620286f4eb57a2bf3f210 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: [PATCH 062/115] haskell-wai-logger: update to version 2.0.1 --- .../libraries/haskell/wai-logger/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix index fc958c2576b9..98b0cdee39c4 100644 --- a/pkgs/development/libraries/haskell/wai-logger/default.nix +++ b/pkgs/development/libraries/haskell/wai-logger/default.nix @@ -1,14 +1,14 @@ -{ cabal, blazeBuilder, byteorder, caseInsensitive, dateCache -, doctest, fastLogger, httpTypes, network, wai, waiTest +{ cabal, blazeBuilder, byteorder, caseInsensitive, doctest +, fastLogger, httpTypes, network, unixTime, wai, waiTest }: cabal.mkDerivation (self: { pname = "wai-logger"; - version = "0.3.2"; - sha256 = "0las9jb8cxdsyh1mnrhx48yfbjw5f2x4hhmivhmhzb6qgxnbvma9"; + version = "2.0.1"; + sha256 = "1v8n7m314a12421gn10i8vz3nk9sak635dq4nq389sij8w1ihjkw"; buildDepends = [ - blazeBuilder byteorder caseInsensitive dateCache fastLogger - httpTypes network wai + blazeBuilder byteorder caseInsensitive fastLogger httpTypes network + unixTime wai ]; testDepends = [ doctest waiTest ]; meta = { From 059978b4742aedce62be389372101e381630cecb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: [PATCH 063/115] haskell-wai-test: update to version 2.0.0.1 --- pkgs/development/libraries/haskell/wai-test/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index bbc1ed1d1366..9cae0a85d6c9 100644 --- a/pkgs/development/libraries/haskell/wai-test/default.nix +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "wai-test"; - version = "1.3.1.1"; - sha256 = "0daaq8kn1c35y26y7pb00sw1jyhp84zpzk6vfy1p4vfay4ppknd2"; + version = "2.0.0.1"; + sha256 = "1lk7i9kiawsn56f8w2nidmas6g94yq7diaprvkd7c52hjki5mla7"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie httpTypes HUnit network text transformers wai From ad818c12a695ce61103b0cf660d2654f3fb50dfd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: [PATCH 064/115] haskell-wai: update to version 2.0.0 --- pkgs/development/libraries/haskell/wai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index 0fff9096cb07..4273e408a7f7 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai"; - version = "1.4.1"; - sha256 = "1m8z1jc4fvq8rw9vk1x5sy73dbmiifa41973x84i51vsibyaqhgb"; + version = "2.0.0"; + sha256 = "11s60v9pw8jl9w950z81gkxci7djrdibi8hxrw6j1v8az40qqiwk"; buildDepends = [ blazeBuilder conduit httpTypes network text transformers vault ]; From d6377fa89563810a7c609f7dffc4b4e351b759e7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: [PATCH 065/115] haskell-warp-tls: update to version 2.0.0 --- pkgs/development/libraries/haskell/warp-tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp-tls/default.nix b/pkgs/development/libraries/haskell/warp-tls/default.nix index 5b1456c0c48c..b99c5214120b 100644 --- a/pkgs/development/libraries/haskell/warp-tls/default.nix +++ b/pkgs/development/libraries/haskell/warp-tls/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "warp-tls"; - version = "1.4.2"; - sha256 = "05mbf73859n2ns3bdnw24i7vygr4kysyxfq0xdkmmrd47fh3k9r6"; + version = "2.0.0"; + sha256 = "1dfwid6h7yl4v66as166ppbivzafh5wkkrbsvaaar6l3xd9kg211"; buildDepends = [ certificate conduit cprngAes cryptocipher cryptoRandomApi network networkConduit pem tls tlsExtra transformers wai warp From 27bdaa32690b828e5c86755e2baed986596b516a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: [PATCH 066/115] haskell-warp: update to version 2.0.0.1 --- .../libraries/haskell/warp/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 100dbbd7024e..15dd0ec15ec1 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -1,23 +1,23 @@ { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive -, conduit, hashable, hspec, HTTP, httpAttoparsec, httpTypes, HUnit -, liftedBase, network, networkConduit, QuickCheck, simpleSendfile -, transformers, unixCompat, void, wai +, conduit, doctest, hashable, hspec, HTTP, httpAttoparsec, httpDate +, httpTypes, HUnit, liftedBase, network, networkConduit, QuickCheck +, simpleSendfile, time, transformers, unixCompat, void, wai }: cabal.mkDerivation (self: { pname = "warp"; - version = "1.3.10.1"; - sha256 = "1pi2x0gi4r6qy151a9gmfq223yiy53j7prj2pyn00cprr0m4mk2v"; + version = "2.0.0.1"; + sha256 = "12n1r1qahngfhrqhlbfjl11rmy5la9mpd0h4ai0lzdxkakb89pxl"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable - httpAttoparsec httpTypes liftedBase network networkConduit + httpAttoparsec httpDate httpTypes liftedBase network networkConduit simpleSendfile transformers unixCompat void wai ]; testDepends = [ - blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable - hspec HTTP httpAttoparsec httpTypes HUnit liftedBase network - networkConduit QuickCheck simpleSendfile transformers unixCompat - void wai + blazeBuilder blazeBuilderConduit caseInsensitive conduit doctest + hashable hspec HTTP httpAttoparsec httpDate httpTypes HUnit + liftedBase network networkConduit QuickCheck simpleSendfile time + transformers unixCompat void wai ]; meta = { homepage = "http://github.com/yesodweb/wai"; From 8d8db388d91c49ebc8534c4dfdc2d61771a5efb6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: [PATCH 067/115] haskell-wl-pprint-extras: update to version 3.5 --- .../libraries/haskell/wl-pprint-extras/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix b/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix index 77670b4f117e..dd32750ffe91 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix @@ -1,10 +1,13 @@ -{ cabal, nats, semigroupoids, semigroups, text, utf8String }: +{ cabal, HUnit, nats, semigroupoids, semigroups, testFramework +, testFrameworkHunit, text, utf8String +}: cabal.mkDerivation (self: { pname = "wl-pprint-extras"; - version = "3.4"; - sha256 = "17vxyckx2pj4sc2d1yw1rcsxn1rp4nzdjp0hgpy78xsp9plccgsy"; + version = "3.5"; + sha256 = "172xp23j3w8jbd7h0sna9g8p4d6xwy8154gqj93ycz2907r2kwb7"; buildDepends = [ nats semigroupoids semigroups text utf8String ]; + testDepends = [ HUnit testFramework testFrameworkHunit ]; meta = { homepage = "http://github.com/ekmett/wl-pprint-extras/"; description = "A free monad based on the Wadler/Leijen pretty printer"; From 73a20b0473f7aff5132a189e6220fe38840c9470 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: [PATCH 068/115] haskell-wl-pprint-terminfo: update to version 3.7 --- .../libraries/haskell/wl-pprint-terminfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix index d2bd35eebd41..989d56afd7dc 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wl-pprint-terminfo"; - version = "3.6"; - sha256 = "14dq0inv6i8pwjzrpys420iwi6002mard1n73z96k89zq5xhwlbg"; + version = "3.7"; + sha256 = "01lzk8wfynb98ks8a0gvj8qffi50zlfaywlc9axr6j7h8rrblnm3"; buildDepends = [ nats semigroups terminfo text transformers wlPprintExtras ]; From a18328c0b6107af70f997e5e1157b57406efdbb5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: [PATCH 069/115] haskell-xdot: update to version 0.2.4.1 --- pkgs/development/libraries/haskell/xdot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/xdot/default.nix b/pkgs/development/libraries/haskell/xdot/default.nix index f7a2b731d037..7119705b357e 100644 --- a/pkgs/development/libraries/haskell/xdot/default.nix +++ b/pkgs/development/libraries/haskell/xdot/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "xdot"; - version = "0.2.4"; - sha256 = "0723drp9zs3hrayld99j4fniyvm65fz19hkk4001vpvgjw27dfja"; + version = "0.2.4.1"; + sha256 = "1k1ci9lq8l9bx8ks7rdng9jjj6d7hcwgmfbz757al85m1q17xa64"; buildDepends = [ cairo graphviz gtk mtl polyparse text ]; meta = { description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo"; From 4923a984a57088451ab46a29ea056cf8f062b3c9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: [PATCH 070/115] haskell-xml-conduit: update to version 1.1.0.9 --- pkgs/development/libraries/haskell/xml-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index 3f97a028729e..28a5beb966f8 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "1.1.0.8"; - sha256 = "06if4mbrbcsjhk7hj3616fhgfh0rlsj95jblsbxq2drb4bn56r39"; + version = "1.1.0.9"; + sha256 = "01sx8yblknv0dyi7z6k6icfvwjvl4dyhrka1d6y1793xcp1mkxs6"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit blazeHtml blazeMarkup conduit dataDefault deepseq failure From 3517ae882948351a6883030a10855797ece06873 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: [PATCH 071/115] haskell-xml-hamlet: update to version 0.4.0.6 --- pkgs/development/libraries/haskell/xml-hamlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/xml-hamlet/default.nix b/pkgs/development/libraries/haskell/xml-hamlet/default.nix index e2719984708a..885620f0648a 100644 --- a/pkgs/development/libraries/haskell/xml-hamlet/default.nix +++ b/pkgs/development/libraries/haskell/xml-hamlet/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "xml-hamlet"; - version = "0.4.0.5"; - sha256 = "1w1ixjdbpbny332j24d5yjxc4i7cg83jc4yjdm6yl94y1sr90yc5"; + version = "0.4.0.6"; + sha256 = "05izdqpxw0gq2wgs4ckr55xvzfk5ay7xpbcvihj66myiah5azqwy"; buildDepends = [ parsec shakespeare text xmlConduit ]; testDepends = [ hspec HUnit parsec shakespeare text xmlConduit ]; meta = { From c333429da943e049d882d4bf4a1057a30b6bf3cc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: [PATCH 072/115] haskell-yesod-auth: update to version 1.2.4 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index bdc299939196..87cbe9f3d438 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.2.3"; - sha256 = "1hnppb36acr18prra702r9hdbs803zfvaj8krq4idlvwb6g7l0d8"; + version = "1.2.4"; + sha256 = "1bpcz8ihjqdhyxxm4ib4yhgj5h491lxv34mpc3x55wl2daq731qi"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network From c2f98216f8a80bdf989f8b00299b3dbd78ea1cef Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:25 +0100 Subject: [PATCH 073/115] haskell-yesod-bin: update to version 1.2.5.1 --- .../libraries/haskell/yesod-bin/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index c93c76ee3fab..dbee52da8680 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -1,5 +1,5 @@ { cabal, attoparsec, base64Bytestring, blazeBuilder, Cabal, conduit -, fileEmbed, filepath, fsnotify, ghcPaths, httpConduit +, dataDefault, fileEmbed, filepath, fsnotify, ghcPaths, httpConduit , httpReverseProxy, httpTypes, liftedBase, network, networkConduit , optparseApplicative, parsec, projectTemplate, resourcet , shakespeare, shakespeareCss, shakespeareJs, shakespeareText @@ -10,17 +10,18 @@ cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.4.1"; - sha256 = "18wzxalgiffdjz6x5vxmhksscy5531plgyjkv705kf5vaw6v6rlr"; + version = "1.2.5.1"; + sha256 = "1ybj89yvwrsw82jj92rf741jx8na8gp3z4ighyrpavfqhhl6576f"; isLibrary = false; isExecutable = true; buildDepends = [ - attoparsec base64Bytestring blazeBuilder Cabal conduit fileEmbed - filepath fsnotify ghcPaths httpConduit httpReverseProxy httpTypes - liftedBase network networkConduit optparseApplicative parsec - projectTemplate resourcet shakespeare shakespeareCss shakespeareJs - shakespeareText split systemFileio systemFilepath tar text time - transformers unixCompat unorderedContainers wai warp yaml zlib + attoparsec base64Bytestring blazeBuilder Cabal conduit dataDefault + fileEmbed filepath fsnotify ghcPaths httpConduit httpReverseProxy + httpTypes liftedBase network networkConduit optparseApplicative + parsec projectTemplate resourcet shakespeare shakespeareCss + shakespeareJs shakespeareText split systemFileio systemFilepath tar + text time transformers unixCompat unorderedContainers wai warp yaml + zlib ]; meta = { homepage = "http://www.yesodweb.com/"; From c1f1d00bce88843c884950c95852f129c5bfa4a8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:25 +0100 Subject: [PATCH 074/115] haskell-yesod-core: update to version 1.2.6.1 --- .../libraries/haskell/yesod-core/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 789d158fa6c5..86b2eec8945c 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -4,21 +4,22 @@ , httpTypes, HUnit, liftedBase, monadControl, monadLogger, parsec , pathPieces, QuickCheck, random, resourcet, safe, shakespeare , shakespeareCss, shakespeareI18n, shakespeareJs, text, time -, transformers, transformersBase, vector, wai, waiExtra, waiTest -, warp, yesodRoutes +, transformers, transformersBase, unixCompat, vector, wai, waiExtra +, waiLogger, waiTest, warp, yesodRoutes }: cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.5"; - sha256 = "0ia5j6vnxy32y6776wlsfcv9d6s7slqpmkhxw3pipcqd5sjn4kf9"; + version = "1.2.6.1"; + sha256 = "12w8lxkxdwf2pfanz33grciyh4ijn6nzrz4lm478w20y9frmf1nm"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie dataDefault failure fastLogger hamlet httpTypes liftedBase monadControl monadLogger parsec pathPieces random resourcet safe shakespeare shakespeareCss shakespeareI18n shakespeareJs text time transformers - transformersBase vector wai waiExtra warp yesodRoutes + transformersBase unixCompat vector wai waiExtra waiLogger warp + yesodRoutes ]; testDepends = [ blazeBuilder conduit hamlet hspec httpTypes HUnit liftedBase From 7a7b9e515b09505f19e4eccdfaee65f0b4ed3cc8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:25 +0100 Subject: [PATCH 075/115] haskell-yesod-persistent: update to version 1.2.2 --- .../libraries/haskell/yesod-persistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix index 2c6b6f96fbc5..a3740629150a 100644 --- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix +++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-persistent"; - version = "1.2.1"; - sha256 = "06kzxdbg3xw128zlacsf51qi7qnccw0gjnwscxshljgipiicfhfc"; + version = "1.2.2"; + sha256 = "0pi7r6mf8ikd76cwdpjzb1lf73jc3f0ji3xximmg25q8lwcjygq5"; buildDepends = [ blazeBuilder conduit liftedBase persistent persistentTemplate poolConduit resourcet transformers yesodCore From 91e2d2bf9b6362a0e9e8afaaec6aa4d50dcc8daa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:25 +0100 Subject: [PATCH 076/115] haskell-yesod-routes: update to version 1.2.0.2 --- pkgs/development/libraries/haskell/yesod-routes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index 4cbb865c9069..d651e90a8a7f 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "yesod-routes"; - version = "1.2.0.1"; - sha256 = "0pp7g3ccd0swh1j62am1vg9r2gh65jcci5w2n4r42sqzfnql0i8z"; + version = "1.2.0.2"; + sha256 = "0mjffsz9rk401a86l10vcjfhvfd8jknzml86jb5kpk6ssvnah0n7"; buildDepends = [ pathPieces text vector ]; testDepends = [ hspec HUnit pathPieces text ]; meta = { From 48958dac0611b3bb5e68878e2be6afe40e9470a3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:25 +0100 Subject: [PATCH 077/115] haskell-yesod-static: update to version 1.2.2 --- pkgs/development/libraries/haskell/yesod-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index c1f3c4ea8734..c29cbe759749 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.2.1.1"; - sha256 = "009p6hq6hwmvji40yqv97v1sfwdfh44pasp68cxw05czhcwwcacv"; + version = "1.2.2"; + sha256 = "06abyfmqzv6aap0ww7vkw4j6xv6dkivn0g7wx59j2l54dfqrjifr"; buildDepends = [ base64Bytestring cereal conduit cryptoConduit cryptohashCryptoapi dataDefault fileEmbed filepath hjsmin httpTypes mimeTypes From 5e5855d95ca2d0c104d7903344d0d53ce3a378db Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:25 +0100 Subject: [PATCH 078/115] haskell-yesod: update to version 1.2.4 --- pkgs/development/libraries/haskell/yesod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 9f416ad27f93..b4e935428b2a 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.2.3"; - sha256 = "0y1jwz7azk078kf14hsylgpwljdmrainhwflgxwyf0gcc5l7jhz3"; + version = "1.2.4"; + sha256 = "0c8z4hsplfjb2ilrk0qbyighjipwcfhf55xqaw4zqvq752yj4n7c"; buildDepends = [ aeson blazeHtml blazeMarkup dataDefault hamlet monadControl networkConduit safe shakespeareCss shakespeareJs text transformers From a47b25da5b4e1fab275a34f6c097bc66da47072f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:25 +0100 Subject: [PATCH 079/115] haskell-keter: update to version 1.1.0.1 --- .../tools/haskell/keter/default.nix | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix index c3f242bc434a..53e2c5a74194 100644 --- a/pkgs/development/tools/haskell/keter/default.nix +++ b/pkgs/development/tools/haskell/keter/default.nix @@ -1,25 +1,27 @@ { cabal, aeson, async, attoparsec, blazeBuilder, caseInsensitive -, conduit, dataDefault, filepath, fsnotify, httpConduit -, httpReverseProxy, httpTypes, liftedBase, mtl, network -, networkConduit, networkConduitTls, random, regexTdfa, stm -, systemFileio, systemFilepath, tar, text, time, transformers -, unixCompat, unixProcessConduit, unorderedContainers, vector, wai -, waiAppStatic, waiExtra, warp, warpTls, yaml, zlib +, conduit, dataDefault, filepath, fsnotify, httpClient +, httpClientConduit, httpConduit, httpReverseProxy, httpTypes +, liftedBase, mtl, network, networkConduit, networkConduitTls +, random, regexTdfa, stm, systemFileio, systemFilepath, tar, text +, time, transformers, unixCompat, unixProcessConduit +, unorderedContainers, vector, wai, waiAppStatic, waiExtra, warp +, warpTls, yaml, zlib }: cabal.mkDerivation (self: { pname = "keter"; - version = "1.0.1.2"; - sha256 = "1rk0sf6riyb6r1sz0jkvwwj1yyxwjxgafpidp9rqwm8wnqyx6hh8"; + version = "1.1.0.1"; + sha256 = "04hvwfs1dskaxl1fw29lf52389hy1yr3hwd05bl294zgfh995i0s"; isLibrary = true; isExecutable = true; buildDepends = [ aeson async attoparsec blazeBuilder caseInsensitive conduit - dataDefault filepath fsnotify httpConduit httpReverseProxy - httpTypes liftedBase mtl network networkConduit networkConduitTls - random regexTdfa stm systemFileio systemFilepath tar text time - transformers unixCompat unixProcessConduit unorderedContainers - vector wai waiAppStatic waiExtra warp warpTls yaml zlib + dataDefault filepath fsnotify httpClient httpClientConduit + httpConduit httpReverseProxy httpTypes liftedBase mtl network + networkConduit networkConduitTls random regexTdfa stm systemFileio + systemFilepath tar text time transformers unixCompat + unixProcessConduit unorderedContainers vector wai waiAppStatic + waiExtra warp warpTls yaml zlib ]; meta = { homepage = "http://www.yesodweb.com/"; From fbdbe45393966eb4babd5ff305fce134b807149b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 14:23:56 +0100 Subject: [PATCH 080/115] haskell-pretty-show: the build requires happy version 1.19.x. --- pkgs/top-level/haskell-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f34386fa180b..f77199bd8afd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1771,7 +1771,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ppm = callPackage ../development/libraries/haskell/ppm {}; - prettyShow = callPackage ../development/libraries/haskell/pretty-show {}; + prettyShow = callPackage ../development/libraries/haskell/pretty-show { + happy = self.happy_1_19_2; + }; punycode = callPackage ../development/libraries/haskell/punycode {}; From 9fcd7a8994206536ca0e48a9a2fb64df2bdf7ecf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 19:37:17 +0100 Subject: [PATCH 081/115] haskell-warp: disable test suite to fix the build See issue . --- pkgs/development/libraries/haskell/warp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 15dd0ec15ec1..0b6d3403c46f 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -19,6 +19,7 @@ cabal.mkDerivation (self: { liftedBase network networkConduit QuickCheck simpleSendfile time transformers unixCompat void wai ]; + doCheck = false; meta = { homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; From b2770afe611a0430872a25f014dd564aea7e9dc7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 23:01:48 +0100 Subject: [PATCH 082/115] haskell-cmdargs: work around broken tarball on Hackage --- pkgs/development/libraries/haskell/cmdargs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index ba8793ebb45c..1bd39a387bba 100644 --- a/pkgs/development/libraries/haskell/cmdargs/default.nix +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ filepath transformers ]; + patchPhase = "touch cmdargs.cabal"; meta = { homepage = "http://community.haskell.org/~ndm/cmdargs/"; description = "Command line argument processing"; From d0ebac24e9a668c20f04466bc56de095496fc602 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 01:10:40 +0100 Subject: [PATCH 083/115] Update Haddock to version 2.13.2.1 (in ghc-head environment). --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f77199bd8afd..1b6d333705b2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -175,7 +175,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x zlib = self.zlib_0_5_4_1; cabalInstall = self.cabalInstall_1_18_0_2; alex = self.alex_3_1_3; - haddock = self.haddock_2_13_2; + haddock = self.haddock_2_13_2_1; happy = self.happy_1_19_2; primitive = self.primitive_0_5_1_0; # semi-official, but specified }; From e810997859191f9643a01affe9dae1c19f718743 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 10:40:15 +0100 Subject: [PATCH 084/115] haskell-http-client: disable test suite to fix the build See issue . --- pkgs/development/libraries/haskell/http-client/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix index fd40ca88e1dc..3658bc6bf8d1 100644 --- a/pkgs/development/libraries/haskell/http-client/default.nix +++ b/pkgs/development/libraries/haskell/http-client/default.nix @@ -18,6 +18,7 @@ cabal.mkDerivation (self: { failure hspec httpTypes monadControl network text time transformers zlib zlibBindings ]; + doCheck = false; meta = { homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; From 9a7c392af3cd690df8546859f1767fe0e8b7687e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 10:47:53 +0100 Subject: [PATCH 085/115] haskell-http-client-tls: disable test suite to fix the build See issue . --- pkgs/development/libraries/haskell/http-client-tls/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/http-client-tls/default.nix b/pkgs/development/libraries/haskell/http-client-tls/default.nix index 5056a94c5d94..f92ddcd7d551 100644 --- a/pkgs/development/libraries/haskell/http-client-tls/default.nix +++ b/pkgs/development/libraries/haskell/http-client-tls/default.nix @@ -8,6 +8,7 @@ cabal.mkDerivation (self: { sha256 = "06ywjmhdgnwdyfj0qvmabb5bvgrdfyf7dfxm0hzqvkh2i104s7g0"; buildDepends = [ connection dataDefault httpClient network tls ]; testDepends = [ hspec httpClient httpTypes ]; + doCheck = false; meta = { homepage = "https://github.com/snoyberg/http-client"; description = "http-client backend using the connection package and tls library"; From d231aca644ec56bea8f1a45f0d7e6b3f45521bcc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:02:59 +0100 Subject: [PATCH 086/115] haskell-parsec: update to version 3.1.4 --- .../libraries/haskell/parsec/3.1.4.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/parsec/3.1.4.nix diff --git a/pkgs/development/libraries/haskell/parsec/3.1.4.nix b/pkgs/development/libraries/haskell/parsec/3.1.4.nix new file mode 100644 index 000000000000..82032dda61c8 --- /dev/null +++ b/pkgs/development/libraries/haskell/parsec/3.1.4.nix @@ -0,0 +1,15 @@ +{ cabal, mtl, text }: + +cabal.mkDerivation (self: { + pname = "parsec"; + version = "3.1.4"; + sha256 = "0milmi4q5jdcmmwjqa4lcs1vcw5frkrlrxc8q17lkas3p2m10kh5"; + buildDepends = [ mtl text ]; + meta = { + homepage = "http://www.cs.uu.nl/~daan/parsec.html"; + description = "Monadic parser combinators"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1b6d333705b2..2e8e5c741ba9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -158,7 +158,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x OpenGL = self.OpenGL_2_9_1_0; OpenGLRaw = self.OpenGLRaw_1_4_0_0; parallel = self.parallel_3_2_0_4; - parsec = self.parsec_3_1_3; + parsec = self.parsec_3_1_4; QuickCheck = self.QuickCheck_2_6; random = self.random_1_0_1_1; regexBase = self.regexBase_0_93_2; @@ -1701,8 +1701,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x parsec_3_1_1 = callPackage ../development/libraries/haskell/parsec/3.1.1.nix {}; parsec_3_1_2 = callPackage ../development/libraries/haskell/parsec/3.1.2.nix {}; parsec_3_1_3 = callPackage ../development/libraries/haskell/parsec/3.1.3.nix {}; + parsec_3_1_4 = callPackage ../development/libraries/haskell/parsec/3.1.4.nix {}; parsec2 = self.parsec_2_1_0_1; - parsec3 = self.parsec_3_1_3; + parsec3 = self.parsec_3_1_4; parsec = self.parsec3; parsers_0_9 = callPackage ../development/libraries/haskell/parsers/0.9.nix {}; From e9848e3b792cedbe8cebb26b05f565252dce3c25 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:03:13 +0100 Subject: [PATCH 087/115] haskell-cmdargs: update to version 0.10.7 --- pkgs/development/libraries/haskell/cmdargs/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index 1bd39a387bba..7678849930e4 100644 --- a/pkgs/development/libraries/haskell/cmdargs/default.nix +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -2,12 +2,11 @@ cabal.mkDerivation (self: { pname = "cmdargs"; - version = "0.10.6"; - sha256 = "1ckzznza8nqidwq7vd6jlxkjgb7xd4rvqi7gm8ca9laj0cvwkclw"; + version = "0.10.7"; + sha256 = "0mhsj27vynilpmwxgdpb3r383rksrqs9ix15zl2xbhc95a815pfl"; isLibrary = true; isExecutable = true; buildDepends = [ filepath transformers ]; - patchPhase = "touch cmdargs.cabal"; meta = { homepage = "http://community.haskell.org/~ndm/cmdargs/"; description = "Command line argument processing"; From 00b20b6caf51b9f98fa3521a5dd0dd6d6ec714eb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:03:13 +0100 Subject: [PATCH 088/115] haskell-haskell-names: update to version 0.3.2.2 --- pkgs/development/libraries/haskell/haskell-names/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix index 7e6619d4f357..b77cd134dc81 100644 --- a/pkgs/development/libraries/haskell/haskell-names/default.nix +++ b/pkgs/development/libraries/haskell/haskell-names/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "haskell-names"; - version = "0.3.2.1"; - sha256 = "1ddixm37y1wkqsrs4cxvnmjczapwq1n67xg5rhkj0k7d04c8agha"; + version = "0.3.2.2"; + sha256 = "0imr0kgxkm2j2xx9ryll5s1b5bn8s4bkwpqdvvb4z44jhrgcgz7b"; buildDepends = [ aeson Cabal dataLens dataLensTemplate filepath haskellPackages haskellSrcExts hseCpp mtl tagged transformers traverseWithClass From 55ed7d9466b634cb8df5fe99b8f02dab1a1c120e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:03:13 +0100 Subject: [PATCH 089/115] haskell-hoogle: update to version 4.2.25 --- pkgs/development/libraries/haskell/hoogle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index fb4c33d73374..40d475421141 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hoogle"; - version = "4.2.24"; - sha256 = "01q0pr82wscnrm7flb1sd9fv8sym1pkdfvdmp6qcfwzzvrcsh5h2"; + version = "4.2.25"; + sha256 = "0s62h90hbmq1w11iqf44r1lx4acad9h6h62i8qjbsygbnmgkbn95"; isLibrary = true; isExecutable = true; buildDepends = [ From a21f8721c4a6d8af300ef2e2ff414da35e2c7dd6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:03:13 +0100 Subject: [PATCH 090/115] haskell-persistent-template: update to version 1.2.0.5 --- .../libraries/haskell/persistent-template/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index c3bb228933d3..e54ebce96762 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "persistent-template"; - version = "1.2.0.4"; - sha256 = "0lhqv4mcai9r5mzj5h6fsd1hd8mv1458id0rb6q157192gywxhzf"; + version = "1.2.0.5"; + sha256 = "1i1rfs1x9dfm89zib1wy0wsksk3cfwkz84b492v6751v8ysdfsjh"; buildDepends = [ aeson monadControl monadLogger persistent text transformers ]; From 702370e3cdd228f060009528a99bbc4c8b5f14df Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:03:13 +0100 Subject: [PATCH 091/115] haskell-shakespeare-css: update to version 1.0.6.6 --- .../development/libraries/haskell/shakespeare-css/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 7dedf465f655..853a6294131f 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "1.0.6.5"; - sha256 = "1jmi5rh4a9x7md90sgzk6pmn0pn4h9mn44z8z0haq3fzflravqdk"; + version = "1.0.6.6"; + sha256 = "1xjavlw88nj5ila2b4m44zj0qgkpq147b30x1arwv0ik8szgml9k"; buildDepends = [ parsec shakespeare text transformers ]; testDepends = [ hspec HUnit shakespeare text ]; meta = { From cd3a9434fee4c8c50688a5542ec418b89995e1f3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:03:13 +0100 Subject: [PATCH 092/115] haskell-unix-process-conduit: update to version 0.2.2.1 --- .../libraries/haskell/unix-process-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix index 1f04d939d9c1..8470a2d3f821 100644 --- a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix +++ b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unix-process-conduit"; - version = "0.2.2"; - sha256 = "15n6n925avv51kr2avwkp8sq8mfl287i0445vl9iy6hyxjjgpgr6"; + version = "0.2.2.1"; + sha256 = "0zix8m38dza95g6ijip4r5nxz6y9vkh5jy8ksg4qpx1v2ib1m2cc"; buildDepends = [ conduit filepath stm time transformers ]; testDepends = [ conduit hspec transformers ]; meta = { From 3242e0d495d3ff12d30c229ba3d2807f61f1e83b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:03:13 +0100 Subject: [PATCH 093/115] haskell-wai-app-static: update to version 2.0.0.1 --- .../libraries/haskell/wai-app-static/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 3bcf63e17963..a6b8eeb4058b 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -1,18 +1,18 @@ { cabal, base64Bytestring, blazeBuilder, blazeHtml, blazeMarkup , cereal, cryptoApi, cryptoConduit, cryptohashCryptoapi, fileEmbed -, hspec, httpDate, httpTypes, mimeTypes, network, systemFileio -, systemFilepath, text, time, transformers, unixCompat -, unorderedContainers, wai, waiTest, zlib +, filepath, hspec, httpDate, httpTypes, mimeTypes, network +, systemFileio, systemFilepath, text, time, transformers +, unixCompat, unorderedContainers, wai, waiTest, zlib }: cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "2.0.0"; - sha256 = "0zbjwghkg4xsjfxq74s6c041mvkj168r8nhh946yz6n660bkisai"; + version = "2.0.0.1"; + sha256 = "0c02j61a62dpl9i736q8cv0b9kw17akkws7waqa4zcbad1wyiqps"; buildDepends = [ base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal - cryptoApi cryptoConduit cryptohashCryptoapi fileEmbed httpDate - httpTypes mimeTypes systemFileio systemFilepath text time + cryptoApi cryptoConduit cryptohashCryptoapi fileEmbed filepath + httpDate httpTypes mimeTypes systemFileio systemFilepath text time transformers unixCompat unorderedContainers wai zlib ]; testDepends = [ From 9d38ae8bcf7168987b99e07369fb43ccb47d5975 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:10:50 +0100 Subject: [PATCH 094/115] haskell-http-conduit: disable test suite to fix the build See issue . --- pkgs/development/libraries/haskell/http-conduit/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 403fdbe59b79..30dacc9b6b1c 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -26,6 +26,7 @@ cabal.mkDerivation (self: { regexCompat resourcet socks text time tls tlsExtra transformers transformersBase utf8String void wai warp warpTls zlibConduit ]; + doCheck = false; meta = { homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; From 12a3008d4c0683818976508f62bf10eb205d80cd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:46:18 +0100 Subject: [PATCH 095/115] haskell-http-reverse-proxy: disable test suite to fix the build See issue . --- .../development/libraries/haskell/http-reverse-proxy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index f745554e4891..a8e0afc786ea 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -17,6 +17,7 @@ cabal.mkDerivation (self: { blazeBuilder conduit hspec httpConduit httpTypes liftedBase network networkConduit transformers wai warp ]; + doCheck = false; meta = { homepage = "https://github.com/fpco/http-reverse-proxy"; description = "Reverse proxy HTTP requests, either over raw sockets or with WAI"; From c9a52836c83d8e455092e0a1e210f59aec22c077 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:18:54 +0100 Subject: [PATCH 096/115] haskell-pretty-show: resurrect version 1.2, which is required to build hledger on old versions of GHC This reverts commit 54bfef6fc3d88eabfbd17c440c906170f7bc00ef. --- .../libraries/haskell/pretty-show/1.2.nix | 16 ++++++++++++++++ .../pretty-show/{default.nix => 1.6.2.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +++- 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/pretty-show/1.2.nix rename pkgs/development/libraries/haskell/pretty-show/{default.nix => 1.6.2.nix} (100%) diff --git a/pkgs/development/libraries/haskell/pretty-show/1.2.nix b/pkgs/development/libraries/haskell/pretty-show/1.2.nix new file mode 100644 index 000000000000..545816a57a02 --- /dev/null +++ b/pkgs/development/libraries/haskell/pretty-show/1.2.nix @@ -0,0 +1,16 @@ +{ cabal, haskellLexer }: + +cabal.mkDerivation (self: { + pname = "pretty-show"; + version = "1.2"; + sha256 = "0lbalmyrqisgd2spbvzifsy25lr6cl9sgz78hav8q8r406k7nf2l"; + isLibrary = true; + isExecutable = true; + buildDepends = [ haskellLexer ]; + meta = { + homepage = "http://wiki.github.com/yav/pretty-show"; + description = "Tools for working with derived Show instances"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/pretty-show/default.nix b/pkgs/development/libraries/haskell/pretty-show/1.6.2.nix similarity index 100% rename from pkgs/development/libraries/haskell/pretty-show/default.nix rename to pkgs/development/libraries/haskell/pretty-show/1.6.2.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2e8e5c741ba9..5e4488add3fe 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1772,9 +1772,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ppm = callPackage ../development/libraries/haskell/ppm {}; - prettyShow = callPackage ../development/libraries/haskell/pretty-show { + prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {}; + prettyShow_1_6_2 = callPackage ../development/libraries/haskell/pretty-show/1.6.2.nix { happy = self.happy_1_19_2; }; + prettyShow = self.prettyShow_1_6_2; punycode = callPackage ../development/libraries/haskell/punycode {}; From 0262a86ad1ae97d792c73f221994873b03973d7a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:21:53 +0100 Subject: [PATCH 097/115] haskell-blaze-builder: update to version 0.3.3.2 --- pkgs/development/libraries/haskell/blaze-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-builder/default.nix b/pkgs/development/libraries/haskell/blaze-builder/default.nix index 36b8f57cc400..51dda936687d 100644 --- a/pkgs/development/libraries/haskell/blaze-builder/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-builder"; - version = "0.3.3.0"; - sha256 = "0j6nrwcnpcr7c17cxw3v85m19q8z91wb6jir8c6kls5m321hwd63"; + version = "0.3.3.2"; + sha256 = "038ig1a1iz0hc36l53f5g7h6aiz7b1lggq1d04y3ql9a0553vd40"; buildDepends = [ text ]; meta = { homepage = "http://github.com/meiersi/blaze-builder"; From d5a0a812ddb993ea2a3816d42dd8ec08516d3fbf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:21:53 +0100 Subject: [PATCH 098/115] haskell-digestive-functors-heist: update to version 0.8.3.0 --- .../libraries/haskell/digestive-functors-heist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix index 91d1bf0bcbcd..f83488b850d9 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors-heist"; - version = "0.8.1.0"; - sha256 = "0f9nhfy8rc1w9nnhq1yf9y2kwxlb9b6v8y1jz5q3lrpb1cnq31j0"; + version = "0.8.3.0"; + sha256 = "1im9247mvqngknvkjncjrjj3wydz2k9wlsin53vyddjcqbqxa54g"; buildDepends = [ blazeBuilder digestiveFunctors heist mtl text xmlhtml ]; From 6e0f60a5395fa1e453607046bab60dd4f559de1b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:21:53 +0100 Subject: [PATCH 099/115] haskell-digestive-functors-snap: update to version 0.6.0.1 --- .../libraries/haskell/digestive-functors-snap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix index f23ee6d06910..6b20ed6ae89e 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors-snap"; - version = "0.6.0.0"; - sha256 = "18hc0sx7in0df6kgkc8mrxag5h2rmdj2cca9zf9w1if6wimx3g88"; + version = "0.6.0.1"; + sha256 = "0y26fqhjb78mv6rzp3x6cbxrq4dqh2dzd81wd5sgsm079j5frjj7"; buildDepends = [ digestiveFunctors filepath mtl snapCore text ]; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; From 7534476fada3910714ab740e7535be42c3f4dbb1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:21:53 +0100 Subject: [PATCH 100/115] haskell-digestive-functors: update to version 0.6.1.1 --- .../libraries/haskell/digestive-functors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix index 1d3f31e55688..2207f18c35cd 100644 --- a/pkgs/development/libraries/haskell/digestive-functors/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors"; - version = "0.6.1.0"; - sha256 = "0p38q8xz01vjn1mf718xi5ny3i7z9zd00lnnybmd6zy03laq4a2d"; + version = "0.6.1.1"; + sha256 = "05px6xal6kzppph5nm9w60vsdz0d9gng8zp26ipwpxzk57jg4jjw"; buildDepends = [ mtl text ]; testDepends = [ HUnit mtl QuickCheck testFramework testFrameworkHunit From c97000f77c068c8aecbc73d2ac4d4deb07f92771 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:21:53 +0100 Subject: [PATCH 101/115] haskell-hoogle: update to version 4.2.26 --- pkgs/development/libraries/haskell/hoogle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index 40d475421141..70c8ecb249d8 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hoogle"; - version = "4.2.25"; - sha256 = "0s62h90hbmq1w11iqf44r1lx4acad9h6h62i8qjbsygbnmgkbn95"; + version = "4.2.26"; + sha256 = "07nc58vqdj5x3h6d7z8ilbff0pkqd3r7g789xyaalnh6wjkd7380"; isLibrary = true; isExecutable = true; buildDepends = [ From 9d3022ec35305d8ff2b5a60496828153190f29e5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:21:53 +0100 Subject: [PATCH 102/115] haskell-http-client: update to version 0.2.0.2 --- pkgs/development/libraries/haskell/http-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix index 3658bc6bf8d1..2724b27673db 100644 --- a/pkgs/development/libraries/haskell/http-client/default.nix +++ b/pkgs/development/libraries/haskell/http-client/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "http-client"; - version = "0.2.0.1"; - sha256 = "0iqlq0drylxc9ir362pdbljghh5mxrmqjl51s02381y7jc0mfjs0"; + version = "0.2.0.2"; + sha256 = "1b6057yvbcrd01qp9gcmqh27zbla4d5krrsl279hmklkm2fd2zm3"; buildDepends = [ base64Bytestring blazeBuilder caseInsensitive cookie dataDefault deepseq failure httpTypes network publicsuffixlist text time From 66bd60896df4343c2e7b1e1e8fffb9d6dc6b5052 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:21:53 +0100 Subject: [PATCH 103/115] haskell-http-conduit: update to version 2.0.0.2 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 30dacc9b6b1c..b041957e555b 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "2.0.0.1"; - sha256 = "1xkq11yylh4mdx8ml69h17fldmfpxclriw1kl0j44vddqdryn6zd"; + version = "2.0.0.2"; + sha256 = "0ypwn63brdjxyh70x10wb26xbsymj5x9v664nzc3nwvlh22ldhyw"; buildDepends = [ conduit httpClient httpClientConduit httpClientTls httpTypes liftedBase resourcet transformers From e51fe9c496cab1f236129768d07592f54316eb44 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:21:53 +0100 Subject: [PATCH 104/115] haskell-path-pieces: update to version 0.1.3.1 --- pkgs/development/libraries/haskell/path-pieces/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/path-pieces/default.nix b/pkgs/development/libraries/haskell/path-pieces/default.nix index cdfe320a0609..b29527488436 100644 --- a/pkgs/development/libraries/haskell/path-pieces/default.nix +++ b/pkgs/development/libraries/haskell/path-pieces/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "path-pieces"; - version = "0.1.3"; - sha256 = "03x9kfcaz1zsdpdzs05pcl0hv4hffgsl2js8xiy5slba6n841v4l"; + version = "0.1.3.1"; + sha256 = "140pkci5k6aa9ncxa29fn2p0g6lb79zci0k02nblv59qmj5hj8ic"; buildDepends = [ text time ]; testDepends = [ hspec HUnit QuickCheck text ]; meta = { From 303ce435511963cb83e517f3049f1b956f01762f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:21:53 +0100 Subject: [PATCH 105/115] haskell-persistent-template: update to version 1.2.0.6 --- .../libraries/haskell/persistent-template/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index e54ebce96762..9dc42ea5e39c 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "persistent-template"; - version = "1.2.0.5"; - sha256 = "1i1rfs1x9dfm89zib1wy0wsksk3cfwkz84b492v6751v8ysdfsjh"; + version = "1.2.0.6"; + sha256 = "1vkrxf2dabk9z0igfbvb2ib2bxcxi5af2vpxllv74cbjz9r6ip3s"; buildDepends = [ aeson monadControl monadLogger persistent text transformers ]; From 878227d7aa7383bf8a0daeaeeae7614673c50ea3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 20:39:20 +0100 Subject: [PATCH 106/115] haskell-ListLike: jailbreak to fix the build with text 1.x --- pkgs/development/libraries/haskell/ListLike/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix index d8e1e0c6f429..973fca3fb991 100644 --- a/pkgs/development/libraries/haskell/ListLike/default.nix +++ b/pkgs/development/libraries/haskell/ListLike/default.nix @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1ny6h3f1l0gigyv2rs24s7w158vsflrdx4i9v1al4910cxh56awv"; buildDepends = [ text vector ]; testDepends = [ HUnit QuickCheck random text vector ]; + jailbreak = true; meta = { homepage = "http://software.complete.org/listlike"; description = "Generic support for list-like structures"; From 5afc2d5cf323cf40bbce5c8978c3e35e751d6740 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 20:45:18 +0100 Subject: [PATCH 107/115] haskell-http-client: update to version 0.2.0.3 --- pkgs/development/libraries/haskell/http-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix index 2724b27673db..221d82033bc5 100644 --- a/pkgs/development/libraries/haskell/http-client/default.nix +++ b/pkgs/development/libraries/haskell/http-client/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "http-client"; - version = "0.2.0.2"; - sha256 = "1b6057yvbcrd01qp9gcmqh27zbla4d5krrsl279hmklkm2fd2zm3"; + version = "0.2.0.3"; + sha256 = "0dy0nf92404hlg4f4zifx6b1qs5wadgky7snqrizl5kk5af43i4h"; buildDepends = [ base64Bytestring blazeBuilder caseInsensitive cookie dataDefault deepseq failure httpTypes network publicsuffixlist text time From 8248ffc9e4681bf67b9db11ba491b964208eb5ad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 20:45:18 +0100 Subject: [PATCH 108/115] haskell-lifted-async: update to version 0.1.0.1 --- pkgs/development/libraries/haskell/lifted-async/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lifted-async/default.nix b/pkgs/development/libraries/haskell/lifted-async/default.nix index 8fbfd1f51b01..fa48f289a4ca 100644 --- a/pkgs/development/libraries/haskell/lifted-async/default.nix +++ b/pkgs/development/libraries/haskell/lifted-async/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "lifted-async"; - version = "0.1.0"; - sha256 = "09ns06qgnwls6zcqsjvr7ykhpr1w12vq49ix4bkqriarl1q3ap7b"; + version = "0.1.0.1"; + sha256 = "03b89cixfin7ksdjh12g0pfrmgzw9mnx6nyvywv3rjc1sra3b8f0"; buildDepends = [ async liftedBase monadControl transformersBase ]; testDepends = [ HUnit liftedBase monadControl mtl testFramework testFrameworkHunit From 49536b487f7448bc93e2ab37b120251a0b888dc6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 20:45:18 +0100 Subject: [PATCH 109/115] haskell-tasty-ant-xml: update to version 1.0.0.4 --- pkgs/development/libraries/haskell/tasty-ant-xml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix index 3d68e8232755..4d90d51fceb9 100644 --- a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix +++ b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty-ant-xml"; - version = "1.0.0.2"; - sha256 = "1c13gmqsp33cfqim7aqqjypabkx42rmmhmjj8fpcr0ainpmvwkwi"; + version = "1.0.0.4"; + sha256 = "09qgakwqaqgppplxybkgyhyryxrw1pwlgkiqpixrqqhjans3z0hn"; buildDepends = [ genericDeriving mtl reducers stm tagged tasty transformers xml ]; From bf34b53746231b553c3c163b77207f367683eda7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 20:45:18 +0100 Subject: [PATCH 110/115] haskell-tasty-golden: update to version 2.2.0.1 --- pkgs/development/libraries/haskell/tasty-golden/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty-golden/default.nix b/pkgs/development/libraries/haskell/tasty-golden/default.nix index 2f27e50d8f9c..14c642239399 100644 --- a/pkgs/development/libraries/haskell/tasty-golden/default.nix +++ b/pkgs/development/libraries/haskell/tasty-golden/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty-golden"; - version = "2.2"; - sha256 = "0z49w4ksbbih3x0j170pfy93r2d68jw34hdni4s2p43kds52cakb"; + version = "2.2.0.1"; + sha256 = "0zr8ikg1j1nc29b6i23wb7zwbq0kmvjry7a1a6ldnz4p13m05q6d"; buildDepends = [ filepath mtl optparseApplicative tagged tasty temporary ]; From 28ba549fa8b02de5c16da37f8fc205e64230ced9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 20:45:18 +0100 Subject: [PATCH 111/115] haskell-tasty: update to version 0.5.1 --- pkgs/development/libraries/haskell/tasty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index 9ad53093c68b..8153eb9f6a76 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty"; - version = "0.4.2"; - sha256 = "06348zdagaxk0axdmfj38r2h6pcacr0kqwx6hz6f499xdj8g74g9"; + version = "0.5.1"; + sha256 = "0a59cwy3ks9jz7v27n9ws85qga38ksv1mg68p62birm1rw9xc3xd"; buildDepends = [ ansiTerminal deepseq mtl optparseApplicative regexPosix stm tagged ]; From e32ee4acf9f5fd8b8fadcfb92d2bde3993cfae9a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 20:45:19 +0100 Subject: [PATCH 112/115] haskell-vault: update to version 0.3.0.3 --- pkgs/development/libraries/haskell/vault/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/vault/default.nix b/pkgs/development/libraries/haskell/vault/default.nix index 3f2842844443..8786838ab3db 100644 --- a/pkgs/development/libraries/haskell/vault/default.nix +++ b/pkgs/development/libraries/haskell/vault/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "vault"; - version = "0.3.0.2"; - sha256 = "1m9vanwzlw61fbdcy7qvv2prmbax5y9dsl52dldcf5zr7vip2hpb"; + version = "0.3.0.3"; + sha256 = "0wpj73jbwgcva1hfjc0bpf9l3lfc3iwdz70m29dh1785wvzxhsh5"; buildDepends = [ hashable unorderedContainers ]; jailbreak = true; meta = { From 4df80c3c2edc1b709423c3b00b293e22968178bc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 20:45:19 +0100 Subject: [PATCH 113/115] haskell-warp: update to version 2.0.1 --- pkgs/development/libraries/haskell/warp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 0b6d3403c46f..04fb88de0d6b 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "2.0.0.1"; - sha256 = "12n1r1qahngfhrqhlbfjl11rmy5la9mpd0h4ai0lzdxkakb89pxl"; + version = "2.0.1"; + sha256 = "1sgsiw75xm3b1bv0cnpkx6vn6k0r1an3c94xw5bab4h7blb9jk4a"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpAttoparsec httpDate httpTypes liftedBase network networkConduit From 43070fe84f2d70de650987de5e92248290d9152d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 20:45:19 +0100 Subject: [PATCH 114/115] haskell-yesod-platform: update to version 1.2.5 --- .../haskell/yesod-platform/default.nix | 77 ++++++++++--------- 1 file changed, 40 insertions(+), 37 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix index 7d56ca1142cd..ee9cd3b1fd3b 100644 --- a/pkgs/development/libraries/haskell/yesod-platform/default.nix +++ b/pkgs/development/libraries/haskell/yesod-platform/default.nix @@ -2,56 +2,59 @@ , attoparsecConduit, authenticate, base64Bytestring , baseUnicodeSymbols, blazeBuilder, blazeBuilderConduit, blazeHtml , blazeMarkup, byteable, byteorder, caseInsensitive, cereal -, certificate, cipherAes, cipherRc4, clientsession, conduit, cookie -, cprngAes, cryptoApi, cryptoCipherTypes, cryptoConduit, cryptohash -, cryptohashCryptoapi, cryptoNumbers, cryptoPubkey -, cryptoPubkeyTypes, cryptoRandom, cssText, dataDefault -, dataDefaultClass, dataDefaultInstancesBase +, certificate, cipherAes, cipherRc4, clientsession, conduit +, connection, controlMonadLoop, cookie, cprngAes, cryptoApi +, cryptoCipherTypes, cryptoConduit, cryptohash, cryptohashCryptoapi +, cryptoNumbers, cryptoPubkey, cryptoPubkeyTypes, cryptoRandom +, cssText, dataDefault, dataDefaultClass, dataDefaultInstancesBase , dataDefaultInstancesContainers, dataDefaultInstancesDlist -, dataDefaultInstancesOldLocale, dateCache, dlist, emailValidate -, entropy, failure, fastLogger, fileEmbed, filesystemConduit -, hamlet, hjsmin, hspec, hspecExpectations, htmlConduit -, httpAttoparsec, httpConduit, httpDate, httpTypes -, languageJavascript, liftedBase, mimeMail, mimeTypes, mmorph -, monadControl, monadLogger, networkConduit, pathPieces, pem -, persistent, persistentTemplate, poolConduit, primitive -, publicsuffixlist, pureMD5, pwstoreFast, quickcheckIo -, resourcePool, resourcet, safe, securemem, semigroups, setenv, SHA -, shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs -, shakespeareText, silently, simpleSendfile, skein, socks -, stringsearch, systemFileio, systemFilepath, tagged, tagsoup -, tagstreamConduit, tls, tlsExtra, transformersBase, unixCompat -, unorderedContainers, utf8Light, utf8String, vector, void, wai -, waiAppStatic, waiExtra, waiLogger, waiTest, warp, word8 -, xmlConduit, xmlTypes, xssSanitize, yaml, yesod, yesodAuth -, yesodCore, yesodForm, yesodPersistent, yesodRoutes, yesodStatic -, yesodTest, zlibBindings, zlibConduit +, dataDefaultInstancesOldLocale, dlist, emailValidate, entropy +, failure, fastLogger, fileEmbed, filesystemConduit, hamlet, hjsmin +, hspec, hspecExpectations, htmlConduit, httpAttoparsec, httpClient +, httpClientConduit, httpClientTls, httpConduit, httpDate +, httpTypes, languageJavascript, liftedBase, mimeMail, mimeTypes +, mmorph, monadControl, monadLogger, monadLoops, networkConduit +, pathPieces, pem, persistent, persistentTemplate, poolConduit +, primitive, processConduit, publicsuffixlist, pureMD5, pwstoreFast +, quickcheckIo, resourcePool, resourcet, safe, securemem +, semigroups, setenv, SHA, shakespeare, shakespeareCss +, shakespeareI18n, shakespeareJs, shakespeareText, silently +, simpleSendfile, skein, socks, stmChans, stringsearch +, systemFileio, systemFilepath, tagged, tagsoup, tagstreamConduit +, tls, tlsExtra, transformersBase, unixCompat, unorderedContainers +, utf8Light, utf8String, vector, void, wai, waiAppStatic, waiExtra +, waiLogger, waiTest, warp, word8, xmlConduit, xmlTypes +, xssSanitize, yaml, yesod, yesodAuth, yesodCore, yesodForm +, yesodPersistent, yesodRoutes, yesodStatic, yesodTest +, zlibBindings, zlibConduit }: cabal.mkDerivation (self: { pname = "yesod-platform"; - version = "1.2.4.4"; - sha256 = "0avqaqx81rald37j4qxp75ixgq5q4a3b8fnlmfsp9d54nfp3hxji"; + version = "1.2.5"; + sha256 = "1qd1r3ihnmzpc9jspvrygvxvp7si7j9rjrdp18jibsx3ijpkkif3"; buildDepends = [ aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit authenticate base64Bytestring baseUnicodeSymbols blazeBuilder blazeBuilderConduit blazeHtml blazeMarkup byteable byteorder caseInsensitive cereal certificate cipherAes cipherRc4 - clientsession conduit cookie cprngAes cryptoApi cryptoCipherTypes - cryptoConduit cryptohash cryptohashCryptoapi cryptoNumbers - cryptoPubkey cryptoPubkeyTypes cryptoRandom cssText dataDefault - dataDefaultClass dataDefaultInstancesBase - dataDefaultInstancesContainers dataDefaultInstancesDlist - dataDefaultInstancesOldLocale dateCache dlist emailValidate entropy - failure fastLogger fileEmbed filesystemConduit hamlet hjsmin hspec - hspecExpectations htmlConduit httpAttoparsec httpConduit httpDate - httpTypes languageJavascript liftedBase mimeMail mimeTypes mmorph - monadControl monadLogger networkConduit pathPieces pem persistent - persistentTemplate poolConduit primitive publicsuffixlist pureMD5 + clientsession conduit connection controlMonadLoop cookie cprngAes + cryptoApi cryptoCipherTypes cryptoConduit cryptohash + cryptohashCryptoapi cryptoNumbers cryptoPubkey cryptoPubkeyTypes + cryptoRandom cssText dataDefault dataDefaultClass + dataDefaultInstancesBase dataDefaultInstancesContainers + dataDefaultInstancesDlist dataDefaultInstancesOldLocale dlist + emailValidate entropy failure fastLogger fileEmbed + filesystemConduit hamlet hjsmin hspec hspecExpectations htmlConduit + httpAttoparsec httpClient httpClientConduit httpClientTls + httpConduit httpDate httpTypes languageJavascript liftedBase + mimeMail mimeTypes mmorph monadControl monadLogger monadLoops + networkConduit pathPieces pem persistent persistentTemplate + poolConduit primitive processConduit publicsuffixlist pureMD5 pwstoreFast quickcheckIo resourcePool resourcet safe securemem semigroups setenv SHA shakespeare shakespeareCss shakespeareI18n shakespeareJs shakespeareText silently simpleSendfile skein socks - stringsearch systemFileio systemFilepath tagged tagsoup + stmChans stringsearch systemFileio systemFilepath tagged tagsoup tagstreamConduit tls tlsExtra transformersBase unixCompat unorderedContainers utf8Light utf8String vector void wai waiAppStatic waiExtra waiLogger waiTest warp word8 xmlConduit From 6cd149f2a975e9db3716bc5aa0e95674064bef0b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 21:47:39 +0100 Subject: [PATCH 115/115] hoogle: disable test suite to fix the build See issue . --- pkgs/development/libraries/haskell/hoogle/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index 70c8ecb249d8..b461b5a1fd41 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -16,6 +16,7 @@ cabal.mkDerivation (self: { tagsoup text time transformers uniplate wai warp ]; testDepends = [ filepath ]; + doCheck = false; meta = { homepage = "http://www.haskell.org/hoogle/"; description = "Haskell API Search";