diff options
Diffstat (limited to 'pkgs/development')
50 files changed, 1491 insertions, 917 deletions
diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index 43ac75271bea..994656a61d56 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ats2-${version}"; - version = "0.1.9"; + version = "0.1.10"; src = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz"; - sha256 = "0zcki97zj9r1dvlfriwfckp9b9z7iavw09q21v6i5ld90hw9588q"; + sha256 = "0hxjgpyc0m44w58aqzglbgraqirijs3497q9s6ymam4fnj0i57s2"; }; buildInputs = [ gmp ]; diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index 428346b78b6b..2135e75a07ac 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "closure-compiler-${version}"; - version = "20130603"; + version = "20150315"; src = fetchurl { url = "http://dl.google.com/closure-compiler/compiler-${version}.tar.gz"; - sha256 = "0bk0s8p9r9an5m0l8y23wjlx490k15i4zah0a384a2akzji8y095"; + sha256 = "1vzwyhpqbrndg7mri81f1b2yi8cshw5pghvdda9vdxgq465sa52f"; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index c48d74249e19..068b29d47ced 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip, curl }: stdenv.mkDerivation { - name = "dmd-2.066.1"; + name = "dmd-2.067.0"; src = fetchurl { - url = http://downloads.dlang.org/releases/2014/dmd.2.066.1.zip; - sha256 = "1qifwgrl6h232zsnvcx3kmb5d0fsy7j9zv17r3b4vln7x5rvzc66"; + url = http://downloads.dlang.org/releases/2015/dmd.2.067.0.zip; + sha256 = "0b1b65694846ef3430de1de341c8cf353151a1a39656e6a1065fe56bc90fb60b"; }; buildInputs = [ unzip curl ]; diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index d04bd842bf67..e9f036425894 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -39,7 +39,10 @@ }: let version = "0.1.0"; - libDir = "share/ghcjs/${pkgs.stdenv.system}-${version}-${ghc.version}/ghcjs"; + ghcArch = if pkgs.stdenv.system == "i686-linux" + then "i386-linux" + else pkgs.stdenv.system; + libDir = "share/ghcjs/${ghcArch}-${version}-${ghc.version}/ghcjs"; ghcjsBoot = fetchgit { url = git://github.com/ghcjs/ghcjs-boot.git; rev = "8cd6144870470258fb037b3e04a0a2a98c2b6551"; # 7.10 branch @@ -122,7 +125,5 @@ in mkDerivation (rec { description = "GHCJS is a Haskell to JavaScript compiler that uses the GHC API"; license = stdenv.lib.licenses.bsd3; platforms = ghc.meta.platforms; - maintainers = with stdenv.lib.maintainers; [ - jwiegley cstrahan - ]; + maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ]; }) diff --git a/pkgs/development/compilers/oraclejdk/jdk7-linux.nix b/pkgs/development/compilers/oraclejdk/jdk7-linux.nix index eb40cff689a2..730b3b569c61 100644 --- a/pkgs/development/compilers/oraclejdk/jdk7-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk7-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "7"; - patchVersion = "75"; + patchVersion = "79"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html; - sha256_i686 = "173ppi5d90hllqgys90wlv596bpj2iw8gsbsr6pk7xvd4l1wdhrw"; - sha256_x86_64 = "040n50nglr6rcli2pz5rd503c2qqdqqbqynp6hzc4kakkchmj2a6"; + sha256_i686 = "1hv9bmj08y8gavhhkip5w5dg96b1dy4sc2cidpjcbwpb2mzh5lhs"; + sha256_x86_64 = "140xl5kfdrlmh8wh2x3j23x53dbil8qxsvc7gf3138mz4805vmr9"; jceName = "UnlimitedJCEPolicyJDK7.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html; sha256JCE = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d"; diff --git a/pkgs/development/compilers/oraclejdk/jdk7psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk7psu-linux.nix index 929ff59717d9..311f07e8e45b 100644 --- a/pkgs/development/compilers/oraclejdk/jdk7psu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk7psu-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "7"; - patchVersion = "76"; + patchVersion = "80"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html; - sha256_i686 = "0558p5garc4b5g7h11dkzn161kpk84az5ad1q5hhsblbx02aqff3"; - sha256_x86_64 = "130ckrv846amyfzbnnd6skljkznc457yky7d6ajaw5ndsbzg93yf"; + sha256_i686 = "1fjpm8pa74c4vgv93lnky6pd3igln56yxdn4kbhgcg12lwc17vcx"; + sha256_x86_64 = "08wn62sammvsvlqac0n8grrikl0ykh9ikqdy823i2mcnccqsgnds"; jceName = "UnlimitedJCEPolicyJDK7.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html; sha256JCE = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix index ea1c01ec5e56..014ed0db7c2f 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix @@ -1,10 +1,10 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "40"; + patchVersion = "45"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "1bfabnmbar0kfx3i37wnxh97j7whkib8m6wqxrb1d9zf6k13bw50"; - sha256_x86_64 = "0nfm4xqd57s8dmkgd0jsrhys8dhfw0fx5d57mq70ramq9dl2jq66"; + sha256_i686 = "1y1zymydd1azv14r0hh12zjr8k64wa8wfdbz8sn1css84aqwl87d"; + sha256_x86_64 = "0v9ilahx03isxdzh4ryv1bqmmzppckickz22hvgzs785769cm67j"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; - sha256JCE = "f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59"; + sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; } diff --git a/pkgs/development/compilers/rdmd/default.nix b/pkgs/development/compilers/rdmd/default.nix index f70b8f448b48..38473897698d 100644 --- a/pkgs/development/compilers/rdmd/default.nix +++ b/pkgs/development/compilers/rdmd/default.nix @@ -1,14 +1,13 @@ -{stdenv, lib, fetchgit, dmd}: +{stdenv, lib, fetchurl, dmd}: stdenv.mkDerivation { - name = "rdmd-20141113"; + name = "rdmd-2.067.0"; buildInputs = [ dmd ]; - src = fetchgit { - url = git://github.com/D-Programming-Language/tools.git; - rev = "f496c68ee4e776597bd7382aa47f05da698a69e"; - sha256 = "0vbhmz8nbh8ayml4vad0239kfg982vqfyqqrjv6wrlnjah97n5ms"; + src = fetchurl { + url = "https://github.com/D-Programming-Language/tools/archive/v2.067.0.tar.gz"; + sha256 = "2702ecda0427c675084d9b688449bc8c8392fd73e30257d79e2488640d5a9982"; }; buildPhase = '' diff --git a/pkgs/development/coq-modules/bedrock/default.nix b/pkgs/development/coq-modules/bedrock/default.nix index 7aadead54281..478f74058bdf 100644 --- a/pkgs/development/coq-modules/bedrock/default.nix +++ b/pkgs/development/coq-modules/bedrock/default.nix @@ -15,12 +15,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildFlags = "cito"; + buildPhase = '' + make -j$NIX_BUILD_CORES -C src/reification + make -j$NIX_BUILD_CORES -C src + ''; installPhase = '' COQLIB=$out/lib/coq/${coq.coq-version}/ mkdir -p $COQLIB/user-contrib/Bedrock - cp -pR src $COQLIB/user-contrib/Bedrock + cp -pR src/* $COQLIB/user-contrib/Bedrock ''; meta = with stdenv.lib; { diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 353acd3bfcba..631d0b713b8e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -211,6 +211,15 @@ self: super: { # https://github.com/liamoc/wizards/issues/5 wizards = doJailbreak super.wizards; + # https://github.com/tibbe/ekg-core/commit/c986d9750d026a0c049cf6e6610d69fc1f23121f, not yet in hackage + ekg-core = doJailbreak super.ekg-core; + + # https://github.com/tibbe/ekg/commit/95018646f48f60d9ccf6209cc86747e0f132e737, not yet in hackage + ekg = doJailbreak super.ekg; + + # https://github.com/diagrams/diagrams-rasterific/commit/2758e5760c64f8ca2528628bd11de502f354ab15, not yet in hackage + diagrams-rasterific = doJailbreak super.diagrams-rasterific; + # https://github.com/NixOS/cabal2nix/issues/136 glib = addBuildDepends super.glib [pkgs.pkgconfig pkgs.glib]; gtk3 = super.gtk3.override { inherit (pkgs) gtk3; }; @@ -280,7 +289,6 @@ self: super: { amqp-conduit = dontCheck super.amqp-conduit; concurrent-dns-cache = dontCheck super.concurrent-dns-cache; dbus = dontCheck super.dbus; # http://hydra.cryp.to/build/498404/log/raw - directory_1_2_2_0 = dontCheck super.directory_1_2_2_0; # https://github.com/haskell/directory/issues/24 hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw hasql = dontCheck super.hasql; # http://hydra.cryp.to/build/502489/nixlog/4/raw hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; }); @@ -494,6 +502,9 @@ self: super: { # https://github.com/joeyadams/haskell-stm-delay/issues/3 stm-delay = dontCheck super.stm-delay; + # https://github.com/cgaebel/stm-conduit/issues/33 + stm-conduit = dontCheck super.stm-conduit; + # https://github.com/fumieval/call/issues/3 call = markBrokenVersion "0.1.2" super.call; rhythm-game-tutorial = dontDistribute super.rhythm-game-tutorial; # depends on call @@ -529,6 +540,18 @@ self: super: { # Upstream notified by e-mail. MonadCompose = markBrokenVersion "0.2.0.0" super.MonadCompose; + # no haddock since this is an umbrella package. + cloud-haskell = dontHaddock super.cloud-haskell; + + # Disable tests which couldn't be built. + distributed-process-async = dontCheck super.distributed-process-async; + + # Disable tests which couldn't be built. + distributed-process-client-server = dontCheck super.distributed-process-client-server; + + # Disable tests which couldn't be built. + distributed-process-extras = dontCheck super.distributed-process-extras; + # Make distributed-process-platform compile until next version distributed-process-platform = overrideCabal super.distributed-process-platform (drv: { patchPhase = "mv Setup.hs Setup.lhs"; @@ -536,6 +559,15 @@ self: super: { doHaddock = false; }); + # Disable tests due to a failure (Sequential Shutdown Ordering test.) + distributed-process-supervisor = dontCheck super.distributed-process-supervisor; + + # Disable network test and errorneous haddock. + distributed-process-tests = overrideCabal super.distributed-process-tests (drv: { + doCheck = false; + doHaddock = false; + }); + # This packages compiles 4+ hours on a fast machine. That's just unreasonable. CHXHtml = dontDistribute super.CHXHtml; @@ -719,16 +751,19 @@ self: super: { # Tries to run GUI in tests leksah = dontCheck super.leksah; + # Patch to consider NIX_GHC just like xmonad does + dyre = appendPatch super.dyre ./dyre-nix.patch; + } // { # Not on Hackage. cabal2nix = self.mkDerivation { pname = "cabal2nix"; - version = "20150318"; + version = "20150414"; src = pkgs.fetchgit { url = "http://github.com/NixOS/cabal2nix.git"; - rev = "b56cc6de2c4900fb0d1dc3617591a2f536aca60d"; - sha256 = "0pza9j3x1mfjqrzcqq6ndg0jiqx85mg0sw8n9fmq18fk5g4hzhis"; + rev = "d08c2970e9c74948e81e7b926b64e5d7d1dd07b7"; + sha256 = "1rqibfhvkvmfxj9k92brz87b4l40w8d7mq1s7zgfnrmay6h0956a"; deepClone = true; }; isLibrary = false; @@ -736,12 +771,12 @@ self: super: { buildDepends = with self; [ aeson base bytestring Cabal containers deepseq-generics directory filepath hackage-db lens monad-par monad-par-extras mtl pretty - prettyclass process regex-posix SHA split transformers utf8-string cartel - ]; + process regex-posix SHA split transformers utf8-string cartel + ] ++ pkgs.lib.optional (pkgs.lib.versionOlder self.ghc.version "7.10") prettyclass; testDepends = with self; [ aeson base bytestring Cabal containers deepseq deepseq-generics directory doctest filepath hackage-db hspec lens monad-par - monad-par-extras mtl pretty prettyclass process QuickCheck + monad-par-extras mtl pretty process QuickCheck regex-posix SHA split transformers utf8-string ]; buildTools = [ pkgs.gitMinimal ]; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 990066ab6409..8652b0108596 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -134,20 +134,16 @@ self: super: { ''; }); - # see: https://github.com/jaspervdj/hakyll/issues/343 - hakyll = overrideCabal super.hakyll (drv: { - buildDepends = drv.buildDepends ++ [ self.time-locale-compat ]; - patches = [ - (pkgs.fetchpatch { - url = "https://github.com/jaspervdj/hakyll/pull/344.patch"; - sha256 = "130c0icw3cj209p219siaq0n8avmm0fpmph0iyjgx67w62sffrli"; - }) - ]; + # ekmett/linear#74 + linear = overrideCabal super.linear (drv: { + prePatch = "sed -i 's/-Werror//g' linear.cabal"; }); # Cabal_1_22_1_1 requires filepath >=1 && <1.4 cabal-install = dontCheck (super.cabal-install.override { Cabal = null; }); + HStringTemplate = self.HStringTemplate_0_8_3; + # We have Cabal 1.22.x. jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; @@ -183,6 +179,9 @@ self: super: { esqueleto = doJailbreak super.esqueleto; pointfree = doJailbreak super.pointfree; + # acid-state/safecopy#25 acid-state/safecopy#26 + safecopy = dontCheck (super.safecopy); + # bos/attoparsec#92 attoparsec = dontCheck super.attoparsec; @@ -227,23 +226,17 @@ self: super: { }); wl-pprint = overrideCabal super.wl-pprint (drv: { - patchPhase = "sed -i '113iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen.hs"; - }); - - wl-pprint-text = overrideCabal super.wl-pprint-text (drv: { - patchPhase = '' - sed -i '71iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen/Text/Monadic.hs - sed -i '119iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen/Text.hs - ''; + postPatch = "sed -i '113iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen.hs"; + jailbreak = true; }); # https://github.com/kazu-yamamoto/unix-time/issues/30 unix-time = dontCheck super.unix-time; # Until the changes have been pushed to Hackage - mono-traversable = appendPatch super.mono-traversable (pkgs.fetchpatch { - url = "https://github.com/snoyberg/mono-traversable/pull/68.patch"; - sha256 = "11hqf6hi3sc34wl0fn4rpigdf7wfklcjv6jwp8c3129yphg8687h"; + arithmoi = appendPatch super.arithmoi (pkgs.fetchpatch { + url = "https://github.com/cartazio/arithmoi/pull/3.patch"; + sha256 = "1rqs796sh81inqkg2vadskcjpp6q92j6k8zpn370990wndndzzmq"; }); conduit-combinators = appendPatch super.conduit-combinators (pkgs.fetchpatch { url = "https://github.com/fpco/conduit-combinators/pull/16.patch"; @@ -269,4 +262,40 @@ self: super: { buildDepends = [ primitive ]; license = pkgs.stdenv.lib.licenses.bsd3; }) {}; + + # diagrams/monoid-extras#19 + monoid-extras = overrideCabal super.monoid-extras (drv: { + prePatch = "sed -i 's|4\.8|4.9|' monoid-extras.cabal"; + }); + + # diagrams/statestack#5 + statestack = overrideCabal super.statestack (drv: { + prePatch = "sed -i 's|4\.8|4.9|' statestack.cabal"; + }); + + # diagrams/diagrams-core#83 + diagrams-core = overrideCabal super.diagrams-core (drv: { + prePatch = "sed -i 's|4\.8|4.9|' diagrams-core.cabal"; + }); + + # diagrams/diagrams-core#83 + diagrams-lib = overrideCabal super.diagrams-lib (drv: { + prePatch = "sed -i 's|4\.8|4.9|' diagrams-lib.cabal"; + patches = [ ./diagrams-lib-flexible-contexts.patch ]; + }); + + timezone-series = doJailbreak super.timezone-series; + timezone-olson = doJailbreak super.timezone-olson; + libmpd = dontCheck super.libmpd; + xmonad-extras = overrideCabal super.xmonad-extras (drv: { + postPatch = '' + sed -i -e "s,<\*,<ยค,g" XMonad/Actions/Volume.hs + ''; + }); + + # Workaround for a workaround, see comment for "ghcjs" flag. + jsaddle = let jsaddle' = disableCabalFlag super.jsaddle "ghcjs"; + in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3 + self.webkitgtk3-javascriptcore ]; + } 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 e9bdec89bd02..4eb2be5552f1 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -73,6 +73,15 @@ self: super: { mtl-prelude = self.mtl-prelude_1_0_3; equivalence = super.equivalence_0_2_5; # required by Agda + # purescript requires mtl 2.2.x. + purescript = overrideCabal (super.purescript.overrideScope (self: super: { + mkDerivation = drv: super.mkDerivation (drv // { doCheck = false; }); + mtl = super.mtl_2_2_1; + transformers = super.transformers_0_4_3_0; + haskeline = self.haskeline_0_7_2_1; + transformers-compat = disableCabalFlag super.transformers-compat "three"; + })) (drv: {}); + # The test suite pulls in mtl 2.2.x command-qq = dontCheck super.command-qq; @@ -96,7 +105,6 @@ self: super: { highlighter2 = markBroken super.highlighter2; hypher = markBroken super.hypher; miniforth = markBroken super.miniforth; - purescript = markBroken super.purescript; xhb-atom-cache = markBroken super.xhb-atom-cache; xhb-ewmh = markBroken super.xhb-ewmh; yesod-purescript = markBroken super.yesod-purescript; @@ -112,4 +120,9 @@ self: super: { # Newer versions require base > 4.7 gloss = super.gloss_1_9_2_1; + # Workaround for a workaround, see comment for "ghcjs" flag. + jsaddle = let jsaddle' = disableCabalFlag super.jsaddle "ghcjs"; + in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3 + self.webkitgtk3-javascriptcore ]; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 47b450afc4ea..8a212413b02e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -85,4 +85,9 @@ self: super: { # https://github.com/ndmitchell/extra/issues/4 extra = dontCheck super.extra; + # Workaround for a workaround, see comment for "ghcjs" flag. + jsaddle = let jsaddle' = disableCabalFlag super.jsaddle "ghcjs"; + in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3 + self.webkitgtk3-javascriptcore ]; + } diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index aad0da0604e3..e880f7e713e8 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -7,7 +7,7 @@ self: super: { # LLVM is not supported on this GHC; use the latest one. inherit (pkgs) llvmPackages; - jailbreak-cabal = pkgs.haskell-ng.packages.ghc7101.jailbreak-cabal; + inherit (pkgs.haskell-ng.packages.ghc7101) jailbreak-cabal alex happy; # Many packages fail with: # haddock: internal error: expectJust getPackageDetails @@ -71,7 +71,7 @@ self: super: { cat >> src/Reactive/Banana/Switch.hs <<EOF instance Functor (AnyMoment Identity) where fmap = liftM - + instance Applicative (AnyMoment Identity) where pure = return (<*>) = ap @@ -95,16 +95,8 @@ self: super: { ''; }); - "ghcjs-dom" = self.callPackage - ({ mkDerivation, base, mtl, text, ghcjs-base - }: - mkDerivation { - pname = "ghcjs-dom"; - version = "0.1.1.3"; - sha256 = "0pdxb2s7fflrh8sbqakv0qi13jkn3d0yc32xhg2944yfjg5fvlly"; - buildDepends = [ base mtl text ghcjs-base ]; - description = "DOM library that supports both GHCJS and WebKitGTK"; - license = pkgs.stdenv.lib.licenses.mit; - hydraPlatforms = pkgs.stdenv.lib.platforms.none; - }) {}; + ghcjs-dom = overrideCabal super.ghcjs-dom (drv: { + buildDepends = [ self.base self.mtl self.text self.ghcjs-base ]; + }); + } diff --git a/pkgs/development/haskell-modules/diagrams-lib-flexible-contexts.patch b/pkgs/development/haskell-modules/diagrams-lib-flexible-contexts.patch new file mode 100644 index 000000000000..385bc75b5823 --- /dev/null +++ b/pkgs/development/haskell-modules/diagrams-lib-flexible-contexts.patch @@ -0,0 +1,11 @@ +diff -Naur diagrams-lib-1.2.0.9-orig/src/Diagrams/TwoD/Polygons.hs diagrams-lib-1.2.0.9/src/Diagrams/TwoD/Polygons.hs +--- diagrams-lib-1.2.0.9-orig/src/Diagrams/TwoD/Polygons.hs 2015-04-02 22:13:26.000000000 -0400 ++++ diagrams-lib-1.2.0.9/src/Diagrams/TwoD/Polygons.hs 2015-04-11 18:17:28.095156620 -0400 +@@ -4,6 +4,7 @@ + {-# LANGUAGE TemplateHaskell #-} + {-# LANGUAGE TypeFamilies #-} + {-# LANGUAGE ViewPatterns #-} ++{-# LANGUAGE FlexibleContexts #-} + + ----------------------------------------------------------------------------- + -- | diff --git a/pkgs/development/haskell-modules/dyre-nix.patch b/pkgs/development/haskell-modules/dyre-nix.patch new file mode 100644 index 000000000000..458e540e0c4a --- /dev/null +++ b/pkgs/development/haskell-modules/dyre-nix.patch @@ -0,0 +1,25 @@ +--- dyre-0.8.12/Config/Dyre/Compile.hs 2015-04-13 11:00:20.794278350 +0100 ++++ dyre-0.8.12-patched/Config/Dyre/Compile.hs 2015-04-13 11:07:26.938893502 +0100 +@@ -10,11 +10,13 @@ + import System.FilePath ( (</>) ) + import System.Directory ( getCurrentDirectory, doesFileExist + , createDirectoryIfMissing ) ++import System.Environment ( lookupEnv ) ++import Control.Applicative ((<$>)) + import Control.Exception ( bracket ) +-import GHC.Paths ( ghc ) + + import Config.Dyre.Paths ( getPaths ) + import Config.Dyre.Params ( Params(..) ) ++import Data.Maybe ( fromMaybe ) + + -- | Return the path to the error file. + getErrorPath :: Params cfgType -> IO FilePath +@@ -47,6 +49,7 @@ + errFile <- getErrorPath params + result <- bracket (openFile errFile WriteMode) hClose $ \errHandle -> do + ghcOpts <- makeFlags params configFile tempBinary cacheDir libsDir ++ ghc <- fromMaybe "ghc" <$> lookupEnv "NIX_GHC" + ghcProc <- runProcess ghc ghcOpts (Just cacheDir) Nothing + Nothing Nothing (Just errHandle) + waitForProcess ghcProc diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 90e2c21aec18..4385dd9a08f4 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2557,12 +2557,12 @@ self: { }) {}; "Concurrential" = callPackage - ({ mkDerivation, async, base }: + ({ mkDerivation, async, base, stm }: mkDerivation { pname = "Concurrential"; - version = "0.1.0.0"; - sha256 = "1fsqqc4nrfaq2r9vvvy7rjkahb92vn0bxyygbygqidbp2pbrfshi"; - buildDepends = [ async base ]; + version = "0.2.1.0"; + sha256 = "09p9a1a1z8jp9152bl0cir340cv4g45dprajyrdrxqd96b6libhh"; + buildDepends = [ async base stm ]; homepage = "http://github.com/avieth/Concurrential"; description = "Mix concurrent and sequential computation"; license = stdenv.lib.licenses.bsd3; @@ -7604,8 +7604,8 @@ self: { }: mkDerivation { pname = "HaskellNet"; - version = "0.4.3"; - sha256 = "1y7i7yi2c025l89hrrj2avzrszgfdjl8a4pii04lnxngq4b3nhmz"; + version = "0.4.4"; + sha256 = "0df5q28y1x5irnzm5ma65b6ny6dds0375bzj6xczsw6xrlxaj3br"; buildDepends = [ array base base64-string bytestring cryptohash mime-mail mtl network old-time pretty text @@ -8290,14 +8290,14 @@ self: { "HueAPI" = callPackage ({ mkDerivation, aeson, base, containers, lens, lens-aeson, mtl - , transformers, wreq + , time, transformers, wreq }: mkDerivation { pname = "HueAPI"; - version = "0.2.3"; - sha256 = "1c30i551f0lmcpima48dlpmbr4z7dly4d9s4iqn97qq3l9snb1k9"; + version = "0.2.4"; + sha256 = "0qpa2cmsqpxb311f2vyy0zm52c6z71yxbzl9ih1f8x2fz4cm5g6n"; buildDepends = [ - aeson base containers lens lens-aeson mtl transformers wreq + aeson base containers lens lens-aeson mtl time transformers wreq ]; homepage = "https://github.com/sjoerdvisscher/HueAPI"; description = "API for controlling Philips Hue lights"; @@ -13831,17 +13831,16 @@ self: { }) {}; "TBit" = callPackage - ({ mkDerivation, base, containers, deepseq, fgl, free, haskeline - , hmatrix, integration, list-extras, mtl, numeric-tools, parallel - , stream-fusion + ({ mkDerivation, base, containers, deepseq, fgl, free, hmatrix + , integration, list-extras, mtl, numeric-tools, parallel }: mkDerivation { pname = "TBit"; - version = "0.4.2.0"; - sha256 = "0qccd23x1qcng207dl82h7wifh2cc7aaapf9qrg0m5jz3fa5cvkm"; + version = "0.4.2.1"; + sha256 = "1x11v42px02j9sgxrikan5ixqnwdv20ybc090gaklbhmf9xhics6"; buildDepends = [ - base containers deepseq fgl free haskeline hmatrix integration - list-extras mtl numeric-tools parallel stream-fusion + base containers deepseq fgl free hmatrix integration list-extras + mtl numeric-tools parallel ]; jailbreak = true; description = "Utilities for condensed matter physics tight binding calculations"; @@ -14777,6 +14776,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Weather" = callPackage + ({ mkDerivation, aeson, base, bytestring, HTTP, text + , unordered-containers + }: + mkDerivation { + pname = "Weather"; + version = "0.1.0.1"; + sha256 = "18ixqj9lq1xaginhwxsk6ykcrs68jy1pn960imn3wm2wgvn2n1pi"; + buildDepends = [ + aeson base bytestring HTTP text unordered-containers + ]; + homepage = "https://github.com/bstamour/weather"; + description = "Library for interacting with the Weather Underground JSON API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "WebBits" = callPackage ({ mkDerivation, base, containers, mtl, parsec, pretty, syb }: mkDerivation { @@ -17385,11 +17400,12 @@ self: { ({ mkDerivation, argparser, base, containers, threefish }: mkDerivation { pname = "alea"; - version = "0.3.3.0"; - sha256 = "1c5bdbazlds419qgpdghrap5y20i59z57qk2dnj35bl2n5mvlapl"; + version = "0.4.0.0"; + sha256 = "1j18hqyrfyyhngla4dikdchi659bi7gj1lsl38r08645hf9n5395"; isLibrary = false; isExecutable = true; buildDepends = [ argparser base containers threefish ]; + jailbreak = true; homepage = "https://github.com/Rnhmjoj/alea"; description = "a diceware passphrase generator"; license = stdenv.lib.licenses.mit; @@ -17517,9 +17533,10 @@ self: { ({ mkDerivation, base, syb, template-haskell }: mkDerivation { pname = "algebraic-classes"; - version = "0.5.2"; - sha256 = "0kk0wafqwqr466qiz3dwagpf03vln922dnrrj90ay7kqp3623jnd"; + version = "0.6"; + sha256 = "0i34n1lmnw12xrnaqvmiydnnlm8m8ky12chwb9jmnsf3klv8qm61"; buildDepends = [ base syb template-haskell ]; + jailbreak = true; homepage = "https://github.com/sjoerdvisscher/algebraic-classes"; description = "Conversions between algebraic classes and F-algebras"; license = stdenv.lib.licenses.bsd3; @@ -18722,8 +18739,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "annotated-wl-pprint"; - version = "0.5.3"; - sha256 = "0g8b4hmgh7jhiknfrlaqr9sxr7a6sikkpaws15dy8mg4r792bbis"; + version = "0.6.0"; + sha256 = "1rwjfw4fspyi564a847sb6k679sa6psajm2jybzpa1pvjq9z2a9x"; buildDepends = [ base ]; homepage = "https://github.com/david-christiansen/annotated-wl-pprint"; description = "The Wadler/Leijen Pretty Printer, with annotation support"; @@ -19422,8 +19439,8 @@ self: { }: mkDerivation { pname = "appc"; - version = "0.0.5"; - sha256 = "0xilcg5rbi6bnwbs3xkysnf3v5h07hxn764sxim0s0n75vvlvidy"; + version = "0.0.6"; + sha256 = "0qns7kjp9sjrpdx6vfkci9q6xinb0gwkb1a9ssw8xfbqqhf9ljms"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -19473,6 +19490,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "applicative-parsec" = callPackage + ({ mkDerivation, base, containers, lens, mtl, QuickCheck + , test-framework, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "applicative-parsec"; + version = "0.1.0.0"; + sha256 = "12y2j9lpaqpjcr2a9fk4anlvc1cw5rimyx031b6xa5dx500phrrx"; + buildDepends = [ base containers lens mtl text ]; + testDepends = [ + base mtl QuickCheck test-framework test-framework-quickcheck2 + ]; + jailbreak = true; + homepage = "https://www.github.com/ktvoelker/AParsec"; + description = "An applicative parser combinator library"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "applicative-quoters" = callPackage ({ mkDerivation, base, haskell-src-meta, template-haskell }: mkDerivation { @@ -20951,6 +20986,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "audacity" = callPackage + ({ mkDerivation, base, deepseq, utility-ht }: + mkDerivation { + pname = "audacity"; + version = "0.0"; + sha256 = "1vfp5x5b6z7lwjiv8jla5bdwbcbafdm31zs9kr555idzz1n8wmqz"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base deepseq utility-ht ]; + homepage = "http://code.haskell.org/~thielema/audacity"; + description = "Interchange with the Audacity sound signal editor"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "audiovisual" = callPackage ({ mkDerivation, base, boundingboxes, colors, deepseq, directory , filepath, free, freetype2, hashable, JuicyPixels @@ -21237,8 +21286,8 @@ self: { }: mkDerivation { pname = "avers"; - version = "0.0.3"; - sha256 = "0y58qixd9kjm0wp5spachm581mshp15pcvlyv48nsrabrzssn3ng"; + version = "0.0.4"; + sha256 = "0bd424ls3kfqx2y7fzcmhssss3r3bhra8bzmllx1slb1x04apgn6"; buildDepends = [ aeson attoparsec base base16-bytestring bytestring containers cryptohash inflections influxdb MonadRandom mtl network @@ -23285,8 +23334,8 @@ self: { }: mkDerivation { pname = "binary-list"; - version = "1.1.0.2"; - sha256 = "006a46yw1jcdw2yhpwimbjcpls0vrhzrhiylxh6vc136w2kb6qcd"; + version = "1.1.1.0"; + sha256 = "03fh5ipmmjzdyywm28m2kkbxn11yb4ygrs1q2igll1mbmpm2km6x"; buildDepends = [ base binary bytestring deepseq phantom-state transformers ]; @@ -24212,15 +24261,14 @@ self: { }: mkDerivation { pname = "binembed"; - version = "0.1.0.2"; - sha256 = "0cabiww0iczgpk7rrf4iqy3vamq65w5m1r5y90117llr6w610rks"; + version = "0.1.0.3"; + sha256 = "163cs2qfj68dvbsyfg37hzb29jp0ylfpqlnhzjswm4j8mrcfsl3r"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring Cabal containers directory dlist filepath ]; - jailbreak = true; - homepage = "http://gitorious.org/binembed"; + homepage = "http://code.mathr.co.uk/binembed"; description = "Embed data into object files"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -24230,13 +24278,12 @@ self: { }: mkDerivation { pname = "binembed-example"; - version = "0.1"; - sha256 = "069caz3gzpnc9fm553yxj3jwn07svb0i34kfqw4vzlkkpzs5r5g4"; + version = "0.1.0.3"; + sha256 = "06lw6jvg382k3wj8ybld05bj3nchb8dqk363a69mak3r5zxg43iy"; isLibrary = false; isExecutable = true; buildDepends = [ base binembed bytestring containers filepath ]; - jailbreak = true; - homepage = "http://gitorious.org/binembed"; + homepage = "http://code.mathr.co.uk/binembed"; description = "Example project using binembed to embed data in object files"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -24489,6 +24536,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bitcoin-script" = callPackage + ({ mkDerivation, base, base16-bytestring, binary, bytestring, hspec + , hspec-expectations, text + }: + mkDerivation { + pname = "bitcoin-script"; + version = "0.9.1"; + sha256 = "0lh537bs9hj1jz98w27pcr9w1pdwcwrahdrfqk5aj0nmjzachn3f"; + buildDepends = [ base base16-bytestring binary bytestring text ]; + testDepends = [ base bytestring hspec hspec-expectations ]; + homepage = "http://github.com/solatis/haskell-bitcoin-script"; + description = "Compilation, manipulation and decompilation of Bitcoin scripts"; + license = stdenv.lib.licenses.mit; + }) {}; + + "bitcoin-tx" = callPackage + ({ mkDerivation, base, base16-bytestring, binary, bitcoin-script + , bytestring, hspec + }: + mkDerivation { + pname = "bitcoin-tx"; + version = "0.9.0"; + sha256 = "1yhpwjvbikf1kk2ikj1qgngchkd6mj1jikfyb7g233ixdihiykrg"; + buildDepends = [ + base base16-bytestring binary bitcoin-script bytestring + ]; + testDepends = [ base bitcoin-script bytestring hspec ]; + homepage = "http://www.leonmergen.com/opensource.html"; + description = "Utility functions for manipulating bitcoin transactions"; + license = stdenv.lib.licenses.mit; + }) {}; + "bitly-cli" = callPackage ({ mkDerivation, base, Bitly, directory, filepath, regexpr }: mkDerivation { @@ -24725,12 +24804,11 @@ self: { ({ mkDerivation, array, base, bytestring, QuickCheck }: mkDerivation { pname = "bitwise"; - version = "0.1.0.1"; - sha256 = "0k3xzw6lcrffbv8hqgg4kaanizql8r888ap4bw22sh3l3rq7zasn"; + version = "0.1.0.2"; + sha256 = "195g09frdyyn3wsb4jyspdmz8dlmpymqdlbss6zyslkddkrs8hdf"; buildDepends = [ array base bytestring ]; testDepends = [ base QuickCheck ]; - jailbreak = true; - homepage = "https://gitorious.org/bitwise"; + homepage = "http://code.mathr.co.uk/bitwise"; description = "fast multi-dimensional unboxed bit packed Bool arrays"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -25452,21 +25530,20 @@ self: { }) {}; "blunt" = callPackage - ({ mkDerivation, aeson, array, base, bytestring, clay, containers - , flow, haskell-src-exts, http-types, jmacro, lucid, pointful, text - , transformers, wai, wai-extra, wai-websockets, warp, websockets - , wl-pprint-text + ({ mkDerivation, aeson, base, bytestring, clay, flow, http-types + , jmacro, lucid, pointfree, pointful, text, wai, wai-extra + , wai-websockets, warp, websockets, wl-pprint-text }: mkDerivation { pname = "blunt"; - version = "0.0.16"; - sha256 = "03pradwal8ncrpj7gin9ri753hsi78lpfj8zsihf26dli79g5vmk"; + version = "1.0.0"; + sha256 = "0l1pm29ihypq0g65s5dhvfh18fvlvi750amhcbarzxznanvn92y9"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson array base bytestring clay containers flow haskell-src-exts - http-types jmacro lucid pointful text transformers wai wai-extra - wai-websockets warp websockets wl-pprint-text + aeson base bytestring clay flow http-types jmacro lucid pointfree + pointful text wai wai-extra wai-websockets warp websockets + wl-pprint-text ]; homepage = "https://blunt.herokuapp.com"; description = "Point-free Haskell as a service"; @@ -25841,6 +25918,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "breve" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, cryptohash + , directory, hashtables, mtl, random, simple, tconfig, transformers + , wai, wai-extra, warp, xdg-basedir + }: + mkDerivation { + pname = "breve"; + version = "0.0.4.0"; + sha256 = "1bszsndpc67z1hg3snmflcbp2hpn7lhgi8fck9q3p12fg2sxx583"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + aeson base binary bytestring cryptohash directory hashtables mtl + random simple tconfig transformers wai wai-extra warp xdg-basedir + ]; + jailbreak = true; + homepage = "https://github.com/rnhmjoj/breve"; + description = "a url shortener"; + license = stdenv.lib.licenses.mit; + }) {}; + "brians-brain" = callPackage ({ mkDerivation, array, base, parallel, random, SDL }: mkDerivation { @@ -27146,8 +27244,8 @@ self: { }: mkDerivation { pname = "cabal-helper"; - version = "0.3.1.0"; - sha256 = "1hfprys4q4azfgqcv2xcyn14y8nybmvrl8y3z3ckx0v5r13ss75n"; + version = "0.3.2.0"; + sha256 = "06igjmr0n8418wid1pr74cgvlsmwni7ar72g9bddivlbxax1pfli"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -27424,8 +27522,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "cabal-scripts"; - version = "0.1"; - sha256 = "17wpmqkgr55wj5qzb7ph3fvifz4bzzhk98ypcmrx5q0caq1crdq8"; + version = "0.1.1"; + sha256 = "1ajgx29hvcsdd6lwc78dyhsjm5ikx2zn0kdbwnzn1kggz2l08ls4"; buildDepends = [ base ]; description = "Shell scripts for support of Cabal maintenance"; license = stdenv.lib.licenses.bsd3; @@ -27999,8 +28097,8 @@ self: { ({ mkDerivation, base, containers, haskeline, parsec, QuickCheck }: mkDerivation { pname = "calculator"; - version = "0.3.0.2"; - sha256 = "14fcb4zfx7pk0ha3hvlpj84mxp82jpn1ywyjnfmczm3ic4mq98m9"; + version = "0.3.1.0"; + sha256 = "0mis4wni2w5dbyf65wxk7005g7s4n8ad2kzcra9kaifvl2hpfz81"; isLibrary = false; isExecutable = true; buildDepends = [ base containers haskeline parsec ]; @@ -28779,8 +28877,8 @@ self: { }: mkDerivation { pname = "cblrepo"; - version = "0.15.0"; - sha256 = "1a7bhy3yvrmnirh7nmlz6d1nyxs5dng2ap17h8585yhx9k1a5n68"; + version = "0.15.1"; + sha256 = "1cwkkszbxx90jykd6b4r6kkjz4dpi86xx99fb8h3aqczyccn6hvw"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -29260,8 +29358,8 @@ self: { ({ mkDerivation, array, base, process, random }: mkDerivation { pname = "chalmers-lava2000"; - version = "1.4.1"; - sha256 = "19n7z5k6ycn6brnh1n8ykni3ix49d53p3rjggfaklw83knqnvxhy"; + version = "1.5"; + sha256 = "1xrzh1mqa6d3hwr7lfazfskh6bklbj3kv9vlm40n650l2l42arga"; buildDepends = [ array base process random ]; homepage = "http://projects.haskell.org/chalmers-lava2000/Doc/tutorial.pdf"; description = "Hardware description EDSL"; @@ -30997,7 +31095,6 @@ self: { homepage = "http://github.com/haskell-distributed/cloud-haskell"; description = "The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cloudfront-signer" = callPackage @@ -31341,8 +31438,8 @@ self: { }: mkDerivation { pname = "cndict"; - version = "0.5.0"; - sha256 = "095gin216bm2zrlw3j52byk924z51ijk90di2n5r1dbvf9liwj7l"; + version = "0.5.2"; + sha256 = "0jnrv15gs350zjd97a7z332f8k4g02y7v5r0ix4g5wp50mydm2zz"; buildDepends = [ base binary bytestring cassava containers file-embed text vector ]; @@ -32771,8 +32868,8 @@ self: { }: mkDerivation { pname = "conduit-combinators"; - version = "0.3.0.6"; - sha256 = "0z2nzs89sw2wxrgvyd2bxyh9vs87r1g6rbjqiwcjvhjs25ppq22b"; + version = "0.3.1"; + sha256 = "14cvd9vs31gbgggy3v6rsg7wckr08msw1s0fwqbyal73krm79f2r"; buildDepends = [ base base16-bytestring base64-bytestring bytestring chunked-data conduit conduit-extra monad-control mono-traversable mwc-random @@ -32818,8 +32915,8 @@ self: { }: mkDerivation { pname = "conduit-extra"; - version = "1.1.7.1"; - sha256 = "1qpqjcqy44l92s21aivd2gvb7zz574102mld19a44w0n3yxvljx3"; + version = "1.1.7.2"; + sha256 = "0nb7sd8a5lbl9frypz9clr808ircln356244nzm7kl5qd53752iw"; buildDepends = [ attoparsec base blaze-builder bytestring conduit directory filepath monad-control network primitive process resourcet stm @@ -34590,8 +34687,8 @@ self: { ({ mkDerivation, base, data-binary-ieee754, ieee754 }: mkDerivation { pname = "crackNum"; - version = "1.1"; - sha256 = "12sr5dqm4cgmc2hk4fhn5zd4dqnhjzzb5hqldmj4s75xhpsnws10"; + version = "1.3"; + sha256 = "06balzwvvpl69abfcq0gynv6zpy42aygvlicb9jsnrys2vyipv28"; isLibrary = true; isExecutable = true; buildDepends = [ base data-binary-ieee754 ieee754 ]; @@ -35281,8 +35378,8 @@ self: { }: mkDerivation { pname = "cryptol"; - version = "2.2.1"; - sha256 = "06dl3jkv0ygyb42p89hifrsmcg8jipyag01ibwj3gr6kxm443cg7"; + version = "2.2.2"; + sha256 = "1rqnrjxvkisis7m5zfhyw8717a9jnjgdmm6nnbdrnbxmsabsad20"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -35292,6 +35389,7 @@ self: { template-haskell text tf-random transformers utf8-string ]; buildTools = [ alex happy ]; + jailbreak = true; homepage = "http://www.cryptol.net/"; description = "Cryptol: The Language of Cryptography"; license = stdenv.lib.licenses.bsd3; @@ -35305,8 +35403,8 @@ self: { }: mkDerivation { pname = "cryptsy-api"; - version = "0.2"; - sha256 = "09sx9z6s1ii8p4hw84j4ahd81a6k4xz3fn1zi60r7grsmbx69pkw"; + version = "0.2.1"; + sha256 = "1knnzh77y4rr7ka2nfwr99z61v2pvx2p1mzji06ac0mjk2n80ybs"; buildDepends = [ aeson base bytestring deepseq either http-client http-client-tls old-locale pipes-attoparsec pipes-http text time transformers @@ -35314,7 +35412,7 @@ self: { ]; jailbreak = true; description = "Bindings for Cryptsy cryptocurrency exchange API"; - license = "unknown"; + license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -35356,16 +35454,18 @@ self: { }) {}; "csound-expression" = callPackage - ({ mkDerivation, base, Boolean, colour, csound-expression-opcodes - , csound-expression-typed, data-default, process + ({ mkDerivation, base, Boolean, colour, csound-expression-dynamic + , csound-expression-opcodes, csound-expression-typed, data-default + , process, transformers }: mkDerivation { pname = "csound-expression"; - version = "4.4.1"; - sha256 = "03l7gbbiqs1djizda16hhi24pqgmqpdsfgl0dxvpzpvz703imfg5"; + version = "4.5"; + sha256 = "0h9rba2jvfc6dhrdkn6g33rw1qdnxzjmkvsqpbq2l5iqzw8j1s7k"; buildDepends = [ - base Boolean colour csound-expression-opcodes - csound-expression-typed data-default process + base Boolean colour csound-expression-dynamic + csound-expression-opcodes csound-expression-typed data-default + process transformers ]; homepage = "https://github.com/anton-k/csound-expression"; description = "library to make electronic music"; @@ -35378,8 +35478,8 @@ self: { }: mkDerivation { pname = "csound-expression-dynamic"; - version = "0.1.2"; - sha256 = "05x9fbsm8ah2s7p81xzqmfvkxs81iplg1r334j6djcyab1waqa9i"; + version = "0.1.3"; + sha256 = "0pzdkzdlbllgz7ikz6sd89f8nfrvr3ryi01jcwk0ix0h0mwdg6n6"; buildDepends = [ array base Boolean containers data-default data-fix data-fix-cse transformers wl-pprint @@ -35395,8 +35495,8 @@ self: { }: mkDerivation { pname = "csound-expression-opcodes"; - version = "0.0.1"; - sha256 = "0lm95cx66i8bysr9y9gd455pfmx9didgk78cfld8fcwjj6rv1qa0"; + version = "0.0.2"; + sha256 = "0friwwx0ia2wk75ylmvlladswqfwhza8grsbnqfn5q8ffsjv632r"; buildDepends = [ base csound-expression-dynamic csound-expression-typed transformers ]; @@ -35411,8 +35511,8 @@ self: { }: mkDerivation { pname = "csound-expression-typed"; - version = "0.0.7.1"; - sha256 = "163jkx5x3mnlcj0zxx9595i4bpp29lz60fgcdkx07vmqky7hb1ng"; + version = "0.0.7.2"; + sha256 = "0fflw0pyyvzvnkizv57kszkfr933sapgsilsbkzkvx9xp6v5975d"; buildDepends = [ base Boolean colour containers csound-expression-dynamic data-default deepseq ghc-prim stable-maps transformers wl-pprint @@ -35426,8 +35526,8 @@ self: { ({ mkDerivation, base, csound-expression, transformers }: mkDerivation { pname = "csound-sampler"; - version = "0.0.4.0"; - sha256 = "03mymb5yk4hlf6nsmakxw0nyspvrs7882dmpx9r65lkpsvgnaxyp"; + version = "0.0.5.0"; + sha256 = "14ya1sbq5kqg4nbl6iak181rhi8znj33vbcxnhzbbcybx1y6rsh1"; buildDepends = [ base csound-expression transformers ]; homepage = "https://github.com/anton-k/csound-sampler"; description = "A musical sampler based on Csound"; @@ -35756,8 +35856,8 @@ self: { ({ mkDerivation, base, c2hs, cuda }: mkDerivation { pname = "cufft"; - version = "0.1.2.0"; - sha256 = "09d62g5nwl8bj80h8pz5k9bjcp59xcbsa5pmbygqybhcfhng25kg"; + version = "0.1.2.1"; + sha256 = "1qkrp2dwfpivf5j42a7wij61010a3rmldxng4j8ivkrc7vllv76j"; buildDepends = [ base cuda ]; buildTools = [ c2hs ]; homepage = "http://github.com/robeverest/cufft"; @@ -36324,8 +36424,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "darcs-scripts"; - version = "0.1"; - sha256 = "1jyl04z76935kz71hmz2hdx9bw2ka2v8pai6lpy6iz63wamhkmps"; + version = "0.1.1"; + sha256 = "06gs18s89nc5qyicfpkj0hz999l5pf4glhlanm2yhyd6lxbfgkba"; buildDepends = [ base ]; description = "Shell scripts for support of darcs workflow"; license = stdenv.lib.licenses.bsd3; @@ -36624,8 +36724,8 @@ self: { ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { pname = "data-clist"; - version = "0.0.7.3"; - sha256 = "0kabcqyvsajf5drihp3f6da2vbw76f85cc4gh20n9czxy19g35rq"; + version = "0.0.7.4"; + sha256 = "0vnrn8fcnibdbvwdf2smipnvmamgva0x7pszl4bykmh15ns417vn"; buildDepends = [ base deepseq QuickCheck ]; homepage = "https://github.com/sw17ch/data-clist"; description = "Simple functional ring type"; @@ -37543,13 +37643,15 @@ self: { }) {}; "dataflow" = callPackage - ({ mkDerivation, base, mtl }: + ({ mkDerivation, base, containers, hspec, HUnit, mtl }: mkDerivation { pname = "dataflow"; - version = "0.3.1.0"; - sha256 = "0rl396ll4m5vc6347d98bf7iyyvf7przgdsmh5l53qj7vl226fj6"; - buildDepends = [ base mtl ]; + version = "0.5.0.0"; + sha256 = "0vkrmgf39mjvf1150dhwry663l1kvkb73d076jh95zzlksyg0xfp"; + buildDepends = [ base containers mtl ]; + testDepends = [ base hspec HUnit ]; jailbreak = true; + homepage = "https://github.com/owickstrom/dataflow"; description = "Generate Graphviz documents from a Haskell representation"; license = stdenv.lib.licenses.mit; }) {}; @@ -38892,9 +38994,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "descrilo"; - version = "0.1.0.2"; - sha256 = "1wvq4gcda39k69hadz9kfxn5bsxqjag4chbbppiwmyp503y8f2k1"; + version = "0.1.0.3"; + sha256 = "19x78lv6rd5i5xvqj92q5snly1579jiiw2fgmxzxza0km9j9yiw2"; buildDepends = [ base ]; + jailbreak = true; description = "Loads a list of items with fields"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -40043,17 +40146,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "directory_1_2_2_0" = callPackage - ({ mkDerivation, base, filepath, time, unix }: + "directory_1_2_2_1" = callPackage + ({ mkDerivation, base, filepath, python, time, unix, which }: mkDerivation { pname = "directory"; - version = "1.2.2.0"; - sha256 = "1dbn6d48gdqh0n2rkh02asxv94ikd8849659ndc7p3h93kgj1dy4"; + version = "1.2.2.1"; + sha256 = "0ikhkmgzmpxvgl9w1piv168sbwkrvn0l2xdx9zb4sw75ci1ymb1y"; buildDepends = [ base filepath time unix ]; - testDepends = [ base ]; + testDepends = [ base python which ]; description = "Platform-agnostic library for filesystem operations"; license = stdenv.lib.licenses.bsd3; - }) {}; + broken = true; + }) { python = null; which = null;}; "directory-layout" = callPackage ({ mkDerivation, base, bytestring, command-qq, containers @@ -40281,7 +40385,6 @@ self: { homepage = "http://github.com/haskell-distributed/distributed-process-async"; description = "Cloud Haskell Async API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-azure" = callPackage @@ -40338,7 +40441,6 @@ self: { homepage = "http://github.com/haskell-distributed/distributed-process-client-server"; description = "The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-execution" = callPackage @@ -40404,7 +40506,6 @@ self: { homepage = "http://github.com/haskell-distributed/distributed-process-extras"; description = "Cloud Haskell Extras"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-monad-control" = callPackage @@ -40561,7 +40662,6 @@ self: { homepage = "http://github.com/haskell-distributed/distributed-process-supervisor"; description = "Supervisors for The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-task" = callPackage @@ -40621,7 +40721,6 @@ self: { homepage = "http://github.com/haskell-distributed/distributed-process-tests"; description = "Tests for distributed-process"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-zookeeper" = callPackage @@ -40717,17 +40816,18 @@ self: { "diversity" = callPackage ({ mkDerivation, base, containers, fasta, math-functions - , optparse-applicative, parsec, split + , MonadRandom, optparse-applicative, parsec, random-shuffle + , scientific, split }: mkDerivation { pname = "diversity"; - version = "0.4.0.1"; - sha256 = "15baqhwzhdsbn2iz2r7vkf66nbv0p4ni1qkpnpwblwbcnvfk2lzq"; + version = "0.5.0.2"; + sha256 = "0zmwikcl11sllvdz49l8cxlsnxlmv7lbjpnbpxjxl5iczsyscgl7"; isLibrary = true; isExecutable = true; buildDepends = [ - base containers fasta math-functions optparse-applicative parsec - split + base containers fasta math-functions MonadRandom + optparse-applicative parsec random-shuffle scientific split ]; homepage = "https://github.com/GregorySchwartz/diversity"; description = "Return the diversity at each position for all sequences in a fasta file"; @@ -41333,6 +41433,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "dozenal" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "dozenal"; + version = "0.1.0.0"; + sha256 = "0sqvxyj3aybqvjlrz2a93lnp1vbjiqikysm575wizri2rd3vfj1l"; + buildDepends = [ base ]; + homepage = "https://github.com/siddhanathan/dozenal"; + description = "A Haskell library for using Dozenal (Duodecimal - Base 12) numbers"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "dph-base" = callPackage ({ mkDerivation, array, base, ghc-prim, pretty, random, vector }: mkDerivation { @@ -41791,6 +41903,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dtw" = callPackage + ({ mkDerivation, base, containers, MemoTrie, QuickCheck + , test-framework, test-framework-quickcheck2, thyme, vector + , vector-space + }: + mkDerivation { + pname = "dtw"; + version = "1.0.0.0"; + sha256 = "0kcb773sly86lkvnb3ihsswrz432phi3ccizwbf1phzf72kdflzr"; + buildDepends = [ base containers MemoTrie vector vector-space ]; + testDepends = [ + base containers MemoTrie QuickCheck test-framework + test-framework-quickcheck2 thyme vector vector-space + ]; + description = "(Fast) Dynamic Time Warping"; + license = stdenv.lib.licenses.mit; + }) {}; + "dual-tree" = callPackage ({ mkDerivation, base, monoid-extras, newtype, semigroups }: mkDerivation { @@ -42386,8 +42516,8 @@ self: { }: mkDerivation { pname = "ede"; - version = "0.2.8"; - sha256 = "1pzqjs7560xkw51aqpivm6sgysnxs6c5jy4fnalvds79gk37yryh"; + version = "0.2.8.2"; + sha256 = "0j0b0pn9apvpqxb0gnxxp51g32xc47jky4njb9jn0x59jssc1g1q"; buildDepends = [ aeson ansi-wl-pprint base bifunctors bytestring comonad directory filepath free lens mtl parsers scientific semigroups text @@ -42470,7 +42600,9 @@ self: { mkDerivation { pname = "edit-distance"; version = "0.2.1.2"; + revision = "1"; sha256 = "08dxsp1ar8mr4xrjy37lzl0s1rjnqsdq30p09nclip5pyhcw7g44"; + editedCabalFile = "27d6fb19e1707aa05883ca4ffd6715dcc81db287c71508d6aaa420cefc8f29c1"; isLibrary = true; isExecutable = true; buildDepends = [ array base containers random ]; @@ -42545,6 +42677,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) libedit;}; + "editor-open" = callPackage + ({ mkDerivation, base, bytestring, process, temporary, unix }: + mkDerivation { + pname = "editor-open"; + version = "0.2.0.0"; + sha256 = "0lv7rkapyvhsrri1094ls4biv7s5p5a30zm20ghqaky3nka2n18p"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base bytestring process temporary unix ]; + jailbreak = true; + homepage = "https://notabug.org/pharpend/editor-open"; + description = "Open the user's $EDITOR for text input"; + license = stdenv.lib.licenses.asl20; + }) {}; + "effect-handlers" = callPackage ({ mkDerivation, base, free, hspec, hspec-discover, HUnit , kan-extensions, mtl, QuickCheck @@ -42883,8 +43030,8 @@ self: { }: mkDerivation { pname = "ekg-core"; - version = "0.1.0.3"; - sha256 = "0d2hvj9g62xkaah8iizgr668ij53164nnrdjkikhc2igi6wk31k4"; + version = "0.1.0.4"; + sha256 = "04ym37hc2l3k185dbkmfa4n7ya412cgc5zf0kynwgfvdwggjnxwh"; buildDepends = [ base containers ghc-prim text unordered-containers ]; @@ -42923,6 +43070,7 @@ self: { buildDepends = [ base bytestring ekg-core text time unordered-containers ]; + jailbreak = true; homepage = "https://github.com/adarqui/ekg-push"; description = "Small framework to push metric deltas to a broadcast channel using the ekg-core library"; license = stdenv.lib.licenses.bsd3; @@ -42955,12 +43103,11 @@ self: { }: mkDerivation { pname = "ekg-statsd"; - version = "0.2.0.1"; - sha256 = "0s01bkir41189ss72sshlbg4y4qk2wvkr234m2j1y0169l067687"; + version = "0.2.0.2"; + sha256 = "1jblrhwpv579d51i66bin9zxmwkl899lxwygg4qqpm3cnx5vf859"; buildDepends = [ base bytestring ekg-core network text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/tibbe/ekg-statsd"; description = "Push metrics to statsd"; license = stdenv.lib.licenses.bsd3; @@ -43497,8 +43644,8 @@ self: { }: mkDerivation { pname = "engine-io"; - version = "1.2.4"; - sha256 = "08445vp6ma2jids99b21grw8pds086yvbcbh6iyr8x3z74020y1m"; + version = "1.2.5"; + sha256 = "09hndfmgvganfj2y53zj5dpy1dn8rain3fyxknr14ln8c75jprah"; buildDepends = [ aeson async attoparsec base base64-bytestring bytestring either free monad-loops mwc-random stm stm-delay text transformers @@ -43516,8 +43663,8 @@ self: { }: mkDerivation { pname = "engine-io-snap"; - version = "1.0.2"; - sha256 = "0x2sb3b825ds1g2g15yyqxdrw6bh968ivmyd1933l47649qbs0xr"; + version = "1.0.3"; + sha256 = "0i2099b4drvzknz6ifi4dvgfibkqxfrz6w3a15k09nw3vxc14hbg"; buildDepends = [ attoparsec-enumerator base bytestring containers engine-io MonadCatchIO-transformers snap-core unordered-containers websockets @@ -43534,10 +43681,8 @@ self: { }: mkDerivation { pname = "engine-io-yesod"; - version = "1.0.1"; - revision = "1"; - sha256 = "0pczmiqrg046r367j071h2hr6p2amw93sqy7j1drd2gdiwaxzn02"; - editedCabalFile = "5963c385f145309049f67eb35f835abf2530a7b117730bd9fe0c4991837a52aa"; + version = "1.0.2"; + sha256 = "15hjq128zn23kq5nlmpv7sbrhzhv1936psgf8aa7yxvx4xwy6baw"; buildDepends = [ base bytestring conduit conduit-extra engine-io http-types text unordered-containers wai wai-websockets websockets yesod-core @@ -43951,17 +44096,20 @@ self: { "equivalence" = callPackage ({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans , template-haskell, test-framework, test-framework-quickcheck2 + , transformers, transformers-compat }: mkDerivation { pname = "equivalence"; - version = "0.3.0.1"; - sha256 = "0ym4dlwajwh9qk6wgqzbwy0nfnq13a3f4lcfhw7g7xn63lkwm7ch"; - buildDepends = [ base containers mtl STMonadTrans ]; + version = "0.3.1"; + sha256 = "0zi053l03r5qcnpsphnq8xqazd0cbgj9n44hn47s1hagdra3j1bs"; + buildDepends = [ + base containers mtl STMonadTrans transformers transformers-compat + ]; testDepends = [ base containers mtl QuickCheck STMonadTrans template-haskell - test-framework test-framework-quickcheck2 + test-framework test-framework-quickcheck2 transformers + transformers-compat ]; - jailbreak = true; homepage = "https://bitbucket.org/paba/equivalence/"; description = "Maintaining an equivalence relation implemented as union-find using STT"; license = stdenv.lib.licenses.bsd3; @@ -44251,8 +44399,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "2.1.2.3"; - sha256 = "0pa4j9xd8hk2imfggkjxk08314jpi0fh9z0pkr7f8mix6rvqm8ir"; + version = "2.1.3"; + sha256 = "1wsq058dm849ldxn5gjayagb6ds56b80dinyrpbjw8b0fr3s6v9d"; buildDepends = [ base conduit monad-logger persistent resourcet tagged text transformers unordered-containers @@ -44607,6 +44755,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "exact-pi" = callPackage + ({ mkDerivation, base, groups }: + mkDerivation { + pname = "exact-pi"; + version = "0.1.0.0"; + sha256 = "01vljbgsqwiv6chlp1nfvmfc4wd3nq89mvn7x8s68dhfd8f8m2g6"; + buildDepends = [ base groups ]; + jailbreak = true; + homepage = "https://github.com/dmcclean/exact-pi"; + description = "Exact rational multiples of pi (and integer powers of pi)"; + license = stdenv.lib.licenses.mit; + }) {}; + "exception-mailer" = callPackage ({ mkDerivation, base, hslogger, mime-mail, text }: mkDerivation { @@ -44735,8 +44896,8 @@ self: { }: mkDerivation { pname = "exhaustive"; - version = "1.1.0"; - sha256 = "14pdf5iks0j2vpg3w48qs32lnj8ahkd0jljjhx1qap66mss0i3jl"; + version = "1.1.1"; + sha256 = "0bgzg2qhx91hd9711bxv6cr2qc7m23g29al4gb7yx20cs78bz1mg"; buildDepends = [ base generics-sop template-haskell transformers ]; homepage = "http://github.com/ocharles/exhaustive"; description = "Compile time checks that a computation considers producing data through all possible constructors"; @@ -45065,12 +45226,13 @@ self: { }) {}; "extensible" = callPackage - ({ mkDerivation, base, binary, constraints, template-haskell }: + ({ mkDerivation, base, constraints, profunctors, template-haskell + }: mkDerivation { pname = "extensible"; - version = "0.3.2"; - sha256 = "1fb027d14100s384mhl0g09jpjxqam85g6yh0pnwcn3g4fzq0fln"; - buildDepends = [ base binary constraints template-haskell ]; + version = "0.3.3"; + sha256 = "0d574fra1f5cd0fakypjixkr9ag1zsgh7bc8l250sjqw1sjq4cmh"; + buildDepends = [ base constraints profunctors template-haskell ]; homepage = "https://github.com/fumieval/extensible"; description = "Extensible, efficient, lens-friendly data types"; license = stdenv.lib.licenses.bsd3; @@ -45449,8 +45611,8 @@ self: { ({ mkDerivation, base, containers, parsec, split, text }: mkDerivation { pname = "fasta"; - version = "0.5.1.3"; - sha256 = "1p5a98riv7wjkd0mdinqfm3qmhx6q4dbibdhpp9a4r4zm4ccwpfb"; + version = "0.5.1.5"; + sha256 = "12qjgmrd8pvzcx6ssky3vjbbh69yki1kpppkyksv0afbvd81qkv5"; buildDepends = [ base containers parsec split text ]; homepage = "https://github.com/GregorySchwartz/fasta"; description = "A simple, mindless parser for fasta files"; @@ -45579,8 +45741,8 @@ self: { }: mkDerivation { pname = "fay-builder"; - version = "0.2.0.4"; - sha256 = "0x1y9d2hgi3ky7f7ydc43dyd54dsmqcgxj6g8n2x3yfrcjkljq05"; + version = "0.2.0.5"; + sha256 = "18ii5dnzk866q79h43fspdz8dzg17mzfrykh3pl4p0q4qdnylv8i"; buildDepends = [ base Cabal data-default directory fay filepath safe split text ]; @@ -45672,8 +45834,8 @@ self: { }: mkDerivation { pname = "fb"; - version = "1.0.8"; - sha256 = "1cv722kkp6lbxajv3ka4088x2491yy41cfypqqkq753mm59x6s9m"; + version = "1.0.9"; + sha256 = "0f5zs1qnjkhrdlfvcl26l3j2xl58y97y7rh2dds12mvsyj7h446b"; buildDepends = [ aeson attoparsec base base16-bytestring base64-bytestring bytestring cereal conduit conduit-extra crypto-api cryptohash @@ -46099,8 +46261,8 @@ self: { }) {}; "ffmpeg-light" = callPackage - ({ mkDerivation, base, JuicyPixels, libavcodec, libavformat - , libavutil, libswscale, mtl, transformers, vector + ({ mkDerivation, base, ffmpeg, JuicyPixels, libavcodec, libavformat + , libswscale, mtl, transformers, vector }: mkDerivation { pname = "ffmpeg-light"; @@ -46109,13 +46271,13 @@ self: { isLibrary = true; isExecutable = true; buildDepends = [ base JuicyPixels mtl transformers vector ]; - pkgconfigDepends = [ libavcodec libavformat libavutil libswscale ]; + pkgconfigDepends = [ ffmpeg libavcodec libavformat libswscale ]; jailbreak = true; description = "Minimal bindings to the FFmpeg library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { libavcodec = null; libavformat = null; libavutil = null; - libswscale = null;}; + }) { inherit (pkgs) ffmpeg; libavcodec = null; + libavformat = null; libswscale = null;}; "ffmpeg-tutorials" = callPackage ({ mkDerivation, base, bytestring, haskell98, hs-ffmpeg, SDL, stm @@ -46358,8 +46520,8 @@ self: { }: mkDerivation { pname = "filediff"; - version = "0.1.0.4"; - sha256 = "0jqmwlg7xpz03kqchnydgrxyiz8cf4ijv3019nshwqxjwjyzf50r"; + version = "0.1.0.6"; + sha256 = "10lhp6d87r2xiw0xrj8x0h7x5nzr2240w4q1ks3hhvrcpczzgy5w"; buildDepends = [ base data-default data-memocombinators directory either mtl tasty tasty-hunit text time transformers Zora @@ -47375,8 +47537,8 @@ self: { ({ mkDerivation, base, bytestring, c2hs, directory, process }: mkDerivation { pname = "fltkhs"; - version = "0.1.0.1"; - sha256 = "026cx8l24qjf91d8ikqyz7bj92apm3qzq0ml6rvybj44mrpd1c34"; + version = "0.1.0.2"; + sha256 = "11p957d12ivrf9r76zf2khjd736fdnhaj7qp0x6fbwmda2ifrij3"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring directory process ]; @@ -47678,8 +47840,8 @@ self: { ({ mkDerivation, aeson, base, text }: mkDerivation { pname = "forecast-io"; - version = "0.1.0.0"; - sha256 = "0z2hv8lv75zij9arvxdircc0db0r0m86fgk5496hh1gvxxd5pqw6"; + version = "0.2.0.0"; + sha256 = "17wsqrq1zq1p80gnrfsvks5bhickfqj5mh2prbzzkzb3s28l1mby"; buildDepends = [ aeson base text ]; homepage = "https://github.com/stormont/forecast-io"; description = "A Haskell library for working with forecast.io data."; @@ -47714,7 +47876,9 @@ self: { mkDerivation { pname = "foreign-var"; version = "0.1"; + revision = "1"; sha256 = "1rxfmzq9npj1170i85qhq5fhvvzb9j1wdi5lzmj57k4hlyxcwqjd"; + editedCabalFile = "f9c906434533279cfa8e2897c6eed6ed9c279f373efc5180bda76b704601fa1c"; buildDepends = [ base stm transformers ]; homepage = "http://github.com/ekmett/foreign-var/"; description = "Encapsulating mutatable state in external libraries"; @@ -48128,12 +48292,13 @@ self: { }: mkDerivation { pname = "free-functors"; - version = "0.6.3.3"; - sha256 = "05q3b5ls6c63piywyxpa87gzn0c46xwgisq6skb05a38q24za3a0"; + version = "0.6.4.1"; + sha256 = "1mc5y29j4khl222dwb9xcnfmn2jh3v47rkvkzwvlgrbg5bh81kzk"; buildDepends = [ algebraic-classes base comonad constraints template-haskell transformers void ]; + jailbreak = true; homepage = "https://github.com/sjoerdvisscher/free-functors"; description = "Provides free functors that are adjoint to functors that forget class constraints"; license = stdenv.lib.licenses.bsd3; @@ -48385,17 +48550,16 @@ self: { }) {}; "friday" = callPackage - ({ mkDerivation, base, bytestring, convertible, deepseq, primitive - , QuickCheck, ratio-int, test-framework, test-framework-quickcheck2 + ({ mkDerivation, base, convertible, deepseq, primitive, QuickCheck + , ratio-int, test-framework, test-framework-quickcheck2 , transformers, vector }: mkDerivation { pname = "friday"; - version = "0.2.1.0"; - sha256 = "02n0cdmd4fc3vi2i73s7q4pynnn29dpa1rh94z6j5lb5arcz9i8p"; + version = "0.2.1.1"; + sha256 = "1snbmr1q60lg94zzfxfc0pfzyi695m7dc79vpi66c8kb5anwahw8"; buildDepends = [ - base bytestring convertible deepseq primitive ratio-int - transformers vector + base convertible deepseq primitive ratio-int transformers vector ]; testDepends = [ base QuickCheck test-framework test-framework-quickcheck2 vector @@ -48832,8 +48996,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "functor-monadic"; - version = "0.1.0.1"; - sha256 = "0791pqg4b9nr4ggfhi6ijjxmnwyf2yyqxfk9iahf6jn0y09lr7pm"; + version = "0.1.0.2"; + sha256 = "03jipdzark9dhwlym7ky887zzl3cdsc18wwwmg5szl1wgg30li1n"; buildDepends = [ base ]; homepage = "https://github.com/ombocomp/FunctorMonadic/"; description = "Monad-style combinators for functors"; @@ -49756,8 +49920,8 @@ self: { ({ mkDerivation, base, containers, mtl, template-haskell }: mkDerivation { pname = "genifunctors"; - version = "0.2.2.0"; - sha256 = "0j0pxpb46iq5vqbr5x1cjng9dpjcbd3q2r53ds27b956pyi82m19"; + version = "0.3"; + sha256 = "16jsy5dyp1hqnk40nzjprkw3bfdbc92vkgzmwdds67ljh0jn6815"; buildDepends = [ base containers mtl template-haskell ]; testDepends = [ base containers mtl template-haskell ]; homepage = "https://github.com/danr/genifunctors"; @@ -49955,8 +50119,8 @@ self: { }: mkDerivation { pname = "getopt-generics"; - version = "0.2"; - sha256 = "12zidbkxnksh05l8ds100y6sx29l0i8x0xy3zfczh4cir4lbz67g"; + version = "0.3"; + sha256 = "188zymhbnhcpbsljpbjsz6zhwax8zakjvlh7pqxqyag4fdd3qgc1"; buildDepends = [ base base-compat generics-sop tagged ]; testDepends = [ base base-compat generics-sop hspec hspec-expectations silently @@ -50838,8 +51002,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "5.20150406.1"; - sha256 = "11r4i1bwkkwwffqqk0s9w9brbc7xnkjr6qw7amzagk4lfvcvpsvi"; + version = "5.20150409"; + sha256 = "0pap6sxzlxj43qs8m6dmrpy82123jprl4lva3j10yblgkpg4j9lf"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -51473,8 +51637,8 @@ self: { }: mkDerivation { pname = "gl"; - version = "0.7.4"; - sha256 = "08b7mayd1qfalqrr2zh8ra7mm05l2inifjamvxn84697mnvxhjg7"; + version = "0.7.5"; + sha256 = "0ffc9lks1fd4ch7pygdl8yfmy425aazykrn2niakb876kzzm5axi"; buildDepends = [ base containers directory filepath fixed half hxt split transformers @@ -58978,6 +59142,7 @@ self: { base-prelude either hasql-backend hasql-postgres hspec monad-control mtl-prelude slave-thread text vector ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/hasql"; description = "A minimalistic general high level API for relational databases"; license = stdenv.lib.licenses.mit; @@ -59144,8 +59309,8 @@ self: { ({ mkDerivation, base, haste-compiler, transformers }: mkDerivation { pname = "haste-perch"; - version = "0.1.0.8"; - sha256 = "0p15wzl7rina4pnldhkm188addqlgmc9k4cryv7v2dr9i0wv5y8f"; + version = "0.1.0.9"; + sha256 = "1a92ahmphsr0dgj1jlp2cxpq5yy59b3avw3gzmv0jzrds41p3ic8"; buildDepends = [ base haste-compiler transformers ]; homepage = "https://github.com/agocorona/haste-perch"; description = "Create, navigate and modify the DOM tree with composable syntax, with the haste compiler"; @@ -60341,9 +60506,9 @@ self: { mkDerivation { pname = "heist"; version = "0.14.1"; - revision = "1"; + revision = "2"; sha256 = "11g6nrg9xn9ypwrz7mj3hqjhg45ia1miihh1ydls7vfdm2fqlagy"; - editedCabalFile = "2d58f7f1572a3a9ed3f20cb344a4f45e33303a40889b1e5bd8f83e4b972b195e"; + editedCabalFile = "73ce4cfe9090a973644268118b4d765577c2e8ddeeb1ad245d335772f5369d34"; buildDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist errors filepath hashable @@ -62605,12 +62770,11 @@ self: { }: mkDerivation { pname = "hledger-irr"; - version = "0.1.1.5"; - sha256 = "0xv8rmxf1534g6mbxlhmrx71w0amdrhhj1dwyw5dv91i743br5mp"; + version = "0.1.1.6"; + sha256 = "1w8f69ssr7g50w4mikfakznrw7y0lqcjr78ad5bwz37ppi4fhdvj"; isLibrary = false; isExecutable = true; buildDepends = [ base Cabal Decimal hledger-lib statistics time ]; - jailbreak = true; description = "computes the internal rate of return of an investment"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -62750,6 +62914,22 @@ self: { license = stdenv.lib.licenses.mit; }) { inherit (pkgs) git; inherit (pkgs) openssl;}; + "hlibsass" = callPackage + ({ mkDerivation, base, hspec, sass }: + mkDerivation { + pname = "hlibsass"; + version = "0.1.1.0"; + revision = "1"; + sha256 = "1dq09m5ag63zzhfa5xkvh3vzrn2ywamvdl41gjrirmbiziqa86l8"; + editedCabalFile = "768c79fd71253719dfd74821dbf070bd3d1ff30a298fd76d9e6c616bd4b5799a"; + buildDepends = [ base ]; + testDepends = [ base hspec ]; + extraLibraries = [ sass ]; + homepage = "https://github.com/jakubfijalkowski/hlibsass"; + description = "Low-level bindings to libsass"; + license = stdenv.lib.licenses.mit; + }) { sass = null;}; + "hlint" = callPackage ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs , directory, extra, filepath, haskell-src-exts, hscolour, process @@ -62907,8 +63087,8 @@ self: { ({ mkDerivation, base, bytestring, cassava, hmatrix, vector }: mkDerivation { pname = "hmatrix-csv"; - version = "0.1.0.1"; - sha256 = "0xfh7gj4f5sb14j3m15mp9bddz90jk0g4qz0rjhfdwyd8k9k6hfp"; + version = "0.1.0.2"; + sha256 = "0cbnxzl9ymqnyrikwk13d660l3hmi4ln5zdx0q814k8b7hyvsnkb"; buildDepends = [ base bytestring cassava hmatrix vector ]; homepage = "https://github.com/grtlr/hmatrix-csv"; description = "CSV encoding and decoding for hmatrix"; @@ -63939,8 +64119,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "4.2.39"; - sha256 = "0n3sh13lhg9aip1390by0wfdfsrnqz61zgs6ji143ak7fdff1559"; + version = "4.2.40"; + sha256 = "11clwdqgsg38lw0jc382xkazlgm8lpa7d8sydgi14wkgwy4v9zqv"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -64430,19 +64610,19 @@ self: { }) {}; "hp2pretty" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, containers - , filepath, floatshow, mtl + ({ mkDerivation, array, attoparsec, base, containers, filepath + , floatshow, mtl, text }: mkDerivation { pname = "hp2pretty"; - version = "0.5"; - sha256 = "1kjfvp29s8wwdwpkqx47qpqy5ybl1ynx42idraarngcv8i9bzfgm"; + version = "0.6"; + sha256 = "1bma881ljhwhzirj2q9rqf0bxx9xfy0ng2z9mrhdnaywnw4d8v4c"; isLibrary = false; isExecutable = true; buildDepends = [ - array attoparsec base bytestring containers filepath floatshow mtl + array attoparsec base containers filepath floatshow mtl text ]; - homepage = "http://gitorious.org/hp2pretty"; + homepage = "http://code.mathr.co.uk/hp2pretty"; description = "generate pretty graphs from heap profiles"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -64640,8 +64820,8 @@ self: { }: mkDerivation { pname = "hplayground"; - version = "0.1.2.9"; - sha256 = "090j08ygfjsmhyfdg0azl0qwfm0i96yyk67xnwyv1as56r2pvn6r"; + version = "0.1.3.1"; + sha256 = "15yri40046lap05b762k4nk9nly8k6cbypic790zfmhj9ljjq1bv"; buildDepends = [ base containers data-default haste-compiler haste-perch monads-tf transformers @@ -65506,6 +65686,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) { xenctrl = null;}; + "hsass" = callPackage + ({ mkDerivation, base, data-default-class, filepath, hlibsass + , hspec, hspec-discover, monad-loops, mtl, temporary + }: + mkDerivation { + pname = "hsass"; + version = "0.1.0"; + sha256 = "1hl0lpjkzxhd4svkfvzl6p8gg32qvkggqdphz14fi11p34ksf41i"; + buildDepends = [ + base data-default-class filepath hlibsass monad-loops mtl + ]; + testDepends = [ + base data-default-class hspec hspec-discover temporary + ]; + jailbreak = true; + homepage = "https://github.com/jakubfijalkowski/hsass"; + description = "Integrating Sass into Haskell applications"; + license = stdenv.lib.licenses.mit; + }) {}; + "hsay" = callPackage ({ mkDerivation, base, Hclip, HTTP, process, unix }: mkDerivation { @@ -66434,8 +66634,8 @@ self: { ({ mkDerivation, base, haskeline }: mkDerivation { pname = "hsilop"; - version = "0.1.0.0"; - sha256 = "1yaghdyw94ynq5wg6qk5yswrwwf4vx6j7kpl43alym8dh754npw5"; + version = "0.1.1.0"; + sha256 = "001wwlwxd3qb3mcpn0l5qmd7nvpy8qlrcr5j3s5111pgfi8ib0sn"; isLibrary = false; isExecutable = true; buildDepends = [ base haskeline ]; @@ -66953,13 +67153,17 @@ self: { }) {}; "hspec-contrib" = callPackage - ({ mkDerivation, base, hspec, hspec-core, HUnit, QuickCheck }: + ({ mkDerivation, base, hspec, hspec-core, HUnit, logging-facade + , QuickCheck + }: mkDerivation { pname = "hspec-contrib"; - version = "0.2.0"; - sha256 = "0p6jh3j84cq66gfp2pk957ha4ds7797vfbfri9lsg9gd4998dwkq"; - buildDepends = [ base hspec-core HUnit ]; - testDepends = [ base hspec hspec-core HUnit QuickCheck ]; + version = "0.2.1"; + sha256 = "0m7h0bl34qp8yc5pdlk9hn3a9drd11qy7qkqx3lqh2kzr7wbffj0"; + buildDepends = [ base hspec-core HUnit logging-facade ]; + testDepends = [ + base hspec hspec-core HUnit logging-facade QuickCheck + ]; homepage = "http://hspec.github.io/"; description = "Contributed functionality for Hspec"; license = stdenv.lib.licenses.mit; @@ -67037,7 +67241,9 @@ self: { mkDerivation { pname = "hspec-expectations-lifted"; version = "0.5.0"; + revision = "1"; sha256 = "0c3fxgwxjwqgwpnlxlbp2amhk44m34iq2lxs1rxkp3vjwkqi2m8b"; + editedCabalFile = "43e88e0e7587ba1965ba3f2416500c239ad44ba19043bb249c6f307665e85208"; buildDepends = [ base hspec-expectations transformers ]; testDepends = [ base hspec ]; description = "A version of hspec-expectations generalized to MonadIO"; @@ -67166,20 +67372,20 @@ self: { "hspec-snap" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , digestive-functors, directory, HandsomeSoup, hspec, hspec-core - , hxt, lens, mtl, snap, snap-core, snap-extras, text, transformers + , hxt, lens, mtl, snap, snap-core, text, transformers }: mkDerivation { pname = "hspec-snap"; - version = "0.3.2.3"; - sha256 = "187j2fhiwv3v2rlh1h9jdxpywdms9n37yp3597dmsbq2kggzsigh"; + version = "0.3.2.4"; + sha256 = "1sp1shbkdfphaj207993qnyxjh4jd0vkwf7157v2hg8cny6qvnbf"; buildDepends = [ base bytestring containers digestive-functors HandsomeSoup hspec hspec-core hxt lens mtl snap snap-core text transformers ]; testDepends = [ aeson base bytestring containers digestive-functors directory - HandsomeSoup hspec hspec-core hxt lens mtl snap snap-core - snap-extras text transformers + HandsomeSoup hspec hspec-core hxt lens mtl snap snap-core text + transformers ]; jailbreak = true; homepage = "https://github.com/dbp/hspec-snap"; @@ -67999,6 +68205,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "html-entities" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, directory, doctest + , filepath, text, unordered-containers + }: + mkDerivation { + pname = "html-entities"; + version = "1.0.0.2"; + sha256 = "09djrc8ws8ijig8syanjj29b4fdgrf6cp7py3vx2x1gap4jg5zya"; + buildDepends = [ + attoparsec base-prelude text unordered-containers + ]; + testDepends = [ base base-prelude directory doctest filepath ]; + homepage = "https://github.com/nikita-volkov/html-entities"; + description = "An \"attoparsec\" parser and a decoder of HTML entities"; + license = stdenv.lib.licenses.mit; + }) {}; + "html-kure" = callPackage ({ mkDerivation, base, hxt, kure }: mkDerivation { @@ -68072,8 +68295,8 @@ self: { ({ mkDerivation, base, containers, text }: mkDerivation { pname = "html5-entity"; - version = "0.2.0.2"; - sha256 = "1vy47b9k71jjrrhgakq9hla67cf006fvj6ggqxq14b0a1bclfkf7"; + version = "0.2.0.3"; + sha256 = "0bmmzshxanzw5y2y0hvgzz9yw18jqgv535i1xq2a5lf7w8wpj1if"; isLibrary = true; isExecutable = true; buildDepends = [ base containers text ]; @@ -68242,8 +68465,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.4.11"; - sha256 = "0lzrvkja3na2s6r4ixgnj7fx8gjm02bxxs101d69d6s3b0n80phb"; + version = "0.4.11.1"; + sha256 = "122h9g6nk17nwxrwqwni75gfbc221s1jvjjlmq6sh9ksgsyh09b4"; buildDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive clock containers cookie data-default-class deepseq @@ -69566,10 +69789,8 @@ self: { ({ mkDerivation, base, hxt, mtl }: mkDerivation { pname = "hxt-pickle-utils"; - version = "0.1.0.2"; - revision = "1"; - sha256 = "06v4935lljcyyx4a5v0z4id3fz4v28aghsrzr94k6diibpnwcdz2"; - editedCabalFile = "89173b402c57c3ee7ee0eb2814e58d81e46cce5742a4f01684980b841359d2fb"; + version = "0.1.0.3"; + sha256 = "1id9459yphsbxqa0z89dhsmqqcgvk2axv91d05aw3n6r4ygs3nwx"; buildDepends = [ base hxt mtl ]; homepage = "https://github.com/silkapp/hxt-pickle-utils"; description = "Utility functions for using HXT picklers"; @@ -70345,16 +70566,19 @@ self: { }) {}; "ideas" = callPackage - ({ mkDerivation, array, base, cgi, containers, directory, filepath - , parsec, QuickCheck, random, time, uniplate, wl-pprint + ({ mkDerivation, array, base, bytestring, containers, Diff + , directory, exceptions, filepath, mtl, multipart, network + , old-locale, old-time, parsec, QuickCheck, random, time, uniplate + , wl-pprint, xhtml }: mkDerivation { pname = "ideas"; - version = "1.2"; - sha256 = "13mj1xa1bpr0bj9id00vcm6fnai7cf2289s6gs52rmkbnhkp998m"; + version = "1.3.1"; + sha256 = "1rwvnxih9lb8hw3wvnv377z78szdq80qsrspnxbdqf37kfdw3fx0"; buildDepends = [ - array base cgi containers directory filepath parsec QuickCheck - random time uniplate wl-pprint + array base bytestring containers Diff directory exceptions filepath + mtl multipart network old-locale old-time parsec QuickCheck random + time uniplate wl-pprint xhtml ]; jailbreak = true; homepage = "http://ideas.cs.uu.nl/www/"; @@ -70369,8 +70593,8 @@ self: { }: mkDerivation { pname = "ideas-math"; - version = "1.1"; - sha256 = "1wvxkav9c7d2na9wkzkl4pxhwihlw6iqdjga7gbjy7pmqn8xja51"; + version = "1.2"; + sha256 = "1s3pryjzc7dkmfdfrysag1w1j752y29cga4040a8fag10n9w7rr2"; isLibrary = false; isExecutable = true; buildDepends = [ base containers ideas parsec QuickCheck random ]; @@ -71495,8 +71719,8 @@ self: { }: mkDerivation { pname = "inflections"; - version = "0.1.0.9"; - sha256 = "10l7dnjc6h75bf61rp38w7pqm6yqvhssvjqmh01nwa2bxxayzl7m"; + version = "0.1.0.10"; + sha256 = "0v9iz9q4f5cx2hr0afvbzy5ax71kx1klbjrla14bqdfh55hzdhrp"; buildDepends = [ base containers parsec ]; testDepends = [ base containers HUnit parsec QuickCheck test-framework @@ -72145,7 +72369,7 @@ self: { }) {}; "io-streams" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, bytestring + ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder , deepseq, directory, filepath, HUnit, mtl, network, primitive , process, QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, text, time, transformers, vector @@ -72153,17 +72377,17 @@ self: { }: mkDerivation { pname = "io-streams"; - version = "1.2.1.2"; - sha256 = "03jwm9p4pmh6bra19lkgbkb08aghfylv4gjwg3mfcipw981dnzb8"; + version = "1.3.0.0"; + sha256 = "029qp0jfap6jczxdi2my1g4vcp8pr4zkxp64xfl7cyiigbapkimw"; buildDepends = [ - attoparsec base blaze-builder bytestring network primitive process - text time transformers vector zlib-bindings + attoparsec base bytestring bytestring-builder network primitive + process text time transformers vector zlib-bindings ]; testDepends = [ - attoparsec base blaze-builder bytestring deepseq directory filepath - HUnit mtl network primitive process QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 text time - transformers vector zlib zlib-bindings + attoparsec base bytestring bytestring-builder deepseq directory + filepath HUnit mtl network primitive process QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 text + time transformers vector zlib zlib-bindings ]; configureFlags = [ "-fnointeractivetests" ]; description = "Simple, composable, and easy-to-use stream I/O"; @@ -72467,6 +72691,17 @@ self: { license = "unknown"; }) {}; + "irc-colors" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "irc-colors"; + version = "0.1"; + sha256 = "1xl38bq1b6w7z8q0frra4h76lyk63bsy5i1qd34pdgwvikd2rkh0"; + buildDepends = [ base text ]; + description = "Colourize your IRC strings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "irc-conduit" = callPackage ({ mkDerivation, async, base, bytestring, conduit, conduit-extra , connection, irc, irc-ctcp, network-conduit-tls, text, time, tls @@ -73757,7 +73992,9 @@ self: { mkDerivation { pname = "jose-jwt"; version = "0.5"; + revision = "2"; sha256 = "0pk6fq3wsbl6pl79dcyns1c94xmv98acfr6rbxhyfqmc5lys759s"; + editedCabalFile = "e3f6e8d368c88a0be06d656e627e86b8ad481cf75578a97af2a5c29bf0bb55b6"; buildDepends = [ aeson base base64-bytestring byteable bytestring cereal cipher-aes containers crypto-cipher-types crypto-numbers crypto-pubkey @@ -74153,20 +74390,20 @@ self: { "json-schema" = callPackage ({ mkDerivation, aeson, aeson-utils, attoparsec, base, bytestring , containers, generic-aeson, generic-deriving, mtl, scientific - , tagged, tasty, tasty-hunit, tasty-th, text, time - , unordered-containers, vector + , tasty, tasty-hunit, tasty-th, text, time, unordered-containers + , vector }: mkDerivation { pname = "json-schema"; - version = "0.7.3.3"; - sha256 = "0645ji3dl0xilpkgpblz3kkp1yvzxxcm9qm205wk2xsn00mp864c"; + version = "0.7.3.4"; + sha256 = "0p9m706hl8phl12zb9inn6hkrgzxgd3k9lg2p1kav53j5mz17w0p"; buildDepends = [ aeson base containers generic-aeson generic-deriving mtl scientific - tagged text time unordered-containers vector + text time unordered-containers vector ]; testDepends = [ - aeson aeson-utils attoparsec base bytestring generic-aeson tagged - tasty tasty-hunit tasty-th text vector + aeson aeson-utils attoparsec base bytestring generic-aeson tasty + tasty-hunit tasty-th text vector ]; description = "Types and type classes for defining JSON schemas"; license = stdenv.lib.licenses.bsd3; @@ -74405,6 +74642,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "jumpthefive" = callPackage + ({ mkDerivation, base, parallel }: + mkDerivation { + pname = "jumpthefive"; + version = "0.0.1"; + sha256 = "0ymp7hkkla7jxn3c7prsrcdl0mzkpqdm6ivq599qwx39rcnq6dpl"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base parallel ]; + description = "an elementary symmetric chiffre for pragmatically protecting one's effects"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "jvm-parser" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , data-binary-ieee754, fgl, fingertree, pretty, zlib @@ -75080,8 +75330,8 @@ self: { }: mkDerivation { pname = "knots"; - version = "0.1.0.0"; - sha256 = "1kqcfabbk308ph9i04d6sz9hrh2lcmqp7aml7av9h15hdhq77nf2"; + version = "0.1.0.1"; + sha256 = "1yv26gnf8aipjh6d6apszbx4jwvfa7cafnjz0frw73xagnd1z084"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -76943,6 +77193,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ldap-client" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring + , connection, containers, hspec, network, process, semigroups, stm + , text + }: + mkDerivation { + pname = "ldap-client"; + version = "0.1.0"; + sha256 = "18c33jfgwa7vdickxshyhmrqdpndy7ayjd3z0zqkjqa7awd0zcf4"; + buildDepends = [ + asn1-encoding asn1-types async base bytestring connection + containers network semigroups stm text + ]; + testDepends = [ base bytestring hspec process semigroups ]; + homepage = "https://supki.github.io/ldap-client"; + description = "Pure Haskell LDAP Client Library"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "ldif" = callPackage ({ mkDerivation, base, bytestring, cmdargs, containers, directory , filepath, HUnit, parsec, rosezipper @@ -77168,6 +77437,24 @@ self: { license = "GPL"; }) {}; + "lendingclub" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, HsOpenSSL + , http-streams, io-streams, mtl, scientific, text, vector + }: + mkDerivation { + pname = "lendingclub"; + version = "0.1.1"; + sha256 = "1r40qm7f45vgzdxnzlhpqhsi81rbwa2nss3gf1d5mqz32dscjwfx"; + buildDepends = [ + aeson base blaze-builder bytestring HsOpenSSL http-streams + io-streams mtl scientific text vector + ]; + jailbreak = true; + homepage = "https://www.lendingclub.com/developers/lc-api.action"; + description = "Bindings for the LendingClub marketplace API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lens_4_7_0_1" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, comonad , containers, contravariant, deepseq, directory, distributive @@ -77182,9 +77469,9 @@ self: { mkDerivation { pname = "lens"; version = "4.7.0.1"; - revision = "2"; + revision = "3"; sha256 = "1j9d7g4sj38zq2r8vhy05b2kbxx1sg2k0b3yx05lbxlb79wcm1j1"; - editedCabalFile = "fd79ae606fe461d82d0eca185ade4ba04200b4afbf65348a59ffc600a5b7dc03"; + editedCabalFile = "6ac87d4c8600c9497c965d54b1e97f10d0073bed3c45381b78d1ba4b81da57c8"; buildDepends = [ array base bifunctors bytestring comonad containers contravariant distributive exceptions filepath free ghc-prim hashable mtl @@ -77500,8 +77787,8 @@ self: { }: mkDerivation { pname = "lexer-applicative"; - version = "1.0.0.1"; - sha256 = "14srsxw3xyhllmxlxkfid1njay5dca4zy488sa1lmsffrfdkp20z"; + version = "1.1"; + sha256 = "1yl4404w5pmmpa1l7j4zlm5lg24jglxff04qdc757bd1r0bklbw1"; buildDepends = [ base regex-applicative srcloc ]; testDepends = [ base deepseq regex-applicative srcloc tasty tasty-hunit @@ -78504,12 +78791,11 @@ self: { }: mkDerivation { pname = "linear-opengl"; - version = "0.2.0.7"; - sha256 = "0yj98757d6z1bh3mqajn58ax2iaxnf2nl68wvbjv2pncwfn679m6"; + version = "0.2.0.8"; + sha256 = "18yy35pcl4jg0albh9dhngi7q4ak40fzr6ypa2piz2di4zqhfqp6"; buildDepends = [ base distributive lens linear OpenGL OpenGLRaw tagged ]; - jailbreak = true; homepage = "http://www.github.com/bgamari/linear-opengl"; description = "Isomorphisms between linear and OpenGL types"; license = stdenv.lib.licenses.bsd3; @@ -79387,8 +79673,8 @@ self: { }: mkDerivation { pname = "llvm-general"; - version = "3.4.5.2"; - sha256 = "1n6c1dna2lw3z36y6pnx15qsqwdmdd0cki0snh4yhbfjvcz5lack"; + version = "3.4.5.3"; + sha256 = "03rps9ga20cdqfh2khqnahwrkljs714ac7yx9x7krb3dngf83zsm"; buildDepends = [ array base bytestring containers llvm-general-pure mtl parsec setenv template-haskell transformers transformers-compat @@ -79413,8 +79699,8 @@ self: { }: mkDerivation { pname = "llvm-general-pure"; - version = "3.4.5.2"; - sha256 = "1ybrn3y10nz69jsmhhzv652skyd4d4xb6b89zlc4n5xvrpxxg36j"; + version = "3.4.5.3"; + sha256 = "1b3zh2y3b3jj5sg6421wv2qsrhyjs23qdzrk693r7mpj10rd258k"; buildDepends = [ base containers mtl parsec setenv template-haskell transformers transformers-compat @@ -79875,21 +80161,22 @@ self: { }) {}; "logic-classes" = callPackage - ({ mkDerivation, applicative-extras, base, containers, fgl, HUnit - , mtl, pretty, PropLogic, safecopy, set-extra, syb, syb-with-class - , template-haskell, text + ({ mkDerivation, applicative-extras, base, containers, HUnit, mtl + , pretty, PropLogic, safecopy, set-extra, syb, template-haskell }: mkDerivation { pname = "logic-classes"; - version = "1.5"; - sha256 = "12rdq38wga5d4d2mw21rmdmgjg7vqhap0zl2f5wzn79hl7814rwz"; - isLibrary = true; - isExecutable = true; + version = "1.5.1"; + sha256 = "06bywqjx7xrfv5d4kc3qhcb017zj7709cn8fvrqvs9a014yazdid"; buildDepends = [ - applicative-extras base containers fgl HUnit mtl pretty PropLogic - safecopy set-extra syb syb-with-class template-haskell text + applicative-extras base containers HUnit mtl pretty PropLogic + safecopy set-extra syb template-haskell ]; - homepage = "http://src.seereason.com/logic-classes"; + testDepends = [ + applicative-extras base containers HUnit mtl pretty PropLogic + set-extra syb + ]; + homepage = "https://github.com/seereason/logic-classes"; description = "Framework for propositional and first order logic, theorem proving"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -82855,8 +83142,8 @@ self: { }: mkDerivation { pname = "midi"; - version = "0.2.1.3"; - sha256 = "0mqf6q7686zdxljkz3bqa2zhkgirqz5c1fkbd3n4wyipzhjc773a"; + version = "0.2.1.4"; + sha256 = "1afi6vam6cbpgfabypxdyilz4jc8q5kx2199vfxvgjjzsr33arfz"; buildDepends = [ base binary bytestring event-list explicit-exception monoid-transformer non-negative QuickCheck random transformers @@ -85675,6 +85962,7 @@ self: { attoparsec base base58-bytestring base64-bytestring byteable bytestring cryptohash hex io-streams optparse-applicative ]; + jailbreak = true; homepage = "https://github.com/LukeHoersten/multihash"; description = "Multihash library and CLI executable"; license = stdenv.lib.licenses.bsd3; @@ -86315,18 +86603,17 @@ self: { }) {}; "mvc" = callPackage - ({ mkDerivation, async, base, contravariant, managed, mmorph, pipes - , pipes-concurrency, transformers + ({ mkDerivation, async, base, contravariant, foldl, managed, mmorph + , pipes, pipes-concurrency, transformers }: mkDerivation { pname = "mvc"; - version = "1.0.3"; - sha256 = "1b1342qxyn2jxb3a5c9bp6ai7iwhbjxgfpbh2kjm7v75444lx78g"; + version = "1.0.4"; + sha256 = "0mbbcjcvd05ql76ys5fmsr57aif1bysasz91rvmp795a9wj3i83i"; buildDepends = [ - async base contravariant managed mmorph pipes pipes-concurrency - transformers + async base contravariant foldl managed mmorph pipes + pipes-concurrency transformers ]; - jailbreak = true; description = "Model-view-controller"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -87162,18 +87449,46 @@ self: { }: mkDerivation { pname = "nero"; - version = "0.2"; - sha256 = "1jw8sji0ci4za62zgjdlxsh9rknaj3pdm7p32rxdd33i6ir6pmh0"; + version = "0.3"; + sha256 = "11c3aghnfj8grvaxy32qnp77dp7q9mi6l7hwb9dl032qmdfwnrj1"; buildDepends = [ base bifunctors bytestring containers lens text ]; testDepends = [ base bytestring doctest Glob lens tasty tasty-hunit text ]; - homepage = "https://github.com/jdnavarro/nero"; + homepage = "https://github.com/plutonbrb/nero"; description = "Lens-based HTTP toolkit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "nero-wai" = callPackage + ({ mkDerivation, base, bytestring, http-types, lens, nero, text + , wai, wai-extra + }: + mkDerivation { + pname = "nero-wai"; + version = "0.3"; + sha256 = "1jz2was51lfqiq1krrjljy7yl2z49nlj72x9dspc748dznizb8aw"; + buildDepends = [ + base bytestring http-types lens nero text wai wai-extra + ]; + homepage = "https://github.com/plutonbrb/nero-wai"; + description = "WAI adapter for Nero server applications"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "nero-warp" = callPackage + ({ mkDerivation, base, nero, nero-wai, warp }: + mkDerivation { + pname = "nero-warp"; + version = "0.3"; + sha256 = "1ddr0hs9x7r74f5bb00fbi0z87cfkxp21m5ikp5qgyblqb09940s"; + buildDepends = [ base nero nero-wai warp ]; + homepage = "https://github.com/plutonbrb/nero-warp"; + description = "Run Nero server applications with Warp"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "nested-routes" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring, containers , hspec, http-types, lucid, mtl, pseudo-trie, QuickCheck @@ -87182,8 +87497,8 @@ self: { }: mkDerivation { pname = "nested-routes"; - version = "0.1"; - sha256 = "0fz6lshm79iy62bxgg22bgrn8irgfalp5a3dllzlhbci8q5xs02k"; + version = "0.1.1"; + sha256 = "191pa0kc17sfi692yf6dy26ayfmy84v2053wqaw6zi2qwra0vy8f"; buildDepends = [ aeson base blaze-html bytestring containers http-types lucid mtl pseudo-trie semigroups text transformers wai wai-extra @@ -88036,8 +88351,8 @@ self: { }: mkDerivation { pname = "network-simple-sockaddr"; - version = "0.1"; - sha256 = "0k54scgxwgj57vqpfshr0cr6a70nsfhrfvfjh77x17imk1795npw"; + version = "0.2"; + sha256 = "0c7jjdpzvbpg29njr1w0kn26m3pxa8q1z3sh7bfh933spnvqm52x"; buildDepends = [ base bytestring directory exceptions network transformers ]; @@ -88697,8 +89012,8 @@ self: { }: mkDerivation { pname = "nonce"; - version = "1.0.1"; - sha256 = "10vlm550m0hjl004rwcz70j1d89sd9g0fnxxxksvk8nxqf9fnfpr"; + version = "1.0.2"; + sha256 = "1l4w6bdrwa42r90n6xzwr8lz2fdrn3m763ls311pnygajr4ih10h"; buildDepends = [ base base64-bytestring bytestring cprng-aes crypto-random text transformers @@ -88832,11 +89147,10 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "notcpp"; - version = "0.2.0.2"; - sha256 = "1qdqwwy16n43djgrynzn8xv64vv450my6z2xddypafxwhvp7jaqy"; + version = "0.2.0.3"; + sha256 = "15aa96zdz60x9wc9k8ad5qkc4bs5rbgm9xvsykf3ppyys2z449ca"; buildDepends = [ base template-haskell ]; testDepends = [ base template-haskell ]; - jailbreak = true; description = "Avoiding the C preprocessor via cunning use of Template Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -89776,12 +90090,12 @@ self: { }) {}; "open-typerep" = callPackage - ({ mkDerivation, base, constraints, syntactic, tagged }: + ({ mkDerivation, base, constraints, mtl, syntactic, tagged }: mkDerivation { pname = "open-typerep"; - version = "0.2"; - sha256 = "0z1bp7hansv2zzvwq3n8yqln9pi9vlby5s9mlb7v8wrj99w563lp"; - buildDepends = [ base constraints syntactic tagged ]; + version = "0.3.1"; + sha256 = "1wx3rh7fzq5d4g45k4fjwv0yh5grcqpvzlf2ixkni20d9rhb0yzs"; + buildDepends = [ base constraints mtl syntactic tagged ]; testDepends = [ base ]; homepage = "https://github.com/emilaxelsson/open-typerep"; description = "Open type representations and dynamic types"; @@ -90316,6 +90630,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "optparse-simple" = callPackage + ({ mkDerivation, base, either, gitrev, optparse-applicative + , template-haskell, transformers + }: + mkDerivation { + pname = "optparse-simple"; + version = "0.0.0"; + sha256 = "1kwf5xah5r9crjy63fmvzv22if5k9jpppg2gidy7370knrpvbnfj"; + buildDepends = [ + base either gitrev optparse-applicative template-haskell + transformers + ]; + description = "Simple interface to optparse-applicative"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "orc" = callPackage ({ mkDerivation, base, deepseq, monadIO, mtl, process, random, stm }: @@ -90494,8 +90824,8 @@ self: { }: mkDerivation { pname = "orgmode-parse"; - version = "0.1.0"; - sha256 = "1n1azp4ymsc9z89x39ycxx45hax8h2pqyr18q9sc88rawr31k4f8"; + version = "0.1.0.4"; + sha256 = "098zl8nyph459zyla0y2mkqiy78zp74yzadrnwa6xv07i5zs125h"; buildDepends = [ aeson attoparsec base bytestring containers free hashable old-locale text thyme unordered-containers @@ -90504,8 +90834,7 @@ self: { aeson attoparsec base bytestring containers hashable HUnit old-locale tasty tasty-hunit text thyme unordered-containers ]; - jailbreak = true; - description = "A parser and writer for org-mode flavored documents"; + description = "A collection of Attoparsec combinators for parsing org-mode flavored documents"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -90716,8 +91045,8 @@ self: { }: mkDerivation { pname = "packed-dawg"; - version = "0.2.0.4"; - sha256 = "0lvn1kj5mqy22lkm3h5yhsqw83kv6nwdwm6yvgia3xr0c8nnvx4c"; + version = "0.2.0.5"; + sha256 = "1b8lhigpzj1zvah6f4ra7pczhpm8dxcwaqna8p1ifbbx2ys6x59p"; buildDepends = [ base binary deepseq mtl unordered-containers vector vector-binary-instances @@ -90861,8 +91190,8 @@ self: { ({ mkDerivation, array, base, colour, containers }: mkDerivation { pname = "palette"; - version = "0.1.0.1"; - sha256 = "0065b83qrmlqrm96399p3hqqd5psmvxawhwqnwkjm7gid4qgiaha"; + version = "0.1.0.2"; + sha256 = "1snhn4mz58ax5sd77kh1m4jicwdmlrf89j612rkz5bkavvks6rrr"; buildDepends = [ array base colour containers ]; homepage = "http://projects.haskell.org/diagrams"; description = "Utilities for choosing and creating color schemes"; @@ -90933,9 +91262,9 @@ self: { mkDerivation { pname = "pandoc"; version = "1.13.2"; - revision = "2"; + revision = "3"; sha256 = "12kd71g70d1wzz19p5yq7f00hw8d4ra8ghn83g7yzsal8igl8p76"; - editedCabalFile = "1b9479a2579d76c43089283b6fb7a060e16050fd62fe0da896a722db815671d6"; + editedCabalFile = "23325052ac34c80bbb51c2f5b73ae474d684d2be3fdea83db875a105f2ffbf87"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -91619,8 +91948,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "partial-handler"; - version = "0.1.0"; - sha256 = "07dhsm2r89iviz481r9wxw0scq40dgfzw0mi6klky78xn8r9x4ds"; + version = "1.0.0.0"; + sha256 = "1fmfiw38v77anh20xh5zzqxm2dcryyyismsagn09sc27jdgnnrzl"; buildDepends = [ base ]; homepage = "https://github.com/nikita-volkov/partial-handler"; description = "A composable exception handler"; @@ -91791,6 +92120,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pathfinding" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "pathfinding"; + version = "0.1.0.0"; + sha256 = "1d1vpkx4gl438b71mni80n46yrhz57z2hq2p9j2fkkpxj3k72y80"; + buildDepends = [ base containers ]; + homepage = "https://github.com/rvion/pathfinding"; + description = "pathfinding in grid and graphs"; + license = stdenv.lib.licenses.mit; + }) {}; + "pathfindingcore" = callPackage ({ mkDerivation, array, base, HUnit, split, tasty, tasty-hunit }: mkDerivation { @@ -92227,12 +92568,15 @@ self: { "pdfinfo" = callPackage ({ mkDerivation, base, mtl, old-locale, process-extras, text, time + , time-locale-compat }: mkDerivation { pname = "pdfinfo"; - version = "1.5.2"; - sha256 = "1s2hhmcqsg57fppqjvrkp77bms1npblysjvfl37fgn0jafn0mhjq"; - buildDepends = [ base mtl old-locale process-extras text time ]; + version = "1.5.4"; + sha256 = "04894cwvcn910j2b0j95dc6i9v6xriqa0v97z3vyi9dhi9yiysls"; + buildDepends = [ + base mtl old-locale process-extras text time time-locale-compat + ]; homepage = "https://github.com/chrisdone/pdfinfo"; description = "Wrapper around the pdfinfo command"; license = stdenv.lib.licenses.bsd3; @@ -93281,6 +93625,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pia-forward" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, directory + , filepath, http-client, http-client-tls, network-info, process + , random, text, text-format, time, xdg-basedir + }: + mkDerivation { + pname = "pia-forward"; + version = "0.1.0.1"; + sha256 = "02ryfiibkbfx6zg1n0h8kvb4mkiai57cvllqcwp815x50rsrpd2r"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + aeson base bytestring data-default directory filepath http-client + http-client-tls network-info process random text text-format time + xdg-basedir + ]; + jailbreak = true; + homepage = "https://github.com/enolan/pia-forward"; + description = "Set up port forwarding with the Private Internet Access VPN service"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "pianola" = callPackage ({ mkDerivation, attoparsec, attoparsec-iteratee, base, bytestring , comonad, comonad-transformers, containers, either, errors @@ -93628,8 +93994,8 @@ self: { ({ mkDerivation, base, errors, pipes }: mkDerivation { pname = "pipes-errors"; - version = "0.2"; - sha256 = "1lnb8pgp4a8rcsnz2kc34zzpbf781vw7cvphs7birsnb2r2w6waw"; + version = "0.2.1"; + sha256 = "08i3rzqz7r5vkjfry0bdw3gpxjzhni8xmwwa6p8hdkixznjq7539"; buildDepends = [ base errors pipes ]; homepage = "https://github.com/jdnavarro/pipes-errors"; description = "Integration between pipes and errors"; @@ -93756,8 +94122,8 @@ self: { }: mkDerivation { pname = "pipes-p2p"; - version = "0.3"; - sha256 = "0iig35b2m30dqc0f9p9n3cfz2f21ac2rkqw6cvaydfvh31vbh4iw"; + version = "0.4"; + sha256 = "1ls89dnz0aibmyy4mky7jl4ibirpfrs12yxmflarghv3j6rn0wnc"; buildDepends = [ async base binary bytestring errors exceptions mtl network network-simple-sockaddr pipes pipes-concurrency pipes-network @@ -94424,9 +94790,9 @@ self: { }: mkDerivation { pname = "pointfree"; - version = "1.0.4.8"; - sha256 = "0nb3mqp6zwnnq6fs27xhcqv4w8h6sr5k01hldkqnkgwz0yyy7ljy"; - isLibrary = false; + version = "1.1"; + sha256 = "0lkwan8vi86jl72wfpdi0saac6rbx8z270r2nf3vp0468dqk25cf"; + isLibrary = true; isExecutable = true; buildDepends = [ array base containers haskell-src-exts transformers @@ -94743,34 +95109,37 @@ self: { "pontarius-xmpp" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring, binary - , bytestring, Cabal, conduit, containers, crypto-api, crypto-random - , cryptohash, cryptohash-cryptoapi, data-default, derive, directory - , dns, doctest, filepath, hslogger, hspec, hspec-expectations - , iproute, lens, lifted-base, mtl, network, pureMD5, QuickCheck + , bytestring, Cabal, conduit, configurator, containers, crypto-api + , crypto-random, cryptohash, cryptohash-cryptoapi, data-default + , derive, directory, dns, doctest, exceptions, filepath, hslogger + , hspec, hspec-expectations, HUnit, iproute, lens, lens-family + , lifted-base, mtl, network, profunctors, pureMD5, QuickCheck , quickcheck-instances, random, ranges, resourcet, smallcheck , split, stm, stringprep, tasty, tasty-hspec, tasty-hunit , tasty-quickcheck, tasty-th, template-haskell, text, tls - , transformers, unbounded-delays, void, xml-conduit, xml-picklers - , xml-types + , transformers, unbounded-delays, void, x509-system, xml-conduit + , xml-picklers, xml-types }: mkDerivation { pname = "pontarius-xmpp"; - version = "0.4.0.2"; - sha256 = "0s633z93qw1k0rs5bx85slmk40rlzlacr2fyxfp5qs3b74k93m7d"; + version = "0.4.1.0"; + sha256 = "183c69v3540gm54clxd2kizrhsiy4xwdjgaakpqkvlk47s4rj89i"; buildDepends = [ attoparsec base base64-bytestring binary bytestring conduit containers crypto-api crypto-random cryptohash cryptohash-cryptoapi - data-default dns hslogger iproute lifted-base mtl network pureMD5 - random resourcet split stm stringprep template-haskell text tls - transformers unbounded-delays void xml-conduit xml-picklers + data-default dns exceptions hslogger iproute lens-family + lifted-base mtl network profunctors pureMD5 random resourcet split + stm stringprep template-haskell text tls transformers + unbounded-delays void x509-system xml-conduit xml-picklers xml-types ]; testDepends = [ - async base Cabal conduit containers data-default derive directory - doctest filepath hslogger hspec hspec-expectations lens network - QuickCheck quickcheck-instances ranges smallcheck stm stringprep - tasty tasty-hspec tasty-hunit tasty-quickcheck tasty-th text - transformers xml-picklers xml-types + async base Cabal conduit configurator containers data-default + derive directory doctest filepath hslogger hspec hspec-expectations + HUnit lens mtl network QuickCheck quickcheck-instances ranges + smallcheck stm stringprep tasty tasty-hspec tasty-hunit + tasty-quickcheck tasty-th text tls transformers xml-picklers + xml-types ]; jailbreak = true; homepage = "https://github.com/pontarius/pontarius-xmpp/"; @@ -94845,14 +95214,19 @@ self: { }) {}; "pooled-io" = callPackage - ({ mkDerivation, base, deepseq, transformers, unsafe, utility-ht }: + ({ mkDerivation, base, concurrent-split, containers, deepseq + , transformers, unsafe, utility-ht + }: mkDerivation { pname = "pooled-io"; - version = "0.0.0.1"; - sha256 = "1phk5mqyyjvlrf3fknhzrwzjmx3inwrs8hs328p8jpwwig8zfpv7"; + version = "0.0.2"; + sha256 = "0v7l0jvk2acqslb1inw6lgwbjraj73s396r160hw56slqxh5sgxl"; isLibrary = true; isExecutable = true; - buildDepends = [ base deepseq transformers unsafe utility-ht ]; + buildDepends = [ + base concurrent-split containers deepseq transformers unsafe + utility-ht + ]; homepage = "http://code.haskell.org/~thielema/pooled-io/"; description = "Run jobs on a limited number of threads and support data dependencies"; license = stdenv.lib.licenses.bsd3; @@ -96325,8 +96699,8 @@ self: { }: mkDerivation { pname = "process-streaming"; - version = "0.7.1.0"; - sha256 = "07f3qykiqf3a2al2dj72fm2mlpl263vgvb4n3m9a32lf7mw6243d"; + version = "0.7.2.0"; + sha256 = "1wlrinx5v0k26jdkmbb8k313p3nyjrn2r9nag3hryl1wfdkbr1bl"; buildDepends = [ base bifunctors bytestring conceit containers contravariant foldl free pipes pipes-bytestring pipes-concurrency pipes-parse @@ -96441,10 +96815,10 @@ self: { }: mkDerivation { pname = "product-profunctors"; - version = "0.6"; - revision = "4"; - sha256 = "1qhl2v0shzip5yh7x7b6k7xsnd4d5spf1f69h0qr0l57lm6jywl4"; - editedCabalFile = "84407dc2bb4ba0fab1d21463e367149586a67758f2f6bba8eaa86b0cb1f07ac0"; + version = "0.6.1"; + revision = "1"; + sha256 = "0phwjngndgsggw2f74k6q43cnnw5w4nvfrfrmkwyz6hgah2zv562"; + editedCabalFile = "98cd3c6ac3f78d4097bd1b8c7c1782b85bd05497938ce86d70cb0eb27b09359c"; buildDepends = [ base contravariant profunctors template-haskell ]; testDepends = [ base profunctors ]; homepage = "https://github.com/tomjaguarpaw/product-profunctors"; @@ -96807,6 +97181,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "prosper" = callPackage + ({ mkDerivation, aeson, base, bytestring, cereal, containers + , HsOpenSSL, http-streams, io-streams, mtl, text, transformers + , vector + }: + mkDerivation { + pname = "prosper"; + version = "0.1.1"; + sha256 = "006h3i316s85f3d6qmwm9kajbxil1xcnqp11jfvv5ypnx2gdyhgb"; + buildDepends = [ + aeson base bytestring cereal containers HsOpenSSL http-streams + io-streams mtl text transformers vector + ]; + jailbreak = true; + homepage = "https://api.prosper.com"; + description = "Bindings to the Prosper marketplace API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "proteaaudio" = callPackage ({ mkDerivation, alsaLib, base, c2hs }: mkDerivation { @@ -96982,8 +97375,8 @@ self: { ({ mkDerivation, base, semigroups }: mkDerivation { pname = "pseudo-trie"; - version = "0.0.4.2"; - sha256 = "0b09qxgxv86wmcsns2rl00pna0a3jfngddyzk9dfjk1xjaq8cb59"; + version = "0.0.4.3"; + sha256 = "020jkgr6h1f4z14xbrl6zsqjqflkps03lh5102742bfsd58d9hvb"; buildDepends = [ base semigroups ]; description = "A tagged rose-tree with short circuited unique leaves"; license = stdenv.lib.licenses.bsd3; @@ -99144,8 +99537,8 @@ self: { }: mkDerivation { pname = "reactive-banana"; - version = "0.8.1.0"; - sha256 = "166bw6lr3jd0m7b9hfr45lwyvyrggkz0xqh6ybqwvcpmc5h99dcg"; + version = "0.8.1.1"; + sha256 = "1fgfcpn5zapygixygz69cfmqg872ixa3nlakvgj5dd53qgkzq9s7"; buildDepends = [ base containers hashable pqueue transformers unordered-containers vault @@ -99154,7 +99547,7 @@ self: { base containers hashable HUnit pqueue test-framework test-framework-hunit transformers unordered-containers vault ]; - homepage = "http://haskell.org/haskellwiki/Reactive-banana"; + homepage = "http://wiki.haskell.org/Reactive-banana"; description = "Library for functional reactive programming (FRP)"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -99842,8 +100235,8 @@ self: { }: mkDerivation { pname = "reflex"; - version = "0.1.0"; - sha256 = "1l64kz1haicq4qfw5nrn93jrv37c93zz6z0xkhjnm5rxff7qrdns"; + version = "0.1.1"; + sha256 = "071pv72l1iynl8jmnjdx121f1pzp1pj4kr1jcbmzx4v60zhfwpns"; buildDepends = [ base containers dependent-map dependent-sum mtl primitive semigroups template-haskell these @@ -100891,8 +101284,8 @@ self: { ({ mkDerivation, base, libdevil, repa, transformers }: mkDerivation { pname = "repa-devil"; - version = "0.3.2.2"; - sha256 = "0p46ni9z8wymyk4qmcy04kwycxb31yyprd8ddxsxpjilhbw848lh"; + version = "0.3.2.6"; + sha256 = "0f7xawg4qlfbf24lrjbpqzl3f3zf63f8g5b2gi17h0rpyw3cxhzy"; buildDepends = [ base repa transformers ]; extraLibraries = [ libdevil ]; homepage = "https://github.com/RaphaelJ/repa-devil"; @@ -101079,16 +101472,17 @@ self: { "repl-toolkit" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, directory , exceptions, functor-monadic, ListLike, listsafe, monad-loops, mtl - , numericpeano, parsec, system-filepath, text, transformers + , numericpeano, parsec, semigroupoids, system-filepath, text + , transformers }: mkDerivation { pname = "repl-toolkit"; - version = "0.3.1.0"; - sha256 = "1bf2cigrn0frxprp8lgd78pv0ahk4zln9qyv15pwhmirvbbppgvn"; + version = "0.4.0.0"; + sha256 = "1r4gyj3jjm9sv597zlksckg5cl9r2k633hz5avzczf92b0j4ikr3"; buildDepends = [ aeson base bytestring data-default directory exceptions functor-monadic ListLike listsafe monad-loops mtl numericpeano - parsec system-filepath text transformers + parsec semigroupoids system-filepath text transformers ]; jailbreak = true; homepage = "https://github.com/ombocomp/repl-toolkit"; @@ -101906,13 +102300,13 @@ self: { }) {}; "rfc3339" = callPackage - ({ mkDerivation, base, old-locale, time }: + ({ mkDerivation, base, timerep }: mkDerivation { pname = "rfc3339"; - version = "1.0.4"; - sha256 = "0vrcfmkfikszcalcpa59rzwrjk2dlbwrqgpy2jx0z4kbiaalbg6j"; - buildDepends = [ base old-locale time ]; - description = "Parse and display time according to RFC3339"; + version = "1.0.5"; + sha256 = "1p3nahcmsikrc5maf7qz45042h80m6xszx70154yq169rsqkvav0"; + buildDepends = [ base timerep ]; + description = "Parse and display time according to RFC3339 (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -102405,14 +102799,15 @@ self: { }: mkDerivation { pname = "rosa"; - version = "0.1.3.0"; - sha256 = "1wyjcmr3a7lljksiq45ch3ng15dd7sk40bbb2l8yvvjgyk12990a"; + version = "0.2.0.0"; + sha256 = "198xzbzkalg7xlngrl52mh1iinipk6b00gnhmh6fnjrj1s61nqq6"; isLibrary = false; isExecutable = true; buildDepends = [ aeson argparser base bytestring lens process text unordered-containers vector wreq ]; + jailbreak = true; description = "Query the namecoin blockchain"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -103737,19 +104132,20 @@ self: { }) {}; "sbv" = callPackage - ({ mkDerivation, array, async, base, containers, deepseq, directory - , filepath, HUnit, mtl, old-time, pretty, process, QuickCheck - , random, syb + ({ mkDerivation, array, async, base, containers, crackNum + , data-binary-ieee754, deepseq, directory, filepath, HUnit, mtl + , old-time, pretty, process, QuickCheck, random, syb }: mkDerivation { pname = "sbv"; - version = "4.2"; - sha256 = "1q62fa2wi8sxkbx93qpxqr6sivs5q028kdbs35j3ym9mb3pa8y8q"; + version = "4.4"; + sha256 = "1914695yxyd3ag1z56dd88kz0p0zvl63255psd4bilzvdwlys6ls"; isLibrary = true; isExecutable = true; buildDepends = [ - array async base containers deepseq directory filepath HUnit mtl - old-time pretty process QuickCheck random syb + array async base containers crackNum data-binary-ieee754 deepseq + directory filepath HUnit mtl old-time pretty process QuickCheck + random syb ]; testDepends = [ base directory filepath HUnit syb ]; homepage = "http://leventerkok.github.com/sbv/"; @@ -104748,22 +105144,23 @@ self: { "second-transfer" = callPackage ({ mkDerivation, base, base16-bytestring, binary, bytestring - , conduit, containers, hashable, hashtables, hslogger, http2, lens - , network, network-uri, openssl, text, transformers + , conduit, containers, exceptions, hashable, hashtables, hslogger + , http2, HUnit, lens, network, network-uri, openssl, text + , transformers }: mkDerivation { pname = "second-transfer"; - version = "0.1.0.0"; - sha256 = "0y6wjni3sj0mkjwc6mbx9majc91aw51vwyqki603dggjfbp78b0x"; + version = "0.2.0.0"; + sha256 = "0lgb938i3f4yb4j5dxa4j4vn7wckl7kjhz0qd8yx1hpzi9k3y70g"; buildDepends = [ base base16-bytestring binary bytestring conduit containers - hashable hashtables hslogger http2 lens network network-uri text - transformers + exceptions hashable hashtables hslogger http2 lens network + network-uri text transformers ]; - testDepends = [ base conduit ]; + testDepends = [ base bytestring conduit http2 HUnit lens ]; extraLibraries = [ openssl ]; jailbreak = true; - homepage = "www.zunzun.se"; + homepage = "https://github.com/alcidesv/second-transfer"; description = "Second Transfer HTTP/2 web server"; license = stdenv.lib.licenses.bsd3; }) { inherit (pkgs) openssl;}; @@ -105269,6 +105666,7 @@ self: { version = "0.3.2"; sha256 = "0v2d5125zyldr7f50zdhvgm1wcp7zbrnas9i2chqsq3s17qkrkm5"; buildDepends = [ base io-streams seqid ]; + jailbreak = true; description = "Sequence ID IO-Streams"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -107489,9 +107887,10 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "simtreelo"; - version = "0.1.0.2"; - sha256 = "0r985v4159hnz371g1fxvn6x3x91c0xyymjnfnj2iaya5nmds6qp"; + version = "0.1.0.3"; + sha256 = "1s8j2kim3h7rybi52qhdf40smamclhg1il81y2kn1sq6sx220spd"; buildDepends = [ base containers ]; + jailbreak = true; description = "Loader for data organized in a tree"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -107670,10 +108069,8 @@ self: { }: mkDerivation { pname = "skein"; - version = "1.0.9.2"; - revision = "1"; - sha256 = "1j8bhqm25r9vd4qb4v12g32r0dv6xyhk48cq287wfbzjraayi1gw"; - editedCabalFile = "824638ce2aaf27614e10fe56fe886e486969fb9483e722a025b38fff3fb099ab"; + version = "1.0.9.3"; + sha256 = "0k7ibm4ykvypz6dm6jgqx0aj7qlg34cg841vipyjkbykp8nv3fn7"; buildDepends = [ base bytestring cereal crypto-api tagged ]; testDepends = [ base bytestring cereal crypto-api filepath hspec tagged @@ -107804,8 +108201,8 @@ self: { }: mkDerivation { pname = "slave-thread"; - version = "0.1.5"; - sha256 = "0qw4c6406hbdnv6i55sh8ps8739szm7rnqjzk6ynm7dfbf3vxhw4"; + version = "1.0.0.0"; + sha256 = "0snk0v126a79q2blddbznz50l89jfap4y4xs9i76pk0b0dcik319"; buildDepends = [ base base-prelude list-t mmorph partial-handler stm-containers transformers @@ -108687,7 +109084,9 @@ self: { mkDerivation { pname = "snaplet-fay"; version = "0.3.3.11"; + revision = "1"; sha256 = "18g61qivc49g37zmb4qv2piwlgs572fmngdpsjdhjmrgqn049fjr"; + editedCabalFile = "754ad06e1c8e6fd26f362bdc3f83f0863e7f2e941ffcf8b753310aee2c1aad26"; buildDepends = [ aeson base bytestring configurator directory fay filepath mtl snap snap-core transformers @@ -109532,8 +109931,8 @@ self: { }: mkDerivation { pname = "socket-io"; - version = "1.3.0"; - sha256 = "10zza904qrbj65bgi5n0mcf41s7imwfc0qrq7cykb5la7anb2k4q"; + version = "1.3.1"; + sha256 = "0ylb05lcgprvfdvhc71dqhh9azsp12vwx8zihdvcim0ax0ylrb20"; buildDepends = [ aeson attoparsec base bytestring engine-io mtl stm text transformers unordered-containers vector @@ -110731,6 +111130,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sr-extra" = callPackage + ({ mkDerivation, base, bytestring, bzlib, containers, directory + , filepath, HUnit, mtl, network-uri, old-locale, old-time, pretty + , process, pureMD5, QuickCheck, random, regex-compat, time, unix + , Unixutils, zlib + }: + mkDerivation { + pname = "sr-extra"; + version = "1.46.3.1"; + sha256 = "0ssrv6h50kycxzb84s5j61mg78xyb4hyda2zxshnlqz0gbq134sr"; + buildDepends = [ + base bytestring bzlib containers directory filepath HUnit mtl + network-uri old-locale old-time pretty process pureMD5 QuickCheck + random regex-compat time unix Unixutils zlib + ]; + homepage = "https://github.com/seereason/sr-extra"; + description = "A grab bag of modules"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "srcinst" = callPackage ({ mkDerivation, base, directory, hslogger, MissingH, network , parsec, process, regex-compat, unix @@ -111023,7 +111442,9 @@ self: { mkDerivation { pname = "stackage-curator"; version = "0.7.4"; + revision = "1"; sha256 = "181wdsrwr0dlgp969zkqyg231kz3xh8mzii8ikcxx5z0yharn3gk"; + editedCabalFile = "4e0d029d79d0224ebe84bcf2891b5fd37cdc3178d4acae146d1ba2148bee86b1"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -111068,8 +111489,8 @@ self: { }: mkDerivation { pname = "standalone-haddock"; - version = "1.1.4.3"; - sha256 = "0kzgd4c2zashhcg9pblayvzwnkzhkkmdvbkx5yc9a7rcjaqzh40j"; + version = "1.1.4.4"; + sha256 = "02j10ws9n7xc2gvmpd146vrg7khawll9y3904h28k5d6ffk6qr14"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -111267,10 +111688,9 @@ self: { ({ mkDerivation, base, double-conversion, free, mtl, text }: mkDerivation { pname = "static-canvas"; - version = "0.2.0.0"; - sha256 = "10fk8kjzksym7qz9xc8pcglcn24rzi6ry03rnhxiy0mc6d6dsrb4"; + version = "0.2.0.1"; + sha256 = "14zglnvlra4p85zc4vkgwrpfjf7mrz9dw4ppi369vsfwnw2sgwkq"; buildDepends = [ base double-conversion free mtl text ]; - jailbreak = true; homepage = "https://github.com/jeffreyrosenbluth/static-canvas"; description = "DSL to generate HTML5 Canvas javascript"; license = stdenv.lib.licenses.bsd3; @@ -111589,6 +112009,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stitch" = callPackage + ({ mkDerivation, base, Cabal, containers, hspec, text, transformers + }: + mkDerivation { + pname = "stitch"; + version = "0.3.0.0"; + sha256 = "0h0n6xyi4fi7jcy2j0yzspfla65zmv3c54d88xynv6sw305rd1kz"; + buildDepends = [ base containers text transformers ]; + testDepends = [ base Cabal hspec text ]; + description = "lightweight CSS DSL"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "stm" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -112137,8 +112570,8 @@ self: { }: mkDerivation { pname = "streaming-commons"; - version = "0.1.10.0"; - sha256 = "15bsjprj3xr7bcqskgjs9c1pgy1yq56579qj4r4wk1ccg3kqfw8q"; + version = "0.1.11"; + sha256 = "01havwn8w96xr1m4m1g1bnqb85brkf79a9yy4w07y0ahg5cl7rxb"; buildDepends = [ array base blaze-builder bytestring directory network process random stm text transformers unix zlib @@ -112577,13 +113010,14 @@ self: { }: mkDerivation { pname = "structural-induction"; - version = "0.1.2"; - sha256 = "153w6p4xn3fv13kdq3cf4jwiikplnyiaczw30dy9mwyb2i8fp7r5"; + version = "0.2"; + sha256 = "1lr91wc1m655pi3ljw3n89svfazrb16785s9mfx361jgn335m8rd"; buildDepends = [ base containers genifunctors mtl pretty safe ]; testDepends = [ base geniplate language-haskell-extract mtl pretty QuickCheck safe testing-feat ]; + jailbreak = true; homepage = "http://www.github.com/danr/structural-induction"; description = "Instantiate structural induction schemas for algebraic data types"; license = stdenv.lib.licenses.gpl3; @@ -113482,16 +113916,17 @@ self: { }) { Synt = null;}; "syntactic" = callPackage - ({ mkDerivation, base, constraints, containers, data-hash, mtl - , QuickCheck, safe, tagged, tasty, tasty-golden, tasty-quickcheck - , tasty-th, template-haskell, tree-view, utf8-string + ({ mkDerivation, base, constraints, containers, data-hash, deepseq + , mtl, QuickCheck, safe, tagged, tasty, tasty-golden + , tasty-quickcheck, tasty-th, template-haskell, tree-view + , utf8-string }: mkDerivation { pname = "syntactic"; - version = "2.0"; - sha256 = "0b90afdfymsbgllk8np3xfkgrn2b5ry3n2wbpkn660rknsayw94x"; + version = "2.1"; + sha256 = "1r2b11xw235qsv6z6qqssrmgd1wcbr28vmlqs7vlb4h0yhpkd1i3"; buildDepends = [ - base constraints containers data-hash mtl safe tagged + base constraints containers data-hash deepseq mtl safe tagged template-haskell tree-view ]; testDepends = [ @@ -115007,17 +115442,17 @@ self: { "tasty-silver" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , deepseq, directory, filepath, mtl, optparse-applicative, process - , process-extras, stm, tagged, tasty, tasty-hunit, temporary, text - , transformers + , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit + , temporary, text, transformers }: mkDerivation { pname = "tasty-silver"; - version = "3.1.3"; - sha256 = "18ciqnj2h77cyr07wypyjdbry5g4m88zmlrxqavhqxz4008biqlx"; + version = "3.1.5"; + sha256 = "09mgk5pklmwxhr6r3lfmcdd09fzwn00x1vbyy93gh7wbpcpfa8dv"; buildDepends = [ ansi-terminal async base bytestring containers deepseq directory - filepath mtl optparse-applicative process process-extras stm tagged - tasty temporary text + filepath mtl optparse-applicative process process-extras regex-tdfa + stm tagged tasty temporary text ]; testDepends = [ base directory filepath process tasty tasty-hunit temporary @@ -115512,8 +115947,8 @@ self: { }: mkDerivation { pname = "term-rewriting"; - version = "0.1.2.1"; - sha256 = "06lz89dhaq6pqp1zjx8bmgpx06fq3xgnqy1llipik5c9zyr4zrfv"; + version = "0.1.2.2"; + sha256 = "0j69a4vvsv5lbh8zx3908bpk76lmg871glm6hqv0nq4xzircp184"; buildDepends = [ ansi-wl-pprint array base containers mtl multiset parsec union-find-array @@ -116080,8 +116515,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.8.0.2"; - sha256 = "11hzqfik99zydvsnwy4ihpgqvsiq398pxnw777bcaqzdrvyw7fa7"; + version = "0.8.1"; + sha256 = "0k30b4klbp1n59gjpwmkcd8p7rg0ihnn9n3ka5vz85lfsykl7q6q"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -116096,6 +116531,26 @@ self: { license = "GPL"; }) {}; + "texrunner" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, directory, filepath + , HUnit, io-streams, lens, mtl, process, temporary, test-framework + , test-framework-hunit + }: + mkDerivation { + pname = "texrunner"; + version = "0.0.1.0"; + sha256 = "1p7q9fz6f56wcm9q0xap17xc2r9a01qf8gdlrbdgryv25fp0lhcs"; + buildDepends = [ + attoparsec base bytestring directory filepath io-streams mtl + process temporary + ]; + testDepends = [ + base bytestring HUnit lens test-framework test-framework-hunit + ]; + description = "Functions for running Tex from Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "text" = callPackage ({ mkDerivation, array, base, bytestring, deepseq, directory , ghc-prim, HUnit, integer-gmp, QuickCheck, quickcheck-unicode @@ -117780,12 +118235,12 @@ self: { }) {}; "timerep" = callPackage - ({ mkDerivation, base, old-locale, time }: + ({ mkDerivation, attoparsec, base, old-locale, time }: mkDerivation { pname = "timerep"; - version = "1.0.3"; - sha256 = "14lz8nzfy1j7snvifbwjkk1fjc8wy4jk67xk9n87r25v3cva3x0p"; - buildDepends = [ base old-locale time ]; + version = "1.0.4"; + sha256 = "00a1sfhpp3c88f2pg0kigmzngh84ahw9d4zh188miagw0b4zn8xj"; + buildDepends = [ attoparsec base old-locale time ]; description = "Parse and display time according to some RFCs (RFC3339, RFC2822)"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -117995,8 +118450,8 @@ self: { }: mkDerivation { pname = "tls"; - version = "1.2.16"; - sha256 = "0z5w8bj6acr7517y25dkqi3scjn08kzq2hjkhrc1rs6cafn8cl20"; + version = "1.2.17"; + sha256 = "0j0a16zwpycp0drsjar0rpcs5vd1ljymhclfjls6091ph917rzn6"; buildDepends = [ asn1-encoding asn1-types async base byteable bytestring cereal cipher-aes cipher-des cipher-rc4 crypto-cipher-types crypto-numbers @@ -118374,8 +118829,8 @@ self: { ({ mkDerivation, base, ghc-prim, void }: mkDerivation { pname = "total"; - version = "1.0.2"; - sha256 = "1di1iblxijdffczv3yni8bj1yjjc2258w7dxf8iwrd5n5h6574d4"; + version = "1.0.3"; + sha256 = "1aqpjpxg4incb03zryp6j66fn9wq1jd7nr5kjvrad8awk7349ggn"; buildDepends = [ base ghc-prim void ]; description = "Exhaustive pattern matching using lenses, traversals, and prisms"; license = stdenv.lib.licenses.bsd3; @@ -119065,6 +119520,17 @@ self: { license = "LGPL"; }) {}; + "tslogger" = callPackage + ({ mkDerivation, async, base, containers, random }: + mkDerivation { + pname = "tslogger"; + version = "0.1.0.0"; + sha256 = "1xybllaxakzlai0ja93fyw8yr0p56g58f5akc5z9pi4w4493c7dl"; + buildDepends = [ async base containers random ]; + description = "Thread-safe logging"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tsp-viz" = callPackage ({ mkDerivation, base, gloss, stm, vector }: mkDerivation { @@ -119113,12 +119579,19 @@ self: { }) {}; "ttrie" = callPackage - ({ mkDerivation, atomic-primops, base, hashable, primitive, stm }: + ({ mkDerivation, atomic-primops, base, containers, hashable + , primitive, QuickCheck, stm, test-framework + , test-framework-quickcheck2 + }: mkDerivation { pname = "ttrie"; - version = "0.1.0.0"; - sha256 = "1lyz2hyi52fc0w1pix15g5h88y9x66wfw65k8bm4zc79irfv969h"; + version = "0.1.1"; + sha256 = "1di4h0vqj0hyxy0zgxkr1zwfy901hfglh9da21kv7li88c2d51sp"; buildDepends = [ atomic-primops base hashable primitive stm ]; + testDepends = [ + base containers hashable QuickCheck stm test-framework + test-framework-quickcheck2 + ]; jailbreak = true; homepage = "http://github.com/mcschroeder/ttrie"; description = "Contention-free STM hash map"; @@ -119363,8 +119836,8 @@ self: { ({ mkDerivation, base, twentefp-eventloop-graphics }: mkDerivation { pname = "twentefp-graphs"; - version = "0.1.0.3"; - sha256 = "1ran49yvbylf14hbr3ffmbxpkjwva785hgyvnmwzp2v2hwz1343m"; + version = "0.1.0.4"; + sha256 = "0g0py8cb4z9i9pjhka2pyjm8vfai9x3k0vmlb06g157ish97qvir"; buildDepends = [ base twentefp-eventloop-graphics ]; description = "Lab Assignments Environment at Univeriteit Twente"; license = stdenv.lib.licenses.bsd3; @@ -120755,6 +121228,7 @@ self: { version = "0.1.2"; sha256 = "0fhs55bap2dkp9lismq4df4sy8878f52xawr4an4cl0v1yj12cq0"; buildDepends = [ base io-streams unagi-chan ]; + jailbreak = true; description = "Unagi Chan IO-Streams"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -121134,8 +121608,8 @@ self: { ({ mkDerivation, array, base, mtl }: mkDerivation { pname = "union-find-array"; - version = "0.1.0.1"; - sha256 = "0p50w0kb1pz80nq0nm9l20wshsqjcaaagrrjfqx955awrvz2wmf7"; + version = "0.1.0.2"; + sha256 = "1pxb1v2k04i8ds2n8zqra74gacry6dj5p87sxgkf4fazx4s316dk"; buildDepends = [ array base mtl ]; homepage = "https://github.com/haskell-rewriting/union-find-array"; description = "union find data structure"; @@ -122598,8 +123072,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "uulib"; - version = "0.9.19"; - sha256 = "1q7mnin2prjnxgjln60s97163191dl1kfaqjq01qxfax845c0qbn"; + version = "0.9.20"; + sha256 = "1qz73rjxywc9mf54d2j4xv9m7d15gnfmi1c1fj3yklx059xlvfz2"; buildDepends = [ base ghc-prim ]; homepage = "https://github.com/UU-ComputerScience/uulib"; description = "Haskell Utrecht Tools Library"; @@ -123012,8 +123486,8 @@ self: { }: mkDerivation { pname = "vcache"; - version = "0.2.4"; - sha256 = "1dfdfcvq6554dxda1h2mnl1ggm39k8w779836v3dwpi0wnq4x249"; + version = "0.2.5"; + sha256 = "0jinysgn4rzh0b4a97wjac6md74vafb7avzprr6yddksmkylkayl"; buildDepends = [ base bytestring containers direct-murmur-hash easy-file filelock lmdb random stm transformers @@ -124015,20 +124489,20 @@ self: { "vty-ui" = callPackage ({ mkDerivation, array, base, bytestring, containers, data-default - , directory, filepath, mtl, old-locale, QuickCheck, random - , regex-base, stm, text, time, unix, vector, vty + , directory, filepath, mtl, QuickCheck, random, regex-base, stm + , text, time, unix, vector, vty }: mkDerivation { pname = "vty-ui"; - version = "1.8"; - sha256 = "08jrcwml5g74mp4wy7kqp9jd5mfbxl04517v5354jiwn4dc77azm"; + version = "1.9"; + sha256 = "1mvs2224slnkswcag6knnj9ydkfgvw6nhaiy71bijjd2wwln4fq2"; isLibrary = true; isExecutable = true; buildDepends = [ array base bytestring containers data-default directory filepath - mtl old-locale QuickCheck random regex-base stm text time unix - vector vty + mtl QuickCheck random regex-base stm text time unix vector vty ]; + jailbreak = true; homepage = "http://jtdaugherty.github.com/vty-ui/"; description = "An interactive terminal user interface library for Vty"; license = stdenv.lib.licenses.bsd3; @@ -124208,18 +124682,18 @@ self: { , data-default-class, deepseq, directory, fast-logger, hspec , http-types, HUnit, lifted-base, network, old-locale, resourcet , streaming-commons, stringsearch, text, time, transformers, unix - , unix-compat, void, wai, wai-logger, word8, zlib + , unix-compat, vault, void, wai, wai-logger, word8, zlib }: mkDerivation { pname = "wai-extra"; - version = "3.0.6.1"; - sha256 = "15wxr9y1f87q3wh5zkrv7d7w2mb9s4jd6l6cxwj9cgk0yw2nbi5f"; + version = "3.0.7"; + sha256 = "0hk3n5nhccy78xpjrhikx2sp752kaln3zdyp2260191vxvpq43qm"; buildDepends = [ ansi-terminal base base64-bytestring blaze-builder bytestring case-insensitive containers cookie data-default-class deepseq directory fast-logger http-types lifted-base network old-locale resourcet streaming-commons stringsearch text time transformers - unix unix-compat void wai wai-logger word8 + unix unix-compat vault void wai wai-logger word8 ]; testDepends = [ base blaze-builder bytestring cookie fast-logger hspec http-types @@ -125048,8 +125522,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.0.11"; - sha256 = "05sm9l8fjf18vl3b7qk3lpz2fd4knld0a90fh8smfxdvxap3fqv3"; + version = "3.0.12"; + sha256 = "0ybdzgpwb8gh9b59y9wn3ykwwlcjc2407cijj3iy6glnk07vvb5a"; buildDepends = [ array auto-update base blaze-builder bytestring case-insensitive ghc-prim hashable http-date http-types iproute network @@ -126263,10 +126737,9 @@ self: { ({ mkDerivation, base, lens, linear, parsec, parsec-numbers }: mkDerivation { pname = "wkt"; - version = "0.2.4"; - sha256 = "0xbzk4p5jazdkrlvj67xzy9vphl6rw90jp8cv4hr8p63v7ja2kfq"; + version = "0.2.5"; + sha256 = "02r453wx1kv50lw0hx4nvzzv5wjfsy16gyjqphc25aq45rl5hr8g"; buildDepends = [ base lens linear parsec parsec-numbers ]; - jailbreak = true; homepage = "http://github.com/bgamari/wkt"; description = "Parsec parsers and types for geographic data in well-known text (WKT) format"; license = stdenv.lib.licenses.bsd3; @@ -128934,10 +129407,8 @@ self: { }: mkDerivation { pname = "yarr"; - version = "1.3.3.3"; - revision = "1"; - sha256 = "09nr1k0yhm1sh4g741876sf4vi0mgrh7gdq9cbw33hxn6168h547"; - editedCabalFile = "290dde1a67c1de78074c60796f5326cf01668fb109345cd100ff1ac5a5663687"; + version = "1.4.0.1"; + sha256 = "0kk2yhhh6cjbav30sh68fg880kgdpks018c9gmn4gw98621nc6al"; buildDepends = [ base deepseq fixed-vector ghc-prim missing-foreign primitive template-haskell @@ -128955,6 +129426,7 @@ self: { sha256 = "1wmmzw62wb5hz4qavy51wb3wwqn07zd6iiwsrzcck1jdxwy0p81x"; buildDepends = [ base yarr ]; extraLibraries = [ libdevil ]; + jailbreak = true; description = "Image IO for Yarr library"; license = stdenv.lib.licenses.mit; }) { inherit (pkgs) libdevil;}; @@ -129090,6 +129562,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "yesod-angular-ui" = callPackage + ({ mkDerivation, base, blaze-html, containers, directory, hjsmin + , mtl, resourcet, shakespeare, template-haskell, text, transformers + , yesod, yesod-core + }: + mkDerivation { + pname = "yesod-angular-ui"; + version = "0.1.0.1"; + sha256 = "1kj2lbg57sp4bsl4ri3p73gr5a2k17lx7gf01ay7x0960gj5ql92"; + buildDepends = [ + base blaze-html containers directory hjsmin mtl resourcet + shakespeare template-haskell text transformers yesod yesod-core + ]; + homepage = "https://github.com/tolysz/yesod-angular-ui"; + description = "Angular Helpers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "yesod-auth" = callPackage ({ mkDerivation, aeson, authenticate, base, base16-bytestring , base64-bytestring, binary, blaze-builder, blaze-html @@ -129292,20 +129782,20 @@ self: { "yesod-auth-oauth2" = callPackage ({ mkDerivation, aeson, authenticate, base, bytestring, hoauth2 - , http-conduit, http-types, lifted-base, network-uri, text - , transformers, uuid, yesod-auth, yesod-core, yesod-form + , http-conduit, http-types, lifted-base, network-uri, random, text + , transformers, yesod-auth, yesod-core, yesod-form }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.0.12"; - sha256 = "1n70cnab99ldx4pd9yi7v6lvc7f1psnicmvq7sm8am8p9yhf9bs0"; + version = "0.1.0"; + sha256 = "0iwi41ia0wmcli3wy30fv82y4vb15xm95b2xa58sijzzpl0r3cma"; buildDepends = [ aeson authenticate base bytestring hoauth2 http-conduit http-types - lifted-base network-uri text transformers uuid yesod-auth + lifted-base network-uri random text transformers yesod-auth yesod-core yesod-form ]; - homepage = "http://github.com/scan/yesod-auth-oauth2"; - description = "Library to authenticate with OAuth 2.0 for Yesod web applications."; + homepage = "http://github.com/thoughtbot/yesod-auth-oauth2"; + description = "OAuth 2.0 authentication plugins"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -130311,6 +130801,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-websockets-extra" = callPackage + ({ mkDerivation, base, enclosed-exceptions, transformers + , websockets, yesod-websockets + }: + mkDerivation { + pname = "yesod-websockets-extra"; + version = "0.1.0.0"; + sha256 = "042gl7w8cipjhqfl5h933b0p3j9d5m58v91p1rylz4mjgvhxpk5g"; + buildDepends = [ + base enclosed-exceptions transformers websockets yesod-websockets + ]; + description = "Extension to yesod-websockets"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "yesod-worker" = callPackage ({ mkDerivation, base, containers, fast-logger, monad-control , monad-logger, persistent, resourcet, stm, template-haskell @@ -130334,21 +130839,29 @@ self: { "yet-another-logger" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base - , base-unicode-symbols, bytestring, case-insensitive + , base-unicode-symbols, bytestring, Cabal, case-insensitive, clock , configuration-tools, deepseq, either, enclosed-exceptions, lens - , lifted-base, monad-control, mtl, optparse-applicative, stm - , stm-chans, text, trace, transformers, transformers-base + , lifted-base, monad-control, mtl, nats, optparse-applicative, stm + , stm-chans, tagged, tasty, tasty-hunit, text, time, trace + , transformers, transformers-base, void }: mkDerivation { pname = "yet-another-logger"; - version = "0.1.1.1"; - sha256 = "0bwslcxb747krvpa4irnych4ddjik51542jf0bkzsyhagmakrjz8"; + version = "0.2"; + sha256 = "1di3pjvyiwx1qq6ngk0rmyhyalf1l54dhdy190bg14da3xpsvzbh"; + isLibrary = true; + isExecutable = true; 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 + Cabal case-insensitive clock configuration-tools deepseq either + enclosed-exceptions lens lifted-base monad-control mtl nats + optparse-applicative stm stm-chans text time trace transformers + transformers-base void + ]; + testDepends = [ + async base base-unicode-symbols configuration-tools + enclosed-exceptions lens lifted-base nats tagged tasty tasty-hunit + text transformers transformers-base void ]; jailbreak = true; homepage = "https://github.com/alephcloud/hs-yet-another-logger"; @@ -130801,12 +131314,16 @@ self: { }) {}; "z3" = callPackage - ({ mkDerivation, base, containers, gomp, mtl, z3 }: + ({ mkDerivation, base, containers, gomp, hspec, mtl, QuickCheck, z3 + }: mkDerivation { pname = "z3"; - version = "0.3.2"; - sha256 = "1qlklpzpjfbqjgzzkyv2j06ps42brria4px2ir2fvwgdjfzxha4n"; + version = "4.0.0"; + sha256 = "1axn3kzy6hsrnq5mcgf2n1sv63q3pqkhznvvhlj13k6jc3h2jzhl"; + isLibrary = true; + isExecutable = true; buildDepends = [ base containers mtl ]; + testDepends = [ base hspec QuickCheck ]; extraLibraries = [ gomp z3 ]; homepage = "http://bitbucket.org/iago/z3-haskell"; description = "Bindings for the Z3 Theorem Prover"; diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index ce6081b849c6..1166c7075c85 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils, curl, bash, cacert }: let - version = "1.0.3"; + version = "1.0.4"; in stdenv.mkDerivation { name = "elixir-${version}"; src = fetchurl { url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"; - sha256 = "ec6c4eaffcb771d91bdea9fb274600c624fd16b1891d194b3fcb2b521f52cc75"; + sha256 = "1babp3ff6hajdm247zl9rc311k973cdnv6dqaai7l8817gg1yd3r"; }; buildInputs = [ erlang rebar makeWrapper ]; diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index 2e17ebea5ea7..6b64fc32e122 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -14,11 +14,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}" + "${optionalString javacSupport "-javac"}"; - version = "17.4"; + version = "17.5"; src = fetchurl { url = "http://www.erlang.org/download/otp_src_${version}.tar.gz"; - sha256 = "0mhzfs64wa00g0bv9hwf0sbl8lgs83jj8cq9c3wg1iksmskfv0hd"; + sha256 = "0x34hj1a4j3rphqdaapdld7la4sqiqillamcz06wac0vk0684a1w"; }; buildInputs = @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { postInstall = let manpages = fetchurl { url = "http://www.erlang.org/download/otp_doc_man_${version}.tar.gz"; - sha256 = "0n4sczblx8mjcck56rpxvyvz186hkzg0c1xjqrnpnz1nkn7dn73c"; + sha256 = "1hspm285bl7i9a0d4r6j6lm5yk4sb5d9xzpia3simh0z06hv5cc5"; }; in '' ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call diff --git a/pkgs/development/interpreters/ruby/bundix/Gemfile b/pkgs/development/interpreters/ruby/bundix/Gemfile index 7d2f78133c57..4899cafc3738 100644 --- a/pkgs/development/interpreters/ruby/bundix/Gemfile +++ b/pkgs/development/interpreters/ruby/bundix/Gemfile @@ -1,4 +1,4 @@ source "http://rubygems.org" gem "bundix", :git => "https://github.com/cstrahan/bundix.git", - :ref => "v1.0.2" + :ref => "v1.0.3" diff --git a/pkgs/development/interpreters/ruby/bundix/Gemfile.lock b/pkgs/development/interpreters/ruby/bundix/Gemfile.lock index 038fa1a7a503..f241a3bafd4f 100644 --- a/pkgs/development/interpreters/ruby/bundix/Gemfile.lock +++ b/pkgs/development/interpreters/ruby/bundix/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/cstrahan/bundix.git - revision: e098b8c04087079c897aaf9542990e9fdd503bcf - ref: v1.0.2 + revision: c879cf901ff8084b4c97aaacfb5ecbdb0f95cc03 + ref: v1.0.3 specs: bundix (1.0.2) thor (~> 0.19.1) diff --git a/pkgs/development/interpreters/ruby/bundix/gemset.nix b/pkgs/development/interpreters/ruby/bundix/gemset.nix index adde97a49f21..f8f6546671d9 100644 --- a/pkgs/development/interpreters/ruby/bundix/gemset.nix +++ b/pkgs/development/interpreters/ruby/bundix/gemset.nix @@ -4,8 +4,8 @@ source = { type = "git"; url = "https://github.com/cstrahan/bundix.git"; - rev = "e098b8c04087079c897aaf9542990e9fdd503bcf"; - sha256 = "0www8srjqlxy1pzn2b6himy5y768dni54m7rv67gj8yvx48vd803"; + rev = "c879cf901ff8084b4c97aaacfb5ecbdb0f95cc03"; + sha256 = "05kmdnq4qa5h8l3asv05cjpnyplnqqx6hrqybj2cjlzmdxnkkgyj"; fetchSubmodules = false; }; dependencies = [ diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/development/libraries/gecode/default.nix index c0deb2d5fca6..ee7b12de5027 100644 --- a/pkgs/development/libraries/gecode/default.nix +++ b/pkgs/development/libraries/gecode/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gecode-${version}"; - version = "4.3.3"; + version = "4.4.0"; src = fetchurl { url = "http://www.gecode.org/download/${name}.tar.gz"; - sha256 = "1nxcv32pqmf7fsdpa8zp482i8a1nhrfppqaimymcxvxjgxzmpj1i"; + sha256 = "0akqjzy6pd229mn0lhpdbyc4wbazhprkd5ijqs99z68bj3b9h0s3"; }; buildInputs = [ perl ]; diff --git a/pkgs/development/libraries/haskell/diagrams/builder/wrapper.nix b/pkgs/development/libraries/haskell/diagrams/builder/wrapper.nix index 8d175398414e..3fbc8c3f2b05 100644 --- a/pkgs/development/libraries/haskell/diagrams/builder/wrapper.nix +++ b/pkgs/development/libraries/haskell/diagrams/builder/wrapper.nix @@ -2,7 +2,7 @@ If user need access to more haskell package for building his diagrams, he simply has to pass these package through the extra packages function as follow in `config.nix`: - + ~~~ diagramBuilderWrapper.override { extraPackages = self : [myHaskellPackage]; @@ -10,22 +10,21 @@ ยญ~~~ WARNING: - Note that this solution works well but however, as this is a + Note that this solution works well but however, as this is a non-cabal derivation, user should be carefull to never put this package inside the listing passed as argument to `ghcWithPackages` as it will silently disregard the package. This silent disregard should be regarded as an issue for `ghcWithPackages`. It should rather raise an error instead when a non-cabal dirivation is directly passed to it. The alternative would have been to - use a fake cabal file in order to make this a cabal derivation - such as what `yiCustom` package did. + use a fake cabal file in order to make this a cabal derivation. */ -{ stdenv, diagramsBuilder, ghcWithPackages, makeWrapper, +{ stdenv, diagramsBuilder, ghcWithPackages, makeWrapper, extraPackages ? (self: []) }: let - # Used same technique as for the yiCustom package. - w = ghcWithPackages + # Used same technique such as xmonad + w = ghcWithPackages (self: [ diagramsBuilder ] ++ extraPackages self); wrappedGhc = w.override { ignoreCollisions = true; }; in @@ -50,4 +49,4 @@ stdenv.mkDerivation { ''; preferLocalBuild = true; meta = diagramsBuilder.meta; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index fd16866cceeb..9a003de80f1e 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "libevdev-1.3.1"; + name = "libevdev-1.4.1"; src = fetchurl { url = "http://www.freedesktop.org/software/libevdev/${name}.tar.xz"; - sha256 = "0hr6xjp7vcnr7lnr1il03235rcslqb95yv7j88qh51q0bwcpcz2b"; + sha256 = "11dfiz7pkb2jbavr1ba8phn86qavvgf1xwlxmfs69mqxlz4x6yai"; }; buildInputs = [ python ]; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 586d48a8daa7..23ccfc69df44 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { - name = "libgpg-error-1.18"; + name = "libgpg-error-1.19"; src = fetchurl { url = "mirror://gnupg/libgpg-error/${name}.tar.bz2"; - sha256 = "0408v19h3h0q6w61g51hgbdg6cyw81nyzkh70qfprvsc3pkddwcz"; + sha256 = "12wpqhjlsw4iaanifbqm2kich6c7x7lm8a7zhy6x5ifm6c9hw4jk"; }; postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure"; diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index 1293c2245ac2..26aa974a7eed 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libgpgerror }: stdenv.mkDerivation rec { - name = "libksba-1.3.2"; + name = "libksba-1.3.3"; src = fetchurl { url = "mirror://gnupg/libksba/${name}.tar.bz2"; - sha256 = "01l4hvcknk9nb4bvyb6aqaid19jg0wv3ik54j1b89hnzamwm75gb"; + sha256 = "11kp3h9l3b8ikydkcdkwgx45r662zi30m26ra5llyhfh6kz5yzqc"; }; propagatedBuildInputs = [ libgpgerror ]; diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 100f91d966ff..54862e0482bf 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "0.7.72"; + version = "0.7.73"; name = "libmediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.bz2"; - sha256 = "1ndfag9a7yl8j1iwxgd2d8slwzc0ifmzg9zf8lg7fsqsa9c3s7m6"; + sha256 = "1c7yc9m4fdrfdlb80g6157sa8s0wlv892pixrfdzfljsqayxnl6k"; }; buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ]; diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 08ada463a548..d5055d213fbd 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -1,20 +1,19 @@ -{ stdenv, fetchurl, glib, dbus_libs, unzip, automake, libtool, autoconf, m4, docbook_xsl, - intltool, gtk_doc, gobjectIntrospection, pkgconfig, libxslt, libgcrypt }: +{ stdenv, fetchurl, glib, dbus_libs, unzip, docbook_xsl +, intltool, gtk_doc, gobjectIntrospection, pkgconfig, libxslt, libgcrypt +}: stdenv.mkDerivation rec { - version = "0.16"; + version = "0.18"; name = "libsecret-${version}"; src = fetchurl { - url = "https://git.gnome.org/browse/libsecret/snapshot/libsecret-${version}.zip"; - sha256 = "1yf4zvzfa45wr5bqlh54g3bmd0lgcsa8hnhppa99czca0zj7bkks"; + url = "mirror://gnome/sources/libsecret/${version}/${name}.tar.xz"; + sha256 = "1qq29c01xxjyx5sl6y5h22w8r0ff4c73bph3gfx3h7mx5mvalwqc"; }; propagatedBuildInputs = [ glib dbus_libs ]; nativeBuildInputs = [ unzip ]; - buildInputs = [ gtk_doc automake libtool autoconf intltool gobjectIntrospection pkgconfig libxslt libgcrypt m4 docbook_xsl ]; - - configureScript = "./autogen.sh"; + buildInputs = [ gtk_doc intltool gobjectIntrospection pkgconfig libxslt libgcrypt docbook_xsl ]; meta = { inherit (glib.meta) platforms maintainers; diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index a7c80077e799..6a4756670786 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -1,149 +1,148 @@ -{stdenv, fetchurl, bash, perl, yasm -, vp8Support ? true # VP8 +{stdenv, fetchFromGitHub, perl, yasm , 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 -, 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 +, 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 -, decryptSupport ? false +, 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 -, experimentalMultipleArfSupport ? false -, experimentalNon420Support ? false -, experimentalAlphaSupport ? false +, 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 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}"; + inherit (stdenv) isi686 isx86_64 isArm is64bit isMips isDarwin isCygwin; + inherit (stdenv.lib) enableFeature optional optionals; in -with stdenv.lib; +assert isi686 || isx86_64 || isArm || isMips; # Requires ARM with floating point support + +assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport; +assert internalStatsSupport && (vp9DecoderSupport || vp9EncoderSupport) -> postprocSupport; +/* 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 unitTestsSupport -> curl != null && coreutils != null; +assert vp9HighbitdepthSupport -> (vp9DecoderSupport || vp9EncoderSupport); +assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport; + stdenv.mkDerivation rec { name = "libvpx-${version}"; - version = "1.3.0"; + version = "1.4.0"; - src = fetchurl { - url = "http://webm.googlecode.com/files/libvpx-v${version}.tar.bz2"; - sha1 = "191b95817aede8c136cc3f3745fb1b8c50e6d5dc"; + src = fetchFromGitHub { + owner = "webmproject"; + repo = "libvpx"; + rev = "v${version}"; + sha256 = "1y8cf2q5ij8z8ab5j36m18rbs62aah6sw6shzbs3jr70ja0z6n8s"; }; - patchPhase = '' - patchShebangs . - ''; - - nativeBuildInputs = [ bash perl yasm ]; - - buildInputs = [ ] - ++ optional unitTestsSupport coreutils - ++ optional unitTestsSupport curl; + patchPhase = ''patchShebangs .''; 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") + (enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8") + (enableFeature vp8EncoderSupport "vp8-encoder") + (enableFeature vp8DecoderSupport "vp8-decoder") + (enableFeature (vp9EncoderSupport || vp9DecoderSupport) "vp9") + (enableFeature vp9EncoderSupport "vp9-encoder") + (enableFeature vp9DecoderSupport "vp9-decoder") + (enableFeature extraWarningsSupport "extra-warnings") + (enableFeature 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") + (enableFeature examplesSupport "install-bins") + "--enable-install-libs" + "--disable-install-srcs" + (enableFeature debugSupport "debug") + (enableFeature gprofSupport "gprof") + (enableFeature 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") + (enableFeature (!isCygwin) "pic") + (enableFeature (isi686 || isx86_64) "use-x86inc") + (enableFeature optimizationsSupport "optimizations") + (enableFeature runtimeCpuDetectSupport "runtime-cpu-detect") + (enableFeature thumbSupport "thumb") + "--enable-libs" + (enableFeature 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") + # Limit default decoder max to WHXGA + (if sizeLimitSupport then "--size-limit=5120x3200" else null) + (enableFeature fastUnalignedSupport "fast-unaligned") + "--disable-codec-srcs" + (enableFeature debugLibsSupport "debug-libs") + (enableFeature isMips "dequant-tokens") + (enableFeature isMips "dc-recon") + (enableFeature postprocSupport "postproc") + (enableFeature (postprocSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-postproc") + (enableFeature multithreadSupport "multithread") + (enableFeature internalStatsSupport "internal-stats") + (enableFeature memTrackerSupport "mem-tracker") + (enableFeature spatialResamplingSupport "spatial-resampling") + (enableFeature realtimeOnlySupport "realtime-only") + (enableFeature ontheflyBitpackingSupport "onthefly-bitpacking") + (enableFeature 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") + (if isDarwin || isCygwin then + "--enable-static --disable-shared" + else + "--disable-static --enable-shared") + (enableFeature smallSupport "small") + (enableFeature postprocVisualizerSupport "postproc-visualizer") + (enableFeature unitTestsSupport "unit-tests") + (enableFeature webmIOSupport "webm-io") + (enableFeature libyuvSupport "libyuv") + (enableFeature decodePerfTestsSupport "decode-perf-tests") + (enableFeature encodePerfTestsSupport "encode-perf-tests") + (enableFeature multiResEncodingSupport "multi-res-encoding") + (enableFeature temporalDenoisingSupport "temporal-denoising") + (enableFeature (temporalDenoisingSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-temporal-denoising") + (enableFeature coefficientRangeCheckingSupport "coefficient-range-checking") + (enableFeature (vp9HighbitdepthSupport && is64bit) "vp9-highbitdepth") + (enableFeature (experimentalSpatialSvcSupport || + experimentalFpMbStatsSupport || + experimentalEmulateHardwareSupport) "experimental") # Experimental features - (mkFlag experimentalMultipleArfSupport "multiple-arf") - (mkFlag experimentalNon420Support "non420") - (mkFlag experimentalAlphaSupport "alpha") - ]; + ] ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc" + ++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats" + ++ optional experimentalEmulateHardwareSupport "--enable-emulate-hardware"; + + nativeBuildInputs = [ perl yasm ]; + + buildInputs = [ ] + ++ optionals unitTestsSupport [ coreutils curl ]; enableParallelBuilding = true; @@ -163,7 +162,8 @@ stdenv.mkDerivation rec { # 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" + 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" @@ -174,11 +174,11 @@ stdenv.mkDerivation rec { ]; }; - meta = { + meta = with stdenv.lib; { description = "WebM VP8/VP9 codec SDK"; homepage = http://www.webmproject.org/; license = licenses.bsd3; - maintainers = with maintainers; [ codyopel lovek323 ]; + maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix index fd7f9150e1dc..31b1c197e9ff 100644 --- a/pkgs/development/libraries/libvpx/git.nix +++ b/pkgs/development/libraries/libvpx/git.nix @@ -1,15 +1,10 @@ {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 @@ -17,13 +12,10 @@ , 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 @@ -40,7 +32,6 @@ , 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 @@ -50,118 +41,109 @@ , 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; +let + inherit (stdenv) isi686 isx86_64 isArm is64bit isMips isDarwin isCygwin; + inherit (stdenv.lib) enableFeature optional optionals; +in + +assert isi686 || isx86_64 || isArm || isMips; # Requires ARM with floating point support + +assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport; +assert internalStatsSupport && (vp9DecoderSupport || vp9EncoderSupport) -> postprocSupport; /* 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); +assert unitTestsSupport -> curl != null && coreutils != null; +assert vp9HighbitdepthSupport -> (vp9DecoderSupport || vp9EncoderSupport); +assert 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"; + name = "libvpx-git-${version}"; + version = "2015-2-12"; 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 + rev = "f4c29ae9ea16c502c980a81ca9683327d5051929"; sha256 = "1d5m3dryfdrsf3mi6bcbsndyhihzksqalzfvi21fbxxkk1imsb9x"; }; - patchPhase = '' - patchShebangs . - ''; - - nativeBuildInputs = [ perl yasm ]; - - buildInputs = [ ] - ++ optional unitTestsSupport coreutils - ++ optional unitTestsSupport curl; + patchPhase = ''patchShebangs .''; 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") + (enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8") + (enableFeature vp8EncoderSupport "vp8-encoder") + (enableFeature vp8DecoderSupport "vp8-decoder") + (enableFeature (vp9EncoderSupport || vp9DecoderSupport) "vp9") + (enableFeature vp9EncoderSupport "vp9-encoder") + (enableFeature vp9DecoderSupport "vp9-decoder") + (enableFeature extraWarningsSupport "extra-warnings") + (enableFeature 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") + (enableFeature examplesSupport "install-bins") + "--enable-install-libs" + "--disable-install-srcs" + (enableFeature debugSupport "debug") + (enableFeature gprofSupport "gprof") + (enableFeature 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") + (enableFeature (!isCygwin) "pic") + (enableFeature (isi686 || isx86_64) "use-x86inc") + (enableFeature optimizationsSupport "optimizations") + (enableFeature runtimeCpuDetectSupport "runtime-cpu-detect") + (enableFeature thumbSupport "thumb") + "--enable-libs" + (enableFeature 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") + (if sizeLimitSupport then "--size-limit=5120x3200" else null) + (enableFeature fastUnalignedSupport "fast-unaligned") + "--disable-codec-srcs" + (enableFeature debugLibsSupport "debug-libs") + (enableFeature isMips "dequant-tokens") + (enableFeature isMips "dc-recon") + (enableFeature postprocSupport "postproc") + (enableFeature (postprocSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-postproc") + (enableFeature multithreadSupport "multithread") + (enableFeature internalStatsSupport "internal-stats") + (enableFeature memTrackerSupport "mem-tracker") + (enableFeature spatialResamplingSupport "spatial-resampling") + (enableFeature realtimeOnlySupport "realtime-only") + (enableFeature ontheflyBitpackingSupport "onthefly-bitpacking") + (enableFeature 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") + (if isDarwin || isCygwin then + "--enable-static --disable-shared" + else + "--disable-static --enable-shared") + (enableFeature smallSupport "small") + (enableFeature postprocVisualizerSupport "postproc-visualizer") + (enableFeature unitTestsSupport "unit-tests") + (enableFeature webmIOSupport "webm-io") + (enableFeature libyuvSupport "libyuv") + (enableFeature decodePerfTestsSupport "decode-perf-tests") + (enableFeature encodePerfTestsSupport "encode-perf-tests") + (enableFeature multiResEncodingSupport "multi-res-encoding") + (enableFeature temporalDenoisingSupport "temporal-denoising") + (enableFeature (temporalDenoisingSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-temporal-denoising") + (enableFeature coefficientRangeCheckingSupport "coefficient-range-checking") + (enableFeature (vp9HighbitdepthSupport && is64bit) "vp9-highbitdepth") + (enableFeature (experimentalSpatialSvcSupport || + experimentalFpMbStatsSupport || + experimentalEmulateHardwareSupport) "experimental") # Experimental features - (mkFlag experimentalSpatialSvcSupport "spatial-svc") - (mkFlag experimentalFpMbStatsSupport "fp-mb-stats") - (mkFlag experimentalEmulateHardwareSupport "emulate-hardware") - ]; + ] ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc" + ++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats" + ++ optional experimentalEmulateHardwareSupport "--enable-emulate-hardware"; + + nativeBuildInputs = [ perl yasm ]; + + buildInputs = [ ] + ++ optionals unitTestsSupport [ coreutils curl ]; enableParallelBuilding = true; @@ -193,7 +175,7 @@ stdenv.mkDerivation rec { ]; }; - meta = { + meta = with stdenv.lib; { description = "WebM VP8/VP9 codec SDK"; homepage = http://www.webmproject.org/; license = licenses.bsd3; diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix index 2fdeee7b5dcd..11b77ae08150 100644 --- a/pkgs/development/libraries/libzen/default.nix +++ b/pkgs/development/libraries/libzen/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig }: -let version = "0.4.30"; in +let version = "0.4.31"; in stdenv.mkDerivation { name = "libzen-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2"; - sha256 = "1ripvyzz2lw9nx2j8mkjgjfpabrz6knwxri52asqf1abnszbry64"; + sha256 = "1d54bn561dipf16ki1bfq5r72j5bmz1yyx4n1v85jv4qc4cfvl4z"; }; buildInputs = [ automake autoconf libtool pkgconfig ]; diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index a2891f9207d3..8cf0744a0d14 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "mailcore2-${version}"; - version = "0.5"; + version = "0.5.1"; src = fetchFromGitHub { owner = "MailCore"; repo = "mailcore2"; rev = version; - sha256 = "1f2kpw8ha4j43jlimw0my9b7x1gbik7yyg1m87q6nhbbsci78qly"; + sha256 = "1k0l59cdk8np4pff1my07dp7ivf3nchlhcpvm9xizp0my9rqgbxb"; }; buildInputs = [ diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index c80b1bca685f..33f5ba867d6a 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation { name = "schroedinger-1.0.11"; src = fetchurl { - url = http://diracvideo.org/download/schroedinger/schroedinger-1.0.11.tar.gz; + urls = [ + http://diracvideo.org/download/schroedinger/schroedinger-1.0.11.tar.gz + http://download.videolan.org/contrib/schroedinger-1.0.11.tar.gz + ]; sha256 = "04prr667l4sn4zx256v1z36a0nnkxfdqyln48rbwlamr6l3jlmqy"; }; diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix index f3b91f442de2..56bcba8297de 100644 --- a/pkgs/development/libraries/xmlrpc-c/default.nix +++ b/pkgs/development/libraries/xmlrpc-c/default.nix @@ -1,14 +1,18 @@ -{ stdenv, fetchurl, curl }: +{ stdenv, fetchurl, curl, libxml2 }: stdenv.mkDerivation rec { - name = "xmlrpc-c-1.25.30"; + name = "xmlrpc-c-1.33.17"; src = fetchurl { url = "mirror://sourceforge/xmlrpc-c/${name}.tgz"; - sha256 = "161gj237baagy5jaa08m54zfyvilb19gql0i5c9ysl3xqm7fvrla"; + sha256 = "0makq1zpfqnrj6xx1xc7wi4mh115ri9p4yz2rbvjhj0il4y8l4ah"; }; - buildInputs = [ curl ]; + buildInputs = [ curl libxml2 ]; + + configureFlags = [ + "--enable-libxml2-backend" + ]; # Build and install the "xmlrpc" tool (like the Debian package) postInstall = '' diff --git a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh index 6452bd5d95ae..05376c1e9a3c 100755 --- a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh +++ b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh @@ -40,6 +40,8 @@ NIX_LISP_ASDF_REGISTRY_CODE=" ) " +NIX_LISP_ASDF="${NIX_LISP_ASDF:-@asdf@}" + [ -z "$NIX_LISP_SKIP_CODE" ] && "$NIX_LISP_COMMAND" $NIX_LISP_EARLY_OPTIONS \ $NIX_LISP_EXEC_CODE "(load \"$NIX_LISP_ASDF/lib/common-lisp/asdf/build/asdf.lisp\")" \ $NIX_LISP_EXEC_CODE "$NIX_LISP_ASDF_REGISTRY_CODE" \ diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix index 9641dc305bec..be1f1f93a025 100644 --- a/pkgs/development/lisp-modules/clwrapper/default.nix +++ b/pkgs/development/lisp-modules/clwrapper/default.nix @@ -6,9 +6,9 @@ stdenv.mkDerivation { installPhase='' mkdir -p "$out"/bin - cp ${./cl-wrapper.sh} "$out"/bin/cl-wrapper.sh cp ${./common-lisp.sh} "$out"/bin/common-lisp.sh substituteAll "${./build-with-lisp.sh}" "$out/bin/build-with-lisp.sh" + substituteAll "${./cl-wrapper.sh}" "$out/bin/cl-wrapper.sh" chmod a+x "$out"/bin/* ''; diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index e423344fb164..3e51daf0ee8c 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -36,11 +36,11 @@ let lispPackages = rec { version = "darcs-2014-11-01"; description = "Iteration package for Common Lisp"; deps = []; - src = pkgs.fetchdarcs { + src = (pkgs.lib.overrideDerivation (pkgs.fetchdarcs { url = "http://common-lisp.net/project/iterate/darcs/iterate"; sha256 = "0gm05s3laiivsqgqjfj1rkz83c2c0jyn4msfgbv6sz42znjpam25"; context = ./iterate.darcs-context; - }; + }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ca-bundle.crt";})); overrides = x: { configurePhase="buildPhase(){ true; }"; }; @@ -52,7 +52,7 @@ let lispPackages = rec { description = "A collection of portable public domain utilities"; deps = []; src = pkgs.fetchgit { - url = "git://common-lisp.net/projects/alexandria/alexandria.git"; + url = "https://gitlab.common-lisp.net/alexandria/alexandria.git"; sha256 = "1d981a243f9d4d3c9fd86cc47698050507ff615b87b9a710449abdb4234e501b"; rev = ''2b1eb4067fb34bc501e527de75d09166a8ba9ceb''; }; @@ -238,7 +238,7 @@ let lispPackages = rec { export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$out/lib/common-lisp/query-fs" export HOME=$PWD build-with-lisp.sh sbcl \ - ":query-fs $(echo "$linkedSystems" | sed -re 's/(^| )([^ :])/:\2/g')" \ + ":query-fs $(echo "$linkedSystems" | sed -re 's/(^| )([^ :])/ :\2/g')" \ "$out/bin/query-fs" \ "(query-fs:run-fs-with-cmdline-args)" ''; @@ -308,10 +308,10 @@ let lispPackages = rec { description = "A UTF-8 encoding library"; deps = []; # Source type: darcs - src = pkgs.fetchdarcs { + src = (pkgs.lib.overrideDerivation (pkgs.fetchdarcs { url = ''http://common-lisp.net/project/trivial-utf-8/darcs/trivial-utf-8/''; sha256 = "1jz27gz8gvqdmvp3k9bxschs6d5b3qgk94qp2bj6nv1d0jc3m1l1"; - }; + }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ca-bundle.crt";})); }; cl-fuse-meta-fs = buildLispPackage rec { @@ -547,5 +547,18 @@ let lispPackages = rec { cvsRoot = '':pserver:anonymous:anonymous@common-lisp.net:/project/cl-smtp/cvsroot''; }; }; + + md5 = buildLispPackage rec { + baseName = "md5"; + version = "git-20150415"; + description = "The MD5 Message-Digest Algorithm RFC 1321"; + deps = []; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/pmai/md5''; + sha256 = "f64d7e36c54da649bb1d574b92cdb907291224fb3d8565b3708703a81820367b"; + rev = ''9d6f82f7121c87fb7e3b314987ba93900d300dc6''; + }; + }; }; in lispPackages diff --git a/pkgs/development/ocaml-modules/pgocaml/default.nix b/pkgs/development/ocaml-modules/pgocaml/default.nix index f1166d1c3249..00c0d472f9a8 100644 --- a/pkgs/development/ocaml-modules/pgocaml/default.nix +++ b/pkgs/development/ocaml-modules/pgocaml/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, ocaml, findlib, camlp4, calendar, csv, ocaml_pcre}: +{ stdenv, fetchurl, ocaml, findlib, camlp4, calendar, csv, ocaml_pcre }: stdenv.mkDerivation { - name = "ocaml-pgocaml-2.1"; + name = "ocaml-pgocaml-2.2"; src = fetchurl { - url = http://forge.ocamlcore.org/frs/download.php/1413/pgocaml-2.1.tgz; - sha256 = "0m7whlmhm7z58pfaarvkyiwaylmrz05aj6fr773zd9xlv07ljiym"; + url = http://forge.ocamlcore.org/frs/download.php/1506/pgocaml-2.2.tgz; + sha256 = "0x0dhlz2rqxpwfdqi384f9fn0ng2irifadmxfm2b4gcz7y1cl9rh"; }; - buildInputs = [ocaml findlib camlp4]; - propagatedBuildInputs = [calendar csv ocaml_pcre]; + buildInputs = [ ocaml findlib camlp4 ]; + propagatedBuildInputs = [ calendar csv ocaml_pcre ]; createFindlibDestdir = true; diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 20fb2ec496b4..b962e9f84727 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -62,10 +62,10 @@ if disabled then throw "${name} not supported for interpreter ${python.executabl ] ++ buildInputs ++ pythonPath ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip); - # propagate python to active setup-hook in nix-shell - propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader python ]; + # propagate python/setuptools to active setup-hook in nix-shell + propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader python setuptools ]; - pythonPath = [ setuptools ] ++ pythonPath; + pythonPath = pythonPath; configurePhase = attrs.configurePhase or '' runHook preConfigure diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index e343536b8fa8..220ddf26b30f 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -26,12 +26,7 @@ wrapPythonProgramsIn() { # dont wrap EGG-INFO scripts since they are called from python if echo "$i" | grep -v EGG-INFO/scripts; then echo "wrapping \`$i'..." - sed -i "$i" -re '1 { - /^#!/!b; :r - /\\$/{N;b r} - /__future__|^ *(#.*)?$/{n;b r} - /^ *[^# ]/i import sys; sys.argv[0] = '"'$(basename "$i")'"' - }' + sed -i "$i" -re '@magicalSedExpression@' wrapProgram "$i" \ --prefix PYTHONPATH ":" $program_PYTHONPATH \ --prefix PATH ":" $program_PATH diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index dd0b07912c88..d92cca88d5f5 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl, curl, dmd, gcc, unzip}: +{stdenv, fetchurl, curl, dmd, gcc, unzip }: stdenv.mkDerivation { - name = "dub-0.9.22"; + name = "dub-0.9.23"; src = fetchurl { - url = "https://github.com/rejectedsoftware/dub/archive/v0.9.22.tar.gz"; - sha256 = "0vhn96ybbsfflldlbyc17rmwb7bz21slbm189k5glyfr9nnp4cir"; + url = "https://github.com/D-Programming-Language/dub/archive/v0.9.23.tar.gz"; + sha256 = "7ecbce89c0e48b43705d7c48003394f383556f33562c4b5d884a786cd85814d1"; }; buildInputs = [ unzip curl ]; diff --git a/pkgs/development/tools/haskell/ihaskell/ng-wrapper.nix b/pkgs/development/tools/haskell/ihaskell/ng-wrapper.nix deleted file mode 100644 index 4ce78c31fe2f..000000000000 --- a/pkgs/development/tools/haskell/ihaskell/ng-wrapper.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, buildEnv, ghcWithPackages, makeWrapper, ihaskell, ipython, packages }: -let - ihaskellEnv = ghcWithPackages (self: [ - self.ihaskell - self.ihaskell-blaze - self.ihaskell-diagrams - self.ihaskell-display - ] ++ packages self); - profile = "${ihaskell.pname}-${ihaskell.version}/profile/profile.tar"; - drv = buildEnv { - name = "ihaskell-with-packages"; - paths = [ ihaskellEnv ipython ]; - postBuild = '' - tar xf ${ihaskell.src} ${profile} - mkdir -p $out/share/`dirname ${profile}` - mkdir profile - cd profile - tar xf ../${profile} - for cfg in ipython_*config.py;do - sed -i -e "1iexe = '${ihaskell}/bin/IHaskell'" $cfg - done - tar cf $out/share/${profile} . - wrapProgram "$out/bin/IHaskell" \ - --prefix PATH : "${ihaskellEnv}/bin:${ipython}/bin" \ - --set PROFILE_DIR "\$HOME/.ipython/profile_haskell" \ - --set PROFILE_TAR "$out/share/${profile}" \ - --set PROFILE_INIT "\$([ ! -d \$PROFILE_DIR ] \ - && mkdir -p \$PROFILE_DIR \ - && tar xf \$PROFILE_TAR -C \$PROFILE_DIR \ - ; [ -d \$PROFILE_DIR ] && for cfg in \$PROFILE_DIR/ipython_*config.py;do \ - sed -i -e '/.*exe.*IHaskell.*/d' \$cfg; sed -i -e \"1iexe = '${ihaskell}/bin/IHaskell'\" \$cfg;done )" \ - --set GHC_PACKAGE_PATH "\$(echo $out/lib/*/package.conf.d| tr ' ' ':'):" \ - ''; - }; -in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; }) \ No newline at end of file diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix index b20f8fa4f507..035ad738a824 100644 --- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -1,36 +1,23 @@ -{ stdenv, makeWrapper, ihaskell, ipython, ghc }: - -stdenv.mkDerivation rec { - - inherit (ihaskell) name pname src version meta; - - buildInputs = [ makeWrapper ]; - - preferLocalBuild = true; - - buildCommand = let profile = "${pname}-${version}/profile/profile.tar"; in '' - tar xf $src ${profile} - mkdir -p $out/share/`dirname ${profile}` - mkdir profile - cd profile - tar xf ../${profile} - for cfg in ipython_*config.py;do - sed -i -e "1iexe = '${ihaskell}/bin/IHaskell'" $cfg - done - tar cf $out/share/${profile} . - makeWrapper "${ihaskell}/bin/IHaskell" "$out/bin/ihaskell" \ - --prefix PATH : "${ghc}/bin:${ihaskell}/bin:${ipython}/bin" \ - --prefix LD_LIBRARY_PATH : "${ihaskell}/lib/ghc-${ghc.version}/${name}/" \ - --add-flags "--ipython=${ipython}/bin/ipython" \ - --set PROFILE_DIR "\$HOME/.ipython/profile_haskell" \ - --set PROFILE_TAR "$out/share/${profile}" \ - --set PROFILE_INIT "\$([ ! -d \$PROFILE_DIR ] \ - && mkdir -p \$PROFILE_DIR \ - && tar xf \$PROFILE_TAR -C \$PROFILE_DIR \ - ; [ -d \$PROFILE_DIR ] && for cfg in \$PROFILE_DIR/ipython_*config.py;do \ - sed -i -e '/.*exe.*IHaskell.*/d' \$cfg; sed -i -e \"1iexe = '${ihaskell}/bin/IHaskell'\" \$cfg;done ) \ - " \ - --prefix GHC_PACKAGE_PATH : "\$(${ghc.GHCGetPackages} ${ghc.version}|sed -e 's, -package-db ,:,g'|cut -b 2-):${ihaskell}/lib/ghc-${ghc.version}/package.conf.d/${pname}-${version}.installedconf" \ - --set GHC_PACKAGE_PATH "\$GHC_PACKAGE_PATH:" # always end with : to include base packages +{ stdenv, writeScriptBin, buildEnv, ghcWithPackages, ihaskell, ipython, packages }: +let + ihaskellEnv = ghcWithPackages (self: [ + self.ihaskell + self.ihaskell-blaze + self.ihaskell-diagrams + self.ihaskell-display + ] ++ packages self); + ihaskellSh = writeScriptBin "ihaskell-notebook" '' + #!/bin/sh + export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH" + export PATH="${ihaskell}/bin:${ihaskellEnv}/bin:${ipython}/bin" + ${ihaskell}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${ipython}/bin/ipython notebook --kernel=haskell + ''; + profile = "${ihaskell.pname}-${ihaskell.version}/profile/profile.tar"; +in +buildEnv { + name = "ihaskell-with-packages"; + paths = [ ihaskellEnv ipython ]; + postBuild = '' + ln -s ${ihaskellSh}/bin/ihaskell-notebook $out/bin/. ''; } diff --git a/pkgs/development/tools/leksah/default.nix b/pkgs/development/tools/leksah/default.nix new file mode 100644 index 000000000000..24570a9b68eb --- /dev/null +++ b/pkgs/development/tools/leksah/default.nix @@ -0,0 +1,17 @@ +{ stdenv, ghcWithPackages, gtk3, makeWrapper }: + +let +leksahEnv = ghcWithPackages (self: [ self.leksah-server self.leksah ]); +in stdenv.mkDerivation { + name = "leksah"; + + buildInputs = [ gtk3 ]; + nativeBuildInputs = [ makeWrapper ]; + + buildCommand = '' + mkdir -p $out/bin + makeWrapper ${leksahEnv}/bin/leksah $out/bin/leksah \ + --prefix PATH : "${leksahEnv}/bin" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + ''; +} diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index 64de64dea067..309d20d675b6 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -3,18 +3,18 @@ let libphutil = fetchgit { url = "git://github.com/phacility/libphutil.git"; - rev = "ce3959b4046f5dcc4f3413a59328bda2a42e76b0"; - sha256 = "3c206b428fa5e0391868f7782db4af4d1cf2f338899831a36771cef74db14a76"; + rev = "efc338d50f17dec594a66337034797c90c8b10c1"; + sha256 = "9a9df8667d9bf31667facd1cd873adef292c63893adc15d32bd819c47256027c"; }; arcanist = fetchgit { url = "git://github.com/phacility/arcanist.git"; - rev = "b961869edac9469be93f2c3ac7a24562d3186860"; - sha256 = "2ae1272c76a1e2bdedd87d453ddb75f6110f9224063e7ee39e88fcb8b3b4c884"; + rev = "e101496508e279e1b9ee15d7d549735a0352f8ab"; + sha256 = "4f2ae195173d859f9920378c42e257d70e5720b7f54c02d9af2c398f936f20b9"; }; in stdenv.mkDerivation rec { name = "arcanist-${version}"; - version = "20150318"; + version = "20150412"; src = [ arcanist libphutil ]; buildInputs = [ php makeWrapper flex ]; diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index b24b46aec3d7..16ab1f8e5dc4 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -8,7 +8,7 @@ let - basename = "gdb-7.8.2"; + basename = "gdb-7.9"; # Whether (cross-)building for GNU/Hurd. This is an approximation since # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.xz"; - sha256 = "11a4fj1vpsny71kz7xqqbqk3kgzbs5cfjj3z9gm0hpvxfkam8nb0"; + sha256 = "14l3hhsy7fmpn2dk7ivc67gnbjdhkxlq90kxijpzfa35l58mcccv"; }; - patches = [ ./edit-signals.patch ]; + # patches = [ ./edit-signals.patch ]; # I think python is not a native input, but I leave it # here while I will not need it cross building @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { postInstall = '' # Remove Info files already provided by Binutils and other packages. - rm -v $out/share/info/{standards,configure,bfd}.info + rm -v $out/share/info/bfd.info ''; # TODO: Investigate & fix the test failures. diff --git a/pkgs/development/tools/misc/gdb/edit-signals.patch b/pkgs/development/tools/misc/gdb/edit-signals.patch deleted file mode 100644 index e9da8035ef5b..000000000000 --- a/pkgs/development/tools/misc/gdb/edit-signals.patch +++ /dev/null @@ -1,25 +0,0 @@ -Patch adapted from -https://www.sourceware.org/ml/gdb-patches/2012-08/msg00439.html - -Without it, spawning a terminal 'vim' from gdb 'edit' cmd, makes -all gdb grazy. - -diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c -index 7ea0fec..be5455c 100644 ---- a/gdb/tui/tui-win.c -+++ b/gdb/tui/tui-win.c -@@ -831,11 +831,12 @@ void - tui_initialize_win (void) - { - #ifdef SIGWINCH --#ifdef HAVE_SIGACTION -+#if defined (HAVE_SIGACTION) && defined (SA_RESTART) - struct sigaction old_winch; - -- memset (&old_winch, 0, sizeof (old_winch)); -+ sigemptyset (&old_winch.sa_mask); - old_winch.sa_handler = &tui_sigwinch_handler; -+ old_winch.sa_flags = SA_RESTART; - sigaction (SIGWINCH, &old_winch, NULL); - #else - signal (SIGWINCH, &tui_sigwinch_handler); diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix index c05189213834..45586c1e9bd7 100644 --- a/pkgs/development/web/iojs/default.nix +++ b/pkgs/development/web/iojs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python, utillinux, openssl, http-parser, zlib, libuv, nightly ? false }: let - version = if nightly then "1.5.2-nightly201503173c8ae2d934" else "1.5.1"; + version = if nightly then "1.6.5-nightly20150409ff74931107" else "1.6.4"; inherit (stdenv.lib) optional maintainers licenses platforms; in stdenv.mkDerivation { name = "iojs-${version}"; @@ -11,8 +11,8 @@ in stdenv.mkDerivation { then "https://iojs.org/download/nightly/v${version}/iojs-v${version}.tar.gz" else "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz"; sha256 = if nightly - then "10blf1hr80fknrzyrbj7qy2xn7wilnyn6y2r7ijrw2gns4ia3d0h" - else "0zdxdb9n0yk6dp6j6x3bka7vrnf7kz8jjcpl6fw5fr9f742s9s26"; + then "04f7r4iv8p0jfylw4sxg3vsv14rbsi6n9hbqnwvdh6554yrm6d35" + else "1qzvf7g457dppzxn23wppjcm09vh1n6bhsvz5szhwgjvl0iv2pc7"; }; prePatch = '' diff --git a/pkgs/development/web/iojs/update-iojs b/pkgs/development/web/iojs/update-iojs index 3140c5e842b4..4e01ecfd63e0 100755 --- a/pkgs/development/web/iojs/update-iojs +++ b/pkgs/development/web/iojs/update-iojs @@ -3,6 +3,8 @@ # Fetch the latest io.js release (stable/nightly) and update # `default.nix` in this directory. # +# Call this from the root of your nixpkgs directory. +# set -e @@ -21,12 +23,13 @@ latest_log() { } url() { - nix-instantiate -A "$1" 2> /dev/null | xargs cat \ + nix-instantiate -A "$1" \ + | xargs cat \ | sed 's/.*"urls","//;s/".*//' } hash() { - nix-prefetch-url "$1" 2> /dev/null + nix-prefetch-url "$1" } hash_log() { |