From cd528ddd8ec8bfb17a71ba526e71c3053929feeb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:44:17 +0100
Subject: [PATCH 01/63] python: spyder: 3.2.6 -> 3.2.7
---
pkgs/applications/science/spyder/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix
index 04a5def81e6..ed6e6334a5d 100644
--- a/pkgs/applications/science/spyder/default.nix
+++ b/pkgs/applications/science/spyder/default.nix
@@ -10,11 +10,11 @@
buildPythonApplication rec {
pname = "spyder";
- version = "3.2.6";
+ version = "3.2.7";
src = fetchPypi {
inherit pname version;
- sha256 = "87d6a4f5ee1aac4284461ee3584c3ade50cb53feb3fe35abebfdfb9be18c526a";
+ sha256 = "b5bb8fe0a556930dc09b68fa2741a0de3da6488843ec960e0c62f1f3b2e08e2f";
};
# Somehow setuptools can't find pyqt5. Maybe because the dist-info folder is missing?
From c96c80365dafebb10b74b7101a6db256f77f97c8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:44:22 +0100
Subject: [PATCH 02/63] python: nbstripout: 0.3.0 -> 0.3.1
---
pkgs/applications/version-management/nbstripout/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix
index c4c09094edd..324bbf690d5 100644
--- a/pkgs/applications/version-management/nbstripout/default.nix
+++ b/pkgs/applications/version-management/nbstripout/default.nix
@@ -3,7 +3,7 @@
with python2Packages;
buildPythonApplication rec {
name = "${pname}-${version}";
- version = "0.3.0";
+ version = "0.3.1";
pname = "nbstripout";
# Mercurial should be added as a build input but because it's a Python
@@ -14,7 +14,7 @@ buildPythonApplication rec {
src = fetchPypi {
inherit pname version;
- sha256 = "126xhjma4a0k7gq58hbqglhb3rai0a576azz7g8gmqjr3kl0264v";
+ sha256 = "b997c99b8bbb865988202d2f005cdaabb2598b07dad891c302a147a5871a4a95";
};
# for some reason, darwin uses /bin/sh echo native instead of echo binary, so
From 1fdb74a217c6c0888fdd8573d00564bc75f2ed70 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:44:27 +0100
Subject: [PATCH 03/63] python: aiohttp: 3.0.3 -> 3.0.4
---
pkgs/development/python-modules/aiohttp/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 53635e7d53a..0788d1d5388 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "aiohttp";
- version = "3.0.3";
+ version = "3.0.4";
src = fetchPypi {
inherit pname version;
- sha256 = "a96be9189b2d51e366106e4207c9afaf3d69462562548a613e399c311ff70b88";
+ sha256 = "6569b8850103595be10fcfa1fa911b01f876651921f52d769017b21d822e5dc3";
};
disabled = pythonOlder "3.4";
From 66d74b6f3dc8797c008713534e7b6502f65ac45b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:44:32 +0100
Subject: [PATCH 04/63] python: astral: 1.5 -> 1.6
---
pkgs/development/python-modules/astral/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix
index c6a3ac47aa7..46b4b6bc8ea 100644
--- a/pkgs/development/python-modules/astral/default.nix
+++ b/pkgs/development/python-modules/astral/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "astral";
- version = "1.5";
+ version = "1.6";
src = fetchPypi {
inherit pname version;
- sha256 = "527628fbfe90c1596c3950ff84ebd07ecc10c8fb1044c903a0519b5057700cb6";
+ sha256 = "874b397ddbf0a4c1d8d644b21c2481e8a96b61343f820ad52d8a322d61a15083";
};
propagatedBuildInputs = [ pytz ];
From 7fd6793bfe7b6406d1f40182b7c8d6d2bbc8f40d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:44:37 +0100
Subject: [PATCH 05/63] python: cached-property: 1.3.1 -> 1.4.0
---
pkgs/development/python-modules/cached-property/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/cached-property/default.nix b/pkgs/development/python-modules/cached-property/default.nix
index 6ab5015a1e7..1cd8e36594b 100644
--- a/pkgs/development/python-modules/cached-property/default.nix
+++ b/pkgs/development/python-modules/cached-property/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "cached-property";
- version = "1.3.1";
+ version = "1.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "6562f0be134957547421dda11640e8cadfa7c23238fc4e0821ab69efdb1095f3";
+ sha256 = "a2fa0f89dd422f7e5dd992a4a3e0ce209d5d1e47a4db28fd0a7b5273ec8da3f0";
};
checkInputs = [ freezegun ];
From 4aaab4bd15dd15ea533d42a790a5ac6d73748f9a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:44:42 +0100
Subject: [PATCH 06/63] python: cachetools: 1.1.3 -> 2.0.1
---
pkgs/development/python-modules/cachetools/1.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/cachetools/1.nix b/pkgs/development/python-modules/cachetools/1.nix
index edfe965fa80..6daa735cfae 100644
--- a/pkgs/development/python-modules/cachetools/1.nix
+++ b/pkgs/development/python-modules/cachetools/1.nix
@@ -3,12 +3,12 @@
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "cachetools";
- version = "1.1.3";
+ version = "2.0.1";
disabled = isPyPy; # a test fails
src = fetchPypi {
inherit pname version;
- sha256 = "0js7qx5pa8ibr8487lcf0x3a7w0xml0wa17snd6hjs0857kqhn20";
+ sha256 = "ede01f2d3cbd6ddc9e35e16c2b0ce011d8bb70ce0dbaf282f5b4df24b213bc5d";
};
meta = with stdenv.lib; {
From d9c2da634fe284971d742ef11f856794b9de88a2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:44:47 +0100
Subject: [PATCH 07/63] python: python-can: 2.0.0 -> 2.1.0
---
pkgs/development/python-modules/can/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix
index fbb53828d2a..395122b4da9 100644
--- a/pkgs/development/python-modules/can/default.nix
+++ b/pkgs/development/python-modules/can/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "python-can";
- version = "2.0.0";
+ version = "2.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1c6zfd29ck9ffdklfb5xgxvfl52xdaqd89isykkypm1ll97yk2fs";
+ sha256 = "4a5c01dd67feeda35f88e6c12ea14ac8cabd426b9be0cc5f9fd083fe90a9dbfc";
};
propagatedBuildInputs = [ pyserial ];
From 2669ebec8e49e4fab6da94e48dbccac9efb6d6a4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:44:52 +0100
Subject: [PATCH 08/63] python: chainer: 3.3.0 -> 3.4.0
---
pkgs/development/python-modules/chainer/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix
index b7a58f11a15..31cd0236a59 100644
--- a/pkgs/development/python-modules/chainer/default.nix
+++ b/pkgs/development/python-modules/chainer/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "chainer";
- version = "3.3.0";
+ version = "3.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0669375e5b09d687781a37d6c025ee0a6015f575b4d2c70a2ad09c33b8228f86";
+ sha256 = "b7bcd8fc1a39b3602b4a78a0be6012721ba6c8792c4d14773496a4c6d038f886";
};
checkInputs = [
From d7508d4a22841fd48d4388034fa1bb640fa5f6b6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:44:57 +0100
Subject: [PATCH 09/63] python: cupy: 2.3.0 -> 2.4.0
---
pkgs/development/python-modules/cupy/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index e020eafc04c..bfb296470cf 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "cupy";
- version = "2.3.0";
+ version = "2.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "7426f6332cb01513d2a6a687792dfa17c678ff64dd1b19b04559ddd5672c833f";
+ sha256 = "96ac44dface1a73673e9c0549fc897f8fa31a7648ff9963dff799ddabd67fde2";
};
checkInputs = [
From 9fd13a944a945ba361132faec0a0235d7270cd28 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:45:02 +0100
Subject: [PATCH 10/63] python: Django: 2.0.1 -> 2.0.2
---
pkgs/development/python-modules/django/2_0.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/django/2_0.nix b/pkgs/development/python-modules/django/2_0.nix
index c1f935e51c6..907d2ba6e00 100644
--- a/pkgs/development/python-modules/django/2_0.nix
+++ b/pkgs/development/python-modules/django/2_0.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "Django";
name = "${pname}-${version}";
- version = "2.0.1";
+ version = "2.0.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "0by1gswkrzxn594fa26llkzsc410999fq8s0b5d1598jwi5q0syr";
+ sha256 = "dc3b61d054f1bced64628c62025d480f655303aea9f408e5996c339a543b45f0";
};
patches = stdenv.lib.optionals withGdal [
From 4f42e781cf8674ce19a23a518cba0e5a2df8acff Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:45:12 +0100
Subject: [PATCH 11/63] python: fonttools: 3.22.0 -> 3.23.0
---
pkgs/development/python-modules/fonttools/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index a8a89f0e8ca..28d4053888f 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "fonttools";
- version = "3.22.0";
+ version = "3.23.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "01640dfbc0ba752181b21fe74240b8a7bbf7af75581737245836ada5565bd549";
+ sha256 = "9af97075be0395b631880a82ba88dcf694c8aa76b07a622bf5f650e8f8cff293";
extension = "zip";
};
From 481465e0cc918de1fde96e5e1917cf48c8755905 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:45:18 +0100
Subject: [PATCH 12/63] python: GPy: 1.8.5 -> 1.9.2
---
pkgs/development/python-modules/gpy/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix
index bb39746d296..72415879b41 100644
--- a/pkgs/development/python-modules/gpy/default.nix
+++ b/pkgs/development/python-modules/gpy/default.nix
@@ -3,12 +3,12 @@
buildPythonPackage rec {
pname = "GPy";
- version = "1.8.5";
+ version = "1.9.2";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "1562e34629192f209273f454e41614a127c6ef04144cd0eb5992d484721d55d3";
+ sha256 = "372e43d41df5c90e0958d3073070994b351a7409c2e5fbd349cffe13bc24c10a";
};
# running tests produces "ImportError: cannot import name 'linalg_cython'"
From 42aa273308df00700e7b21a31b460b74f8bd7aa3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:45:23 +0100
Subject: [PATCH 13/63] python: guessit: 2.0.4 -> 2.1.4
---
pkgs/development/python-modules/guessit/2.0.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/guessit/2.0.nix b/pkgs/development/python-modules/guessit/2.0.nix
index 59fb650c883..c8f30746310 100644
--- a/pkgs/development/python-modules/guessit/2.0.nix
+++ b/pkgs/development/python-modules/guessit/2.0.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "guessit";
- version = "2.0.4";
+ version = "2.1.4";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "1cfcgb0px6i9jl8nwkx8j06j4y6p5975a9pfmd8lcacwr8gy4wjg";
+ sha256 = "90e6f9fb49246ad27f34f8b9984357e22562ccc3059241cbc08b4fac1d401c56";
};
# Tests require more packages.
From 43982ce0fbb4bbe8e9dbf9d8001e79e134daf338 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:45:27 +0100
Subject: [PATCH 14/63] python: hyperlink: 17.3.1 -> 18.0.0
---
pkgs/development/python-modules/hyperlink/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/hyperlink/default.nix b/pkgs/development/python-modules/hyperlink/default.nix
index 9886f705d54..4fbce36ee7e 100644
--- a/pkgs/development/python-modules/hyperlink/default.nix
+++ b/pkgs/development/python-modules/hyperlink/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "hyperlink";
- version = "17.3.1";
+ version = "18.0.0";
name = pname + "-" + version;
src = fetchurl {
url = "mirror://pypi/h/hyperlink/${name}.tar.gz";
- sha256 = "bc4ffdbde9bdad204d507bd8f554f16bba82dd356f6130cb16f41422909c33bc";
+ sha256 = "f01b4ff744f14bc5d0a22a6b9f1525ab7d6312cb0ff967f59414bbac52f0a306";
};
checkInputs = [ pytest ];
From 1885c1564500c6c37bbd1c61b1f0c253eb44ff87 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:45:37 +0100
Subject: [PATCH 15/63] python: kafka-python: 1.3.5 -> 1.4.1
---
pkgs/development/python-modules/kafka-python/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix
index f5392202d4d..f88a021d53d 100644
--- a/pkgs/development/python-modules/kafka-python/default.nix
+++ b/pkgs/development/python-modules/kafka-python/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
name = "${pname}-${version}";
- version = "1.3.5";
+ version = "1.4.1";
pname = "kafka-python";
src = fetchPypi {
inherit pname version;
- sha256 = "19m9fdckxqngrgh0www7g8rgi7z0kq13wkhcqy1r8aa4sxad0f5j";
+ sha256 = "596e9b4e302a0dc04d35be159cf23d31c4cba73a218e16fc8cd1be0ad57f8c22";
};
checkInputs = [ pytest six mock ];
From 324656b8976429024d4a28dbefe47e0db13cf2e6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:45:42 +0100
Subject: [PATCH 16/63] python: llvmlite: 0.21.0 -> 0.22.0
---
pkgs/development/python-modules/llvmlite/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix
index d702d8f95b0..b420e7149d7 100644
--- a/pkgs/development/python-modules/llvmlite/default.nix
+++ b/pkgs/development/python-modules/llvmlite/default.nix
@@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "llvmlite";
- version = "0.21.0";
+ version = "0.22.0";
disabled = isPyPy;
src = fetchPypi {
inherit pname version;
- sha256 = "3a5dd0695fdfb9fd47464cd71791b84935bf9642e11f4811d57aa1f2da8cdaa8";
+ sha256 = "a0a875f3d502f41f4a24444aa98fbf076a6bf36e2a0b3b4481b22e1c4a3acdc2";
};
propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;
From 29b50300f28f50f35f5c1d5c5a0ae31bf7bcf678 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:45:47 +0100
Subject: [PATCH 17/63] python: mozdevice: 0.50 -> 0.52
---
.../python-modules/marionette-harness/mozdevice.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/marionette-harness/mozdevice.nix b/pkgs/development/python-modules/marionette-harness/mozdevice.nix
index 00329aa1d3f..af26c8d071d 100644
--- a/pkgs/development/python-modules/marionette-harness/mozdevice.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozdevice.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "mozdevice";
- version = "0.50";
+ version = "0.52";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "0cfxzhfxdphlzj80vkd3h7m0mg5w7zhb8h6f5lmybliqdiv9vz20";
+ sha256 = "5b6fcbc7179c0f09bd99f7f7c42b614bce5f39543fb18b190e408488f987d6b5";
};
propagatedBuildInputs = [ moznetwork mozprocess ];
From 22114aa0c4b65c39f6f2589b98e8cf97c4f5ce32 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:45:53 +0100
Subject: [PATCH 18/63] python: mozlog: 3.4 -> 3.7
---
pkgs/development/python-modules/marionette-harness/mozlog.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/marionette-harness/mozlog.nix b/pkgs/development/python-modules/marionette-harness/mozlog.nix
index 5960848ff63..605a4ae4a38 100644
--- a/pkgs/development/python-modules/marionette-harness/mozlog.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozlog.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "mozlog";
- version = "3.4";
+ version = "3.7";
name = "${pname}-${version}";
disabled = isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "1m4d9i1kzcmkhipfd5czv05f2s84j1byx3cv4y2irjmwq5v6cyiq";
+ sha256 = "414141131c4f5e7242e69a939d2b74f4ed8dbac12bef93eee4e7125cd1a131e9";
};
propagatedBuildInputs = [ blessings mozfile ];
From 7746fcecb1f77fc313ca8c0bc626b4e725e41d23 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:45:58 +0100
Subject: [PATCH 19/63] python: mozprocess: 0.25 -> 0.26
---
.../python-modules/marionette-harness/mozprocess.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/marionette-harness/mozprocess.nix b/pkgs/development/python-modules/marionette-harness/mozprocess.nix
index b6bea84aa23..80b13d94a2d 100644
--- a/pkgs/development/python-modules/marionette-harness/mozprocess.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozprocess.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "mozprocess";
- version = "0.25";
+ version = "0.26";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "0lfflwjkwvc8bqvsgdib3b78w2pms8nharh3sc3zgsrmqb1mbzks";
+ sha256 = "9f471c45bee9ff14e936c6ee216a6cc4941223659c01fa626bce628001d8485c";
};
propagatedBuildInputs = [ mozinfo ];
From c992c9a4f368960442a4aaffe1af4e228804650f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:46:03 +0100
Subject: [PATCH 20/63] python: mozprofile: 0.28 -> 0.29
---
.../python-modules/marionette-harness/mozprofile.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/marionette-harness/mozprofile.nix b/pkgs/development/python-modules/marionette-harness/mozprofile.nix
index 5e939d4f333..a783c125af3 100644
--- a/pkgs/development/python-modules/marionette-harness/mozprofile.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozprofile.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "mozprofile";
- version = "0.28";
+ version = "0.29";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "15xsdhrpbg7hlr6nvb3k3ci33h786hrv12az8j2k7aa9gzjcf8nh";
+ sha256 = "92af4b9f527a18997dccb60e846e1844b2428668dadf3ccb1a8cd30c706b25c1";
};
propagatedBuildInputs = [ mozlog mozfile mozhttpd ];
From b41be56a3d1835eaabbb395fdd2211c28680142a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:46:08 +0100
Subject: [PATCH 21/63] python: mozrunner: 6.13 -> 6.14
---
.../python-modules/marionette-harness/mozrunner.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/marionette-harness/mozrunner.nix b/pkgs/development/python-modules/marionette-harness/mozrunner.nix
index b0c3f6d8bcf..368ab51845c 100644
--- a/pkgs/development/python-modules/marionette-harness/mozrunner.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozrunner.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "mozrunner";
- version = "6.13";
+ version = "6.14";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "1d5k3a0w1iyyk6l28l65j47grq87zd207h369x4vahq02nrx2g6l";
+ sha256 = "a401ea5141cdd15d8f047f19a30ccbeabeb0aea079674b684121acddc5dcf810";
};
propagatedBuildInputs = [ mozdevice mozfile mozinfo mozlog mozprocess
From b32937cc561cd255da4024f46940a2b7cf6ac280 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:46:13 +0100
Subject: [PATCH 22/63] python: mozversion: 1.4 -> 1.5
---
.../python-modules/marionette-harness/mozversion.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/marionette-harness/mozversion.nix b/pkgs/development/python-modules/marionette-harness/mozversion.nix
index 62605a1d21d..729f110858c 100644
--- a/pkgs/development/python-modules/marionette-harness/mozversion.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozversion.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "mozversion";
- version = "1.4";
+ version = "1.5";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "15ipddn6bpqxl590cy37fj52vgpa4faw2dax1mwvdxj7b18s3pwh";
+ sha256 = "e9b11e4a46bf7a4a11469ea4589c75f3ba50b34b7801e7edf1a09147af8bf70f";
};
propagatedBuildInputs = [ mozlog mozdevice ];
From daf18bdca5812848bdbc3e4e4814dfb8700c5e01 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:46:18 +0100
Subject: [PATCH 23/63] python: numba: 0.36.2 -> 0.37.0
---
pkgs/development/python-modules/numba/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index 97aad8c0928..e62fff7bca3 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -14,12 +14,12 @@
}:
buildPythonPackage rec {
- version = "0.36.2";
+ version = "0.37.0";
pname = "numba";
src = fetchPypi {
inherit pname version;
- sha256 = "d61597808ce511e81b64e32da664f52beb7d947bf834dde8b8b60b29d205e5c2";
+ sha256 = "c62121b2d384d8b4d244ef26c1cf8bb5cb819278a80b893bf41918ad6d391258";
};
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
From 9861cff0dff92a28e8e5b3e3bf0443ee1953463f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:46:29 +0100
Subject: [PATCH 24/63] python: paramz: 0.8.5 -> 0.9.1
---
pkgs/development/python-modules/paramz/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix
index 3d9fd2afaca..daca12f66c0 100644
--- a/pkgs/development/python-modules/paramz/default.nix
+++ b/pkgs/development/python-modules/paramz/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "paramz";
- version = "0.8.5";
+ version = "0.9.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "297e59b48e57e78e15f547b1af8b21ddfd19a6312d70b9dc07c7262711adfed9";
+ sha256 = "8a5a2fe5cdb033eb869c49e81fde2a9d0055fadb53a8af1665a7f48f320179cf";
};
propagatedBuildInputs = [ numpy scipy six decorator ];
From d31f490229b6070f6820255d79cf0eba68f89bcb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:46:34 +0100
Subject: [PATCH 25/63] python: phonenumbers: 8.8.9 -> 8.9.0
---
pkgs/development/python-modules/phonenumbers/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index 14e59ce3a95..e00aeb5d70d 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "phonenumbers";
- version = "8.8.9";
+ version = "8.9.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "d819299c3aa8f85f248295ab8559e202af429b4017301b122a0b4c387aed10d2";
+ sha256 = "2cb4822ba895200b06f46a788e852d6ae8200fdc97e1d7c86b0ee10c99d4ff3a";
};
meta = {
From b4f40beac27b51eb33c5cb2c2dfd7f1550e3bc5c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:46:39 +0100
Subject: [PATCH 26/63] python: pydub: 0.20.0 -> 0.21.0
---
pkgs/development/python-modules/pydub/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pydub/default.nix b/pkgs/development/python-modules/pydub/default.nix
index 819c6ffe489..6450cb7c70e 100644
--- a/pkgs/development/python-modules/pydub/default.nix
+++ b/pkgs/development/python-modules/pydub/default.nix
@@ -3,10 +3,10 @@
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "pydub";
- version = "0.20.0";
+ version = "0.21.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0hqsvvph6ks4kxj0m2q1xvl5bllqmpk78rlqpqhh79schl344xkv";
+ sha256 = "27acc5977b0f5220682175d44fda737bbf818143b0832c0c3863b5dde38e197a";
};
patches = [
From 12a98f33533030752d5064e6cce219bd85f8d363 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:46:44 +0100
Subject: [PATCH 27/63] python: python-oauth2: 1.0.1 -> 1.1.0
---
pkgs/development/python-modules/python-oauth2/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/python-oauth2/default.nix b/pkgs/development/python-modules/python-oauth2/default.nix
index 38649ca1985..f4d87dc035c 100644
--- a/pkgs/development/python-modules/python-oauth2/default.nix
+++ b/pkgs/development/python-modules/python-oauth2/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "python-oauth2";
- version = "1.0.1";
+ version = "1.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0a1d0qnlgm07wq9r9bbm5jqkqry73w34m87p0141bk76lg7bb0sm";
+ sha256 = "b24da812837c19183df1924e80a22ba0a1869582dea8b04a9ecd807b04dbc525";
};
# attempts to run mysql
doCheck = false;
From a69333bc1c6ef332af7b75fa0685d4b78d5651b4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:46:49 +0100
Subject: [PATCH 28/63] python: pytools: 2017.6 -> 2018.1
---
pkgs/development/python-modules/pytools/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix
index 2bf7413c600..1fba3303e3f 100644
--- a/pkgs/development/python-modules/pytools/default.nix
+++ b/pkgs/development/python-modules/pytools/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "pytools";
- version = "2017.6";
+ version = "2018.1";
src = fetchPypi {
inherit pname version;
- sha256 = "80f1bba4469d473c1b3969bc8e188c03bcc94d35807a889ceebbfc78e3208115";
+ sha256 = "0063b87285cb1172e3602a996bfd7342bf407361cf67b562cb6d806f70422e71";
};
checkInputs = [ pytest ];
From 1dd167efe0d682cf34e10c4a2059420325749ef4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:47:05 +0100
Subject: [PATCH 29/63] python: stripe: 1.77.2 -> 1.79.0
---
pkgs/development/python-modules/stripe/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
index 7e7aa4756bb..1bfcb8eb002 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -3,7 +3,7 @@
buildPythonPackage rec {
pname = "stripe";
- version = "1.77.2";
+ version = "1.79.0";
name = "${pname}-${version}";
# Tests require network connectivity and there's no easy way to disable
@@ -12,7 +12,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "3bcd55108dd2c0e853a91147ee843bc375f35767e64d0f7680e5bd82ddb7fbf1";
+ sha256 = "490bb7bfc7d224e483d643171fd860f8a1670e31fd9cef8cb8d9a7c19806d450";
};
buildInputs = [ unittest2 mock ];
From 5eda61d20213e31e097840d00adb7d1cbba0cb42 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:47:10 +0100
Subject: [PATCH 30/63] python: text-unidecode: 1.1 -> 1.2
---
pkgs/development/python-modules/text-unidecode/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/text-unidecode/default.nix b/pkgs/development/python-modules/text-unidecode/default.nix
index 79ee34c733b..94aebc59512 100644
--- a/pkgs/development/python-modules/text-unidecode/default.nix
+++ b/pkgs/development/python-modules/text-unidecode/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "text-unidecode";
- version = "1.1";
+ version = "1.2";
src = fetchPypi {
inherit pname version;
- sha256 = "1l081m1w8ibbx684ca71ibdy68iwqsivy6rf6yqvysdclzldbbyh";
+ sha256 = "5a1375bb2ba7968740508ae38d92e1f889a0832913cb1c447d5e2046061a396d";
};
checkInputs = [ pytest ];
From 5ead05c0a8898f8eb108dd75c07a22c7e84c740b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:47:15 +0100
Subject: [PATCH 31/63] python: textacy: 0.5.0 -> 0.6.0
---
pkgs/development/python-modules/textacy/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix
index 333c4825f0f..47b8b04c4f6 100644
--- a/pkgs/development/python-modules/textacy/default.nix
+++ b/pkgs/development/python-modules/textacy/default.nix
@@ -25,11 +25,11 @@
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "textacy";
- version = "0.5.0";
+ version = "0.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "6fc4603fd52c386081b063ef7aa15ca77e5e937a3064b197359659fccfdeb406";
+ sha256 = "70ebd8f6536c1536132c997988a4f27731a2db5a7ca7bab29fb33746b444959f";
};
disabled = isPy27; # 2.7 requires backports.csv
From 2e89e4e9747fc9816e5ab549297b891967e6973b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:47:20 +0100
Subject: [PATCH 32/63] python: tifffile: 0.13.5 -> 0.14.0
---
pkgs/development/python-modules/tifffile/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix
index 12edef190dc..6e1baf2f2e9 100644
--- a/pkgs/development/python-modules/tifffile/default.nix
+++ b/pkgs/development/python-modules/tifffile/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "tifffile";
- version = "0.13.5";
+ version = "0.14.0";
src = fetchPypi {
inherit pname version;
- sha256 = "bca0fc9eaf609a27ebd99d8466e05d5a6e79389957f17582b70643dbca65e3d8";
+ sha256 = "eff44f71782dce38c604921a1b29ddad0d007ac9871d66e9c872fd6fc311334e";
};
checkInputs = [ nose ];
From 4a277c1efe120024f0d54b2764b657154800e939 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:47:31 +0100
Subject: [PATCH 33/63] python: txtorcon: 0.19.3 -> 0.20.0
---
pkgs/development/python-modules/txtorcon/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix
index cd2d6c9a365..2e7c07c74f3 100644
--- a/pkgs/development/python-modules/txtorcon/default.nix
+++ b/pkgs/development/python-modules/txtorcon/default.nix
@@ -5,7 +5,7 @@
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "txtorcon";
- version = "0.19.3";
+ version = "0.20.0";
checkInputs = [ pytest mock lsof GeoIP ];
propagatedBuildInputs = [
@@ -16,7 +16,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "1za4qag4g2lbw695v4ssxqc2aspdyknnbn2diylwg8q9g5k9cczp";
+ sha256 = "dc80cb76b3ddacef6d671c0a088cb1a45274c0858554c32ce55d0f41421c740e";
};
# ipaddress isn't required for Python 3 although it's in requirements.txt.
From ae57d3a0ea44c26e423e6674e12e2896cbc4cba7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:47:36 +0100
Subject: [PATCH 34/63] python: zeroconf: 0.19.1 -> 0.20.0
---
pkgs/development/python-modules/zeroconf/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix
index 5502a8236da..f3dbf70eecf 100644
--- a/pkgs/development/python-modules/zeroconf/default.nix
+++ b/pkgs/development/python-modules/zeroconf/default.nix
@@ -3,12 +3,12 @@
buildPythonPackage rec {
pname = "zeroconf";
- version = "0.19.1";
+ version = "0.20.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "0ykzg730n915qbrq9bn5pn06bv6rb5zawal4sqjyfnjjm66snkj3";
+ sha256 = "6e3f1e7b5871e3d1410ac29b9fb85aafc1e2d661ed596b07a6f84559a475efcb";
};
propagatedBuildInputs = [ netifaces six enum-compat ];
From b5a4395c4aedd5e0d243c81e4d046fd459a54704 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:47:41 +0100
Subject: [PATCH 35/63] python: autoflake: 1.0 -> 1.1
---
pkgs/development/tools/analysis/autoflake/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/tools/analysis/autoflake/default.nix b/pkgs/development/tools/analysis/autoflake/default.nix
index 9522b1cf6b7..ce650adb7ef 100644
--- a/pkgs/development/tools/analysis/autoflake/default.nix
+++ b/pkgs/development/tools/analysis/autoflake/default.nix
@@ -3,12 +3,12 @@
with python3Packages;
buildPythonApplication rec {
pname = "autoflake";
- version = "1.0";
+ version = "1.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "12k4v8w7awqp83j727y0iwcbjqj3ccvbai7c9m0wgbmq5xkvav8a";
+ sha256 = "a74d684a7a02654f74582addc24a3016c06809316cc140457a4fe93a1e6ed131";
};
propagatedBuildInputs = [ pyflakes ];
From fdb6655f2caa8d45265edf8820113268eb9b0501 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:47:51 +0100
Subject: [PATCH 36/63] python: conan: 0.28.1 -> 1.0.4
---
pkgs/development/tools/build-managers/conan/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
index 4a2afbeedfe..423a952026a 100644
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -5,12 +5,12 @@
}:
buildPythonApplication rec {
- version = "0.28.1";
+ version = "1.0.4";
pname = "conan";
src = fetchPypi {
inherit pname version;
- sha256 = "0zf564iqh0099yd779f9fgk21qyp87d7cmgfj34hmncf8y3qh32a";
+ sha256 = "6f5cea887ecd6285bd83ae2acc3f76ed06dd52a79c106fe686d210b3ead89060";
};
propagatedBuildInputs = [
From aec31bf3629b0dcd963dfa3084b8cc2a15d6ba92 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:47:57 +0100
Subject: [PATCH 37/63] python: pew: 1.1.0 -> 1.1.2
---
pkgs/development/tools/pew/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/tools/pew/default.nix b/pkgs/development/tools/pew/default.nix
index 16fc4817417..82014691a1f 100644
--- a/pkgs/development/tools/pew/default.nix
+++ b/pkgs/development/tools/pew/default.nix
@@ -2,11 +2,11 @@
with python3Packages; buildPythonApplication rec {
name = "${pname}-${version}";
pname = "pew";
- version = "1.1.0";
+ version = "1.1.2";
src = fetchPypi {
inherit pname version;
- sha256 = "0b8z1vjsll1kgnh3mmdjps5rr9gayy091rapp2dra71jrwkx3yfh";
+ sha256 = "b8312728526c9010295c88215c95a1b1731fdbd1a568f728e069932bd0545611";
};
propagatedBuildInputs = [ virtualenv virtualenv-clone setuptools ];
From b50a66c3a0c8da96a8736a84b94a60b027e6c33a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:48:02 +0100
Subject: [PATCH 38/63] python: vcstool: 0.1.31 -> 0.1.32
---
pkgs/development/tools/vcstool/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix
index 51e066f3d39..2dd03b1d02a 100644
--- a/pkgs/development/tools/vcstool/default.nix
+++ b/pkgs/development/tools/vcstool/default.nix
@@ -6,11 +6,11 @@ with python3Packages;
buildPythonApplication rec {
name = "${pname}-${version}";
pname = "vcstool";
- version = "0.1.31";
+ version = "0.1.32";
src = fetchPypi {
inherit pname version;
- sha256 = "0n2zkvy2km9ky9lljf1mq5nqyqi5qqzfy2a6sgkjg2grvsk7abxc";
+ sha256 = "adf09fad9feaa9bc2d7fe53e909951b6b7300db2f2e0717f12ccd44e047a8839";
};
propagatedBuildInputs = [ pyyaml ];
From 9e4057ed283bb4ee246ec3455a194dbe5f8ca826 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:48:07 +0100
Subject: [PATCH 39/63] python: yq: 2.3.4 -> 2.4.1
---
pkgs/development/tools/yq/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/tools/yq/default.nix b/pkgs/development/tools/yq/default.nix
index 6fb7f8440ef..3283136590a 100644
--- a/pkgs/development/tools/yq/default.nix
+++ b/pkgs/development/tools/yq/default.nix
@@ -3,7 +3,7 @@
buildPythonApplication rec {
pname = "yq";
- version = "2.3.4";
+ version = "2.4.1";
propagatedBuildInputs = [ pyyaml jq ];
@@ -12,7 +12,7 @@ buildPythonApplication rec {
src = fetchPypi {
inherit pname version;
- sha256 = "04ckrlmin8m176iicyfhddp4r0yry5hx306vhfglf8mcp1jkga78";
+ sha256 = "4833d4055b0f1c1f1a2fd292421b3472da39c7dc2727d7819efd11065a5fd310";
};
meta = with lib; {
From ab672401a844de1e5cf13a4ac2ba774d5ccee44f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 18:48:23 +0100
Subject: [PATCH 40/63] python: you-get: 0.4.1011 -> 0.4.1025
---
pkgs/tools/misc/you-get/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix
index 3a917040863..b6aaaab0d93 100644
--- a/pkgs/tools/misc/you-get/default.nix
+++ b/pkgs/tools/misc/you-get/default.nix
@@ -2,7 +2,7 @@
buildPythonApplication rec {
pname = "you-get";
- version = "0.4.1011";
+ version = "0.4.1025";
# Tests aren't packaged, but they all hit the real network so
# probably aren't suitable for a build environment anyway.
@@ -10,7 +10,7 @@ buildPythonApplication rec {
src = fetchPypi {
inherit pname version;
- sha256 = "0h6aspnfic30s89xsv6qss1jfka9px4ll60bqrjbds4y0k3h818g";
+ sha256 = "d348b89bd4798ef2225f5b357510505a4bc781380479c9f59b69d80ff9a56ab5";
};
meta = with stdenv.lib; {
From 50c978fae0a1bf8e3a28f9a3bd908566ff7602a5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 19:04:25 +0100
Subject: [PATCH 41/63] python: setuptools: 38.4.0 -> 38.4.1
---
pkgs/development/python-modules/setuptools/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index b8fd011c4ea..cd07a64ae49 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -8,13 +8,13 @@
# Should use buildPythonPackage here somehow
stdenv.mkDerivation rec {
pname = "setuptools";
- version = "38.4.0";
+ version = "38.4.1";
name = "${python.libPrefix}-${pname}-${version}";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "6501fc32f505ec5b3ed36ec65ba48f1b975f52cf2ea101c7b73a08583fd12f75";
+ sha256 = "3b5f74bd33b046a121f052632f248b580f5e83848bb4cebda9e38741a445a969";
};
nativeBuildInputs = [ unzip wrapPython ];
From 55ef50c257d052ebf5e760877c5d62ec24ed1c4b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 19:06:01 +0100
Subject: [PATCH 42/63] python.pkgs.bootstrapped-pip: setuptools 38.4.0 ->
38.4.1
---
pkgs/development/python-modules/bootstrapped-pip/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 37c3ea5d72a..86e45e17ed5 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -9,9 +9,9 @@ let
};
setuptools_source = fetchPypi {
pname = "setuptools";
- version = "38.4.0";
+ version = "38.4.1";
format = "wheel";
- sha256 = "155c2ec9fdcc00c3973d966b416e1cf3a1e7ce75f4c09fb760b23f94b935926e";
+ sha256 = "22f8bcff5ce7fd1867785701769eaba42b79331d0abf890974a9288787dc015b";
};
# TODO: Shouldn't be necessary anymore for pip > 9.0.1!
From 7d7c60b2734a589b4176aac9bcfa468d7d74e23a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 19:18:12 +0100
Subject: [PATCH 43/63] python.pkgs.apsw: 3.7.6.2-r1 -> 3.9.2-r1
---
pkgs/development/python-modules/apsw/default.nix | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix
index 3e7e970da6c..c16fb3c4c46 100644
--- a/pkgs/development/python-modules/apsw/default.nix
+++ b/pkgs/development/python-modules/apsw/default.nix
@@ -1,22 +1,21 @@
-{ stdenv, buildPythonPackage, fetchurl
+{ stdenv, buildPythonPackage, fetchPypi
, sqlite, isPyPy }:
buildPythonPackage rec {
pname = "apsw";
- version = "3.7.6.2-r1";
- name = "${pname}-${version}";
+ version = "3.9.2-r1";
disabled = isPyPy;
- src = fetchurl {
- url = "http://apsw.googlecode.com/files/${name}.zip";
- sha256 = "cb121b2bce052609570a2f6def914c0aa526ede07b7096dddb78624d77f013eb";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "dab96fd164dde9e59f7f27228291498217fa0e74048e2c08c7059d7e39589270";
};
buildInputs = [ sqlite ];
# python: double free or corruption (fasttop): 0x0000000002fd4660 ***
- doCheck = false;
+# doCheck = false;
meta = with stdenv.lib; {
description = "A Python wrapper for the SQLite embedded relational database engine";
From b6fea27bae6b7003efbb0aa9b022e85874467cdd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 19:19:00 +0100
Subject: [PATCH 44/63] python.pkgs.absl-py: 0.1.9 -> 0.1.10
---
pkgs/development/python-modules/absl-py/default.nix | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix
index 5e295bb9516..5acbf12aafc 100644
--- a/pkgs/development/python-modules/absl-py/default.nix
+++ b/pkgs/development/python-modules/absl-py/default.nix
@@ -6,12 +6,11 @@
buildPythonPackage rec {
pname = "absl-py";
- version = "0.1.9";
- name = "${pname}-${version}";
+ version = "0.1.10";
src = fetchPypi {
inherit pname version;
- sha256 = "1c787e3bc7ef8fea7a8a79cf36b0c550b4bd66e13c05d1352fbc5786488befb0";
+ sha256 = "908eba9a96a37c10f10074aba57d685070b814906b02a1ea2cf54bb10a6b8c74";
};
propagatedBuildInputs = [ six ];
From 38f02f84e8fb37f2761e2ce8a5167bdec0e96ea4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 19:23:58 +0100
Subject: [PATCH 45/63] python3.pkgs.MechanicalSoup: 0.9.0.post4 -> 0.10.0
---
pkgs/development/python-modules/MechanicalSoup/default.nix | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/python-modules/MechanicalSoup/default.nix b/pkgs/development/python-modules/MechanicalSoup/default.nix
index b5d202af50a..63eb93a207c 100644
--- a/pkgs/development/python-modules/MechanicalSoup/default.nix
+++ b/pkgs/development/python-modules/MechanicalSoup/default.nix
@@ -3,15 +3,13 @@
, pytestrunner, requests-mock, pytestcov, pytest
}:
-
buildPythonPackage rec {
- name = "${pname}-${version}";
pname = "MechanicalSoup";
- version = "0.9.0.post4";
+ version = "0.10.0";
src = fetchPypi {
inherit pname version;
- sha256 = "ce8f822afbc9bef1499be417e8d5deecd0cd32606420165700e89477955f03ab";
+ sha256 = "22423efd025c3eedb06f41d3ff1127174a59f40dc560e82dce143956976195bf";
};
checkInputs = [ pytest pytestrunner requests-mock pytestcov ];
From 26ea14c4dce5838f38836c476d1cea0f2bce738f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 19:24:16 +0100
Subject: [PATCH 46/63] python.pkgs.blaze: use FetchFromGitHub
---
pkgs/development/python-modules/blaze/default.nix | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/python-modules/blaze/default.nix b/pkgs/development/python-modules/blaze/default.nix
index 74e327fd342..b3c56a618e8 100644
--- a/pkgs/development/python-modules/blaze/default.nix
+++ b/pkgs/development/python-modules/blaze/default.nix
@@ -1,6 +1,6 @@
{ lib
, buildPythonPackage
-, fetchurl
+, fetchFromGitHub
, pytest
, contextlib2
, cytoolz
@@ -27,9 +27,11 @@ buildPythonPackage rec {
pname = "blaze";
version = "0.11.3";
- src = fetchurl {
- url = "https://github.com/blaze/blaze/archive/${version}.tar.gz";
- sha256 = "075gqc9d7g284z4nfwv5zbq99ln22w25l4lcndjg3v10kmsjadww";
+ src = fetchFromGitHub {
+ owner = pname;
+ repo = pname;
+ rev = version;
+ sha256 = "0w916k125058p40cf7i090f75pgv3cqdb8vwjzqhb9r482fa6717";
};
checkInputs = [ pytest ];
From 73d381a13a160cffb83ebb2afe94ecbd616b6a1e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 19:25:27 +0100
Subject: [PATCH 47/63] python.pkgs.codecov: 2.0.9 -> 2.1.15
---
pkgs/development/python-modules/codecov/default.nix | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/python-modules/codecov/default.nix b/pkgs/development/python-modules/codecov/default.nix
index 93620098446..6b2063f4992 100644
--- a/pkgs/development/python-modules/codecov/default.nix
+++ b/pkgs/development/python-modules/codecov/default.nix
@@ -2,15 +2,14 @@
buildPythonPackage rec {
pname = "codecov";
- version = "2.0.9";
- name = "${pname}-${version}";
+ version = "2.0.15";
src = fetchPypi {
inherit pname version;
- sha256 = "037h4dcl8xshlq3rj8409p11rpgnyqrhlhfq8j34s94nm0n1h76v";
+ sha256 = "8ed8b7c6791010d359baed66f84f061bba5bd41174bf324c31311e8737602788";
};
- buildInputs = [ unittest2 ]; # Tests only
+ checkInputs = [ unittest2 ]; # Tests only
propagatedBuildInputs = [ requests coverage ];
@@ -18,6 +17,9 @@ buildPythonPackage rec {
sed -i 's/, "argparse"//' setup.py
'';
+ # No tests in archive
+ doCheck = false;
+
meta = {
description = "Python report uploader for Codecov";
homepage = https://codecov.io/;
From 9928b03832ce024b199f61e20c7ceec87bbbda67 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 19:31:19 +0100
Subject: [PATCH 48/63] python.pkgs.flask_script: improve expression
---
.../python-modules/flask-script/default.nix | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/python-modules/flask-script/default.nix b/pkgs/development/python-modules/flask-script/default.nix
index ace3cee2d22..33b44080343 100644
--- a/pkgs/development/python-modules/flask-script/default.nix
+++ b/pkgs/development/python-modules/flask-script/default.nix
@@ -1,17 +1,20 @@
-{ lib, buildPythonPackage, fetchurl, flask, pytest }:
+{ lib, buildPythonPackage, fetchPypi, flask, pytest }:
buildPythonPackage rec {
- name = "Flask-Script-${version}";
+ pname = "Flask-Script";
version = "2.0.6";
- src = fetchurl {
- url = "mirror://pypi/F/Flask-Script/${name}.tar.gz";
+ src = fetchPypi {
+ inherit pname version;
sha256 = "0zqh2yq8zk7m9b4xw1ryqmrljkdigfb3hk5155a3b5hkfnn6xxyf";
};
propagatedBuildInputs = [ flask ];
checkInputs = [ pytest ];
+ # No tests in archive
+ doCheck = false;
+
meta = with lib; {
homepage = http://github.com/smurfix/flask-script;
description = "Scripting support for Flask";
From 925a73468815632aee4d13b469c62eb2fa5c771f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 26 Feb 2018 19:33:30 +0100
Subject: [PATCH 49/63] python.pkgs.pybfd: use pname and version
---
pkgs/development/python-modules/pybfd/default.nix | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/pybfd/default.nix b/pkgs/development/python-modules/pybfd/default.nix
index 0ac437bfb29..8f074943dd3 100644
--- a/pkgs/development/python-modules/pybfd/default.nix
+++ b/pkgs/development/python-modules/pybfd/default.nix
@@ -1,7 +1,8 @@
{ lib, fetchFromGitHub, buildPythonPackage, isPyPy, isPy3k, libbfd, libopcodes }:
buildPythonPackage rec {
- name = "pybfd-0.1.1.2017-12-31";
+ pname = "pybfd";
+ version = "-0.1.1.2017-12-31";
disabled = isPyPy || isPy3k;
From d2124e3f93c5e728919bb6e6268b38d0a285cda3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 26 Feb 2018 20:59:21 +0100
Subject: [PATCH 50/63] pythonPackages.hyperlink: add idna dependency
---
pkgs/development/python-modules/hyperlink/default.nix | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/hyperlink/default.nix b/pkgs/development/python-modules/hyperlink/default.nix
index 4fbce36ee7e..d36db696ef6 100644
--- a/pkgs/development/python-modules/hyperlink/default.nix
+++ b/pkgs/development/python-modules/hyperlink/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchurl, pytest }:
+{ stdenv, buildPythonPackage, fetchurl, idna, pytest }:
buildPythonPackage rec {
pname = "hyperlink";
@@ -10,6 +10,8 @@ buildPythonPackage rec {
sha256 = "f01b4ff744f14bc5d0a22a6b9f1525ab7d6312cb0ff967f59414bbac52f0a306";
};
+ propagatedBuildInputs = [ idna ];
+
checkInputs = [ pytest ];
checkPhase = ''
From a367095153c446223c64e8ffea6a95b0c91402c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 26 Feb 2018 21:00:28 +0100
Subject: [PATCH 51/63] pythonPackages.hyperlink: modernize expression
---
pkgs/development/python-modules/hyperlink/default.nix | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/python-modules/hyperlink/default.nix b/pkgs/development/python-modules/hyperlink/default.nix
index d36db696ef6..53a245c45dc 100644
--- a/pkgs/development/python-modules/hyperlink/default.nix
+++ b/pkgs/development/python-modules/hyperlink/default.nix
@@ -1,12 +1,11 @@
-{ stdenv, buildPythonPackage, fetchurl, idna, pytest }:
+{ stdenv, buildPythonPackage, fetchPypi, idna, pytest }:
buildPythonPackage rec {
pname = "hyperlink";
version = "18.0.0";
- name = pname + "-" + version;
- src = fetchurl {
- url = "mirror://pypi/h/hyperlink/${name}.tar.gz";
+ src = fetchPypi {
+ inherit pname version;
sha256 = "f01b4ff744f14bc5d0a22a6b9f1525ab7d6312cb0ff967f59414bbac52f0a306";
};
From f760fcb239641870101b057bc40827afe16464f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 26 Feb 2018 23:42:14 +0100
Subject: [PATCH 52/63] pythonPackages.cached-property: fix tests
Need to fetch from GitHub because conftest.py is necessary to disable some tests for Python 2.
---
.../cached-property/default.nix | 21 +++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/pkgs/development/python-modules/cached-property/default.nix b/pkgs/development/python-modules/cached-property/default.nix
index 1cd8e36594b..5daa505429e 100644
--- a/pkgs/development/python-modules/cached-property/default.nix
+++ b/pkgs/development/python-modules/cached-property/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
+, pytest
, freezegun
}:
@@ -8,12 +9,20 @@ buildPythonPackage rec {
pname = "cached-property";
version = "1.4.0";
- src = fetchPypi {
- inherit pname version;
- sha256 = "a2fa0f89dd422f7e5dd992a4a3e0ce209d5d1e47a4db28fd0a7b5273ec8da3f0";
+ # conftest.py is missing in PyPI tarball
+ # https://github.com/pydanny/cached-property/pull/87
+ src = fetchFromGitHub {
+ owner = "pydanny";
+ repo = pname;
+ rev = version;
+ sha256 = "0w7709grs4yqhfbnn7lva2fgyphvh43xcfqhi95lhh8sjad3xwkw";
};
- checkInputs = [ freezegun ];
+ checkInputs = [ pytest freezegun ];
+
+ checkPhase = ''
+ py.test
+ '';
meta = {
description = "A decorator for caching properties in classes";
@@ -22,4 +31,4 @@ buildPythonPackage rec {
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ ericsagnes ];
};
-}
\ No newline at end of file
+}
From 283002461b7927865945e44ac357be63f28449e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 26 Feb 2018 23:56:36 +0100
Subject: [PATCH 53/63] pythonPackages.mozterm: init at 0.1.0
---
.../python-modules/mozterm/default.nix | 16 ++++++++++++++++
pkgs/top-level/python-packages.nix | 2 ++
2 files changed, 18 insertions(+)
create mode 100644 pkgs/development/python-modules/mozterm/default.nix
diff --git a/pkgs/development/python-modules/mozterm/default.nix b/pkgs/development/python-modules/mozterm/default.nix
new file mode 100644
index 00000000000..6adba7ef2b9
--- /dev/null
+++ b/pkgs/development/python-modules/mozterm/default.nix
@@ -0,0 +1,16 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+ pname = "mozterm";
+ version = "0.1.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "4ebf8bd772d97c0f557184173f0f96cfca0abfc07e1ae975fbcfa76be50b5561";
+ };
+
+ meta = with lib; {
+ description = "Terminal abstractions built around the blessings module";
+ license = licenses.mpl20;
+ };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0e4837ba325..ec2b99a9fbc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9860,6 +9860,8 @@ in {
};
};
+ mozterm = callPackage ../development/python-modules/mozterm { };
+
mplleaflet = callPackage ../development/python-modules/mplleaflet { };
multidict = callPackage ../development/python-modules/multidict { };
From e459171f9a847fe6138d91010e4a82872d3e3d56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 26 Feb 2018 23:59:46 +0100
Subject: [PATCH 54/63] pythonPackages.mozlog: correct dependencies
---
.../python-modules/marionette-harness/mozlog.nix | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/marionette-harness/mozlog.nix b/pkgs/development/python-modules/marionette-harness/mozlog.nix
index 605a4ae4a38..dfe91309ea4 100644
--- a/pkgs/development/python-modules/marionette-harness/mozlog.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozlog.nix
@@ -4,13 +4,14 @@
, fetchPypi
, isPy3k
, blessings
+, mozterm
+, six
, mozfile
}:
buildPythonPackage rec {
pname = "mozlog";
version = "3.7";
- name = "${pname}-${version}";
disabled = isPy3k;
@@ -19,7 +20,9 @@ buildPythonPackage rec {
sha256 = "414141131c4f5e7242e69a939d2b74f4ed8dbac12bef93eee4e7125cd1a131e9";
};
- propagatedBuildInputs = [ blessings mozfile ];
+ propagatedBuildInputs = [ blessings mozterm six ];
+
+ checkInputs = [ mozfile ];
meta = {
description = "Mozilla logging library";
From c5fab86a7ef4102e597ea03ba9630f217ecb29ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 27 Feb 2018 00:22:09 +0100
Subject: [PATCH 55/63] pythonPackages.astral: fix build
---
pkgs/development/python-modules/astral/default.nix | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix
index 46b4b6bc8ea..488c5ed6651 100644
--- a/pkgs/development/python-modules/astral/default.nix
+++ b/pkgs/development/python-modules/astral/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytz, pytest }:
+{ stdenv, buildPythonPackage, fetchPypi, pytz, requests, pytest }:
buildPythonPackage rec {
pname = "astral";
@@ -9,11 +9,13 @@ buildPythonPackage rec {
sha256 = "874b397ddbf0a4c1d8d644b21c2481e8a96b61343f820ad52d8a322d61a15083";
};
- propagatedBuildInputs = [ pytz ];
+ propagatedBuildInputs = [ pytz requests ];
checkInputs = [ pytest ];
checkPhase = ''
- py.test -k "not test_GoogleLocator"
+ # https://github.com/sffjunkie/astral/pull/13
+ touch src/test/.api_key
+ py.test -m "not webtest"
'';
meta = with stdenv.lib; {
From d6e25bfc3b34c0b4a7b7874e7cabe78e6447ede7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 27 Feb 2018 00:27:01 +0100
Subject: [PATCH 56/63] home-assistant: pin astral version to 1.5
---
pkgs/servers/home-assistant/default.nix | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index cb9424ad5cf..e2f3deb6c48 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -35,6 +35,13 @@ let
sha256 = "15i3gaap8ilhpbah1ffc6q415wkvliqxilc6s69a4rinvkw6cx3s";
};
});
+ astral = super.astral.overridePythonAttrs (oldAttrs: rec {
+ version = "1.5";
+ src = oldAttrs.src.override {
+ inherit version;
+ sha256 = "527628fbfe90c1596c3950ff84ebd07ecc10c8fb1044c903a0519b5057700cb6";
+ };
+ });
hass-frontend = super.callPackage ./frontend.nix { };
};
};
From 31a94650e2a3be50fce643436c8252e7ee396b90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 27 Feb 2018 00:41:49 +0100
Subject: [PATCH 57/63] pythonPackages.stripe: add simplejson dependency for
python 2
---
pkgs/development/python-modules/stripe/default.nix | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
index 1bfcb8eb002..9a3ed36d893 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -1,10 +1,9 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, unittest2, mock, requests }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k
+, unittest2, mock, requests, simplejson }:
buildPythonPackage rec {
pname = "stripe";
version = "1.79.0";
- name = "${pname}-${version}";
# Tests require network connectivity and there's no easy way to disable
# them. ~ C.
@@ -15,11 +14,11 @@ buildPythonPackage rec {
sha256 = "490bb7bfc7d224e483d643171fd860f8a1670e31fd9cef8cb8d9a7c19806d450";
};
- buildInputs = [ unittest2 mock ];
+ checkInputs = [ unittest2 mock ];
- propagatedBuildInputs = [ requests ];
+ propagatedBuildInputs = [ requests ] ++ lib.optional (!isPy3k) simplejson;
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Stripe Python bindings";
homepage = https://github.com/stripe/stripe-python;
license = licenses.mit;
From 4e50deb14ae7577dbad0b6983f73c3e4aa05c057 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 27 Feb 2018 01:02:25 +0100
Subject: [PATCH 58/63] yq: add xmltodict dependency
---
pkgs/development/tools/yq/default.nix | 8 +++-----
pkgs/top-level/all-packages.nix | 2 +-
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/pkgs/development/tools/yq/default.nix b/pkgs/development/tools/yq/default.nix
index 3283136590a..c911cdb5825 100644
--- a/pkgs/development/tools/yq/default.nix
+++ b/pkgs/development/tools/yq/default.nix
@@ -1,11 +1,10 @@
-{ stdenv, lib, buildPythonApplication, fetchPypi, pyyaml, jq }:
+{ stdenv, lib, buildPythonApplication, fetchPypi, pyyaml, xmltodict, jq }:
buildPythonApplication rec {
-
pname = "yq";
version = "2.4.1";
- propagatedBuildInputs = [ pyyaml jq ];
+ propagatedBuildInputs = [ pyyaml xmltodict jq ];
# ValueError: underlying buffer has been detached
doCheck = false;
@@ -17,9 +16,8 @@ buildPythonApplication rec {
meta = with lib; {
description = "Command-line YAML processor - jq wrapper for YAML documents.";
- homepage = https://pypi.python.org/pypi/yq;
+ homepage = https://github.com/kislyuk/yq;
license = [ licenses.asl20 ];
maintainers = [ maintainers.womfoo ];
};
-
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3fa73015ca9..75ab0c4aaf9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8214,7 +8214,7 @@ with pkgs;
yodl = callPackage ../development/tools/misc/yodl { };
yq = callPackage ../development/tools/yq {
- inherit (python3Packages) buildPythonApplication fetchPypi pyyaml;
+ inherit (python3Packages) buildPythonApplication fetchPypi pyyaml xmltodict;
};
winpdb = callPackage ../development/tools/winpdb { };
From 12c2f2a430fbde3af98dee893488438499405ecf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 27 Feb 2018 01:14:21 +0100
Subject: [PATCH 59/63] pythonPackages.green: 2.12.0 -> 2.12.1
---
pkgs/development/python-modules/green/default.nix | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix
index fa09e4ded21..81d2a7e204c 100644
--- a/pkgs/development/python-modules/green/default.nix
+++ b/pkgs/development/python-modules/green/default.nix
@@ -2,18 +2,13 @@
buildPythonPackage rec {
pname = "green";
- version = "2.12.0";
+ version = "2.12.1";
src = fetchPypi {
inherit pname version;
- sha256 = "8cdd2934eff754c9664f373ee0d77cb1cb35dbbf3b719b8ae3b059718db875df";
+ sha256 = "4c0c163bd2ce2da1f201eb69fd92fc24aaeab884f9e5c5a8c23d507a53336fa8";
};
- prePatch = ''
- # See https://github.com/CleanCut/green/pull/182
- substituteInPlace setup.py --replace python-termstyle termstyle
- '';
-
propagatedBuildInputs = [
colorama coverage termstyle unidecode
] ++ lib.optionals (!isPy3k) [ mock backports_shutil_get_terminal_size ];
From 73072e688b7e7daeed46414ab5a67e5d961020b7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 27 Feb 2018 09:25:53 +0100
Subject: [PATCH 60/63] awscli: 1.14.41 -> 1.14.47
---
pkgs/tools/admin/awscli/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index 4c6a91ec321..adc733cbeb2 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -26,12 +26,12 @@ let
in buildPythonPackage rec {
pname = "awscli";
- version = "1.14.41";
+ version = "1.14.47";
namePrefix = "";
src = fetchPypi {
inherit pname version;
- sha256 = "8cf2a52d56f26e22e2fbd7b72649ef1d3de8930df7a730d7f27418d129bb3a6a";
+ sha256 = "269483910c820ae5b4f60021375f07e4f1c23f86505e1b9e29243880a660c1d8";
};
# No tests included
From 6617c0cc306d02903b28ceb30ba74509e4d1d5fc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 27 Feb 2018 09:26:12 +0100
Subject: [PATCH 61/63] python: botocore: 1.8.50 -> 1.9.0
---
pkgs/development/python-modules/botocore/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index 67f09cf9275..e03aade3d95 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "botocore";
- version = "1.8.50";
+ version = "1.9.0";
src = fetchPypi {
inherit pname version;
- sha256 = "a80a23e080f4a93d11a1c067a69304dd407d18c358cba1e0df8c96f56c9e98b4";
+ sha256 = "f70f7f5682a2e7593079ec813f774044ef464b0ebe680dab47930f40e230d6d5";
};
propagatedBuildInputs = [
From ae870798dc8803e1298e335cebc1d1de22068c74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
<robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 27 Feb 2018 09:26:19 +0100
Subject: [PATCH 62/63] awscli: refactor
---
pkgs/tools/admin/awscli/default.nix | 44 ++++++++++++-----------------
pkgs/top-level/all-packages.nix | 2 +-
2 files changed, 19 insertions(+), 27 deletions(-)
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index adc733cbeb2..eb735a04abb 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -1,35 +1,27 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, botocore
-, bcdoc
-, s3transfer
-, six
-, colorama
-, docutils
-, rsa
-, pyyaml
+{ lib
+, python
, groff
, less
}:
let
- colorama_3_7 = colorama.overrideAttrs (old: rec {
- name = "${pname}-${version}";
- pname = "colorama";
- version = "0.3.7";
- src = old.src.override {
- inherit version;
- sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0";
+ py = python.override {
+ packageOverrides = self: super: {
+ colorama = super.colorama.overridePythonAttrs (oldAttrs: rec {
+ version = "0.3.7";
+ src = oldAttrs.src.override {
+ inherit version;
+ sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0";
+ };
+ });
};
- });
+ };
-in buildPythonPackage rec {
+in py.pkgs.buildPythonApplication rec {
pname = "awscli";
version = "1.14.47";
- namePrefix = "";
- src = fetchPypi {
+ src = py.pkgs.fetchPypi {
inherit pname version;
sha256 = "269483910c820ae5b4f60021375f07e4f1c23f86505e1b9e29243880a660c1d8";
};
@@ -37,12 +29,12 @@ in buildPythonPackage rec {
# No tests included
doCheck = false;
- propagatedBuildInputs = [
+ propagatedBuildInputs = with py.pkgs; [
botocore
bcdoc
s3transfer
six
- colorama_3_7
+ colorama
docutils
rsa
pyyaml
@@ -58,10 +50,10 @@ in buildPythonPackage rec {
rm $out/bin/aws.cmd
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://aws.amazon.com/cli/;
description = "Unified tool to manage your AWS services";
- license = stdenv.lib.licenses.asl20;
+ license = licenses.asl20;
maintainers = with maintainers; [ muflax ];
};
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 75ab0c4aaf9..32e3f985688 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -552,7 +552,7 @@ with pkgs;
avfs = callPackage ../tools/filesystems/avfs { };
- awscli = pythonPackages.callPackage ../tools/admin/awscli { };
+ awscli = callPackage ../tools/admin/awscli { };
awsebcli = callPackage ../tools/virtualization/awsebcli {};
From d96f70fc540c1edff4130fb4e3d5a0f6d3f8cb7f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 27 Feb 2018 09:43:40 +0100
Subject: [PATCH 63/63] python: boto3: 1.4.8 -> 1.6.0
---
pkgs/development/python-modules/boto3/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index eaab0031205..ccada6dd140 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -13,13 +13,13 @@
buildPythonPackage rec {
pname = "boto3";
- version = "1.4.8";
+ version = "1.6.0";
src = fetchFromGitHub {
owner = "boto";
repo = "boto3";
rev = version;
- sha256 = "11ysd7a9l5y98q7b7az56phsj2m7w90abf4jabwrknp2c43sq9bi";
+ sha256 = "14d60wc5kff2gjkrm0yfz0179s0qg3f1qqldv8hnf37ny6yvfwn3";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];