lol

Merge pull request #249995 from K900/more-protobuf-pins

treewide: more protobuf downgrades

authored by

K900 and committed by
GitHub
2eeb7391 1e271fd4

+79 -26
+1 -1
pkgs/applications/misc/ola/default.nix
··· 39 39 python3 40 40 ]; 41 41 propagatedBuildInputs = [ 42 - python3.pkgs.protobuf 42 + (python3.pkgs.protobuf.override { protobuf = protobuf; }) 43 43 python3.pkgs.numpy 44 44 ]; 45 45
+77 -24
pkgs/top-level/all-packages.nix
··· 731 731 732 732 protoc-gen-go-vtproto = callPackage ../development/tools/protoc-gen-go-vtproto { }; 733 733 734 - protoc-gen-grpc-web = callPackage ../development/tools/protoc-gen-grpc-web { }; 734 + protoc-gen-grpc-web = callPackage ../development/tools/protoc-gen-grpc-web { 735 + protobuf = protobuf3_21; 736 + }; 735 737 736 738 protoc-gen-connect-go = callPackage ../development/tools/protoc-gen-connect-go { }; 737 739 ··· 2566 2568 2567 2569 gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { }; 2568 2570 2569 - goldberg-emu = callPackage ../applications/emulators/goldberg-emu { }; 2571 + goldberg-emu = callPackage ../applications/emulators/goldberg-emu { 2572 + protobuf = protobuf3_21; 2573 + }; 2570 2574 2571 2575 gopsuinfo = callPackage ../tools/system/gopsuinfo { }; 2572 2576 ··· 4059 4063 4060 4064 amoco = callPackage ../tools/security/amoco { }; 4061 4065 4062 - anbox = callPackage ../os-specific/linux/anbox { }; 4066 + anbox = callPackage ../os-specific/linux/anbox { 4067 + protobuf = protobuf3_21; 4068 + }; 4063 4069 4064 4070 androidenv = callPackage ../development/mobile/androidenv { }; 4065 4071 ··· 4613 4619 4614 4620 common-licenses = callPackage ../data/misc/common-licenses { }; 4615 4621 4616 - compactor = callPackage ../applications/networking/compactor { }; 4622 + compactor = callPackage ../applications/networking/compactor { 4623 + protobuf = protobuf3_21; 4624 + }; 4617 4625 4618 4626 consul = callPackage ../servers/consul { }; 4619 4627 ··· 5421 5429 5422 5430 ghdorker = callPackage ../tools/security/ghdorker { }; 5423 5431 5424 - ghidra = if stdenv.isDarwin then darwin.apple_sdk_11_0.callPackage ../tools/security/ghidra/build.nix {} 5425 - else callPackage ../tools/security/ghidra/build.nix { }; 5432 + ghidra = darwin.apple_sdk_11_0.callPackage ../tools/security/ghidra/build.nix { 5433 + protobuf = protobuf3_21; 5434 + }; 5426 5435 5427 5436 ghidra-bin = callPackage ../tools/security/ghidra { }; 5428 5437 ··· 11200 11209 11201 11210 nq = callPackage ../tools/system/nq { }; 11202 11211 11203 - nsjail = callPackage ../tools/security/nsjail { }; 11212 + nsjail = callPackage ../tools/security/nsjail { 11213 + protobuf = protobuf3_21; 11214 + }; 11204 11215 11205 11216 nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd { }; 11206 11217 ··· 11332 11343 11333 11344 oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { }; 11334 11345 11335 - ola = callPackage ../applications/misc/ola { }; 11346 + ola = callPackage ../applications/misc/ola { 11347 + protobuf = protobuf3_21; 11348 + }; 11336 11349 11337 11350 olive-editor = qt6Packages.callPackage ../applications/video/olive-editor { 11338 11351 inherit (darwin.apple_sdk.frameworks) CoreFoundation; ··· 11603 11616 11604 11617 p3x-onenote = callPackage ../applications/office/p3x-onenote { }; 11605 11618 11606 - p4c = callPackage ../development/compilers/p4c { }; 11619 + p4c = callPackage ../development/compilers/p4c { 11620 + protobuf = protobuf3_21; 11621 + }; 11607 11622 11608 11623 p7zip = callPackage ../tools/archivers/p7zip { }; 11609 11624 ··· 14968 14983 14969 14984 zasm = callPackage ../development/compilers/zasm { }; 14970 14985 14971 - zbackup = callPackage ../tools/backup/zbackup { }; 14986 + zbackup = callPackage ../tools/backup/zbackup { 14987 + protobuf = protobuf3_21; 14988 + }; 14972 14989 14973 14990 zbar = libsForQt5.callPackage ../tools/graphics/zbar { 14974 14991 inherit (darwin.apple_sdk.frameworks) Foundation; ··· 20061 20078 flex = flex_2_5_35; 20062 20079 }; 20063 20080 20064 - spoofer = callPackage ../tools/networking/spoofer { }; 20081 + spoofer = callPackage ../tools/networking/spoofer { 20082 + protobuf = protobuf3_21; 20083 + }; 20065 20084 20066 - spoofer-gui = callPackage ../tools/networking/spoofer { withGUI = true; }; 20085 + spoofer-gui = callPackage ../tools/networking/spoofer { 20086 + withGUI = true; 20087 + protobuf = protobuf3_21; 20088 + }; 20067 20089 20068 20090 spooles = callPackage ../development/libraries/science/math/spooles { }; 20069 20091 ··· 20779 20801 20780 20802 cmrt = callPackage ../development/libraries/cmrt { }; 20781 20803 20782 - codecserver = callPackage ../applications/audio/codecserver { }; 20804 + codecserver = callPackage ../applications/audio/codecserver { 20805 + protobuf = protobuf3_21; 20806 + }; 20783 20807 20784 20808 coeurl = callPackage ../development/libraries/coeurl { }; 20785 20809 ··· 21287 21311 21288 21312 gallia = callPackage ../tools/security/gallia { }; 21289 21313 21290 - gamenetworkingsockets = callPackage ../development/libraries/gamenetworkingsockets { }; 21314 + gamenetworkingsockets = callPackage ../development/libraries/gamenetworkingsockets { 21315 + protobuf = protobuf3_21; 21316 + }; 21291 21317 21292 21318 game-music-emu = callPackage ../development/libraries/audio/game-music-emu { }; 21293 21319 ··· 23300 23326 23301 23327 libptytty = callPackage ../development/libraries/libptytty { }; 23302 23328 23303 - libpulsar = callPackage ../development/libraries/libpulsar { }; 23329 + libpulsar = callPackage ../development/libraries/libpulsar { 23330 + protobuf = protobuf3_21; 23331 + }; 23304 23332 23305 23333 libpwquality = callPackage ../development/libraries/libpwquality { 23306 23334 python = python3; ··· 23705 23733 23706 23734 lightspark = callPackage ../misc/lightspark { }; 23707 23735 23708 - lightstep-tracer-cpp = callPackage ../development/libraries/lightstep-tracer-cpp { }; 23736 + lightstep-tracer-cpp = callPackage ../development/libraries/lightstep-tracer-cpp { 23737 + protobuf = protobuf3_21; 23738 + }; 23709 23739 23710 23740 ligolo-ng = callPackage ../tools/networking/ligolo-ng { }; 23711 23741 ··· 27162 27192 rethinkdb = callPackage ../servers/nosql/rethinkdb { 27163 27193 stdenv = clangStdenv; 27164 27194 libtool = darwin.cctools; 27195 + protobuf = protobuf3_21; 27165 27196 }; 27166 27197 27167 27198 rippled = callPackage ../servers/rippled { ··· 28607 28638 28608 28639 sgx-ssl = callPackage ../os-specific/linux/sgx/ssl { }; 28609 28640 28610 - sgx-psw = callPackage ../os-specific/linux/sgx/psw { }; 28641 + sgx-psw = callPackage ../os-specific/linux/sgx/psw { 28642 + protobuf = protobuf3_21; 28643 + }; 28611 28644 28612 28645 shadow = callPackage ../os-specific/linux/shadow { }; 28613 28646 ··· 30377 30410 30378 30411 astroid = callPackage ../applications/networking/mailreaders/astroid { 30379 30412 vim = vim-full.override { features = "normal"; }; 30413 + protobuf = protobuf3_21; 30380 30414 }; 30381 30415 30382 30416 aucatctl = callPackage ../applications/audio/aucatctl { }; ··· 32390 32424 extra-packages = [ csound ]; 32391 32425 }; 32392 32426 32393 - hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { }; 32427 + hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { 32428 + protobuf = protobuf3_21; 32429 + }; 32394 32430 32395 32431 hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { }; 32396 32432 ··· 33997 34033 33998 34034 osm2pgsql = callPackage ../tools/misc/osm2pgsql { }; 33999 34035 34000 - ostinato = libsForQt5.callPackage ../applications/networking/ostinato { }; 34036 + ostinato = libsForQt5.callPackage ../applications/networking/ostinato { 34037 + protobuf = protobuf3_21; 34038 + }; 34001 34039 34002 34040 p4 = callPackage ../applications/version-management/p4 { 34003 34041 inherit (darwin.apple_sdk.frameworks) CoreServices Foundation Security; ··· 34101 34139 34102 34140 shogun = callPackage ../applications/science/machine-learning/shogun { 34103 34141 opencv = opencv3; 34142 + protobuf = protobuf3_21; 34104 34143 }; 34105 34144 34106 34145 smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; ··· 34984 35023 34985 35024 rgp = libsForQt5.callPackage ../development/tools/rgp { }; 34986 35025 34987 - ricochet = libsForQt5.callPackage ../applications/networking/instant-messengers/ricochet { }; 35026 + ricochet = libsForQt5.callPackage ../applications/networking/instant-messengers/ricochet { 35027 + protobuf = protobuf3_21; 35028 + }; 34988 35029 34989 35030 ries = callPackage ../applications/science/math/ries { }; 34990 35031 ··· 35308 35349 35309 35350 curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { }; 35310 35351 35311 - curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; }; 35352 + curaengine = callPackage ../applications/misc/curaengine { 35353 + inherit (python3.pkgs) libarcus; 35354 + protobuf = protobuf3_21; 35355 + }; 35312 35356 35313 35357 cura = libsForQt5.callPackage ../applications/misc/cura { }; 35314 35358 ··· 35689 35733 35690 35734 tijolo = callPackage ../applications/editors/tijolo { }; 35691 35735 35692 - tilemaker = callPackage ../applications/misc/tilemaker { }; 35736 + tilemaker = callPackage ../applications/misc/tilemaker { 35737 + protobuf = protobuf3_21; 35738 + }; 35693 35739 35694 35740 timbreid = callPackage ../applications/audio/pd-plugins/timbreid { 35695 35741 fftw = fftwSinglePrec; ··· 36879 36925 36880 36926 bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc { 36881 36927 withGui = true; 36928 + protobuf = protobuf3_21; 36882 36929 }; 36883 36930 bitcoind-abc = callPackage ../applications/blockchains/bitcoin-abc { 36884 36931 mkDerivation = stdenv.mkDerivation; 36932 + protobuf = protobuf3_21; 36885 36933 withGui = false; 36886 36934 }; 36887 36935 ··· 37445 37493 37446 37494 ckan = callPackage ../games/ckan { }; 37447 37495 37448 - cockatrice = libsForQt5.callPackage ../games/cockatrice { }; 37496 + cockatrice = libsForQt5.callPackage ../games/cockatrice { 37497 + protobuf = protobuf3_21; 37498 + }; 37449 37499 37450 37500 commandergenius = callPackage ../games/commandergenius { }; 37451 37501 ··· 38035 38085 38036 38086 pong3d = callPackage ../games/pong3d { }; 38037 38087 38038 - pokerth = libsForQt5.callPackage ../games/pokerth { }; 38088 + pokerth = libsForQt5.callPackage ../games/pokerth { 38089 + protobuf = protobuf3_21; 38090 + }; 38039 38091 38040 38092 pokerth-server = libsForQt5.callPackage ../games/pokerth { 38041 38093 target = "server"; 38094 + protobuf = protobuf3_21; 38042 38095 }; 38043 38096 38044 38097 pokete = callPackage ../games/pokete { };
+1 -1
pkgs/top-level/python-packages.nix
··· 5870 5870 }; 5871 5871 5872 5872 libarcus = callPackage ../development/python-modules/libarcus { 5873 - inherit (pkgs) protobuf; 5873 + protobuf = pkgs.protobuf3_21; 5874 5874 }; 5875 5875 5876 5876 libasyncns = callPackage ../development/python-modules/libasyncns {