Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4835c83e3a1a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d34194baddf1
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 6, 2019

  1. nixos/networkmanager: fix merging options 

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

#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: #72416
    @jtojnar
    jtojnar committed Nov 6, 2019
    Copy the full SHA
    894fdfa View commit details

  2. nixos/networkmanager: fix merging options (#72916) 

    nixos/networkmanager: fix merging options
    @infinisil
    infinisil authored Nov 6, 2019
    Copy the full SHA
    d34194b View commit details
Showing with 13 additions and 9 deletions.
  1. +13 −9 nixos/modules/services/networking/networkmanager.nix
22 changes: 13 additions & 9 deletions nixos/modules/services/networking/networkmanager.nix
View file
Original file line number Diff line number Diff line change
@@ -456,15 +456,19 @@ in {
};

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

(mkIf cfg.enableStrongSwan {
networkmanager.packages = [ pkgs.networkmanager_strongswan ];
})

(mkIf enableIwd {
wireless.iwd.enable = true;
})
];

security.polkit.extraConfig = polkitConf;