From c3777a81ecaa6b4b603bd3ae7bb42241d97ee49f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 17 Oct 2024 14:01:49 +0200 Subject: [PATCH] python312Packages.protobuf: propagate pkgs.protobuf --- pkgs/development/python-modules/protobuf/default.nix | 5 +++++ pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 31b4a8f60f72..228f8140fbe6 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -3,6 +3,7 @@ fetchPypi, lib, setuptools, + protobuf, }: buildPythonPackage rec { @@ -17,6 +18,10 @@ buildPythonPackage rec { build-system = [ setuptools ]; + propagatedNativeBuildInputs = [ + protobuf + ]; + # the pypi source archive does not ship tests doCheck = false; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4cd7b3e12c4b..f19741e43bbd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10725,7 +10725,9 @@ self: super: with self; { }; # Protobuf 5.x - protobuf5 = callPackage ../development/python-modules/protobuf/default.nix { }; + protobuf5 = callPackage ../development/python-modules/protobuf/default.nix { + inherit (pkgs.__splicedPackages) protobuf; + }; # If a protobuf upgrade causes many Python packages to fail, please pin it here to the previous version. protobuf = protobuf5;