searx: 0.9.0 -> 0.10.0 (#18608)

With a patch to loosen up searx pip dependency requirements.
Also includes a minor version bump of pysocks.

2 files changed, 32 insertions, 6 deletions

diff --git a/pkgs/development/python-modules/searx.patch b/pkgs/development/python-modules/searx.patch
new file mode 100644
index 000000000000..6cd25babb332
--- /dev/null
+++ b/pkgs/development/python-modules/searx.patch
@@ -0,0 +1,25 @@
+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
+-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 26e2867de81a..40f17c88b0a9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19679,11 +19679,11 @@ in modules // {
 
   pysocks = buildPythonPackage rec {
     name = "pysocks-${version}";
-    version = "1.5.0";
+    version = "1.5.7";
 
     src = pkgs.fetchurl {
       url    = "mirror://pypi/P/PySocks/PySocks-${version}.tar.gz";
-      sha256 = "10wq5311qrnk8rvzsh6gwzxi7h51pgvzw3d7s1mb39fsvf0vyjdk";
+      sha256 = "124bydbcspzhkb6ynckvgqra1b79rh5mrq98kbyyd202n6a7c775";
     };
 
     doCheck = false;
@@ -27037,15 +27037,16 @@ in modules // {
 
   searx = buildPythonPackage rec {
     name = "searx-${version}";
-    version = "0.9.0";
+    version = "0.10.0";
 
     src = pkgs.fetchFromGitHub {
       owner = "asciimoo";
       repo = "searx";
       rev = "v${version}";
-      sha256 = "030qkrsj4as9anr8xfpk5n41qzg7w4yyjasb4cqislvyl1l1dvvs";
+      sha256 = "0j9pnifcrm4kzziip43w2fgadsg1sqlcm7dfxhnshdx03nby2dy2";
     };
 
+    patches = [ ../development/python-modules/searx.patch ];
     postPatch = ''
       substituteInPlace requirements.txt \
         --replace 'certifi==2015.11.20.1' 'certifi==2016.2.28' \
@@ -27055,14 +27056,14 @@ in modules // {
     propagatedBuildInputs = with self; [
       pyyaml lxml_3_5 grequests flaskbabel flask requests2
       gevent speaklater Babel pytz dateutil pygments_2_0
-      pyasn1 pyasn1-modules ndg-httpsclient certifi
+      pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks
     ];
 
     meta = {
       homepage = https://github.com/asciimoo/searx;
       description = "A privacy-respecting, hackable metasearch engine";
       license = licenses.agpl3Plus;
-      maintainers = with maintainers; [ matejc fpletz ];
+      maintainers = with maintainers; [ matejc fpletz profpatsch ];
     };
   };