Merge master into staging-next

pkgs/tools/misc/hdl-dump/default.nix

@@ -1,20 +1,19 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , fetchFromGitHub
 , upx
 }:
 
-let
-  version = "20202807";
+stdenv.mkDerivation rec {
   pname = "hdl-dump";
-in stdenv.mkDerivation {
-  inherit pname version;
+  version = "20202807";
 
   # Using AkuHAK's repo because playstation2's repo is outdated
   src = fetchFromGitHub {
     owner = "AKuHAK";
     repo = pname;
-    rev = "be37e112a44772a1341c867dc3dfee7381ce9e59";
-    sha256 = "0akxak6hm11h8z6jczxgr795s4a8czspwnhl3swqxp803dvjdx41";
+    rev = "0c98b235c83c0fca1da93648f05ea5f940a4aee0";
+    sha256 = "1s3wflqjjlcslpa9n5chr8dbamhmfk88885dzw68apz4vf6g27iq";
   };
 
   buildInputs = [ upx ];

pkgs/tools/misc/iotools/default.nix

@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/adurbin/iotools";
     license = licenses.gpl2Only;
     maintainers = with maintainers; [ felixsinger ];
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" "i686-linux" ];
   };
 }