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

Merge pull request #29741 from teh/zhf-17.09

Browse Source 
Python packages updates
This commit is contained in:
Frederik Rietdijk 2017-10-07 11:38:43 +02:00 committed by GitHub
commit e3bda92a1a
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/python-modules/bokeh/default.nix
View File

@ -34,11 +34,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "bokeh"; pname = "bokeh";
name = "${pname}${version}"; name = "${pname}${version}";
version = "0.12.7"; version = "0.12.9";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "2c42c95bf1a418c758dbff8446b4f5e5fc72ac10ea5da4e6b5010067396d0880"; sha256 = "00jx3yycy6fziihz45hwj1dsh520h3vmypp28mw0877rxpxl2yxg";
}; };
disabled = isPyPy; disabled = isPyPy;
@ -79,4 +79,4 @@ buildPythonPackage rec {
homepage = "http://github.com/bokeh/bokeh"; homepage = "http://github.com/bokeh/bokeh";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
}; };
} }

10
pkgs/development/python-modules/xarray/default.nix
View File

@ -5,6 +5,7 @@
, numpy , numpy
, pandas , pandas
, python , python
, fetchurl
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -17,6 +18,15 @@ buildPythonPackage rec {
sha256 = "f649a41d43b5a6c64bdcbd57e994932656b689f9593a86dd0be95778a2b47494"; sha256 = "f649a41d43b5a6c64bdcbd57e994932656b689f9593a86dd0be95778a2b47494";
}; };
# Temporary patch until next release (later than 0.9.6) to fix
# a broken test case.
patches = [
(fetchurl {
url = "https://github.com/pydata/xarray/commit/726c6a3638ecf95889c541d84e892a106c2f2f92.patch";
sha256 = "1i2hsj5v5qlvqfj48vyn9931yndsf4k4wrk3qpqpywh32s7r007b";
})
];
buildInputs = [ pytest ]; buildInputs = [ pytest ];
propagatedBuildInputs = [numpy pandas]; propagatedBuildInputs = [numpy pandas];