Merge master into staging

There are larger-rebuild changes: gnutls and samba.
2015-07-17 06:37:13 +02:00
parent cf8309ef34 967abfc786
commit 9f37e91ec5
46 changed files with 791 additions and 101 deletions
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
  shortName = "setuptools-${version}";
  name = "${python.executable}-${shortName}";

-  version = "7.0";
+  version = "18.0.1";

  src = fetchurl {
    url = "http://pypi.python.org/packages/source/s/setuptools/${shortName}.tar.gz";
-    sha256 = "0qg07f035agwcz9m0p3kgdjs18xpl3h00rv28aqsfdyz1wm1m76x";
+    sha256 = "152b4qlpqc54939vfx5ipjpgx0kln02n3ywpm6x25pqysngwjjad";
  };

  buildInputs = [ python wrapPython distutils-cfg ];