lol

nixos/hostapd: fix regression after refactoring to RFC42. Switching from submodule notation from ({name, ...}: {}) to (submob: {}) seems to require a different accessing scheme.

oddlama 0ac2ba76 7ce0abe7

+3 -5
+2 -5
nixos/modules/services/networking/hostapd.nix
··· 921 921 }; 922 922 923 923 config = let 924 - bss = bssSubmod.name; 925 924 bssCfg = bssSubmod.config; 926 - 927 925 pairwiseCiphers = 928 926 concatStringsSep " " (unique (bssCfg.authentication.pairwiseCiphers 929 927 ++ optionals bssCfg.authentication.enableRecommendedPairwiseCiphers ["CCMP" "CCMP-256" "GCMP" "GCMP-256"])); ··· 964 962 } // optionalAttrs (bssCfg.bssid != null) { 965 963 bssid = bssCfg.bssid; 966 964 } // optionalAttrs (bssCfg.macAllow != [] || bssCfg.macAllowFile != null || bssCfg.authentication.saeAddToMacAllow) { 967 - accept_mac_file = "/run/hostapd/${bss}.mac.allow"; 965 + accept_mac_file = "/run/hostapd/${bssCfg._module.args.name}.mac.allow"; 968 966 } // optionalAttrs (bssCfg.macDeny != [] || bssCfg.macDenyFile != null) { 969 - deny_mac_file = "/run/hostapd/${bss}.mac.deny"; 967 + deny_mac_file = "/run/hostapd/${bssCfg._module.args.name}.mac.deny"; 970 968 } // optionalAttrs (bssCfg.authentication.mode == "none") { 971 969 wpa = mkDefault 0; 972 970 } // optionalAttrs (bssCfg.authentication.mode == "wpa3-sae") { ··· 1051 1049 }; 1052 1050 1053 1051 config.settings = let 1054 - radio = radioSubmod.name; 1055 1052 radioCfg = radioSubmod.config; 1056 1053 in { 1057 1054 driver = radioCfg.driver;
+1
nixos/tests/wpa_supplicant.nix
··· 34 34 ssid = "nixos-test-mixed"; 35 35 authentication = { 36 36 mode = "wpa3-sae-transition"; 37 + saeAddToMacAllow = true; 37 38 saePasswordsFile = pkgs.writeText "password" "reproducibility"; 38 39 wpaPasswordFile = pkgs.writeText "password" "reproducibility"; 39 40 };