##// END OF EJS Templates
release: merge back stable branch into default
marcink -
r648:07d4187a merge default
parent child Browse files
Show More
@@ -49,3 +49,4 b' 75e11d32c0be0a457198f07888e7ef650cfa6888'
49 6c6f49fda0191c4641dcd43aa0d4376b8b728d40 v4.15.0
49 6c6f49fda0191c4641dcd43aa0d4376b8b728d40 v4.15.0
50 184dea5e01c36e6474c83d3bb34719cdfec22b0d v4.15.1
50 184dea5e01c36e6474c83d3bb34719cdfec22b0d v4.15.1
51 a4dc3669345553582296b2ce1485229a6c6f0522 v4.15.2
51 a4dc3669345553582296b2ce1485229a6c6f0522 v4.15.2
52 d2a4a1a66f204668841da1cdccfa29083e1ef7a3 v4.16.0
@@ -755,11 +755,11 b' self: super: {'
755 };
755 };
756 };
756 };
757 "setuptools" = super.buildPythonPackage {
757 "setuptools" = super.buildPythonPackage {
758 name = "setuptools-40.7.3";
758 name = "setuptools-40.8.0";
759 doCheck = false;
759 doCheck = false;
760 src = fetchurl {
760 src = fetchurl {
761 url = "https://files.pythonhosted.org/packages/90/86/00ab839a8647e0fee435fe77f70795865ca4534387872a6c23b22fd85ac8/setuptools-40.7.3.zip";
761 url = "https://files.pythonhosted.org/packages/c2/f7/c7b501b783e5a74cf1768bc174ee4fb0a8a6ee5af6afa92274ff964703e0/setuptools-40.8.0.zip";
762 sha256 = "0c54kklk7c97g0dhm7ilg9cd4n4s464ps6mspsa5m9hhrcqxsbvh";
762 sha256 = "0k9hifpgahnw2a26w3cr346iy733k6d3nwh3f7g9m13y6f8fqkkf";
763 };
763 };
764 meta = {
764 meta = {
765 license = [ pkgs.lib.licenses.mit ];
765 license = [ pkgs.lib.licenses.mit ];
General Comments 0
You need to be logged in to leave comments. Login now