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

unpackPhase: Handle sources starting with a hyphen #34247

Merged
merged 1 commit into from Jan 25, 2018
Merged

unpackPhase: Handle sources starting with a hyphen #34247

merged 1 commit into from Jan 25, 2018

Conversation

shlevy
Copy link
Member

@shlevy shlevy commented Jan 25, 2018

Motivation for this change

Builds fail if your src has a name starting with a hyphen.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@orivej
Copy link
Contributor

orivej commented Jan 25, 2018

Isn't the path to src always in /nix/store and absolute?

orivej
orivej approved these changes Jan 25, 2018
View reviewed changes
Copy link
Contributor

@orivej orivej left a comment

Choose a reason for hiding this comment

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

stripHash "$fn" may leave hyphen in front…

It looks like this PR is enough to support such source names.

@shlevy shlevy merged commit f83b6e1 into NixOS:staging Jan 25, 2018
@shlevy shlevy deleted the default-unpack-hyphenated-names branch January 25, 2018 13:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@orivej orivej orivej approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 501+ 10.rebuild-darwin-stdenv 10.rebuild-linux: 501+ 10.rebuild-linux-stdenv
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@shlevy @orivej @GrahamcOfBorg