From e06858bd99fb27642f3ddcef5510964df915ade0 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 17 Feb 2024 17:21:27 +0100 Subject: [PATCH 1/2] python311Packages.protobuf: mark as broken for protobuf >= 25 --- pkgs/development/python-modules/protobuf/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index f2d2d52f2c8f..610313302ad8 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -115,5 +115,8 @@ 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 "25"; }; } From 89d515e214dc623e447d27bbb65883404f6836e6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 17 Feb 2024 17:21:45 +0100 Subject: [PATCH 2/2] protobuf_25: 25.2 -> 25.3 Changelog: https://github.com/protocolbuffers/protobuf/releases/tag/v25.3 --- pkgs/development/libraries/protobuf/25.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/protobuf/25.nix b/pkgs/development/libraries/protobuf/25.nix index 0b05e81cc029..782906d0b5b7 100644 --- a/pkgs/development/libraries/protobuf/25.nix +++ b/pkgs/development/libraries/protobuf/25.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix ({ - version = "25.2"; - hash = "sha256-Bw7xOgcGLshFppH4qD8E48D8v21ZJRaRkK19LPSATMg="; + version = "25.3"; + hash = "sha256-N/mO9a6NyC0GwxY3/u1fbFbkfH7NTkyuIti6L3bc+7k="; } // args) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c88ef6e59e19..9bcaf7356b04 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24420,9 +24420,7 @@ with pkgs; protobuf = protobuf_24; - protobuf_25 = callPackage ../development/libraries/protobuf/25.nix { - abseil-cpp = abseil-cpp_202308; - }; + protobuf_25 = callPackage ../development/libraries/protobuf/25.nix { }; protobuf_24 = callPackage ../development/libraries/protobuf/24.nix { }; protobuf_23 = callPackage ../development/libraries/protobuf/23.nix { }; protobuf_21 = callPackage ../development/libraries/protobuf/21.nix {