Merge master into staging-next

2020-11-27 15:09:19 +01:00
parent 9778483751 be36f6f0a0
commit b2a3891e12
800 changed files with 21489 additions and 5337 deletions
--- a/pkgs/development/libraries/libseccomp/default.nix
+++ b/pkgs/development/libraries/libseccomp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, getopt, utillinux, gperf }:
+{ stdenv, fetchurl, getopt, util-linux, gperf }:

 stdenv.mkDerivation rec {
  pname = "libseccomp";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
    patchShebangs .
  '';

-  checkInputs = [ utillinux ];
+  checkInputs = [ util-linux ];
  doCheck = false; # dependency cycle

  # Hack to ensure that patchelf --shrink-rpath get rids of a $TMPDIR reference.