nixos/networkmanager: fix merging options #72916
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kamilchm
suggested changes
Nov 6, 2019
There was a problem hiding this comment.
I get an infinite recursion after cherry-picking onto nixos-unstable:
error: while evaluating the attribute 'config.system.build.toplevel' at nixos/modules/system/activation/top-level.nix:274:5:
while evaluating 'foldr' at lib/lists.nix:52:20, called from nixos/modules/system/activation/top-level.nix:138:12:
while evaluating 'fold'' at lib/lists.nix:55:15, called from lib/lists.nix:59:8:
while evaluating the attribute 'assertions' at undefined position:
while evaluating anonymous function at lib/modules.nix:75:45, called from undefined position:
while evaluating the attribute 'value' at lib/modules.nix:336:9:
while evaluating the option `assertions':
while evaluating the attribute 'isDefined' at lib/modules.nix:373:5:
while evaluating the attribute 'values' at lib/modules.nix:362:9:
while evaluating the attribute 'values' at lib/modules.nix:456:7:
while evaluating anonymous function at lib/modules.nix:348:28, called from lib/modules.nix:348:17:
while evaluating 'dischargeProperties' at lib/modules.nix:415:25, called from lib/modules.nix:349:62:
while evaluating the attribute 'condition' at lib/modules.nix:500:14:
while evaluating the attribute 'condition' at lib/modules.nix:500:14:
while evaluating the attribute 'enable' at undefined position:
while evaluating anonymous function at lib/modules.nix:75:45, called from undefined position:
while evaluating the attribute 'value' at lib/modules.nix:336:9:
while evaluating the option `networking.wireless.enable':
while evaluating the attribute 'isDefined' at lib/modules.nix:373:5:
while evaluating the attribute 'values' at lib/modules.nix:362:9:
while evaluating the attribute 'values' at lib/modules.nix:456:7:
while evaluating anonymous function at lib/modules.nix:348:28, called from lib/modules.nix:348:17:
while evaluating 'dischargeProperties' at lib/modules.nix:415:25, called from lib/modules.nix:349:62:
while evaluating 'dischargeProperties' at lib/modules.nix:415:25, called from lib/modules.nix:421:11:
while evaluating the attribute 'condition' at lib/modules.nix:500:14:
while evaluating the attribute 'condition' at lib/modules.nix:500:14:
while evaluating the attribute 'condition' at lib/modules.nix:500:14:
while evaluating the attribute 'networking.wireless.enable' at undefined position:
while evaluating anonymous function at lib/modules.nix:75:45, called from undefined position:
while evaluating the attribute 'value' at lib/modules.nix:336:9:
infinite recursion encountered, at lib/modules.nix:336:9
Incorrect merging of modules resulted in dhcpcd being enabled causing flaky network connection. NixOS#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: NixOS#72416
jtojnar
force-pushed
the
nm-prope-merge
branch
from
819b9c1
to
894fdfa
Compare
jtojnar
added
the
9.needs: port to stable
kamilchm
approved these changes
Nov 6, 2019
10 tasks
infinisil
approved these changes
Nov 6, 2019
worldofpeace
approved these changes
Nov 6, 2019
|
aha! Yes, I've been having some problems and had to manually stop dhcpcd when using NetworkManager. But since that problem only appeared after the iwd changes were merged, I assumed the problem must lie somewhere else. |
|
I'm brewing up some changes to the module system such that this can't happen anymore |
3 tasks
|
[needs: port to stable] can be removed, i suppose. It is hard to see what actually needs port to stable... |
infinisil
removed
the
9.needs: port to stable
|
Sorry, forgot to mention. It was backported in #72951 |
10 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Incorrect merging of modules in #64364 resulted in dhcpcd being enabled causing flaky network connection.
Fixing it uncovered an infinite recursion from the same commit, previously masked by the incorrect merge.
We can just drop the
mkDefaultfornetworking.wireless.enableas it is alreadyfalseby default.Closes: #72416
cc @laikq, @alexeymuranov (reporters), @JohnAZoidberg (cause of breakage), @worldofpeace (backporter)