Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nixos: use substitute rather than substituteAll in installer modules #300329

Closed

Conversation

philiptaron
Copy link
Contributor

Description of changes

Rationale is here:

There's mostly no change to the files. I did make two bug fixes:

  1. In nixos/modules/installer/tools/nixos-install.sh, there is no nix replacement variable, but there is a path substitution, so I added config.nix.package.out to the path.
  2. In nixos/modules/installer/tools/nixos-enter.sh, there was no path replacement variable; I added it.

These changes validate the logic that motivated opening #237216. It's too easy to write a bug!

Previously:

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@philiptaron philiptaron requested a review from samueldr as a code owner March 30, 2024 21:54
@philiptaron philiptaron changed the title nixos: use substitute rather than substituteAll in select modules nixos: use substitute rather than substituteAll in installer modules Mar 30, 2024
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Mar 30, 2024
@philiptaron philiptaron requested a review from roberth March 30, 2024 21:54
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants