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: e1502a8be258
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8fa36fc8a182
Choose a head ref
  • 1 commit
  • 6 files changed
  • 1 contributor

Commits on Apr 28, 2019

  1. python: provide hasCxxDistutils attribute for pythonPackages.numpy 

    Patching numpy.distutils used to be required for pythonPackages.cython
to build on darwin. It was later accidentally disabled during one of the
refactorings, but that did not break cython. This change reinstantiates
the patch. It still applies, so it should be low maintenance and it can
still be useful.
    @veprbl @FRidh
    veprbl authored and FRidh committed Apr 28, 2019
    Copy the full SHA
    8fa36fc View commit details
2 changes: 1 addition & 1 deletion pkgs/development/interpreters/python/cpython/2.7/default.nix
View file
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ let
executable = libPrefix;
pythonVersion = with sourceVersion; "${major}.${minor}";
sitePackages = "lib/${libPrefix}/site-packages";
inherit pythonForBuild;
inherit hasDistutilsCxxPatch pythonForBuild;
} // {
inherit ucsEncoding;
};
2 changes: 1 addition & 1 deletion pkgs/development/interpreters/python/cpython/default.nix
View file
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ let
executable = libPrefix;
pythonVersion = with sourceVersion; "${major}.${minor}";
sitePackages = "lib/${libPrefix}/site-packages";
inherit pythonForBuild;
inherit hasDistutilsCxxPatch pythonForBuild;
};

version = with sourceVersion; "${major}.${minor}.${patch}${suffix}";
3 changes: 2 additions & 1 deletion pkgs/development/interpreters/python/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@ with pkgs;
, pythonVersion
, packageOverrides
, sitePackages
, hasDistutilsCxxPatch
, pythonForBuild
, self
}: let
@@ -40,7 +41,7 @@ with pkgs;
inherit sourceVersion;
pythonAtLeast = lib.versionAtLeast pythonVersion;
pythonOlder = lib.versionOlder pythonVersion;
inherit pythonForBuild;
inherit hasDistutilsCxxPatch pythonForBuild;
};

in {
1 change: 1 addition & 0 deletions pkgs/development/interpreters/python/pypy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -24,6 +24,7 @@ let
executable = "pypy${if isPy3k then "3" else ""}";
pythonForBuild = self; # No cross-compiling for now.
sitePackages = "site-packages";
hasDistutilsCxxPatch = false;
};
pname = passthru.executable;
version = with sourceVersion; "${major}.${minor}.${patch}";
1 change: 1 addition & 0 deletions pkgs/development/interpreters/python/pypy/prebuilt.nix
View file
Original file line number Diff line number Diff line change
@@ -34,6 +34,7 @@ let
executable = "pypy${if isPy3k then "3" else ""}";
pythonForBuild = self; # Not possible to cross-compile with.
sitePackages = "site-packages";
hasDistutilsCxxPatch = false;
};
pname = "${passthru.executable}_prebuilt";
version = with sourceVersion; "${major}.${minor}.${patch}";
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/numpy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ in buildPythonPackage rec {
nativeBuildInputs = [ gfortran pytest ];
buildInputs = [ blas ];

patches = lib.optionals (python.hasDistutilsCxxPatch or false) [
patches = lib.optionals python.hasDistutilsCxxPatch [
# We patch cpython/distutils to fix https://bugs.python.org/issue1222585
# Patching of numpy.distutils is needed to prevent it from undoing the
# patch to distutils.