diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-11-13 15:30:01 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-11-13 15:30:01 +0000 |
| commit | 26b89bcd160762633732251061ac29723da9b2b5 (patch) | |
| tree | cab28af5ae43126195be9fdfbee2fba3399c3a69 /pkgs/top-level/python2-packages.nix | |
| parent | 25da6bdd4157c31cb107188078bb12622a1c567d (diff) | |
| parent | 631c3d7cb2be3267aae75035600d0b2074ea8248 (diff) | |
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Diffstat (limited to 'pkgs/top-level/python2-packages.nix')
| -rw-r--r-- | pkgs/top-level/python2-packages.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 6ee041b0e53fe..f9f9dc3bdb663 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -415,6 +415,11 @@ with self; with super; { prompt-toolkit = callPackage ../development/python-modules/prompt-toolkit/1.nix { }; + protobuf = callPackage ../development/python-modules/protobuf { + disabled = isPyPy; + protobuf = pkgs.protobuf3_17; # last version compatible with Python 2 + }; + pyamf = callPackage ../development/python-modules/pyamf { }; pyblosxom = callPackage ../development/python-modules/pyblosxom { }; |