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

Jump to bottom

Fix docker tools nix symlinks #91085

Merged
merged 2 commits into from Jun 19, 2020
Merged

Fix docker tools nix symlinks #91085

merged 2 commits into from Jun 19, 2020

Conversation

roberth
Copy link
Member

@roberth roberth commented Jun 19, 2020

Motivation for this change

tar transforms were breaking the symlink targets in the nix package when packaged as a layered image.

Things done
  • 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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@roberth roberth requested a review from tfc June 19, 2020 08:12
@nlewo
Copy link
Member

nlewo commented Jun 19, 2020

@GrahamcOfBorg test docker-tools

@tfc
Copy link
Contributor

tfc commented Jun 19, 2020

lgtm, but there is a strange fail in the borg test in the python stuff that somehow does not look like it's really from your changes...

@roberth
Copy link
Member Author

roberth commented Jun 19, 2020

The same test does succeed on aarch64-linux and I had no issues running it locally multiple times while working on this. I'll assume it's unrelated to this change.

@roberth roberth merged commit 0646949 into NixOS:master Jun 19, 2020
@roberth
Copy link
Member Author

roberth commented Jun 24, 2020 •
edited

To provide some context, this was caused by hercules-ci@886c923 which seems to be a port of the idea of https://github.com/NixOS/nixpkgs/pull/58431/files.
Ultimately this is a fix for a fix https://github.com/NixOS/nixpkgs/pull/75911/files. Replacement of this code by #91084 seems like a good way forward. (Interesting coincidence that it's exactly the PR before this one...)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nlewo nlewo nlewo approved these changes

@tfc tfc Awaiting requested review from tfc

Assignees
No one assigned
Labels
6.topic: nixos 8.has: documentation 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@roberth @nlewo @tfc