Merge branch 'nixpkgs-unstable' into PR #111431

I'm not really sure about the conflicts in: pkgs/development/python-modules/psutil/default.nix Hydra nixpkgs: ?compare=1666054
2021-04-28 17:13:34 +02:00
parent 16d7d40b8a 267761cf44
commit 82bccc2d62
8971 changed files with 264990 additions and 108348 deletions
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchurl, m4, perl, lzma}:
+{lib, stdenv, fetchurl, m4, perl, xz}:

 stdenv.mkDerivation rec {
  name = "autoconf-2.13";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
    sha256 = "07krzl4czczdsgzrrw9fiqx35xcf32naf751khg821g5pqv12qgh";
  };

-  nativebuildInputs = [ lzma ];
+  nativebuildInputs = [ xz ];
  buildInputs = [ m4 perl ];

  doCheck = true;