public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #64236 from NixOS/staging-next

Browse Source 
Staging next
This commit is contained in:
Frederik Rietdijk
2019-07-10 08:52:04 +02:00
committed by GitHub
parent d2c3c1f2bb 74c24385cb
commit fb6260fcf7
203 changed files with 5311 additions and 3760 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/python-modules/distutils-cfg/default.nix
View File

@@ -21,7 +21,7 @@ in stdenv.mkDerivation {
buildInputs = [ python ];
unpackPhase = "true";
dontUnpack = true;
installPhase = ''
dest="$out/lib/${python.libPrefix}/site-packages/distutils"

2
pkgs/development/python-modules/recursive-pth-loader/default.nix
View File

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.0";
name = pname + "-" + version;
unpackPhase = "true";
dontUnpack = true;
buildInputs = [ python ];

3
pkgs/development/python-modules/scikitlearn/default.nix
View File

@@ -7,14 +7,13 @@
, cython
, joblib
, llvmPackages
, pythonOlder
}:
buildPythonPackage rec {
pname = "scikit-learn";
version = "0.21.2";
# UnboundLocalError: local variable 'message' referenced before assignment
disabled = stdenv.isi686 || (pythonOlder "3.5"); # https://github.com/scikit-learn/scikit-learn/issues/5534
disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534
src = fetchPypi {
inherit pname version;