gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
treewide: more protobuf downgrades
This commit is contained in:
K900
2023-08-19 10:17:48 +03:00
committed by GitHub
parent 1e271fd42a b4b986693b
commit 2eeb7391e5
3 changed files with 79 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/misc/ola/default.nix
+1 -1
View File
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
python3
];
propagatedBuildInputs = [
python3.pkgs.protobuf
(python3.pkgs.protobuf.override { protobuf = protobuf; })
python3.pkgs.numpy
];
pkgs/top-level/all-packages.nix
+77 -24
View File
@@ -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 { };
@@ -11200,7 +11209,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 { };
@@ -11332,7 +11343,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;
@@ -11603,7 +11616,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 { };
@@ -14968,7 +14983,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;
@@ -20061,9 +20078,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 { };
@@ -20779,7 +20801,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 { };
@@ -21287,7 +21311,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 { };
@@ -23300,7 +23326,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;
@@ -23705,7 +23733,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 { };
@@ -27162,6 +27192,7 @@ with pkgs;
rethinkdb = callPackage ../servers/nosql/rethinkdb {
stdenv = clangStdenv;
libtool = darwin.cctools;
protobuf = protobuf3_21;
};
rippled = callPackage ../servers/rippled {
@@ -28607,7 +28638,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 { };
@@ -30377,6 +30410,7 @@ with pkgs;
astroid = callPackage ../applications/networking/mailreaders/astroid {
vim = vim-full.override { features = "normal"; };
protobuf = protobuf3_21;
};
aucatctl = callPackage ../applications/audio/aucatctl { };
@@ -32390,7 +32424,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 { };
@@ -33997,7 +34033,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;
@@ -34101,6 +34139,7 @@ with pkgs;
shogun = callPackage ../applications/science/machine-learning/shogun {
opencv = opencv3;
protobuf = protobuf3_21;
};
smplayer = libsForQt5.callPackage ../applications/video/smplayer { };
@@ -34984,7 +35023,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 { };
@@ -35308,7 +35349,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 { };
@@ -35689,7 +35733,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;
@@ -36879,9 +36925,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;
};
@@ -37445,7 +37493,9 @@ with pkgs;
ckan = callPackage ../games/ckan { };
cockatrice = libsForQt5.callPackage ../games/cockatrice { };
cockatrice = libsForQt5.callPackage ../games/cockatrice {
protobuf = protobuf3_21;
};
commandergenius = callPackage ../games/commandergenius { };
@@ -38035,10 +38085,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 { };
pkgs/top-level/python-packages.nix
+1 -1
View File
@@ -5870,7 +5870,7 @@ self: super: with self; {
};
libarcus = callPackage ../development/python-modules/libarcus {
inherit (pkgs) protobuf;
protobuf = pkgs.protobuf3_21;
};
libasyncns = callPackage ../development/python-modules/libasyncns {