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: 4835c83e3a1a
Choose a base ref
...
head repository: NixOS/nixpkgs
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
    Browse the repository at this point in the history

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

    nixos/networkmanager: fix merging options
    @infinisil
    infinisil committed Nov 6, 2019
    Copy the full SHA
    d34194b View commit details
    Browse the repository at this point in the history