Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2019-10-16 11:17:12 +02:00
549 changed files with 8805 additions and 5948 deletions

View File

@@ -28,6 +28,7 @@ with pkgs;
isPy35 = pythonVersion == "3.5";
isPy36 = pythonVersion == "3.6";
isPy37 = pythonVersion == "3.7";
isPy38 = pythonVersion == "3.8";
isPy2 = lib.strings.substring 0 1 pythonVersion == "2";
isPy3 = lib.strings.substring 0 1 pythonVersion == "3";
isPy3k = isPy3;
@@ -104,9 +105,9 @@ in {
major = "3";
minor = "8";
patch = "0";
suffix = "rc1";
suffix = "";
};
sha256 = "08d8j3dsv6yz5zxkqvsa71scxjjzdwarfk6hsjfhaw2xrxndyi5f";
sha256 = "110d0did9rxn7rg85kf2fwli5hqq44xv2d8bi7d92m7v2d728mmk";
inherit (darwin) CF configd;
inherit passthruFun;
};