diff options
Diffstat (limited to 'pkgs/development')
35 files changed, 1376 insertions, 522 deletions
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 8ebb3ac85bb9..0363855977f7 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ghc, perl, gmp, ncurses, libiconv }: +{ stdenv, fetchgit, ghc, perl, gmp, ncurses, libiconv, autoconf, automake, happy, alex }: let @@ -18,18 +18,22 @@ in stdenv.mkDerivation rec { version = "7.11.20150118"; name = "ghc-${version}"; + rev = "6ff3db92140e3ac8cbda50d1a4aab976350ac8c4"; - src = fetchurl { - url = "http://deb.haskell.org/dailies/2015-01-18/ghc_${version}.orig.tar.bz2"; - sha256 = "1zy960q2faq03camq2n4834bd748vkc15h83bapswc68dqncqj20"; + src = fetchgit { + url = "git://git.haskell.org/ghc.git"; + inherit rev; + sha256 = "1a1r3nw7x5rd8563770zcg1phm55vi3sxs2zwr91ik026n8jjba6"; }; postUnpack = '' - # tarball includes many already-compiled files - find . \( -name '*.dyn_o' -o -name '*.dyn_hi' -o -name haddock \) -type f -exec rm {} \; + pushd ghc-${builtins.substring 0 7 rev} + patchShebangs . + ./boot + popd ''; - buildInputs = [ ghc perl ]; + buildInputs = [ ghc perl autoconf automake happy alex ]; preConfigure = '' echo >mk/build.mk "${buildMK}" diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix new file mode 100644 index 000000000000..3b8f46eb6881 --- /dev/null +++ b/pkgs/development/compilers/nim/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "nim-0.10.2"; + + buildInputs = [ unzip ]; + + src = fetchurl { + url = "http://nim-lang.org/download/${name}.zip"; + sha256 = "1jkrf8wgva7kfl0vqs1f3scidi6a85r6bkz2zf90k8gdpin9idrg"; + }; + + buildPhase = "sh build.sh"; + installPhase = + '' + substituteInPlace install.sh --replace '$1/nim' "$out" + sh install.sh $out + ''; + + meta = with stdenv.lib; + { description = "Statically typed, imperative programming language"; + homepage = http://nim-lang.org/; + license = licenses.mit; + maintainers = with maintainers; [ emery ]; + platforms = platforms.linux; # arbitrary + }; +} diff --git a/pkgs/development/compilers/sbcl/1.2.0.nix b/pkgs/development/compilers/sbcl/1.2.0.nix index a12e8c5ae9da..d19edce2c105 100644 --- a/pkgs/development/compilers/sbcl/1.2.0.nix +++ b/pkgs/development/compilers/sbcl/1.2.0.nix @@ -50,6 +50,9 @@ stdenv.mkDerivation rec { # Use whatever `cc` the stdenv provides substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc + + substituteInPlace src/runtime/Config.x86-64-darwin \ + --replace mmacosx-version-min=10.4 mmacosx-version-min=10.5 ''; preBuild = '' diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index ea61940e8d4e..94a17c483aba 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -53,6 +53,9 @@ stdenv.mkDerivation rec { # Use whatever `cc` the stdenv provides substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc + + substituteInPlace src/runtime/Config.x86-64-darwin \ + --replace mmacosx-version-min=10.4 mmacosx-version-min=10.5 ''; preBuild = '' diff --git a/pkgs/development/compilers/vala/0.26.nix b/pkgs/development/compilers/vala/0.26.nix index 4cc07eb7d9d7..78cb850c3565 100644 --- a/pkgs/development/compilers/vala/0.26.nix +++ b/pkgs/development/compilers/vala/0.26.nix @@ -4,8 +4,8 @@ let major = "0.26"; - minor = "1"; - sha256 = "8407abb19ab3a58bbfc0d288abb47666ef81f76d0540258c03965e7545f59e6b"; + minor = "2"; + sha256 = "37f13f430c56a93b6dac85239084681fd8f31c407d386809c43bc2f2836e03c4"; in stdenv.mkDerivation rec { name = "vala-${major}.${minor}"; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d30e3061d8d0..ae736e0125e8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -449,9 +449,6 @@ self: super: { rematch = dontCheck super.rematch; # https://github.com/tcrayford/rematch/issues/5 rematch-text = dontCheck super.rematch-text; # https://github.com/tcrayford/rematch/issues/6 - # https://github.com/Twinside/Rasterific/issues/20 - Rasterific = dontCheck super.Rasterific; - # Upstream notified by e-mail. MonadCompose = markBrokenVersion "0.2.0.0" super.MonadCompose; @@ -462,6 +459,12 @@ self: super: { doHaddock = false; }); + # This packages compiles 4+ hours on a fast machine. That's just unreasonable. + CHXHtml = dontDistribute super.CHXHtml; + + # https://github.com/bos/bloomfilter/issues/7 + bloomfilter = overrideCabal super.bloomfilter (drv: { broken = !pkgs.stdenv.is64bit; }); + } // { # Not on Hackage. diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index 67ac5f5a3286..88e14b5a9e2c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -40,7 +40,7 @@ self: super: { transformers-compat = disableCabalFlag super.transformers-compat "three"; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_0_0 = super.Cabal_1_22_0_0.override { binary = self.binary_0_7_3_0; process = self.process_1_2_1_0; }; + Cabal_1_22_0_0 = super.Cabal_1_22_0_0.override { binary = self.binary_0_7_3_0; process = self.process_1_2_2_0; }; # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index 9dd694387fbe..ebb12ed20a8c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -75,6 +75,9 @@ self: super: { hosc = dontDistribute super.hosc; tidal-midi = dontDistribute super.tidal-midi; + # Needs mtl 2.2.x due to "plailude". + clac = dontDistribute super.clac; + } // # packages relating to amazonka @@ -103,7 +106,7 @@ self: super: { time = self.time_1_5_0_1; unix = self.unix_2_7_1_0; directory = self.directory_1_2_1_0; - process = overrideCabal self.process_1_2_1_0 (drv: { coreSetup = true; }); + process = overrideCabal self.process_1_2_2_0 (drv: { coreSetup = true; }); inherit amazonka-core amazonkaEnv amazonka amazonka-cloudwatch; }; amazonka = super.amazonka.overrideScope amazonkaEnv; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6ac89102e5c6..75365f7addbd 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -5013,12 +5013,11 @@ self: { ({ mkDerivation, array, base, directory, random, wx, wxcore }: mkDerivation { pname = "GeBoP"; - version = "1.7.4"; - sha256 = "1nz0829jx2yf673r6haahzva3m5y80d9whxh79abxx9716874rw9"; + version = "1.7.4.1"; + sha256 = "0cldjrk26p2llyhsp1rcvzbgz5qg8k898fvmdxkfc9ihc5lsxxf5"; isLibrary = false; isExecutable = true; buildDepends = [ array base directory random wx wxcore ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/GeBoP"; description = "Several games"; license = stdenv.lib.licenses.bsd3; @@ -7763,16 +7762,22 @@ self: { }) {}; "Hoed" = callPackage - ({ mkDerivation, array, base, template-haskell }: + ({ mkDerivation, array, base, containers, directory, filepath + , libgraph, mtl, process, RBTree, regex-posix, template-haskell + , threepenny-gui + }: mkDerivation { pname = "Hoed"; - version = "0.1.0.1"; - sha256 = "1121m0ksh9ydn9vvvlz6jh0i9yx8jyxv4qwsnkmcnzajhh3b9w81"; + version = "0.2.0"; + sha256 = "0hjjsrk3rbj2q2n6pylg7xg583ns34iz7mg4mhsfgiadz593b7ph"; isLibrary = true; isExecutable = true; - buildDepends = [ array base template-haskell ]; - homepage = "http://maartenfaddegon.nl/pub"; - description = "Debug anything without recompiling everything!"; + buildDepends = [ + array base containers directory filepath libgraph mtl process + RBTree regex-posix template-haskell threepenny-gui + ]; + homepage = "http://maartenfaddegon.nl"; + description = "Lighweight algorithmic debugging based on observing intermediate values and the cost centre stack"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -12150,22 +12155,17 @@ self: { }) {}; "Rasterific" = callPackage - ({ mkDerivation, base, binary, criterion, deepseq, directory, dlist - , filepath, FontyFruity, free, JuicyPixels, mtl, primitive - , QuickCheck, statistics, vector, vector-algorithms + ({ mkDerivation, base, dlist, FontyFruity, free, JuicyPixels, mtl + , primitive, vector, vector-algorithms }: mkDerivation { pname = "Rasterific"; - version = "0.5.0.1"; - sha256 = "1q1102503ga2nncanww3pgvpgryj9c2q8gy3bmrd1f0lpv31fhn8"; + version = "0.5.0.2"; + sha256 = "0w4p1na6ksvsy9dc8lcpnkvj7x2d6n6w79ndzy257iqfcf03n1kc"; buildDepends = [ base dlist FontyFruity free JuicyPixels mtl primitive vector vector-algorithms ]; - testDepends = [ - base binary criterion deepseq directory filepath FontyFruity - JuicyPixels QuickCheck statistics vector - ]; description = "A pure haskell drawing engine"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -14716,8 +14716,8 @@ self: { ({ mkDerivation, base, containers, directory, Win32 }: mkDerivation { pname = "Win32-notify"; - version = "0.3"; - sha256 = "0mykxfasrl44fg7d7dzi0kabcsxhq3pa86pcy53ppgskn42g8x80"; + version = "0.3.0.1"; + sha256 = "0zzbb00rykl8y1prkcm3paaamhmdrqji34070b9zg7sg2pc5k4f4"; isLibrary = true; isExecutable = true; buildDepends = [ base containers directory Win32 ]; @@ -16588,27 +16588,27 @@ self: { "aeson-schema" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers - , directory, filepath, hashable, hint, HUnit, mtl, QuickCheck - , regex-pcre, syb, template-haskell, temporary, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, th-lift - , transformers, unordered-containers, vector + , directory, filepath, ghc-prim, hashable, hint, HUnit, mtl + , QuickCheck, regex-base, regex-compat, regex-pcre, scientific, syb + , template-haskell, temporary, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, th-lift, transformers + , unordered-containers, vector }: mkDerivation { pname = "aeson-schema"; - version = "0.2.0.1"; - sha256 = "12xlrkb06as9s8ns64fqkh8b24r13fywzk0nxm3128ak0b4db4z0"; + version = "0.3.0.0"; + sha256 = "0glnx168klmfhq2rsp3h149hyafym2rlw9n00vja13kxs557k8s6"; buildDepends = [ - aeson attoparsec base bytestring containers mtl QuickCheck - regex-pcre syb template-haskell text th-lift transformers - unordered-containers vector + aeson attoparsec base bytestring containers ghc-prim mtl QuickCheck + regex-base regex-compat regex-pcre scientific syb template-haskell + text th-lift transformers unordered-containers vector ]; testDepends = [ aeson attoparsec base bytestring containers directory filepath - hashable hint HUnit mtl QuickCheck template-haskell temporary - test-framework test-framework-hunit test-framework-quickcheck2 text - unordered-containers vector + hashable hint HUnit mtl QuickCheck regex-compat scientific + template-haskell temporary test-framework test-framework-hunit + test-framework-quickcheck2 text unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/timjb/aeson-schema"; description = "Haskell JSON schema validator and parser generator"; license = stdenv.lib.licenses.mit; @@ -17574,16 +17574,18 @@ self: { "amazonka" = callPackage ({ mkDerivation, amazonka-core, base, bytestring, conduit - , exceptions, http-conduit, lens, mmorph, monad-control, mtl - , resourcet, retry, text, time, transformers, transformers-base + , conduit-extra, cryptohash, cryptohash-conduit, exceptions + , http-conduit, lens, mmorph, monad-control, mtl, resourcet, retry + , text, time, transformers, transformers-base }: mkDerivation { pname = "amazonka"; - version = "0.2.3"; - sha256 = "0zdkpk08m6d4cg0x7z8wkf27x01d3qrpsp31p0mhzsgmdrvr998m"; + version = "0.3.0"; + sha256 = "0zjdd50rhkhb31y1c65wqggc1dgvl9ycxkr8hnqgsvq4q1nz0hn1"; buildDepends = [ - amazonka-core base bytestring conduit exceptions http-conduit lens - mmorph monad-control mtl resourcet retry text time transformers + amazonka-core base bytestring conduit conduit-extra cryptohash + cryptohash-conduit exceptions http-conduit lens mmorph + monad-control mtl resourcet retry text time transformers transformers-base ]; jailbreak = true; @@ -17596,8 +17598,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-autoscaling"; - version = "0.2.3"; - sha256 = "13kpibj6c23lwj4gj401jdhq480hy8qhcphvasqmkh7xs7vabn81"; + version = "0.3.0"; + sha256 = "1kp82bkcmpigidppb2a7isxjl9kls76csd85q4aym50apzhfvmqr"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Auto Scaling SDK"; @@ -17609,8 +17611,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudformation"; - version = "0.2.3"; - sha256 = "1i2b07swgq6i4szwl3y2jl8p7bc68hfcfpp338ghg970rvjps6ja"; + version = "0.3.0"; + sha256 = "1rxdlygbr423f4g6y5aizv3anpcyq56nx3yp5363v3k9xi96dnzq"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFormation SDK"; @@ -17622,8 +17624,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudfront"; - version = "0.2.3"; - sha256 = "1r6vs3xfph1i9b36s7kn5d70bls7fwwhrd94drv5f0rcm372ck9b"; + version = "0.3.0"; + sha256 = "02b09208amcv91jcc8lmznbjvvf1bgz9cp3vc9f1s69mb4b09azr"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFront SDK"; @@ -17635,8 +17637,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudhsm"; - version = "0.2.3"; - sha256 = "0rak82ahr6qvi4ahkrmxrbivnda06bw91z3zg1lgl6qxyas0601m"; + version = "0.3.0"; + sha256 = "0hjx5cxpf7wmz7pyc4ry7g8khp40f1i4fx366c7va48cmw42zkjl"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudHSM SDK"; @@ -17648,8 +17650,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudsearch"; - version = "0.2.3"; - sha256 = "18zrmr43045ql886fjz0911j80sdhj34xvxqbpx47xmwmwinqa58"; + version = "0.3.0"; + sha256 = "0kgrgc6l901y5vf6z8has0610cd29k6x3iicb3pwpq00vamiq1b4"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch SDK"; @@ -17661,8 +17663,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudsearch-domains"; - version = "0.2.3"; - sha256 = "0xchvnqvjbl808yy08kh7zqkpl2wjn7yyqy0wjisw0az106smp1g"; + version = "0.3.0"; + sha256 = "09xalcrw56wbba86ibhjkxpcmj4sdxkfzxy2s2n0i9zb0nk4asfw"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch Domain SDK"; @@ -17674,8 +17676,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudtrail"; - version = "0.2.3"; - sha256 = "0i5z4p1qrn15g0khi66bcdp6m8nlac0r7lafgfqj5mndj3ml08bp"; + version = "0.3.0"; + sha256 = "1pzaqavz86h9a44gyby5qxjh5sikc105kh2kkpa6h3lhvpp4ka59"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudTrail SDK"; @@ -17687,8 +17689,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudwatch"; - version = "0.2.3"; - sha256 = "0szdk7z4z2dzflzff46mjn627i9dlpqzvzwrv0rnhm2wcdz5i2i5"; + version = "0.3.0"; + sha256 = "1xbqcid23k6y6b48fv4p3clbzd1inbm47lwyqyakxgk1ch6bgpzp"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch SDK"; @@ -17699,8 +17701,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudwatch-logs"; - version = "0.2.3"; - sha256 = "16kjzpr70m0ag7ss7ijswhw6h25xikp280hd6ng4dwdplgzci1zl"; + version = "0.3.0"; + sha256 = "00qlqrdzlljqy8cdi52qwxq3jxqh9rzif8pbz5r9ps3zw1ris1q7"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch Logs SDK"; @@ -17712,8 +17714,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-codedeploy"; - version = "0.2.3"; - sha256 = "0dp1nhsand12fcv1z0p238i04ajylkqjb0wf8a0ksv0997zgzaw5"; + version = "0.3.0"; + sha256 = "12bqpl3xvf9sk2aldxpjr98131j56yyjzwy01pynr9pid132c3a1"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeDeploy SDK"; @@ -17725,8 +17727,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cognito-identity"; - version = "0.2.3"; - sha256 = "0awhxx148rkla192pvk8qwiw87z7hy8z2nsa33aysbs47aasnsdj"; + version = "0.3.0"; + sha256 = "1v07fb55rc80w0pddryvn2qnxsd7g2j6rjpmydrflg3090jq8zbf"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Identity SDK"; @@ -17738,8 +17740,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cognito-sync"; - version = "0.2.3"; - sha256 = "09wvx1mp8vxx8hkwdgkrdhkfclb7v0g5q9lk4a42r70yf2qfq2fw"; + version = "0.3.0"; + sha256 = "16cv000pmp9n0312sp9wnsj7h2z23w6657r0gi1q4z9xqwj4nkkz"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Sync SDK"; @@ -17751,8 +17753,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-config"; - version = "0.2.3"; - sha256 = "0acs6gh9qkwdv9kcp9giyz021w0jzq47340shc44zwx5l0s0a1af"; + version = "0.3.0"; + sha256 = "1znrz1gp52fv8qjyzlbygxcn10w687bakrczixcvwqnrw3krsi25"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Config SDK"; @@ -17763,23 +17765,22 @@ self: { "amazonka-core" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , base64-bytestring, bifunctors, bytestring, case-insensitive - , conduit, conduit-extra, cryptohash, cryptohash-conduit - , data-default-class, hashable, http-client, http-types, lens - , mmorph, mtl, nats, resourcet, scientific, semigroups, tagged - , tasty, tasty-hunit, template-haskell, text, time, transformers - , unordered-containers, vector, xml-conduit + , conduit, conduit-extra, cryptohash, data-default-class, hashable + , http-client, http-types, lens, mmorph, mtl, nats, resourcet + , scientific, semigroups, tagged, tasty, tasty-hunit + , template-haskell, text, time, transformers, unordered-containers + , vector, xml-conduit }: mkDerivation { pname = "amazonka-core"; - version = "0.2.3"; - sha256 = "1s9mlkrql7vmm14nppx9ixlk3364rc50m4k1lgxiddmz2hhc74v0"; + version = "0.3.0"; + sha256 = "1pgxap976rc5sfqd1cy3092r6ckfnjswk44gccfy2rcxn0cxvmsj"; buildDepends = [ aeson attoparsec base base16-bytestring base64-bytestring bifunctors bytestring case-insensitive conduit conduit-extra - cryptohash cryptohash-conduit data-default-class hashable - http-client http-types lens mmorph mtl nats resourcet scientific - semigroups tagged text time transformers unordered-containers - vector xml-conduit + cryptohash data-default-class hashable http-client http-types lens + mmorph mtl nats resourcet scientific semigroups tagged text time + transformers unordered-containers vector xml-conduit ]; testDepends = [ aeson base tasty tasty-hunit template-haskell text time @@ -17794,8 +17795,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-datapipeline"; - version = "0.2.3"; - sha256 = "1b4pz5shyms8zb5d46z51rawj7pvajsbbgprkzw2jm522d0cmzvq"; + version = "0.3.0"; + sha256 = "1q69c2chhnkz9sajcy6cpbzc3dlnq5fi7qppf63lfa3291a7pkpl"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Data Pipeline SDK"; @@ -17807,8 +17808,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-directconnect"; - version = "0.2.3"; - sha256 = "0cn2rf2lddjvfcsznhpfirl8nj47pmrfdqxx4jp2kly5yxcwrivv"; + version = "0.3.0"; + sha256 = "0cvainbvqb2b9kn8l1jm6rvc16hwd8nd91bz46sm6r4i30yv0848"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Direct Connect SDK"; @@ -17820,8 +17821,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-dynamodb"; - version = "0.2.3"; - sha256 = "02402hrqp8iwjq7mww8s3z5vx37fh2n3slv4fvz0bz38dgbgfpz2"; + version = "0.3.0"; + sha256 = "1wyslkbj7jkz8y72djfwa9gknjxwckpm8k369slhqsrj3z0yhi3k"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB SDK"; @@ -17833,8 +17834,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ec2"; - version = "0.2.3"; - sha256 = "0hcq8l4bilb8fd91k8nsv96xkrc2gqvy1ms95iycwhc8lm1g0wa0"; + version = "0.3.0"; + sha256 = "1ip5x1g6khnywmr0l0naswl02j1s35hxmklra07hz86v6zrlnxhh"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Compute Cloud SDK"; @@ -17842,12 +17843,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "amazonka-ecs" = callPackage + ({ mkDerivation, amazonka-core, base }: + mkDerivation { + pname = "amazonka-ecs"; + version = "0.3.0"; + sha256 = "0wm7si0yvn3xh5ad6ycz181yjqlil1l056asw73c8yxfy3g3n0q6"; + buildDepends = [ amazonka-core base ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon EC2 Container Service SDK"; + license = "unknown"; + }) {}; + "amazonka-elasticache" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elasticache"; - version = "0.2.3"; - sha256 = "1vj3dmcfrql8r3m50ck7afilbv8knp9cd5g0x7l6c1qp3klnz9b9"; + version = "0.3.0"; + sha256 = "0s97ssb4bgkc5ahrjm5dbydnjp7k3sqms1885d978bfnsmrrc91l"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon ElastiCache SDK"; @@ -17859,8 +17872,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elasticbeanstalk"; - version = "0.2.3"; - sha256 = "0lrv91mx3bml3gc8cw9pjlb2klag9bnxajgjl44vxacnbs2qb4xz"; + version = "0.3.0"; + sha256 = "02mznpghvzz6inf918dzv3cdid3yamnxfbq136aah97j8vzcj0g1"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Beanstalk SDK"; @@ -17872,8 +17885,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elastictranscoder"; - version = "0.2.3"; - sha256 = "1fm3hyg798zajrflp09wvmzs5ih2614xkbr8ylnwkzjfpspqi9s9"; + version = "0.3.0"; + sha256 = "0kbh30rz2zx7zw5sh32806g3kr19ijhp71c5wi07i1j949r2ixss"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Transcoder SDK"; @@ -17885,8 +17898,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elb"; - version = "0.2.3"; - sha256 = "1m59zb62d80h6pbhc4azqnmalgn0hs60ij0q9dgr4igxlbwag5d8"; + version = "0.3.0"; + sha256 = "14wvh8r63q5kyyfhh0nh5sq29wn19dy6kjj62k8ysph54bm7d7i2"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Load Balancing SDK"; @@ -17898,8 +17911,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-emr"; - version = "0.2.3"; - sha256 = "0khmhhhlwwfbb8h2f5djqvpy3c8lh18hy6wvwwxznc2raqlrpvgq"; + version = "0.3.0"; + sha256 = "09f3yclyg0hjqybkpfi61wrsfvxa7mlcai8il3maya78sbrz8bj9"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic MapReduce SDK"; @@ -17907,12 +17920,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "amazonka-glacier" = callPackage + ({ mkDerivation, amazonka-core, base }: + mkDerivation { + pname = "amazonka-glacier"; + version = "0.3.0"; + sha256 = "1gj17z7k63a0cdqhjn6f4ylawa8hv5b45hrdqw103fn13qn860hr"; + buildDepends = [ amazonka-core base ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon Glacier SDK"; + license = "unknown"; + }) {}; + "amazonka-iam" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-iam"; - version = "0.2.3"; - sha256 = "1yayzjr8zjrcw8ynprw4737qg0zi580mcxc0r51g8dik19fg6rly"; + version = "0.3.0"; + sha256 = "0lch80bl2p5c78qqam1hwffslzdnqwc5paiyja70z41n4cf9zw9d"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Identity and Access Management SDK"; @@ -17924,8 +17949,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-importexport"; - version = "0.2.3"; - sha256 = "0874iyrq3lsk4b3hpxh491c5jic9y8ififqsxgxv70ywipvfr7d0"; + version = "0.3.0"; + sha256 = "0kbsnbwnlxxnn58mwr7pkqc6jzkwlryq3h7vmzgvnm2xa0gv9vrp"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Import/Export SDK"; @@ -17937,8 +17962,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-kinesis"; - version = "0.2.3"; - sha256 = "0i2bv484hhh0rg47669i51qizcm904cq74amf93a5c8pbla1b2fb"; + version = "0.3.0"; + sha256 = "157ayynhc847hc2mk14hkcxbx0z15r5ymfykhf909qwv6js70xs4"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis SDK"; @@ -17950,8 +17975,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-kms"; - version = "0.2.3"; - sha256 = "1xd27qfm08ygi3vlk35qma381p4dq6q357qm5jasfpcm9jj33rss"; + version = "0.3.0"; + sha256 = "00psl8hffvgbl2zl24pfp7lrhis5j971cvyrazr4vgr43iss3ww4"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Key Management Service SDK"; @@ -17962,8 +17987,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-lambda"; - version = "0.2.3"; - sha256 = "09hjb5qyvd4yairwxrpajksdrzqva350qnqh9azb9xzlsl6wfxry"; + version = "0.3.0"; + sha256 = "0il89vnwywqisfl4lyibjfi1ihpxba58drbvag4x5rf19nw1glc1"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lambda SDK"; @@ -17975,8 +18000,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-opsworks"; - version = "0.2.3"; - sha256 = "09scxvk2jp8k4a7ggaphq0ywp3f4d5xy422sds55kfd0m32cqcpg"; + version = "0.3.0"; + sha256 = "07gz564x624jzh7yca4vkla770ly1781kyj5qg70qs3k4kf2b7gm"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon OpsWorks SDK"; @@ -17988,8 +18013,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-rds"; - version = "0.2.3"; - sha256 = "13hgkww38p1q79xzpd4gj9dv2rzhsba9z8lh5gb4iqyb34831c0i"; + version = "0.3.0"; + sha256 = "1bzxim2mafgb3gaxzj7vx04w4b1cljywwf3vyq9gn3p9i3dc2qh2"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Relational Database Service SDK"; @@ -18001,8 +18026,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-redshift"; - version = "0.2.3"; - sha256 = "05pm2v1hqb5aha979mrx59d9qxqr3kn8f402m30lp0v0gfqlvxj0"; + version = "0.3.0"; + sha256 = "1x5dbzdqrkdf47fixqajb13lqh9j5zpb1src45pszjgy1pnf9zkc"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Redshift SDK"; @@ -18014,8 +18039,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-route53"; - version = "0.2.3"; - sha256 = "1qklx8iv7isasys02n5ga6ml83j86lmgi92dlwa5spqbvrq8cqbs"; + version = "0.3.0"; + sha256 = "1pb5f2yl640kikqz83arwcnjxz5abwpx04klnp6ypay7sxnpl0sq"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 SDK"; @@ -18027,8 +18052,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-route53-domains"; - version = "0.2.3"; - sha256 = "0gxjfjw82nhiza7gxpj2qbyli8jd45rbhgmx17vqj5f741b186d8"; + version = "0.3.0"; + sha256 = "15sk43545qbnh4r3chm44fxsjr1rjjafhqc8pmy0p08r45v82bf2"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 Domains SDK"; @@ -18040,8 +18065,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-s3"; - version = "0.2.3"; - sha256 = "1mv8qz5i4bbiarfai4ryvwwbx52dc8hd4kfi75avglmji8cda315"; + version = "0.3.0"; + sha256 = "0akkfj6yzjpfgrpzi2mscv03hdhv3ym8vslms17xdp5f9ydba0wv"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Storage Service SDK"; @@ -18053,8 +18078,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sdb"; - version = "0.2.3"; - sha256 = "0bd3xr85vp8i6qkd3nqhcppc5vvzgqc1f1xjcbk3mp03vdxbpaal"; + version = "0.3.0"; + sha256 = "10vm8jr7ljkmpa8xwn96262jf2i8cb3c1cxw0dagry101im7wxdg"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon SimpleDB SDK"; @@ -18066,8 +18091,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ses"; - version = "0.2.3"; - sha256 = "0657j13v78laz8bv2lpmzr44bijifbx59g0fsv76m3jfirkgv1lj"; + version = "0.3.0"; + sha256 = "1vmwkjb37w2jgrvfhj3mx3z6h3q52jkqh3c2fkc27a9q5jyi43p5"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Email Service SDK"; @@ -18079,8 +18104,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sns"; - version = "0.2.3"; - sha256 = "11xkzgcflz5smp0mpbbsl2l61g5qwzmrzfxvkq0rzavfaqpr6jzc"; + version = "0.3.0"; + sha256 = "1njvanj7bw0r4l1fhg7nq89sz8sx9cahxjwczr7ab3cf7a03ndra"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Notification Service SDK"; @@ -18092,8 +18117,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sqs"; - version = "0.2.3"; - sha256 = "1gziq56fs5iggasggn4d2k7q6dvrg2shabnfgmk7c9pxsqbaj2c6"; + version = "0.3.0"; + sha256 = "06786g4mdy58ca1hdwi6dfa3xlkzf2la8x7c8zqyf6848a573yb1"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Queue Service SDK"; @@ -18105,8 +18130,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-storagegateway"; - version = "0.2.3"; - sha256 = "1pj0cnixbqwwxpwh46bcm96j0b686vwd6cdglb3rhg2nq76whjs1"; + version = "0.3.0"; + sha256 = "1d75q42z3yvwdav95na5xdxssk4zjgbr77fs1j63x1991p0ar06c"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Storage Gateway SDK"; @@ -18118,8 +18143,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sts"; - version = "0.2.3"; - sha256 = "13wisry1c0fig9vw6nr9pw7jwyq4p2gylb568al5s812hw2nisxg"; + version = "0.3.0"; + sha256 = "1xxkch0n5f89s7qqv14vfichv5ldlx6qk8gwzccqvf1wxwcgpbhc"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Security Token Service SDK"; @@ -18131,8 +18156,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-support"; - version = "0.2.3"; - sha256 = "0sqsx03iw0cf9is491y0gwpaw1xv39nplmja1a2as3iw46vf3382"; + version = "0.3.0"; + sha256 = "0c5fh50qyr8wfl7031x4gksablp3g9kyj6phjpxndzy6hh4cfim2"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Support SDK"; @@ -18144,8 +18169,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-swf"; - version = "0.2.3"; - sha256 = "06a7mx44crgh3dwx8amvrqwprdrlhdhvmyw3jybzidm5c2lfjyay"; + version = "0.3.0"; + sha256 = "0s60jgyps1mgaa0kqpi7acqss8j1wn2mjrp8rl69ivarhsyh0ijh"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Workflow Service SDK"; @@ -18741,6 +18766,7 @@ self: { base bytestring http-types HUnit mtl test-framework test-framework-hunit wai wai-extra ]; + jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "Simple and type safe web framework that generate web API documentation"; license = stdenv.lib.licenses.mit; @@ -20090,8 +20116,8 @@ self: { }: mkDerivation { pname = "atlassian-connect-core"; - version = "0.4.0.0"; - sha256 = "1g802w7b31isjix2xypia26vqhy73cxrjk8izhxcnqyl4f6g5ym2"; + version = "0.5.0.0"; + sha256 = "09v6q0pnl68jv9mq4hlzzz2lqih172zymv9j2f0fpidmq67ayz9b"; buildDepends = [ aeson atlassian-connect-descriptor base base64-bytestring bytestring case-insensitive cipher-aes configurator containers @@ -20973,8 +20999,8 @@ self: { }: mkDerivation { pname = "aws-kinesis-client"; - version = "0.2.0.2"; - sha256 = "1zz9wxgcsnx28i9rg0sykjdmg0fhnv1ycgvzrxnpkph0j8zllsis"; + version = "0.2.0.3"; + sha256 = "16djyvzdmqssfsn97sjzmnq592bzxva4jsjdmxlp6yryqr8ciji3"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -21692,10 +21718,9 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "base-io-access"; - version = "0.3.0.1"; - sha256 = "0hgrxr5331lqk7n6vqpi8a05xwwdm3mbd0p52js0rjg9lqcy0akr"; + version = "0.4.0.0"; + sha256 = "0d0i8ndh2j42qf8ns9wprkjiffy3hyybgvs9nbf67yd50di6p263"; buildDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/bheklilr/base-io-access"; description = "The IO functions included in base delimited into small, composable classes"; license = stdenv.lib.licenses.gpl2; @@ -24360,6 +24385,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "blaze-builder_0_4_0_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq, HUnit, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, utf8-string + }: + mkDerivation { + pname = "blaze-builder"; + version = "0.4.0.0"; + sha256 = "0xhxz2g7hgp892n8qcq7iw136fv2csw9aaq8123srs05z9j1lcfk"; + buildDepends = [ base bytestring deepseq text ]; + testDepends = [ + base bytestring HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 text utf8-string + ]; + homepage = "http://github.com/lpsmith/blaze-builder"; + description = "Efficient buffered output"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "blaze-builder-conduit" = callPackage ({ mkDerivation, base, conduit }: mkDerivation { @@ -27042,8 +27086,8 @@ self: { }: mkDerivation { pname = "calculator"; - version = "0.2.0.1"; - sha256 = "1ankmv93lpan83g37vzp9nhcxcx3n214p30sbjcryi6ign87cv8q"; + version = "0.2.0.2"; + sha256 = "0xamlq32mg60444sm0wl9vh89v1xgjf2b2vk2ks83f9vfzbfy989"; isLibrary = false; isExecutable = true; buildDepends = [ base containers haskeline mtl parsec QuickCheck ]; @@ -27096,23 +27140,25 @@ self: { "call" = callPackage ({ mkDerivation, base, bindings-portaudio, boundingboxes , clean-unions, colors, containers, control-bool, deepseq - , directory, distributive, elevator, filepath, freetype2, GLFW-b - , hashable, JuicyPixels, JuicyPixels-util, lens, linear - , minioperational, mtl, objective, OpenGL, OpenGLRaw, random - , reflection, template-haskell, text, transformers, vector, WAVE + , directory, distributive, elevator, extensible, filepath + , freetype2, GLFW-b, hashable, JuicyPixels, JuicyPixels-util, lens + , linear, minioperational, mtl, objective, OpenGL, OpenGLRaw + , random, reflection, template-haskell, text, transformers, vector + , WAVE }: mkDerivation { pname = "call"; - version = "0.1.2"; - sha256 = "11nm2h9z758c6j77a60aaln53p2izrcnaygklapv5l46dmgjiy8b"; + version = "0.1.3"; + sha256 = "11gk7wgkrid6k546ilcz3ik8cwclfss6hby1rgla9znyd5lqk7l9"; isLibrary = true; isExecutable = true; buildDepends = [ base bindings-portaudio boundingboxes clean-unions colors containers control-bool deepseq directory distributive elevator - filepath freetype2 GLFW-b hashable JuicyPixels JuicyPixels-util - lens linear minioperational mtl objective OpenGL OpenGLRaw random - reflection template-haskell text transformers vector WAVE + extensible filepath freetype2 GLFW-b hashable JuicyPixels + JuicyPixels-util lens linear minioperational mtl objective OpenGL + OpenGLRaw random reflection template-haskell text transformers + vector WAVE ]; jailbreak = true; homepage = "https://github.com/fumieval/call"; @@ -27356,8 +27402,8 @@ self: { }: mkDerivation { pname = "casadi-bindings"; - version = "2.2.0.3"; - sha256 = "1f2xwwrn63wnffhblxwzpvbr7vqi2sz2v2bb3bbs9bf03mb78pja"; + version = "2.2.0.4"; + sha256 = "1qn3ghsp340mmq9a49icsr33pyibdqlnw1mg1i1gqglvwlanqysw"; buildDepends = [ base casadi-bindings-core casadi-bindings-internal containers linear vector @@ -27796,6 +27842,7 @@ self: { http-conduit lens lens-aeson mtl text transformers unordered-containers vector ]; + jailbreak = true; homepage = "https://github.com/MichelBoucey/cayley-client"; description = "An Haskell client for Cayley graph database"; license = stdenv.lib.licenses.bsd3; @@ -29046,6 +29093,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "clac" = callPackage + ({ mkDerivation, base, containers, optparse-applicative, plailude + , pretty-tree, safe, split + }: + mkDerivation { + pname = "clac"; + version = "0.3.0"; + sha256 = "0vqsp0wp5kf40wxclwpqvkn057ndajxn2nx16ndb60r7xmh59inp"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base containers optparse-applicative plailude pretty-tree safe + split + ]; + description = "Simple CLI RPN calculator"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "clafer" = callPackage ({ mkDerivation, aeson, array, base, bytestring, cmdargs , containers, data-stringmap, directory, executable-path, filepath @@ -34451,8 +34516,8 @@ self: { }: mkDerivation { pname = "curve25519"; - version = "0.2"; - sha256 = "05dmc66wxli6dy25gyhxnyb5z3dj27jpygf9msspzbghi94hvr4m"; + version = "0.2.1"; + sha256 = "1kfs7cjxig0rk17nb7dzi189msww90yw0066rlalw01kff5w2hdy"; buildDepends = [ base bytestring crypto-api ]; testDepends = [ base bytestring crypto-api DRBG HUnit QuickCheck tagged @@ -34963,6 +35028,42 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "darkplaces-demo" = callPackage + ({ mkDerivation, base, binary, bytestring, containers + , darkplaces-text, data-binary-ieee754, directory, mtl + , optparse-applicative, regex-tdfa, transformers + }: + mkDerivation { + pname = "darkplaces-demo"; + version = "0.1"; + sha256 = "0map78fnnqm2nlh92xrxmg3fs9q2hb4pl87hyara41v2dvwlsj3f"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base binary bytestring containers darkplaces-text + data-binary-ieee754 directory mtl optparse-applicative regex-tdfa + transformers + ]; + homepage = "https://github.com/bacher09/darkplaces-demo"; + description = "Utility and parser for DarkPlaces demo files"; + license = stdenv.lib.licenses.gpl2; + }) {}; + + "darkplaces-text" = callPackage + ({ mkDerivation, alex, ansi-terminal, array, base, bytestring, text + , vector + }: + mkDerivation { + pname = "darkplaces-text"; + version = "0.1"; + sha256 = "08zqrivqz57r0ifjpgksm5l8h19zmsxcicwf97h3andds62v05lf"; + buildDepends = [ ansi-terminal array base bytestring text vector ]; + buildTools = [ alex ]; + homepage = "https://github.com/bacher09/darkplaces-text"; + description = "Parser for darkplaces colorful text"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "dash-haskell" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, direct-sqlite , directory, either, ghc, haddock-api, mtl, optparse-applicative @@ -35358,14 +35459,16 @@ self: { }) {}; "data-filepath" = callPackage - ({ mkDerivation, base, ghc-prim, semigroups, split + ({ mkDerivation, base, bifunctors, ghc-prim, semigroups, split , template-haskell }: mkDerivation { pname = "data-filepath"; - version = "2.1.1.0"; - sha256 = "00x8z4pyqbwpdbsvkzdrdvbgqm01rjqklp7j7hig0s9dv6dfr9fr"; - buildDepends = [ base ghc-prim semigroups split template-haskell ]; + version = "2.2.0.0"; + sha256 = "1l71sg02rqgk7i6w401il7crx3ikdbxi5wbb6ida677pfdrpm7f7"; + buildDepends = [ + base bifunctors ghc-prim semigroups split template-haskell + ]; homepage = "https://github.com/maxpow4h/data-filepath"; description = "A type safe file path data structure"; license = stdenv.lib.licenses.bsd3; @@ -36080,6 +36183,7 @@ self: { base containers hashable HUnit test-framework test-framework-hunit text ]; + jailbreak = true; description = "An implementation of datalog in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -36288,10 +36392,9 @@ self: { }: mkDerivation { pname = "dbus-th"; - version = "0.1.1.0"; - sha256 = "1rwxbv92x7c0psp2s88cn168zkxdghviym9zpaz13av7ix06zx7a"; + version = "0.1.1.1"; + sha256 = "0sxk7m8fdd7cx0n0lbcfz2bv28d0i8v0im50y1sciac7pi13q4bc"; buildDepends = [ base containers dbus syb template-haskell text ]; - jailbreak = true; description = "TemplateHaskell generator of DBus bindings"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -37812,15 +37915,14 @@ self: { }: mkDerivation { pname = "diagrams-rasterific"; - version = "0.1.0.6"; - sha256 = "0hj42ln9gynjcnz7r2r71l73c262jkrdkdl7sy1a99qb4dbr15c6"; + version = "0.1.0.7"; + sha256 = "180ip125phg6q7wvmsq57pdwfc8fq8a5vfadizcqfmc6ng6xzd88"; buildDepends = [ base bytestring containers data-default-class diagrams-core diagrams-lib directory filepath FontyFruity JuicyPixels lens mtl old-time optparse-applicative process Rasterific split statestack time unix ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "Rasterific backend for diagrams"; license = stdenv.lib.licenses.bsd3; @@ -41153,6 +41255,7 @@ self: { base bifunctors exceptions free monad-control MonadRandom mtl profunctors semigroupoids semigroups transformers transformers-base ]; + jailbreak = true; homepage = "http://github.com/ekmett/either/"; description = "An either monad transformer"; license = stdenv.lib.licenses.bsd3; @@ -41240,8 +41343,8 @@ self: { }: mkDerivation { pname = "ekg-core"; - version = "0.1.0.2"; - sha256 = "0iipj2q4msawxlvzzikiy7jls22ncbx7v3ldi7y75d52cyl2lmpg"; + version = "0.1.0.3"; + sha256 = "0d2hvj9g62xkaah8iizgr668ij53164nnrdjkikhc2igi6wk31k4"; buildDepends = [ base containers ghc-prim text unordered-containers ]; @@ -42145,6 +42248,7 @@ self: { version = "1.7.0"; sha256 = "1h4ajq1rraiz7qw7350128n26jnqhzk9iyjzqc3lnbyx87q8j73v"; buildDepends = [ base exceptions mtl ]; + jailbreak = true; description = "*Very* basic Erlang-like process support for Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -42902,6 +43006,7 @@ self: { buildDepends = [ base exceptions hashable stm time transformers vector ]; + jailbreak = true; homepage = "https://github.com/kim/ex-pool"; description = "Another fork of resource-pool, with a MonadIO and MonadCatch constraint"; license = stdenv.lib.licenses.bsd3; @@ -42995,17 +43100,16 @@ self: { }) {}; "exceptions" = callPackage - ({ mkDerivation, base, mtl, QuickCheck, test-framework + ({ mkDerivation, base, mtl, QuickCheck, stm, test-framework , test-framework-quickcheck2, transformers }: mkDerivation { pname = "exceptions"; - version = "0.6.1"; - sha256 = "09jv5jskv48fd5la1pdvafwc9j2jxj1ncf6yxzkwcjddynbkyszm"; - editedCabalFile = "e86a40308d3a603a445e0fc2989d83fbf4216e96e7d241e7703e4394442ac9d6"; - buildDepends = [ base mtl transformers ]; + version = "0.7"; + sha256 = "0y69xxwxvhyshbd687h30nk5sfly9khbbimclz5gfaf2k9sl6k9p"; + buildDepends = [ base mtl stm transformers ]; testDepends = [ - base mtl QuickCheck test-framework test-framework-quickcheck2 + base mtl QuickCheck stm test-framework test-framework-quickcheck2 transformers ]; homepage = "http://github.com/ekmett/exceptions/"; @@ -43353,12 +43457,12 @@ self: { }) {}; "extensible" = callPackage - ({ mkDerivation, base, deepseq, template-haskell }: + ({ mkDerivation, base, binary, deepseq, template-haskell }: mkDerivation { pname = "extensible"; - version = "0.2.8"; - sha256 = "11akhq1p88n0s5z06w0d0zdyyy4qa7jdlgkk2n4h2x74r3dc9g1g"; - buildDepends = [ base deepseq template-haskell ]; + version = "0.2.9"; + sha256 = "1qr4b2nm3nixfv0s9h7mbg6n9lry521bag1r8320vi1rszlrvj0g"; + buildDepends = [ base binary deepseq template-haskell ]; homepage = "https://github.com/fumieval/extensible"; description = "Extensible, efficient, lens-friendly data types"; license = stdenv.lib.licenses.bsd3; @@ -43788,22 +43892,24 @@ self: { "fay" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , directory, filepath, ghc-paths, haskell-names, haskell-packages - , haskell-src-exts, language-ecmascript, mtl, optparse-applicative - , process, safe, sourcemap, split, spoon, syb, text, time - , transformers, uniplate, unordered-containers, utf8-string, vector + , haskell-src-exts, language-ecmascript, mtl, mtl-compat + , optparse-applicative, process, safe, sourcemap, split, spoon, syb + , text, time, transformers, transformers-compat, uniplate + , unordered-containers, utf8-string, vector }: mkDerivation { pname = "fay"; - version = "0.22.0.0"; - sha256 = "1001zwg0gsdvy7kvlkyc10ky04ci297vb3chvwlv13yby36mrmn8"; + version = "0.23.0.0"; + sha256 = "112pdpp4pvgs6y7351a218l00lrg9fhgpzykra4c9yaayclkbcd5"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base bytestring containers data-default directory filepath ghc-paths haskell-names haskell-packages haskell-src-exts - language-ecmascript mtl optparse-applicative process safe sourcemap - split spoon syb text time transformers uniplate - unordered-containers utf8-string vector + language-ecmascript mtl mtl-compat optparse-applicative process + safe sourcemap split spoon syb text time transformers + transformers-compat uniplate unordered-containers utf8-string + vector ]; jailbreak = true; homepage = "https://github.com/faylang/fay/wiki"; @@ -43816,8 +43922,8 @@ self: { ({ mkDerivation, base, fay }: mkDerivation { pname = "fay-base"; - version = "0.19.4.2"; - sha256 = "1rch4mwkvxccw8jcndhwvf5n0f9bnwpfg6qnbhbwls4y1cvlcihr"; + version = "0.20.0.0"; + sha256 = "07hizichy7jnlirxq3sh2gjw4k21cfnqpswihbzkcvz0fnmd9sw3"; buildDepends = [ base fay ]; homepage = "https://github.com/faylang/fay/"; description = "The base package for Fay"; @@ -43831,8 +43937,8 @@ self: { }: mkDerivation { pname = "fay-builder"; - version = "0.2.0.2"; - sha256 = "0sbizici0465ih1jpgn768p8hf3s42qva72wldf9bbaps80dc8ya"; + version = "0.2.0.3"; + sha256 = "1kkx6abrvbd2cdwpgdx7cpwyfqpk31zwrxfw9kr1ngayf7sgzc9s"; buildDepends = [ base Cabal data-default directory fay filepath safe split text ]; @@ -43845,8 +43951,8 @@ self: { ({ mkDerivation, fay-base }: mkDerivation { pname = "fay-dom"; - version = "0.5"; - sha256 = "1r8kl6wbrl516qc29zs93png922p7zzg2lagvkcf2cb506qg1mr1"; + version = "0.5.0.1"; + sha256 = "1zm6w6nccswaksr283alhnsss6xw4k7s61yp8ff4lg5127ff9wp0"; buildDepends = [ fay-base ]; homepage = "https://github.com/faylang/fay-dom"; description = "DOM FFI wrapper library for Fay"; @@ -43898,8 +44004,8 @@ self: { ({ mkDerivation, fay, fay-base, text }: mkDerivation { pname = "fay-text"; - version = "0.3.2.1"; - sha256 = "1qng6zlzd96m4zcanvz58qhz9pqj71ya59y6a12gp46mdn2hcqv1"; + version = "0.3.2.2"; + sha256 = "1q1v8jzkccy9arq6jkz4ynpzm1691d1dv9wzyi4i5m6n0gl7aans"; buildDepends = [ fay fay-base text ]; homepage = "https://github.com/faylang/fay-text"; description = "Fay Text type represented as JavaScript strings"; @@ -44547,18 +44653,17 @@ self: { "file-location" = callPackage ({ mkDerivation, base, containers, lifted-base, process - , template-haskell, transformers + , template-haskell, th-orphans, transformers }: mkDerivation { pname = "file-location"; - version = "0.4.5.3"; - sha256 = "0d1iqhdac1gcag1d7ch9ia4fm97jpp31m46b794z90bmm6nr29h9"; + version = "0.4.7.1"; + sha256 = "0p4fj7jjsssn3bdn2z984q2wyngc6cfygbgprzndcw0bxqi78jl4"; buildDepends = [ - base containers lifted-base template-haskell transformers - ]; - testDepends = [ - base containers lifted-base process template-haskell transformers + base containers lifted-base template-haskell th-orphans + transformers ]; + testDepends = [ base lifted-base process ]; homepage = "https://github.com/gregwebs/FileLocation.hs"; description = "common functions that show file location information"; license = stdenv.lib.licenses.bsd3; @@ -48340,8 +48445,8 @@ self: { ({ mkDerivation, base, cpphs, ghc, happy }: mkDerivation { pname = "ghc-parser"; - version = "0.1.3.0"; - sha256 = "13p09mj92jh4y0v2r672d49fmlz3l5r2r1lqg0jjy6kj045wcfdn"; + version = "0.1.4.0"; + sha256 = "0d29bl64gsij7169wvqgdkr8vcn35jdbqyq2aky53wcbhw4kq7k7"; buildDepends = [ base ghc ]; buildTools = [ cpphs happy ]; patchPhase = '' @@ -49415,8 +49520,8 @@ self: { }: mkDerivation { pname = "gl"; - version = "0.7.2"; - sha256 = "1rarbvxffh2gvn8hz363z59lsjdjqmxc5m995z7lpibc6m4rh054"; + version = "0.7.2.3"; + sha256 = "0kc701k81al4zyarp6zn65is039hpa2ahvr3m5as86qw8kah8h8b"; buildDepends = [ base containers directory filepath fixed half hxt split transformers @@ -50942,17 +51047,18 @@ self: { }) {}; "groundhog" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, containers - , monad-control, monad-logger, mtl, text, time, transformers - , transformers-base + ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder + , bytestring, containers, monad-control, monad-logger, mtl + , scientific, text, time, transformers, transformers-base }: mkDerivation { pname = "groundhog"; - version = "0.7.0.1"; - sha256 = "1g50qwwxp999g1r8486vqr12facmlxy6nz9vz412v6y469ww5b1x"; + version = "0.7.0.2"; + sha256 = "09wyhqpwmdmw13nbxrrdkc4jsl46pwnq0yhcjzdn9g3s5049s0by"; buildDepends = [ - base blaze-builder bytestring containers monad-control monad-logger - mtl text time transformers transformers-base + aeson base base64-bytestring blaze-builder bytestring containers + monad-control monad-logger mtl scientific text time transformers + transformers-base ]; homepage = "http://github.com/lykahb/groundhog"; description = "Type-safe datatype-database mapping library"; @@ -51005,8 +51111,8 @@ self: { }: mkDerivation { pname = "groundhog-postgresql"; - version = "0.7.0.1"; - sha256 = "0xsiq7ma5bp6fhy4bigdxly1wi9h2kq8sbk5gxr43fvvm402h9k1"; + version = "0.7.0.2"; + sha256 = "18wdj51v6qqyqx10lvknr3irhs5qddvh301bx7l9cdcpkk1la81i"; buildDepends = [ attoparsec base blaze-builder bytestring containers groundhog monad-control monad-logger postgresql-libpq postgresql-simple @@ -51239,9 +51345,7 @@ self: { "gstreamer" = callPackage ({ mkDerivation, array, base, bytestring, directory, glib - , gstreamer, gstreamer-audio, gstreamer-base, gstreamer-controller - , gstreamer-dataprotocol, gstreamer-net, gstreamer-plugins-base - , gtk2hs-buildtools, mtl + , gst_plugins_base, gstreamer, gtk2hs-buildtools, mtl }: mkDerivation { pname = "gstreamer"; @@ -51249,19 +51353,12 @@ self: { sha256 = "0grg20wsvdyfpm2y3ykw7d3j7s2hlbs8psjwfy0yfz3839yvccy6"; buildDepends = [ array base bytestring directory glib mtl ]; buildTools = [ gtk2hs-buildtools ]; - pkgconfigDepends = [ - gstreamer gstreamer-audio gstreamer-base gstreamer-controller - gstreamer-dataprotocol gstreamer-net gstreamer-plugins-base - ]; + pkgconfigDepends = [ gst_plugins_base gstreamer ]; jailbreak = true; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GStreamer open source multimedia framework"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) gstreamer; gstreamer-audio = null; - gstreamer-base = null; gstreamer-controller = null; - gstreamer-dataprotocol = null; gstreamer-net = null; - gstreamer-plugins-base = null;}; + }) { inherit (pkgs) gst_plugins_base; inherit (pkgs) gstreamer;}; "gt-tools" = callPackage ({ mkDerivation, base, containers, extensible-exceptions, haskeline @@ -52940,6 +53037,7 @@ self: { optparse-applicative process resourcet sqlite-simple system-fileio system-filepath tagsoup text transformers ]; + jailbreak = true; homepage = "https://github.com/philopon/haddocset"; description = "Generate docset of Dash by Haddock haskell documentation tool"; license = stdenv.lib.licenses.bsd3; @@ -55400,8 +55498,8 @@ self: { }: mkDerivation { pname = "haskell-names"; - version = "0.5.1"; - sha256 = "1dlivxigd1brcz1il0kz7qm40v8sgn4vqk8w5xxllniqrmiycjma"; + version = "0.5.2"; + sha256 = "0dxv33facklxyy6x9a3xxwv5avfzn6jbigl7zdd2zkvrr6rnz9zf"; buildDepends = [ aeson base bytestring Cabal containers data-lens-light filepath haskell-packages haskell-src-exts hse-cpp mtl tagged transformers @@ -55691,6 +55789,7 @@ self: { base haskell-src-exts pretty syb template-haskell th-orphans uniplate ]; + jailbreak = true; description = "Parse source to template-haskell abstract syntax"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -58553,6 +58652,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "heroku-persistent" = callPackage + ({ mkDerivation, base, bytestring, heroku, hspec + , persistent-postgresql, text + }: + mkDerivation { + pname = "heroku-persistent"; + version = "0.1.0"; + sha256 = "1ws4076dk4a8l2yz9mwfwqk57sm7y2ch2c5318agsm7hnwil7wbf"; + buildDepends = [ + base bytestring heroku persistent-postgresql text + ]; + testDepends = [ base hspec persistent-postgresql ]; + description = "Parse DATABASE_URL into configuration types for Persistent"; + license = stdenv.lib.licenses.mit; + }) {}; + "herringbone" = callPackage ({ mkDerivation, base, bytestring, containers, directory , http-types, mtl, old-locale, process, process-listlike @@ -59544,8 +59659,8 @@ self: { }: mkDerivation { pname = "hindent"; - version = "4.3.8"; - sha256 = "1plnkb3xfkqfaqvmzv3yi8c7iy8sbqjj3618pi3j9xa9rdi8yc0p"; + version = "4.3.9"; + sha256 = "0dasmssr19kbwxwi9hyx52k70j87b3vfxla6gpzf9k3aaqghcnvf"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -60392,8 +60507,8 @@ self: { ({ mkDerivation, base, bindings-DSL, git, openssl, process, zlib }: mkDerivation { pname = "hlibgit2"; - version = "0.18.0.13"; - sha256 = "1bslg51kkhnwm48kxaad4izq3xmzv6dpqy10a5kh16vr5zy3w5hz"; + version = "0.18.0.14"; + sha256 = "0fxglcgi0iwj9xqgx1f3dixia9pqfzz0yq9iq7flaggpr9pvn3n0"; buildDepends = [ base bindings-DSL zlib ]; testDepends = [ base process ]; buildTools = [ git ]; @@ -63702,13 +63817,13 @@ self: { }) {}; "hscurses" = callPackage - ({ mkDerivation, base, mtl, old-locale, old-time, unix }: + ({ mkDerivation, base, exceptions, mtl, old-locale, old-time, unix + }: mkDerivation { pname = "hscurses"; - version = "1.4.1.2"; - sha256 = "1r3njcwad8d4vn17s5g69iw3rhjz9hbhv49wkqqpndck5080fh7l"; - buildDepends = [ base mtl old-locale old-time unix ]; - jailbreak = true; + version = "1.4.2.0"; + sha256 = "0msf80475l3ncpnb1lcpnyscl1svmqg074ylb942rx7dbvck71bj"; + buildDepends = [ base exceptions mtl old-locale old-time unix ]; homepage = "https://github.com/skogsbaer/hscurses"; description = "NCurses bindings for Haskell"; license = "LGPL"; @@ -64155,8 +64270,8 @@ self: { }: mkDerivation { pname = "hslogger"; - version = "1.2.6"; - sha256 = "0yqw7824bn8vb9iynx8lkgswxd0nz484k4bvcwd02wvakbbfawkk"; + version = "1.2.7"; + sha256 = "0s99w1bzzq75mckb8pk0h545w6y8n8n3nq36mp09vn4kwf503mc9"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -67992,32 +68107,35 @@ self: { ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal , classy-prelude, cmdargs, containers, directory, filepath, ghc , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint - , hspec, HTTP, HUnit, MissingH, mono-traversable, mtl, parsec - , process, random, setenv, shelly, split, stm, strict, system-argv0 - , system-filepath, tar, text, transformers, unix - , unordered-containers, utf8-string, uuid, vector, zeromq4-haskell + , hspec, http-client, http-client-tls, HUnit, ipython-kernel + , MissingH, mono-traversable, mtl, parsec, process, random, setenv + , shelly, split, stm, strict, system-argv0, system-filepath, tar + , template-haskell, text, transformers, unix, unordered-containers + , utf8-string, uuid, vector }: mkDerivation { pname = "ihaskell"; - version = "0.4.3.0"; - sha256 = "1k6i56cdzv5ikci20brq7qj07nqdpzkfj7xr69lh1gvx7xb24ida"; + version = "0.5.0.0"; + sha256 = "1vp31ihl2hbpw3fadwmdm6hg1692khmb1v7gzcqik162i65dyzrj"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base base64-bytestring bytestring cereal classy-prelude cmdargs containers directory filepath ghc ghc-parser ghc-paths - haskeline haskell-src-exts here hlint hspec HTTP HUnit MissingH - mono-traversable mtl parsec process random shelly split stm strict - system-argv0 system-filepath tar text transformers unix - unordered-containers utf8-string uuid vector zeromq4-haskell + haskeline haskell-src-exts here hlint hspec http-client + http-client-tls HUnit ipython-kernel MissingH mono-traversable mtl + parsec process random shelly split stm strict system-argv0 + system-filepath tar template-haskell text transformers unix + unordered-containers utf8-string uuid vector ]; testDepends = [ aeson base base64-bytestring bytestring cereal classy-prelude cmdargs containers directory filepath ghc ghc-parser ghc-paths - haskeline haskell-src-exts here hlint hspec HTTP HUnit MissingH - mono-traversable mtl parsec process random setenv shelly split stm - strict system-argv0 system-filepath tar text transformers unix - unordered-containers utf8-string uuid vector zeromq4-haskell + haskeline haskell-src-exts here hlint hspec http-client + http-client-tls HUnit ipython-kernel MissingH mono-traversable mtl + parsec process random setenv shelly split stm strict system-argv0 + system-filepath tar text transformers unix unordered-containers + utf8-string uuid vector ]; jailbreak = true; homepage = "http://gibiansky.github.io/IHaskell/"; @@ -68026,35 +68144,45 @@ self: { }) {}; "ihaskell-aeson" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, classy-prelude, here - , ihaskell + ({ mkDerivation, aeson, aeson-pretty, base, chunked-data + , classy-prelude, here, ihaskell }: mkDerivation { pname = "ihaskell-aeson"; - version = "0.1.0.0"; - sha256 = "0pficg9df5396caic44hc7kxlj0qrd7lq6knkck8sn9xhakpr1m1"; + version = "0.2.0.0"; + sha256 = "1ag8xv456r4dgibqsazmw6xhhfvplc8sw128prr26hw2139ci6w9"; buildDepends = [ - aeson aeson-pretty base classy-prelude here ihaskell + aeson aeson-pretty base chunked-data classy-prelude here ihaskell ]; - jailbreak = true; - homepage = "http://www.github.com/gibiansky/IHaskell-Display"; + homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for Aeson"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ihaskell-basic" = callPackage + ({ mkDerivation, base, classy-prelude, ihaskell }: + mkDerivation { + pname = "ihaskell-basic"; + version = "0.2.0.0"; + sha256 = "0xf2z4xr0gkq3zvpiwvl73b6wbql4x8fdbw81kz990ifb0vwq65w"; + buildDepends = [ base classy-prelude ihaskell ]; + homepage = "http://www.github.com/gibiansky/IHaskell"; + description = "IHaskell display instances for basic types"; + license = stdenv.lib.licenses.mit; + }) {}; + "ihaskell-blaze" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, classy-prelude , ihaskell }: mkDerivation { pname = "ihaskell-blaze"; - version = "0.1.0.0"; - sha256 = "0sxh3sg90sjj4fnirki9gym3dznrwk85jdh034qwg9fqyk4sxn82"; + version = "0.2.0.0"; + sha256 = "1z3fcfyvx1is30ami7bfmcq6xxfj0l8bymyc85k8rgzjfirqfcdd"; buildDepends = [ base blaze-html blaze-markup classy-prelude ihaskell ]; - jailbreak = true; homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for blaze-html types"; license = stdenv.lib.licenses.mit; @@ -68066,13 +68194,12 @@ self: { }: mkDerivation { pname = "ihaskell-charts"; - version = "0.1.0.0"; - sha256 = "0qh04p49ckmx7qrb7swa8bqr69sas1i4k1ki8iwmfaggxghp5pnj"; + version = "0.2.0.0"; + sha256 = "0zncvhjr3nkpr80m5lhl52jq1ha8ml14bjkykkg6d2l1pqnrb3mg"; buildDepends = [ base bytestring Chart Chart-cairo classy-prelude data-default-class directory ihaskell ]; - jailbreak = true; homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for charts types"; license = stdenv.lib.licenses.mit; @@ -68085,13 +68212,12 @@ self: { }: mkDerivation { pname = "ihaskell-diagrams"; - version = "0.1.0.0"; - sha256 = "18k6abmq3xfkvc5mmbmam9qccr1kix530zil736xncpbyja2a5a8"; + version = "0.2.0.0"; + sha256 = "1if010ky6raw4g0wl24iww1i8qygy4jwd4f8yi9axhxzqzknmqvi"; buildDepends = [ base bytestring classy-prelude diagrams diagrams-cairo diagrams-lib directory ihaskell ]; - jailbreak = true; homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for diagram types"; license = stdenv.lib.licenses.mit; @@ -68110,25 +68236,87 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ihaskell-hatex" = callPackage + ({ mkDerivation, base, HaTeX, ihaskell, text }: + mkDerivation { + pname = "ihaskell-hatex"; + version = "0.2.0.0"; + sha256 = "02ynqhirz8bblcfaxksgxxqgnkmxqazj8imwxc2gbrw2v3p0i39s"; + buildDepends = [ base HaTeX ihaskell text ]; + homepage = "http://www.github.com/gibiansky/IHaskell"; + description = "IHaskell display instances for hatex"; + license = stdenv.lib.licenses.mit; + }) {}; + + "ihaskell-juicypixels" = callPackage + ({ mkDerivation, base, bytestring, classy-prelude, directory + , ihaskell, JuicyPixels + }: + mkDerivation { + pname = "ihaskell-juicypixels"; + version = "0.2.0.0"; + sha256 = "058a7wcksbmxq2nahyvpbckd24ziya5f99vmlb3l9wgy9a3i4v2k"; + buildDepends = [ + base bytestring classy-prelude directory ihaskell JuicyPixels + ]; + homepage = "http://www.github.com/gibiansky/ihaskell"; + description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package"; + license = stdenv.lib.licenses.mit; + }) {}; + "ihaskell-magic" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring - , classy-prelude, ihaskell, magic, text, utf8-string + , classy-prelude, ihaskell, ipython-kernel, magic, text + , utf8-string }: mkDerivation { pname = "ihaskell-magic"; - version = "0.1.0.0"; - sha256 = "0p4r5vkpvrznwhwwhhmhmgyw8n0qfm4b9pwy0mv3iwa805ffafnd"; + version = "0.2.0.0"; + sha256 = "0kmvhxc9bw7zg16m9pcs5ck3akc0fwnz3w6mmzj7dkc7avafmwcg"; buildDepends = [ - base base64-bytestring bytestring classy-prelude ihaskell magic - text utf8-string + base base64-bytestring bytestring classy-prelude ihaskell + ipython-kernel magic text utf8-string ]; - jailbreak = true; homepage = "http://www.github.com/gibiansky/IHaskell"; description = "IHaskell display instances for bytestrings"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ihaskell-parsec" = callPackage + ({ mkDerivation, aeson, base, classy-prelude, here, ihaskell + , parsec, random, unordered-containers + }: + mkDerivation { + pname = "ihaskell-parsec"; + version = "0.2.0.0"; + sha256 = "009mk611knz8w197dfbq66dabncky03axrchah707xikzpbaz95f"; + buildDepends = [ + aeson base classy-prelude here ihaskell parsec random + unordered-containers + ]; + homepage = "http://www.github.com/gibiansky/ihaskell"; + description = "IHaskell display instances for Parsec"; + license = stdenv.lib.licenses.mit; + }) {}; + + "ihaskell-rlangqq" = callPackage + ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring + , directory, filepath, ihaskell, ihaskell-blaze, Rlang-QQ, split + , stm, template-haskell, xformat + }: + mkDerivation { + pname = "ihaskell-rlangqq"; + version = "0.2.0.0"; + sha256 = "18681acd0wmmbalj87p4psis1qf84rzhvh8c1a96jgh5nv3rk5dn"; + buildDepends = [ + base base64-bytestring blaze-html bytestring directory filepath + ihaskell ihaskell-blaze Rlang-QQ split stm template-haskell xformat + ]; + description = "a rDisp quasiquote to show plots from Rlang-QQ in IHaskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ihttp" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , contstuff, enumerator, netlines, network @@ -68782,6 +68970,7 @@ self: { base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck tasty-th text vector ]; + jailbreak = true; homepage = "https://github.com/maoe/influxdb-haskell"; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; @@ -69623,18 +69812,20 @@ self: { }) {}; "ipython-kernel" = callPackage - ({ mkDerivation, aeson, base, bytestring, cereal, containers, text - , unix, uuid, zeromq4-haskell + ({ mkDerivation, aeson, base, bytestring, cereal, containers + , directory, filepath, mtl, parsec, tar, text, transformers, unix + , uuid, zeromq4-haskell }: mkDerivation { pname = "ipython-kernel"; - version = "0.1.0.0"; - sha256 = "048zc62rci4784djsp9m607zy2z3ybh0zm7211j8j8j1z96nz2x5"; + version = "0.3.0.0"; + sha256 = "035cfq1dlkjmmfjkmfvkn4i4rx04wzsgz9s4dbdwhkx3x7bcj7sj"; + isLibrary = true; + isExecutable = true; buildDepends = [ - aeson base bytestring cereal containers text unix uuid - zeromq4-haskell + aeson base bytestring cereal containers directory filepath mtl + parsec tar text transformers unix uuid zeromq4-haskell ]; - jailbreak = true; homepage = "http://github.com/gibiansky/IHaskell"; description = "A library for creating kernels for IPython frontends"; license = stdenv.lib.licenses.mit; @@ -74397,6 +74588,7 @@ self: { tasty tasty-quickcheck temporary transformers ]; extraLibraries = [ leveldb snappy ]; + jailbreak = true; homepage = "http://github.com/kim/leveldb-haskell"; description = "Haskell bindings to LevelDB"; license = stdenv.lib.licenses.bsd3; @@ -75181,15 +75373,16 @@ self: { "lifted-base" = callPackage ({ mkDerivation, base, HUnit, monad-control, test-framework , test-framework-hunit, transformers, transformers-base + , transformers-compat }: mkDerivation { pname = "lifted-base"; - version = "0.2.3.3"; - sha256 = "1n015i21pyh1ksrdiy105c9sw3gm3yvmlwv1sajy7nvpxb2xdjc3"; + version = "0.2.3.4"; + sha256 = "0gm68xfwzxdjk2h3mad9l37307kr73rmvazg69kclfsdi908vqsp"; buildDepends = [ base monad-control transformers-base ]; testDepends = [ base HUnit monad-control test-framework test-framework-hunit - transformers transformers-base + transformers transformers-base transformers-compat ]; homepage = "https://github.com/basvandijk/lifted-base"; description = "lifted IO operations from the base library"; @@ -76033,6 +76226,7 @@ self: { version = "0.1.0.0"; sha256 = "0mkyhanay0zr318cc01wgp4qxwpqj1wzydqlq7c12hbfrjb1ah4b"; buildDepends = [ base exceptions ]; + jailbreak = true; homepage = "https://github.com/ombocomp/listsafe"; description = "Safe wrappers for partial list functions, supporting MonadThrow"; license = stdenv.lib.licenses.asl20; @@ -76592,6 +76786,7 @@ self: { tagged-exception-core test-framework test-framework-hunit test-framework-quickcheck2 transformers ]; + jailbreak = true; homepage = "https://github.com/trskop/lock-file"; description = "Provide exclusive access to a resource using lock file"; license = stdenv.lib.licenses.bsd3; @@ -77071,6 +77266,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lowgl" = callPackage + ({ mkDerivation, base, data-default, gl, linear, vector }: + mkDerivation { + pname = "lowgl"; + version = "0.1.0.0"; + sha256 = "0kc7gpg7v064c6055hsp74dilqd059ww5xb42qdnwgw1ccd874x0"; + buildDepends = [ base data-default gl linear vector ]; + jailbreak = true; + description = "Basic gl wrapper and reference"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "lrucache" = callPackage ({ mkDerivation, base, containers, contravariant }: mkDerivation { @@ -77278,10 +77485,9 @@ self: { ({ mkDerivation, base, blaze-builder, lucid, text, transformers }: mkDerivation { pname = "lucid-svg"; - version = "0.4.0.1"; - sha256 = "1gg4zmvz80bqw9sv11irfzn0if7z1558d50cnsl0n12fw45vz87n"; + version = "0.4.0.2"; + sha256 = "1zdndb81190xg2zwpw10pg0qpjvyp2jmvwm64s2bid3shlhibmmd"; buildDepends = [ base blaze-builder lucid text transformers ]; - jailbreak = true; homepage = "http://github.com/jeffreyrosenbluth/lucid-svg.git"; description = "DSL for SVG using lucid for HTML"; license = stdenv.lib.licenses.bsd3; @@ -80444,6 +80650,7 @@ self: { base exceptions filepath ghc ghc-paths template-haskell temporary transformers ]; + jailbreak = true; homepage = "https://github.com/jfischoff/modulespection"; description = "Template Haskell for introspecting a module's declarations"; license = stdenv.lib.licenses.bsd3; @@ -80573,12 +80780,16 @@ self: { }) {}; "monad-control" = callPackage - ({ mkDerivation, base, stm, transformers, transformers-base }: + ({ mkDerivation, base, stm, transformers, transformers-base + , transformers-compat + }: mkDerivation { pname = "monad-control"; - version = "1.0.0.2"; - sha256 = "13l9gq00pjlp1b2g9xzfavl6zibi2s195f234rmhzbsb14yhzgnr"; - buildDepends = [ base stm transformers transformers-base ]; + version = "1.0.0.3"; + sha256 = "1jal6m6f8kz9lqfza6jm49jr1nyx6hhqyqfnjq226scm292zybsc"; + buildDepends = [ + base stm transformers transformers-base transformers-compat + ]; homepage = "https://github.com/basvandijk/monad-control"; description = "Lift control operations, like exception catching, through monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -80707,15 +80918,17 @@ self: { , conduit-extra, exceptions, fast-logger, lifted-base , monad-control, monad-loops, mtl, resourcet, stm, stm-chans , template-haskell, text, transformers, transformers-base + , transformers-compat }: mkDerivation { pname = "monad-logger"; - version = "0.3.11.1"; - sha256 = "1vh847ivymhb20sly9aplcm35zcmn7xmibv8lkv1ws9y7s1951p7"; + version = "0.3.12"; + sha256 = "0n5y2rc7da4paszcnvi6yrzg8fmi2nzyxd62d554z7fwciv9px71"; buildDepends = [ base blaze-builder bytestring conduit conduit-extra exceptions fast-logger lifted-base monad-control monad-loops mtl resourcet stm stm-chans template-haskell text transformers transformers-base + transformers-compat ]; homepage = "https://github.com/kazu-yamamoto/logger"; description = "A class of monads which can log messages"; @@ -81439,8 +81652,8 @@ self: { }: mkDerivation { pname = "mono-traversable"; - version = "0.7.0"; - sha256 = "0154spqy8k060hqq2qdj5hyj5fyf6r0dcm7nmz3w4wlg2labc0i4"; + version = "0.8.0.1"; + sha256 = "19b4d21cgnp1iq3fcayi0phjp1lk1l09njpp6wpxcj2jcdi2l9sz"; buildDepends = [ base bytestring comonad containers dlist dlist-instances hashable semigroupoids semigroups text transformers unordered-containers @@ -81748,6 +81961,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mp" = callPackage + ({ mkDerivation, base, binary, bytestring, ConfigFile, daemons + , directory, filepath, glib, gstreamer, hgettext, MissingH, mtl + , network, random, setlocale, text, unix, unordered-containers + , utf8-string, vty, vty-ui + }: + mkDerivation { + pname = "mp"; + version = "0.1.3"; + sha256 = "0gh2xsn9nmb8r8l69xcdd0v9ldk8663676wl5dxh6300h97a0dsj"; + editedCabalFile = "155358da276e8dee3d6e543f005025de03692dc9857d74cd19291a0b98ece325"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base binary bytestring ConfigFile daemons directory filepath glib + gstreamer hgettext MissingH mtl network random setlocale text unix + unordered-containers utf8-string vty vty-ui + ]; + jailbreak = true; + homepage = "http://code.google.com/p/linux-music-player"; + description = "Music player for linux"; + license = "GPL"; + }) {}; + "mp3decoder" = callPackage ({ mkDerivation, base, binary-strict, bytestring, haskell98, mtl }: mkDerivation { @@ -83814,8 +84051,8 @@ self: { ({ mkDerivation, base, netlist, pretty }: mkDerivation { pname = "netlist-to-vhdl"; - version = "0.3.1"; - sha256 = "15daik7l0pjqilya01l5rl84g2fyjwkap1md0nx82gxcp8m1v76k"; + version = "0.3.2"; + sha256 = "107pkkihj62qjkfwrnhwfscpph5r76lx6r3s0m3b0dbsf1jy2a61"; buildDepends = [ base netlist pretty ]; description = "Convert a Netlist AST to VHDL"; license = stdenv.lib.licenses.bsd3; @@ -84053,8 +84290,8 @@ self: { }: mkDerivation { pname = "network-bitcoin"; - version = "1.7.0"; - sha256 = "0hr9kg4hiif918bciz6zg9wf4amjjgkbkz437m8yf3vsmdfwpb66"; + version = "1.7.1"; + sha256 = "0w801fmwfn1q5n65yd2c5n7c6901gxvx640r6mrjxgcj402bwjxk"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -84438,8 +84675,8 @@ self: { }: mkDerivation { pname = "network-simple"; - version = "0.4.0.2"; - sha256 = "0k155m1s7k157rpsz8ww9cs7jyw3faybwfmw97agvskhb4axw6hf"; + version = "0.4.0.3"; + sha256 = "0nbs79v07x18y324drngr1zrcgjla2y9qjxkd64qwbldw48s1i85"; buildDepends = [ base bytestring exceptions network transformers ]; homepage = "https://github.com/k0001/network-simple"; description = "Simple network sockets usage patterns"; @@ -85737,6 +85974,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "octohat" = callPackage + ({ mkDerivation, aeson, base, base-compat, base16-bytestring + , base64-bytestring, bytestring, containers, cryptohash, dotenv + , either, errors, hspec, hspec-expectations, http-client + , http-types, lens, mtl, text, time, transformers + , unordered-containers, wreq, xmlhtml + }: + mkDerivation { + pname = "octohat"; + version = "0.1"; + sha256 = "1xiqs5q2cpgr6vgj3wpwildhnd08c2kwk52hzpwnnarwfif29r49"; + editedCabalFile = "8f268dfdda4d4fe6215f17223f11751da0bf15c4989282aae70c82ffe1a6e35c"; + buildDepends = [ + aeson base base-compat base16-bytestring base64-bytestring + bytestring containers cryptohash dotenv either errors http-client + http-types lens mtl text time transformers unordered-containers + wreq xmlhtml + ]; + testDepends = [ + base base-compat dotenv hspec hspec-expectations text transformers + ]; + description = "A tested, minimal wrapper around GitHub's API"; + license = stdenv.lib.licenses.mit; + }) {}; + "octopus" = callPackage ({ mkDerivation, array, base, bytestring, containers, hexpr, mtl , parsec, symbol, text @@ -85996,8 +86258,8 @@ self: { }: mkDerivation { pname = "on-demand-ssh-tunnel"; - version = "0.1.0.4"; - sha256 = "0k1z7a4h3ml043x140vrhfchlha5x4ak5n3nvaqcfk78cjr8krbr"; + version = "0.1.0.5"; + sha256 = "0gsfdsss7yddb90rx0ml6lpcd5q0qvk78m42iz1ikqgy5g9hgv1x"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -86082,19 +86344,18 @@ self: { }) {}; "opaleye" = callPackage - ({ mkDerivation, base, contravariant, old-locale, postgresql-simple - , pretty, product-profunctors, profunctors, semigroups, text, time - , transformers, uuid + ({ mkDerivation, attoparsec, base, case-insensitive, contravariant + , old-locale, postgresql-simple, pretty, product-profunctors + , profunctors, semigroups, text, time, transformers, uuid }: mkDerivation { pname = "opaleye"; - version = "0.3"; - sha256 = "1jq2q0dswgj5jksdd5xn2ny66d1nfqmwf7cv835gg59g4rd2yyrx"; - editedCabalFile = "fba09de3e538f5f3271e5b736a08541a8738fc291ab0d1a7dc537fb30dd60a85"; + version = "0.3.1"; + sha256 = "188c5n0ywmvfsh4sbbwi3p82is92x770mlfdkdbfm4bsqnsc8905"; buildDepends = [ - base contravariant old-locale postgresql-simple pretty - product-profunctors profunctors semigroups text time transformers - uuid + attoparsec base case-insensitive contravariant old-locale + postgresql-simple pretty product-profunctors profunctors semigroups + text time transformers uuid ]; testDepends = [ base postgresql-simple product-profunctors profunctors time @@ -87416,10 +87677,10 @@ self: { pname = "parallel-io"; version = "0.3.3"; sha256 = "0i86x3bf8pjlg6mdg1zg5lcrjpg75pbqs2mrgrbp4z4bkcmw051s"; + editedCabalFile = "75eeeb51593fa2771c8dbc965ca09d830d62e08135870188a10446f842178bee"; isLibrary = true; isExecutable = true; buildDepends = [ base containers extensible-exceptions random ]; - jailbreak = true; homepage = "http://batterseapower.github.com/parallel-io"; description = "Combinators for executing IO actions in parallel on a thread pool"; license = stdenv.lib.licenses.bsd3; @@ -88306,6 +88567,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pcre-heavy" = callPackage + ({ mkDerivation, base, bytestring, doctest, Glob, pcre-light + , stringable, template-haskell + }: + mkDerivation { + pname = "pcre-heavy"; + version = "0.2.0"; + sha256 = "103720n3nqmghvqnh2nhyn4q0a85x02ss98ya36r0jyckr0a1fn8"; + buildDepends = [ + base bytestring pcre-light stringable template-haskell + ]; + testDepends = [ base doctest Glob ]; + homepage = "https://github.com/myfreeweb/pcre-heavy"; + description = "A regexp library on top of pcre-light you can actually use"; + license = "unknown"; + }) {}; + "pcre-less" = callPackage ({ mkDerivation, array, base, regex-pcre }: mkDerivation { @@ -89228,20 +89506,18 @@ self: { }) {}; "pgdl" = callPackage - ({ mkDerivation, base, binary, bytestring, Cabal, configurator - , directory, filepath, HTTP, http-conduit, process, resourcet - , split, tagsoup, text, transformers, vty, vty-ui + ({ mkDerivation, base, bytestring, Cabal, configurator, directory + , filepath, HTTP, network-uri, process, tagsoup, text, vty, vty-ui }: mkDerivation { pname = "pgdl"; - version = "7.0"; - sha256 = "1vk2y1c94s2n3r3fk7sfc26sp143qq9hxwaqpfw063nda55q7yh0"; + version = "7.4"; + sha256 = "1n9cyj8yki922vm26bgnxpd4j1ps50gqllgncnk2gg5q7g6y3nz1"; isLibrary = false; isExecutable = true; buildDepends = [ - base binary bytestring Cabal configurator directory filepath HTTP - http-conduit process resourcet split tagsoup text transformers vty - vty-ui + base bytestring Cabal configurator directory filepath HTTP + network-uri process tagsoup text vty vty-ui ]; description = "pgdownloader"; license = stdenv.lib.licenses.publicDomain; @@ -89981,6 +90257,7 @@ self: { version = "2.2.0"; sha256 = "1m44a2pbws73jbr2ca48i94mrfwzlsibyc22i2w3fqq159qfg6ca"; buildDepends = [ base containers exceptions pipes transformers ]; + jailbreak = true; description = "Safety for the pipes ecosystem"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -90182,16 +90459,12 @@ self: { }) {}; "plailude" = callPackage - ({ mkDerivation, base, bytestring, mtl, stringable, text, time - , utf8-string - }: + ({ mkDerivation, base, bytestring, mtl, time }: mkDerivation { pname = "plailude"; - version = "0.4.1"; - sha256 = "1a21a3x6c81ajr5rads2gw1kjlyflxpcr8niksb9yv9k3kmzq6xy"; - buildDepends = [ - base bytestring mtl stringable text time utf8-string - ]; + version = "0.4.1.1"; + sha256 = "05br21gsmcqssi6wcp0pyyv1gx9q9imh6079vxigy9iacwq5hi0q"; + buildDepends = [ base bytestring mtl time ]; jailbreak = true; homepage = "https://secure.plaimi.net/works/plailude"; description = "plaimi's prelude"; @@ -91356,8 +91629,8 @@ self: { }: mkDerivation { pname = "postgresql-typed"; - version = "0.3.1"; - sha256 = "0x7c01ai2k75qcr244cr33dylim44dhphvwd1ji9h4hlvmpr9j11"; + version = "0.3.2"; + sha256 = "0q1k5sj6q9c4mssf3z9m69fqyn9z8iz15v2b0rcc7c8x1za1kq2i"; buildDepends = [ array base binary bytestring containers cryptohash haskell-src-meta network old-locale parsec postgresql-binary scientific @@ -92166,12 +92439,12 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "process_1_2_1_0" = callPackage + "process_1_2_2_0" = callPackage ({ mkDerivation, base, deepseq, directory, filepath, unix }: mkDerivation { pname = "process"; - version = "1.2.1.0"; - sha256 = "0r11j0vys8gmzsdkfq491g43l21f9301dzma0s3gwblfsvdv2hwc"; + version = "1.2.2.0"; + sha256 = "0rxxcimwhsgcphy0brq6gxcrm8spgpqha8fhppj956kp401hx3s8"; buildDepends = [ base deepseq directory filepath unix ]; description = "Process libraries"; license = stdenv.lib.licenses.bsd3; @@ -92469,15 +92742,14 @@ self: { }: mkDerivation { pname = "profiteur"; - version = "0.1.2.1"; - sha256 = "1108hhh2ivhs85jkga4wps2yscgjnp211sw5w45j4wp9dgpz2hak"; + version = "0.1.2.2"; + sha256 = "11h4hgwwh8vq96vkca2w1rc5l0aikfhp6550x5ax04k4p3l9lzhy"; isLibrary = false; isExecutable = true; buildDepends = [ aeson attoparsec base bytestring filepath text unordered-containers vector ]; - jailbreak = true; homepage = "http://github.com/jaspervdj/profiteur"; description = "Treemap visualiser for GHC prof files"; license = stdenv.lib.licenses.bsd3; @@ -92713,8 +92985,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "1.3.2"; - sha256 = "02cfs90kfpk09njhx45bfms90350my7j4wcf1yyzfszlkpfn3mmc"; + version = "2.1.0"; + sha256 = "1ln0sa6niqjq5fzbm87kncgfyynyv14756gnj23jiwpwwv3v6pd4"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -94204,6 +94476,7 @@ self: { snap-core snap-server stm websockets websockets-snap ]; testDepends = [ base HUnit mtl ]; + jailbreak = true; homepage = "https://github.com/talw/quoridor-hs"; description = "A Quoridor implementation in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -94734,8 +95007,8 @@ self: { }: mkDerivation { pname = "rasterific-svg"; - version = "0.1.0.1"; - sha256 = "1v6ky1b43mm99j6z94q6hbvhm39vpkmncihi1y6qcls8pxymgg7s"; + version = "0.1.0.2"; + sha256 = "1jn6cj7baph2jvihr9aqrxcqwbn1vaa125n2d39s8ib6yar5x3sq"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -94747,7 +95020,6 @@ self: { attoparsec base binary blaze-html bytestring directory filepath FontyFruity JuicyPixels linear Rasterific svg-tree text ]; - jailbreak = true; description = "SVG renderer based on Rasterific"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -96572,11 +96844,12 @@ self: { ({ mkDerivation, array, base, ghc, ghc-paths, json, network }: mkDerivation { pname = "remote-debugger"; - version = "0.1.1"; - sha256 = "0ffwqd0sh09qayv8c97rk7ihv33rcpw938a6f3hlxlbpfhlhli46"; + version = "0.2.1"; + sha256 = "0mgq2n92d4xk6yqzrbghlp0h18nmkyhxnv5zynrqykfw5h9xl0f8"; isLibrary = false; isExecutable = true; buildDepends = [ array base ghc ghc-paths json network ]; + jailbreak = true; homepage = "https://github.com/octomarat/HaskellDebugger"; description = "Interface to ghci debugger"; license = stdenv.lib.licenses.bsd3; @@ -97897,6 +98170,7 @@ self: { version = "1.3.0.1"; sha256 = "1s6zihvgd0k9fyp15fvyd1fcm7bgsnp5k9w64w6srh5kwdmx8cvp"; buildDepends = [ base containers exceptions transformers xhb ]; + jailbreak = true; homepage = "https://github.com/lfairy/robot"; description = "Simulate keyboard and mouse events"; license = "unknown"; @@ -99244,6 +99518,7 @@ self: { testDepends = [ base bytestring HUnit tasty tasty-hunit tasty-quickcheck tasty-th ]; + jailbreak = true; homepage = "http://hackage.haskell.org/package/sandi"; description = "Data encoding library"; license = stdenv.lib.licenses.bsd3; @@ -101405,6 +101680,7 @@ self: { pname = "setlocale"; version = "1.0.0.1"; sha256 = "15dzf4hgkn5saz6qyn1xqvinvy0y571crfxfwycmcmm4az6rsqk0"; + editedCabalFile = "f95d33f3a43b64f5b4e1e94641f8614e70c778ada7f6fd8cde83577d84b486c6"; buildDepends = [ base ]; description = "Haskell bindings to setlocale"; license = stdenv.lib.licenses.bsd3; @@ -102087,6 +102363,7 @@ self: { system-fileio system-filepath text time transformers transformers-base unix-compat ]; + jailbreak = true; homepage = "https://github.com/yesodweb/Shelly.hs"; description = "shell-like (systems) programming in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -104218,8 +104495,8 @@ self: { }: mkDerivation { pname = "snaplet-fay"; - version = "0.3.3.9"; - sha256 = "019zffk11ix0fhngl41y6h40m0cvakn2bss4xnyqv8q8rgqn3v2g"; + version = "0.3.3.10"; + sha256 = "15gp711b650z66168a9r0zrwqvrp9l66mfqhb8qnzbyin43kc5ll"; buildDepends = [ aeson base bytestring configurator directory fay filepath mtl snap snap-core transformers @@ -104772,6 +105049,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) { inherit (pkgs) snappy;}; + "snappy-conduit" = callPackage + ({ mkDerivation, base, bytestring, conduit, snappy }: + mkDerivation { + pname = "snappy-conduit"; + version = "0.1.0.0"; + sha256 = "0k93v3dyv7818xy45l7i5wykfmnwyqkykxjh6xr937zh8a4qapfi"; + buildDepends = [ base bytestring conduit snappy ]; + homepage = "http://github.com/tatac1/snappy-conduit/"; + description = "Conduit bindings for Snappy (see snappy package)"; + license = stdenv.lib.licenses.mit; + }) {}; + "snappy-framing" = callPackage ({ mkDerivation, array, base, binary, bytestring, snappy }: mkDerivation { @@ -107060,8 +107349,8 @@ self: { }: mkDerivation { pname = "stm-conduit"; - version = "2.5.3"; - sha256 = "1jsij92i3rw2wz1166i58p0lxrbx0jndf1hi3kj92ccvnc3zg1iw"; + version = "2.5.4"; + sha256 = "1pwsv9724b6g80l53wwziv2sajaxc2mwl3mxldpzd0v48zaajflk"; buildDepends = [ async base cereal cereal-conduit conduit conduit-extra directory lifted-async lifted-base monad-control monad-loops resourcet stm @@ -108423,13 +108712,12 @@ self: { }: mkDerivation { pname = "svg-tree"; - version = "0.1"; - sha256 = "08id1wadmdqh9nig5cjdkg47s9qi6k92dm02s6l9si7bq2mymwvy"; + version = "0.1.0.1"; + sha256 = "1yypbd94436c38qvgq5cfc1f9bpiq26faxb12s0xyl6551gr6rac"; buildDepends = [ attoparsec base bytestring containers JuicyPixels lens linear mtl scientific text transformers vector xml ]; - jailbreak = true; description = "SVG file loader and serializer"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -109643,12 +109931,17 @@ self: { }) {}; "tagged-exception-core" = callPackage - ({ mkDerivation, base, exceptions, mmorph, transformers }: + ({ mkDerivation, base, exceptions, extensible-exceptions, mmorph + , transformers + }: mkDerivation { pname = "tagged-exception-core"; version = "2.0.0.0"; sha256 = "02ny4yz9afaazw2pxpkpalffx8i5nhi3x9561blrd0pdrqq8qnib"; - buildDepends = [ base exceptions mmorph transformers ]; + buildDepends = [ + base exceptions extensible-exceptions mmorph transformers + ]; + jailbreak = true; homepage = "https://github.com/trskop/tagged-exception"; description = "Reflect exceptions using phantom types"; license = stdenv.lib.licenses.bsd3; @@ -109884,6 +110177,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "takahashi" = callPackage + ({ mkDerivation, base, free-operational, mtl, reasonable-lens }: + mkDerivation { + pname = "takahashi"; + version = "0.2.0.0"; + sha256 = "18cj4w4a998r4krari6j77fnv2msizyrv8xdwyq6v7ja33zb954h"; + buildDepends = [ base free-operational mtl reasonable-lens ]; + description = "library for takahashi method"; + license = stdenv.lib.licenses.mit; + }) {}; + "takusen-oracle" = callPackage ({ mkDerivation, base, clntsh, mtl, old-time, QuickCheck, random , sqlplus, time @@ -111136,6 +111440,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "test-sandbox-compose" = callPackage + ({ mkDerivation, aeson, base, bytestring, cabal-test-bin + , containers, directory, hastache, hspec, http-conduit, lifted-base + , network, optparse-applicative, process, shakespeare, shelly + , test-sandbox, text, unix, wai, wai-extra, warp, yaml, yesod + , yesod-core + }: + mkDerivation { + pname = "test-sandbox-compose"; + version = "0.1.1"; + sha256 = "1v2zvds3c8g0svh4jafzpdylnkn02hfrnwgxf7pilpd7x718id17"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson base bytestring containers directory hastache http-conduit + lifted-base network optparse-applicative process shelly + test-sandbox text unix wai wai-extra warp yaml yesod yesod-core + ]; + testDepends = [ + base bytestring cabal-test-bin hspec process shakespeare text unix + ]; + description = "Lightweight development enviroments using test-sandbox"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "test-sandbox-hunit" = callPackage ({ mkDerivation, base, HUnit, lifted-base, test-sandbox }: mkDerivation { @@ -111801,14 +112130,15 @@ self: { }: mkDerivation { pname = "th-alpha"; - version = "0.2.0.0"; - sha256 = "1v280dhy3yw6aw9vi3rb91vz9brdcg8j6pvqdirra98r0yz321q0"; + version = "0.2.0.1"; + sha256 = "02bym2rk3lm0l09n6fp68v144l3mv67qjlifsja4q9iya530ckls"; buildDepends = [ base containers mmorph mtl template-haskell th-desugar transformers ]; testDepends = [ base derive tasty tasty-hunit tasty-quickcheck template-haskell ]; + jailbreak = true; homepage = "https://github.com/jkarni/th-alpha"; description = "Alpha equivalence for TH Exp"; license = stdenv.lib.licenses.bsd3; @@ -111982,8 +112312,8 @@ self: { ({ mkDerivation, base, template-haskell, th-lift, th-reify-many }: mkDerivation { pname = "th-orphans"; - version = "0.8.3"; - sha256 = "1ia6qg6fh90glg86kc248mch3qim1x09zbccfh1drcqk4c54lhnx"; + version = "0.9.0"; + sha256 = "150859mxwn40xkwbfbwsxi05x8j8dq5qvx53i956fqh1gp4sx4p3"; buildDepends = [ base template-haskell th-lift th-reify-many ]; description = "Orphan instances for TH datatypes"; license = stdenv.lib.licenses.bsd3; @@ -112266,6 +112596,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "threads-supervisor" = callPackage + ({ mkDerivation, base, bytestring, QuickCheck, stm, tasty + , tasty-hunit, tasty-quickcheck, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "threads-supervisor"; + version = "1.0.0.0"; + sha256 = "0wbq92kg41srm0s2n0ckaimkrvba4na3acdg3ky9rpcwh7ir4a7v"; + buildDepends = [ base stm time unordered-containers ]; + testDepends = [ + base bytestring QuickCheck stm tasty tasty-hunit tasty-quickcheck + time transformers + ]; + description = "Simple, IO-based library for Erlang-style thread supervision"; + license = stdenv.lib.licenses.mit; + }) {}; + "threadscope" = callPackage ({ mkDerivation, array, base, binary, cairo, containers, deepseq , filepath, ghc-events, glib, gtk, mtl, pango, text, time, unix @@ -113777,13 +114125,12 @@ self: { }) {}; "transformers-base" = callPackage - ({ mkDerivation, base, stm, transformers }: + ({ mkDerivation, base, stm, transformers, transformers-compat }: mkDerivation { pname = "transformers-base"; - version = "0.4.3"; - sha256 = "0bklr7piiipnh99jnqx262pdyb9hzk852d6hzk5sqppvz5ndcf4y"; - editedCabalFile = "48e267c7ce3e0cbc1493d5d7dc3fd7301ae42d229857fd21240a3b915665545e"; - buildDepends = [ base stm transformers ]; + version = "0.4.4"; + sha256 = "11r3slgpgpra6zi2kjg3g60gvv17b1fh6qxipcpk8n86qx7lk8va"; + buildDepends = [ base stm transformers transformers-compat ]; homepage = "https://github.com/mvv/transformers-base"; description = "Lift computations from the bottom of a transformer stack"; license = stdenv.lib.licenses.bsd3; @@ -114973,8 +115320,8 @@ self: { ({ mkDerivation, base, cpphs }: mkDerivation { pname = "type-eq"; - version = "0.4.2"; - sha256 = "0nyx3lqgrnlz0l3p615ln2dglqd39jwlk91ybz7blzhq1gpgayar"; + version = "0.5"; + sha256 = "007srln0xxi27wca8dk72xp3cdwnk8iqmlqgbxi17c9l2x7lrkwz"; buildDepends = [ base ]; buildTools = [ cpphs ]; homepage = "http://github.com/glaebhoerl/type-eq"; @@ -115503,8 +115850,8 @@ self: { }: mkDerivation { pname = "tzdata"; - version = "0.1.20141110.0"; - sha256 = "1i9vngkf1yjda7s89q17r1q37bq8f52069xpc2kzpdql4il8pvdd"; + version = "0.1.20150129.0"; + sha256 = "103f37lcz6a72hl4vyd2ynpbd7ldxkn75znss2kbkrqfggb05p9c"; buildDepends = [ base bytestring containers vector ]; testDepends = [ base bytestring directory filemanip filepath HUnit MissingH @@ -115868,12 +116215,15 @@ self: { "unbound-generics" = callPackage ({ mkDerivation, base, containers, contravariant, mtl, QuickCheck , tasty, tasty-hunit, tasty-quickcheck, transformers + , transformers-compat }: mkDerivation { pname = "unbound-generics"; - version = "0.0.2"; - sha256 = "0zgajq411bp16xwv31i2igsz62lad923rylhfprklsism13rk5ai"; - buildDepends = [ base containers contravariant mtl transformers ]; + version = "0.0.2.1"; + sha256 = "0ilfgmipfwha698qccy8jryjl42py4q2ph1lx1l8678fkfwwhi7i"; + buildDepends = [ + base containers contravariant mtl transformers transformers-compat + ]; testDepends = [ base mtl QuickCheck tasty tasty-hunit tasty-quickcheck ]; @@ -116805,8 +117155,8 @@ self: { ({ mkDerivation, base, ports-tools, process }: mkDerivation { pname = "up-grade"; - version = "0.0.1"; - sha256 = "1apa5ni0i2wqps8xvppnlhybz6s1qllpbgias4d7fbwb5pfznppd"; + version = "0.0.2"; + sha256 = "1njmx622ghpzgnwm4wykzjj1ixpalbj21hs7nkbwpmljniakp2fb"; isLibrary = false; isExecutable = true; buildDepends = [ base ports-tools process ]; @@ -120343,6 +120693,7 @@ self: { transformers-base unordered-containers vector zip-archive ]; testDepends = [ base parallel text ]; + jailbreak = true; homepage = "https://github.com/kallisti-dev/hs-webdriver"; description = "a Haskell client for the Selenium WebDriver protocol"; license = stdenv.lib.licenses.bsd3; @@ -122218,8 +122569,8 @@ self: { }: mkDerivation { pname = "xml-conduit"; - version = "1.2.3.1"; - sha256 = "10cqhqpc85zx87jc0hapzkvwm76drpxqsjliipvlah2a0x8l4ai8"; + version = "1.2.3.2"; + sha256 = "1vk4ldcacpwfmhiqpcs571s5kqsh7v0ch2sfrw2ibkm0cyqs6jk9"; buildDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring conduit conduit-extra containers data-default deepseq monad-control @@ -123137,6 +123488,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "y0l0bot" = callPackage + ({ mkDerivation, base, bytestring, containers, mtl, network + , old-locale, old-time, safe, split, text, time + }: + mkDerivation { + pname = "y0l0bot"; + version = "0.1.0"; + sha256 = "0mdfhnwz5zh9zr2p6sp3yp3f23rqsj7y2bafk4ylh9dak69v2cwx"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base bytestring containers mtl network old-locale old-time safe + split text time + ]; + jailbreak = true; + description = "#plaimi's all-encompassing bot"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "yabi" = callPackage ({ mkDerivation, base, word8 }: mkDerivation { @@ -124486,22 +124856,19 @@ self: { "yesod-purescript" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default - , directory, filepath, formatting, fsnotify, parsec, purescript - , regex-tdfa, regex-tdfa-text, shakespeare, system-fileio - , system-filepath, template-haskell, text, time, transformers - , yesod-core + , formatting, fsnotify, purescript, regex-tdfa, regex-tdfa-text + , shakespeare, system-fileio, system-filepath, template-haskell + , text, time, transformers, yesod-core }: mkDerivation { pname = "yesod-purescript"; - version = "0.0.4.4"; - sha256 = "0cnci6i4r9jp1f5ni4jxis28v0ijryyqvskqif3036nxbq4fm099"; + version = "0.0.4.5"; + sha256 = "0fmndjapnlh6qqwxri4d16dbn151wd8ihypkbprd4402cd7i5fb0"; buildDepends = [ - aeson base bytestring containers data-default directory filepath - formatting fsnotify parsec purescript regex-tdfa regex-tdfa-text - shakespeare system-fileio system-filepath template-haskell text - time transformers yesod-core + aeson base bytestring containers data-default formatting fsnotify + purescript regex-tdfa regex-tdfa-text shakespeare system-fileio + system-filepath template-haskell text time transformers yesod-core ]; - jailbreak = true; homepage = "https://github.com/mpietrzak/yesod-purescript"; description = "PureScript integration for Yesod"; license = stdenv.lib.licenses.mit; @@ -124851,6 +125218,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yet-another-logger" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, base + , base-unicode-symbols, bytestring, case-insensitive + , configuration-tools, deepseq, either, enclosed-exceptions, lens + , lifted-base, monad-control, mtl, optparse-applicative, stm + , stm-chans, text, trace, transformers, transformers-base + }: + mkDerivation { + pname = "yet-another-logger"; + version = "0.0.1"; + sha256 = "0pf2vwx0448813sx0y1c50rlg2ws1yaiplhwdjpyl7mk7f20b63m"; + buildDepends = [ + aeson ansi-terminal async base base-unicode-symbols bytestring + case-insensitive configuration-tools deepseq either + enclosed-exceptions lens lifted-base monad-control mtl + optparse-applicative stm stm-chans text trace transformers + transformers-base + ]; + jailbreak = true; + homepage = "https://github.com/alephcloud/hs-yet-another-logger"; + description = "Yet Another Logger"; + license = stdenv.lib.licenses.asl20; + }) {}; + "yhccore" = callPackage ({ mkDerivation, base, containers, mtl, pretty, uniplate }: mkDerivation { @@ -125485,6 +125876,7 @@ self: { async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck ]; pkgconfigDepends = [ zeromq ]; + jailbreak = true; homepage = "http://github.com/twittner/zeromq-haskell/"; description = "Bindings to ZeroMQ 4.x"; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix index 6fe3601aeaa7..802aafc444c3 100644 --- a/pkgs/development/libraries/faac/default.nix +++ b/pkgs/development/libraries/faac/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source MPEG-4 and MPEG-2 AAC encoder"; homepage = http://www.audiocoding.com/faac.html; - license = licenses.unfree; + license = licenses.unfreeRedistributable; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix index 0694b7d3018c..2b0b027bda5d 100644 --- a/pkgs/development/libraries/fdk-aac/default.nix +++ b/pkgs/development/libraries/fdk-aac/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, exampleSupport ? true # Example encoding program +, exampleSupport ? false # Example encoding program }: with stdenv.lib; diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix index 6238f4b53b07..aab08d52ca11 100644 --- a/pkgs/development/libraries/gsm/default.nix +++ b/pkgs/development/libraries/gsm/default.nix @@ -11,11 +11,13 @@ stdenv.mkDerivation rec { }; preConfigure = '' - sed -e 's,$(GSM_INSTALL_ROOT)/inc,$(GSM_INSTALL_ROOT)/includes,' -i Makefile - mkdir -p "$out/"{bin,lib,man/man1,man/man3,include} + sed -e 's,$(GSM_INSTALL_ROOT)/inc,$(GSM_INSTALL_ROOT)/include/gsm,' -i Makefile + mkdir -p "$out/"{bin,lib,man/man1,man/man3,include/gsm} makeFlags="$makeFlags INSTALL_ROOT=$out" ''; + NIX_CFLAGS_COMPILE = "-fPIC"; + parallelBuild = false; meta = { diff --git a/pkgs/development/libraries/haskell/servant-server/default.nix b/pkgs/development/libraries/haskell/servant-server/default.nix index 7776af8036d1..8c3ce56d4128 100644 --- a/pkgs/development/libraries/haskell/servant-server/default.nix +++ b/pkgs/development/libraries/haskell/servant-server/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "servant-server"; - version = "0.2.1"; - sha256 = "1b2aqxnn9nf5qabbl8k9kq9b2mpn591j9jpjy33sis7ni469bayj"; + version = "0.2.3"; + sha256 = "0n4r145jd1g07g0a1mhbc7s61h6cbbvjvhzwngff756iky7fkcb9"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index a6e0cdfa3b06..8a352a27ba3a 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "1.2.3"; - sha256 = "1knwmvs9hczlknyi27hciy1xkn219s6niv3w7q0wkw6rxz2q555v"; + version = "1.2.3.1"; + sha256 = "10cqhqpc85zx87jc0hapzkvwm76drpxqsjliipvlah2a0x8l4ai8"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup conduit conduitExtra dataDefault deepseq monadControl resourcet systemFilepath text @@ -18,7 +18,6 @@ cabal.mkDerivation (self: { blazeMarkup conduit hspec HUnit resourcet text transformers xmlTypes ]; - jailbreak = true; meta = { homepage = "http://github.com/snoyberg/xml"; description = "Pure-Haskell utilities for dealing with XML with the conduit package"; diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 166444d1b3b0..b400ff813d29 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "ldb-1.1.19"; + name = "ldb-1.1.20"; src = fetchurl { url = "mirror://samba/ldb/${name}.tar.gz"; - sha256 = "1p2815z9sjack08pcdbv4xzp1fvr4lxcn30rj0wh3py4ly6ji1h0"; + sha256 = "1ckplfvr8rp5y632w5j0abdgkj3irbzjh1wn0yxadnhz4ymknjds"; }; buildInputs = [ diff --git a/pkgs/development/libraries/libasr/default.nix b/pkgs/development/libraries/libasr/default.nix new file mode 100644 index 000000000000..b919aef5658c --- /dev/null +++ b/pkgs/development/libraries/libasr/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, libevent, openssl }: + +stdenv.mkDerivation rec { + name = "libasr-${version}"; + version= "1.0.1"; + + src = fetchurl { + url = "https://www.opensmtpd.org/archives/${name}.tar.gz"; + sha256 = "10h1c9b58msbggns8k2m0857zmbldb0x8ghk3aay88yn2bip2916"; + }; + + buildInputs = [ libevent openssl ]; + + meta = with stdenv.lib; { + homepage = https://github.com/OpenSMTPD/libasr; + description = "Free, simple and portable asynchronous resolver library"; + license = licenses.isc; + maintainers = [ maintainers.koral ]; + }; +} diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 15b80053218d..7dda6912a986 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -1,34 +1,53 @@ { stdenv, fetchurl, pkgconfig, yasm -, freetype, fribidi, fontconfig -, enca ? null -, harfbuzz ? null +, freetype ? null +, fribidi ? null +, encaSupport ? true, enca ? null # enca support +, fontconfigSupport ? true, fontconfig ? null # fontconfig support +, harfbuzzSupport ? true, harfbuzz ? null # harfbuzz support +, rasterizerSupport ? false # Internal rasterizer +, largeTilesSupport ? false # Use larger tiles in the rasterizer }: +assert ((freetype != null) && (fribidi != null)); +assert encaSupport -> (enca != null); +assert fontconfigSupport -> (fontconfig != null); +assert harfbuzzSupport -> (harfbuzz != null); + let - version = "0.11.1"; - sha256 = "1b0ki1zdkhflszzj5qr45j9qsd0rfbb6ws5pqkny8jhih0l3lxwx"; - baseurl = "https://github.com/libass/libass/releases/download"; -in stdenv.mkDerivation rec { + mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; +in + +with stdenv.lib; +stdenv.mkDerivation rec { name = "libass-${version}"; + version = "0.12.1"; src = fetchurl { - url = "${baseurl}/${version}/${name}.tar.xz"; - inherit sha256; + url = "https://github.com/libass/libass/releases/download/${version}/${name}.tar.xz"; + sha256 = "1mwj2nk9g6cq6f8m1hf0ijg1299rghhy9naahqq43sc2whblb1l7"; }; + configureFlags = [ + (mkFlag encaSupport "enca") + (mkFlag fontconfigSupport "fontconfig") + (mkFlag harfbuzzSupport "harfbuzz") + (mkFlag rasterizerSupport "rasterizer") + (mkFlag largeTilesSupport "large-tiles") + ]; + nativeBuildInputs = [ pkgconfig yasm ]; - buildInputs = [ - freetype fribidi fontconfig - enca harfbuzz - ]; + buildInputs = [ freetype fribidi ] + ++ optional encaSupport enca + ++ optional fontconfigSupport fontconfig + ++ optional harfbuzzSupport harfbuzz; meta = { description = "Portable ASS/SSA subtitle renderer"; - homepage = http://code.google.com/p/libass/; - license = stdenv.lib.licenses.isc; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.urkud ]; + homepage = https://github.com/libass/libass; + license = licenses.isc; + platforms = platforms.linux; + maintainers = with maintainers; [ codyopel urkud ]; repositories.git = git://github.com/libass/libass.git; }; } diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index ae501f90cec5..fc554122c08e 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "06dabf77cz6qg7aqv5j5r4m32b5zn253pixwb3k5lm3z0h88y7cn"; }; - NIX_LDFLAGS = "-lssp"; + NIX_LDFLAGS = stdenv.lib.optionalString (stdenv.cc.cc.isGNU or false) "-lssp"; doCheck = true; diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 45fc442a713f..a7c80077e799 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -1,47 +1,184 @@ -{stdenv, fetchurl, bash, yasm, which, perl, binutils}: +{stdenv, fetchurl, bash, perl, yasm +, vp8Support ? true # VP8 +, vp8DecoderSupport ? true # VP8 decoder +, vp8EncoderSupport ? true # VP8 encoder +, vp9Support ? true # VP9 +, vp9DecoderSupport ? true # VP9 decoder +, vp9EncoderSupport ? true # VP9 encoder +, extraWarningsSupport ? false # emit non-fatal warnings +, werrorSupport ? false # treat warnings as errors (not available with all compilers) +, installBinsSupport ? true # install binaries (vpxdec & vpxenc) +, installLibsSupport ? true # install libraries +, installSrcsSupport ? false # install sources +, debugSupport ? false # debug mode +, gprofSupport ? false # gprof profiling instrumentation +, gcovSupport ? false # gcov coverage instrumentation +, optimizationsSupport ? true # compiler optimization flags +, runtimeCpuDetectSupport ? true # detect cpu capabilities at runtime +, thumbSupport ? false # build arm assembly in thumb mode +, libsSupport ? true # build librares +, examplesSupport ? true # build examples (vpxdec & vpxenc are part of examples) +, fastUnalignedSupport ? true # use unaligned accesses if supported by hardware +, codecSrcsSupport ? false # codec library source code +, debugLibsSupport ? false # include debug version of each library +, md5Support ? true # support for output of checksum data +, postprocSupport ? true # postprocessing +, vp9PostprocSupport ? true # VP9 specific postprocessing +, multithreadSupport ? true # multithreaded decoding & encoding +, internalStatsSupport ? false # output of encoder internal stats for debug, if supported (encoders) +, memTrackerSupport ? false # track memory usage +, realtimeOnlySupport ? false # build for real-time encoding +, ontheflyBitpackingSupport ? false # on-the-fly bitpacking in real-time encoding +, errorConcealmentSupport ? false # decoder conceals losses +, smallSupport ? false # favor smaller binary over speed +, postprocVisualizerSupport ? false # macro block/block level visualizers +, unitTestsSupport ? false, curl ? null, coreutils ? null # unit tests +, multiResEncodingSupport ? false # multiple-resolution encoding +, temporalDenoisingSupport ? true # use temporal denoising instead of spatial denoising +, decryptSupport ? false +, experimentalSupport ? false # experimental features +# Experimental features +, experimentalMultipleArfSupport ? false +, experimentalNon420Support ? false +, experimentalAlphaSupport ? false +}: -let version = "1.3.0"; +assert (vp8Support || vp9Support); +assert (vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport); +assert vp8DecoderSupport -> vp8Support; +assert vp8EncoderSupport -> vp8Support; +assert vp9DecoderSupport -> vp9Support; +assert vp9EncoderSupport -> vp9Support; +assert installLibsSupport -> libsSupport; +# libvpx will not build binaries if examplesSupport is not enabled (ie. vpxdec & vpxenc) +assert installBinsSupport -> examplesSupport; +assert examplesSupport -> md5Support; +assert vp9PostprocSupport -> (vp9Support && postprocSupport); +assert (internalStatsSupport && vp9Support) -> vp9PostprocSupport; +assert postprocVisualizerSupport -> postprocSupport; +assert (postprocVisualizerSupport && vp9Support) -> vp9PostprocSupport; +assert unitTestsSupport -> ((curl != null) && (coreutils != null)); +assert (experimentalMultipleArfSupport || experimentalNon420Support || experimentalAlphaSupport) -> experimentalSupport; +assert stdenv.isCygwin -> unitTestsSupport; + +let + mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; in + +with stdenv.lib; stdenv.mkDerivation rec { - name = "libvpx-" + version; + name = "libvpx-${version}"; + version = "1.3.0"; - src = fetchurl { # sadly, there's no official tarball for this release - url = "http://webm.googlecode.com/files/libvpx-v1.3.0.tar.bz2"; + src = fetchurl { + url = "http://webm.googlecode.com/files/libvpx-v${version}.tar.bz2"; sha1 = "191b95817aede8c136cc3f3745fb1b8c50e6d5dc"; }; patchPhase = '' - sed -e 's,/bin/bash,${bash}/bin/bash,' -i configure build/make/version.sh \ - examples/gen_example_code.sh build/make/gen_asm_deps.sh - sed -e '/enable linux/d' -i configure + patchShebangs . ''; - buildInputs = [ yasm which perl ] - ++ stdenv.lib.optional stdenv.isDarwin binutils; # new asm opcode support + nativeBuildInputs = [ bash perl yasm ]; - preConfigure = '' - mkdir -p build - cd build - substituteInPlace make/configure.sh --replace "-arch x86_64" "-march=x86-64" - ''; + buildInputs = [ ] + ++ optional unitTestsSupport coreutils + ++ optional unitTestsSupport curl; - configureScript = "../configure"; - configureFlags = - [ "--disable-install-srcs" "--disable-install-docs" "--disable-examples" - "--enable-vp8" "--enable-runtime-cpu-detect" "--enable-pic" ] - # --enable-shared is only supported on ELF - ++ stdenv.lib.optional (!stdenv.isDarwin) "--disable-static --enable-shared"; + configureFlags = [ + (mkFlag vp8Support "vp8") + (mkFlag vp8EncoderSupport "vp8-encoder") + (mkFlag vp8DecoderSupport "vp8-decoder") + (mkFlag vp9Support "vp9") + (mkFlag vp9EncoderSupport "vp9-encoder") + (mkFlag vp9DecoderSupport "vp9-decoder") + (mkFlag extraWarningsSupport "extra-warnings") + (mkFlag werrorSupport "werror") + "--disable-install-docs" + (mkFlag installBinsSupport "install-bins") + (mkFlag installLibsSupport "install-libs") + (mkFlag installSrcsSupport "install-srcs") + (mkFlag debugSupport "debug") + (mkFlag gprofSupport "gprof") + (mkFlag gcovSupport "gcov") + # Required to build shared libraries + (mkFlag (!stdenv.isDarwin && !stdenv.isCygwin) "pic") + (mkFlag (stdenv.isx86_64 || !stdenv.isDarwin || stdenv.isCygwin) "use-x86inc") + (mkFlag optimizationsSupport "optimizations") + (mkFlag runtimeCpuDetectSupport "runtime-cpu-detect") + (mkFlag thumbSupport "thumb") + (mkFlag libsSupport "libs") + (mkFlag examplesSupport "examples") + "--disable-docs" + "--as=yasm" + (mkFlag fastUnalignedSupport "fast-unaligned") + (mkFlag codecSrcsSupport "codec-srcs") + (mkFlag debugLibsSupport "debug-libs") + (mkFlag md5Support "md5") + (mkFlag stdenv.isMips "dequant-tokens") + (mkFlag stdenv.isMips "dc-recon") + (mkFlag postprocSupport "postproc") + (mkFlag vp9PostprocSupport "vp9-postproc") + (mkFlag multithreadSupport "multithread") + (mkFlag internalStatsSupport "internal-stats") + (mkFlag memTrackerSupport "mem-tracker") + /* If --enable-spatial-resampling not enabled, build will fail with undeclared variable errors. + Variables called in vpx_scale/generic/vpx_scale.c are declared by vpx_scale/vpx_scale_rtcd.pl, + but is only executed if --enable-spatial-resampling is enabled */ + "--enable-spatial-resampling" + (mkFlag realtimeOnlySupport "realtime-only") + (mkFlag ontheflyBitpackingSupport "onthefly-bitpacking") + (mkFlag errorConcealmentSupport "error-concealment") + # Shared libraries are only supported on ELF platforms + (mkFlag (stdenv.isDarwin || stdenv.isCygwin) "static") + (mkFlag (!stdenv.isDarwin && !stdenv.isCygwin) "shared") + (mkFlag smallSupport "small") + (mkFlag postprocVisualizerSupport "postproc-visualizer") + (mkFlag unitTestsSupport "unit-tests") + (mkFlag multiResEncodingSupport "multi-res-encoding") + (mkFlag temporalDenoisingSupport "temporal-denoising") + (mkFlag decryptSupport "decrypt") + (mkFlag experimentalSupport "experimental") + # Experimental features + (mkFlag experimentalMultipleArfSupport "multiple-arf") + (mkFlag experimentalNon420Support "non420") + (mkFlag experimentalAlphaSupport "alpha") + ]; - installPhase = '' - make quiet=false DIST_DIR=$out install - ''; + enableParallelBuilding = true; - meta = with stdenv.lib; { - description = "VP8 video encoder"; - homepage = http://code.google.com/p/webm; + crossAttrs = let + isCygwin = stdenv.cross.libc == "msvcrt"; + isDarwin = stdenv.cross.libc == "libSystem"; + in { + dontSetConfigureCross = true; + configureFlags = configureFlags ++ [ + #"--extra-cflags=" + #"--prefix=" + #"--libc=" + #"--libdir=" + "--enable-external-build" + # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version) + # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure + # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14 + "--force-target=${stdenv.cross.config}${( + if isDarwin then ( + if stdenv.cross.osxMinVersion == "10.9" then "13" + else if stdenv.cross.osxMinVersion == "10.8" then "12" + else if stdenv.cross.osxMinVersion == "10.7" then "11" + else if stdenv.cross.osxMinVersion == "10.6" then "10" + else if stdenv.cross.osxMinVersion == "10.5" then "9" + else "8") + else "")}-gcc" + (if isCygwin then "--enable-static-msvcrt" else "") + ]; + }; + + meta = { + description = "WebM VP8/VP9 codec SDK"; + homepage = http://www.webmproject.org/; license = licenses.bsd3; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; + maintainers = with maintainers; [ codyopel lovek323 ]; + platforms = platforms.all; }; } - diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix new file mode 100644 index 000000000000..fd7f9150e1dc --- /dev/null +++ b/pkgs/development/libraries/libvpx/git.nix @@ -0,0 +1,203 @@ +{stdenv, fetchgit, perl, yasm +, vp8Support ? true # VP8 +, vp8DecoderSupport ? true # VP8 decoder +, vp8EncoderSupport ? true # VP8 encoder +, vp9Support ? true # VP9 +, vp9DecoderSupport ? true # VP9 decoder +, vp9EncoderSupport ? true # VP9 encoder +, extraWarningsSupport ? false # emit non-fatal warnings +, werrorSupport ? false # treat warnings as errors (not available with all compilers) +, installBinsSupport ? true # install binaries (vpxdec & vpxenc) +, installLibsSupport ? true # install libraries +, installSrcsSupport ? false # install sources +, debugSupport ? false # debug mode +, gprofSupport ? false # gprof profiling instrumentation +, gcovSupport ? false # gcov coverage instrumentation +, sizeLimitSupport ? true # limit max size to allow in the decoder +, optimizationsSupport ? true # compiler optimization flags +, runtimeCpuDetectSupport ? true # detect cpu capabilities at runtime +, thumbSupport ? false # build arm assembly in thumb mode +, libsSupport ? true # build librares +, examplesSupport ? true # build examples (vpxdec & vpxenc are part of examples) +, fastUnalignedSupport ? true # use unaligned accesses if supported by hardware +, codecSrcsSupport ? false # codec library source code +, debugLibsSupport ? false # include debug version of each library +, postprocSupport ? true # postprocessing +, vp9PostprocSupport ? true # VP9 specific postprocessing +, multithreadSupport ? true # multithreaded decoding & encoding +, internalStatsSupport ? false # output of encoder internal stats for debug, if supported (encoders) +, memTrackerSupport ? false # track memory usage +, spatialResamplingSupport ? true # spatial sampling (scaling) +, realtimeOnlySupport ? false # build for real-time encoding +, ontheflyBitpackingSupport ? false # on-the-fly bitpacking in real-time encoding +, errorConcealmentSupport ? false # decoder conceals losses +, smallSupport ? false # favor smaller binary over speed +, postprocVisualizerSupport ? false # macro block/block level visualizers +, unitTestsSupport ? false, curl ? null, coreutils ? null # unit tests +, webmIOSupport ? true # input from and output to webm container +, libyuvSupport ? true # libyuv +, decodePerfTestsSupport ? false # build decoder perf tests with unit tests +, encodePerfTestsSupport ? false # build encoder perf tests with unit tests +, multiResEncodingSupport ? false # multiple-resolution encoding +, temporalDenoisingSupport ? true # use temporal denoising instead of spatial denoising +, vp9TemporalDenoisingSupport ? true # VP9 specific temporal denoising +, coefficientRangeCheckingSupport ? false # decoder checks if intermediate transform coefficients are in valid range +, vp9HighbitdepthSupport ? true # 10/12 bit color support in VP9 +, experimentalSupport ? false # experimental features +# Experimental features +, experimentalSpatialSvcSupport ? false # Spatial scalable video coding +, experimentalFpMbStatsSupport ? false +, experimentalEmulateHardwareSupport ? false +}: + +assert (vp8Support || vp9Support); +assert (vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport); +assert vp8DecoderSupport -> vp8Support; +assert vp8EncoderSupport -> vp8Support; +assert vp9DecoderSupport -> vp9Support; +assert vp9EncoderSupport -> vp9Support; +assert installLibsSupport -> libsSupport; +# libvpx will not build binaries if examplesSupport is not enabled (ie. vpxdec & vpxenc) +assert installBinsSupport -> examplesSupport; +assert vp9PostprocSupport -> (vp9Support && postprocSupport); +assert (internalStatsSupport && vp9Support) -> vp9PostprocSupport; +/* If spatialResamplingSupport not enabled, build will fail with undeclared variable errors. + Variables called in vpx_scale/generic/vpx_scale.c are declared by vpx_scale/vpx_scale_rtcd.pl, + but is only executed if spatialResamplingSupport is enabled */ +assert spatialResamplingSupport; +assert postprocVisualizerSupport -> postprocSupport; +assert (postprocVisualizerSupport && vp9Support) -> vp9PostprocSupport; +assert unitTestsSupport -> ((curl != null) && (coreutils != null)); +assert vp9TemporalDenoisingSupport -> (vp9Support && temporalDenoisingSupport); +assert vp9HighbitdepthSupport -> vp9Support; +assert (experimentalSpatialSvcSupport || experimentalFpMbStatsSupport || experimentalEmulateHardwareSupport) -> experimentalSupport; +assert stdenv.isCygwin -> (unitTestsSupport && webmIOSupport && libyuvSupport); + +let + mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; +in + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "libvpx-git"; + + src = fetchgit { + url = "https://chromium.googlesource.com/webm/libvpx"; + /* DO NOT under any circumstance ever just bump the git commit without + confirming changes have not been made to the configure system */ + rev = "f4c29ae9ea16c502c980a81ca9683327d5051929"; # 2015-2-12 + sha256 = "1d5m3dryfdrsf3mi6bcbsndyhihzksqalzfvi21fbxxkk1imsb9x"; + }; + + patchPhase = '' + patchShebangs . + ''; + + nativeBuildInputs = [ perl yasm ]; + + buildInputs = [ ] + ++ optional unitTestsSupport coreutils + ++ optional unitTestsSupport curl; + + configureFlags = [ + (mkFlag vp8Support "vp8") + (mkFlag vp8EncoderSupport "vp8-encoder") + (mkFlag vp8DecoderSupport "vp8-decoder") + (mkFlag vp9Support "vp9") + (mkFlag vp9EncoderSupport "vp9-encoder") + (mkFlag vp9DecoderSupport "vp9-decoder") + (mkFlag extraWarningsSupport "extra-warnings") + (mkFlag werrorSupport "werror") + "--disable-install-docs" + (mkFlag installBinsSupport "install-bins") + (mkFlag installLibsSupport "install-libs") + (mkFlag installSrcsSupport "install-srcs") + (mkFlag debugSupport "debug") + (mkFlag gprofSupport "gprof") + (mkFlag gcovSupport "gcov") + # Required to build shared libraries + (mkFlag (!stdenv.isDarwin && !stdenv.isCygwin) "pic") + (mkFlag (stdenv.isi686 || stdenv.isx86_64) "use-x86inc") + (mkFlag optimizationsSupport "optimizations") + (mkFlag runtimeCpuDetectSupport "runtime-cpu-detect") + (mkFlag thumbSupport "thumb") + (mkFlag libsSupport "libs") + (mkFlag examplesSupport "examples") + "--disable-docs" + "--as=yasm" + # Limit default decoder max to WHXGA + (if sizeLimitSupport then "--size-limit=5120x3200" else "") + (mkFlag fastUnalignedSupport "fast-unaligned") + (mkFlag codecSrcsSupport "codec-srcs") + (mkFlag debugLibsSupport "debug-libs") + (mkFlag stdenv.isMips "dequant-tokens") + (mkFlag stdenv.isMips "dc-recon") + (mkFlag postprocSupport "postproc") + (mkFlag vp9PostprocSupport "vp9-postproc") + (mkFlag multithreadSupport "multithread") + (mkFlag internalStatsSupport "internal-stats") + (mkFlag memTrackerSupport "mem-tracker") + (mkFlag spatialResamplingSupport "spatial-resampling") + (mkFlag realtimeOnlySupport "realtime-only") + (mkFlag ontheflyBitpackingSupport "onthefly-bitpacking") + (mkFlag errorConcealmentSupport "error-concealment") + # Shared libraries are only supported on ELF platforms + (mkFlag (stdenv.isDarwin || stdenv.isCygwin) "static") + (mkFlag (!stdenv.isDarwin && !stdenv.isCygwin) "shared") + (mkFlag smallSupport "small") + (mkFlag postprocVisualizerSupport "postproc-visualizer") + (mkFlag unitTestsSupport "unit-tests") + (mkFlag webmIOSupport "webm-io") + (mkFlag libyuvSupport "libyuv") + (mkFlag decodePerfTestsSupport "decode-perf-tests") + (mkFlag encodePerfTestsSupport "encode-perf-tests") + (mkFlag multiResEncodingSupport "multi-res-encoding") + (mkFlag temporalDenoisingSupport "temporal-denoising") + (mkFlag vp9TemporalDenoisingSupport "vp9-temporal-denoising") + (mkFlag coefficientRangeCheckingSupport "coefficient-range-checking") + (mkFlag (vp9HighbitdepthSupport && !stdenv.isi686) "vp9-highbitdepth") + (mkFlag experimentalSupport "experimental") + # Experimental features + (mkFlag experimentalSpatialSvcSupport "spatial-svc") + (mkFlag experimentalFpMbStatsSupport "fp-mb-stats") + (mkFlag experimentalEmulateHardwareSupport "emulate-hardware") + ]; + + enableParallelBuilding = true; + + crossAttrs = let + isCygwin = stdenv.cross.libc == "msvcrt"; + isDarwin = stdenv.cross.libc == "libSystem"; + in { + dontSetConfigureCross = true; + configureFlags = configureFlags ++ [ + #"--extra-cflags=" + #"--prefix=" + #"--libc=" + #"--libdir=" + "--enable-external-build" + # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version) + # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure + # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14 + "--force-target=${stdenv.cross.config}${( + if isDarwin then ( + if stdenv.cross.osxMinVersion == "10.10" then "14" + else if stdenv.cross.osxMinVersion == "10.9" then "13" + else if stdenv.cross.osxMinVersion == "10.8" then "12" + else if stdenv.cross.osxMinVersion == "10.7" then "11" + else if stdenv.cross.osxMinVersion == "10.6" then "10" + else if stdenv.cross.osxMinVersion == "10.5" then "9" + else "8") + else "")}-gcc" + (if isCygwin then "--enable-static-msvcrt" else "") + ]; + }; + + meta = { + description = "WebM VP8/VP9 codec SDK"; + homepage = http://www.webmproject.org/; + license = licenses.bsd3; + maintainers = with maintainers; [ codyopel ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/protobuf/2.5.nix b/pkgs/development/libraries/protobuf/2.5.nix index 4cc6a68c9f20..9d7bb38cf3c9 100644 --- a/pkgs/development/libraries/protobuf/2.5.nix +++ b/pkgs/development/libraries/protobuf/2.5.nix @@ -2,6 +2,7 @@ callPackage ./generic.nix (args // rec { version = "2.5.0"; + # make sure you test also -A pythonPackages.protobuf src = fetchurl { url = "http://protobuf.googlecode.com/files/${version}.tar.bz2"; sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk"; diff --git a/pkgs/development/libraries/protobuf/2.6.nix b/pkgs/development/libraries/protobuf/2.6.nix index 72960b0dd6af..49ed9d9ade19 100644 --- a/pkgs/development/libraries/protobuf/2.6.nix +++ b/pkgs/development/libraries/protobuf/2.6.nix @@ -2,6 +2,7 @@ callPackage ./generic.nix (args // rec { version = "2.6.1"; + # make sure you test also -A pythonPackages.protobuf src = fetchFromGitHub { owner = "google"; repo = "protobuf"; diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 003ea7035172..929621204a0d 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "protobuf-${version}"; + name = "protobuf-v${version}"; inherit src; diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index d7e66a4f618b..30fbdcd1e8df 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "1.4"; - rev = "5e604833c5aa605d0b6efbe5234492b5e7d8ac61"; - sha256 = "1aqksqi1qmjpva5cal6j7h0hzk298wk3nhqv73wnyqdchq2sa8v5"; + version = "1.5"; + rev = "9f0324125f53a12f766f6ed6f98f16e2f42337f4"; + sha256 = "1nyim0l975faj7926s4wba8yvjy4rvx005zb7krv0gb5p84nzgi7"; }) \ No newline at end of file diff --git a/pkgs/development/libraries/x265/generic.nix b/pkgs/development/libraries/x265/generic.nix index 58a39dbbe384..2779b5811433 100644 --- a/pkgs/development/libraries/x265/generic.nix +++ b/pkgs/development/libraries/x265/generic.nix @@ -1,12 +1,21 @@ -{ stdenv, cmake, fetchhg, mercurial, yasm +{ stdenv, fetchhg, cmake, yasm , rev , sha256, version -, highBitDepth ? false -, debuggingSupport ? false -, enableCli ? true -, testSupport ? false +, debugSupport ? false # Run-time sanity checks (debugging) +, highbitdepthSupport ? false # false=8bits per channel, true=10/12bits per channel +, werrorSupport ? false # Warnings as errors +, ppaSupport ? false # PPA profiling instrumentation +, vtuneSupport ? false # Vtune profiling instrumentation +, custatsSupport ? false # Internal profiling of encoder work +, cliSupport ? true # Build standalone CLI application +, unittestsSupport ? false # Unit tests , ... }: +let + mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF"; +in + +with stdenv.lib; stdenv.mkDerivation rec { name = "x265-${version}"; @@ -20,39 +29,28 @@ stdenv.mkDerivation rec { sed -i 's/unknown/${version}/g' source/cmake/version.cmake ''; - cmakeFlags = with stdenv.lib; - '' - ${if debuggingSupport - then "-DCHECKED_BUILD=ON" - else "-DCHECKED_BUILD=OFF" - } - -DSTATIC_LINK_CRT=OFF - ${if (stdenv.system == "x86_64-linux" && highBitDepth) - then "-DHIGH_BIT_DEPTH=ON" - else "-DHIGH_BIT_DEPTH=OFF" - } - -DWARNINGS_AS_ERRORS=OFF - -DENABLE_PPA=OFF - -DENABLE_SHARED=ON - ${if enableCli - then "-DENABLE_CLI=ON" - else "-DENABLE_CLI=OFF" - } - ${if testSupport - then "-DENABLE_TESTS=ON" - else "-DENABLE_TESTS=OFF" - } - ''; - - preConfigure = "cd source"; - - buildInputs = [ cmake yasm ]; - - meta = with stdenv.lib; { - homepage = "http://x265.org"; + cmakeFlags = with stdenv.lib; [ + (mkFlag debugSupport "CHECKED_BUILD") + "-DSTATIC_LINK_CRT=OFF" + (mkFlag (highbitdepthSupport && stdenv.isx86_64) "HIGH_BIT_DEPTH") + (mkFlag werrorSupport "WARNINGS_AS_ERRORS") + (mkFlag ppaSupport "ENABLE_PPA") + "-DENABLE_SHARED=ON" + (mkFlag cliSupport "ENABLE_CLI") + (mkFlag unittestsSupport "ENABLE_TESTS") + ]; + + preConfigure = '' + cd source + ''; + + nativeBuildInputs = [ cmake yasm ]; + + meta = { description = "Library for encoding h.265/HEVC video streams"; - license = licenses.gpl2; - platforms = platforms.linux; + homepage = http://x265.org; + license = licenses.gpl2; maintainers = with maintainers; [ codyopel ]; + platforms = platforms.all; }; } \ No newline at end of file diff --git a/pkgs/development/libraries/x265/hg.nix b/pkgs/development/libraries/x265/hg.nix index 5793bd343388..d26df82b3e30 100644 --- a/pkgs/development/libraries/x265/hg.nix +++ b/pkgs/development/libraries/x265/hg.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // rec { - version = "hg"; - rev = "5f9f7194267b76f733e9ffb0f9e8b474dfe89a71"; - sha256 = "056ng8nsadmjf6s7igbgbxmiapjcxpfy6pbayl764xbhpkv4md88"; + version = "2015-2-11"; # Date of commit used Y-M-D + rev = "9ab104096834f51bd799ea1cf1160092f8182944"; + sha256 = "1j4k6ylglrzng5rz29qx2z06amdrq8wyzvqhm4ivfzvpndfniim6"; }) \ No newline at end of file diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix index 546d2aaa5226..e90e7c4571c7 100644 --- a/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -2,7 +2,7 @@ let pname = "cmdliner"; - version = "0.9.6"; + version = "0.9.7"; ocaml_version = (builtins.parseDrvName ocaml.name).version; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz"; - sha256 = "1i08yjkk5wln60bw9rrllh6ajjgq14cvzvcci8y1nk5v6ys7jr8p"; + sha256 = "0ymzy1l6z85b6779lfxk179igfpf7rgfik70kr3c7lxmzwy8j6cw"; }; unpackCmd = "tar xjf $src"; diff --git a/pkgs/development/ocaml-modules/ezjsonm/default.nix b/pkgs/development/ocaml-modules/ezjsonm/default.nix index f54d14e4fe9d..25a9e4128bf0 100644 --- a/pkgs/development/ocaml-modules/ezjsonm/default.nix +++ b/pkgs/development/ocaml-modules/ezjsonm/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchzip, ocaml, findlib, jsonm, hex, sexplib, lwt }: -let version = "0.3.1"; in +let version = "0.4.1"; in stdenv.mkDerivation { name = "ocaml-ezjsonm-${version}"; src = fetchzip { url = "https://github.com/mirage/ezjsonm/archive/${version}.tar.gz"; - sha256 = "0cz1v75j8j5y4vfcgylp5zaxiy7541qg6pm4wrgmvy6fmh82654f"; + sha256 = "0cfjh8awajvw6kkmxr65dvri4k6h29pynxvk76a8c2lkixpsc095"; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index 1e4599bbf302..6fd7f2f2e5e0 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, ocaml, findlib }: stdenv.mkDerivation rec { - name = "ocaml-re-1.2.2"; + name = "ocaml-re-1.3.0"; src = fetchgit { url = https://github.com/ocaml/ocaml-re.git; rev = "refs/tags/${name}"; - sha256 = "1556i1zc6nrg4hxlvidllfhkjwl6n74biyjbvjlby8304n84jrk7"; + sha256 = "1h8hz0dbjp8l39pva2js380c8bsm8rb4v326l62rkrdv8jvyh6bx"; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index 4111e2646583..53549791b253 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -1,14 +1,15 @@ -{stdenv, fetchurl, sqlite, ocaml, findlib, pkgconfig}: +{ stdenv, fetchurl, sqlite, ocaml, findlib, pkgconfig }: -stdenv.mkDerivation { - name = "ocaml-sqlite3-2.0.7"; +stdenv.mkDerivation rec { + name = "ocaml-sqlite3-${version}"; + version = "2.0.9"; src = fetchurl { - url = https://github.com/mmottl/sqlite3-ocaml/archive/v2.0.7.tar.gz; - sha256 = "04m7qz251m6l2b7slkgml2j8bnx60lwzbdbsv95vidwzqcwg7bdq"; + url = "https://github.com/mmottl/sqlite3-ocaml/releases/download/v${version}/sqlite3-ocaml-${version}.tar.gz"; + sha256 = "0rwsx1nfa3xqmbygim2qx45jqm1gwf08m70wmcwkx50f1qk3l551"; }; - buildInputs = [ocaml findlib pkgconfig sqlite]; + buildInputs = [ ocaml findlib pkgconfig sqlite ]; createFindlibDestdir = true; diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix index 928a5d33f8f4..2fa5f4d82e3e 100644 --- a/pkgs/development/pharo/launcher/default.nix +++ b/pkgs/development/pharo/launcher/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, bash, pharo-vm, unzip, makeDesktopItem }: stdenv.mkDerivation rec { - version = "0.2.1-2014.09.29"; + version = "0.2.4-2015.02.13"; name = "pharo-launcher-${version}"; src = fetchurl { url = "http://files.pharo.org/platform/launcher/blessed/PharoLauncher-user-${version}.zip"; - md5 = "10945989c2b323c7f09a3b4e42ee7f2d"; + md5 = "064f53cd20c7f189ba2d01f9e4b17d36"; }; executable-name = "pharo-launcher"; @@ -68,4 +68,4 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.DamienCassou ]; platforms = pharo-vm.meta.platforms; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index f0e057e2dd69..f1bb496ac007 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -51,7 +51,7 @@ # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. -if disabled then throw "${name} not supported for interpreter ${python.executable}" else python.stdenv.mkDerivation (attrs // { +python.stdenv.mkDerivation (attrs // { inherit doCheck; name = namePrefix + name; @@ -118,7 +118,7 @@ if disabled then throw "${name} not supported for interpreter ${python.executabl # work as expected # --old-and-unmanagable: - # instruct setuptools not to use eggs but fallback to plan package install + # instruct setuptools not to use eggs but fallback to plan package install # this also reduces one .pth file in the chain, but the main reason is to # force install process to install only scripts for the package we are # installing (otherwise it will install scripts also for dependencies) @@ -167,6 +167,7 @@ if disabled then throw "${name} not supported for interpreter ${python.executabl meta = with lib.maintainers; { # default to python's platforms platforms = python.meta.platforms; + broken = disabled; } // meta // { # add extra maintainer(s) to every package maintainers = (meta.maintainers or []) ++ [ chaoflow iElectric ]; diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix new file mode 100644 index 000000000000..f9406279b5d7 --- /dev/null +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, cmake, llvmPackages }: + +with llvmPackages; + +let version = "3.5"; in +stdenv.mkDerivation rec { + name = "include-what-you-use-${version}"; + + src = fetchurl { + sha256 = "1wfl78wkg8m2ssjnkb2rwcqy35nhc8fa63mk3sa60jrshpy7b15w"; + url = "${meta.homepage}/downloads/${name}.src.tar.gz"; + }; + + meta = with stdenv.lib; { + description = "Analyze #includes in C/C++ source files with clang"; + longDescription = '' + For every symbol (type, function variable, or macro) that you use in + foo.cc, either foo.cc or foo.h should #include a .h file that exports the + declaration of that symbol. The include-what-you-use tool is a program + that can be built with the clang libraries in order to analyze #includes + of source files to find include-what-you-use violations, and suggest + fixes for them. The main goal of include-what-you-use is to remove + superfluous #includes. It does this both by figuring out what #includes + are not actually needed for this file (for both .cc and .h files), and + replacing #includes with forward-declares when possible. + ''; + homepage = http://include-what-you-use.com; + license = with licenses; bsd3; + platforms = with platforms; linux; + maintainers = with maintainers; [ nckx ]; + }; + + buildInputs = [ clang cmake llvm ]; + + cmakeFlags = [ "-DLLVM_PATH=${llvm}" ]; + enableParallelBuilding = true; +} diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index dc846acb5005..fe174febc9e3 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation { name = "ocp-build-1.99.8-beta"; src = fetchurl { - url = "https://github.com/OCamlPro/ocp-build/archive/ocp-build.1.99.8-beta.tar.gz"; - sha256 = "06qh8v7k5m52xbivas08lblspsnvdl0vd7ghfj6wvpnfl8qvqabn"; + url = http://www.typerex.org/pub/ocp-build/ocp-build.1.99.8-beta.tar.gz; + sha256 = "03zqpl73ah0fji5baxmk8w0h7waamlnhhysi128yap4abzsh5w87"; }; buildInputs = [ ocaml findlib ncurses ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation { TERM = "xterm"; meta = with stdenv.lib; { - homepage = "http://typerex.ocamlpro.com/ocp-build.html"; + homepage = http://www.typerex.org/ocp-build.html; description = "A build tool for OCaml"; longDescription = '' ocp-build is a build system for OCaml application, based on simple diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index e385c0d40c44..1965521ba818 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -64,8 +64,8 @@ let patchShebangs = dir: '' node=`type -p node` coffee=`type -p coffee || true` - find -L ${dir} -type f -print0 | \ - xargs -0 sed --follow-symlinks -i \ + find -L ${dir} -type f -print0 | xargs -0 grep -Il . | \ + xargs sed --follow-symlinks -i \ -e 's@#!/usr/bin/env node@#!'"$node"'@' \ -e 's@#!/usr/bin/env coffee@#!'"$coffee"'@' \ -e 's@#!/.*/node@#!'"$node"'@' \ |