Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-02-27 00:08:08 +00:00
parent b4dadff542 766ad682f1
commit 3477e662e6
504 changed files with 28750 additions and 13232 deletions
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, pythonPackages}:

-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
  name = "dtrx-${version}";
  version = "7.1";

@@ -3,10 +3,10 @@

 stdenv.mkDerivation rec {
  name = "zstd-${version}";
-  version = "0.5.0";
+  version = "0.5.1";

  src = fetchFromGitHub {
-    sha256 = "18jwhvzj3kv8lpr6fgild7a574lsak93fc1z8nvhcdbc1b1n2dsj";
+    sha256 = "18mfrq5fqd7gkkqrgc32rlb98vw45rq1vsbrg44bprg3mv6ca3ls";
    rev = "v${version}";
    repo = "zstd";
    owner = "Cyan4973";