From b4b986693bb6a13b56bb43f849776f61162c5e84 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 18 Aug 2023 20:09:06 +0300 Subject: [PATCH] treewide: more protobuf downgrades --- pkgs/applications/misc/ola/default.nix | 2 +- pkgs/top-level/all-packages.nix | 101 +++++++++++++++++++------ pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 79 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix index 14055463fa3f1..b016aa8719c70 100644 --- a/pkgs/applications/misc/ola/default.nix +++ b/pkgs/applications/misc/ola/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { python3 ]; propagatedBuildInputs = [ - python3.pkgs.protobuf + (python3.pkgs.protobuf.override { protobuf = protobuf; }) python3.pkgs.numpy ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ef9507a603e8..8a7d60f13c092 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -731,7 +731,9 @@ with pkgs; protoc-gen-go-vtproto = callPackage ../development/tools/protoc-gen-go-vtproto { }; - protoc-gen-grpc-web = callPackage ../development/tools/protoc-gen-grpc-web { }; + protoc-gen-grpc-web = callPackage ../development/tools/protoc-gen-grpc-web { + protobuf = protobuf3_21; + }; protoc-gen-connect-go = callPackage ../development/tools/protoc-gen-connect-go { }; @@ -2566,7 +2568,9 @@ with pkgs; gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { }; - goldberg-emu = callPackage ../applications/emulators/goldberg-emu { }; + goldberg-emu = callPackage ../applications/emulators/goldberg-emu { + protobuf = protobuf3_21; + }; gopsuinfo = callPackage ../tools/system/gopsuinfo { }; @@ -4059,7 +4063,9 @@ with pkgs; amoco = callPackage ../tools/security/amoco { }; - anbox = callPackage ../os-specific/linux/anbox { }; + anbox = callPackage ../os-specific/linux/anbox { + protobuf = protobuf3_21; + }; androidenv = callPackage ../development/mobile/androidenv { }; @@ -4613,7 +4619,9 @@ with pkgs; common-licenses = callPackage ../data/misc/common-licenses { }; - compactor = callPackage ../applications/networking/compactor { }; + compactor = callPackage ../applications/networking/compactor { + protobuf = protobuf3_21; + }; consul = callPackage ../servers/consul { }; @@ -5421,8 +5429,9 @@ with pkgs; ghdorker = callPackage ../tools/security/ghdorker { }; - ghidra = if stdenv.isDarwin then darwin.apple_sdk_11_0.callPackage ../tools/security/ghidra/build.nix {} - else callPackage ../tools/security/ghidra/build.nix { }; + ghidra = darwin.apple_sdk_11_0.callPackage ../tools/security/ghidra/build.nix { + protobuf = protobuf3_21; + }; ghidra-bin = callPackage ../tools/security/ghidra { }; @@ -11188,7 +11197,9 @@ with pkgs; nq = callPackage ../tools/system/nq { }; - nsjail = callPackage ../tools/security/nsjail { }; + nsjail = callPackage ../tools/security/nsjail { + protobuf = protobuf3_21; + }; nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd { }; @@ -11320,7 +11331,9 @@ with pkgs; oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { }; - ola = callPackage ../applications/misc/ola { }; + ola = callPackage ../applications/misc/ola { + protobuf = protobuf3_21; + }; olive-editor = qt6Packages.callPackage ../applications/video/olive-editor { inherit (darwin.apple_sdk.frameworks) CoreFoundation; @@ -11591,7 +11604,9 @@ with pkgs; p3x-onenote = callPackage ../applications/office/p3x-onenote { }; - p4c = callPackage ../development/compilers/p4c { }; + p4c = callPackage ../development/compilers/p4c { + protobuf = protobuf3_21; + }; p7zip = callPackage ../tools/archivers/p7zip { }; @@ -14956,7 +14971,9 @@ with pkgs; zasm = callPackage ../development/compilers/zasm { }; - zbackup = callPackage ../tools/backup/zbackup { }; + zbackup = callPackage ../tools/backup/zbackup { + protobuf = protobuf3_21; + }; zbar = libsForQt5.callPackage ../tools/graphics/zbar { inherit (darwin.apple_sdk.frameworks) Foundation; @@ -20045,9 +20062,14 @@ with pkgs; flex = flex_2_5_35; }; - spoofer = callPackage ../tools/networking/spoofer { }; + spoofer = callPackage ../tools/networking/spoofer { + protobuf = protobuf3_21; + }; - spoofer-gui = callPackage ../tools/networking/spoofer { withGUI = true; }; + spoofer-gui = callPackage ../tools/networking/spoofer { + withGUI = true; + protobuf = protobuf3_21; + }; spooles = callPackage ../development/libraries/science/math/spooles { }; @@ -20763,7 +20785,9 @@ with pkgs; cmrt = callPackage ../development/libraries/cmrt { }; - codecserver = callPackage ../applications/audio/codecserver { }; + codecserver = callPackage ../applications/audio/codecserver { + protobuf = protobuf3_21; + }; coeurl = callPackage ../development/libraries/coeurl { }; @@ -21271,7 +21295,9 @@ with pkgs; gallia = callPackage ../tools/security/gallia { }; - gamenetworkingsockets = callPackage ../development/libraries/gamenetworkingsockets { }; + gamenetworkingsockets = callPackage ../development/libraries/gamenetworkingsockets { + protobuf = protobuf3_21; + }; game-music-emu = callPackage ../development/libraries/audio/game-music-emu { }; @@ -23284,7 +23310,9 @@ with pkgs; libptytty = callPackage ../development/libraries/libptytty { }; - libpulsar = callPackage ../development/libraries/libpulsar { }; + libpulsar = callPackage ../development/libraries/libpulsar { + protobuf = protobuf3_21; + }; libpwquality = callPackage ../development/libraries/libpwquality { python = python3; @@ -23689,7 +23717,9 @@ with pkgs; lightspark = callPackage ../misc/lightspark { }; - lightstep-tracer-cpp = callPackage ../development/libraries/lightstep-tracer-cpp { }; + lightstep-tracer-cpp = callPackage ../development/libraries/lightstep-tracer-cpp { + protobuf = protobuf3_21; + }; ligolo-ng = callPackage ../tools/networking/ligolo-ng { }; @@ -27146,6 +27176,7 @@ with pkgs; rethinkdb = callPackage ../servers/nosql/rethinkdb { stdenv = clangStdenv; libtool = darwin.cctools; + protobuf = protobuf3_21; }; rippled = callPackage ../servers/rippled { @@ -28591,7 +28622,9 @@ with pkgs; sgx-ssl = callPackage ../os-specific/linux/sgx/ssl { }; - sgx-psw = callPackage ../os-specific/linux/sgx/psw { }; + sgx-psw = callPackage ../os-specific/linux/sgx/psw { + protobuf = protobuf3_21; + }; shadow = callPackage ../os-specific/linux/shadow { }; @@ -30361,6 +30394,7 @@ with pkgs; astroid = callPackage ../applications/networking/mailreaders/astroid { vim = vim-full.override { features = "normal"; }; + protobuf = protobuf3_21; }; aucatctl = callPackage ../applications/audio/aucatctl { }; @@ -32374,7 +32408,9 @@ with pkgs; extra-packages = [ csound ]; }; - hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { }; + hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { + protobuf = protobuf3_21; + }; hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { }; @@ -33981,7 +34017,9 @@ with pkgs; osm2pgsql = callPackage ../tools/misc/osm2pgsql { }; - ostinato = libsForQt5.callPackage ../applications/networking/ostinato { }; + ostinato = libsForQt5.callPackage ../applications/networking/ostinato { + protobuf = protobuf3_21; + }; p4 = callPackage ../applications/version-management/p4 { inherit (darwin.apple_sdk.frameworks) CoreServices Foundation Security; @@ -34085,6 +34123,7 @@ with pkgs; shogun = callPackage ../applications/science/machine-learning/shogun { opencv = opencv3; + protobuf = protobuf3_21; }; smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; @@ -34968,7 +35007,9 @@ with pkgs; rgp = libsForQt5.callPackage ../development/tools/rgp { }; - ricochet = libsForQt5.callPackage ../applications/networking/instant-messengers/ricochet { }; + ricochet = libsForQt5.callPackage ../applications/networking/instant-messengers/ricochet { + protobuf = protobuf3_21; + }; ries = callPackage ../applications/science/math/ries { }; @@ -35292,7 +35333,10 @@ with pkgs; curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { }; - curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; }; + curaengine = callPackage ../applications/misc/curaengine { + inherit (python3.pkgs) libarcus; + protobuf = protobuf3_21; + }; cura = libsForQt5.callPackage ../applications/misc/cura { }; @@ -35673,7 +35717,9 @@ with pkgs; tijolo = callPackage ../applications/editors/tijolo { }; - tilemaker = callPackage ../applications/misc/tilemaker { }; + tilemaker = callPackage ../applications/misc/tilemaker { + protobuf = protobuf3_21; + }; timbreid = callPackage ../applications/audio/pd-plugins/timbreid { fftw = fftwSinglePrec; @@ -36864,9 +36910,11 @@ with pkgs; bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc { withGui = true; + protobuf = protobuf3_21; }; bitcoind-abc = callPackage ../applications/blockchains/bitcoin-abc { mkDerivation = stdenv.mkDerivation; + protobuf = protobuf3_21; withGui = false; }; @@ -37430,7 +37478,9 @@ with pkgs; ckan = callPackage ../games/ckan { }; - cockatrice = libsForQt5.callPackage ../games/cockatrice { }; + cockatrice = libsForQt5.callPackage ../games/cockatrice { + protobuf = protobuf3_21; + }; commandergenius = callPackage ../games/commandergenius { }; @@ -38020,10 +38070,13 @@ with pkgs; pong3d = callPackage ../games/pong3d { }; - pokerth = libsForQt5.callPackage ../games/pokerth { }; + pokerth = libsForQt5.callPackage ../games/pokerth { + protobuf = protobuf3_21; + }; pokerth-server = libsForQt5.callPackage ../games/pokerth { target = "server"; + protobuf = protobuf3_21; }; pokete = callPackage ../games/pokete { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 29cbdf6d97b49..ca60dd3aa43da 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5868,7 +5868,7 @@ self: super: with self; { }; libarcus = callPackage ../development/python-modules/libarcus { - inherit (pkgs) protobuf; + protobuf = pkgs.protobuf3_21; }; libasyncns = callPackage ../development/python-modules/libasyncns {