From b0d26719daac8d850fe22e274faa14c83a9e317f Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Sun, 16 Aug 2015 15:48:36 -0400 Subject: [PATCH 1/7] python-idna init at 2.0 Needed for python-cryptography: 0.6.1 -> 1.0 --- pkgs/top-level/python-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e952f266ed11..0e3c83f4ab91 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2330,6 +2330,21 @@ let propagatedBuildInputs = [ self.six ] ++ optional (!isPyPy) self.cffi_0_8; }; + idna = buildPythonPackage rec { + name = "idna-2.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/i/idna/${name}.tar.gz"; + sha256 = "0frxgmgi234lr9hylg62j69j4ik5zhg0wz05w5dhyacbjfnrl68n"; + }; + + meta = { + homepage = "http://github.com/kjd/idna/"; + description = "Internationalized Domain Names in Applications (IDNA)"; + license = "licenses.bsd3"; + }; + }; + cryptography_vectors = buildPythonPackage rec { name = "cryptography_vectors-0.6.1"; From fcd5a4a2c398b82010093aff800eaeab960ca388 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Sun, 16 Aug 2015 15:48:58 -0400 Subject: [PATCH 2/7] python-pyasn1: 0.1.7 -> 0.1.8 Needed for python-cryptography: 0.6.1 -> 1.0 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0e3c83f4ab91..8a541fc711e5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9914,11 +9914,11 @@ let pyasn1 = buildPythonPackage ({ - name = "pyasn1-0.1.7"; + name = "pyasn1-0.1.8"; src = pkgs.fetchurl { - url = "mirror://sourceforge/pyasn1/0.1.7/pyasn1-0.1.7.tar.gz"; - sha256 = "1aqy21fb564gmnkw2fbkn55c40diyx3z0ixh4savvxikqm9ivy74"; + url = "mirror://sourceforge/pyasn1/0.1.8/pyasn1-0.1.8.tar.gz"; + sha256 = "0iw31d9l0zwx35szkzq72hiw002wnqrlrsi9dpbrfngcl1ybwcsx"; }; meta = { From ff192b72cf018977c3da5502edb54fa92848eebe Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Sun, 16 Aug 2015 15:49:35 -0400 Subject: [PATCH 3/7] python-cryptography_vectors: 0.6.1 -> 1.0 Needed for python-cryptography: 0.6.1 -> 1.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8a541fc711e5..d3fad6c15839 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2346,11 +2346,11 @@ let }; cryptography_vectors = buildPythonPackage rec { - name = "cryptography_vectors-0.6.1"; + name = "cryptography_vectors-1.0"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/c/cryptography-vectors/${name}.tar.gz"; - sha256 = "1ks1xdb1ff74qmjdzqcfvkrwsbnwpsjgg3cy18zh37p8985cvl3r"; + sha256 = "0d02x93vk0b1fla914bij71pfma0p7sprlvrxq1bb6dxnwc7h9z7"; }; }; From ef43cb270eb842a2c6eeb7183c5d458cd80ade82 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Sun, 16 Aug 2015 15:50:10 -0400 Subject: [PATCH 4/7] python-cryptography: 0.6.1 -> 1.0 Update propagatedBuildInputs to get proper cffi version and shim packages for older pythons. --- pkgs/top-level/python-packages.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d3fad6c15839..98eea3d7e99b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2318,16 +2318,18 @@ let }; cryptography = buildPythonPackage rec { - name = "cryptography-0.6.1"; + name = "cryptography-1.0"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/c/cryptography/${name}.tar.gz"; - sha256 = "17ij2acy28ryxahiq64lpf71d5z3sa9xhr4pjv7a1v81189i0j82"; + sha256 = "008hq9s4z7y17yjxh1aycvddas320hfbl9vj8gydg4fpfzz04711"; }; buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors - self.iso8601 self.pyasn1 self.pytest ]; - propagatedBuildInputs = [ self.six ] ++ optional (!isPyPy) self.cffi_0_8; + self.iso8601 self.pyasn1 self.pytest self.py ]; + propagatedBuildInputs = [ self.six self.idna self.ipaddress ] + ++ optional (!isPyPy) self.cffi + ++ optional (pythonOlder "3.4") self.enum34; }; idna = buildPythonPackage rec { From 3ea4485446107ff8cbd7658a2d0e067a190c6071 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Sun, 16 Aug 2015 09:37:54 -0400 Subject: [PATCH 5/7] python-pyopenssl: update propagatedBuildInputs. --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 98eea3d7e99b..0105daa8abd7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11208,7 +11208,7 @@ let # 17 tests failing doCheck = false; - propagatedBuildInputs = [ self.cryptography ]; + propagatedBuildInputs = [ self.cryptography self.pyasn1 self.idna ]; }; From ebe451017c057efece01fa45414e18ad5522dca6 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Sun, 16 Aug 2015 05:48:17 -0400 Subject: [PATCH 6/7] python-SleekXMPP: fix source URL --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0105daa8abd7..79867011de73 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8231,8 +8231,8 @@ let propagatedBuildInputs = with self ; [ dnspython3 pyasn1 ]; src = pkgs.fetchurl { - url = "https://github.com/fritzy/SleekXMPP/archive/${version}.tar.gz"; - sha256 = "1hqs2w5d7x532psfqipd2wl1mkmsaak83jvp1rh9rv406fzp9h67"; + url = "https://github.com/fritzy/SleekXMPP/archive/sleek-${version}.tar.gz"; + sha256 = "07zz0bm098zss0xww11gj45aw417nrkp9k1szzs1zm88wyfr1z31"; }; meta = { From 5b91f2dd91d4194d96b80da6def0adf62b6bd5c5 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Sun, 16 Aug 2015 06:04:33 -0400 Subject: [PATCH 7/7] python-Electrum: fix file sha256 It's unfortunate that this changed, but the tarball does appear to have a valid signature. --- pkgs/applications/misc/electrum/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 7aff57a6af93..b1fdc50fe15c 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchurl { url = "https://download.electrum.org/Electrum-${version}.tar.gz"; - sha256 = "0z5ksr1wlywl4bpvxjmmqnsk7jh1jfjdz9lsjkhf2j391jx0wz9q"; + sha256 = "0y04m5b410y3s9vqvkbvmlvvx1nr0cyvrnl41yapz8hydw9vdkjx"; }; propagatedBuildInputs = with pythonPackages; [