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

fetchpatch: Add support for an arbitrary extra prefix #34018

Merged
merged 1 commit into from Jan 18, 2018

Conversation

Ericson2314
Copy link
Member

Motivation for this change

I need this to patch a cloned submodule from upstream for #26799

We still ensure the old and new ones start, respectfully, with a/ and b/. Use with stripLen to ensure tha the old a/ and /b are gone if a new prefix is added.

Things done

I checked (disabling cached builds) that existing uses with or without addPrefixes = true still have the same hash.

  • 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.

We still ensure the old and new ones start, respectfully, with `a/` and
`b/`. Use with `stripLen` to ensure tha the old `a/` and `/b` are gone
if a new prefix is added.
@Ericson2314
Copy link
Member Author

Talked to @fpletz on IRC, and the change looked good to him.

@Ericson2314 Ericson2314 added this to @bgamari's numerous fixes in Cross compilation Jan 18, 2018
@Ericson2314 Ericson2314 moved this from @bgamari's numerous fixes to After big PR in Cross compilation Jan 18, 2018
@Ericson2314 Ericson2314 merged commit 5708396 into NixOS:master Jan 18, 2018
@Ericson2314 Ericson2314 deleted the fetchpatch branch January 18, 2018 17:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
Cross compilation
After big PR
Development

Successfully merging this pull request may close these issues.

None yet

2 participants