Merge branch 'master' into staging-next

2018-08-31 17:32:48 +02:00
parent a9780a095b dde959a896
commit 93550cbddf
497 changed files with 2235 additions and 1360 deletions
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -1,4 +1,4 @@
-{lib, fetchPypi, python, buildPythonPackage, isPyPy, gfortran, pytest, blas, hostPlatform }:
+{ stdenv, lib, fetchPypi, python, buildPythonPackage, isPyPy, gfortran, pytest, blas }:

 buildPythonPackage rec {
  pname = "numpy";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
    ./numpy-distutils-C++.patch
  ];

-  postPatch = lib.optionalString hostPlatform.isMusl ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isMusl ''
    # Use fenv.h
    sed -i \
      numpy/core/src/npymath/ieee754.c.src \