diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2017-05-08 08:50:03 +0100 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2017-05-09 15:29:08 +0100 |
commit | 05aa80c06ab45da7c44b6bf1b858a87815665c71 (patch) | |
tree | 50a2aeffc0417ef57fe24c97183dc1112968d8d3 /nixos/modules/hardware/network | |
parent | 6e738df1763d5fe94e55348635270b26d08b71d2 (diff) | |
download | nixpkgs-05aa80c06ab45da7c44b6bf1b858a87815665c71.tar nixpkgs-05aa80c06ab45da7c44b6bf1b858a87815665c71.tar.gz nixpkgs-05aa80c06ab45da7c44b6bf1b858a87815665c71.tar.bz2 nixpkgs-05aa80c06ab45da7c44b6bf1b858a87815665c71.tar.lz nixpkgs-05aa80c06ab45da7c44b6bf1b858a87815665c71.tar.xz nixpkgs-05aa80c06ab45da7c44b6bf1b858a87815665c71.tar.zst nixpkgs-05aa80c06ab45da7c44b6bf1b858a87815665c71.zip |
hardware: add enableRedistributalFirmware
Due the recent inclusion of broadcom-bt-firmware in enableAllFirmware, it was required to set `nixpkgs.config.allowUnfree` to obtain the full list. To make this dependency more explicit an assertion is added and an alternative option `enableRedistributalFirmware` is provided to only obtain firmware with an license allowing redistribution.
Diffstat (limited to 'nixos/modules/hardware/network')
-rw-r--r-- | nixos/modules/hardware/network/broadcom-43xx.nix | 2 | ||||
-rw-r--r-- | nixos/modules/hardware/network/intel-2030.nix | 2 | ||||
-rw-r--r-- | nixos/modules/hardware/network/intel-2100bg.nix | 2 | ||||
-rw-r--r-- | nixos/modules/hardware/network/intel-3945abg.nix | 2 | ||||
-rw-r--r-- | nixos/modules/hardware/network/intel-4965agn.nix | 2 | ||||
-rw-r--r-- | nixos/modules/hardware/network/intel-5000.nix | 2 | ||||
-rw-r--r-- | nixos/modules/hardware/network/intel-5150.nix | 2 | ||||
-rw-r--r-- | nixos/modules/hardware/network/intel-6000.nix | 2 | ||||
-rw-r--r-- | nixos/modules/hardware/network/intel-6000g2a.nix | 2 | ||||
-rw-r--r-- | nixos/modules/hardware/network/intel-6000g2b.nix | 2 | ||||
-rw-r--r-- | nixos/modules/hardware/network/ralink.nix | 2 | ||||
-rw-r--r-- | nixos/modules/hardware/network/rtl8192c.nix | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/nixos/modules/hardware/network/broadcom-43xx.nix b/nixos/modules/hardware/network/broadcom-43xx.nix index 8fecdae36bf..e0bd16a3483 100644 --- a/nixos/modules/hardware/network/broadcom-43xx.nix +++ b/nixos/modules/hardware/network/broadcom-43xx.nix @@ -1,3 +1,3 @@ { - hardware.enableAllFirmware = true; + hardware.enableRedistributalFirmware = true; } diff --git a/nixos/modules/hardware/network/intel-2030.nix b/nixos/modules/hardware/network/intel-2030.nix index 8fecdae36bf..e0bd16a3483 100644 --- a/nixos/modules/hardware/network/intel-2030.nix +++ b/nixos/modules/hardware/network/intel-2030.nix @@ -1,3 +1,3 @@ { - hardware.enableAllFirmware = true; + hardware.enableRedistributalFirmware = true; } diff --git a/nixos/modules/hardware/network/intel-2100bg.nix b/nixos/modules/hardware/network/intel-2100bg.nix index 89fdce415dd..a54ce30e2d3 100644 --- a/nixos/modules/hardware/network/intel-2100bg.nix +++ b/nixos/modules/hardware/network/intel-2100bg.nix @@ -23,7 +23,7 @@ config = lib.mkIf config.networking.enableIntel2100BGFirmware { - hardware.enableAllFirmware = true; + hardware.enableRedistributalFirmware = true; }; diff --git a/nixos/modules/hardware/network/intel-3945abg.nix b/nixos/modules/hardware/network/intel-3945abg.nix index f4f19d20834..a6e490d9789 100644 --- a/nixos/modules/hardware/network/intel-3945abg.nix +++ b/nixos/modules/hardware/network/intel-3945abg.nix @@ -22,7 +22,7 @@ config = lib.mkIf config.networking.enableIntel3945ABGFirmware { - hardware.enableAllFirmware = true; + hardware.enableRedistributalFirmware = true; }; diff --git a/nixos/modules/hardware/network/intel-4965agn.nix b/nixos/modules/hardware/network/intel-4965agn.nix index 8fecdae36bf..e0bd16a3483 100644 --- a/nixos/modules/hardware/network/intel-4965agn.nix +++ b/nixos/modules/hardware/network/intel-4965agn.nix @@ -1,3 +1,3 @@ { - hardware.enableAllFirmware = true; + hardware.enableRedistributalFirmware = true; } diff --git a/nixos/modules/hardware/network/intel-5000.nix b/nixos/modules/hardware/network/intel-5000.nix index 8fecdae36bf..e0bd16a3483 100644 --- a/nixos/modules/hardware/network/intel-5000.nix +++ b/nixos/modules/hardware/network/intel-5000.nix @@ -1,3 +1,3 @@ { - hardware.enableAllFirmware = true; + hardware.enableRedistributalFirmware = true; } diff --git a/nixos/modules/hardware/network/intel-5150.nix b/nixos/modules/hardware/network/intel-5150.nix index 8fecdae36bf..e0bd16a3483 100644 --- a/nixos/modules/hardware/network/intel-5150.nix +++ b/nixos/modules/hardware/network/intel-5150.nix @@ -1,3 +1,3 @@ { - hardware.enableAllFirmware = true; + hardware.enableRedistributalFirmware = true; } diff --git a/nixos/modules/hardware/network/intel-6000.nix b/nixos/modules/hardware/network/intel-6000.nix index 8fecdae36bf..e0bd16a3483 100644 --- a/nixos/modules/hardware/network/intel-6000.nix +++ b/nixos/modules/hardware/network/intel-6000.nix @@ -1,3 +1,3 @@ { - hardware.enableAllFirmware = true; + hardware.enableRedistributalFirmware = true; } diff --git a/nixos/modules/hardware/network/intel-6000g2a.nix b/nixos/modules/hardware/network/intel-6000g2a.nix index 8fecdae36bf..e0bd16a3483 100644 --- a/nixos/modules/hardware/network/intel-6000g2a.nix +++ b/nixos/modules/hardware/network/intel-6000g2a.nix @@ -1,3 +1,3 @@ { - hardware.enableAllFirmware = true; + hardware.enableRedistributalFirmware = true; } diff --git a/nixos/modules/hardware/network/intel-6000g2b.nix b/nixos/modules/hardware/network/intel-6000g2b.nix index 8fecdae36bf..e0bd16a3483 100644 --- a/nixos/modules/hardware/network/intel-6000g2b.nix +++ b/nixos/modules/hardware/network/intel-6000g2b.nix @@ -1,3 +1,3 @@ { - hardware.enableAllFirmware = true; + hardware.enableRedistributalFirmware = true; } diff --git a/nixos/modules/hardware/network/ralink.nix b/nixos/modules/hardware/network/ralink.nix index 0469ae3a1fb..a15b0f8894b 100644 --- a/nixos/modules/hardware/network/ralink.nix +++ b/nixos/modules/hardware/network/ralink.nix @@ -20,7 +20,7 @@ ###### implementation config = lib.mkIf config.networking.enableRalinkFirmware { - hardware.enableAllFirmware = true; + hardware.enableRedistributalFirmware = true; }; } diff --git a/nixos/modules/hardware/network/rtl8192c.nix b/nixos/modules/hardware/network/rtl8192c.nix index deae6355492..44b4b767d34 100644 --- a/nixos/modules/hardware/network/rtl8192c.nix +++ b/nixos/modules/hardware/network/rtl8192c.nix @@ -20,7 +20,7 @@ ###### implementation config = lib.mkIf config.networking.enableRTL8192cFirmware { - hardware.enableAllFirmware = true; + hardware.enableRedistributalFirmware = true; }; } |