Merge staging-next into staging

2019-08-31 18:07:33 +02:00
parent 92b96ce63f 96e5474329
commit 98ef78326d
40 changed files with 801 additions and 381 deletions
--- a/pkgs/tools/text/patchutils/generic.nix
+++ b/pkgs/tools/text/patchutils/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, perl
 , version, sha256, patches ? []
 , ...
 }:
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
    inherit sha256;
  };

+  buildInputs = [ perl ];
  hardeningDisable = [ "format" ];

  doCheck = false; # fails