# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2019-02-25 12:50:00
# Node ID 07d4187ae3e96d8ab683be498acfdba27459271f
# Parent  d42f7af512ebcde1a8fe258abc3936ab4d40a998
# Parent  90644f979fa029551ff1daf50ed5ba123925519c

release: merge back stable branch into default

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -49,3 +49,4 @@ 75e11d32c0be0a457198f07888e7ef650cfa6888
 6c6f49fda0191c4641dcd43aa0d4376b8b728d40 v4.15.0
 184dea5e01c36e6474c83d3bb34719cdfec22b0d v4.15.1
 a4dc3669345553582296b2ce1485229a6c6f0522 v4.15.2
+d2a4a1a66f204668841da1cdccfa29083e1ef7a3 v4.16.0
diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix
--- a/pkgs/python-packages.nix
+++ b/pkgs/python-packages.nix
@@ -755,11 +755,11 @@ self: super: {
     };
   };
   "setuptools" = super.buildPythonPackage {
-    name = "setuptools-40.7.3";
+    name = "setuptools-40.8.0";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/90/86/00ab839a8647e0fee435fe77f70795865ca4534387872a6c23b22fd85ac8/setuptools-40.7.3.zip";
-      sha256 = "0c54kklk7c97g0dhm7ilg9cd4n4s464ps6mspsa5m9hhrcqxsbvh";
+      url = "https://files.pythonhosted.org/packages/c2/f7/c7b501b783e5a74cf1768bc174ee4fb0a8a6ee5af6afa92274ff964703e0/setuptools-40.8.0.zip";
+      sha256 = "0k9hifpgahnw2a26w3cr346iy733k6d3nwh3f7g9m13y6f8fqkkf";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];