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: ad02408c7ba2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9965ac017d3e
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 24, 2019

  1. python.pkgs.joblib: 0.12.4 -> 0.13.2 (#57906) 

    (cherry picked from commit 2c07a08)
    @dotlambda
    dotlambda authored and Robert Schütz committed Mar 24, 2019
    Copy the full SHA
    9965ac0 View commit details
Showing with 23 additions and 8 deletions.
  1. +23 −8 pkgs/development/python-modules/joblib/default.nix
31 changes: 23 additions & 8 deletions pkgs/development/python-modules/joblib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchPypi
, fetchpatch
, sphinx
, numpydoc
, pytest
@@ -10,16 +11,30 @@

buildPythonPackage rec {
pname = "joblib";
version = "0.12.4";
version = "0.13.2";

# get full repository inorder to run tests
src = fetchFromGitHub {
owner = "joblib";
repo = pname;
rev = version;
sha256 = "06zszgp7wpa4jr554wkk6kkigp4k9n5ad5h08i6w9qih963rlimb";
src = fetchPypi {
inherit pname version;
sha256 = "315d6b19643ec4afd4c41c671f9f2d65ea9d787da093487a81ead7b0bac94524";
};

# python-lz4 compatibility
# https://github.com/joblib/joblib/pull/847
patches = [
(fetchpatch {
url = https://github.com/joblib/joblib/commit/d3235fd601f40c91e074d48a411d7380329fe155.patch;
sha256 = "1hg1vfbba7mfilrpvmd97s68v03vs4bhlp1c1dj9lizi51mj2q2h";
})
(fetchpatch {
url = https://github.com/joblib/joblib/commit/884c92cd2aa5c2c1975ab48786da75556d779833.patch;
sha256 = "11kvpkvi428dq13ayy7vfyrib8isvcrdw8cd5hxkp5axr7sl12ba";
})
(fetchpatch {
url = https://github.com/joblib/joblib/commit/f1e177d781cc0d64420ec964a0b17d8268cb42a0.patch;
sha256 = "1sq6wcw4bhaq8cqwcd43fdws3467qy342xx3pgv62hp2nn75a21d";
})
];

checkInputs = [ sphinx numpydoc pytest ];
propagatedBuildInputs = [ python-lz4 ];