From 600ce2f45f1a6fe611b8add89f15f74beec0db60 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 21 Sep 2024 17:38:42 +0200 Subject: [PATCH] python3Packages.protobuf4: pin to protobuf_25 25 is the last version that claims compatibility with protobuf4. I've removed the comment, as it doesn't seem that later versions will ever be supported. --- pkgs/development/python-modules/protobuf/4.nix | 2 -- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/protobuf/4.nix b/pkgs/development/python-modules/protobuf/4.nix index 9d10deca12a5..d58e21d195a1 100644 --- a/pkgs/development/python-modules/protobuf/4.nix +++ b/pkgs/development/python-modules/protobuf/4.nix @@ -124,8 +124,6 @@ buildPythonPackage { homepage = "https://developers.google.com/protocol-buffers/"; license = licenses.bsd3; maintainers = with maintainers; [ knedlsepp ]; - # Tests are currently failing because backend is unavailable and causes tests to fail - # Progress tracked in https://github.com/NixOS/nixpkgs/pull/264902 broken = lib.versionAtLeast protobuf.version "26"; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6cb4a31554a2..63442fbcbd31 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10623,7 +10623,7 @@ self: super: with self; { # Protobuf 4.x protobuf4 = callPackage ../development/python-modules/protobuf/4.nix { - protobuf = pkgs.protobuf; + protobuf = pkgs.protobuf_25; }; # Protobuf 5.x