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: 50a6f2170dc4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 56090c4151b9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 7, 2018

  1. numpy: fix high cpu count bug

    @timokau
    timokau committed Nov 7, 2018
    Copy the full SHA
    0d2483f View commit details

Commits on Nov 8, 2018

  1. Merge pull request #49888 from timokau/numpy-high-cpu-fix 

    numpy: fix high cpu count bug
    @timokau
    timokau authored Nov 8, 2018
    Copy the full SHA
    56090c4 View commit details
Showing with 9 additions and 2 deletions.
  1. +9 −2 pkgs/development/python-modules/numpy/default.nix
11 changes: 9 additions & 2 deletions pkgs/development/python-modules/numpy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchPypi, python, buildPythonPackage, isPyPy, gfortran, pytest, blas }:
{ stdenv, lib, fetchPypi, fetchpatch, python, buildPythonPackage, isPyPy, gfortran, pytest, blas }:

buildPythonPackage rec {
pname = "numpy";
@@ -14,7 +14,14 @@ buildPythonPackage rec {
nativeBuildInputs = [ gfortran pytest ];
buildInputs = [ blas ];

patches = lib.optionals (python.hasDistutilsCxxPatch or false) [
patches = [
# fix a bug with high cpu count (https://github.com/numpy/numpy/issues/12087)
(fetchpatch {
name = "limit-default-for-get_num_build_jobs-to-8.patch";
url = "https://github.com/numpy/numpy/commit/4c05fed01c68a305abf62135695bc61606746683.patch";
sha256 = "1j2jlaibbx1fjszxzkgxrz7k8id34kg3gbc2fh4ib6y7hfnbqqz5";
})
] ++ lib.optionals (python.hasDistutilsCxxPatch or false) [
# 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.