colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/hostapd: fix regression after refactoring to RFC42.

Browse Source 
Switching from submodule notation from ({name, ...}: {}) to (submob: {}) seems to require a different accessing scheme.
This commit is contained in:
oddlama 2023-07-25 18:40:51 +02:00
parent 7ce0abe77d
commit 0ac2ba763f
No known key found for this signature in database
GPG Key ID: 14EFE510775FE39A
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/services/networking/hostapd.nix
View File

@ -921,9 +921,7 @@ in {
};
config = let
bss = bssSubmod.name;
bssCfg = bssSubmod.config;
pairwiseCiphers =
concatStringsSep " " (unique (bssCfg.authentication.pairwiseCiphers
++ optionals bssCfg.authentication.enableRecommendedPairwiseCiphers ["CCMP" "CCMP-256" "GCMP" "GCMP-256"]));
@ -964,9 +962,9 @@ in {
} // optionalAttrs (bssCfg.bssid != null) {
bssid = bssCfg.bssid;
} // optionalAttrs (bssCfg.macAllow != [] || bssCfg.macAllowFile != null || bssCfg.authentication.saeAddToMacAllow) {
accept_mac_file = "/run/hostapd/${bss}.mac.allow";
accept_mac_file = "/run/hostapd/${bssCfg._module.args.name}.mac.allow";
} // optionalAttrs (bssCfg.macDeny != [] || bssCfg.macDenyFile != null) {
deny_mac_file = "/run/hostapd/${bss}.mac.deny";
deny_mac_file = "/run/hostapd/${bssCfg._module.args.name}.mac.deny";
} // optionalAttrs (bssCfg.authentication.mode == "none") {
wpa = mkDefault 0;
} // optionalAttrs (bssCfg.authentication.mode == "wpa3-sae") {
@ -1051,7 +1049,6 @@ in {
};
config.settings = let
radio = radioSubmod.name;
radioCfg = radioSubmod.config;
in {
driver = radioCfg.driver;

1
nixos/tests/wpa_supplicant.nix
View File

@ -34,6 +34,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...}:
ssid = "nixos-test-mixed";
authentication = {
mode = "wpa3-sae-transition";
saeAddToMacAllow = true;
saePasswordsFile = pkgs.writeText "password" "reproducibility";
wpaPasswordFile = pkgs.writeText "password" "reproducibility";
};