Merge branch 'master' into staging

There were some conflicts in python modules, commented at #28314.
2017-08-29 10:51:54 +02:00
parent 34b6bbe021 e1f755e44f
commit 2858c41823
300 changed files with 6475 additions and 4510 deletions
--- a/pkgs/development/python-modules/requests-oauthlib.nix
+++ b/pkgs/development/python-modules/requests-oauthlib.nix
@@ -8,7 +8,7 @@ buildPythonPackage rec {

  src = fetchPypi {
    inherit pname version;
-    sha256 = "883ac416757eada6d3d07054ec7092ac21c7f35cb1d2cf82faf205637081f468";
+    sha256 = "18gg9dwral153c10f8bwhz2dy4nw7c6mws5a2g7gidk3z5xhqy4n";
  };

  doCheck = false;        # Internet tests fail when building in chroot