Do a small rework of AMD and Intel microcode (#340379)

pkgs/by-name/iu/iucode-tool/package.nix

@@ -1,13 +1,20 @@
-{ lib, stdenv, fetchFromGitLab, autoreconfHook, fetchpatch, argp-standalone }:
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  fetchpatch,
+  argp-standalone,
+}:
 
 stdenv.mkDerivation rec {
   pname = "iucode-tool";
   version = "2.3.1";
 
   src = fetchFromGitLab {
-    owner  = "iucode-tool";
-    repo   = "iucode-tool";
-    rev    = "v${version}";
+    owner = "iucode-tool";
+    repo = "iucode-tool";
+    rev = "v${version}";
     sha256 = "04dlisw87dd3q3hhmkqc5dd58cp22fzx3rzah7pvcyij135yjc3a";
   };
 
@@ -31,6 +38,9 @@ stdenv.mkDerivation rec {
     homepage = "https://gitlab.com/iucode-tool/iucode-tool";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ peterhoeg ];
-    platforms = [ "x86_64-linux" "i686-linux" ];
+    platforms = [
+      "x86_64-linux"
+      "i686-linux"
+    ];
   };
 }

pkgs/by-name/mi/microcode-amd/package.nix

@@ -1,4 +1,9 @@
-{ lib, stdenv, linux-firmware, libarchive }:
+{
+  lib,
+  stdenv,
+  linux-firmware,
+  libarchive,
+}:
 
 stdenv.mkDerivation {
   pname = "amd-ucode";
@@ -26,6 +31,9 @@ stdenv.mkDerivation {
     description = "AMD Processor microcode patch";
     homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
     license = licenses.unfreeRedistributableFirmware;
-    platforms = platforms.linux;
+    platforms = [
+      "i686-linux"
+      "x86_64-linux"
+    ];
   };
 }

pkgs/by-name/mi/microcode-intel/package.nix

@@ -1,4 +1,10 @@
-{ lib, stdenv, fetchFromGitHub, libarchive, iucode-tool }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  libarchive,
+  iucode-tool,
+}:
 
 stdenv.mkDerivation rec {
   pname = "microcode-intel";
@@ -11,7 +17,10 @@ stdenv.mkDerivation rec {
     hash = "sha256-O2UWa04MnU9ndzvWy8fruOTm85PexEd+i1McQNz6uFE=";
   };
 
-  nativeBuildInputs = [ iucode-tool libarchive ];
+  nativeBuildInputs = [
+    iucode-tool
+    libarchive
+  ];
 
   installPhase = ''
     runHook preInstall
@@ -29,7 +38,10 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/${src.rev}";
     description = "Microcode for Intel processors";
     license = licenses.unfreeRedistributableFirmware;
-    platforms = platforms.linux;
+    platforms = [
+      "i686-linux"
+      "x86_64-linux"
+    ];
     maintainers = with maintainers; [ felixsinger ];
   };
 }

pkgs/top-level/all-packages.nix

@@ -25995,12 +25995,6 @@ with pkgs;
 
   mlxbf-bootimages = callPackage ../misc/mlxbf-bootimages { };
 
-  microcodeAmd = callPackage ../os-specific/linux/microcode/amd.nix { };
-
-  microcodeIntel = callPackage ../os-specific/linux/microcode/intel.nix { };
-
-  iucode-tool = callPackage ../os-specific/linux/microcode/iucode-tool.nix { };
-
   inherit (callPackages ../os-specific/linux/apparmor { })
     libapparmor apparmor-utils apparmor-bin-utils apparmor-parser apparmor-pam
     apparmor-profiles apparmor-kernel-patches apparmorRulesFromClosure;