Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 001cf3f926af
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2379e36124a0
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 4, 2020

  1. python39: fix build on macOS

    Basically the same changes as in 81d1594 but for python3.9 instead of python3.8.
    Luflosi authored and FRidh committed Jun 4, 2020
    Copy the full SHA
    2379e36 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/development/interpreters/python/cpython/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/python/cpython/default.nix
Original file line number Diff line number Diff line change
@@ -107,7 +107,7 @@ in with passthru; stdenv.mkDerivation {
# Backport a fix for discovering `rpmbuild` command when doing `python setup.py bdist_rpm` to 3.5, 3.6, 3.7.
# See: https://bugs.python.org/issue11122
./3.7/fix-hardcoded-path-checking-for-rpmbuild.patch
] ++ optionals (isPy37 || isPy38) [
] ++ optionals (isPy37 || isPy38 || isPy39) [
# Fix darwin build https://bugs.python.org/issue34027
./3.7/darwin-libutil.patch
] ++ optionals (isPy3k && hasDistutilsCxxPatch) [
@@ -118,7 +118,7 @@ in with passthru; stdenv.mkDerivation {
(
if isPy35 then
./3.5/python-3.x-distutils-C++.patch
else if isPy37 || isPy38 then
else if isPy37 || isPy38 || isPy39 then
./3.7/python-3.x-distutils-C++.patch
else
fetchpatch {