From df5f5099c8831d8b05bb67c79fde682abe1201c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 14 Aug 2023 20:08:30 +0200 Subject: [PATCH] python311Packages.protobuf: drop extraneous patch https://hydra.nixos.org/build/231540486/nixlog/1/tail --- pkgs/development/python-modules/protobuf/default.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 38db9ef067e6..d0f8e3bba99d 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -27,14 +27,7 @@ buildPythonPackage { sourceRoot = "${protobuf.src.name}/python"; - patches = lib.optionals (pythonAtLeast "3.11") [ - (fetchpatch { - url = "https://github.com/protocolbuffers/protobuf/commit/da973aff2adab60a9e516d3202c111dbdde1a50f.patch"; - stripLen = 2; - extraPrefix = ""; - hash = "sha256-a/12C6yIe1tEKjsMxcfDAQ4JHolA8CzkN7sNG8ZspPs="; - }) - ] ++ lib.optionals (lib.versionAtLeast protobuf.version "3.22") [ + patches = lib.optionals (lib.versionAtLeast protobuf.version "3.22") [ # Replace the vendored abseil-cpp with nixpkgs' (substituteAll { src = ./use-nixpkgs-abseil-cpp.patch;