diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-13 09:34:39 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-13 09:34:39 +0200 |
commit | 47dcf634bbce3c09170a370715125d9c2a1fcc4d (patch) | |
tree | 4757cb38fc1fa160298ddbdcc187a6aa0a1791f5 | |
parent | d6dec0a9e6857e6e56222ded048d4b73bec3f174 (diff) | |
download | nixpkgs-47dcf634bbce3c09170a370715125d9c2a1fcc4d.tar nixpkgs-47dcf634bbce3c09170a370715125d9c2a1fcc4d.tar.gz nixpkgs-47dcf634bbce3c09170a370715125d9c2a1fcc4d.tar.bz2 nixpkgs-47dcf634bbce3c09170a370715125d9c2a1fcc4d.tar.lz nixpkgs-47dcf634bbce3c09170a370715125d9c2a1fcc4d.tar.xz nixpkgs-47dcf634bbce3c09170a370715125d9c2a1fcc4d.tar.zst nixpkgs-47dcf634bbce3c09170a370715125d9c2a1fcc4d.zip |
python.pkgs.joblib: move expression
-rw-r--r-- | pkgs/development/python-modules/joblib/default.nix | 36 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 26 |
2 files changed, 37 insertions, 25 deletions
diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix new file mode 100644 index 00000000000..f6ead8c8266 --- /dev/null +++ b/pkgs/development/python-modules/joblib/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, sphinx +, numpydoc +, isPy3k +, stdenv +}: + + +buildPythonPackage rec { + pname = "joblib"; + name = "${pname}-${version}"; + version = "0.10.3"; + src = fetchPypi { + inherit pname version; + sha256 = "29b2965a9efbc90a5fe66a389ae35ac5b5b0c1feabfc7cab7fd5d19f429a071d"; + }; + + checkInputs = [ nose sphinx numpydoc ]; + + # Failing test on Python 3.x and Darwin + postPatch = '''' + lib.optionalString (isPy3k || stdenv.isDarwin) '' + sed -i -e '70,84d' joblib/test/test_format_stack.py + # test_nested_parallel_warnings: ValueError: Non-zero return code: -9. + # Not sure why but it's nix-specific. Try removing for new joblib releases. + rm joblib/test/test_parallel.py + ''; + + meta = { + description = "Lightweight pipelining: using Python functions as pipeline jobs"; + homepage = http://pythonhosted.org/joblib/; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c06159eaa3..07e9bce555d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7896,31 +7896,7 @@ in { }; }; - joblib = buildPythonPackage rec { - pname = "joblib"; - name = "${pname}-${version}"; - version = "0.10.3"; - src = pkgs.fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "29b2965a9efbc90a5fe66a389ae35ac5b5b0c1feabfc7cab7fd5d19f429a071d"; - }; - - buildInputs = with self; [ nose sphinx numpydoc ]; - - # Failing test on Python 3.x and Darwin - postPatch = '''' + optionalString (isPy3k || stdenv.isDarwin) '' - sed -i -e '70,84d' joblib/test/test_format_stack.py - # test_nested_parallel_warnings: ValueError: Non-zero return code: -9. - # Not sure why but it's nix-specific. Try removing for new joblib releases. - rm joblib/test/test_parallel.py - ''; - - meta = { - description = "Lightweight pipelining: using Python functions as pipeline jobs"; - homepage = http://pythonhosted.org/joblib/; - license = licenses.bsd3; - }; - }; + joblib = callPackage ../development/python-modules/joblib { }; safe = buildPythonPackage rec { version = "0.4"; |