Merge master into staging-next

pkgs/development/tools/misc/creduce/default.nix

@@ -8,18 +8,18 @@
 
 stdenv.mkDerivation rec {
   name = "creduce-${version}";
-  version = "2.7.0";
+  version = "2.8.0";
 
   src = fetchurl {
     url = "https://embed.cs.utah.edu/creduce/${name}.tar.gz";
-    sha256 = "0h8s4d54q6cl6i45x3143l2xmr29b2yhr3m0n5qqx63sr5csip1n";
+    sha256 = "1vqx73ymfscvlyig03972a5m7ar3gx2yv6m8c6h2mibz792j5xkp";
   };
 
+  nativeBuildInputs = [ cmake makeWrapper ];
   buildInputs = [
     # Ensure stdenv's CC is on PATH before clang-unwrapped
     stdenv.cc
     # Actual deps:
-    cmake makeWrapper
     llvm clang-unwrapped
     flex zlib
     perl ExporterLite FileWhich GetoptTabular RegexpCommon TermReadKey

pkgs/development/tools/misc/elfutils/default.nix

@@ -3,11 +3,11 @@
 # TODO: Look at the hardcoded paths to kernel, modules etc.
 stdenv.mkDerivation rec {
   name = "elfutils-${version}";
-  version = "0.172";
+  version = "0.173";
 
   src = fetchurl {
     url = "https://sourceware.org/elfutils/ftp/${version}/${name}.tar.bz2";
-    sha256 = "090fmbnvd9jblkwhb2bm3hanim63rrvd5f30mfxq4jac6kk9k73p";
+    sha256 = "1zq0l12k64hrbjmdjc4llrad96c25i427hpma1id9nk87w9qqvdp";
   };
 
   patches = ./debug-info-from-env.patch;