nixos-rebuild: cleanup #368364
Open
nixos-rebuild: cleanup #368364
+153
−150
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
nixos-rebuild is *not* os-specific. It's possible to call it on macOS with --target-host for example. This change brings it closer to nixos-rebuild-ng to make synchronization easier.
Make it slightly more readable
Simplify the script by only using Bash tests instead of a mixture of bash [[ ]] and POSIX [ ] tests. In general, Bash tests are a safer superset as they have less variable escaping issues (eg: [[ -z $foo ]] is fine).
trueNAHO
reviewed
Dec 26, 2024
There was a problem hiding this comment.
Run if result/bin/nixpkgs-vet --base "$base" .; then - pkgs/by-name/ni/nixos-rebuild: File package.nix at line 18 contains the path expression "./../../../../nixos/modules/installer/tools/nix-fallback-paths.nix" which may point outside the directory of that package. This is undesirable because it creates dependencies between internal paths, making it harder to reorganise Nixpkgs in the future. Alternatives include: - If you are creating a new version of a package with a common file between versions, consider following the recommendation in https://github.com/NixOS/nixpkgs/tree/master/pkgs/by-name#recommendation-for-new-packages-with-multiple-versions. - If the path being referenced could be considered a stable interface with multiple uses, consider exposing it via a `pkgs` attribute, then taking it as a attribute argument in package.nix. - If the path being referenced is internal and has multiple uses, consider passing the file as an explicit `callPackage` argument in `pkgs/top-level/all-packages.nix`. - If the path being referenced is internal and will need to be modified independently of the original, consider copying it into the pkgs/by-name/ni/nixos-rebuild directory. This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break. To run locally: ./ci/nixpkgs-vet.sh master https://github.com/NixOS/nixpkgs.git If you're having trouble, ping @NixOS/nixpkgs-vet Error: Process completed with exit code 1.-- https://github.com/NixOS/nixpkgs/actions/runs/12505685594/job/34889420432?pr=368364
Consider replacing
with:
fallback = import "${nixpkgs}/nixos/modules/installer/tools/nix-fallback-paths.nix";
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.
The script is pretty hairy and needed some cleanup. There is nixos-rebuild-ng, but I think nixos-rebuild will still be around for a bit to make those changes worthwhile.
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.