From 6d0806d061db5da8fecf62459347db407e23c119 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 8 Feb 2017 20:33:57 +0100 Subject: [PATCH] pythonPackages.searx: 0.10.0 -> 0.11.0 --- pkgs/development/python-modules/searx.patch | 26 --------------------- pkgs/top-level/python-packages.nix | 17 ++++++++++---- 2 files changed, 12 insertions(+), 31 deletions(-) delete mode 100644 pkgs/development/python-modules/searx.patch diff --git a/pkgs/development/python-modules/searx.patch b/pkgs/development/python-modules/searx.patch deleted file mode 100644 index 1fd7dcbde6d..00000000000 --- a/pkgs/development/python-modules/searx.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/requirements.txt b/requirements.txt -index 0d2f61b..46481b3 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,12 +1,12 @@ - certifi==2016.2.28 --flask==0.11.1 --flask-babel==0.11.1 --lxml==3.6.0 --ndg-httpsclient==0.4.1 -+flask==0.* -+flask-babel==0.* -+lxml==3.* -+ndg-httpsclient==0.4.* - pyasn1==0.1.9 - pyasn1-modules==0.0.8 --pygments==2.1.3 -+pygments==2.* --pyopenssl==0.15.1 -+pyopenssl==16.* --python-dateutil==2.5.3 -+python-dateutil==2.* --pyyaml==3.11 -+pyyaml==3.* --requests[socks]==2.10.0 -+requests[socks]==2.* diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 969ae8b240a..e9f00fbeb24 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -28876,20 +28876,27 @@ EOF searx = buildPythonPackage rec { name = "searx-${version}"; - version = "0.10.0"; + version = "0.11.0"; src = pkgs.fetchFromGitHub { owner = "asciimoo"; repo = "searx"; rev = "v${version}"; - sha256 = "0j9pnifcrm4kzziip43w2fgadsg1sqlcm7dfxhnshdx03nby2dy2"; + sha256 = "1m6q7yd45lfk19yp30x1jmisff6npa1y348wqc9ixa3ywvb28ky8"; }; - patches = [ ../development/python-modules/searx.patch ]; + postPatch = '' + substituteInPlace requirements.txt \ + --replace 'certifi==2016.9.26' 'certifi' \ + --replace 'pyyaml==3.11' 'pyyaml' \ + --replace 'lxml==3.7.1' 'lxml' \ + --replace 'pyopenssl==16.2.0' 'pyopenssl' \ + --replace 'requests[socks]==2.12.4' 'requests[socks]' + ''; propagatedBuildInputs = with self; [ - pyyaml lxml_3_5 grequests flaskbabel flask requests2 - gevent speaklater Babel pytz dateutil pygments_2_0 + pyyaml lxml grequests flaskbabel flask requests2 + gevent speaklater Babel pytz dateutil pygments pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks ];