# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2016-12-13 10:58:38
# Node ID 85e5575dda702db77bb7528d72d9c66f22d865ef
# Parent  02c32193d282bae6210eeee9249ff221848948e2

packaging: updated rhodecode-tools to 0.11.0

diff --git a/pkgs/patch-rhodecode-tools-setup.diff b/pkgs/patch-rhodecode-tools-setup.diff
deleted file mode 100644
--- a/pkgs/patch-rhodecode-tools-setup.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/requirements.txt b/requirements.txt
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -3,7 +3,7 @@ future==0.14.3
- six==1.9.0
- mako==1.0.1
- markupsafe==0.23
--requests==2.5.1
-+requests
- whoosh==2.7.0
- elasticsearch==2.3.0
- elasticsearch-dsl==2.0.0
\ No newline at end of file
diff --git a/pkgs/python-packages-overrides.nix b/pkgs/python-packages-overrides.nix
--- a/pkgs/python-packages-overrides.nix
+++ b/pkgs/python-packages-overrides.nix
@@ -202,12 +202,6 @@ self: super: {
       '';
     });
 
-  rhodecode-tools = super.rhodecode-tools.override (attrs: {
-    patches = [
-      ./patch-rhodecode-tools-setup.diff
-    ];
-  });
-
   URLObject = super.URLObject.override (attrs: {
     meta = {
       license = {
diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix
--- a/pkgs/python-packages.nix
+++ b/pkgs/python-packages.nix
@@ -666,13 +666,13 @@
     };
   };
   elasticsearch-dsl = super.buildPythonPackage {
-    name = "elasticsearch-dsl-2.0.0";
+    name = "elasticsearch-dsl-2.2.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [six python-dateutil elasticsearch];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/4e/5d/e788ae8dbe2ff4d13426db0a027533386a5c276c77a2654dc0e2007ce04a/elasticsearch-dsl-2.0.0.tar.gz";
-      md5 = "4cdfec81bb35383dd3b7d02d7dc5ee68";
+      url = "https://pypi.python.org/packages/66/2f/52a086968788e58461641570f45c3207a52d46ebbe9b77dc22b6a8ffda66/elasticsearch-dsl-2.2.0.tar.gz";
+      md5 = "fa6bd3c87ea3caa8f0f051bc37c53221";
     };
     meta = {
       license = [ pkgs.lib.licenses.asl20 ];
@@ -1508,13 +1508,13 @@
     };
   };
   rhodecode-tools = super.buildPythonPackage {
-    name = "rhodecode-tools-0.10.2";
+    name = "rhodecode-tools-0.11.0";
     buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [click future six Mako MarkupSafe requests Whoosh elasticsearch elasticsearch-dsl urllib3];
+    propagatedBuildInputs = with self; [click future six Mako MarkupSafe requests elasticsearch elasticsearch-dsl urllib3 Whoosh];
     src = fetchurl {
-      url = "https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.10.2.zip";
-      md5 = "d2af3985a1a32a678944d4d48870cb04";
+      url = "https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.11.0.tar.gz?md5=e5fd0a8363af08a0ced71b50ca9cce15";
+      md5 = "e5fd0a8363af08a0ced71b50ca9cce15";
     };
     meta = {
       license = [ { fullName = "AGPLv3 and Proprietary"; } ];
diff --git a/requirements.txt b/requirements.txt
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,6 @@ Beaker==1.7.0
 Chameleon==2.24
 FormEncode==1.2.4
 Jinja2==2.7.3
-Mako==1.0.6
 Markdown==2.6.7
 MarkupSafe==0.23
 MySQL-python==1.2.5
@@ -32,7 +31,6 @@ WebError==0.10.3
 WebHelpers==1.3
 WebHelpers2==2.0
 WebOb==1.3.1
-Whoosh==2.7.4
 amqplib==1.0.2
 anyjson==0.3.3
 appenlight-client==0.6.14
@@ -56,6 +54,7 @@ infrae.cache==1.0.1
 iso8601==0.1.11
 itsdangerous==0.24
 kombu==1.5.1
+Mako==1.0.6
 meld3==1.0.2
 msgpack-python==0.4.8
 nose==1.3.6
@@ -85,7 +84,6 @@ pyzmq==14.6.0
 recaptcha-client==1.0.6
 repoze.lru==0.6
 requests==2.9.1
-serpent==1.12
 setproctitle==1.1.8
 simplejson==3.7.2
 six==1.9.0
@@ -98,6 +96,7 @@ uWSGI==2.0.11.2
 urllib3==1.16
 venusian==1.0
 
+Whoosh==2.7.4
 wsgiref==0.1.2
 zope.cachedescriptors==4.0.0
 zope.deprecation==4.1.2
@@ -122,8 +121,8 @@ ipython==5.1.0
 CProfileV==1.0.6
 bottle==0.12.8
 
-# rhodecode-tools
-https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.10.2.zip#md5=d2af3985a1a32a678944d4d48870cb04
+## rhodecode-tools, special case
+https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.11.0.tar.gz?md5=e5fd0a8363af08a0ced71b50ca9cce15#egg=rhodecode-tools==0.11.0
 
 # test related requirements
 -r requirements_test.txt