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/installer: Make nixos-rebuild test and dry-activate not create a symlink in the current directory #84996

Closed
wants to merge 1 commit into from

Conversation

jakobrs
Copy link
Contributor

@jakobrs jakobrs commented Apr 11, 2020

Motivation for this change

Before this commit, nixos-rebuild test and dry-activate would create a ./result symlink in the current directory. This commit makes them not do that. See #12665, specifically this comment. There's some more information in the commit message.

Things done

Note: I have not been able to test the flake-specific code. I've also had to comment out line 256 to 262 to prevent nixos-rebuild from execing the "broken" version of itself.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
    • Up by 432 bytes
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

…a symlink in the current directory

The section for `test`, `build`, `dry-build`, and `dry-activate` has been
split into two separate cases, one for `build` and one for the rest. The
handling for `build` is identical to how it was before, but the others use
--no-out-link to not create a result symlink in the current directory.

Note that this actually doesn't matter for `dry-build`. I've grouped `dry-build`
with `test` and `dry-activate` since it shouldn't create a ./result symlink
(which it doesn't do anyway)
if [[ -z $flake ]]; then
pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A system -k "${extraBuildFlags[@]}")"
else
nix build "$flake#$flakeAttr.config.system.build.toplevel" "${extraBuildFlags[@]}" "${lockFlags[@]}"
pathToConfig="$(readlink -f ./result)"
fi
elif [ "$action" = test -o "$action" = dry-build -o "$action" = dry-activate ]; then
if [[ -z $flake ]]; then
pathToConfig="$(nixBuild '<nixpkgs/nixos>' --no-out-link -A system -k "${extraBuildFlags[@]}")"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't it be easier to just add --no-out-link to extraBuildFlags?

Copy link
Contributor Author

@jakobrs jakobrs Apr 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem is that the flake-specific part is structured differently in the build and the test cases. The nix-command equivalent to --no-out-link seems to be called --no-link, but the code that's already there (L418-421) didn't use it and I assumed that maybe there's a reason why.

@Ma27 Ma27 requested a review from edolstra April 11, 2020 16:01
@stale
Copy link

stale bot commented Oct 9, 2020

Hello, I'm a bot and I thank you in the name of the community for your contributions.

Nixpkgs is a busy repository, and unfortunately sometimes PRs get left behind for too long. Nevertheless, we'd like to help committers reach the PRs that are still important. This PR has had no activity for 180 days, and so I marked it as stale, but you can rest assured it will never be closed by a non-human.

If this is still important to you and you'd like to remove the stale label, we ask that you leave a comment. Your comment can be as simple as "still important to me". But there's a bit more you can do:

If you received an approval by an unprivileged maintainer and you are just waiting for a merge, you can @ mention someone with merge permissions and ask them to help. You might be able to find someone relevant by using Git blame on the relevant files, or via GitHub's web interface. You can see if someone's a member of the nixpkgs-committers team, by hovering with the mouse over their username on the web interface, or by searching them directly on the list.

If your PR wasn't reviewed at all, it might help to find someone who's perhaps a user of the package or module you are changing, or alternatively, ask once more for a review by the maintainer of the package/module this is about. If you don't know any, you can use Git blame on the relevant files, or GitHub's web interface to find someone who touched the relevant files in the past.

If your PR has had reviews and nevertheless got stale, make sure you've responded to all of the reviewer's requests / questions. Usually when PR authors show responsibility and dedication, reviewers (privileged or not) show dedication as well. If you've pushed a change, it's possible the reviewer wasn't notified about your push via email, so you can always officially request them for a review, or just @ mention them and say you've addressed their comments.

Lastly, you can always ask for help at our Discourse Forum, or more specifically, at this thread or at #nixos' IRC channel.

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Oct 9, 2020
@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jan 18, 2021
@stale
Copy link

stale bot commented Jul 19, 2021

I marked this as stale due to inactivity. → More info

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jul 19, 2021
@jakobrs
Copy link
Contributor Author

jakobrs commented Jul 20, 2021

nixos-rebuild.sh has changed since I wrote this, and fixing the merge conflicts would mean re-implementing the PR.

@jakobrs jakobrs closed this Jul 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants