diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix index d3e0c360e3eb..c1cacb9eaa35 100644 --- a/pkgs/development/libraries/haskell/aeson/default.nix +++ b/pkgs/development/libraries/haskell/aeson/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "aeson"; - version = "0.6.0.1"; - sha256 = "0hhhfq045drwfc4l3827006ybw9shwxi8mg25k9nsjx9wdhmkvy9"; + version = "0.6.0.2"; + sha256 = "04vyjpp3zi2g65rrkq4x4bddw0nfclniq5hhfq7l3jhybd8jxy51"; buildDepends = [ attoparsec blazeBuilder deepseq dlist hashable mtl syb text time unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix index 59060ef0682b..402c9a0a6b5b 100644 --- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "attoparsec-conduit"; - version = "0.2.0.1"; - sha256 = "1jxb2zanfmfqdmd5q770r4yz2s0giky9ify6fcsjwc8wiah4aji1"; + version = "0.4.0"; + sha256 = "1vlgpa90sgaym754w5wr3jjqjra9yrn3yn4fhi148v25y4ijrrc0"; buildDepends = [ attoparsec conduit text transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index f5359ee0d6ad..50df0746c560 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/pkgs/development/libraries/haskell/authenticate/default.nix @@ -1,16 +1,17 @@ { cabal, aeson, attoparsec, blazeBuilder, blazeBuilderConduit -, caseInsensitive, conduit, httpConduit, httpTypes, network -, tagsoup, text, transformers, unorderedContainers, xmlConduit +, caseInsensitive, conduit, httpConduit, httpTypes, monadControl +, network, resourcet, tagsoup, text, transformers +, unorderedContainers, xmlConduit }: cabal.mkDerivation (self: { pname = "authenticate"; - version = "1.0.0.1"; - sha256 = "0wrbr7kwd4g8idd6i4ghvpd5q7nq0b8zx5qphqvkbs128m0r308d"; + version = "1.2.0.1"; + sha256 = "1wyqkam1wgcg5rg4vjh3rlyffhiw7hmx5wshhg9hi2vqpgz0rs65"; buildDepends = [ aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive - conduit httpConduit httpTypes network tagsoup text transformers - unorderedContainers xmlConduit + conduit httpConduit httpTypes monadControl network resourcet + tagsoup text transformers unorderedContainers xmlConduit ]; meta = { homepage = "http://github.com/yesodweb/authenticate"; diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix index 5d92e3ba28d0..57752798446c 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-builder-conduit"; - version = "0.2.0.1"; - sha256 = "0p6kq43avsf21biskjardv7k47bag16ki2gmwjpk8ram9mwlz0zg"; + version = "0.4.0"; + sha256 = "0lpm480xc2y3syv42l3v7v6yhhnfr69bj7vc80fj0074h5288vjy"; buildDepends = [ blazeBuilder conduit text transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index 8d5cc0959375..e885c39cb05f 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "certificate"; - version = "1.1.0"; - sha256 = "10xpszfr51nd72kqmr4l1fna3bc3a272h3vf5b5hlls6k9kxzddg"; + version = "1.1.1"; + sha256 = "1n9sj69haqsiny1zn1lb09q86ga4ccypbdbkxsk5bzv10ygkk7d9"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 52345c9446f1..7c303a09a4b2 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -1,13 +1,14 @@ -{ cabal, liftedBase, monadControl, text, transformers -, transformersBase +{ cabal, liftedBase, monadControl, resourcet, text, transformers +, transformersBase, void }: cabal.mkDerivation (self: { pname = "conduit"; - version = "0.2.2"; - sha256 = "1iwmf0zdrrxh8q3xja742j17nanj6va5zj9bs9a5m78whf8cc80j"; + version = "0.4.0.1"; + sha256 = "1n4a42ayww55hvvsnis6gdfwfciwxpzz0wxa0b3ybvmyr0jsidiq"; buildDepends = [ - liftedBase monadControl text transformers transformersBase + liftedBase monadControl resourcet text transformers + transformersBase void ]; meta = { homepage = "http://github.com/snoyberg/conduit"; diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index 552a40b6659b..c3bd4be6dbeb 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "crypto-conduit"; - version = "0.1.3.1"; - sha256 = "0b8n2njz2ccdb9gql79l96jgv1nlq4ls09d25a2yy9f69w7h1ww5"; + version = "0.3.0.1"; + sha256 = "1j7j1ga9in9j9i5gxdkpijarcw7a0y8w0z4sj00d2yzb1qhdalzq"; buildDepends = [ cereal conduit cryptoApi transformers ]; meta = { homepage = "https://github.com/meteficha/crypto-conduit"; diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 59f219529c9c..053fce65ce2d 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -11,6 +11,9 @@ cabal.mkDerivation (self: { binary blazeHtml citeprocHs cryptohash filepath hamlet mtl pandoc parsec regexBase regexTdfa snapCore snapServer tagsoup time ]; + patchPhase = '' + sed -i 's|hamlet >= 0.10.3 && < 0.11|hamlet|' hakyll.cabal + ''; meta = { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index 57bd463fecba..668ac64af94a 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -4,15 +4,15 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "0.10.9.1"; - sha256 = "1z2g7ymb8ihx13dkfq0k0s2fn1k6nig8h306i8p4q76wy7ybw3g0"; + version = "1.0.1"; + sha256 = "1h3bq9vignnbvnjwr35yf4am0k90l1c21x0phnhnigdx7wanygcz"; buildDepends = [ blazeBuilder blazeHtml failure parsec shakespeare text ]; meta = { - homepage = "http://www.yesodweb.com/book/templates"; + homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "Haml-like template files that are compile-time checked"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix index 089905fd620a..44f5a88f6fb8 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix @@ -5,6 +5,9 @@ cabal.mkDerivation (self: { version = "7.0.0"; sha256 = "15r6xpyg193iwqin96mn7c9x5w7l8q9m3vbgiwv7bxvhdrl1dp7j"; buildDepends = [ hamlet happstackServer text ]; + patchPhase = '' + sed -i 's|hamlet >= 0.10 && <0.11|hamlet|' happstack-hamlet.cabal + ''; meta = { homepage = "http://www.happstack.com/"; description = "Support for Hamlet HTML templates in Happstack"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 29ba6b50d8f1..f81c281d378a 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "happstack-server"; - version = "6.6.5"; - sha256 = "1s0sa0sk2g6q55xwmzzdca327kp7mhxwc4dlg8lrdqa4dr3hm3gj"; + version = "7.0.0"; + sha256 = "09i573gracz04z8b5rls7jm6hq5dfg7a4gkn7xpfsl1nmhnf1xhv"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index c03484b93f51..147212dc299c 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { haskellSrcExts httpTypes parsec random safe tagsoup time transformers uniplate wai warp ]; + patches = [ ./relax-version-requirements.patch ]; meta = { homepage = "http://www.haskell.org/hoogle/"; description = "Haskell API Search"; diff --git a/pkgs/development/libraries/haskell/hoogle/relax-version-requirements.patch b/pkgs/development/libraries/haskell/hoogle/relax-version-requirements.patch new file mode 100644 index 000000000000..63b7f857697f --- /dev/null +++ b/pkgs/development/libraries/haskell/hoogle/relax-version-requirements.patch @@ -0,0 +1,15 @@ +--- hoogle-4.2.10-orig/hoogle.cabal 2012-04-05 18:43:21.465011394 +0200 ++++ hoogle-4.2.10/hoogle.cabal 2012-04-05 18:46:22.791068726 +0200 +@@ -114,9 +114,9 @@ + blaze-builder >= 0.2 && < 0.4, + http-types == 0.6.*, + case-insensitive >= 0.2 && < 0.5, +- conduit == 0.2.*, +- wai == 1.1.*, +- warp == 1.1.*, ++ conduit, ++ wai, ++ warp, + Cabal >= 1.8 && < 1.15 + + other-modules: diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index d49b0dde7d62..6490d14711d1 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -1,21 +1,21 @@ { cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring , blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate , conduit, cookie, cprngAes, dataDefault, failure, httpTypes -, liftedBase, monadControl, mtl, network, regexCompat, socks, text -, time, tls, tlsExtra, transformers, transformersBase, utf8String -, zlibConduit +, liftedBase, monadControl, mtl, network, regexCompat, resourcet +, socks, text, time, tls, tlsExtra, transformers, transformersBase +, utf8String, void, zlibConduit }: cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.2.6"; - sha256 = "0gspqkydw5v4wb9s0ipy5s708nmqp3phkh3j95mzn6nlbk2r9kvn"; + version = "1.4.0.2"; + sha256 = "1zhsz9zqa4h5f18yalihcqa5p4ji50b8cw7h88i9s46q3fwcrbhh"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie cprngAes dataDefault failure httpTypes liftedBase monadControl mtl - network regexCompat socks text time tls tlsExtra transformers - transformersBase utf8String zlibConduit + network regexCompat resourcet socks text time tls tlsExtra + transformers transformersBase utf8String void zlibConduit ]; meta = { homepage = "http://www.yesodweb.com/book/http-conduit"; diff --git a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix new file mode 100644 index 000000000000..6a7c4d6fde5e --- /dev/null +++ b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix @@ -0,0 +1,15 @@ +{ cabal, cryptoApi, mtl, transformers }: + +cabal.mkDerivation (self: { + pname = "monadcryptorandom"; + version = "0.4"; + sha256 = "1wxqffi5x8kv0qrx82bvpvlqzzwy8vrw5ybqvf2h6cln36ff23m6"; + buildDepends = [ cryptoApi mtl transformers ]; + meta = { + homepage = "http://trac.haskell.org/crypto-api/wiki"; + description = "A monad for using CryptoRandomGen"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix index d1a067bcbb02..fa4b4e953b65 100644 --- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix +++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "persistent-sqlite"; - version = "0.8.0"; - sha256 = "19dly53g4jzcqi9px49w9qaf2vnlpsxc6jf5xn63827ylmxlmk5q"; + version = "0.9.0"; + sha256 = "0l0w4g83bxaqlwwqs9xvlws0ksl0i8jmqsi4lpgywylvpywnhlgc"; buildDepends = [ aeson conduit monadControl persistent text transformers ]; diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index 22948d89946d..2beef995d2af 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "persistent-template"; - version = "0.8.2"; - sha256 = "0lmdp2gmrbgnp2ls4b76hnjcrllgmzrsiszkmbywkb2dmlxm5wdq"; + version = "0.9.0"; + sha256 = "17rcmqmakpqk2d630rpj6i345jc7hk225c26s5v8ks3hds4dn85w"; buildDepends = [ aeson monadControl persistent text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 0ebb1d2d7c0f..ea4052e8d9af 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -1,17 +1,17 @@ { cabal, aeson, attoparsec, base64Bytestring, blazeHtml, conduit -, liftedBase, monadControl, mtl, pathPieces, poolConduit, sqlite -, text, time, transformers, transformersBase, unorderedContainers -, vector +, liftedBase, monadControl, mtl, pathPieces, poolConduit, resourcet +, sqlite, text, time, transformers, transformersBase +, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "persistent"; - version = "0.8.0.2"; - sha256 = "10v11fnx7dhj2gg09k3ji054iywbpazs789vhfxn56wfg6rz59wb"; + version = "0.9.0"; + sha256 = "00nd76is0yijzh52a5dgv00v30mcign9j86lmmfbpxpaa460g3hn"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml conduit liftedBase - monadControl mtl pathPieces poolConduit text time transformers - transformersBase unorderedContainers vector + monadControl mtl pathPieces poolConduit resourcet text time + transformers transformersBase unorderedContainers vector ]; extraLibraries = [ sqlite ]; meta = { diff --git a/pkgs/development/libraries/haskell/pool-conduit/default.nix b/pkgs/development/libraries/haskell/pool-conduit/default.nix index 4d4f9101456c..40aea355c50c 100644 --- a/pkgs/development/libraries/haskell/pool-conduit/default.nix +++ b/pkgs/development/libraries/haskell/pool-conduit/default.nix @@ -1,10 +1,10 @@ -{ cabal, conduit, resourcePool, transformers }: +{ cabal, resourcePool, resourcet, transformers }: cabal.mkDerivation (self: { pname = "pool-conduit"; - version = "0.0.0.1"; - sha256 = "1im5fpwadg9hmajay6dkwmlzbp5rzn8hh9wh01iy23jgivkqk2q0"; - buildDepends = [ conduit resourcePool transformers ]; + version = "0.1.0"; + sha256 = "1rxagidgd18a9xk7qqafz8l3nqlbr1s4231k8bf1sxd62b8rs4sm"; + buildDepends = [ resourcePool resourcet transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; description = "Resource pool allocations via ResourceT"; diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix index 051a3800f695..72046994a87a 100644 --- a/pkgs/development/libraries/haskell/reactive-banana/default.nix +++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix @@ -14,6 +14,9 @@ cabal.mkDerivation (self: { description = "Practical library for functional reactive programming (FRP)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.bluescreen303 ]; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.bluescreen303 + ]; }; }) diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index d24529425d0e..f3a777e83382 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,13 +2,13 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "0.10.8"; - sha256 = "1c3a48rfrr5ifarr15zkcwg74zkqw08lhfk5fpkr5z6gxhwnbkas"; + version = "1.0.1"; + sha256 = "0n7ld8lr73k16gx3q1ab0qgsv6h0j77ma8dm7daisav9hci9sdbs"; buildDepends = [ parsec shakespeare text ]; meta = { - homepage = "http://www.yesodweb.com/book/templates"; + homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "Stick your haskell variables into css at compile time"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix index 47749bf05650..3d5d87e32103 100644 --- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "shakespeare-i18n"; - version = "0.0.2.1"; - sha256 = "1gaxngqihz6wi5d6hyb9mdlhgcxnr4bvmm1si919zgjndwnms8z8"; + version = "1.0.0"; + sha256 = "16zbf4y00l1jfah9j8xkhva5avgp6vg0spgjjrm3rxrs1kclxzpv"; buildDepends = [ parsec shakespeare text ]; meta = { - homepage = "http://www.yesodweb.com/book/i18n"; + homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "A type-based approach to internationalization"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index eb8d029496b2..bbdbfe894aa9 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "shakespeare-js"; - version = "0.11.2"; - sha256 = "1ck39bgl4wswd88w42b1fx5dlsd7r31d60ssv1lk11x6s4cjihgz"; + version = "1.0.0"; + sha256 = "0i94kx1cnnz8kaf3zzy8bphp3k670jgq4ajynzc0ys47hb5sy3h9"; buildDepends = [ shakespeare text ]; meta = { - homepage = "http://www.yesodweb.com/book/templates"; + homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "Stick your haskell variables into javascript/coffeescript at compile time"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix index acf55d9d0828..75643dc638a8 100644 --- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "shakespeare-text"; - version = "0.11"; - sha256 = "02h8vi28kzvv44hy1ix9jc01x4jx302cp71bdj8blsjxzqyr6aq8"; + version = "1.0.0"; + sha256 = "1bsvjmkjlqwmgbv1ki7a8djdfqvdcx7b7586a20zcgichxkkzgf6"; buildDepends = [ shakespeare text ]; meta = { - homepage = "http://www.yesodweb.com/book/templates"; + homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "Interpolation with quasi-quotation: put variables strings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 04305bbed224..78a5ed2913b9 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "shakespeare"; - version = "0.11"; - sha256 = "0ksjgl2x97n5ci346vlmc2kd8plvsg6kn5cncbxkd8c6w4h28a4b"; + version = "1.0.0"; + sha256 = "16f9ynk537sra32bs5c4wncryx9sb4mfabxcjyq2mw42b8kn7ggs"; buildDepends = [ parsec text ]; meta = { - homepage = "http://www.yesodweb.com/book/templates"; + homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "A toolkit for making compile-time interpolated templates"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix index 3df9ac1a5e1f..82d316e4d765 100644 --- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix +++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "simple-sendfile"; - version = "0.2.1"; - sha256 = "0mbnqdy7g9jp2d6x9mcrz315b4xhp92as28bxygf7jhc0aai66aq"; + version = "0.2.2"; + sha256 = "0id3d6ynl2xz4w0vcxm3wyj1kxjnchcl3h0xa4prh3s0giap8yax"; buildDepends = [ network ]; meta = { description = "Cross platform library for the sendfile system call"; diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index 7391896817df..82a638ee21f7 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "texmath"; - version = "0.6.0.3"; - sha256 = "0vj1kh62qs7badv00lcda9m3j53kc069kmrv5lmz62a96y4kx5yi"; + version = "0.6.0.4"; + sha256 = "1jbjqis5vfsv3yihgp1gdnj7zmdpvf6f47bbrkqdf7j75hyq2x66"; isLibrary = true; isExecutable = true; buildDepends = [ parsec syb xml ]; diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix index 5a58a2002b16..98bbcdde1625 100644 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ b/pkgs/development/libraries/haskell/tls-extra/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls-extra"; - version = "0.4.3"; - sha256 = "1qr7l70c5fgqpf9hnhsngghcss2cannhca1snlvbcrq074hc2f2n"; + version = "0.4.4"; + sha256 = "1yj4v140pgvgpjv1g8h3dv00k983vjnsvdgc6y4w8ij8s4jvfbay"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index 31b261c920c4..765d9621224b 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls"; - version = "0.9.1"; - sha256 = "0724xwk3mchb2hd6sq4zhrs7pyd18banr0ndxc6bhim75vci53sl"; + version = "0.9.2"; + sha256 = "0qhgf3lxclcjgvnqz6zc41l4s6fzlwpg96jdp6n7q8snn4mdfn5s"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 0f181935cefa..64807567d731 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "1.1.2"; - sha256 = "1nvzqg3wk7i2p1kcpb9f9wdzbrfl6gxid44l94mmvc7xjcmdl6qw"; + version = "1.2.0"; + sha256 = "1y41pw7aw10b2qdx64ygi0qcm0vjv2fx9hncfjqk5y5hlzblqv7s"; buildDepends = [ base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed httpDate httpTypes text time transformers unixCompat wai diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 077fd7ae24f6..877edea7474e 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "1.1.0.1"; - sha256 = "0kavvbywkkwj9914y622wsziwfca9qjaqz798mjhl1ip5bfy73b0"; + version = "1.2.0.2"; + sha256 = "0kfbk505nli51h9lx8865gfgcnji7kgxcjfmfdanv1im00ghrq1v"; buildDepends = [ ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault fastLogger httpTypes network text time @@ -15,7 +15,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://github.com/yesodweb/wai"; description = "Provides some basic WAI handlers and middleware"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index e08981e9c9c6..b16b3940d5dd 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.1.0.1"; - sha256 = "0klyi3d4rivgvbasamxccvkz1w44ak0rcbx840ypdcjq8mbcb85f"; + version = "1.2.0"; + sha256 = "0kiv2z387a2m5crpxissmind6xnxglv7kfvznr0z9ycl6mi9fb9a"; buildDepends = [ blazeBuilder conduit httpTypes network text transformers vault ]; diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 45632743e679..daacb75394a0 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -1,15 +1,15 @@ -{ cabal, blazeBuilder, blazeBuilderConduit, bytestringLexing -, caseInsensitive, conduit, httpTypes, liftedBase, network +{ cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive +, conduit, httpTypes, liftedBase, network, networkConduit , simpleSendfile, transformers, unixCompat, wai }: cabal.mkDerivation (self: { pname = "warp"; - version = "1.1.0.1"; - sha256 = "1bgjnnkqgcyj00jd4rgsnpmac0yfd1ydd6i61b252gyrr9dd0wm9"; + version = "1.2.0"; + sha256 = "1dz7nrybr08k40phynk5xm7pc5hk86k5r92yr3pri1wdyg7yb6kv"; buildDepends = [ - blazeBuilder blazeBuilderConduit bytestringLexing caseInsensitive - conduit httpTypes liftedBase network simpleSendfile transformers + blazeBuilder blazeBuilderConduit caseInsensitive conduit httpTypes + liftedBase network networkConduit simpleSendfile transformers unixCompat wai ]; meta = { diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index 16d142ea955f..dc49a5ef7995 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -1,16 +1,16 @@ { cabal, attoparsec, attoparsecConduit, blazeBuilder , blazeBuilderConduit, conduit, dataDefault, failure, monadControl -, systemFilepath, text, transformers, xmlTypes +, resourcet, systemFilepath, text, transformers, xmlTypes }: cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "0.5.4"; - sha256 = "1apvh2xlh4wkrfak0yqycsadsnkybfwjb86zqalm8ni9w2p9lwr6"; + version = "0.7.0.1"; + sha256 = "0ikkdgzvvadz7787jii8hwx8rls95jwvk7p4g2lw3ib8372hz4ly"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit - conduit dataDefault failure monadControl systemFilepath text - transformers xmlTypes + conduit dataDefault failure monadControl resourcet systemFilepath + text transformers xmlTypes ]; meta = { homepage = "http://github.com/snoyberg/xml"; diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index 0f41c7ace7b1..a495ba4df3ce 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -1,14 +1,14 @@ -{ cabal, aeson, attoparsec, conduit, text, transformers +{ cabal, aeson, attoparsec, conduit, resourcet, text, transformers , unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "yaml"; - version = "0.5.2"; - sha256 = "1jhzycasfmjlfdpca1cflrggc16jp16852af7d6cwfsy342wh6gp"; + version = "0.7.0"; + sha256 = "10l5isiidmjn818zm05ac65yaidrkq0qcb1bcpwnvi0fgjr308n5"; buildDepends = [ - aeson attoparsec conduit text transformers unorderedContainers - vector + aeson attoparsec conduit resourcet text transformers + unorderedContainers vector ]; meta = { homepage = "http://github.com/snoyberg/yaml/"; diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index f656c17ffd1a..9671fc2583a8 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "0.8.1.1"; - sha256 = "0wmvywyil6cnpxq777a0w4qknw4lr4i53nni4bcigrvmpg7gzgac"; + version = "1.0.0"; + sha256 = "1wdzz6xy55430xgaibzqwij1c4yswkz3da22n2016xl5nyspaijl"; buildDepends = [ aeson authenticate blazeHtml hamlet httpConduit liftedBase mimeMail persistent persistentTemplate pureMD5 pwstoreFast random SHA @@ -18,7 +18,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://www.yesodweb.com/"; description = "Authentication for Yesod"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index e7929b578ed6..d197aabaf0df 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -1,26 +1,27 @@ { cabal, aeson, blazeBuilder, blazeHtml, caseInsensitive, cereal , clientsession, conduit, cookie, failure, fastLogger, hamlet , httpTypes, liftedBase, monadControl, parsec, pathPieces, random -, shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs, text -, time, transformers, transformersBase, vector, wai, waiExtra -, waiLogger, yesodRoutes +, resourcet, shakespeare, shakespeareCss, shakespeareI18n +, shakespeareJs, text, time, transformers, transformersBase, vector +, wai, waiExtra, waiLogger, yesodRoutes }: cabal.mkDerivation (self: { pname = "yesod-core"; - version = "0.10.3"; - sha256 = "1mw78h6h7b4g67kyg4y01rcgi5bpb97hhzx0yqk4bmq23mzisg9m"; + version = "1.0.0"; + sha256 = "0za3pflbcmgxd45jx0g2yc7cmhmhn1qk45j0mg4qq73r1lcyj6x0"; buildDepends = [ aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession conduit cookie failure fastLogger hamlet httpTypes liftedBase - monadControl parsec pathPieces random shakespeare shakespeareCss - shakespeareI18n shakespeareJs text time transformers + monadControl parsec pathPieces random resourcet shakespeare + shakespeareCss shakespeareI18n shakespeareJs text time transformers transformersBase vector wai waiExtra waiLogger yesodRoutes ]; + noHaddock = true; meta = { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/yesod-default/default.nix b/pkgs/development/libraries/haskell/yesod-default/default.nix index f839b5a16dbc..b7c7c3cecc26 100644 --- a/pkgs/development/libraries/haskell/yesod-default/default.nix +++ b/pkgs/development/libraries/haskell/yesod-default/default.nix @@ -1,19 +1,20 @@ -{ cabal, shakespeareCss, shakespeareJs, text, transformers -, unorderedContainers, wai, waiExtra, warp, yaml, yesodCore +{ cabal, networkConduit, shakespeareCss, shakespeareJs, text +, transformers, unorderedContainers, wai, waiExtra, warp, yaml +, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-default"; - version = "0.6.1"; - sha256 = "0am5f8r2w7695zfc6vi0gy8yin9kfgj37qzr14r5v6wzhk1gq5da"; + version = "1.0.0"; + sha256 = "1l6x56ky3jf20nvz03jsxs19dvh1rz108gzhgbh86qjhcisaaqvi"; buildDepends = [ - shakespeareCss shakespeareJs text transformers unorderedContainers - wai waiExtra warp yaml yesodCore + networkConduit shakespeareCss shakespeareJs text transformers + unorderedContainers wai waiExtra warp yaml yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; description = "Default config and main functions for your yesod application"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 8be3b65b93fd..4e7777df6604 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "0.4.2.1"; - sha256 = "0zpmyqxbknz8pdib1gdf410jv4xndn4pphdigagqxl5m5c2hi1v2"; + version = "1.0.0"; + sha256 = "0ghv21yb54ldik0zq2k69d3s9dfs6wvy71nh5hkzh2hqpxhcq112"; buildDepends = [ blazeBuilder blazeHtml dataDefault emailValidate hamlet network persistent shakespeareCss shakespeareJs text time transformers wai @@ -15,7 +15,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://www.yesodweb.com/"; description = "Form handling support for Yesod Web Framework"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix index 25a4ba34f167..debc3d7cb096 100644 --- a/pkgs/development/libraries/haskell/yesod-json/default.nix +++ b/pkgs/development/libraries/haskell/yesod-json/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-json"; - version = "0.3.1"; - sha256 = "17w82mfl364dc0k1zk1gqas3fyskz2jc50diq71fiw87apslva4v"; + version = "1.0.0"; + sha256 = "159j303yd3d5n2iqkbi55vj9d5d3jdnpnz115m9p6nf60qqmhj97"; buildDepends = [ aeson attoparsecConduit blazeBuilder conduit safe shakespeareJs text transformers vector wai waiExtra yesodCore yesodRoutes @@ -14,7 +14,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://www.yesodweb.com/"; description = "Generate content for Yesod using the aeson package"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix index b50e34df8b33..42f3f93c5076 100644 --- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix +++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix @@ -2,15 +2,15 @@ cabal.mkDerivation (self: { pname = "yesod-persistent"; - version = "0.3.1"; - sha256 = "0pxzwqrq4wr9hdnppi5ri0iip2a8gg2y7lplmhn2791jc001ll7m"; + version = "1.0.0"; + sha256 = "1dawhs9ab2z5njq9m37p9zrr5wdzrmw4i0ixb2j4rhff8z50hjaf"; buildDepends = [ persistent persistentTemplate transformers yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; description = "Some helpers for using Persistent from Yesod"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index 78781dc3f741..7037ac029630 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -2,13 +2,13 @@ cabal.mkDerivation (self: { pname = "yesod-routes"; - version = "0.0.1"; - sha256 = "19bnww5idxr0j2l8g838idxkhhn73bhdz0bnvglinv7163fy8xhl"; + version = "1.0.0"; + sha256 = "1sqlcawsbv8sz22prcg41dvma6kywyl18dwp7msjlbkxgc2msp3a"; buildDepends = [ pathPieces text vector ]; meta = { homepage = "http://www.yesodweb.com/"; description = "Efficient routing for Yesod"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index dc065b572b28..316477101ff5 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-static"; - version = "0.10.1"; - sha256 = "07dapygk2n6d7sk39gwi06w96b13dqhxgx3l7ac198nil5x2m68m"; + version = "1.0.0"; + sha256 = "1l4wj8d5s7h52fx4bs0780rz43wmxaf5fllnj1z8iwkc7rydkydx"; buildDepends = [ base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed httpTypes text transformers unixCompat wai waiAppStatic yesodCore @@ -14,7 +14,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://www.yesodweb.com/"; description = "Static file serving subsite for Yesod Web Framework"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index f9320acc6e79..763de7b1595f 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "0.10.2"; - sha256 = "15dswvhn9vz3bpdvbypg8x8gwhjkwj170b8mqznp10drccxyizs2"; + version = "1.0.0"; + sha256 = "05bmx6767a07am0vz5a6xa9xa51gwnsm2myvi8f5hzscfck2p6lp"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -21,7 +21,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/zlib-bindings/0.0.3.2.nix b/pkgs/development/libraries/haskell/zlib-bindings/0.0.3.2.nix deleted file mode 100644 index ba2a14a23d0a..000000000000 --- a/pkgs/development/libraries/haskell/zlib-bindings/0.0.3.2.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ cabal, zlib }: - -cabal.mkDerivation (self: { - pname = "zlib-bindings"; - version = "0.0.3.2"; - sha256 = "0x78fkjinfhhihhfihr0g5rc4d8jkhza3vw5qsyds74skd6rsy1q"; - buildDepends = [ zlib ]; - meta = { - homepage = "http://github.com/snoyberg/zlib-bindings"; - description = "Low-level bindings to the zlib package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/zlib-bindings/0.1.0.1.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/zlib-bindings/0.1.0.1.nix rename to pkgs/development/libraries/haskell/zlib-bindings/default.nix diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix index 260ef687edbe..03ca2f155744 100644 --- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix +++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zlib-conduit"; - version = "0.2.0.1"; - sha256 = "0css7cr9jj6rn829bw8mlbdl0d6iz9ckhsbrlrdcppx8k4gzb4rg"; + version = "0.4.0"; + sha256 = "0snjvpybkdcnqzw2dkja7fvakd6fwvr29l40ghxk48bzzs2j308i"; buildDepends = [ conduit transformers zlibBindings ]; meta = { homepage = "http://github.com/snoyberg/conduit"; diff --git a/pkgs/development/libraries/haskell/zlib-enum/default.nix b/pkgs/development/libraries/haskell/zlib-enum/default.nix index 9ee7063317f0..0e1245bca0c7 100644 --- a/pkgs/development/libraries/haskell/zlib-enum/default.nix +++ b/pkgs/development/libraries/haskell/zlib-enum/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zlib-enum"; - version = "0.2.1"; - sha256 = "0cnx7sbgj6s0gvq6pcqyi3xahx7x3bj47ap10z89qfbk0906rkq8"; + version = "0.2.2"; + sha256 = "1fmlvjj1krigj5aqipq5pf0mqnybr7zz50mgqr30kznfg48ry29y"; isLibrary = true; isExecutable = true; buildDepends = [ enumerator transformers zlibBindings ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6e02c61bc7a7..7082a17e4c47 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -996,6 +996,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); monadControl_0_3_1_1 = callPackage ../development/libraries/haskell/monad-control/0.3.1.1.nix {}; monadControl = self.monadControl_0_3_1_1; + monadcryptorandom = callPackage ../development/libraries/haskell/monadcryptorandom {}; + monadLoops = callPackage ../development/libraries/haskell/monad-loops {}; monadPar = callPackage ../development/libraries/haskell/monad-par {}; @@ -1539,15 +1541,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); }; zlib = self.zlib_0_5_3_3; - zlibBindings_0_0_3_2 = callPackage ../development/libraries/haskell/zlib-bindings/0.0.3.2.nix {}; - zlibBindings_0_1_0_1 = callPackage ../development/libraries/haskell/zlib-bindings/0.1.0.1.nix {}; - zlibBindings = self.zlibBindings_0_0_3_2; + zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {}; zlibConduit = callPackage ../development/libraries/haskell/zlib-conduit {}; - zlibEnum = callPackage ../development/libraries/haskell/zlib-enum { - zlibBindings = self.zlibBindings_0_0_3_2; - }; + zlibEnum = callPackage ../development/libraries/haskell/zlib-enum {}; Zwaluw = callPackage ../development/libraries/haskell/Zwaluw {};