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.

Sign up for GitHub

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

buildBazelPackage: fix directory symlink handling, disable multithreaded fetching #63580

Merged
merged 2 commits into from Jun 23, 2019
Merged

buildBazelPackage: fix directory symlink handling, disable multithreaded fetching #63580

merged 2 commits into from Jun 23, 2019

Conversation

timokau
Copy link
Member

@timokau timokau commented Jun 20, 2019 •
edited

Motivation for this change

The previous behaviour would work fine as long as symlink is a link to
a file. If is a link to a directory though, the new ln wouldn't
overwrite it but would create a new link in that directory (with the
name of the link source).

Instead, we can precompute the target location, then first remove the
symlink and write the new one in its place.

CC @uri-canva

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@timokau
buildBazelPackage: fix directory symlink handling
0cfd90a 
The previous behaviour would work fine as long as `symlink` is a link to
a file. If is a link to a directory though, the new `ln` wouldn't
overwrite it but would create a new link *in that directory* (with the
name of the link source).

Instead, we can precompute the target location, then first remove the
symlink and write the new one in its place.
@timokau
Copy link
Member Author

timokau commented Jun 20, 2019

This shouldn't cause any changes in existing packages (since if they worked, the symlinks must all have been files and nothing has changed for files).

@timokau
Copy link
Member Author

timokau commented Jun 20, 2019

I pushed another commit that avoids network timeouts due to multithreading.

@timokau timokau changed the title buildBazelPackage: fix directory symlink handling buildBazelPackage: fix directory symlink handling, disable multithreaded fetching Jun 20, 2019
@timokau timokau mentioned this pull request Jun 21, 2019
Closed
10 tasks
@timokau
Copy link
Member Author

timokau commented Jun 22, 2019

Also CC @kalbasit

@kalbasit
Copy link
Member

@GrahamcOfBorg build bazel-watcher

@kalbasit kalbasit merged commit e0c8a45 into NixOS:master Jun 23, 2019
@timokau timokau deleted the bazel-symlink-fix branch June 24, 2019 22:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kalbasit kalbasit kalbasit approved these changes

Assignees
No one assigned
Labels
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
2 participants
@timokau @kalbasit