diff options
31 files changed, 218 insertions, 116 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 0983ca913865..07b09d37a2fd 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -7,41 +7,45 @@ , gnupg1, gnutls, hamlet, hinotify, hS3, hslogger, HTTP, httpClient , httpConduit, httpTypes, IfElse, json, liftedBase, lsof, MissingH , monadControl, mtl, network, networkInfo, networkMulticast -, networkProtocolXmpp, openssh, optparseApplicative, perl -, QuickCheck, random, regexTdfa, rsync, SafeSemaphore, securemem -, SHA, shakespeare, stm, tasty, tastyHunit, tastyQuickcheck -, tastyRerun, text, time, transformers, unixCompat, utf8String -, uuid, wai, waiExtra, warp, warpTls, which, xmlTypes, yesod -, yesodCore, yesodDefault, yesodForm, yesodStatic -, fsnotify +, networkProtocolXmpp, openssh, optparseApplicative, pathPieces +, perl, QuickCheck, random, regexTdfa, rsync, SafeSemaphore +, securemem, SHA, shakespeare, stm, tasty, tastyHunit +, tastyQuickcheck, tastyRerun, text, time, transformers, unixCompat +, utf8String, uuid, wai, waiExtra, warp, warpTls, which, xmlTypes +, yesod, yesodCore, yesodDefault, yesodForm, yesodStatic }: cabal.mkDerivation (self: { pname = "git-annex"; - version = "5.20140709"; - sha256 = "0n636b52199kj8w3awfvrabg6c76kb133gbfh9r8sp0xrg376z2s"; + version = "5.20140717"; + sha256 = "199gqp85f6xnyg3svs23n3r6q4pflvz4zy5y376klay9mzzp0rbl"; isLibrary = false; isExecutable = true; buildDepends = [ aeson async blazeBuilder bloomfilter byteable caseInsensitive - clientsession cryptoApi cryptohash dataDefault dataenc DAV - dlist dns editDistance exceptions extensibleExceptions - feed filepath gnutls hamlet hS3 hslogger HTTP httpClient + clientsession cryptoApi cryptohash dataDefault dataenc DAV dbus + dlist dns editDistance exceptions extensibleExceptions fdoNotify + feed filepath gnutls hamlet hinotify hS3 hslogger HTTP httpClient httpConduit httpTypes IfElse json liftedBase MissingH monadControl mtl network networkInfo networkMulticast networkProtocolXmpp - optparseApplicative QuickCheck random regexTdfa SafeSemaphore - securemem SHA shakespeare stm tasty tastyHunit tastyQuickcheck - tastyRerun text time transformers unixCompat utf8String uuid wai - waiExtra warp warpTls xmlTypes yesod yesodCore yesodDefault - yesodForm yesodStatic - ] ++ (if self.stdenv.isDarwin then [ - fsnotify - ] else [ - dbus fdoNotify hinotify - ]); + optparseApplicative pathPieces QuickCheck random regexTdfa + SafeSemaphore securemem SHA shakespeare stm tasty tastyHunit + tastyQuickcheck tastyRerun text time transformers unixCompat + utf8String uuid wai waiExtra warp warpTls xmlTypes yesod yesodCore + yesodDefault yesodForm yesodStatic + ]; buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ]; - configureFlags = "-fAssistant - -fProduction"; + configureFlags = "-fS3 + -fWebDAV + -fInotify + -fDbus + -fAssistant + -fWebapp + -fPairing + -fXMPP + -fDNS + -fProduction + -fTDFA"; preConfigure = '' export HOME="$NIX_BUILD_TOP/tmp" mkdir "$HOME" diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index d2bf006285d0..c2b6b0ac5acc 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -1,27 +1,27 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, annotatedWlPprint, ansiTerminal, ansiWlPprint, binary -, blazeHtml, blazeMarkup, boehmgc, Cabal, cheapskate, deepseq -, filepath, gmp, happy, haskeline, languageJava, lens, libffi -, llvmGeneral, llvmGeneralPure, mtl, network, optparseApplicative -, parsers, split, text, time, transformers, trifecta -, unorderedContainers, utf8String, vector, vectorBinaryInstances -, xml, zlib +{ cabal, annotatedWlPprint, ansiTerminal, ansiWlPprint +, base64Bytestring, binary, blazeHtml, blazeMarkup, boehmgc, Cabal +, cheapskate, deepseq, filepath, fingertree, gmp, happy, haskeline +, languageJava, lens, libffi, llvmGeneral, llvmGeneralPure, mtl +, network, optparseApplicative, parsers, split, text, time +, transformers, trifecta, unorderedContainers, utf8String, vector +, vectorBinaryInstances, xml, zlib }: cabal.mkDerivation (self: { pname = "idris"; - version = "0.9.13.1"; - sha256 = "09528c2zxriw3l8c7dd2k5db9j1qmqhs6nbqwc7dkskzqv9snz7n"; + version = "0.9.14"; + sha256 = "0kfzp89sass93p9zsxq616zfix7ipi1rmjqmcjixihi01k7c0b8b"; isLibrary = true; isExecutable = true; buildDepends = [ - annotatedWlPprint ansiTerminal ansiWlPprint binary blazeHtml - blazeMarkup Cabal cheapskate deepseq filepath haskeline - languageJava lens libffi llvmGeneral llvmGeneralPure mtl network - optparseApplicative parsers split text time transformers trifecta - unorderedContainers utf8String vector vectorBinaryInstances xml - zlib + annotatedWlPprint ansiTerminal ansiWlPprint base64Bytestring binary + blazeHtml blazeMarkup Cabal cheapskate deepseq filepath fingertree + haskeline languageJava lens libffi llvmGeneral llvmGeneralPure mtl + network optparseApplicative parsers split text time transformers + trifecta unorderedContainers utf8String vector + vectorBinaryInstances xml zlib ]; buildTools = [ happy ]; extraLibraries = [ boehmgc gmp ]; diff --git a/pkgs/development/libraries/haskell/HTF/default.nix b/pkgs/development/libraries/haskell/HTF/default.nix index 7667dd3d5422..5908498bd0a7 100644 --- a/pkgs/development/libraries/haskell/HTF/default.nix +++ b/pkgs/development/libraries/haskell/HTF/default.nix @@ -2,21 +2,23 @@ { cabal, aeson, base64Bytestring, cpphs, Diff, filepath , haskellSrcExts, HUnit, liftedBase, monadControl, mtl, QuickCheck -, random, regexCompat, temporary, text, unorderedContainers, xmlgen +, random, regexCompat, temporary, text, time, unorderedContainers +, vector, xmlgen }: cabal.mkDerivation (self: { pname = "HTF"; - version = "0.11.4.0"; - sha256 = "0bg84x6xk359zby04xw62yy227fk85mgs7x5nkdbsxcajm7j0bs9"; + version = "0.12.0.0"; + sha256 = "1mbil44gbcl52f84dphxkdvxsyz8bhc532mlq37aqr1bmj54rv0i"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base64Bytestring cpphs Diff haskellSrcExts HUnit liftedBase - monadControl mtl QuickCheck random regexCompat text xmlgen + monadControl mtl QuickCheck random regexCompat text time vector + xmlgen ]; testDepends = [ - aeson filepath mtl random regexCompat temporary text + aeson filepath HUnit mtl random regexCompat temporary text unorderedContainers ]; doCheck = false; diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.7.6.nix b/pkgs/development/libraries/haskell/QuickCheck/2.7.6.nix new file mode 100644 index 000000000000..60667b2afa01 --- /dev/null +++ b/pkgs/development/libraries/haskell/QuickCheck/2.7.6.nix @@ -0,0 +1,19 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, random, testFramework, tfRandom, transformers }: + +cabal.mkDerivation (self: { + pname = "QuickCheck"; + version = "2.7.6"; + sha256 = "09y5l0062l9i5jp9v6811kvkk4zpy0mizwaw44abgz0x1h59gn40"; + buildDepends = [ random tfRandom transformers ]; + testDepends = [ testFramework ]; + noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11"; + meta = { + homepage = "https://github.com/nick8325/quickcheck"; + description = "Automatic testing of Haskell programs"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/aeson/0.8.0.0.nix b/pkgs/development/libraries/haskell/aeson/0.8.0.0.nix new file mode 100644 index 000000000000..cfb256eb9b76 --- /dev/null +++ b/pkgs/development/libraries/haskell/aeson/0.8.0.0.nix @@ -0,0 +1,28 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit +, mtl, QuickCheck, scientific, syb, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, text, time +, unorderedContainers, vector +}: + +cabal.mkDerivation (self: { + pname = "aeson"; + version = "0.8.0.0"; + sha256 = "0p2x03wjawhav87jp57vwclra0gjwn1gqk74zgnji25ypwsvgkk4"; + buildDepends = [ + attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb + text time unorderedContainers vector + ]; + testDepends = [ + attoparsec HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 text time unorderedContainers vector + ]; + meta = { + homepage = "https://github.com/bos/aeson"; + description = "Fast JSON parsing and encoding"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix index 00bb1f5bdcb3..5dc139d058f9 100644 --- a/pkgs/development/libraries/haskell/conduit-extra/default.nix +++ b/pkgs/development/libraries/haskell/conduit-extra/default.nix @@ -1,22 +1,22 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, attoparsec, blazeBuilder, conduit, exceptions, filepath -, hspec, monadControl, network, primitive, resourcet +{ cabal, async, attoparsec, blazeBuilder, conduit, exceptions +, filepath, hspec, monadControl, network, primitive, resourcet, stm , streamingCommons, text, transformers, transformersBase }: cabal.mkDerivation (self: { pname = "conduit-extra"; - version = "1.1.1"; - sha256 = "1876kg7zb0gasl7ijmx48r5r2jv3c5xxa1xb6g6iqfysx0qsv6z2"; + version = "1.1.2"; + sha256 = "1hglg491vgy6hjggi7067rjly3dlnr3byf6xlc20narzr25sxfxi"; buildDepends = [ attoparsec blazeBuilder conduit filepath monadControl network - primitive resourcet streamingCommons text transformers + primitive resourcet stm streamingCommons text transformers transformersBase ]; testDepends = [ - attoparsec blazeBuilder conduit exceptions hspec resourcet text - transformers transformersBase + async attoparsec blazeBuilder conduit exceptions hspec resourcet + stm text transformers transformersBase ]; noHaddock = true; meta = { diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index c48108d20352..7d2375f4b360 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.1.6"; - sha256 = "1nhjj5zz934fd6fdbmkl8xvnvlaprxccgpwxffmdgqwxhvxgprq3"; + version = "1.1.7"; + sha256 = "0xk2his7qbidnzs56xcgnjipbnqmmnh74qy8dfvbznkkqhxdzmz6"; buildDepends = [ exceptions liftedBase mmorph monadControl mtl resourcet transformers transformersBase void diff --git a/pkgs/development/libraries/haskell/connection/default.nix b/pkgs/development/libraries/haskell/connection/default.nix index 2430496dbab7..8b2380767f3b 100644 --- a/pkgs/development/libraries/haskell/connection/default.nix +++ b/pkgs/development/libraries/haskell/connection/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "connection"; - version = "0.2.1"; - sha256 = "1wdjfc9lld3wkr7ncjkszmrwqp74p994ml3chymniz440xg1lxwy"; + version = "0.2.3"; + sha256 = "02mqn19pssdak82jw38p3cbwjyfvmjc6fawgx5981hzbdgb64vsb"; buildDepends = [ cprngAes dataDefaultClass network socks tls x509 x509Store x509System x509Validation diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index 92b41fc3e8b4..531273e5a135 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.8.3"; - sha256 = "03x9vp6mvk9hxs92cmy42aqiyh4prnh343xg36znyjii6xw2x3mf"; + version = "0.5.8.4"; + sha256 = "018j5z4cl9iv5m9wzjykh2gcn5d4fi7vahj76jv0ah101g6fqvrh"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/http-client-tls/default.nix b/pkgs/development/libraries/haskell/http-client-tls/default.nix index 6aa30625244e..ca4dbbe1085c 100644 --- a/pkgs/development/libraries/haskell/http-client-tls/default.nix +++ b/pkgs/development/libraries/haskell/http-client-tls/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "http-client-tls"; - version = "0.2.1.2"; - sha256 = "08qq2d4mqdd80jb99wm4gd4bqvnrlcpblvqgn18p8bzhw1qq6siy"; + version = "0.2.2"; + sha256 = "0a01r05h5fxswyn6k6cgqgak4scqjan72hyy5wbdqzzhl4rmh7j5"; buildDepends = [ connection dataDefaultClass httpClient network tls ]; diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix index e69b436374af..d52017615836 100644 --- a/pkgs/development/libraries/haskell/http-client/default.nix +++ b/pkgs/development/libraries/haskell/http-client/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "http-client"; - version = "0.3.4"; - sha256 = "0y4va0xfriv3qv31hbh7kbzmf61rr3ffr4z4vlfdlzacfv8307y4"; + version = "0.3.5"; + sha256 = "0ffr4xccm2yp5ikiz5dzzjm82vz7gab56l80ra9criry9qirmwqh"; 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 1c4afa9b1362..8d8c3af80932 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "2.1.2.3"; - sha256 = "07d9lhkqf1kr4mg61q0pcf8y73wkdymazxrvr425wjh9363r89gl"; + version = "2.1.3"; + sha256 = "1z9i0b9kl1kqh3nvbhh5vmqyg19pkdpj4cbkfhj0r47rbcynhwlb"; buildDepends = [ conduit httpClient httpClientTls httpTypes liftedBase monadControl mtl resourcet transformers diff --git a/pkgs/development/libraries/haskell/interpolate/default.nix b/pkgs/development/libraries/haskell/interpolate/default.nix index 6367c93fd322..eed6aa835f8f 100644 --- a/pkgs/development/libraries/haskell/interpolate/default.nix +++ b/pkgs/development/libraries/haskell/interpolate/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "interpolate"; - version = "0.0.2"; - sha256 = "0l9hrgwmvp7h2mgw90gk45zgp0yy00201ki9hwg26sh2wd0sj6f8"; + version = "0.0.3"; + sha256 = "05aksslx7mvic3cgw9ixwjp0r759a4gf7m178pbp8xm8dpdksjjw"; buildDepends = [ haskellSrcMeta ]; testDepends = [ doctest haskellSrcMeta hspec QuickCheck quickcheckInstances text diff --git a/pkgs/development/libraries/haskell/iproute/default.nix b/pkgs/development/libraries/haskell/iproute/default.nix index 9d4ff61bd419..2aa33e9b4417 100644 --- a/pkgs/development/libraries/haskell/iproute/default.nix +++ b/pkgs/development/libraries/haskell/iproute/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "iproute"; - version = "1.2.12"; - sha256 = "19pr6my4nw7qq9lsp6xvz55lm9svwzqka5qcqy79sfdkxg459rg5"; + version = "1.3.0"; + sha256 = "1n9lcm1f2rlqkvg90zikf2h4badzh9r24zqb27648l48254m6q5p"; buildDepends = [ appar byteorder network ]; testDepends = [ appar byteorder doctest hspec network QuickCheck safe diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix index e50835a43fa9..8a4122efc8fa 100644 --- a/pkgs/development/libraries/haskell/monad-logger/default.nix +++ b/pkgs/development/libraries/haskell/monad-logger/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "monad-logger"; - version = "0.3.6.1"; - sha256 = "0ylsrhp2a9qir03nmmz6rkim149pw1fgm63lfg611gvh598ig6ss"; + version = "0.3.7"; + sha256 = "03fzp8cvx8qapyjgnm6gywj8b1pcd43y3fb4vg1wgxa55lsg6y58"; buildDepends = [ blazeBuilder conduit conduitExtra exceptions fastLogger liftedBase monadControl monadLoops mtl resourcet stm stmChans text diff --git a/pkgs/development/libraries/haskell/parsers/0.12.nix b/pkgs/development/libraries/haskell/parsers/0.12.nix new file mode 100644 index 000000000000..bb383b078aa7 --- /dev/null +++ b/pkgs/development/libraries/haskell/parsers/0.12.nix @@ -0,0 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, attoparsec, charset, doctest, filepath, parsec, QuickCheck +, quickcheckInstances, text, transformers, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "parsers"; + version = "0.12"; + sha256 = "0lb1djb2mmlkfqpbz7683i27d3ivv0r99l6w79951wgsqb62xph3"; + buildDepends = [ + attoparsec charset parsec text transformers unorderedContainers + ]; + testDepends = [ + attoparsec doctest filepath parsec QuickCheck quickcheckInstances + ]; + meta = { + homepage = "http://github.com/ekmett/parsers/"; + description = "Parsing combinators"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/path-pieces/default.nix b/pkgs/development/libraries/haskell/path-pieces/default.nix index 4b5bb612b716..5fc9faecf2e6 100644 --- a/pkgs/development/libraries/haskell/path-pieces/default.nix +++ b/pkgs/development/libraries/haskell/path-pieces/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "path-pieces"; - version = "0.1.3.1"; - sha256 = "140pkci5k6aa9ncxa29fn2p0g6lb79zci0k02nblv59qmj5hj8ic"; + version = "0.1.4"; + sha256 = "1fxhp4bk88km7z1rdpify7l38li5k21qxw3vgcmq9b6bblvz6y2v"; buildDepends = [ text time ]; testDepends = [ hspec HUnit QuickCheck text ]; meta = { diff --git a/pkgs/development/libraries/haskell/process-conduit/default.nix b/pkgs/development/libraries/haskell/process-conduit/default.nix index 6cf6a7aac17e..ff8a54b85717 100644 --- a/pkgs/development/libraries/haskell/process-conduit/default.nix +++ b/pkgs/development/libraries/haskell/process-conduit/default.nix @@ -1,22 +1,22 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, conduit, controlMonadLoop, hspec, mtl, resourcet -, shakespeare, shakespeareText, text +{ cabal, conduit, conduitExtra, controlMonadLoop, hspec, mtl +, resourcet, shakespeare, shakespeareText, text }: cabal.mkDerivation (self: { pname = "process-conduit"; - version = "1.1.0.0"; - sha256 = "1b3snck651cpb7i3c78cn264zrjan3lzydf59209abkvb6fv1hql"; + version = "1.2.0.1"; + sha256 = "0hnbywmjvk3y26sc9a0jfqzm04pg08zd2bflld1mvni02s89lvc8"; buildDepends = [ conduit controlMonadLoop mtl resourcet shakespeare shakespeareText text ]; - testDepends = [ conduit hspec ]; + testDepends = [ conduit conduitExtra hspec resourcet ]; doCheck = false; meta = { - homepage = "http://github.com/tanakh/process-conduit"; - description = "Conduits for processes"; + homepage = "http://github.com/snoyberg/process-conduit"; + description = "Conduits for processes (deprecated)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix index a178dce43d12..ab05167683fc 100644 --- a/pkgs/development/libraries/haskell/purescript/default.nix +++ b/pkgs/development/libraries/haskell/purescript/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "purescript"; - version = "0.5.2.6"; - sha256 = "0aszzaj3942xgq0nmql68s5cgplhkqrk0k6cfd1mx5lq5n0qxf94"; + version = "0.5.3"; + sha256 = "05vhz3j4gx9paxmvimy154730078bl148819shwml6l6vq02723i"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/reflection/default.nix b/pkgs/development/libraries/haskell/reflection/default.nix index 67827299280a..b7138c3e9746 100644 --- a/pkgs/development/libraries/haskell/reflection/default.nix +++ b/pkgs/development/libraries/haskell/reflection/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "reflection"; - version = "1.4"; - sha256 = "0i6yb3fa9wizyaz8x9b7yzkw9jf7zahdrkr2y0iw7igdxqn4n0k7"; + version = "1.5.1"; + sha256 = "18ail6j7rs5jff9zxphxd7vjkwanpv12dhi98s86r65425fdhjlx"; buildDepends = [ tagged ]; meta = { homepage = "http://github.com/ekmett/reflection"; diff --git a/pkgs/development/libraries/haskell/safe/default.nix b/pkgs/development/libraries/haskell/safe/default.nix index f6eaed8f3b56..21f2140295a6 100644 --- a/pkgs/development/libraries/haskell/safe/default.nix +++ b/pkgs/development/libraries/haskell/safe/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "safe"; - version = "0.3.6"; - sha256 = "03fjasjw8mh8c15xg8dncdn9g8scr427889vchcckilll40kvzvm"; + version = "0.3.7"; + sha256 = "0rw8mjarwl7rwc6fczq0zxlp1nlb6r1rk71whwziwi032hgc8561"; meta = { homepage = "http://community.haskell.org/~ndm/safe/"; description = "Library of safe (exception free) functions"; diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix index 857614ce751e..3d879f12b9d4 100644 --- a/pkgs/development/libraries/haskell/statistics/default.nix +++ b/pkgs/development/libraries/haskell/statistics/default.nix @@ -1,6 +1,6 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, binary, deepseq, erf, HUnit, ieee754, mathFunctions +{ cabal, aeson, binary, deepseq, erf, HUnit, ieee754, mathFunctions , monadPar, mwcRandom, primitive, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, vector , vectorAlgorithms, vectorBinaryInstances @@ -8,10 +8,10 @@ cabal.mkDerivation (self: { pname = "statistics"; - version = "0.11.0.3"; - sha256 = "184lzivqjjj69pxcnr5ibxjqikypfl5nd63i44qgwdhwyvcaqdh3"; + version = "0.13.1.0"; + sha256 = "0y46fna0kqs8bsqbf3v1k9ppq3njd5kxf1qlvvmphydpi3x038nd"; buildDepends = [ - binary deepseq erf mathFunctions monadPar mwcRandom primitive + aeson binary deepseq erf mathFunctions monadPar mwcRandom primitive vector vectorAlgorithms vectorBinaryInstances ]; testDepends = [ diff --git a/pkgs/development/libraries/haskell/streaming-commons/default.nix b/pkgs/development/libraries/haskell/streaming-commons/default.nix index 763476dd1c08..6e8aeb10ff7e 100644 --- a/pkgs/development/libraries/haskell/streaming-commons/default.nix +++ b/pkgs/development/libraries/haskell/streaming-commons/default.nix @@ -1,15 +1,15 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, async, blazeBuilder, deepseq, hspec, network, QuickCheck -, random, text, transformers, zlib +, random, stm, text, transformers, zlib }: cabal.mkDerivation (self: { pname = "streaming-commons"; - version = "0.1.3.1"; - sha256 = "0ryj9pp681f1pqvcyy5ci2zng6ax93j5navm886k095wxmamhzmf"; + version = "0.1.4"; + sha256 = "0p18sha2xa583rn9jyhylcykgrvydrwnl47c2wxf1c1yswn45iz6"; buildDepends = [ - blazeBuilder network random text transformers zlib + blazeBuilder network random stm text transformers zlib ]; testDepends = [ async blazeBuilder deepseq hspec network QuickCheck text zlib diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix index 43f3fe706290..1fc8fd24e252 100644 --- a/pkgs/development/libraries/haskell/unix-time/default.nix +++ b/pkgs/development/libraries/haskell/unix-time/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "unix-time"; - version = "0.3.1"; - sha256 = "1r7glbcr3108zrlpy2d09jyk1gv9k90d5saajipmb1f5l45rdhnj"; + version = "0.3.2"; + sha256 = "0bbzrm4hprqsljwscpfmnw3ipj809q7570alzn1qampijsbb4cds"; buildDepends = [ binary ]; testDepends = [ doctest hspec QuickCheck time ]; meta = { diff --git a/pkgs/development/libraries/haskell/webdriver/default.nix b/pkgs/development/libraries/haskell/webdriver/default.nix index fd01f1c75e6b..d3a041d9a8dc 100644 --- a/pkgs/development/libraries/haskell/webdriver/default.nix +++ b/pkgs/development/libraries/haskell/webdriver/default.nix @@ -1,21 +1,21 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, aeson, attoparsec, base64Bytestring, cond, dataDefault -, directoryTree, exceptions, filepath, HTTP, liftedBase -, monadControl, mtl, network, parallel, scientific, temporary, text -, time, transformers, transformersBase, unorderedContainers, vector -, zipArchive +, directoryTree, exceptions, filepath, httpClient, httpTypes +, liftedBase, monadControl, mtl, network, parallel, scientific +, temporary, text, time, transformers, transformersBase +, unorderedContainers, vector, zipArchive }: cabal.mkDerivation (self: { pname = "webdriver"; - version = "0.5.5"; - sha256 = "1k656ghkaqlnp4a9dd99s3l2vm21zsqpqxwfg2lq5rx2yw402nga"; + version = "0.6.0.1"; + sha256 = "0qpk1i6qr12lcx25bdljwqxgdhf5qk67h04bp6vwmm16dwzsyqd1"; buildDepends = [ aeson attoparsec base64Bytestring cond dataDefault directoryTree - exceptions filepath HTTP liftedBase monadControl mtl network - scientific temporary text time transformers transformersBase - unorderedContainers vector zipArchive + exceptions filepath httpClient httpTypes liftedBase monadControl + mtl network scientific temporary text time transformers + transformersBase unorderedContainers vector zipArchive ]; testDepends = [ parallel text ]; jailbreak = true; diff --git a/pkgs/development/libraries/haskell/word8/default.nix b/pkgs/development/libraries/haskell/word8/default.nix index 7ffbbf7cba7e..ad6b59153834 100644 --- a/pkgs/development/libraries/haskell/word8/default.nix +++ b/pkgs/development/libraries/haskell/word8/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "word8"; - version = "0.1.0"; - sha256 = "1729ip83wyw8w3v8mzmazaw5b9l81zg95hrkmfq3qjk5gz1s75s0"; + version = "0.1.1"; + sha256 = "1xpa0haacimrblxg3x3n5vdcnkg3ff5zqamppdarv0zvkcdj139r"; testDepends = [ hspec ]; meta = { description = "Word8 library"; diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index 92e44ae92b6e..88475a1e951a 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yaml"; - version = "0.8.8.3"; - sha256 = "031d1wx31mw9lw0swlcf1xfzdixaq6wmglhzaj9sixhid0r2isvf"; + version = "0.8.8.4"; + sha256 = "1mh5xv66cqvk0r5n6pwcm11m9489y40l69ca417yvymkksmncc7b"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/documentation/haddock/2.14.3.nix b/pkgs/development/tools/documentation/haddock/2.14.3.nix new file mode 100644 index 000000000000..2ee55bebd014 --- /dev/null +++ b/pkgs/development/tools/documentation/haddock/2.14.3.nix @@ -0,0 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, Cabal, deepseq, filepath, ghcPaths, hspec, QuickCheck +, xhtml +}: + +cabal.mkDerivation (self: { + pname = "haddock"; + version = "2.14.3"; + sha256 = "031ikrsbkpmmwgdkgdr8s19dfx5y6n39rmyljjdfqygas17gcm6l"; + isLibrary = true; + isExecutable = true; + buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; + testDepends = [ Cabal deepseq filepath hspec QuickCheck ]; + doCheck = false; + meta = { + homepage = "http://www.haskell.org/haddock/"; + description = "A documentation-generation tool for Haskell libraries"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix index 66048f7cc09e..377f3c6f08de 100644 --- a/pkgs/development/tools/haskell/HaRe/default.nix +++ b/pkgs/development/tools/haskell/HaRe/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "HaRe"; - version = "0.7.2.4"; - sha256 = "1ljyvs3mdgxzyvss071yvgnrnmhdyp9a10cmvij1d47li1wbj1j1"; + version = "0.7.2.5"; + sha256 = "09v0z1r03bzazgjf26fv54q1jpmv14zyl6w9083xcf2cs3yy6vfh"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/haskell/codex/default.nix b/pkgs/development/tools/haskell/codex/default.nix index 0a68e7939d71..f0c9a6a6aaac 100644 --- a/pkgs/development/tools/haskell/codex/default.nix +++ b/pkgs/development/tools/haskell/codex/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "codex"; - version = "0.1.0.1"; - sha256 = "1s2sn2i0ah4wgyzz5vqkm65jkl3c38cwa2kp0az4xl3vb8y6x7la"; + version = "0.1.0.2"; + sha256 = "0dsc5dx5zcxf5wd2qf6gqzr8d613z1gkllmzzkbny3lxa512crsw"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index bf3089a2e80b..af102d8fefc4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -141,7 +141,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in aeson_0_7_0_4 = callPackage ../development/libraries/haskell/aeson/0.7.0.4.nix { blazeBuilder = null; }; aeson_0_7_0_6 = callPackage ../development/libraries/haskell/aeson/0.7.0.6.nix { blazeBuilder = null; }; - aeson = self.aeson_0_7_0_6; + aeson_0_8_0_0 = callPackage ../development/libraries/haskell/aeson/0.8.0.0.nix { blazeBuilder = null; }; + aeson = self.aeson_0_7_0_6; # 0.8.0.0 breaks too many packages at the moment aesonPretty = callPackage ../development/libraries/haskell/aeson-pretty {}; @@ -1727,7 +1728,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in parsers_0_10_3 = callPackage ../development/libraries/haskell/parsers/0.10.3.nix {}; parsers_0_11_0_3 = callPackage ../development/libraries/haskell/parsers/0.11.0.3.nix {}; - parsers = self.parsers_0_11_0_3; + parsers_0_12 = callPackage ../development/libraries/haskell/parsers/0.12.nix {}; + parsers = self.parsers_0_11_0_3; # the new version breaks trifecta parsimony = callPackage ../development/libraries/haskell/parsimony {}; @@ -1876,8 +1878,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in QuickCheck_2_4_2 = callPackage ../development/libraries/haskell/QuickCheck/2.4.2.nix {}; QuickCheck_2_5_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.5.1.1.nix {}; QuickCheck_2_6 = callPackage ../development/libraries/haskell/QuickCheck/2.6.nix {}; - QuickCheck_2_7_5 = callPackage ../development/libraries/haskell/QuickCheck/2.7.5.nix {}; - QuickCheck = self.QuickCheck_2_7_5; + QuickCheck_2_7_6 = callPackage ../development/libraries/haskell/QuickCheck/2.7.6.nix {}; + QuickCheck = self.QuickCheck_2_7_6; quickcheckAssertions = callPackage ../development/libraries/haskell/quickcheck-assertions {}; @@ -2760,7 +2762,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in haddock_2_12_0 = callPackage ../development/tools/documentation/haddock/2.12.0.nix {}; haddock_2_13_2 = callPackage ../development/tools/documentation/haddock/2.13.2.nix {}; haddock_2_14_2 = callPackage ../development/tools/documentation/haddock/2.14.2.nix {}; - haddock = self.haddock_2_14_2; + haddock_2_14_3 = callPackage ../development/tools/documentation/haddock/2.14.3.nix {}; + haddock = self.haddock_2_14_3; HandsomeSoup = callPackage ../development/libraries/haskell/HandsomeSoup {}; |