Merge branch 'master' into staging

2018-06-30 01:41:59 +02:00
parent 3892a3e5a9 2059bf9e39
commit f7781f5293
998 changed files with 16512 additions and 10378 deletions
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -207,7 +207,7 @@ in stdenv.mkDerivation {
    withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};
    pkgs = pythonPackages;
    isPy3 = true;
-    isPy35 = true;
+    isPy36 = true;
    is_py3k = true;  # deprecated
    interpreter = "${self}/bin/${executable}";
  };