Merge branch 'master' of https://github.com/NixOS/nixpkgs

+218 -116
+28 -24
pkgs/applications/version-management/git-and-tools/git-annex/default.nix
··· 7 7 , gnupg1, gnutls, hamlet, hinotify, hS3, hslogger, HTTP, httpClient 8 8 , httpConduit, httpTypes, IfElse, json, liftedBase, lsof, MissingH 9 9 , monadControl, mtl, network, networkInfo, networkMulticast 10 - , networkProtocolXmpp, openssh, optparseApplicative, perl 11 - , QuickCheck, random, regexTdfa, rsync, SafeSemaphore, securemem 12 - , SHA, shakespeare, stm, tasty, tastyHunit, tastyQuickcheck 13 - , tastyRerun, text, time, transformers, unixCompat, utf8String 14 - , uuid, wai, waiExtra, warp, warpTls, which, xmlTypes, yesod 15 - , yesodCore, yesodDefault, yesodForm, yesodStatic 16 - , fsnotify 10 + , networkProtocolXmpp, openssh, optparseApplicative, pathPieces 11 + , perl, QuickCheck, random, regexTdfa, rsync, SafeSemaphore 12 + , securemem, SHA, shakespeare, stm, tasty, tastyHunit 13 + , tastyQuickcheck, tastyRerun, text, time, transformers, unixCompat 14 + , utf8String, uuid, wai, waiExtra, warp, warpTls, which, xmlTypes 15 + , yesod, yesodCore, yesodDefault, yesodForm, yesodStatic 17 16 }: 18 17 19 18 cabal.mkDerivation (self: { 20 19 pname = "git-annex"; 21 - version = "5.20140709"; 22 - sha256 = "0n636b52199kj8w3awfvrabg6c76kb133gbfh9r8sp0xrg376z2s"; 20 + version = "5.20140717"; 21 + sha256 = "199gqp85f6xnyg3svs23n3r6q4pflvz4zy5y376klay9mzzp0rbl"; 23 22 isLibrary = false; 24 23 isExecutable = true; 25 24 buildDepends = [ 26 25 aeson async blazeBuilder bloomfilter byteable caseInsensitive 27 - clientsession cryptoApi cryptohash dataDefault dataenc DAV 28 - dlist dns editDistance exceptions extensibleExceptions 29 - feed filepath gnutls hamlet hS3 hslogger HTTP httpClient 26 + clientsession cryptoApi cryptohash dataDefault dataenc DAV dbus 27 + dlist dns editDistance exceptions extensibleExceptions fdoNotify 28 + feed filepath gnutls hamlet hinotify hS3 hslogger HTTP httpClient 30 29 httpConduit httpTypes IfElse json liftedBase MissingH monadControl 31 30 mtl network networkInfo networkMulticast networkProtocolXmpp 32 - optparseApplicative QuickCheck random regexTdfa SafeSemaphore 33 - securemem SHA shakespeare stm tasty tastyHunit tastyQuickcheck 34 - tastyRerun text time transformers unixCompat utf8String uuid wai 35 - waiExtra warp warpTls xmlTypes yesod yesodCore yesodDefault 36 - yesodForm yesodStatic 37 - ] ++ (if self.stdenv.isDarwin then [ 38 - fsnotify 39 - ] else [ 40 - dbus fdoNotify hinotify 41 - ]); 31 + optparseApplicative pathPieces QuickCheck random regexTdfa 32 + SafeSemaphore securemem SHA shakespeare stm tasty tastyHunit 33 + tastyQuickcheck tastyRerun text time transformers unixCompat 34 + utf8String uuid wai waiExtra warp warpTls xmlTypes yesod yesodCore 35 + yesodDefault yesodForm yesodStatic 36 + ]; 42 37 buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ]; 43 - configureFlags = "-fAssistant 44 - -fProduction"; 38 + configureFlags = "-fS3 39 + -fWebDAV 40 + -fInotify 41 + -fDbus 42 + -fAssistant 43 + -fWebapp 44 + -fPairing 45 + -fXMPP 46 + -fDNS 47 + -fProduction 48 + -fTDFA"; 45 49 preConfigure = '' 46 50 export HOME="$NIX_BUILD_TOP/tmp" 47 51 mkdir "$HOME"
+15 -15
pkgs/development/compilers/idris/default.nix
··· 1 1 # This file was auto-generated by cabal2nix. Please do NOT edit manually! 2 2 3 - { cabal, annotatedWlPprint, ansiTerminal, ansiWlPprint, binary 4 - , blazeHtml, blazeMarkup, boehmgc, Cabal, cheapskate, deepseq 5 - , filepath, gmp, happy, haskeline, languageJava, lens, libffi 6 - , llvmGeneral, llvmGeneralPure, mtl, network, optparseApplicative 7 - , parsers, split, text, time, transformers, trifecta 8 - , unorderedContainers, utf8String, vector, vectorBinaryInstances 9 - , xml, zlib 3 + { cabal, annotatedWlPprint, ansiTerminal, ansiWlPprint 4 + , base64Bytestring, binary, blazeHtml, blazeMarkup, boehmgc, Cabal 5 + , cheapskate, deepseq, filepath, fingertree, gmp, happy, haskeline 6 + , languageJava, lens, libffi, llvmGeneral, llvmGeneralPure, mtl 7 + , network, optparseApplicative, parsers, split, text, time 8 + , transformers, trifecta, unorderedContainers, utf8String, vector 9 + , vectorBinaryInstances, xml, zlib 10 10 }: 11 11 12 12 cabal.mkDerivation (self: { 13 13 pname = "idris"; 14 - version = "0.9.13.1"; 15 - sha256 = "09528c2zxriw3l8c7dd2k5db9j1qmqhs6nbqwc7dkskzqv9snz7n"; 14 + version = "0.9.14"; 15 + sha256 = "0kfzp89sass93p9zsxq616zfix7ipi1rmjqmcjixihi01k7c0b8b"; 16 16 isLibrary = true; 17 17 isExecutable = true; 18 18 buildDepends = [ 19 - annotatedWlPprint ansiTerminal ansiWlPprint binary blazeHtml 20 - blazeMarkup Cabal cheapskate deepseq filepath haskeline 21 - languageJava lens libffi llvmGeneral llvmGeneralPure mtl network 22 - optparseApplicative parsers split text time transformers trifecta 23 - unorderedContainers utf8String vector vectorBinaryInstances xml 24 - zlib 19 + annotatedWlPprint ansiTerminal ansiWlPprint base64Bytestring binary 20 + blazeHtml blazeMarkup Cabal cheapskate deepseq filepath fingertree 21 + haskeline languageJava lens libffi llvmGeneral llvmGeneralPure mtl 22 + network optparseApplicative parsers split text time transformers 23 + trifecta unorderedContainers utf8String vector 24 + vectorBinaryInstances xml zlib 25 25 ]; 26 26 buildTools = [ happy ]; 27 27 extraLibraries = [ boehmgc gmp ];
+7 -5
pkgs/development/libraries/haskell/HTF/default.nix
··· 2 2 3 3 { cabal, aeson, base64Bytestring, cpphs, Diff, filepath 4 4 , haskellSrcExts, HUnit, liftedBase, monadControl, mtl, QuickCheck 5 - , random, regexCompat, temporary, text, unorderedContainers, xmlgen 5 + , random, regexCompat, temporary, text, time, unorderedContainers 6 + , vector, xmlgen 6 7 }: 7 8 8 9 cabal.mkDerivation (self: { 9 10 pname = "HTF"; 10 - version = "0.11.4.0"; 11 - sha256 = "0bg84x6xk359zby04xw62yy227fk85mgs7x5nkdbsxcajm7j0bs9"; 11 + version = "0.12.0.0"; 12 + sha256 = "1mbil44gbcl52f84dphxkdvxsyz8bhc532mlq37aqr1bmj54rv0i"; 12 13 isLibrary = true; 13 14 isExecutable = true; 14 15 buildDepends = [ 15 16 aeson base64Bytestring cpphs Diff haskellSrcExts HUnit liftedBase 16 - monadControl mtl QuickCheck random regexCompat text xmlgen 17 + monadControl mtl QuickCheck random regexCompat text time vector 18 + xmlgen 17 19 ]; 18 20 testDepends = [ 19 - aeson filepath mtl random regexCompat temporary text 21 + aeson filepath HUnit mtl random regexCompat temporary text 20 22 unorderedContainers 21 23 ]; 22 24 doCheck = false;
+19
pkgs/development/libraries/haskell/QuickCheck/2.7.6.nix
··· 1 + # This file was auto-generated by cabal2nix. Please do NOT edit manually! 2 + 3 + { cabal, random, testFramework, tfRandom, transformers }: 4 + 5 + cabal.mkDerivation (self: { 6 + pname = "QuickCheck"; 7 + version = "2.7.6"; 8 + sha256 = "09y5l0062l9i5jp9v6811kvkk4zpy0mizwaw44abgz0x1h59gn40"; 9 + buildDepends = [ random tfRandom transformers ]; 10 + testDepends = [ testFramework ]; 11 + noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11"; 12 + meta = { 13 + homepage = "https://github.com/nick8325/quickcheck"; 14 + description = "Automatic testing of Haskell programs"; 15 + license = self.stdenv.lib.licenses.bsd3; 16 + platforms = self.ghc.meta.platforms; 17 + maintainers = [ self.stdenv.lib.maintainers.andres ]; 18 + }; 19 + })
+28
pkgs/development/libraries/haskell/aeson/0.8.0.0.nix
··· 1 + # This file was auto-generated by cabal2nix. Please do NOT edit manually! 2 + 3 + { cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit 4 + , mtl, QuickCheck, scientific, syb, testFramework 5 + , testFrameworkHunit, testFrameworkQuickcheck2, text, time 6 + , unorderedContainers, vector 7 + }: 8 + 9 + cabal.mkDerivation (self: { 10 + pname = "aeson"; 11 + version = "0.8.0.0"; 12 + sha256 = "0p2x03wjawhav87jp57vwclra0gjwn1gqk74zgnji25ypwsvgkk4"; 13 + buildDepends = [ 14 + attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb 15 + text time unorderedContainers vector 16 + ]; 17 + testDepends = [ 18 + attoparsec HUnit QuickCheck testFramework testFrameworkHunit 19 + testFrameworkQuickcheck2 text time unorderedContainers vector 20 + ]; 21 + meta = { 22 + homepage = "https://github.com/bos/aeson"; 23 + description = "Fast JSON parsing and encoding"; 24 + license = self.stdenv.lib.licenses.bsd3; 25 + platforms = self.ghc.meta.platforms; 26 + maintainers = [ self.stdenv.lib.maintainers.andres ]; 27 + }; 28 + })
+7 -7
pkgs/development/libraries/haskell/conduit-extra/default.nix
··· 1 1 # This file was auto-generated by cabal2nix. Please do NOT edit manually! 2 2 3 - { cabal, attoparsec, blazeBuilder, conduit, exceptions, filepath 4 - , hspec, monadControl, network, primitive, resourcet 3 + { cabal, async, attoparsec, blazeBuilder, conduit, exceptions 4 + , filepath, hspec, monadControl, network, primitive, resourcet, stm 5 5 , streamingCommons, text, transformers, transformersBase 6 6 }: 7 7 8 8 cabal.mkDerivation (self: { 9 9 pname = "conduit-extra"; 10 - version = "1.1.1"; 11 - sha256 = "1876kg7zb0gasl7ijmx48r5r2jv3c5xxa1xb6g6iqfysx0qsv6z2"; 10 + version = "1.1.2"; 11 + sha256 = "1hglg491vgy6hjggi7067rjly3dlnr3byf6xlc20narzr25sxfxi"; 12 12 buildDepends = [ 13 13 attoparsec blazeBuilder conduit filepath monadControl network 14 - primitive resourcet streamingCommons text transformers 14 + primitive resourcet stm streamingCommons text transformers 15 15 transformersBase 16 16 ]; 17 17 testDepends = [ 18 - attoparsec blazeBuilder conduit exceptions hspec resourcet text 19 - transformers transformersBase 18 + async attoparsec blazeBuilder conduit exceptions hspec resourcet 19 + stm text transformers transformersBase 20 20 ]; 21 21 noHaddock = true; 22 22 meta = {
+2 -2
pkgs/development/libraries/haskell/conduit/default.nix
··· 6 6 7 7 cabal.mkDerivation (self: { 8 8 pname = "conduit"; 9 - version = "1.1.6"; 10 - sha256 = "1nhjj5zz934fd6fdbmkl8xvnvlaprxccgpwxffmdgqwxhvxgprq3"; 9 + version = "1.1.7"; 10 + sha256 = "0xk2his7qbidnzs56xcgnjipbnqmmnh74qy8dfvbznkkqhxdzmz6"; 11 11 buildDepends = [ 12 12 exceptions liftedBase mmorph monadControl mtl resourcet 13 13 transformers transformersBase void
+2 -2
pkgs/development/libraries/haskell/connection/default.nix
··· 6 6 7 7 cabal.mkDerivation (self: { 8 8 pname = "connection"; 9 - version = "0.2.1"; 10 - sha256 = "1wdjfc9lld3wkr7ncjkszmrwqp74p994ml3chymniz440xg1lxwy"; 9 + version = "0.2.3"; 10 + sha256 = "02mqn19pssdak82jw38p3cbwjyfvmjc6fawgx5981hzbdgb64vsb"; 11 11 buildDepends = [ 12 12 cprngAes dataDefaultClass network socks tls x509 x509Store 13 13 x509System x509Validation
+2 -2
pkgs/development/libraries/haskell/highlighting-kate/default.nix
··· 4 4 5 5 cabal.mkDerivation (self: { 6 6 pname = "highlighting-kate"; 7 - version = "0.5.8.3"; 8 - sha256 = "03x9vp6mvk9hxs92cmy42aqiyh4prnh343xg36znyjii6xw2x3mf"; 7 + version = "0.5.8.4"; 8 + sha256 = "018j5z4cl9iv5m9wzjykh2gcn5d4fi7vahj76jv0ah101g6fqvrh"; 9 9 isLibrary = true; 10 10 isExecutable = true; 11 11 buildDepends = [
+2 -2
pkgs/development/libraries/haskell/http-client-tls/default.nix
··· 6 6 7 7 cabal.mkDerivation (self: { 8 8 pname = "http-client-tls"; 9 - version = "0.2.1.2"; 10 - sha256 = "08qq2d4mqdd80jb99wm4gd4bqvnrlcpblvqgn18p8bzhw1qq6siy"; 9 + version = "0.2.2"; 10 + sha256 = "0a01r05h5fxswyn6k6cgqgak4scqjan72hyy5wbdqzzhl4rmh7j5"; 11 11 buildDepends = [ 12 12 connection dataDefaultClass httpClient network tls 13 13 ];
+2 -2
pkgs/development/libraries/haskell/http-client/default.nix
··· 8 8 9 9 cabal.mkDerivation (self: { 10 10 pname = "http-client"; 11 - version = "0.3.4"; 12 - sha256 = "0y4va0xfriv3qv31hbh7kbzmf61rr3ffr4z4vlfdlzacfv8307y4"; 11 + version = "0.3.5"; 12 + sha256 = "0ffr4xccm2yp5ikiz5dzzjm82vz7gab56l80ra9criry9qirmwqh"; 13 13 buildDepends = [ 14 14 base64Bytestring blazeBuilder caseInsensitive cookie 15 15 dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes
+2 -2
pkgs/development/libraries/haskell/http-conduit/default.nix
··· 9 9 10 10 cabal.mkDerivation (self: { 11 11 pname = "http-conduit"; 12 - version = "2.1.2.3"; 13 - sha256 = "07d9lhkqf1kr4mg61q0pcf8y73wkdymazxrvr425wjh9363r89gl"; 12 + version = "2.1.3"; 13 + sha256 = "1z9i0b9kl1kqh3nvbhh5vmqyg19pkdpj4cbkfhj0r47rbcynhwlb"; 14 14 buildDepends = [ 15 15 conduit httpClient httpClientTls httpTypes liftedBase monadControl 16 16 mtl resourcet transformers
+2 -2
pkgs/development/libraries/haskell/interpolate/default.nix
··· 6 6 7 7 cabal.mkDerivation (self: { 8 8 pname = "interpolate"; 9 - version = "0.0.2"; 10 - sha256 = "0l9hrgwmvp7h2mgw90gk45zgp0yy00201ki9hwg26sh2wd0sj6f8"; 9 + version = "0.0.3"; 10 + sha256 = "05aksslx7mvic3cgw9ixwjp0r759a4gf7m178pbp8xm8dpdksjjw"; 11 11 buildDepends = [ haskellSrcMeta ]; 12 12 testDepends = [ 13 13 doctest haskellSrcMeta hspec QuickCheck quickcheckInstances text
+2 -2
pkgs/development/libraries/haskell/iproute/default.nix
··· 6 6 7 7 cabal.mkDerivation (self: { 8 8 pname = "iproute"; 9 - version = "1.2.12"; 10 - sha256 = "19pr6my4nw7qq9lsp6xvz55lm9svwzqka5qcqy79sfdkxg459rg5"; 9 + version = "1.3.0"; 10 + sha256 = "1n9lcm1f2rlqkvg90zikf2h4badzh9r24zqb27648l48254m6q5p"; 11 11 buildDepends = [ appar byteorder network ]; 12 12 testDepends = [ 13 13 appar byteorder doctest hspec network QuickCheck safe
+2 -2
pkgs/development/libraries/haskell/monad-logger/default.nix
··· 7 7 8 8 cabal.mkDerivation (self: { 9 9 pname = "monad-logger"; 10 - version = "0.3.6.1"; 11 - sha256 = "0ylsrhp2a9qir03nmmz6rkim149pw1fgm63lfg611gvh598ig6ss"; 10 + version = "0.3.7"; 11 + sha256 = "03fzp8cvx8qapyjgnm6gywj8b1pcd43y3fb4vg1wgxa55lsg6y58"; 12 12 buildDepends = [ 13 13 blazeBuilder conduit conduitExtra exceptions fastLogger liftedBase 14 14 monadControl monadLoops mtl resourcet stm stmChans text
+23
pkgs/development/libraries/haskell/parsers/0.12.nix
··· 1 + # This file was auto-generated by cabal2nix. Please do NOT edit manually! 2 + 3 + { cabal, attoparsec, charset, doctest, filepath, parsec, QuickCheck 4 + , quickcheckInstances, text, transformers, unorderedContainers 5 + }: 6 + 7 + cabal.mkDerivation (self: { 8 + pname = "parsers"; 9 + version = "0.12"; 10 + sha256 = "0lb1djb2mmlkfqpbz7683i27d3ivv0r99l6w79951wgsqb62xph3"; 11 + buildDepends = [ 12 + attoparsec charset parsec text transformers unorderedContainers 13 + ]; 14 + testDepends = [ 15 + attoparsec doctest filepath parsec QuickCheck quickcheckInstances 16 + ]; 17 + meta = { 18 + homepage = "http://github.com/ekmett/parsers/"; 19 + description = "Parsing combinators"; 20 + license = self.stdenv.lib.licenses.bsd3; 21 + platforms = self.ghc.meta.platforms; 22 + }; 23 + })
+2 -2
pkgs/development/libraries/haskell/path-pieces/default.nix
··· 4 4 5 5 cabal.mkDerivation (self: { 6 6 pname = "path-pieces"; 7 - version = "0.1.3.1"; 8 - sha256 = "140pkci5k6aa9ncxa29fn2p0g6lb79zci0k02nblv59qmj5hj8ic"; 7 + version = "0.1.4"; 8 + sha256 = "1fxhp4bk88km7z1rdpify7l38li5k21qxw3vgcmq9b6bblvz6y2v"; 9 9 buildDepends = [ text time ]; 10 10 testDepends = [ hspec HUnit QuickCheck text ]; 11 11 meta = {
+7 -7
pkgs/development/libraries/haskell/process-conduit/default.nix
··· 1 1 # This file was auto-generated by cabal2nix. Please do NOT edit manually! 2 2 3 - { cabal, conduit, controlMonadLoop, hspec, mtl, resourcet 4 - , shakespeare, shakespeareText, text 3 + { cabal, conduit, conduitExtra, controlMonadLoop, hspec, mtl 4 + , resourcet, shakespeare, shakespeareText, text 5 5 }: 6 6 7 7 cabal.mkDerivation (self: { 8 8 pname = "process-conduit"; 9 - version = "1.1.0.0"; 10 - sha256 = "1b3snck651cpb7i3c78cn264zrjan3lzydf59209abkvb6fv1hql"; 9 + version = "1.2.0.1"; 10 + sha256 = "0hnbywmjvk3y26sc9a0jfqzm04pg08zd2bflld1mvni02s89lvc8"; 11 11 buildDepends = [ 12 12 conduit controlMonadLoop mtl resourcet shakespeare shakespeareText 13 13 text 14 14 ]; 15 - testDepends = [ conduit hspec ]; 15 + testDepends = [ conduit conduitExtra hspec resourcet ]; 16 16 doCheck = false; 17 17 meta = { 18 - homepage = "http://github.com/tanakh/process-conduit"; 19 - description = "Conduits for processes"; 18 + homepage = "http://github.com/snoyberg/process-conduit"; 19 + description = "Conduits for processes (deprecated)"; 20 20 license = self.stdenv.lib.licenses.bsd3; 21 21 platforms = self.ghc.meta.platforms; 22 22 };
+2 -2
pkgs/development/libraries/haskell/purescript/default.nix
··· 7 7 8 8 cabal.mkDerivation (self: { 9 9 pname = "purescript"; 10 - version = "0.5.2.6"; 11 - sha256 = "0aszzaj3942xgq0nmql68s5cgplhkqrk0k6cfd1mx5lq5n0qxf94"; 10 + version = "0.5.3"; 11 + sha256 = "05vhz3j4gx9paxmvimy154730078bl148819shwml6l6vq02723i"; 12 12 isLibrary = true; 13 13 isExecutable = true; 14 14 buildDepends = [
+2 -2
pkgs/development/libraries/haskell/reflection/default.nix
··· 4 4 5 5 cabal.mkDerivation (self: { 6 6 pname = "reflection"; 7 - version = "1.4"; 8 - sha256 = "0i6yb3fa9wizyaz8x9b7yzkw9jf7zahdrkr2y0iw7igdxqn4n0k7"; 7 + version = "1.5.1"; 8 + sha256 = "18ail6j7rs5jff9zxphxd7vjkwanpv12dhi98s86r65425fdhjlx"; 9 9 buildDepends = [ tagged ]; 10 10 meta = { 11 11 homepage = "http://github.com/ekmett/reflection";
+2 -2
pkgs/development/libraries/haskell/safe/default.nix
··· 4 4 5 5 cabal.mkDerivation (self: { 6 6 pname = "safe"; 7 - version = "0.3.6"; 8 - sha256 = "03fjasjw8mh8c15xg8dncdn9g8scr427889vchcckilll40kvzvm"; 7 + version = "0.3.7"; 8 + sha256 = "0rw8mjarwl7rwc6fczq0zxlp1nlb6r1rk71whwziwi032hgc8561"; 9 9 meta = { 10 10 homepage = "http://community.haskell.org/~ndm/safe/"; 11 11 description = "Library of safe (exception free) functions";
+4 -4
pkgs/development/libraries/haskell/statistics/default.nix
··· 1 1 # This file was auto-generated by cabal2nix. Please do NOT edit manually! 2 2 3 - { cabal, binary, deepseq, erf, HUnit, ieee754, mathFunctions 3 + { cabal, aeson, binary, deepseq, erf, HUnit, ieee754, mathFunctions 4 4 , monadPar, mwcRandom, primitive, QuickCheck, testFramework 5 5 , testFrameworkHunit, testFrameworkQuickcheck2, vector 6 6 , vectorAlgorithms, vectorBinaryInstances ··· 8 8 9 9 cabal.mkDerivation (self: { 10 10 pname = "statistics"; 11 - version = "0.11.0.3"; 12 - sha256 = "184lzivqjjj69pxcnr5ibxjqikypfl5nd63i44qgwdhwyvcaqdh3"; 11 + version = "0.13.1.0"; 12 + sha256 = "0y46fna0kqs8bsqbf3v1k9ppq3njd5kxf1qlvvmphydpi3x038nd"; 13 13 buildDepends = [ 14 - binary deepseq erf mathFunctions monadPar mwcRandom primitive 14 + aeson binary deepseq erf mathFunctions monadPar mwcRandom primitive 15 15 vector vectorAlgorithms vectorBinaryInstances 16 16 ]; 17 17 testDepends = [
+4 -4
pkgs/development/libraries/haskell/streaming-commons/default.nix
··· 1 1 # This file was auto-generated by cabal2nix. Please do NOT edit manually! 2 2 3 3 { cabal, async, blazeBuilder, deepseq, hspec, network, QuickCheck 4 - , random, text, transformers, zlib 4 + , random, stm, text, transformers, zlib 5 5 }: 6 6 7 7 cabal.mkDerivation (self: { 8 8 pname = "streaming-commons"; 9 - version = "0.1.3.1"; 10 - sha256 = "0ryj9pp681f1pqvcyy5ci2zng6ax93j5navm886k095wxmamhzmf"; 9 + version = "0.1.4"; 10 + sha256 = "0p18sha2xa583rn9jyhylcykgrvydrwnl47c2wxf1c1yswn45iz6"; 11 11 buildDepends = [ 12 - blazeBuilder network random text transformers zlib 12 + blazeBuilder network random stm text transformers zlib 13 13 ]; 14 14 testDepends = [ 15 15 async blazeBuilder deepseq hspec network QuickCheck text zlib
+2 -2
pkgs/development/libraries/haskell/unix-time/default.nix
··· 4 4 5 5 cabal.mkDerivation (self: { 6 6 pname = "unix-time"; 7 - version = "0.3.1"; 8 - sha256 = "1r7glbcr3108zrlpy2d09jyk1gv9k90d5saajipmb1f5l45rdhnj"; 7 + version = "0.3.2"; 8 + sha256 = "0bbzrm4hprqsljwscpfmnw3ipj809q7570alzn1qampijsbb4cds"; 9 9 buildDepends = [ binary ]; 10 10 testDepends = [ doctest hspec QuickCheck time ]; 11 11 meta = {
+9 -9
pkgs/development/libraries/haskell/webdriver/default.nix
··· 1 1 # This file was auto-generated by cabal2nix. Please do NOT edit manually! 2 2 3 3 { cabal, aeson, attoparsec, base64Bytestring, cond, dataDefault 4 - , directoryTree, exceptions, filepath, HTTP, liftedBase 5 - , monadControl, mtl, network, parallel, scientific, temporary, text 6 - , time, transformers, transformersBase, unorderedContainers, vector 7 - , zipArchive 4 + , directoryTree, exceptions, filepath, httpClient, httpTypes 5 + , liftedBase, monadControl, mtl, network, parallel, scientific 6 + , temporary, text, time, transformers, transformersBase 7 + , unorderedContainers, vector, zipArchive 8 8 }: 9 9 10 10 cabal.mkDerivation (self: { 11 11 pname = "webdriver"; 12 - version = "0.5.5"; 13 - sha256 = "1k656ghkaqlnp4a9dd99s3l2vm21zsqpqxwfg2lq5rx2yw402nga"; 12 + version = "0.6.0.1"; 13 + sha256 = "0qpk1i6qr12lcx25bdljwqxgdhf5qk67h04bp6vwmm16dwzsyqd1"; 14 14 buildDepends = [ 15 15 aeson attoparsec base64Bytestring cond dataDefault directoryTree 16 - exceptions filepath HTTP liftedBase monadControl mtl network 17 - scientific temporary text time transformers transformersBase 18 - unorderedContainers vector zipArchive 16 + exceptions filepath httpClient httpTypes liftedBase monadControl 17 + mtl network scientific temporary text time transformers 18 + transformersBase unorderedContainers vector zipArchive 19 19 ]; 20 20 testDepends = [ parallel text ]; 21 21 jailbreak = true;
+2 -2
pkgs/development/libraries/haskell/word8/default.nix
··· 4 4 5 5 cabal.mkDerivation (self: { 6 6 pname = "word8"; 7 - version = "0.1.0"; 8 - sha256 = "1729ip83wyw8w3v8mzmazaw5b9l81zg95hrkmfq3qjk5gz1s75s0"; 7 + version = "0.1.1"; 8 + sha256 = "1xpa0haacimrblxg3x3n5vdcnkg3ff5zqamppdarv0zvkcdj139r"; 9 9 testDepends = [ hspec ]; 10 10 meta = { 11 11 description = "Word8 library";
+2 -2
pkgs/development/libraries/haskell/yaml/default.nix
··· 6 6 7 7 cabal.mkDerivation (self: { 8 8 pname = "yaml"; 9 - version = "0.8.8.3"; 10 - sha256 = "031d1wx31mw9lw0swlcf1xfzdixaq6wmglhzaj9sixhid0r2isvf"; 9 + version = "0.8.8.4"; 10 + sha256 = "1mh5xv66cqvk0r5n6pwcm11m9489y40l69ca417yvymkksmncc7b"; 11 11 isLibrary = true; 12 12 isExecutable = true; 13 13 buildDepends = [
+23
pkgs/development/tools/documentation/haddock/2.14.3.nix
··· 1 + # This file was auto-generated by cabal2nix. Please do NOT edit manually! 2 + 3 + { cabal, Cabal, deepseq, filepath, ghcPaths, hspec, QuickCheck 4 + , xhtml 5 + }: 6 + 7 + cabal.mkDerivation (self: { 8 + pname = "haddock"; 9 + version = "2.14.3"; 10 + sha256 = "031ikrsbkpmmwgdkgdr8s19dfx5y6n39rmyljjdfqygas17gcm6l"; 11 + isLibrary = true; 12 + isExecutable = true; 13 + buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; 14 + testDepends = [ Cabal deepseq filepath hspec QuickCheck ]; 15 + doCheck = false; 16 + meta = { 17 + homepage = "http://www.haskell.org/haddock/"; 18 + description = "A documentation-generation tool for Haskell libraries"; 19 + license = self.stdenv.lib.licenses.bsd3; 20 + platforms = self.ghc.meta.platforms; 21 + maintainers = [ self.stdenv.lib.maintainers.andres ]; 22 + }; 23 + })
+2 -2
pkgs/development/tools/haskell/HaRe/default.nix
··· 9 9 10 10 cabal.mkDerivation (self: { 11 11 pname = "HaRe"; 12 - version = "0.7.2.4"; 13 - sha256 = "1ljyvs3mdgxzyvss071yvgnrnmhdyp9a10cmvij1d47li1wbj1j1"; 12 + version = "0.7.2.5"; 13 + sha256 = "09v0z1r03bzazgjf26fv54q1jpmv14zyl6w9083xcf2cs3yy6vfh"; 14 14 isLibrary = true; 15 15 isExecutable = true; 16 16 buildDepends = [
+2 -2
pkgs/development/tools/haskell/codex/default.nix
··· 6 6 7 7 cabal.mkDerivation (self: { 8 8 pname = "codex"; 9 - version = "0.1.0.1"; 10 - sha256 = "1s2sn2i0ah4wgyzz5vqkm65jkl3c38cwa2kp0az4xl3vb8y6x7la"; 9 + version = "0.1.0.2"; 10 + sha256 = "0dsc5dx5zcxf5wd2qf6gqzr8d613z1gkllmzzkbny3lxa512crsw"; 11 11 isLibrary = true; 12 12 isExecutable = true; 13 13 buildDepends = [
+8 -5
pkgs/top-level/haskell-packages.nix
··· 141 141 142 142 aeson_0_7_0_4 = callPackage ../development/libraries/haskell/aeson/0.7.0.4.nix { blazeBuilder = null; }; 143 143 aeson_0_7_0_6 = callPackage ../development/libraries/haskell/aeson/0.7.0.6.nix { blazeBuilder = null; }; 144 - aeson = self.aeson_0_7_0_6; 144 + aeson_0_8_0_0 = callPackage ../development/libraries/haskell/aeson/0.8.0.0.nix { blazeBuilder = null; }; 145 + aeson = self.aeson_0_7_0_6; # 0.8.0.0 breaks too many packages at the moment 145 146 146 147 aesonPretty = callPackage ../development/libraries/haskell/aeson-pretty {}; 147 148 ··· 1727 1728 1728 1729 parsers_0_10_3 = callPackage ../development/libraries/haskell/parsers/0.10.3.nix {}; 1729 1730 parsers_0_11_0_3 = callPackage ../development/libraries/haskell/parsers/0.11.0.3.nix {}; 1730 - parsers = self.parsers_0_11_0_3; 1731 + parsers_0_12 = callPackage ../development/libraries/haskell/parsers/0.12.nix {}; 1732 + parsers = self.parsers_0_11_0_3; # the new version breaks trifecta 1731 1733 1732 1734 parsimony = callPackage ../development/libraries/haskell/parsimony {}; 1733 1735 ··· 1876 1878 QuickCheck_2_4_2 = callPackage ../development/libraries/haskell/QuickCheck/2.4.2.nix {}; 1877 1879 QuickCheck_2_5_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.5.1.1.nix {}; 1878 1880 QuickCheck_2_6 = callPackage ../development/libraries/haskell/QuickCheck/2.6.nix {}; 1879 - QuickCheck_2_7_5 = callPackage ../development/libraries/haskell/QuickCheck/2.7.5.nix {}; 1880 - QuickCheck = self.QuickCheck_2_7_5; 1881 + QuickCheck_2_7_6 = callPackage ../development/libraries/haskell/QuickCheck/2.7.6.nix {}; 1882 + QuickCheck = self.QuickCheck_2_7_6; 1881 1883 1882 1884 quickcheckAssertions = callPackage ../development/libraries/haskell/quickcheck-assertions {}; 1883 1885 ··· 2760 2762 haddock_2_12_0 = callPackage ../development/tools/documentation/haddock/2.12.0.nix {}; 2761 2763 haddock_2_13_2 = callPackage ../development/tools/documentation/haddock/2.13.2.nix {}; 2762 2764 haddock_2_14_2 = callPackage ../development/tools/documentation/haddock/2.14.2.nix {}; 2763 - haddock = self.haddock_2_14_2; 2765 + haddock_2_14_3 = callPackage ../development/tools/documentation/haddock/2.14.3.nix {}; 2766 + haddock = self.haddock_2_14_3; 2764 2767 2765 2768 HandsomeSoup = callPackage ../development/libraries/haskell/HandsomeSoup {}; 2766 2769