From 62f4ded8d2ac537cb9755c390c7526f2933f72c2 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Sat, 23 Sep 2017 16:12:44 +0100 Subject: [PATCH 1/3] bokeh: 0.12.7 -> 0.12.9 --- pkgs/development/python-modules/bokeh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 43c176a09ec..a1ae95e6d5d 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -34,11 +34,11 @@ buildPythonPackage rec { pname = "bokeh"; name = "${pname}${version}"; - version = "0.12.7"; + version = "0.12.9"; src = fetchPypi { inherit pname version; - sha256 = "2c42c95bf1a418c758dbff8446b4f5e5fc72ac10ea5da4e6b5010067396d0880"; + sha256 = "00jx3yycy6fziihz45hwj1dsh520h3vmypp28mw0877rxpxl2yxg"; }; disabled = isPyPy; @@ -79,4 +79,4 @@ buildPythonPackage rec { homepage = "http://github.com/bokeh/bokeh"; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} From 8cc240af22eb57284df4b5bca3c9f3332aa96025 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Sat, 23 Sep 2017 16:39:04 +0100 Subject: [PATCH 2/3] flake8-future-import: Add patch to fix tests. --- .../flake8-future-import/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix index f00c1fe2166..2ece8ba85ab 100644 --- a/pkgs/development/python-modules/flake8-future-import/default.nix +++ b/pkgs/development/python-modules/flake8-future-import/default.nix @@ -1,4 +1,5 @@ -{ lib, fetchFromGitHub, buildPythonPackage, python, flake8, six }: +{ lib, fetchFromGitHub, buildPythonPackage, python, flake8, six, + fetchurl }: buildPythonPackage rec { pname = "flake8-future-import"; @@ -11,6 +12,17 @@ buildPythonPackage rec { rev = version; sha256 = "0622bdcfa588m7g8igag6hf4rhjdwh74yfnrjwlxw4vlqhg344k4"; }; + + patches = [ + # Tests in 0.4.3 are broken. We can remove this patch after + # the next release. + (fetchurl { + url = "https://github.com/xZise/flake8-future-import/commit/b4f5a06b22c574fb5270574d1420715667768d5c.patch"; + sha256 = "06n9ggz9p9kiwjb3vmaj44pm5vi4nhgzjfn7i730m85xn67xzmyn"; + }) + ]; + + propagatedBuildInputs = [ flake8 six ]; meta = { homepage = https://github.com/xZise/flake8-future-import; From 83e48f770bcdbbe2479c8424a3a91adf620b2784 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Sun, 24 Sep 2017 14:40:19 +0100 Subject: [PATCH 3/3] xarray: Add upstream patch to fix tests. (#28643) --- pkgs/development/python-modules/xarray/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 7b9712dfd02..1215e613f6f 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -5,6 +5,7 @@ , numpy , pandas , python +, fetchurl }: buildPythonPackage rec { @@ -17,6 +18,15 @@ buildPythonPackage rec { 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 ]; propagatedBuildInputs = [numpy pandas];