diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2021-11-13 12:35:55 +0100 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2021-11-13 12:35:55 +0100 |
| commit | 1a1e32f023a2a8a928c1f06ed7b714e05c191524 (patch) | |
| tree | da2925bcaece20726f708a27b91101ecdf88566d /pkgs/top-level/python2-packages.nix | |
| parent | c0c7fbda14cd086d25ab9250025a32df1c1da61d (diff) | |
| parent | 126db930e3544a4d42b0c9b2a2f1381cdd27004b (diff) | |
| download | nixpkgs-1a1e32f023a2a8a928c1f06ed7b714e05c191524.tar nixpkgs-1a1e32f023a2a8a928c1f06ed7b714e05c191524.tar.gz nixpkgs-1a1e32f023a2a8a928c1f06ed7b714e05c191524.tar.bz2 nixpkgs-1a1e32f023a2a8a928c1f06ed7b714e05c191524.tar.lz nixpkgs-1a1e32f023a2a8a928c1f06ed7b714e05c191524.tar.xz nixpkgs-1a1e32f023a2a8a928c1f06ed7b714e05c191524.tar.zst nixpkgs-1a1e32f023a2a8a928c1f06ed7b714e05c191524.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts were caused by 2043dbb6faa9e21b0fb500161542e30d6c8bc680 interacting with b2767b69ddc702eb926633a5f2336534352cb7b8.
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 3558cf2a221..56b39b5087a 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 { }; |