diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-18 23:21:29 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-18 23:21:29 +0100 |
commit | 4c5a71f777769b1f2516096532424cd42531aa1f (patch) | |
tree | a5eb1c36a9363911ce264c7ed573b2f3cc6a7798 /pkgs/development/libraries/haskell | |
parent | e8394e3f8c7d464bc27a344a982648c20a08a6d7 (diff) | |
parent | 43498628e8a3eb7d6acbabe2b1918e21bd1a30f1 (diff) | |
download | nixlib-4c5a71f777769b1f2516096532424cd42531aa1f.tar nixlib-4c5a71f777769b1f2516096532424cd42531aa1f.tar.gz nixlib-4c5a71f777769b1f2516096532424cd42531aa1f.tar.bz2 nixlib-4c5a71f777769b1f2516096532424cd42531aa1f.tar.lz nixlib-4c5a71f777769b1f2516096532424cd42531aa1f.tar.xz nixlib-4c5a71f777769b1f2516096532424cd42531aa1f.tar.zst nixlib-4c5a71f777769b1f2516096532424cd42531aa1f.zip |
Merge master into x-updates
Conflicts: pkgs/desktops/gnome-2/desktop/gvfs/default.nix pkgs/development/libraries/cogl/default.nix pkgs/development/libraries/libsoup/2.44.nix
Diffstat (limited to 'pkgs/development/libraries/haskell')
119 files changed, 558 insertions, 356 deletions
diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix index c330f082e890..a7e15f2d6b4d 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, httpClientTls, httpTypes +, lens, liftedBase, monadControl, mtl, network, optparseApplicative +, transformers, transformersBase, xmlConduit, xmlHamlet }: cabal.mkDerivation (self: { pname = "DAV"; - version = "0.4.1"; - sha256 = "0bcrnlixrzvbdvw7ffv2xl2d0k0w71jf0i5ayf97ymxly8ii8s0c"; + version = "0.6"; + sha256 = "1lqc1w40mzj5gvpd3gc4qwgz3zrivwkz6ssa5592dsnwz81k1dxk"; isLibrary = true; isExecutable = true; buildDepends = [ - caseInsensitive httpConduit httpTypes lens liftedBase mtl network - optparseApplicative resourcet transformers xmlConduit xmlHamlet + caseInsensitive httpClient httpClientTls httpTypes lens liftedBase + monadControl mtl network optparseApplicative transformers + transformersBase xmlConduit xmlHamlet ]; meta = { homepage = "http://floss.scru.org/hDAV"; diff --git a/pkgs/development/libraries/haskell/HFuse/default.nix b/pkgs/development/libraries/haskell/HFuse/default.nix index 9d37b580d802..2012739afb45 100644 --- a/pkgs/development/libraries/haskell/HFuse/default.nix +++ b/pkgs/development/libraries/haskell/HFuse/default.nix @@ -18,7 +18,7 @@ cabal.mkDerivation (self: { homepage = "https://github.com/toothbrush/hfuse"; description = "HFuse is a binding for the Linux FUSE library"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; + platforms = self.stdenv.lib.platforms.linux; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.9.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.10.nix index 4ab03112189c..c893d2f1e750 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.9.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.10.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "HTTP"; - version = "4000.2.9"; - sha256 = "0fnf4blh7gw0cbap16ss811wr0haa2gqd0gzdbz668jk58n1gmz7"; + version = "4000.2.10"; + sha256 = "1l97l6am45xgyg0dyxpfgbxc00wp8ishm7spd0hbgmwc5sgnvppg"; buildDepends = [ mtl network parsec ]; testDepends = [ caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix index eb7c406e81e4..d7736a5d9b9a 100644 --- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix +++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HsOpenSSL"; - version = "0.10.3.5"; - sha256 = "1yvpvc9ylfqskdv0dqg6cl43w3wg7rggz0lwlrv04a45mrxygh80"; + version = "0.10.3.6"; + sha256 = "0h2q9isbrfvsyr4yzcv7y0vd3gha8ym67l4sn7zlz39n376i2z10"; buildDepends = [ network time ]; extraLibraries = [ openssl ]; meta = { 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 ]; diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix index d8e1e0c6f429..a9723721e1e9 100644 --- a/pkgs/development/libraries/haskell/ListLike/default.nix +++ b/pkgs/development/libraries/haskell/ListLike/default.nix @@ -2,10 +2,11 @@ cabal.mkDerivation (self: { pname = "ListLike"; - version = "4.0.1"; - sha256 = "1ny6h3f1l0gigyv2rs24s7w158vsflrdx4i9v1al4910cxh56awv"; + version = "4.0.2"; + sha256 = "1ggh8yndnsmccgsl11fia4v2cad0vq3clibgh0311r3c43mwvnah"; 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"; diff --git a/pkgs/development/libraries/haskell/OpenAL/default.nix b/pkgs/development/libraries/haskell/OpenAL/default.nix index a04aea993fa2..36d3b41583fb 100644 --- a/pkgs/development/libraries/haskell/OpenAL/default.nix +++ b/pkgs/development/libraries/haskell/OpenAL/default.nix @@ -1,13 +1,13 @@ -{ cabal, ObjectName, openal, StateVar, Tensor }: +{ cabal, openal, OpenGL }: cabal.mkDerivation (self: { pname = "OpenAL"; - version = "1.4.0.2"; - sha256 = "19q4pd5i2w330qh895z0cgim4m4f4gxqf4ya1192fchqmgcz1svz"; - buildDepends = [ ObjectName StateVar Tensor ]; + version = "1.6.0.0"; + sha256 = "0bw20ykn8vi3g4im4nsrfz7p1qq9qwnx8da83zwdbr3wjm9934gd"; + buildDepends = [ OpenGL ]; extraLibraries = [ openal ]; meta = { - homepage = "http://connect.creativelabs.com/openal/"; + homepage = "https://github.com/haskell-openal/ALUT"; description = "A binding to the OpenAL cross-platform 3D audio API"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/alsa-core/default.nix b/pkgs/development/libraries/haskell/alsa-core/default.nix index 140d554e88c6..f38082fba88b 100644 --- a/pkgs/development/libraries/haskell/alsa-core/default.nix +++ b/pkgs/development/libraries/haskell/alsa-core/default.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Binding to the ALSA Library API (Exceptions)"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; + platforms = self.stdenv.lib.platforms.linux; }; }) diff --git a/pkgs/development/libraries/haskell/alsa-pcm/default.nix b/pkgs/development/libraries/haskell/alsa-pcm/default.nix index 3d1091f27027..39123a176dc7 100644 --- a/pkgs/development/libraries/haskell/alsa-pcm/default.nix +++ b/pkgs/development/libraries/haskell/alsa-pcm/default.nix @@ -16,6 +16,6 @@ cabal.mkDerivation (self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Binding to the ALSA Library API (PCM audio)"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; + platforms = self.stdenv.lib.platforms.linux; }; }) diff --git a/pkgs/development/libraries/haskell/ansi-terminal/default.nix b/pkgs/development/libraries/haskell/ansi-terminal/default.nix index 6d598f29ec95..2e9b1c0c25f4 100644 --- a/pkgs/development/libraries/haskell/ansi-terminal/default.nix +++ b/pkgs/development/libraries/haskell/ansi-terminal/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "ansi-terminal"; - version = "0.6"; - sha256 = "0a5zrq80yrj48s2cm8lns06p6wwnz72vs2wy0ryp0gw6rrg50fkg"; + version = "0.6.1"; + sha256 = "0ncghc0z2xkfn1hfvyl0haf4mia9lhjbiqda11nxkqqfxdyklb2j"; isLibrary = true; isExecutable = true; meta = { - homepage = "http://batterseapower.github.com/ansi-terminal"; + homepage = "https://github.com/feuerbach/ansi-terminal"; description = "Simple ANSI terminal support, with Windows compatibility"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/assert-failure/default.nix b/pkgs/development/libraries/haskell/assert-failure/default.nix new file mode 100644 index 000000000000..abc520e7b4ba --- /dev/null +++ b/pkgs/development/libraries/haskell/assert-failure/default.nix @@ -0,0 +1,14 @@ +{ cabal, prettyShow, text }: + +cabal.mkDerivation (self: { + pname = "assert-failure"; + version = "0.1"; + sha256 = "1xwd6rhka9gzmldkaw3d7262h51wxw9dwgip39q8pjkvvfs5kwkr"; + buildDepends = [ prettyShow text ]; + meta = { + homepage = "https://github.com/Mikolaj/assert-failure"; + description = "Syntactic sugar improving 'assert' and 'error'"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/async/2.0.1.5.nix b/pkgs/development/libraries/haskell/async/2.0.1.5.nix new file mode 100644 index 000000000000..d3340fb3678a --- /dev/null +++ b/pkgs/development/libraries/haskell/async/2.0.1.5.nix @@ -0,0 +1,17 @@ +{ cabal, HUnit, stm, testFramework, testFrameworkHunit }: + +cabal.mkDerivation (self: { + pname = "async"; + version = "2.0.1.5"; + sha256 = "0g587b64zgn971qb2lh846ihg4z89037f18821kyaqsgixasq4yd"; + buildDepends = [ stm ]; + testDepends = [ HUnit testFramework testFrameworkHunit ]; + jailbreak = true; + meta = { + homepage = "https://github.com/simonmar/async"; + description = "Run IO operations asynchronously and wait for their results"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) 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 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"; 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"; 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 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 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 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/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index 1814ab99784a..7678849930e4 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.7"; + sha256 = "0mhsj27vynilpmwxgdpb3r383rksrqs9ix15zl2xbhc95a815pfl"; isLibrary = true; isExecutable = true; buildDepends = [ filepath transformers ]; 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"; 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"; diff --git a/pkgs/development/libraries/haskell/cufft/default.nix b/pkgs/development/libraries/haskell/cufft/default.nix index 5caec8341392..df9f686383e1 100644 --- a/pkgs/development/libraries/haskell/cufft/default.nix +++ b/pkgs/development/libraries/haskell/cufft/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cufft"; - version = "0.1.0.1"; - sha256 = "0j1rsixl48z8xszym9s3rw4pwq4s5bz6inqkfsq726gni0nlm8vx"; + version = "0.1.0.3"; + sha256 = "1jj1ixacmhwjcb2syv4fglawpya5vmdhdk2xqrw4wwfxw4wc9ypi"; buildDepends = [ cuda ]; buildTools = [ c2hs ]; meta = { @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Haskell bindings for the CUFFT library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/data-memocombinators/default.nix b/pkgs/development/libraries/haskell/data-memocombinators/default.nix index df6777313264..3bdaf941c837 100644 --- a/pkgs/development/libraries/haskell/data-memocombinators/default.nix +++ b/pkgs/development/libraries/haskell/data-memocombinators/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "data-memocombinators"; - version = "0.5.0"; - sha256 = "1kh2xj1z68gig8y5fqfwaha0mcd41laa2di9x2hryjwdgzswxy74"; + version = "0.5.1"; + sha256 = "1mvfc1xri3kgkx5q7za01bqg1x3bfvbgcffw5vwl6jmq4hh1sd5l"; buildDepends = [ dataInttrie ]; meta = { homepage = "http://github.com/luqui/data-memocombinators"; 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 ]; 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"; diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix index 1d3f31e55688..43f0c4337e74 100644 --- a/pkgs/development/libraries/haskell/digestive-functors/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix @@ -1,15 +1,15 @@ { cabal, HUnit, mtl, QuickCheck, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2, text +, testFrameworkQuickcheck2, text, time }: cabal.mkDerivation (self: { pname = "digestive-functors"; - version = "0.6.1.0"; - sha256 = "0p38q8xz01vjn1mf718xi5ny3i7z9zd00lnnybmd6zy03laq4a2d"; - buildDepends = [ mtl text ]; + version = "0.6.2.0"; + sha256 = "1d07ws5s34x9sviq7mfkl6fh1rl28r5x1rmgbkcxil5h6gxn5mi7"; + buildDepends = [ mtl text time ]; testDepends = [ HUnit mtl QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 text + testFrameworkQuickcheck2 text time ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/enummapset-th/default.nix b/pkgs/development/libraries/haskell/enummapset-th/default.nix new file mode 100644 index 000000000000..a675d4d74ea6 --- /dev/null +++ b/pkgs/development/libraries/haskell/enummapset-th/default.nix @@ -0,0 +1,14 @@ +{ cabal, deepseq }: + +cabal.mkDerivation (self: { + pname = "enummapset-th"; + version = "0.6.0.1"; + sha256 = "1v12pfj6k8av58sh6siwzspf2dnbcapmrzfpg2p4yz3bdkc70hh8"; + buildDepends = [ deepseq ]; + meta = { + homepage = "https://github.com/liyang/enummapset-th"; + description = "TH-generated EnumSet/EnumMap wrappers around IntSet/IntMap"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) 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/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 = { 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"; diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index fb3ccb8e50ec..472d25790481 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -17,7 +17,6 @@ cabal.mkDerivation (self: { ioChoice syb time transformers ]; buildTools = [ emacs ]; - doCheck = false; postInstall = '' cd $out/share/$pname-$version make @@ -25,12 +24,12 @@ cabal.mkDerivation (self: { cd .. ensureDir "$out/share/emacs" mv $pname-$version emacs/site-lisp - mv $out/bin/ghc-mod $out/ghc-mod + mv $out/bin/ghc-mod $out/bin/.ghc-mod-wrapped cat - > $out/bin/ghc-mod <<EOF - #!/bin/sh + #! ${self.stdenv.shell} COMMAND=\$1 shift - eval exec $out/ghc-mod \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@" + eval exec $out/bin/.ghc-mod-wrapped \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@" EOF chmod +x $out/bin/ghc-mod ''; 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 diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix index 5a45e48bdc7b..74368defc9c8 100644 --- a/pkgs/development/libraries/haskell/github/default.nix +++ b/pkgs/development/libraries/haskell/github/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { hashable HTTP httpConduit httpTypes network text time unorderedContainers vector ]; + patches = [ ./fix-build.patch ]; jailbreak = true; meta = { homepage = "https://github.com/fpco/github"; diff --git a/pkgs/development/libraries/haskell/github/fix-build.patch b/pkgs/development/libraries/haskell/github/fix-build.patch new file mode 100644 index 000000000000..2d3483b38ec1 --- /dev/null +++ b/pkgs/development/libraries/haskell/github/fix-build.patch @@ -0,0 +1,13 @@ +diff -ubr github-0.7.2-orig/Github/Private.hs github-0.7.2/Github/Private.hs +--- github-0.7.2-orig/Github/Private.hs 2013-12-15 19:45:00.611789227 +0100 ++++ github-0.7.2/Github/Private.hs 2013-12-15 19:45:46.359954006 +0100 +@@ -104,9 +104,6 @@ + in Just (Data.List.takeWhile (/= '>') s') + else Nothing + +-doHttps :: Method -> String -> Maybe GithubAuth +- -> Maybe (RequestBody (ResourceT IO)) +- -> IO (Either E.SomeException (Response LBS.ByteString)) + doHttps reqMethod url auth body = do + let reqBody = fromMaybe (RequestBodyBS $ BS.pack "") body + reqHeaders = maybe [] getOAuth auth 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 ]; diff --git a/pkgs/development/libraries/haskell/gloss-accelerate/default.nix b/pkgs/development/libraries/haskell/gloss-accelerate/default.nix index c4a31d541b58..2c53925f975d 100644 --- a/pkgs/development/libraries/haskell/gloss-accelerate/default.nix +++ b/pkgs/development/libraries/haskell/gloss-accelerate/default.nix @@ -9,5 +9,6 @@ cabal.mkDerivation (self: { description = "Extras to interface Gloss and Accelerate"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix b/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix index 7ed70bc092cf..db5b62169c40 100644 --- a/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix +++ b/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix @@ -9,5 +9,6 @@ cabal.mkDerivation (self: { description = "Parallel rendering of raster images using Accelerate"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) 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"; 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 ]; diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix index 7e6619d4f357..bac417b618b5 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.3"; + sha256 = "0vh88qkvlljqviy5mqjz8gbpwnl2wq65c2rm9kyjnc2cpyp4i8zx"; buildDepends = [ aeson Cabal dataLens dataLensTemplate filepath haskellPackages haskellSrcExts hseCpp mtl tagged transformers traverseWithClass 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/"; 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 diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index 87d5181fa7de..89a6622cf1ce 100644 --- a/pkgs/development/libraries/haskell/hledger-lib/default.nix +++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix @@ -1,20 +1,20 @@ -{ cabal, cmdargs, csv, filepath, HUnit, mtl, parsec, prettyShow -, regexCompat, regexpr, safe, split, testFramework +{ cabal, cmdargs, csv, dataPprint, filepath, HUnit, mtl, parsec +, prettyShow, regexCompatTdfa, regexpr, safe, split, testFramework , testFrameworkHunit, time, transformers, utf8String }: cabal.mkDerivation (self: { pname = "hledger-lib"; - version = "0.21.3"; - sha256 = "1vvki1dg98f8r9w6gmblazkbin7g2hzifwqd1frb0a3kp869i870"; + version = "0.22"; + sha256 = "059dbwmafwy25pbr9311lknhyjlycdhhal4ng9i56bgd334l2wx3"; buildDepends = [ - cmdargs csv filepath HUnit mtl parsec prettyShow regexCompat - regexpr safe split time transformers utf8String + cmdargs csv dataPprint filepath HUnit mtl parsec prettyShow + regexCompatTdfa regexpr safe split time transformers utf8String ]; testDepends = [ - cmdargs csv filepath HUnit mtl parsec prettyShow regexCompat - regexpr safe split testFramework testFrameworkHunit time - transformers + cmdargs csv dataPprint filepath HUnit mtl parsec prettyShow + regexCompatTdfa regexpr safe split testFramework testFrameworkHunit + time transformers ]; meta = { homepage = "http://hledger.org"; diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix index e4dd6ef1faad..f846dba7fc87 100644 --- a/pkgs/development/libraries/haskell/hledger-web/default.nix +++ b/pkgs/development/libraries/haskell/hledger-web/default.nix @@ -1,20 +1,20 @@ { cabal, blazeHtml, blazeMarkup, clientsession, cmdargs , dataDefault, filepath, hamlet, hjsmin, hledger, hledgerLib, hspec -, httpConduit, HUnit, json, networkConduit, parsec, regexpr, safe -, shakespeareText, text, time, transformers, wai, waiExtra -, waiHandlerLaunch, warp, yaml, yesod, yesodCore, yesodStatic -, yesodTest +, httpClient, httpConduit, HUnit, json, networkConduit, parsec +, regexpr, safe, shakespeareText, text, time, transformers, wai +, waiExtra, waiHandlerLaunch, warp, yaml, yesod, yesodCore +, yesodStatic, yesodTest }: cabal.mkDerivation (self: { pname = "hledger-web"; - version = "0.21.3"; - sha256 = "18gil6qwlzfk0y0f9q1la5np5phi0h3nqlb8rwn9qjjgvs134jgy"; + version = "0.22"; + sha256 = "0bd1cb6988ainkzi034a4g4xnslqc6djv74gbq58aaxjqn4m7m80"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml blazeMarkup clientsession cmdargs dataDefault filepath - hamlet hjsmin hledger hledgerLib httpConduit HUnit json + hamlet hjsmin hledger hledgerLib httpClient httpConduit HUnit json networkConduit parsec regexpr safe shakespeareText text time transformers wai waiExtra waiHandlerLaunch warp yaml yesod yesodCore yesodStatic diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix index 36012251e077..47a5ed381f6b 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -1,23 +1,24 @@ -{ cabal, cmdargs, csv, filepath, haskeline, hledgerLib, HUnit, mtl -, parsec, prettyShow, regexCompat, regexpr, safe, shakespeareText -, split, testFramework, testFrameworkHunit, text, time -, transformers, utf8String +{ cabal, cmdargs, csv, dataPprint, filepath, haskeline, hledgerLib +, HUnit, mtl, parsec, prettyShow, regexCompatTdfa, regexpr, safe +, shakespeareText, split, tabular, testFramework +, testFrameworkHunit, text, time, transformers, utf8String }: cabal.mkDerivation (self: { pname = "hledger"; - version = "0.21.3"; - sha256 = "14j0axlq6xfaih7m6lqpis26ya0yl4v6g6xrqbihmjddvx7j32f2"; + version = "0.22"; + sha256 = "1fwi1a2nvhfjinif7gy7rv00gn7kazwzmhsskpim2a7bg99sfxb9"; isLibrary = true; isExecutable = true; buildDepends = [ - cmdargs filepath haskeline hledgerLib HUnit mtl parsec regexpr safe - shakespeareText split text time utf8String + cmdargs dataPprint filepath haskeline hledgerLib HUnit mtl parsec + regexpr safe shakespeareText split tabular text time utf8String ]; testDepends = [ - cmdargs csv filepath haskeline hledgerLib HUnit mtl parsec - prettyShow regexCompat regexpr safe shakespeareText split - testFramework testFrameworkHunit text time transformers + cmdargs csv dataPprint filepath haskeline hledgerLib HUnit mtl + parsec prettyShow regexCompatTdfa regexpr safe shakespeareText + split tabular testFramework testFrameworkHunit text time + transformers ]; meta = { homepage = "http://hledger.org"; diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index 498e71d06d1e..b461b5a1fd41 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.26"; + sha256 = "07nc58vqdj5x3h6d7z8ilbff0pkqd3r7g789xyaalnh6wjkd7380"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -16,9 +15,8 @@ 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 ]; + doCheck = false; meta = { homepage = "http://www.haskell.org/hoogle/"; description = "Haskell API Search"; 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; 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 = [ 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 = [ 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..1c47b68f06ce --- /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.1"; + sha256 = "0fy9vkxh7hvmp9ijifq8nx6y5y92n6d3s1vdyg53ln65pclc6jn5"; + 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..f0b28ab16124 --- /dev/null +++ b/pkgs/development/libraries/haskell/http-client-tls/default.nix @@ -0,0 +1,18 @@ +{ cabal, connection, dataDefault, hspec, httpClient, httpTypes +, network, tls +}: + +cabal.mkDerivation (self: { + pname = "http-client-tls"; + version = "0.2.0.1"; + sha256 = "0wzbxah6pkglpgl4ax12crw3cl8w48b8pbasb3xkbqcxpaakvbkx"; + 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"; + 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..221d82033bc5 --- /dev/null +++ b/pkgs/development/libraries/haskell/http-client/default.nix @@ -0,0 +1,28 @@ +{ 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.3"; + sha256 = "0dy0nf92404hlg4f4zifx6b1qs5wadgky7snqrizl5kk5af43i4h"; + 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 + ]; + 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"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index f0c559839e05..bb237f16d587 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -1,32 +1,32 @@ { 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.3"; + sha256 = "1s3nyc3wwpqildhmkv5fps2a0552yrnwcqjv4bxcvg581k5sj42i"; 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 ]; + doCheck = false; meta = { homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index a4f458f83953..a8e0afc786ea 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -1,22 +1,23 @@ { 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 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"; 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 = { diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix index f4774ecd14b0..94eb72633de3 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/default.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "language-c-quote"; - version = "0.7.5"; - sha256 = "1ms6bjcqm0mfv0kqznn68svclbpvbwy5rlni0b8i0axhwfgq1l73"; + version = "0.7.6"; + sha256 = "15sfasbrr9wzqkwv9xg9nvb3gnn4drkll3b3cappiyzkmawp2hkr"; buildDepends = [ exceptionMtl exceptionTransformers filepath haskellSrcMeta mainlandPretty mtl srcloc syb symbol 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 ]; 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 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 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 diff --git a/pkgs/development/libraries/haskell/mainland-pretty/default.nix b/pkgs/development/libraries/haskell/mainland-pretty/default.nix index 2bcf2037cbeb..60990d2dbcac 100644 --- a/pkgs/development/libraries/haskell/mainland-pretty/default.nix +++ b/pkgs/development/libraries/haskell/mainland-pretty/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "mainland-pretty"; - version = "0.2.6"; - sha256 = "1mjw79jg0vq8qvgvjdinidw1pvfj3mych3z0f6g031vmqz7fqvzy"; + version = "0.2.7"; + sha256 = "1g4s2xscj6dpkcghs5lws658ki0rhriivpdr5ilcycvr28k3l35q"; buildDepends = [ srcloc text ]; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; diff --git a/pkgs/development/libraries/haskell/markdown-unlit/default.nix b/pkgs/development/libraries/haskell/markdown-unlit/default.nix index 06c1b9e2fcae..e09feb10d905 100644 --- a/pkgs/development/libraries/haskell/markdown-unlit/default.nix +++ b/pkgs/development/libraries/haskell/markdown-unlit/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; testDepends = [ hspec QuickCheck silently stringbuilder ]; + noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.4"; meta = { description = "Literate Haskell support for Markdown"; license = self.stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix index 691029ac5de2..4f7353dfdb6f 100644 --- a/pkgs/development/libraries/haskell/mime-mail/default.nix +++ b/pkgs/development/libraries/haskell/mime-mail/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "mime-mail"; - version = "0.4.2.1"; - sha256 = "1rpxx90k4dgz1b5ss6vqqgd9n1hjrv09q20myy16zzlj1gmn8k3g"; + version = "0.4.3"; + sha256 = "0xh6j4vdg2ispr9f41s8pvx5rb08zqapkqxyvykvjg2ibmczzg4f"; buildDepends = [ base64Bytestring blazeBuilder filepath random text ]; diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix index 0b92ca0bb903..afd968227103 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.2"; + sha256 = "0s75q974q6jwp89xj5kkqziy4crm9484dqvrpgd8ms7rw613jjz6"; buildDepends = [ conduit fastLogger liftedBase monadControl monadLoops mtl resourcet stm stmChans text transformers transformersBase diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.5.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix index 58cbb522fa24..911d984a88c0 100644 --- a/pkgs/development/libraries/haskell/monad-par/0.3.4.5.nix +++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "monad-par"; - version = "0.3.4.5"; - sha256 = "0xwjx3l9ssyxaa49v8kz7ic54va1qy6dqa1z5gvww7a5gw1ll81p"; + version = "0.3.4.6"; + sha256 = "1k345fpq31jg0mvfk8ap03wscnx8dvlp65gr567vai9ym1ahk6zy"; buildDepends = [ abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom parallel diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index b5ccc95bd3fd..b42fc3633f09 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 = [ @@ -26,6 +26,7 @@ cabal.mkDerivation (self: { testFrameworkQuickcheck2 text ]; buildTools = [ alex happy ]; + jailbreak = true; doCheck = false; meta = { homepage = "http://johnmacfarlane.net/pandoc"; 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/development/libraries/haskell/parsers/0.10.1.1.nix b/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/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 = { diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index c3bb228933d3..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.4"; - sha256 = "0lhqv4mcai9r5mzj5h6fsd1hd8mv1458id0rb6q157192gywxhzf"; + version = "1.2.0.6"; + sha256 = "1vkrxf2dabk9z0igfbvb2ib2bxcxi5af2vpxllv74cbjz9r6ip3s"; buildDepends = [ aeson monadControl monadLogger persistent text transformers ]; diff --git a/pkgs/development/libraries/haskell/pretty-show/1.6.1.nix b/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/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"; 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 diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index b4d0fccd8a0b..913e77483e44 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "resourcet"; - version = "0.4.9"; - sha256 = "1jpaphmwvykjshjqwmmyfx64w1j99f6dphy9ygrzc32fjffk5laz"; + version = "0.4.10"; + sha256 = "0mgwcgacf4ilyh54s862p8jqv1f42dkp287sdkpswyai1pxlvipz"; buildDepends = [ liftedBase mmorph monadControl mtl transformers transformersBase ]; diff --git a/pkgs/development/libraries/haskell/scientific/default.nix b/pkgs/development/libraries/haskell/scientific/default.nix index 42d1c4b86122..8494168df15d 100644 --- a/pkgs/development/libraries/haskell/scientific/default.nix +++ b/pkgs/development/libraries/haskell/scientific/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "scientific"; - version = "0.1.0.0"; - sha256 = "1x3c8z1d7nhr1z5dlbs60pxfrgclfbwjhrkpvr0jnz0fpy2m9x5r"; + version = "0.1.0.1"; + sha256 = "0s401gxwap4xwz9rxypc76rs5w344s3an45295ybf3id6yal5140"; buildDepends = [ deepseq hashable text ]; testDepends = [ smallcheck tasty tastySmallcheck text ]; doCheck = false; diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix index ad932df1ac79..d72aed42852f 100644 --- a/pkgs/development/libraries/haskell/scotty/default.nix +++ b/pkgs/development/libraries/haskell/scotty/default.nix @@ -1,18 +1,18 @@ { cabal, aeson, blazeBuilder, caseInsensitive, conduit, dataDefault -, httpTypes, mtl, regexCompat, resourcet, text, transformers, wai -, waiExtra, warp +, httpTypes, mtl, regexCompat, text, transformers, wai, waiExtra +, warp }: cabal.mkDerivation (self: { pname = "scotty"; - version = "0.5.0"; - sha256 = "177c7nyjwksm2y98j2swgzfn1rmr2h0v4fk6s525kx803iibvfhc"; + version = "0.6.1"; + sha256 = "1fcrd1fxlmgkm9d6xfyb76pmn68pgk0a367lpmyh77kp0zr3f7ib"; buildDepends = [ aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes - mtl regexCompat resourcet text transformers wai waiExtra warp + mtl regexCompat 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; 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/"; diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 03b6b057cd1e..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.4"; - sha256 = "12f2b69grxpwk56b2d7idlg8axqfgzn0rn3m56r1hcpvkjbynlc4"; + version = "1.0.6.6"; + sha256 = "1xjavlw88nj5ila2b4m44zj0qgkpq147b30x1arwv0ik8szgml9k"; buildDepends = [ parsec shakespeare text transformers ]; testDepends = [ hspec HUnit shakespeare text ]; meta = { 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 = { 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 = { 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 diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix index df2517a01ace..e81a8872f7ac 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.1"; + sha256 = "1ygrabxh40bym3grnzqyfqn96lirnxspb8cmwkkr213239y605sd"; buildDepends = [ logict mtl ]; meta = { homepage = "https://github.com/feuerbach/smallcheck"; 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 = [ diff --git a/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix b/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix index 838f45eccaad..8a9a594e45d7 100644 --- a/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix +++ b/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "snaplet-acid-state"; - version = "0.2.5"; - sha256 = "0qx6as1m0fwb5fkhvl0k71kx65njwq0dk183xi4gmdzhf83hkjbs"; + version = "0.2.6"; + sha256 = "005c4x7sh820iar69rany3hv4rlbzpsd4yqd2x2v3jql9z55k4s9"; buildDepends = [ acidState snap text ]; meta = { homepage = "https://github.com/mightybyte/snaplet-acid-state"; diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix index 74646c9acca4..c430dfc36a66 100644 --- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix +++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "stylish-haskell"; - version = "0.5.8.0"; - sha256 = "1wjrn4cq47jjmqkb2zv02x90l2mv6n7zh4mvcav25s9bwvvca10r"; + version = "0.5.9.0"; + sha256 = "1iy0d437yd6hgmxmiqa0b6lvg4gw838jxqwn83kdpy1mlykqwmgq"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix index baabf323723c..4d90d51fceb9 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.4"; + sha256 = "09qgakwqaqgppplxybkgyhyryxrw1pwlgkiqpixrqqhjans3z0hn"; 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 ]; 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 ]; diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index c2c05a68f075..6ba25cdc99b2 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.5.2.1"; + sha256 = "0dph1c0j2vjvzf5csp6hwlcx2zqa12yqrafk6pxs8bnd3r9a11ym"; buildDepends = [ ansiTerminal deepseq mtl optparseApplicative regexPosix stm tagged ]; 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/development/libraries/haskell/th-lift/default.nix b/pkgs/development/libraries/haskell/th-lift/default.nix index c479955db645..c10feac4ba68 100644 --- a/pkgs/development/libraries/haskell/th-lift/default.nix +++ b/pkgs/development/libraries/haskell/th-lift/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "th-lift"; - version = "0.5.6"; - sha256 = "128rbpqbm4fgn1glbv8bvlqnvn2wvca7wj08xri25w3bikmfy2z4"; + version = "0.6"; + sha256 = "0nsxrmilp2g0nx4s9iigj2llza6phphcfr4j9gvmqmx6kf2z9vns"; meta = { description = "Derive Template Haskell's Lift class for datatypes"; license = "unknown"; diff --git a/pkgs/development/libraries/haskell/th-orphans/default.nix b/pkgs/development/libraries/haskell/th-orphans/default.nix index 9196e9ef76b2..dd9fbc198bff 100644 --- a/pkgs/development/libraries/haskell/th-orphans/default.nix +++ b/pkgs/development/libraries/haskell/th-orphans/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.8"; sha256 = "0kzzcicn6pggvvblhbrs3vh0bf71izlb99lb0f5qww7ymi4smldr"; buildDepends = [ thLift ]; + jailbreak = true; meta = { description = "Orphan instances for TH datatypes"; license = self.stdenv.lib.licenses.bsd3; 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 = { 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 = { 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"; diff --git a/pkgs/development/libraries/haskell/vty-ui/default.nix b/pkgs/development/libraries/haskell/vty-ui/default.nix index 3b38db8c1de4..ad3ab7823c0e 100644 --- a/pkgs/development/libraries/haskell/vty-ui/default.nix +++ b/pkgs/development/libraries/haskell/vty-ui/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "vty-ui"; - version = "1.6"; - sha256 = "0chwgzzk2pl9kppd9r6h2azbqc668xpdrrk5y415yi8wcw61s0bc"; + version = "1.6.1"; + sha256 = "013a4wlhrhsbkh9wd8dxppn9aa0l7cfrgn3na6cifry34d96ql9d"; 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 d88eb2df0bc9..8f2c6ebb342c 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 = "1.3.3"; - sha256 = "0lsqfvlh65rggp9z6m5gyx8gv0wk3b44jrk57s8yj2bh74pbr64f"; + version = "2.0.0.2"; + sha256 = "0d9afs50r08k9zgz7vvh7fvamcvhm8hf4qxca4w0xi7pcj1vql0r"; 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 = [ diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 7e3424713e0d..c6f8752f8b00 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.1"; + sha256 = "0asjd7v1zdbs1rixqanwwn4n5b417gj48nv2qva6pfj09hs5dzhh"; 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"; 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 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 = { 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 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 ]; 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 diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 100dbbd7024e..04fb88de0d6b 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -1,24 +1,25 @@ { 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.1"; + sha256 = "1sgsiw75xm3b1bv0cnpkx6vn6k0r1an3c94xw5bab4h7blb9jk4a"; 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 ]; + doCheck = false; meta = { homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; 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"; 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 ]; 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"; 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 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 = { diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index bdc299939196..d6bab2c5da53 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.1"; + sha256 = "05csxa0mgqnam375fq38r0rl51zdjq0bki2dzrr99469mg33fzh4"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index c93c76ee3fab..851d152eac56 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.2"; + sha256 = "00n957gbq03qrbwxa29hpqkmyfnbr7n4bah4185rpjdvnywq3l8x"; 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/"; diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 789d158fa6c5..3a8bbb2cdf73 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.2"; + sha256 = "11q70zc837d0sdwgh8c60pv1x4zki2klamcr5vw5zsjj0qsb9pby"; 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 diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index c26d88b50807..936c4ab741b6 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.4"; - sha256 = "1ajdbr7lz6jxh5r0iapc7c70pmyrac8rw8qzv4vh8lbvmx0z4ck4"; + version = "1.3.4.1"; + sha256 = "01h9k7qwp26i57akbm9236r8gbil4mh2317caa4bcva7m1dclvpj"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent resourcet 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 diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix index 7d56ca1142cd..e17ed799c0e1 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.2"; + sha256 = "0pvdaz860zlgizdrsjm4v1vsx0bvcmilz0si0skrx980gysxd0nn"; 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 diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index 4cbb865c9069..1c2922fe069c 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.4"; + sha256 = "1c3fpfvcdx8ijvjxxfjwld5zl6x4xl2587a8gdj2qmsr94f8lgb9"; buildDepends = [ pathPieces text vector ]; testDepends = [ hspec HUnit pathPieces text ]; meta = { 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 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 diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix index bddf09bc405d..bfe648f449b0 100644 --- a/pkgs/development/libraries/haskell/zip-archive/default.nix +++ b/pkgs/development/libraries/haskell/zip-archive/default.nix @@ -1,14 +1,12 @@ -{ cabal, binary, digest, filepath, HUnit, mtl, time, utf8String -, zlib -}: +{ cabal, binary, digest, filepath, HUnit, mtl, text, time, zlib }: cabal.mkDerivation (self: { pname = "zip-archive"; - version = "0.1.4"; - sha256 = "0ipk8gwa2k8iqg2gg4lbawr8l9sjwhy2p7b8qxazpq0i88dyy3lb"; + version = "0.2"; + sha256 = "0d2n8mgfikyjzc4x7qm3vvpmhhf3mva9f0q6p9l1q9b7dlf8vmdv"; isLibrary = true; isExecutable = true; - buildDepends = [ binary digest filepath mtl time utf8String zlib ]; + buildDepends = [ binary digest filepath mtl text time zlib ]; testDepends = [ HUnit time ]; doCheck = false; meta = { |