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
base: 8ed1e7df1fff
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 5b668388bf6f
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.

While this is not a problem in 19.09, we can still drop the `mkDefault` for `networking.wireless.enable` as it is already `false` by default.

Closes: #72416

(cherry picked from commit 894fdfa)
    @jtojnar
    jtojnar committed Nov 6, 2019
    Copy the full SHA
    ab7f310 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2019

  1. Merge pull request #72951 from jtojnar/nm-prope-merge 

    [19.09] nixos/networkmanager: fix merging options
    @worldofpeace
    worldofpeace committed Nov 7, 2019
    Copy the full SHA
    5b66838 View commit details
    Browse the repository at this point in the history