From 8684e5cb667ad7fe38fc44f918ef69a0374f9848 Mon Sep 17 00:00:00 2001 From: Matthew Date: Wed, 10 Aug 2016 18:26:47 +0000 Subject: [PATCH 1/3] pyopenssl: 0.15.1 -> 16.0.0 This will fix the error in certbot. http://hydra.nixos.org/build/38387037/nixlog/3 --- 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 a96c420fe15..43d49b1bbb7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19522,11 +19522,11 @@ in modules // { pyopenssl = buildPythonPackage rec { name = "pyopenssl-${version}"; - version = "0.15.1"; + version = "16.0.0"; src = pkgs.fetchurl { url = "mirror://pypi/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz"; - sha256 = "0wnnq15rhj7fhdcd8ycwiw6r6g3w9f9lcy6cigg8226vsrq618ph"; + sha256 = "0zfijaxlq4vgi6jz0d4i5xq9ygqnyps6br7lmigjhqnh8gp10g9n"; }; # 12 tests failing, 26 error out From 7d3bccdd7c141961b77044cc2542e33d416606f3 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 16 Aug 2016 20:33:59 +0000 Subject: [PATCH 2/3] service-identity: 14.0.0 -> 16.0.0 - adds attrs as input --- 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 43d49b1bbb7..c0250c5b228 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26915,15 +26915,15 @@ in modules // { service-identity = buildPythonPackage rec { name = "service-identity-${version}"; - version = "14.0.0"; + version = "16.0.0"; src = pkgs.fetchurl { url = "mirror://pypi/s/service_identity/service_identity-${version}.tar.gz"; - sha256 = "0njg9bklkkp4rl2b9vsfh9aasxy3w2dmjkv9cq34jn65lwcs619i"; + sha256 = "0dih7i7d36nbllcxgfkvbnaj1wlzhwfnpr4b97dz74czylif4c06"; }; propagatedBuildInputs = with self; [ - characteristic pyasn1 pyasn1-modules pyopenssl idna + characteristic pyasn1 pyasn1-modules pyopenssl idna attrs ]; buildInputs = with self; [ From a2937ba293443644354b6e5677ddfbd4c46e3edc Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 16 Aug 2016 20:46:19 +0000 Subject: [PATCH 3/3] searx: force to use new pyopenssl --- pkgs/top-level/python-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c0250c5b228..fa63de0d01b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26376,7 +26376,8 @@ in modules // { postPatch = '' substituteInPlace requirements.txt \ - --replace 'certifi==2015.11.20.1' 'certifi==2016.2.28' + --replace 'certifi==2015.11.20.1' 'certifi==2016.2.28' \ + --replace 'pyopenssl==0.15.1' 'pyopenssl==16.0.0' ''; propagatedBuildInputs = with self; [