From bb9edd458e041fafdcc8da6f5bf709bc7c755911 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 7 Jan 2019 11:09:56 +0100
Subject: [PATCH 1/2] python.pkgs.plone-testing: fix build

---
 pkgs/development/python-modules/plone-testing/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/plone-testing/default.nix b/pkgs/development/python-modules/plone-testing/default.nix
index 81482414d57f..636028c957a9 100644
--- a/pkgs/development/python-modules/plone-testing/default.nix
+++ b/pkgs/development/python-modules/plone-testing/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, six
 , zope_testing
 , setuptools
 }:
@@ -14,7 +15,7 @@ buildPythonPackage rec {
     sha256 = "db71bde0d4d3c273dbba8c7a2ab259a42f038eca74184da36c5aab61e90e8dd7";
   };
 
-  propagatedBuildInputs = [ setuptools zope_testing ];
+  propagatedBuildInputs = [ six setuptools zope_testing ];
 
   # Huge amount of testing dependencies (including Zope2)
   doCheck = false;
@@ -24,4 +25,4 @@ buildPythonPackage rec {
     homepage = https://github.com/plone/plone.testing;
     license = lib.licenses.bsd3;
   };
-}
\ No newline at end of file
+}

From 985bc6ca5a598471c311ec09c2c86e1e99a0c606 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 7 Jan 2019 11:10:38 +0100
Subject: [PATCH 2/2] searx: 0.14.0 -> 0.15.0

---
 pkgs/servers/web-apps/searx/default.nix | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix
index cde8f9fecbc8..59d3a387b606 100644
--- a/pkgs/servers/web-apps/searx/default.nix
+++ b/pkgs/servers/web-apps/searx/default.nix
@@ -4,26 +4,31 @@ with python3Packages;
 
 buildPythonApplication rec {
   pname = "searx";
-  version = "0.14.0";
+  version = "0.15.0";
 
   # Can not use PyPI because certain test files are missing.
   src = fetchFromGitHub {
     owner = "asciimoo";
     repo = "searx";
     rev = "v${version}";
-    sha256 = "046xg6xcs1mxgahz7kwf3fsmwd99q3hhms6pdjlvyczidlfhpmxl";
+    sha256 = "05si0fn57z1g80l6003cs0ypag2m6zyi3dgsi06pvjp066xbrjvd";
   };
 
   postPatch = ''
     substituteInPlace requirements.txt \
       --replace 'certifi==2017.11.5' 'certifi' \
-      --replace 'flask==0.12.2' 'flask==0.12.*' \
+      --replace 'flask==1.0.2' 'flask==1.0.*' \
       --replace 'flask-babel==0.11.2' 'flask-babel==0.11.*' \
-      --replace 'lxml==4.1.1' 'lxml==4.1.*' \
-      --replace 'idna==2.5' 'idna' \
+      --replace 'lxml==4.2.3' 'lxml==4.2.*' \
+      --replace 'idna==2.7' 'idna' \
       --replace 'pygments==2.1.3' 'pygments>=2.1,<3.0' \
-      --replace 'pyopenssl==17.4.0' 'pyopenssl' \
-      --replace 'python-dateutil==2.6.1' 'python-dateutil==2.6.*'
+      --replace 'pyopenssl==18.0.0' 'pyopenssl' \
+      --replace 'python-dateutil==2.7.3' 'python-dateutil==2.7.*'
+    substituteInPlace requirements-dev.txt \
+      --replace 'plone.testing==5.0.0' 'plone.testing' \
+      --replace 'pep8==1.7.1' 'pep8==1.7.*' \
+      --replace 'splinter==0.7.5' 'splinter' \
+      --replace 'selenium==3.5.0' 'selenium'
   '';
 
   propagatedBuildInputs = [
@@ -33,7 +38,8 @@ buildPythonApplication rec {
   ];
 
   checkInputs = [
-    splinter mock plone-testing robotsuite unittest2 selenium
+    Babel mock nose2 covCore pep8 plone-testing splinter
+    unittest2 zope_testrunner selenium
   ];
 
   preCheck = ''