MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

python: provide hasCxxDistutils attribute for pythonPackages.numpy

Browse source 
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.
This commit is contained in:
Dmitry Kalinkin 2019-04-17 22:57:20 -04:00 committed by Frederik Rietdijk
parent e1502a8be2
commit 8fa36fc8a1
6 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/interpreters/python/cpython/2.7/default.nix
View file

@ -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
pkgs/development/interpreters/python/cpython/default.nix
View file

@ -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
pkgs/development/interpreters/python/default.nix
View file

@ -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
pkgs/development/interpreters/python/pypy/default.nix
View file

@ -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
pkgs/development/interpreters/python/pypy/prebuilt.nix
View file

@ -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
pkgs/development/python-modules/numpy/default.nix
View file

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