From 70cfa4feeb736144afca22e10cdd6a5db9275757 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 5 Mar 2025 08:02:03 +0100 Subject: [PATCH] protobuf_30: init at 30.0 --- pkgs/development/libraries/protobuf/30.nix | 9 ++++ .../development/python-modules/protobuf/6.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 5 +++ 4 files changed, 61 insertions(+) create mode 100644 pkgs/development/libraries/protobuf/30.nix create mode 100644 pkgs/development/python-modules/protobuf/6.nix diff --git a/pkgs/development/libraries/protobuf/30.nix b/pkgs/development/libraries/protobuf/30.nix new file mode 100644 index 000000000000..cf64be20cfb5 --- /dev/null +++ b/pkgs/development/libraries/protobuf/30.nix @@ -0,0 +1,9 @@ +{ callPackage, ... }@args: + +callPackage ./generic.nix ( + { + version = "30.0"; + hash = "sha256-DJhShzuyR7svzxx7hV8INBPFfU4B/0aFCM6foPOINvo="; + } + // args +) diff --git a/pkgs/development/python-modules/protobuf/6.nix b/pkgs/development/python-modules/protobuf/6.nix new file mode 100644 index 000000000000..df3d8c33b6d6 --- /dev/null +++ b/pkgs/development/python-modules/protobuf/6.nix @@ -0,0 +1,45 @@ +{ + buildPythonPackage, + fetchPypi, + lib, + setuptools, + protobuf, +}: + +buildPythonPackage rec { + pname = "protobuf"; + version = "6.30.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-hStnXSdqfQKPZg2gda8YQcdoYY92uQr3cajiwp5vWWU="; + }; + + build-system = [ setuptools ]; + + propagatedNativeBuildInputs = [ + protobuf + ]; + + # the pypi source archive does not ship tests + doCheck = false; + + pythonImportsCheck = [ + "google.protobuf" + "google.protobuf.compiler" + "google.protobuf.internal" + "google.protobuf.pyext" + "google.protobuf.testdata" + "google.protobuf.util" + "google._upb._message" + ]; + + meta = { + description = "Protocol Buffers are Google's data interchange format"; + homepage = "https://developers.google.com/protocol-buffers/"; + changelog = "https://github.com/protocolbuffers/protobuf/releases/v${version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e1655d4fde1..3ebb51e3d0d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10951,6 +10951,7 @@ with pkgs; inherit ({ + protobuf_30 = callPackage ../development/libraries/protobuf/30.nix { }; protobuf_29 = callPackage ../development/libraries/protobuf/29.nix { }; protobuf_28 = callPackage ../development/libraries/protobuf/28.nix { }; protobuf_27 = callPackage ../development/libraries/protobuf/27.nix { }; @@ -10964,6 +10965,7 @@ with pkgs; abseil-cpp = abseil-cpp_202103; }; }) + protobuf_30 protobuf_29 protobuf_28 protobuf_27 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0909b96ce52a..191d895a32b4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11405,6 +11405,11 @@ self: super: with self; { inherit (pkgs.__splicedPackages) protobuf; }; + # Protobuf 6.x + protobuf6 = callPackage ../development/python-modules/protobuf/6.nix { + inherit (pkgs.__splicedPackages) protobuf_30; + }; + proton-client = callPackage ../development/python-modules/proton-client { }; proton-core = callPackage ../development/python-modules/proton-core { };