nixos-{rebuild; install}: rework logic; use system.nix
#389487
Conversation
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
2 tasks
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/pinning-nixos-with-npins/63721/3 |
Otherwise we'd run into trouble when a filename contained e.g. a space
previously flake and buildingFile variables were used to deduce which method to use this originally came to that because flake variable was used to check if script is building flake or module after introduction of buildingFile variable, some parts got messy, checking if building flake was with -z $flake, checking if building module was with -n $flake, and checking if building by attrset was with -n $buildingFile don't forget about $noFlake in that mess using single variable to check which build method to use between two is fine, but when more methods are added, in my opinion it's better to use associative array using it also allows us easily check if user didn't use arguments from different build methods at the same time
nixos-rebuild now detects by-attrset configurations differently. The configuration file of by-attrset format is now detected by system.nix filename instead of default.nix, but manual didn't reflect that.
Use similar mechanism to what nixos-rebuild uses to evaluate which configuration file, and format, to build
nixos-install now detects by-attrset configurations differently, and uses system.nix filename instead of default.nix
e8f4dba to
53a47a1
Compare
|
I rebased onto current master, last time I forgot to remove old check that still used old $buildingAttribute variable |
|
It's probably too late for 25.05, but can we get things going so this PR can get into the next release? |
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.
previously flake and buildingFile variables were used to deduce which method to use this originally came to that, because flake variable was used to check if script is building flake or module
after introduction of buildingFile variable, some parts got messy,
checking if building flake was with -z $flake, checking if building module was with -n $flake, and checking if building by attrset was with -n $buildingFile
using single variable to check which build method to use between two is fine, but when more methods are added, in my opinion it's better to use associative array
resolves issues pointed in #333788
issue for by-attrset build method quoted above is resolved in the following way:
nixos-systementry in nix pathdefault.nixand warn about itsystem.nixsupercedes #333788
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.