Merge staging-next into staging

pkgs/tools/text/fanficfare/default.nix

@@ -24,6 +24,5 @@ python3Packages.buildPythonApplication rec {
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ dwarfmaster ];
-    inherit version;
   };
 }

pkgs/tools/text/wdiff/default.nix

@@ -9,10 +9,15 @@ stdenv.mkDerivation rec {
     sha256 = "0sxgg0ms5lhi4aqqvz1rj4s77yi9wymfm3l3gbjfd1qchy66kzrl";
   };
 
+  # for makeinfo
+  nativeBuildInputs = [ texinfo ];
+
   buildInputs = [ texinfo ];
 
   checkInputs = [ which ];
 
+  strictDeps = true;
+
   meta = with lib; {
     homepage = "https://www.gnu.org/software/wdiff/";
     description = "Comparing files on a word by word basis";