3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/nixos
Jan Tojnar 894fdfaf1f
nixos/networkmanager: fix merging options
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
2019-11-06 21:26:03 +01:00
..
doc nixos manual: refer to nix and nixpkgs manuals 2019-10-30 10:25:09 +01:00
lib nixos/make-iso9660-image: Fix doc typo 2019-10-18 11:58:28 -07:00
maintainers ec2-amis.nix: add 19.09 amis 2019-10-28 14:04:20 -04:00
modules nixos/networkmanager: fix merging options 2019-11-06 21:26:03 +01:00
tests Merge pull request #72094 from lejonet/ceph-tests 2019-11-02 14:48:42 +01:00
COPYING
default.nix
README
release-combined.nix nixos.tests.fontconfig-default-fonts: init 2019-09-01 00:09:25 -04:00
release-small.nix
release.nix Merge pull request #68265 from tkerber/rpi4 2019-09-27 14:35:17 -04:00

*** NixOS ***

NixOS is a Linux distribution based on the purely functional package
management system Nix.  More information can be found at
http://nixos.org/nixos and in the manual in doc/manual.