diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix index a50fdb8ddc04..f0b1ccd8bc04 100644 --- a/pkgs/development/libraries/haskell/ListLike/default.nix +++ b/pkgs/development/libraries/haskell/ListLike/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ListLike"; - version = "3.1.4"; - sha256 = "0cpj7vqlazs2yzh0ffhlg69kdb18xyicybfw614nlqfhhrp53lj9"; + version = "3.1.5"; + sha256 = "0hxpjmj5qdyb55wda2bgd3crkg9q6dklhj2kff7qz6wkx5fdbvjs"; isLibrary = true; isExecutable = true; meta = { diff --git a/pkgs/development/libraries/haskell/bson/default.nix b/pkgs/development/libraries/haskell/bson/default.nix index 3e0aacbaa9d4..95700df7eef8 100644 --- a/pkgs/development/libraries/haskell/bson/default.nix +++ b/pkgs/development/libraries/haskell/bson/default.nix @@ -1,17 +1,16 @@ -{ cabal, binary, compactStringFix, cryptohash, dataBinaryIeee754 -, mtl, network, time +{ cabal, binary, cryptohash, dataBinaryIeee754, mtl, network, text +, time }: cabal.mkDerivation (self: { pname = "bson"; - version = "0.1.7"; - sha256 = "1dmndq0rx22h9kxv31rxwqhwkgsvqg9qy4l0xmvpcvvl101zj4jx"; + version = "0.2.0"; + sha256 = "1m4bzbl3i9p8v78zjb4ilrpdxbxpqz5bgcpklvvkb2ipfkgqhmhx"; buildDepends = [ - binary compactStringFix cryptohash dataBinaryIeee754 mtl network - time + binary cryptohash dataBinaryIeee754 mtl network text time ]; meta = { - homepage = "http://github.com/TonyGen/bson-haskell"; + homepage = "http://github.com/selectel/bson-haskell"; description = "BSON documents are JSON-like objects with a standard binary encoding"; license = "unknown"; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/cpu/default.nix b/pkgs/development/libraries/haskell/cpu/default.nix index 832b7db03690..dc27553c2a3b 100644 --- a/pkgs/development/libraries/haskell/cpu/default.nix +++ b/pkgs/development/libraries/haskell/cpu/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cpu"; - version = "0.1.0"; - sha256 = "020s1cv3qkhjq0gypxligg2x68izb3z82krv8y1m1k360554nqyg"; + version = "0.1.1"; + sha256 = "0ygkxx8ksa0rh63569d3g0w8pzgwg6062sd4yyi3q646zcmryhj6"; isLibrary = true; isExecutable = true; meta = { diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix index 2a2708f70ac5..14c125121bde 100644 --- a/pkgs/development/libraries/haskell/iteratee/default.nix +++ b/pkgs/development/libraries/haskell/iteratee/default.nix @@ -1,14 +1,16 @@ -{ cabal, ListLike, MonadCatchIOTransformers, parallel, transformers +{ cabal, ListLike, MonadCatchIOTransformers, monadControl, parallel +, transformers, transformersBase }: cabal.mkDerivation (self: { pname = "iteratee"; - version = "0.8.8.2"; - sha256 = "1d76an95y8svaja5ksx8p05fk22z62hp3gfwnd1d917qccffw6ry"; + version = "0.8.9.1"; + sha256 = "1yk7jvabmabf0qjcd00imbg7vx84yjf71h7x3zbv4a51ykfy5hax"; isLibrary = true; isExecutable = true; buildDepends = [ - ListLike MonadCatchIOTransformers parallel transformers + ListLike MonadCatchIOTransformers monadControl parallel + transformers transformersBase ]; meta = { homepage = "http://www.tiresiaspress.us/haskell/iteratee"; diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix index ddbbdcb8093e..aec216ea59d1 100644 --- a/pkgs/development/libraries/haskell/mongoDB/default.nix +++ b/pkgs/development/libraries/haskell/mongoDB/default.nix @@ -1,17 +1,17 @@ { cabal, binary, bson, cryptohash, liftedBase, monadControl, mtl -, network, parsec, random, randomShuffle, transformersBase +, network, parsec, random, randomShuffle, text, transformersBase }: cabal.mkDerivation (self: { pname = "mongoDB"; - version = "1.2.0"; - sha256 = "0rffa13p889mxbbkj2bmqy3yada3mrhngvp8pp7qvrll1acm7s13"; + version = "1.3.0"; + sha256 = "1l6r55bicjdybn8jn9rp94aamjqy5j5qs2775m05aba8svsl4kma"; buildDepends = [ binary bson cryptohash liftedBase monadControl mtl network parsec - random randomShuffle transformersBase + random randomShuffle text transformersBase ]; meta = { - homepage = "http://github.com/TonyGen/mongoDB-haskell"; + homepage = "http://github.com/selectel/mongodb-haskell"; description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; license = "unknown"; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/stringsearch/default.nix b/pkgs/development/libraries/haskell/stringsearch/default.nix new file mode 100644 index 000000000000..8b5a81461506 --- /dev/null +++ b/pkgs/development/libraries/haskell/stringsearch/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "stringsearch"; + version = "0.3.6.3"; + sha256 = "1f0sl1zjya8glvlscf3g5i0in0ai1knls7kg9dp82grg2k287sgz"; + meta = { + homepage = "https://bitbucket.org/dafis/stringsearch"; + description = "Fast searching, splitting and replacing of ByteStrings"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix index 4176cf2f6e21..58284655eb88 100644 --- a/pkgs/development/libraries/haskell/system-fileio/default.nix +++ b/pkgs/development/libraries/haskell/system-fileio/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "system-fileio"; - version = "0.3.7"; - sha256 = "0vjjpn3fq0s2assfg3p3wpk60jsrjp1f6i0djm3abdbmc53gqyi0"; + version = "0.3.8"; + sha256 = "0zv7ngxc3qgrlfbp0vqirzcwmkmi9ql8pgqhn1ls56iqwbxbb654"; buildDepends = [ systemFilepath text time ]; meta = { homepage = "https://john-millikin.com/software/haskell-filesystem/"; diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 9e716eb6c13f..3c808dd430b7 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -1,16 +1,17 @@ { cabal, ansiTerminal, blazeBuilder, blazeBuilderConduit , caseInsensitive, conduit, dataDefault, fastLogger, httpTypes -, network, resourcet, text, time, transformers, wai, zlibConduit +, network, resourcet, stringsearch, text, time, transformers, wai +, zlibConduit }: cabal.mkDerivation (self: { pname = "wai-extra"; - version = "1.2.0.4"; - sha256 = "10nd87bs6q1827ihwm13czflha2g8dhza443n55xpakba1sdgsaz"; + version = "1.2.0.5"; + sha256 = "0m9zdn6cdh2j7bwsf17225rdn7jwj7iy97khbd9g7p9rv1lpdain"; buildDepends = [ ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive - conduit dataDefault fastLogger httpTypes network resourcet text - time transformers wai zlibConduit + conduit dataDefault fastLogger httpTypes network resourcet + stringsearch text time transformers wai zlibConduit ]; meta = { homepage = "http://github.com/yesodweb/wai"; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index d09d34dbf6d4..64291854a03e 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -245,7 +245,6 @@ prefFun = ghc741Prefs; }; - # Stable branch snapshot. packages_ghc742 = packages { ghcPath = ../development/compilers/ghc/7.4.2.nix; ghcBinary = ghc6121BinaryDarwin; @@ -255,8 +254,7 @@ # Reasonably current HEAD snapshot. Should *always* be lowPrio. packages_ghcHEAD = packages { ghcPath = ../development/compilers/ghc/head.nix; - ghcBinary = # (packages_ghc704.ghcWithPackages (self : [ self.alex self.happy ])) - ghc704Binary; + ghcBinary = ghc704Binary; prefFun = ghcHEADPrefs; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b009bcad23e1..85ac31b46ef2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -149,7 +149,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); happy = self.happy_1_18_9; # 7.4.2 ok }; - haskellPlatformArgs_2012_2_0_0 = self : { inherit (self) cabal ghc; cgi = self.cgi_3001_1_7_4; # 7.4.1 ok @@ -1279,6 +1278,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); stringCombinators = callPackage ../development/libraries/haskell/string-combinators {}; + stringsearch = callPackage ../development/libraries/haskell/stringsearch {}; + syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {}; syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {}; syb_0_3_3 = callPackage ../development/libraries/haskell/syb/0.3.3.nix {};