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

Fix stdenv-native and fix rebasing on cygwin #38932

Merged
merged 2 commits into from
Apr 18, 2018
Merged

Fix stdenv-native and fix rebasing on cygwin #38932

merged 2 commits into from
Apr 18, 2018
+14 −5

Conversation

svanderburg
Copy link
Member

Motivation for this change

As described in issue #38825, stdenv-native is broken on master and release-18.03 because the mandatory bintools parameter is not propagated. This pull requests fixes this.

Furthermore, on Cygwin rebasing is also broken. When I try to build any package on Cygwin, it will show:

rebase: Invalid Baseaddress 0x200000000, must be > 0x200000000

It appears that increasing the base offset by 1 seems to do the trick.

In addition to merging this to master, you probably want to cherry pick and apply this to release-18.03 as well -- it has exactly the same problem.

Things done

Compose a bintools package, change the base offset

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

Sorry, something went wrong.

@svanderburg
Fix stdenv-native by creating a bintools wrapper with similar settings

Verified

This commit was signed with the committer’s verified signature.
jaraco Jason R. Coombs
GPG key ID: 708E6CB181B4C47E
Verified
Learn about vigilant mode
5a545ca
@svanderburg
Fix invalid Baseaddress must be > 0x200000000 on cygwin
a7adffd
@GrahamcOfBorg GrahamcOfBorg added 6.topic: stdenv Standard environment 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Apr 14, 2018
@svanderburg
Copy link
Member Author

@vcunat @Ericson2314 What do you think about these changes? From the commit history I see that you both are involved in these areas.

I have the rights to merge this myself, but since this affects stdenv, and stdenv affects pretty much everything else, I don't just want to push this without anyone else reviewing.

As far as I can see, it will not trigger a mass rebuild, since only the native stdenv and cygwin areas are affected. Linux and darwin are untouched.

@Ericson2314 Ericson2314 merged commit 204b73f into NixOS:master Apr 18, 2018
@Ericson2314
Copy link
Member

Ericson2314 commented Apr 18, 2018 •
edited
Loading

Thanks for pinging me! No idea what this rebase thing is, but whatever. The nix changes definitely look good, so thanks so much!

CC @thoughtpolice you wanted this; now you have it :).

@svanderburg svanderburg deleted the cygwin-fixes branch April 19, 2018 08:21
@thoughtpolice
Copy link
Member

Haha -- thanks a lot Sander, and thanks John for the ping on this! I'll get around to seeing how this works sometime this week I hope...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: stdenv Standard environment 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@svanderburg @Ericson2314 @thoughtpolice @GrahamcOfBorg