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

python35: fix build on macOS #57215

Merged
merged 1 commit into from Mar 10, 2019
Merged

python35: fix build on macOS #57215

merged 1 commit into from Mar 10, 2019

Conversation

strager
Copy link
Contributor

@strager strager commented Mar 10, 2019

Motivation for this change

The upstream patch for distutils does not apply cleanly to Python 3.5's sources. Fix the patch to make python35 build on macOS.

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 nox --run "nox-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.

@strager
python35: fix build on macOS
bbed4c3 
The upstream patch for distutils does not apply cleanly to Python 3.5's
sources. Fix the patch to make python35 build on macOS.
@strager strager requested a review from FRidh as a code owner March 10, 2019 04:56
@GrahamcOfBorg GrahamcOfBorg added the 6.topic: darwin Running or building packages on Darwin label Mar 10, 2019
@strager
Copy link
Contributor Author

strager commented Mar 10, 2019 •
edited

How can I apply this patch to both master and release-19.03 (#56826)?

@vcunat vcunat added the 9.needs: port to stable A PR needs a backport to the stable release. label Mar 10, 2019
@vcunat
Copy link
Member

vcunat commented Mar 10, 2019

After this PR gets merged, it should be cherry-picked. I think it's easiest when the "merger person" does that directly.

@vcunat
Copy link
Member

vcunat commented Mar 10, 2019

@GrahamcOfBorg build python35 python python3

@FRidh FRidh merged commit 0bf2d63 into NixOS:master Mar 10, 2019
@vcunat vcunat added 8.has: port to stable A PR already has a backport to the stable release. and removed 9.needs: port to stable A PR needs a backport to the stable release. labels Mar 10, 2019
@strager
Copy link
Contributor Author

strager commented Mar 11, 2019

It looks like my patch got merged into release-19.03 already (as a part of commit 72ad05b (#57253)? I can't really tell...).

@FRidh
Copy link
Member

FRidh commented Mar 11, 2019

Yes, I backported it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh Awaiting requested review from FRidh FRidh is a code owner

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 6.topic: python 8.has: port to stable A PR already has a backport to the stable release. 10.rebuild-darwin: 1-10 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@strager @vcunat @FRidh @GrahamcOfBorg