From 23d2b40cae5f2d21601e950b8bb576b0487590d0 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 12 Aug 2024 03:56:08 +0000 Subject: [PATCH 1/2] python3Packages.protobuf3: remove --- pkgs/top-level/python-packages.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 567c5866bc37a..a0bd7d69112eb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10648,11 +10648,6 @@ self: super: with self; { proto-plus = callPackage ../development/python-modules/proto-plus { }; - # Protobuf 3.x - protobuf3 = callPackage ../development/python-modules/protobuf/3.nix { - protobuf = pkgs.protobuf3_20; - }; - # Protobuf 4.x protobuf4 = callPackage ../development/python-modules/protobuf/4.nix { protobuf = pkgs.protobuf; From 2cc1c9efd81ef0411bf00f932773a40c36c07504 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 12 Aug 2024 05:49:08 +0000 Subject: [PATCH 2/2] protobuf3_20: remove --- pkgs/development/libraries/protobuf/3.20.nix | 6 -- .../libraries/protobuf/generic-v3.nix | 59 ------------------- pkgs/top-level/all-packages.nix | 4 -- 3 files changed, 69 deletions(-) delete mode 100644 pkgs/development/libraries/protobuf/3.20.nix delete mode 100644 pkgs/development/libraries/protobuf/generic-v3.nix diff --git a/pkgs/development/libraries/protobuf/3.20.nix b/pkgs/development/libraries/protobuf/3.20.nix deleted file mode 100644 index bae3550f8f05a..0000000000000 --- a/pkgs/development/libraries/protobuf/3.20.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic-v3.nix ({ - version = "3.20.3"; - sha256 = "sha256-u/1Yb8+mnDzc3OwirpGESuhjkuKPgqDAvlgo3uuzbbk="; -} // args) diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix deleted file mode 100644 index cfcaa55515264..0000000000000 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, autoreconfHook, zlib, gtest, buildPackages -, version, sha256 -, ... -}: - -let -mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation { - pname = "protobuf"; - inherit version; - - # make sure you test also -A pythonPackages.protobuf - src = fetchFromGitHub { - owner = "protocolbuffers"; - repo = "protobuf"; - rev = "v${version}"; - inherit sha256; - }; - - postPatch = '' - rm -rf gmock - cp -r ${gtest.src}/googlemock gmock - cp -r ${gtest.src}/googletest googletest - chmod -R a+w gmock - chmod -R a+w googletest - ln -s ../googletest gmock/gtest - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace src/google/protobuf/testing/googletest.cc \ - --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' - ''; - - nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc buildProtobuf ]; - - buildInputs = [ zlib ]; - configureFlags = lib.optional (buildProtobuf != null) "--with-protoc=${buildProtobuf}/bin/protoc"; - - enableParallelBuilding = true; - - doCheck = true; - - dontDisableStatic = true; - - meta = { - description = "Google's data interchange format"; - longDescription = - ''Protocol Buffers are a way of encoding structured data in an efficient - yet extensible format. Google uses Protocol Buffers for almost all of - its internal RPC protocols and file formats. - ''; - homepage = "https://developers.google.com/protocol-buffers/"; - license = lib.licenses.bsd3; - mainProgram = "protoc"; - platforms = lib.platforms.unix; - }; -}; -in mkProtobufDerivation(if (stdenv.buildPlatform != stdenv.hostPlatform) - then (mkProtobufDerivation null buildPackages.stdenv) - else null) stdenv diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3cba16c1aa9f3..9703615b752ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22792,9 +22792,6 @@ with pkgs; protobuf_21 = callPackage ../development/libraries/protobuf/21.nix { abseil-cpp = abseil-cpp_202103; }; - protobuf3_20 = callPackage ../development/libraries/protobuf/3.20.nix { - abseil-cpp = abseil-cpp_202103; - }; }) protobuf_28 protobuf_27 @@ -22803,7 +22800,6 @@ with pkgs; protobuf_24 protobuf_23 protobuf_21 - protobuf3_20 ; protobufc = callPackage ../development/libraries/protobufc { };