python3Minimal and python3: don't override python3

This reduces the amount of packages that are required to use
builtins.fetchurl to fetch. Without this change, mime-types
would not be able to use fetchzip when mime-types support is
added to python3.
This commit is contained in:
Frederik Rietdijk 2021-03-14 15:43:38 +01:00
parent 738746a34b
commit 0c1aa67215

View File

@ -108,6 +108,19 @@ with pkgs;
python = self; python = self;
}; };
}; };
sources = {
"python38" = {
sourceVersion = {
major = "3";
minor = "8";
patch = "8";
suffix = "";
};
sha256 = "fGZCSf935EPW6g5M8OWH6ukYyjxI0IHRkV/iofG8xcw=";
};
};
in { in {
python27 = callPackage ./cpython/2.7 { python27 = callPackage ./cpython/2.7 {
@ -149,18 +162,11 @@ in {
inherit passthruFun; inherit passthruFun;
}; };
python38 = callPackage ./cpython { python38 = callPackage ./cpython ({
self = python38; self = python38;
sourceVersion = {
major = "3";
minor = "8";
patch = "8";
suffix = "";
};
sha256 = "fGZCSf935EPW6g5M8OWH6ukYyjxI0IHRkV/iofG8xcw=";
inherit (darwin) configd; inherit (darwin) configd;
inherit passthruFun; inherit passthruFun;
}; } // sources.python38);
python39 = callPackage ./cpython { python39 = callPackage ./cpython {
self = python39; self = python39;
@ -189,8 +195,9 @@ in {
}; };
# Minimal versions of Python (built without optional dependencies) # Minimal versions of Python (built without optional dependencies)
python3Minimal = (python38.override { python3Minimal = (callPackage ./cpython ({
self = python3Minimal; self = python3Minimal;
inherit passthruFun;
pythonAttr = "python3Minimal"; pythonAttr = "python3Minimal";
# strip down that python version as much as possible # strip down that python version as much as possible
openssl = null; openssl = null;
@ -209,7 +216,7 @@ in {
includeSiteCustomize = false; includeSiteCustomize = false;
enableOptimizations = false; enableOptimizations = false;
mimetypesSupport = false; mimetypesSupport = false;
}).overrideAttrs(old: { } // sources.python38)).overrideAttrs(old: {
pname = "python3-minimal"; pname = "python3-minimal";
meta = old.meta // { meta = old.meta // {
maintainers = []; maintainers = [];