protobuf: make 3.12.x default
This commit is contained in:
parent
d489409aaa
commit
5aa7c0c825
|
@ -14402,7 +14402,7 @@ in
|
||||||
python = python37;
|
python = python37;
|
||||||
};
|
};
|
||||||
|
|
||||||
protobuf = protobuf3_8;
|
protobuf = protobuf3_12;
|
||||||
|
|
||||||
protobuf3_12 = callPackage ../development/libraries/protobuf/3.12.nix { };
|
protobuf3_12 = callPackage ../development/libraries/protobuf/3.12.nix { };
|
||||||
protobuf3_11 = callPackage ../development/libraries/protobuf/3.11.nix { };
|
protobuf3_11 = callPackage ../development/libraries/protobuf/3.11.nix { };
|
||||||
|
|
|
@ -5322,7 +5322,7 @@ in {
|
||||||
protobuf = callPackage ../development/python-modules/protobuf {
|
protobuf = callPackage ../development/python-modules/protobuf {
|
||||||
disabled = isPyPy;
|
disabled = isPyPy;
|
||||||
doCheck = !isPy3k;
|
doCheck = !isPy3k;
|
||||||
protobuf = pkgs.protobuf3_8;
|
protobuf = pkgs.protobuf3_12;
|
||||||
};
|
};
|
||||||
|
|
||||||
psd-tools = callPackage ../development/python-modules/psd-tools { };
|
psd-tools = callPackage ../development/python-modules/psd-tools { };
|
||||||
|
|
Loading…
Reference in New Issue