Skip to content

Commit 5db1750

Browse files
brianmcgeemergify[bot]
authored andcommitted
fix(networking): default vendor and device to {}
Closes #54
1 parent 3801c87 commit 5db1750

File tree

2 files changed

+20
-4
lines changed

2 files changed

+20
-4
lines changed

modules/nixos/networking/broadcom.nix

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ in
88
full_mac.enable = mkEnableOption "Enable the Facter Broadcom Full MAC module" // {
99

1010
default = lib.any (
11-
{ vendor, device, ... }:
11+
{
12+
vendor ? { },
13+
device ? { },
14+
...
15+
}:
1216
# vendor (0x14e4) Broadcom Inc. and subsidiaries
1317
(vendor.value or 0) == 5348
1418
&& (lib.elem (device.value or 0) [
@@ -36,7 +40,11 @@ in
3640
sta.enable = mkEnableOption "Enable the Facter Broadcom STA module" // {
3741

3842
default = lib.any (
39-
{ vendor, device, ... }:
43+
{
44+
vendor ? { },
45+
device ? { },
46+
...
47+
}:
4048
# vendor (0x14e4) Broadcom Inc. and subsidiaries
4149
(vendor.value or 0) == 5348
4250
&& (lib.elem (device.value or 0) [

modules/nixos/networking/intel.nix

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ in
88
_2200BG.enable = mkEnableOption "Enable the Facter Intel 2200BG module" // {
99

1010
default = lib.any (
11-
{ vendor, device, ... }:
11+
{
12+
vendor ? { },
13+
device ? { },
14+
...
15+
}:
1216
# vendor (0x8086) Intel Corp.
1317
(vendor.value or 0) == 32902
1418
&& (lib.elem (device.value or 0) [
@@ -26,7 +30,11 @@ in
2630
_3945ABG.enable = mkEnableOption "Enable the Facter Intel 3945ABG module" // {
2731

2832
default = lib.any (
29-
{ vendor, device, ... }:
33+
{
34+
vendor ? { },
35+
device ? { },
36+
...
37+
}:
3038
# vendor (0x8086) Intel Corp.
3139
(vendor.value or 0) == 32902
3240
&& (lib.elem (device.value or 0) [

0 commit comments

Comments
 (0)