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

nixos/networkmanager: fix merging options

Browse Source 
Incorrect merging of modules resulted in dhcpcd being enabled causing flaky network connection.

https://github.com/NixOS/nixpkgs/pull/64364

Fixing it uncovered an infinite recursion from the same commit, previously masked by the incorrect merge.

We can just drop the `mkDefault` for `networking.wireless.enable` as it is already `false` by default.

Closes: https://github.com/NixOS/nixpkgs/issues/72416
This commit is contained in:
Jan Tojnar 2019-11-06 18:54:56 +01:00
parent 7827d3f449
commit 894fdfaf1f
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nixos/modules/services/networking/networkmanager.nix
View File

@ -456,15 +456,19 @@ in {
}; };
# Turn off NixOS' network management when networking is managed entirely by NetworkManager # Turn off NixOS' network management when networking is managed entirely by NetworkManager
networking = (mkIf (!delegateWireless) { networking = mkMerge [
(mkIf (!delegateWireless) {
useDHCP = false; useDHCP = false;
# Use mkDefault to trigger the assertion about the conflict above })
wireless.enable = mkDefault false;
}) // (mkIf cfg.enableStrongSwan { (mkIf cfg.enableStrongSwan {
networkmanager.packages = [ pkgs.networkmanager_strongswan ]; networkmanager.packages = [ pkgs.networkmanager_strongswan ];
}) // (mkIf enableIwd { })
(mkIf enableIwd {
wireless.iwd.enable = true; wireless.iwd.enable = true;
}); })
];
security.polkit.extraConfig = polkitConf; security.polkit.extraConfig = polkitConf;