Merge pull request #25636 from Mic92/firmware

hardware: add enableRedistributalFirmware

nixos/modules/hardware/all-firmware.nix

@@ -2,7 +2,9 @@
 
 with lib;
 
-{
+let
+  cfg = config.hardware;
+in {
 
   ###### interface
 
@@ -12,7 +14,16 @@ with lib;
       default = false;
       type = types.bool;
       description = ''
-        Turn on this option if you want to enable all the firmware shipped in linux-firmware.
+        Turn on this option if you want to enable all the firmware.
+      '';
+    };
+
+    hardware.enableRedistributalFirmware = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Turn on this option if you want to enable all the firmware with a license allowing redistribution.
+        (i.e. free firmware and <literal>firmware-linux-nonfree</literal>)
       '';
     };
 
@@ -21,15 +32,27 @@ with lib;
 
   ###### implementation
 
-  config = mkIf config.hardware.enableAllFirmware {
+  config = mkMerge [
-    hardware.firmware = with pkgs; [
+    (mkIf (cfg.enableAllFirmware || cfg.enableRedistributalFirmware) {
-      firmwareLinuxNonfree
+      hardware.firmware = with pkgs; [
-      intel2200BGFirmware
+        firmwareLinuxNonfree
-      rtl8723bs-firmware
+        intel2200BGFirmware
-      rtl8192su-firmware
+        rtl8723bs-firmware
-    ] ++ optionals config.nixpkgs.config.allowUnfree [
+        rtl8192su-firmware
-      broadcom-bt-firmware
+      ];
-    ];
+    })
-  };
+    (mkIf cfg.enableAllFirmware {
-
+      assertions = [{
+        assertion = !cfg.enableAllFirmware || (config.nixpkgs.config.allowUnfree or false);
+        message = ''
+          the list of hardware.enableAllFirmware contains non-redistributable licensed firmware files.
+            This requires nixpkgs.config.allowUnfree to be true.
+            An alternative is to use the hardware.enableRedistributalFirmware option.
+        '';
+      }];
+      hardware.firmware = with pkgs; [
+        broadcom-bt-firmware
+      ];
+    })
+  ];
 }

nixos/modules/hardware/network/broadcom-43xx.nix

@@ -1,3 +1,3 @@
 {
-  hardware.enableAllFirmware = true;
+  hardware.enableRedistributalFirmware = true;
 }

nixos/modules/hardware/network/intel-2030.nix

@@ -1,3 +1,3 @@
 {
-  hardware.enableAllFirmware = true;
+  hardware.enableRedistributalFirmware = true;
 }

nixos/modules/hardware/network/intel-2100bg.nix

@@ -23,7 +23,7 @@
 
   config = lib.mkIf config.networking.enableIntel2100BGFirmware {
 
-    hardware.enableAllFirmware = true;
+    hardware.enableRedistributalFirmware = true;
 
   };
 

nixos/modules/hardware/network/intel-3945abg.nix

@@ -22,7 +22,7 @@
 
   config = lib.mkIf config.networking.enableIntel3945ABGFirmware {
 
-    hardware.enableAllFirmware = true;
+    hardware.enableRedistributalFirmware = true;
 
   };
 

nixos/modules/hardware/network/intel-4965agn.nix

@@ -1,3 +1,3 @@
 {
-  hardware.enableAllFirmware = true;
+  hardware.enableRedistributalFirmware = true;
 }

nixos/modules/hardware/network/intel-5000.nix

@@ -1,3 +1,3 @@
 {
-  hardware.enableAllFirmware = true;
+  hardware.enableRedistributalFirmware = true;
 }

nixos/modules/hardware/network/intel-5150.nix

@@ -1,3 +1,3 @@
 {
-  hardware.enableAllFirmware = true;
+  hardware.enableRedistributalFirmware = true;
 }

nixos/modules/hardware/network/intel-6000.nix

@@ -1,3 +1,3 @@
 {
-  hardware.enableAllFirmware = true;
+  hardware.enableRedistributalFirmware = true;
 }

nixos/modules/hardware/network/intel-6000g2a.nix

@@ -1,3 +1,3 @@
 {
-  hardware.enableAllFirmware = true;
+  hardware.enableRedistributalFirmware = true;
 }

nixos/modules/hardware/network/intel-6000g2b.nix

@@ -1,3 +1,3 @@
 {
-  hardware.enableAllFirmware = true;
+  hardware.enableRedistributalFirmware = true;
 }

nixos/modules/hardware/network/ralink.nix

@@ -20,7 +20,7 @@
   ###### implementation
 
   config = lib.mkIf config.networking.enableRalinkFirmware {
-    hardware.enableAllFirmware = true;
+    hardware.enableRedistributalFirmware = true;
   };
 
 }

nixos/modules/hardware/network/rtl8192c.nix

@@ -20,7 +20,7 @@
   ###### implementation
 
   config = lib.mkIf config.networking.enableRTL8192cFirmware {
-    hardware.enableAllFirmware = true;
+    hardware.enableRedistributalFirmware = true;
   };
 
 }

nixos/modules/hardware/video/radeon.nix

@@ -1,3 +1,3 @@
 {
-  hardware.enableAllFirmware = true;
+  hardware.enableRedistributalFirmware = true;
 }

nixos/modules/installer/scan/not-detected.nix

@@ -5,5 +5,5 @@
 with lib;
 
 {
-  hardware.enableAllFirmware = true;
+  hardware.enableRedistributalFirmware = true;
 }

nixos/modules/profiles/all-hardware.nix

@@ -50,7 +50,7 @@
     ];
 
   # Include lots of firmware.
-  hardware.enableAllFirmware = true;
+  hardware.enableRedistributalFirmware = true;
 
   imports =
     [ ../hardware/network/zydas-zd1211.nix ];