diff options
Diffstat (limited to 'pkgs/development/libraries')
56 files changed, 344 insertions, 192 deletions
diff --git a/pkgs/development/libraries/haskell/BoundedChan/default.nix b/pkgs/development/libraries/haskell/BoundedChan/default.nix new file mode 100644 index 000000000000..0ce294c2258c --- /dev/null +++ b/pkgs/development/libraries/haskell/BoundedChan/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "BoundedChan"; + version = "1.0.1.0"; + sha256 = "1v4lmp3j8lzk1m2pv5l90j80y0c6yxm6gb1ww9ffsz2jxfzz8vd8"; + meta = { + description = "Implementation of bounded channels"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/MFlow/default.nix b/pkgs/development/libraries/haskell/MFlow/default.nix index def50e8e7dbd..fe96af2de9e5 100644 --- a/pkgs/development/libraries/haskell/MFlow/default.nix +++ b/pkgs/development/libraries/haskell/MFlow/default.nix @@ -1,7 +1,8 @@ { cabal, blazeHtml, blazeMarkup, caseInsensitive, clientsession -, conduit, conduitExtra, cpphs, extensibleExceptions, httpTypes, monadloc -, mtl, parsec, random, RefSerialize, stm, TCache, text, time -, transformers, utf8String, vector, wai, warp, warpTls, Workflow +, conduit, conduitExtra, cpphs, extensibleExceptions, httpTypes +, monadloc, mtl, parsec, random, RefSerialize, stm, TCache, text +, time, transformers, utf8String, vector, wai, warp, warpTls +, Workflow }: cabal.mkDerivation (self: { @@ -10,10 +11,11 @@ cabal.mkDerivation (self: { sha256 = "1ih9ni14xmqvcfvayjkggmpmw3s9yzp17gf4xzygldmjcs35j4n3"; buildDepends = [ blazeHtml blazeMarkup caseInsensitive clientsession conduit - conduitExtra cpphs extensibleExceptions httpTypes monadloc mtl parsec + conduitExtra extensibleExceptions httpTypes monadloc mtl parsec random RefSerialize stm TCache text time transformers utf8String vector wai warp warpTls Workflow ]; + buildTools = [ cpphs ]; meta = { description = "stateful, RESTful web framework"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/aeson-qq/default.nix b/pkgs/development/libraries/haskell/aeson-qq/default.nix index 1da43428f127..36cb42d0b7fc 100644 --- a/pkgs/development/libraries/haskell/aeson-qq/default.nix +++ b/pkgs/development/libraries/haskell/aeson-qq/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "aeson-qq"; - version = "0.7.0"; - sha256 = "1sq34pnwiyf5lngqph4m463ijr185akzbrdi3i40zmqlrymssv3c"; + version = "0.7.1"; + sha256 = "1b2ham1h6mlm49ax9k2agf8yymbgkk094nq2apn703i2d9v00im6"; buildDepends = [ aeson haskellSrcMeta parsec text vector ]; testDepends = [ aeson hspec ]; meta = { diff --git a/pkgs/development/libraries/haskell/attoparsec/0.12.0.0.nix b/pkgs/development/libraries/haskell/attoparsec/0.12.1.0.nix index 6fd32736c4d8..72a58b1cce65 100644 --- a/pkgs/development/libraries/haskell/attoparsec/0.12.0.0.nix +++ b/pkgs/development/libraries/haskell/attoparsec/0.12.1.0.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "attoparsec"; - version = "0.12.0.0"; - sha256 = "04wdb2i2yqybkfnjs3f25nf7xz1nq5sn8z23klbm4xnqaiajmkmr"; + version = "0.12.1.0"; + sha256 = "1y7sikk5hg9yj3mn21k026ni6lznsih0lx03rgdz4gmb6aqh54bn"; buildDepends = [ deepseq scientific text ]; testDepends = [ deepseq QuickCheck scientific testFramework diff --git a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix index f751126f142a..d08edb48b0ed 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-builder-enumerator"; - version = "0.2.0.5"; - sha256 = "0bbbv9wwzw9ss3d02mszdzxzhg6pcrnpwir9bvby7xkmfqpyffaa"; + version = "0.2.0.6"; + sha256 = "0pdw18drvikb465qh43b8wjyvpqj3wcilyczc21fri5ma4mxdkyp"; buildDepends = [ blazeBuilder enumerator transformers ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/cabal-cargs/default.nix b/pkgs/development/libraries/haskell/cabal-cargs/default.nix index 34759c9b8926..9ba31d333bb6 100644 --- a/pkgs/development/libraries/haskell/cabal-cargs/default.nix +++ b/pkgs/development/libraries/haskell/cabal-cargs/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "cabal-cargs"; - version = "0.6.1"; - sha256 = "1bf903kgs16f054crwq0yyp6ijch80qn3d5ksy4j0fnyxxrdqvsa"; + version = "0.7"; + sha256 = "1dzmvwmb9sxwdgkzszhk9d5qvq2alnqmprx83dlb17sdi6f9jns1"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/cabal-lenses/default.nix b/pkgs/development/libraries/haskell/cabal-lenses/default.nix index 39c0eeb1dd16..bd14dd1c0895 100644 --- a/pkgs/development/libraries/haskell/cabal-lenses/default.nix +++ b/pkgs/development/libraries/haskell/cabal-lenses/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cabal-lenses"; - version = "0.1"; - sha256 = "0jss4h7crh7mndl5ghbpziy37cg9i29cc64fgxvxb63hpk0q2m17"; + version = "0.2"; + sha256 = "1wfr4rh7ba1hsvi0v7mzpab7fi5k93lz27v8qdfjqzkyybhjglv4"; buildDepends = [ Cabal lens unorderedContainers ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/crypto-numbers/default.nix b/pkgs/development/libraries/haskell/crypto-numbers/default.nix index 7633c479e7c0..b3f0b205af5b 100644 --- a/pkgs/development/libraries/haskell/crypto-numbers/default.nix +++ b/pkgs/development/libraries/haskell/crypto-numbers/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { byteable cryptoRandom HUnit QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 vector ]; + doCheck = false; meta = { homepage = "http://github.com/vincenthz/hs-crypto-numbers"; description = "Cryptographic numbers: functions and algorithms"; diff --git a/pkgs/development/libraries/haskell/entropy/default.nix b/pkgs/development/libraries/haskell/entropy/default.nix index c92fc584aaf6..5c494f4a45df 100644 --- a/pkgs/development/libraries/haskell/entropy/default.nix +++ b/pkgs/development/libraries/haskell/entropy/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "entropy"; - version = "0.3"; - sha256 = "0b1yx7409xw8jz2rj8695xscjnw4p7y80niq9cbkqrmnqbqnwj2q"; + version = "0.3.2"; + sha256 = "1kk0vmfmfqcsw0pzbii9rvz32fvhvxqpn6p6jw6q2x33z6gm5f9x"; meta = { homepage = "https://github.com/TomMD/entropy"; description = "A platform independent entropy source"; diff --git a/pkgs/development/libraries/haskell/event-list/default.nix b/pkgs/development/libraries/haskell/event-list/default.nix index 16b73d9bfb36..5305cd87d7df 100644 --- a/pkgs/development/libraries/haskell/event-list/default.nix +++ b/pkgs/development/libraries/haskell/event-list/default.nix @@ -1,12 +1,14 @@ -{ cabal, nonNegative, QuickCheck, transformers, utilityHt }: +{ cabal, nonNegative, QuickCheck, random, transformers, utilityHt +}: cabal.mkDerivation (self: { pname = "event-list"; - version = "0.1.0.2"; - sha256 = "01j48871nijhkbqdsfvbvq01yr9b5a056fn03ccgazikfsd368ri"; - isLibrary = true; - isExecutable = true; + version = "0.1.1.1"; + sha256 = "16qrjvn8z2nlpfp3xlgwsg2abn7b33n3z673qs5k6ashfbkdy5ja"; buildDepends = [ nonNegative QuickCheck transformers utilityHt ]; + testDepends = [ + nonNegative QuickCheck random transformers utilityHt + ]; meta = { homepage = "http://code.haskell.org/~thielema/event-list/"; description = "Event lists with relative or absolute time stamps"; diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix index 40a610f2b11d..55437747f8bf 100644 --- a/pkgs/development/libraries/haskell/force-layout/default.nix +++ b/pkgs/development/libraries/haskell/force-layout/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "force-layout"; - version = "0.3.0.4"; - sha256 = "1zgqcz9b86qax1hyl32a1giapvn2wpnb4gcfn8czkcr0m7c2iwdg"; + version = "0.3.0.5"; + sha256 = "01wk8zygw9d3r5dwbycyab82kfk8s05ynnajb6kfjv7i09s9sgcb"; buildDepends = [ dataDefaultClass lens vectorSpace vectorSpacePoints ]; diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix index 40700b52f61d..a15ed9d1c47c 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.2.2"; - sha256 = "0abk76cy9qiblyways1r7jfsj996sj4laawzaz1j9p546plfkbnj"; + version = "0.7.2.3"; + sha256 = "1gl059n85yxksnq8y7i1vrsjdg4al6himzpdmw95v61y59bbs6c2"; buildDepends = [ cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text transformers xdot diff --git a/pkgs/development/libraries/haskell/haskeline/default.nix b/pkgs/development/libraries/haskell/haskeline/default.nix index f813ddc25131..bff64a72f690 100644 --- a/pkgs/development/libraries/haskell/haskeline/default.nix +++ b/pkgs/development/libraries/haskell/haskeline/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "haskeline"; - version = "0.7.1.2"; - sha256 = "178hzal5gqw3rmgijv9ph9xa6d4sld279z4a8cjyx3hv4azciwr4"; + version = "0.7.1.3"; + sha256 = "1bwyfn7y9mi18g7zxz8wxjkld51azlfbxypxbiqdinpm2fdl63mi"; buildDepends = [ filepath terminfo transformers utf8String ]; configureFlags = "-fterminfo"; jailbreak = true; diff --git a/pkgs/development/libraries/haskell/hedis/default.nix b/pkgs/development/libraries/haskell/hedis/default.nix new file mode 100644 index 000000000000..c4e34b2d3612 --- /dev/null +++ b/pkgs/development/libraries/haskell/hedis/default.nix @@ -0,0 +1,22 @@ +{ cabal, attoparsec, BoundedChan, bytestringLexing, HUnit, mtl +, network, resourcePool, testFramework, testFrameworkHunit, time +, vector +}: + +cabal.mkDerivation (self: { + pname = "hedis"; + version = "0.6.5"; + sha256 = "1kn8i49yxms1bpjwpy4m8vyycgi755zvy4zc66w068nmnd1kiykh"; + buildDepends = [ + attoparsec BoundedChan bytestringLexing mtl network resourcePool + time vector + ]; + testDepends = [ HUnit mtl testFramework testFrameworkHunit time ]; + meta = { + homepage = "https://github.com/informatikr/hedis"; + description = "Client library for the Redis datastore: supports full command set, pipelining"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; + doCheck = false; +}) diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index 9c3ed9e778cd..624cc9319812 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -2,6 +2,7 @@ , cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes , parsec, QuickCheck, random, resourcet, safe, shake, tagsoup, text , time, transformers, uniplate, vector, vectorAlgorithms, wai, warp +, fetchurl }: cabal.mkDerivation (self: { @@ -18,6 +19,9 @@ cabal.mkDerivation (self: { ]; testDepends = [ filepath ]; testTarget = "--test-option=--no-net"; + patches = [ (fetchurl { url = "https://github.com/ndmitchell/hoogle/commit/5fc294f2b5412fda107c7700f4d833b52f26184c.diff"; + sha256 = "1fn52g90p2jsy87gf5rqrcg49s8hfwway5hi4v9i2rpg5mzxaq3i"; }) + ]; meta = { homepage = "http://www.haskell.org/hoogle/"; description = "Haskell API Search"; diff --git a/pkgs/development/libraries/haskell/hourglass/default.nix b/pkgs/development/libraries/haskell/hourglass/default.nix index 7a5cf59b3283..f7569ba3fa5c 100644 --- a/pkgs/development/libraries/haskell/hourglass/default.nix +++ b/pkgs/development/libraries/haskell/hourglass/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hourglass"; - version = "0.2.0"; - sha256 = "13zphy3gfj9p7vsa477qy30968fnz5kq7d0lzb1pyg5hxkx44rim"; + version = "0.2.2"; + sha256 = "015ipy9adi67nfddjsw9c0ihn0banghgawjli0lgrmiyjz01610c"; buildDepends = [ deepseq ]; testDepends = [ deepseq mtl tasty tastyHunit tastyQuickcheck time diff --git a/pkgs/development/libraries/haskell/hsimport/default.nix b/pkgs/development/libraries/haskell/hsimport/default.nix index ca2808e5aba0..fdb3304ccd86 100644 --- a/pkgs/development/libraries/haskell/hsimport/default.nix +++ b/pkgs/development/libraries/haskell/hsimport/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hsimport"; - version = "0.3"; - sha256 = "124dimaa8v4x6vlh51v2r7569d8122l42q19bpzgqih33vw2djcs"; + version = "0.4"; + sha256 = "1pkj6cfdfyrcrm6gr4a43y6s4qhwpli6zgnlx4ycmhs3yh5kay60"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix index 612f49898489..dbc6369dc7ee 100644 --- a/pkgs/development/libraries/haskell/hspec-meta/default.nix +++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix @@ -1,17 +1,17 @@ -{ cabal, ansiTerminal, deepseq, filepath, hspecExpectations, HUnit -, QuickCheck, quickcheckIo, random, setenv, tfRandom, time +{ cabal, ansiTerminal, async, deepseq, filepath, hspecExpectations +, HUnit, QuickCheck, quickcheckIo, random, setenv, tfRandom, time , transformers }: cabal.mkDerivation (self: { pname = "hspec-meta"; - version = "1.9.5"; - sha256 = "0y39z9r5icz62dd7hvr3lwdcqas526w4m5rcd1468fp7rlz3402j"; + version = "1.10.0"; + sha256 = "1x32wgrd1i6rs6790dbr51j9g6abjpcf951cx3nmm4zdcwblyi6a"; isLibrary = true; isExecutable = true; buildDepends = [ - ansiTerminal deepseq filepath hspecExpectations HUnit QuickCheck - quickcheckIo random setenv tfRandom time transformers + ansiTerminal async deepseq filepath hspecExpectations HUnit + QuickCheck quickcheckIo random setenv tfRandom time transformers ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/hspec-wai/default.nix b/pkgs/development/libraries/haskell/hspec-wai/default.nix new file mode 100644 index 000000000000..639aa484dfae --- /dev/null +++ b/pkgs/development/libraries/haskell/hspec-wai/default.nix @@ -0,0 +1,23 @@ +{ cabal, aeson, aesonQq, caseInsensitive, doctest, hspec2 +, hspecMeta, httpTypes, markdownUnlit, scotty, text, transformers +, wai, waiExtra +}: + +cabal.mkDerivation (self: { + pname = "hspec-wai"; + version = "0.2.0"; + sha256 = "1hykc6k3kkjzz0x16i6ijcavsxfc003sp7fwvg2v9pzpmf9rfhhd"; + buildDepends = [ + aeson aesonQq caseInsensitive hspec2 httpTypes text transformers + wai waiExtra + ]; + testDepends = [ + aeson caseInsensitive doctest hspec2 hspecMeta httpTypes + markdownUnlit scotty text transformers wai waiExtra + ]; + meta = { + description = "Experimental Hspec support for testing WAI applications (depends on hspec2!)"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hspec2/default.nix b/pkgs/development/libraries/haskell/hspec2/default.nix index be49f612aaac..144e327b1798 100644 --- a/pkgs/development/libraries/haskell/hspec2/default.nix +++ b/pkgs/development/libraries/haskell/hspec2/default.nix @@ -1,24 +1,22 @@ { cabal, ansiTerminal, async, deepseq, doctest, filepath, ghcPaths -, hspecExpectations, hspecMeta, HUnit, ioMemoize, QuickCheck -, quickcheckIo, random, setenv, silently, tfRandom, time -, transformers +, hspecExpectations, hspecMeta, HUnit, QuickCheck, quickcheckIo +, random, setenv, silently, tfRandom, time, transformers }: cabal.mkDerivation (self: { pname = "hspec2"; - version = "0.3.0"; - sha256 = "0ia19jraz2di31c48lh0kswkb2573jxm7msf33i8d5a5yq8y9wwp"; + version = "0.3.4"; + sha256 = "0vs5y1cqprixmmjdk3sdrig9gr1k63nvn4c91b3z66jj39rdxl21"; isLibrary = true; isExecutable = true; buildDepends = [ ansiTerminal async deepseq filepath hspecExpectations HUnit - ioMemoize QuickCheck quickcheckIo random setenv tfRandom time - transformers + QuickCheck quickcheckIo random setenv tfRandom time transformers ]; testDepends = [ ansiTerminal async deepseq doctest filepath ghcPaths - hspecExpectations hspecMeta HUnit ioMemoize QuickCheck quickcheckIo - random setenv silently tfRandom time transformers + hspecExpectations hspecMeta HUnit QuickCheck quickcheckIo random + setenv silently tfRandom time transformers ]; meta = { homepage = "http://hspec.github.io/"; diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix index b447d9a1f11c..be261bf60272 100644 --- a/pkgs/development/libraries/haskell/http-client/default.nix +++ b/pkgs/development/libraries/haskell/http-client/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "http-client"; - version = "0.3.3"; - sha256 = "001nmy6f57l2f7gc4mchz1gwam28qldkwmcxzs8jnqwczcirgk38"; + version = "0.3.3.1"; + sha256 = "0zzh4vr563f8rb51b64gcwmal7gswif8ndsf2x5kw6f7q55md0dw"; buildDepends = [ base64Bytestring blazeBuilder caseInsensitive cookie dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index fc6762c877e9..918993e6be8c 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -2,13 +2,13 @@ , connection, cookie, dataDefaultClass, hspec, httpClient , httpClientTls, httpTypes, HUnit, liftedBase, monadControl, mtl , network, networkConduit, resourcet, streamingCommons, text, time -, transformers, utf8String, wai, warp, warpTls +, transformers, utf8String, wai, waiConduit, warp, warpTls }: cabal.mkDerivation (self: { pname = "http-conduit"; - version = "2.1.2"; - sha256 = "11g79yfgm2fzcy7gwk9f5np4p6fknsbjkm858v8khb4a1gmbrqvn"; + version = "2.1.2.1"; + sha256 = "17bq72qkgn7sh31ad5w7gqf15dlzl027nmx8k7kmm268mf9bz0b5"; buildDepends = [ conduit httpClient httpClientTls httpTypes liftedBase monadControl mtl resourcet transformers @@ -17,7 +17,7 @@ cabal.mkDerivation (self: { blazeBuilder caseInsensitive conduit conduitExtra connection cookie dataDefaultClass hspec httpClient httpTypes HUnit liftedBase network networkConduit streamingCommons text time transformers - utf8String wai warp warpTls + utf8String wai waiConduit warp warpTls ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index ec34cc98d744..170d15aa7077 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -7,13 +7,13 @@ cabal.mkDerivation (self: { pname = "http-reverse-proxy"; - version = "0.3.1.7"; - sha256 = "0fhndk9zjv1kcqgrhj42brfg96p7flrcpy609asba1vc0i9213j4"; + version = "0.4.0.1"; + sha256 = "0gygmykxsy6rs3xmwb24s5c3brmabdgxb1w0ak82vyvfvsnqxz1h"; buildDepends = [ async blazeBuilder caseInsensitive conduit conduitExtra dataDefaultClass httpClient httpTypes liftedBase monadControl - network networkConduit resourcet streamingCommons text transformers - wai waiLogger word8 + network resourcet streamingCommons text transformers wai waiLogger + word8 ]; testDepends = [ blazeBuilder conduit conduitExtra hspec httpConduit httpTypes diff --git a/pkgs/development/libraries/haskell/io-memoize/default.nix b/pkgs/development/libraries/haskell/io-memoize/default.nix index bba2cd3b1e0f..3343ee9cbe9d 100644 --- a/pkgs/development/libraries/haskell/io-memoize/default.nix +++ b/pkgs/development/libraries/haskell/io-memoize/default.nix @@ -1,10 +1,10 @@ -{ cabal, spawn }: +{ cabal, async }: cabal.mkDerivation (self: { pname = "io-memoize"; - version = "1.0.0.0"; - sha256 = "1z6aimyg7wasaqmacpch7skfm9iyl7khd54lfmb8iwghyfvah5d0"; - buildDepends = [ spawn ]; + version = "1.1.0.0"; + sha256 = "1xnrzrvs5c3lrzdxm4hrqbh8chl8sxv2j98b28na73w8b7yv2agm"; + buildDepends = [ async ]; meta = { description = "Memoize IO actions"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix index 448fd3b2f5f7..259a8e2fc2d5 100644 --- a/pkgs/development/libraries/haskell/mongoDB/default.nix +++ b/pkgs/development/libraries/haskell/mongoDB/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "mongoDB"; - version = "1.4.4"; - sha256 = "11v0k2i0ix67zwm19w1215dslnnqllkc4jlhbs5yva2ix4z7d4gh"; + version = "1.5.0"; + sha256 = "0dvy8pa79c26hcngds6nnwnayrhsyz1flj18m9bcyrcvwb5q3dd6"; buildDepends = [ binary bson cryptohash hashtables liftedBase monadControl mtl network parsec random randomShuffle text transformersBase diff --git a/pkgs/development/libraries/haskell/non-negative/default.nix b/pkgs/development/libraries/haskell/non-negative/default.nix index a50710791dbc..ae025f6cc64e 100644 --- a/pkgs/development/libraries/haskell/non-negative/default.nix +++ b/pkgs/development/libraries/haskell/non-negative/default.nix @@ -2,11 +2,10 @@ cabal.mkDerivation (self: { pname = "non-negative"; - version = "0.1"; - sha256 = "0aebb6f5518191a02b11230798444997a03b84d63d2aaa6c38cac6718f6c351c"; - isLibrary = true; - isExecutable = true; + version = "0.1.1"; + sha256 = "163g3j3xrx1jkrbg2wnha3yyxyg1mn7kabmbpg82y3rbl3ihy1p7"; buildDepends = [ QuickCheck utilityHt ]; + testDepends = [ QuickCheck utilityHt ]; meta = { homepage = "http://code.haskell.org/~thielema/non-negative/"; description = "Non-negative numbers"; diff --git a/pkgs/development/libraries/haskell/pipes-text/default.nix b/pkgs/development/libraries/haskell/pipes-text/default.nix index ac4a57348feb..7156b8897893 100644 --- a/pkgs/development/libraries/haskell/pipes-text/default.nix +++ b/pkgs/development/libraries/haskell/pipes-text/default.nix @@ -1,14 +1,14 @@ { cabal, pipes, pipesBytestring, pipesGroup, pipesParse, pipesSafe -, profunctors, text, textStreamDecode, transformers +, profunctors, streamingCommons, text, transformers }: cabal.mkDerivation (self: { pname = "pipes-text"; - version = "0.0.0.10"; - sha256 = "05lrxfy6cma7g5h41c74sc22p1y38kzbmiagr3grxk5a5110vhr1"; + version = "0.0.0.11"; + sha256 = "0c56gxm17bapdjgbp2f55z3f6vq8ryvsljqp3bcjjj18xv5pf1ls"; buildDepends = [ pipes pipesBytestring pipesGroup pipesParse pipesSafe profunctors - text textStreamDecode transformers + streamingCommons text transformers ]; meta = { homepage = "https://github.com/michaelt/text-pipes"; diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix index 8e23a0cf8f28..4109fc89a2c8 100644 --- a/pkgs/development/libraries/haskell/purescript/default.nix +++ b/pkgs/development/libraries/haskell/purescript/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "purescript"; - version = "0.5.2.2"; - sha256 = "07gkd897qcgn7yf81bii5njkiq1hlhfz5jx3spdlv64a492grmg2"; + version = "0.5.2.3"; + sha256 = "09z56gb3k1ya5c3yznm49sgd1g9i5wvn5ih4mycf5ys2wvy3v9sl"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix index 601ecfb223d4..398d3a1dfb85 100644 --- a/pkgs/development/libraries/haskell/scotty/default.nix +++ b/pkgs/development/libraries/haskell/scotty/default.nix @@ -1,16 +1,17 @@ -{ cabal, aeson, blazeBuilder, caseInsensitive, conduit -, conduitExtra, dataDefault, httpTypes, mtl, regexCompat, text -, transformers, wai, waiExtra, warp +{ cabal, aeson, blazeBuilder, caseInsensitive, conduit, dataDefault +, hspec, httpTypes, mtl, regexCompat, text, transformers, wai +, waiExtra, warp }: cabal.mkDerivation (self: { pname = "scotty"; - version = "0.7.3"; - sha256 = "1cksnsaghcliwpbigs7fjb2qcxsnrqmjcjwndmf3vbfkn43w2prb"; + version = "0.8.0"; + sha256 = "07198m8rsavdqr51abxsrmi8jail6h4ldzrr9s47il1djjba6lhh"; buildDepends = [ - aeson blazeBuilder caseInsensitive conduit conduitExtra dataDefault - httpTypes mtl regexCompat text transformers wai waiExtra warp + aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes + mtl regexCompat text transformers wai waiExtra warp ]; + testDepends = [ hspec httpTypes wai waiExtra ]; jailbreak = true; meta = { homepage = "https://github.com/scotty-web/scotty"; diff --git a/pkgs/development/libraries/haskell/snaplet-redis/default.nix b/pkgs/development/libraries/haskell/snaplet-redis/default.nix new file mode 100644 index 000000000000..83a82ac80ce1 --- /dev/null +++ b/pkgs/development/libraries/haskell/snaplet-redis/default.nix @@ -0,0 +1,19 @@ +{ cabal, configurator, hedis, lens, mtl, network, snap +, transformers +}: + +cabal.mkDerivation (self: { + pname = "snaplet-redis"; + version = "0.1.3.1"; + sha256 = "1aprz9rxs01a86vfr8s7mjydafdfljg89grl7i43vmsw927izc6k"; + buildDepends = [ + configurator hedis lens mtl network snap transformers + ]; + meta = { + homepage = "https://github.com/dzhus/snaplet-redis/"; + description = "Redis support for Snap Framework"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; + jailbreak = true; +}) diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 45dd5562a28b..093fbb76f84d 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -3,13 +3,13 @@ , hspec, httpDate, httpTypes, mimeTypes, network , optparseApplicative, systemFileio, systemFilepath, text, time , transformers, unixCompat, unorderedContainers, wai, waiExtra -, waiTest, warp, zlib +, warp, zlib }: cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "2.0.1"; - sha256 = "1mygyp70rmhnkc0s8626cxrkvcbil92v4gnx70iz26gfb5q9lc7d"; + version = "3.0.0"; + sha256 = "117r2ps440i2i156k50b674fkny2ywwbbla6ry0km041604cl733"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -20,7 +20,7 @@ cabal.mkDerivation (self: { ]; testDepends = [ hspec httpDate httpTypes mimeTypes network text time transformers - unixCompat wai waiTest zlib + unixCompat wai waiExtra zlib ]; meta = { homepage = "http://www.yesodweb.com/book/web-application-interface"; diff --git a/pkgs/development/libraries/haskell/wai-conduit/default.nix b/pkgs/development/libraries/haskell/wai-conduit/default.nix new file mode 100644 index 000000000000..10517e13d9c5 --- /dev/null +++ b/pkgs/development/libraries/haskell/wai-conduit/default.nix @@ -0,0 +1,14 @@ +{ cabal, blazeBuilder, conduit, httpTypes, transformers, wai }: + +cabal.mkDerivation (self: { + pname = "wai-conduit"; + version = "3.0.0"; + sha256 = "0v92jyxkigq7yj3hzy7kg360036nav986ny7b558l6j7zc90jsdg"; + buildDepends = [ blazeBuilder conduit httpTypes transformers wai ]; + meta = { + homepage = "https://github.com/yesodweb/wai"; + description = "conduit wrappers for WAI"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 66d45f059129..d54e8351d4fd 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -1,24 +1,23 @@ { cabal, ansiTerminal, base64Bytestring, blazeBuilder -, blazeBuilderConduit, caseInsensitive, conduit, conduitExtra -, dataDefault, fastLogger, hspec, httpTypes, HUnit, liftedBase -, network, resourcet, stringsearch, text, time, transformers, void -, wai, waiLogger, waiTest, word8, zlib, zlibBindings, zlibConduit +, caseInsensitive, dataDefault, dataDefaultClass, deepseq +, fastLogger, hspec, httpTypes, HUnit, liftedBase, network +, resourcet, streamingCommons, stringsearch, text, time +, transformers, void, wai, waiLogger, word8, zlib }: cabal.mkDerivation (self: { pname = "wai-extra"; - version = "2.1.1.2"; - sha256 = "000ksma1jmi7rfg2ib94baj31mcwqj2xfhkyv7lai89di0m0v6s4"; + version = "3.0.0"; + sha256 = "0spjyimqfj7hx8zgmal4laqy8p1inj8hl2402b5s6zqdn36lldfs"; buildDepends = [ - ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit - caseInsensitive conduit conduitExtra dataDefault fastLogger - httpTypes liftedBase network resourcet stringsearch text time - transformers void wai waiLogger word8 zlibConduit + ansiTerminal base64Bytestring blazeBuilder caseInsensitive + dataDefaultClass deepseq fastLogger httpTypes liftedBase network + resourcet streamingCommons stringsearch text time transformers void + wai waiLogger word8 ]; testDepends = [ - blazeBuilder conduit conduitExtra dataDefault fastLogger hspec - httpTypes HUnit resourcet text transformers wai waiTest zlib - zlibBindings + blazeBuilder dataDefault fastLogger hspec httpTypes HUnit resourcet + text transformers wai zlib ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix b/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix index 9767f2d7750d..7ecc3a347585 100644 --- a/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix +++ b/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "wai-handler-fastcgi"; - version = "2.0.0.1"; - sha256 = "14jsibsqfj6z5yqgdrh43aiqps1yldxkgn6fkj4i80zxk099nbxp"; + version = "3.0.0"; + sha256 = "1cvy95qmbrhc1yjcral7f8y2929xp623abc9xasz7j28m4wwmynh"; buildDepends = [ wai waiExtra ]; extraLibraries = [ fcgi ]; meta = { diff --git a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix index 9d59fd68ed61..d103b54ec6dc 100644 --- a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix +++ b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix @@ -1,14 +1,13 @@ -{ cabal, blazeBuilder, blazeBuilderConduit, conduit, conduitExtra -, httpTypes, transformers, wai, warp, zlibConduit +{ cabal, blazeBuilder, httpTypes, streamingCommons, transformers +, wai, warp }: cabal.mkDerivation (self: { pname = "wai-handler-launch"; - version = "2.0.1.3"; - sha256 = "06im28x26jbzbdk9xz33kqvzblglk3b3b60qwal836hima69alsd"; + version = "3.0.0"; + sha256 = "1dv7w151szjkg9968v870abz11a440pdzy50zwm0xl6blk392nmk"; buildDepends = [ - blazeBuilder blazeBuilderConduit conduit conduitExtra httpTypes - transformers wai warp zlibConduit + blazeBuilder httpTypes streamingCommons transformers wai warp ]; meta = { description = "Launch a web app in the default browser"; diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix index dc00b9525eb8..35b044bdfb48 100644 --- a/pkgs/development/libraries/haskell/wai-logger/default.nix +++ b/pkgs/development/libraries/haskell/wai-logger/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { unixTime wai ]; testDepends = [ doctest waiTest ]; + doCheck = false; meta = { description = "A logging system for WAI"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix index 18b251a8aedb..9ca7992db686 100644 --- a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "wai-middleware-static"; - version = "0.5.0.1"; - sha256 = "1pwyy6lsvi7kaxf6x3ghy5013yq4ryjp01c4rrd4isx4jh1ynl31"; + version = "0.6.0"; + sha256 = "1rsy8qkxcjqdpzqkar0smyy49p8vqapi47k8d24101lz3rym6018"; buildDepends = [ filepath httpTypes mtl text wai ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index b15aa1070ba5..5d1cecc2e508 100644 --- a/pkgs/development/libraries/haskell/wai-test/default.nix +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -1,20 +1,14 @@ -{ cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive -, conduit, conduitExtra, cookie, deepseq, hspec, httpTypes, network -, text, transformers, wai -}: +{ cabal, wai }: cabal.mkDerivation (self: { pname = "wai-test"; - version = "2.0.1.3"; - sha256 = "18j77l2n41941f95awj6fj0w712628v5lsc3bif00cqnaixjmz48"; - buildDepends = [ - blazeBuilder blazeBuilderConduit caseInsensitive conduit - conduitExtra cookie deepseq httpTypes network text transformers wai - ]; - testDepends = [ hspec wai ]; + version = "3.0.0"; + sha256 = "0xys01jniib0pnhadcm7s0v5z0wcxfgi0bf5ax808zm9qzvl3xfx"; + buildDepends = [ wai ]; + noHaddock = true; meta = { homepage = "http://www.yesodweb.com/book/web-application-interface"; - description = "Unit test framework (built on HUnit) for WAI applications"; + description = "Unit test framework (built on HUnit) for WAI applications. (deprecated)"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/libraries/haskell/wai-websockets/default.nix b/pkgs/development/libraries/haskell/wai-websockets/default.nix index 5d909c7d773c..d0973881657f 100644 --- a/pkgs/development/libraries/haskell/wai-websockets/default.nix +++ b/pkgs/development/libraries/haskell/wai-websockets/default.nix @@ -1,17 +1,17 @@ -{ cabal, blazeBuilder, caseInsensitive, conduit, fileEmbed -, httpTypes, ioStreams, network, text, transformers, wai -, waiAppStatic, warp, websockets +{ cabal, blazeBuilder, caseInsensitive, fileEmbed, httpTypes +, ioStreams, network, text, transformers, wai, waiAppStatic, warp +, websockets }: cabal.mkDerivation (self: { pname = "wai-websockets"; - version = "2.1.0.2"; - sha256 = "16hff38x6fpmp4r1wkjd922s02v5na8zwy6mq5f5gsj7b70n2ww2"; + version = "3.0.0"; + sha256 = "0bpzkh9a5j0a282z4dj9dqnjsgd0g8gyvvp0xm0a53582zfhfi5s"; isLibrary = true; isExecutable = true; buildDepends = [ - blazeBuilder caseInsensitive conduit fileEmbed httpTypes ioStreams - network text transformers wai waiAppStatic warp websockets + blazeBuilder caseInsensitive fileEmbed httpTypes ioStreams network + text transformers wai waiAppStatic warp websockets ]; meta = { homepage = "http://github.com/yesodweb/wai"; diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index 540df207241d..50ded58f44d8 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -1,15 +1,11 @@ -{ cabal, blazeBuilder, conduit, conduitExtra, httpTypes, network -, text, transformers, vault -}: +{ cabal, blazeBuilder, hspec, httpTypes, network, text, vault }: cabal.mkDerivation (self: { pname = "wai"; - version = "2.1.0.3"; - sha256 = "0qprvk63fvb4rddg9h385xbd5sr5bcgkpx6fqlw01pjzmmrig1m3"; - buildDepends = [ - blazeBuilder conduit conduitExtra httpTypes network text - transformers vault - ]; + version = "3.0.0.1"; + sha256 = "1f8alq4lygjdb4pzb7xm6jml3dviygk18siwfwb751va3j2fmi0v"; + buildDepends = [ blazeBuilder httpTypes network text vault ]; + testDepends = [ blazeBuilder hspec ]; meta = { homepage = "https://github.com/yesodweb/wai"; description = "Web Application Interface"; diff --git a/pkgs/development/libraries/haskell/warp-tls/default.nix b/pkgs/development/libraries/haskell/warp-tls/default.nix index e9e7ae393808..ca20fe2d6bfc 100644 --- a/pkgs/development/libraries/haskell/warp-tls/default.nix +++ b/pkgs/development/libraries/haskell/warp-tls/default.nix @@ -1,15 +1,13 @@ -{ cabal, conduit, conduitExtra, cprngAes, dataDefaultClass, network -, networkConduit, resourcet, streamingCommons, tls, transformers +{ cabal, cprngAes, dataDefaultClass, network, streamingCommons, tls , wai, warp }: cabal.mkDerivation (self: { pname = "warp-tls"; - version = "2.0.5"; - sha256 = "11nc5drys75mjfqww87rs2clhxpx485q008y42f2ymj7s5856db4"; + version = "3.0.0"; + sha256 = "14gm43a811v9h87ia2b9y9kynafrvq3yw89gswlj832469jx9sfw"; buildDepends = [ - conduit conduitExtra cprngAes dataDefaultClass network - networkConduit resourcet streamingCommons tls transformers wai warp + cprngAes dataDefaultClass network streamingCommons tls wai warp ]; meta = { homepage = "http://github.com/yesodweb/wai"; diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index be5dd392d16f..d0940345a576 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -1,25 +1,22 @@ -{ cabal, async, blazeBuilder, blazeBuilderConduit, caseInsensitive -, conduit, conduitExtra, doctest, hashable, hspec, HTTP, httpDate -, httpTypes, HUnit, liftedBase, network, networkConduit, QuickCheck -, simpleSendfile, streamingCommons, text, time, transformers -, unixCompat, void, wai +{ cabal, async, blazeBuilder, caseInsensitive, doctest, hashable +, hspec, HTTP, httpDate, httpTypes, HUnit, liftedBase, network +, QuickCheck, simpleSendfile, streamingCommons, text, time +, transformers, unixCompat, void, wai }: cabal.mkDerivation (self: { pname = "warp"; - version = "2.1.5.2"; - sha256 = "0rv5fxw1d5dh6jzvs3bg2vjjr702xw59fx7mflygpqh8zivfh4ds"; + version = "3.0.0.1"; + sha256 = "05x216fj7s1i963xipi0p7vmkz5l0nma1fjqiq040fg3rngw4yqb"; buildDepends = [ - blazeBuilder blazeBuilderConduit caseInsensitive conduit - conduitExtra hashable httpDate httpTypes liftedBase network - networkConduit simpleSendfile streamingCommons text transformers - unixCompat void wai + blazeBuilder caseInsensitive hashable httpDate httpTypes network + simpleSendfile streamingCommons text unixCompat void wai ]; testDepends = [ - async blazeBuilder blazeBuilderConduit caseInsensitive conduit - conduitExtra doctest hashable hspec HTTP httpDate httpTypes HUnit - liftedBase network networkConduit QuickCheck simpleSendfile - streamingCommons text time transformers unixCompat void wai + async blazeBuilder caseInsensitive doctest hashable hspec HTTP + httpDate httpTypes HUnit liftedBase network QuickCheck + simpleSendfile streamingCommons text time transformers unixCompat + void wai ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/websockets/default.nix b/pkgs/development/libraries/haskell/websockets/default.nix index 9e22d0cab185..e712a5b2b815 100644 --- a/pkgs/development/libraries/haskell/websockets/default.nix +++ b/pkgs/development/libraries/haskell/websockets/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "websockets"; - version = "0.8.2.3"; - sha256 = "0j4lm5hkipd4q6kizrjy1cjdw2b0588m4k6fh50ss5qnqw9rkjkd"; + version = "0.8.2.4"; + sha256 = "09mq04vhi53isj8z5930ibyai7bv634lnmhl4xl2d3fzz2afvff0"; buildDepends = [ attoparsec base64Bytestring binary blazeBuilder caseInsensitive entropy ioStreams mtl network random SHA text diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index 3bca09f4fb6b..145df1e625fe 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.9.4"; - sha256 = "0ir77hmg3avkm4x7pgmjx3fijisncpwklg4v1glqx4vqbjjrzk5g"; + version = "1.2.10.2"; + sha256 = "18faylxjrd790xv6zr77wikkcy99l7824bb1sq1y225kd7a3alsm"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index ae63f4dbc16b..7ea674aa0d9d 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.15.2"; - sha256 = "1k5dqcfpwqac81p9w2i1kz5pcvr21ibia5kh441811bdzlpwsiwq"; + version = "1.2.16.1"; + sha256 = "1wr5labhp3wc23ki2wvaypanm54qw9vz3v77rxyj1za1y2n1cprw"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit conduitExtra cookie @@ -26,7 +26,7 @@ cabal.mkDerivation (self: { async blazeBuilder conduit conduitExtra hamlet hspec httpTypes HUnit liftedBase network networkConduit QuickCheck random resourcet shakespeare shakespeareCss shakespeareJs streamingCommons text - transformers wai waiTest + transformers wai waiExtra waiTest ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index add7d94bac42..4309df0e4c4e 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.9.1"; - sha256 = "1iw2vcdvp77vz3az9g9y4nk29g098fa9lvqzc7hwypvdawgwpgwm"; + version = "1.3.10"; + sha256 = "1qq0r5phb6xygz4w5ysir3ky7bw0rmd1q4vz57dz1aza2pchb1ih"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable 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 432adeee9af8..f5189caa46fb 100644 --- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix +++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix @@ -1,19 +1,19 @@ { cabal, blazeBuilder, conduit, hspec, persistent, persistentSqlite , persistentTemplate, resourcePool, resourcet, text, transformers -, waiTest, yesodCore +, waiExtra, waiTest, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-persistent"; - version = "1.2.2.3"; - sha256 = "1699grrxb1qwfiivh9ihnczkcbwl4gcqdk7m02lc09r9gjr920p8"; + version = "1.2.3"; + sha256 = "1kdspz6y32r8kl0qk89hgwi4n6dnxch7wriv829cnwqm0bzjfdpw"; buildDepends = [ blazeBuilder conduit persistent persistentTemplate resourcePool resourcet transformers yesodCore ]; testDepends = [ - blazeBuilder conduit hspec persistent persistentSqlite text waiTest - yesodCore + blazeBuilder conduit hspec persistent persistentSqlite text + waiExtra waiTest yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index b6763871c40f..d5a0c1c4c7d4 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -3,14 +3,14 @@ , cssText, dataDefault, fileEmbed, filepath, hashable, hjsmin , hspec, httpTypes, HUnit, mimeTypes, resourcet, shakespeareCss , systemFileio, systemFilepath, text, transformers, unixCompat -, unorderedContainers, wai, waiAppStatic, waiTest, yesodCore -, yesodTest +, unorderedContainers, wai, waiAppStatic, waiExtra, waiTest +, yesodCore, yesodTest }: cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.2.3"; - sha256 = "093lvg7pl71dfnr7qyfmp9r1m3bs64849k0dw4w2qb618y8wb9jh"; + version = "1.2.4"; + sha256 = "0r5bz1jmgjd7cmvhkp3ahgl610bssvgxxsvb626dvqz2vqc0061z"; buildDepends = [ async attoparsec base64Bytestring blazeBuilder byteable conduit conduitExtra cryptohash cryptohashConduit cssText dataDefault @@ -23,7 +23,7 @@ cabal.mkDerivation (self: { cryptohashConduit dataDefault fileEmbed filepath hjsmin hspec httpTypes HUnit mimeTypes resourcet shakespeareCss systemFileio systemFilepath text transformers unixCompat unorderedContainers wai - waiAppStatic waiTest yesodCore yesodTest + waiAppStatic waiExtra waiTest yesodCore yesodTest ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index 292941c01717..44b147586236 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -1,18 +1,18 @@ { cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup , caseInsensitive, cookie, hspec, htmlConduit, httpTypes, HUnit , monadControl, network, persistent, text, time, transformers, wai -, waiTest, xmlConduit, xmlTypes, yesodCore, yesodForm +, waiExtra, waiTest, xmlConduit, xmlTypes, yesodCore, yesodForm }: cabal.mkDerivation (self: { pname = "yesod-test"; - version = "1.2.2"; - sha256 = "1vf5g83mj2a38f34llg6wa63whj13p0vgbzfvi3ic5j7qy5gb8g5"; + version = "1.2.3"; + sha256 = "082zi53q1pw9xv4l6ld1y3xxnvq3iwgbrdnxjknhwsxph7glkn3p"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive cookie hspec htmlConduit httpTypes HUnit monadControl network - persistent text time transformers wai waiTest xmlConduit xmlTypes - yesodCore + persistent text time transformers wai waiExtra waiTest xmlConduit + xmlTypes yesodCore ]; testDepends = [ hspec htmlConduit HUnit text wai xmlConduit yesodCore yesodForm diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 630b04af26b9..8e3873df2ae6 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.2.5.3"; - sha256 = "1w9bbvinnbnhrajjqj6yhy9dgggdf6n98x04dys45anssiwrd2ss"; + version = "1.2.6"; + sha256 = "0rw46zznczdzg2wvbgp5kpq3yrl6w40vbbs7zyvqpcf6m82jsfz0"; buildDepends = [ aeson blazeHtml blazeMarkup conduitExtra dataDefault fastLogger hamlet monadControl monadLogger networkConduit safe shakespeare diff --git a/pkgs/development/libraries/libmodbus/default.nix b/pkgs/development/libraries/libmodbus/default.nix new file mode 100644 index 000000000000..f6a816ef96f6 --- /dev/null +++ b/pkgs/development/libraries/libmodbus/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libmodbus-3.0.6"; + + src = fetchurl { + url = "http://libmodbus.org/releases/${name}.tar.gz"; + sha256 = "1dkijjv3dq0c5vc5z5f1awm8dlssbwg6ivsnvih22pkm1zqn6v84"; + }; + + meta = with stdenv.lib; { + description = "Library to send/receive data according to the Modbus protocol"; + homepage = http://libmodbus.org/; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/development/libraries/libmsgpack/default.nix b/pkgs/development/libraries/libmsgpack/default.nix index 26dc6be8382c..ab9dbd48ea4e 100644 --- a/pkgs/development/libraries/libmsgpack/default.nix +++ b/pkgs/development/libraries/libmsgpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, ruby }: +{ stdenv, fetchurl, autoconf, automake, libtool, ruby, scatterOutputHook }: stdenv.mkDerivation rec { version = "0.5.8"; @@ -9,17 +9,18 @@ stdenv.mkDerivation rec { sha256 = "1h6k9kdbfavmw3by5kk3raszwa64hn9k8yw9rdhvl5m8g2lks89k"; }; + nativeBuildInputs = [ scatterOutputHook ]; buildInputs = [ autoconf automake libtool ruby ]; - outputs = [ "out" "lib" ]; + outputs = [ "out" "bin" ]; - preConfigure = "./bootstrap"; - - postInstall = '' - mkdir -p $lib/lib - mv $out/lib/*.so.* $lib/lib/ + preConfigure = '' + sed -i s,glibtoolize,libtoolize, ./bootstrap + ./bootstrap ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "MessagePack implementation for C and C++"; homepage = http://msgpack.org; diff --git a/pkgs/development/libraries/liboping/default.nix b/pkgs/development/libraries/liboping/default.nix new file mode 100644 index 000000000000..b48b9c0585bd --- /dev/null +++ b/pkgs/development/libraries/liboping/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, ncurses ? null, perl ? null }: + +stdenv.mkDerivation rec { + name = "liboping-1.6.2"; + + src = fetchurl { + url = "http://verplant.org/liboping/files/${name}.tar.bz2"; + sha256 = "1kvkpdcd5jinyc15cgir48v91qphpw22c03inydaga5m4yqv8jjz"; + }; + + buildInputs = [ ncurses perl ]; + + configureFlags = stdenv.lib.optionalString (perl == null) "--with-perl-bindings=no"; + + meta = with stdenv.lib; { + description = "C library to generate ICMP echo requests (a.k.a. ping packets)"; + longDescription = '' + liboping is a C library to generate ICMP echo requests, better known as + "ping packets". It is intended for use in network monitoring applications + or applications that would otherwise need to fork ping(1) frequently. + Included is a sample application, called oping, which demonstrates the + library's abilities. + ''; + homepage = http://verplant.org/liboping/; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index c69d787b0860..4027bd8a84e0 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -4,14 +4,14 @@ , dnsmasq, libnl }: -let version = "1.2.4"; in +let version = "1.2.5"; in stdenv.mkDerivation rec { name = "libvirt-${version}"; src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.gz"; - sha256 = "0xg8m7x4a3dqrg2b9pqcikaghdp6jyl07gkp2z8grsmsnbvcafp4"; + sha256 = "0igd74wkksgv24i2xaa8wx51iqpgjp1v7820pk93m0jv8gipvscf"; }; buildInputs = [ diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/development/libraries/libxmp/default.nix new file mode 100644 index 000000000000..7b4d3d6287aa --- /dev/null +++ b/pkgs/development/libraries/libxmp/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libxmp-4.2.7"; + + meta = with stdenv.lib; { + description = "Extended module player library"; + homepage = "http://xmp.sourceforge.net/"; + longDescription = '' + Libxmp is a library that renders module files to PCM data. It supports + over 90 mainstream and obscure module formats including Protracker (MOD), + Scream Tracker 3 (S3M), Fast Tracker II (XM), and Impulse Tracker (IT). + ''; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ iyzsong ]; + }; + + src = fetchurl { + url = "mirror://sourceforge/xmp/libxmp/${name}.tar.gz"; + sha256 = "1isv8498869w8wc18lagi1p40z4blx684r21j9cligkfyrmri536"; + }; +} diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index f6848ae58602..0355ce25c62c 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: -let version = "4.10.5"; in +let version = "4.10.6"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha1 = "891de2b62ad42f9b38808a0aa58c95e8cbd5c9a9"; + sha1 = "3hzcslcfql1rg7drvcn4nmrigy7jfgwz"; }; preConfigure = "cd nspr"; |