Merge branch 'master' into staging-next

2019-12-03 16:51:48 +01:00
parent f2393197d4 d2da3202ea
commit 30fae2883e
144 changed files with 1463 additions and 927 deletions
@@ -46,7 +46,7 @@ with pkgs;
        inherit hasDistutilsCxxPatch pythonForBuild;
  };

-in rec {
+in {

  python27 = callPackage ./cpython/2.7 {
    self = python27;