python37: fix build on macOS #59619
Merged
python37: fix build on macOS #59619
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The upstream patch for distutils does not apply cleanly to Python 3.7.3's sources. (The patch applies cleanly to Python 3.7.2's sources, but nixpkgs commit 0ddae82 upgraded Python to 3.7.3.) Fix the patch to make python37 build on macOS.
GrahamcOfBorg
added
6.topic: darwin
LnL7
reviewed
Apr 15, 2019
| @@ -104,6 +104,8 @@ in with passthru; stdenv.mkDerivation { | |||
| ( | |||
| if isPy35 then | |||
| ./3.5/python-3.x-distutils-C++.patch | |||
| else if isPy37 then | |||
| ./3.7/python-3.x-distutils-C++.patch | |||
There was a problem hiding this comment.
We can't fetch this from somewhere?
There was a problem hiding this comment.
@LnL7 We used to upload those to the python bug tracker. But it's done inconsistently with unclear naming and the changes to the patches that we are providing are not very meaningful, so we might be better off maintaining those in our tree.
There was a problem hiding this comment.
Ok. Tested a few packages, this can go straight to master since it's broken at the moment.
veprbl
added
the
9.needs: port to stable
LnL7
added
the
8.has: port to stable
veprbl
removed
the
9.needs: port to stable
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
The upstream patch for distutils does not apply cleanly to Python 3.7.3's sources. (The patch applies cleanly to Python 3.7.2's sources, but nixpkgs commit 0ddae82 upgraded Python to 3.7.3.) Fix the patch to make python37 build on macOS.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)