nixpkgs module: Fix defaulting of localSystem and system#40708
Merged
matthewbauer merged 1 commit intoNixOS:masterfrom May 31, 2018
Merged
nixpkgs module: Fix defaulting of localSystem and system#40708matthewbauer merged 1 commit intoNixOS:masterfrom
localSystem and system#40708matthewbauer merged 1 commit intoNixOS:masterfrom
Conversation
My c6f7d43 made the mistake of not having enough defaults. Now both variables are default as the *explicit* value of the other, or a fallback. The fallback of `system` is the default of `localSystem.system`. The fallback of `localSystem` is not the other default (projected), as that would cause a cycle, but `{ system = builtins.currentTime; }` just as nixpkgs itself does it.
GrahamcOfBorg
added
6.topic: nixos
Member
😲 |
Member
|
Also I'm super excited to test this, thanks!! (but not sure when I'll get to it... hopefully soon!) |
matthewbauer
approved these changes
May 30, 2018
Ericson2314
added a commit
to obsidiansystems/nixpkgs
that referenced
this pull request
Sep 7, 2018
Take two of NixOS#40708 (4fe2898). That PR attempted to bidirectionally default `config.nixpkgs.system` and `config.nixpkgs.localSystem.system` to each be updated by the other. But this is not possible with the way the module system works. Divergence in certain cases in inevitable. This PR is more conservative and just has `system` default `localSystem` and `localSystem` make the final call as-is. This solves a number of issues. - `localSystem` completely overrides `system`, just like with nixpkgs proper. There is no need to specify `localSystem.system` to clobber the old system. - `config.nixpkgs.localSystem` is exactly what is passed to nixpkgs. No spooky steps. - `config.nixpkgs.localSystem` is elaborated just as nixpkgs would so that all attributes are available, not just the ones the user specified. The remaining issue is just that `config.nixpkgs.system` doesn't update based on `config.nixpkgs.localSystem.system`. It should never be referred to lest it is a bogus stale value because `config.nixpkgs.localSystem` overwrites it. Fixes NixOS#46320
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Motivation for this change
My c6f7d43 made the mistake of not
having enough defaults. Now both variables are default as the explicit
value of the other, or a fallback. The fallback of
systemis thedefault of
localSystem.system. The fallback oflocalSystemis notthe other default (projected), as that would cause a cycle, but
{ system = builtins.currentTime; }just as nixpkgs itself does it.Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)CC @ElvishJerricco