mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 19:51:17 +00:00
Code Issues Wiki Activity

protobuf: use new package definition only

Browse source
This commit is contained in:
Aaron Jheng 2023-10-06 03:27:27 +00:00
parent ee14e5df15
commit 80aaa46d4c
No known key found for this signature in database
GPG key ID: F6A547A869D050A3
15 changed files with 65 additions and 205 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/kde/marble.nix
View file

@ -2,7 +2,7 @@
, extra-cmake-modules, kdoctools
, qtscript, qtsvg, qtquickcontrols, qtwebengine
, krunner, shared-mime-info, kparts, knewstuff
, gpsd, perl, protobuf3_21
, gpsd, perl, protobuf_21
}:
mkDerivation {
@ -15,7 +15,7 @@ mkDerivation {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ extra-cmake-modules kdoctools perl ];
propagatedBuildInputs = [
protobuf3_21 qtscript qtsvg qtquickcontrols qtwebengine shared-mime-info krunner kparts
protobuf_21 qtscript qtsvg qtquickcontrols qtwebengine shared-mime-info krunner kparts
knewstuff gpsd
];
preConfigure = ''

4
pkgs/applications/networking/localproxy/default.nix
View file

@ -3,14 +3,14 @@
, fetchFromGitHub
, cmake
, openssl
, protobuf3_21
, protobuf_21
, catch2
, boost181
, icu
}:
let
boost = boost181.override { enableStatic = true; };
protobuf = protobuf3_21.override { enableShared = false; };
protobuf = protobuf_21.override { enableShared = false; };
in
stdenv.mkDerivation (finalAttrs: {
pname = "localproxy";

6
pkgs/by-name/ju/justbuild/package.nix
View file

@ -11,7 +11,7 @@
openssl,
pkg-config,
protobuf3_23,
protobuf_23,
grpc,
pandoc,
python3,
@ -87,14 +87,14 @@ stdenv.mkDerivation rec {
# For future updates: The currently used version can be found in the file
# etc/repos.json: https://github.com/just-buildsystem/justbuild/blob/master/etc/repos.json
# under the key .repositories.protobuf
protobuf3_23
protobuf_23
python3
];
postPatch = ''
sed -ie 's|\./bin/just-mr.py|${python3}/bin/python3 ./bin/just-mr.py|' bin/bootstrap.py
sed -ie 's|#!/usr/bin/env python3|#!${python3}/bin/python3|' bin/parallel-bootstrap-traverser.py
jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf3_23}"' etc/repos.json > etc/repos.json.patched
jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf_23}"' etc/repos.json > etc/repos.json.patched
mv etc/repos.json.patched etc/repos.json
jq '.repositories.com_github_grpc_grpc.pkg_bootstrap.local_path = "${grpc}"' etc/repos.json > etc/repos.json.patched
mv etc/repos.json.patched etc/repos.json

6
pkgs/development/libraries/onnxruntime/default.nix
View file

@ -17,7 +17,7 @@
, microsoft-gsl
, iconv
, gtest
, protobuf3_21
, protobuf_21
, pythonSupport ? true
}:
@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
cmake
pkg-config
python3Packages.python
protobuf3_21
protobuf_21
] ++ lib.optionals pythonSupport (with python3Packages; [
setuptools
wheel
@ -177,7 +177,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
protobuf = protobuf3_21;
protobuf = protobuf_21;
tests = lib.optionalAttrs pythonSupport {
python = python3Packages.onnxruntime;
};

4
pkgs/development/libraries/opencv/3.x.nix
View file

@ -2,7 +2,7 @@
, fetchFromGitHub
, fetchpatch
, cmake, pkg-config, unzip, zlib, pcre, hdf5
, glog, boost, gflags, protobuf3_21
, glog, boost, gflags, protobuf_21
, config
, enableJPEG ? true, libjpeg
@ -186,7 +186,7 @@ stdenv.mkDerivation {
buildInputs =
[ zlib pcre hdf5 glog boost gflags ]
++ lib.optional useSystemProtobuf protobuf3_21
++ lib.optional useSystemProtobuf protobuf_21
++ lib.optional enablePython pythonPackages.python
++ lib.optional enableGtk2 gtk2
++ lib.optional enableGtk3 gtk3

6
pkgs/development/libraries/opencv/4.x.nix
View file

@ -11,7 +11,7 @@
, hdf5
, boost
, gflags
, protobuf3_21
, protobuf_21
, config
, ocl-icd
, buildPackages
@ -317,7 +317,7 @@ stdenv.mkDerivation {
echo '"(build info elided)"' > modules/core/version_string.inc
'';
buildInputs = [ zlib pcre boost gflags protobuf3_21 ]
buildInputs = [ zlib pcre boost gflags protobuf_21 ]
++ lib.optional enablePython pythonPackages.python
++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) hdf5
++ lib.optional enableGtk2 gtk2
@ -369,7 +369,7 @@ stdenv.mkDerivation {
"-DOPENCV_GENERATE_PKGCONFIG=ON"
"-DWITH_OPENMP=ON"
"-DBUILD_PROTOBUF=OFF"
"-DProtobuf_PROTOC_EXECUTABLE=${lib.getExe buildPackages.protobuf3_21}"
"-DProtobuf_PROTOC_EXECUTABLE=${lib.getExe buildPackages.protobuf_21}"
"-DPROTOBUF_UPDATE_FILES=ON"
"-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}"
"-DBUILD_TESTS=${printEnabled runAccuracyTests}"

6
pkgs/development/libraries/protobuf/3.21.nix
View file

@ -1,6 +0,0 @@
{ callPackage, ... } @ args:
callPackage ./generic-v3-cmake.nix ({
version = "3.21.12";
sha256 = "sha256-VZQEFHq17UsTH5CZZOcJBKiScGV2xPJ/e6gkkVliRCU=";
} // args)

6
pkgs/development/libraries/protobuf/3.23.nix
View file

@ -1,6 +0,0 @@
{ callPackage, ... } @ args:
callPackage ./generic-v3-cmake.nix ({
version = "3.23.4";
sha256 = "sha256-eI+mrsZAOLEsdyTC3B+K+GjD3r16CmPx1KJ2KhCwFdg=";
} // args)

6
pkgs/development/libraries/protobuf/3.24.nix
View file

@ -1,6 +0,0 @@
{ callPackage, ... } @ args:
callPackage ./generic-v3-cmake.nix ({
version = "3.24.3";
sha256 = "sha256-wXGQW/o674DeLXX2IlyZskl5OrBcSRptOMoJqLQGm94=";
} // args)

116
pkgs/development/libraries/protobuf/generic-v3-cmake.nix
View file

@ -1,116 +0,0 @@
# The cmake version of this build is meant to enable both cmake and .pc being exported
# this is important because grpc exports a .cmake file which also expects for protobuf
# to have been exported through cmake as well.
{ lib
, stdenv
, abseil-cpp
, buildPackages
, cmake
, fetchFromGitHub
, fetchpatch
, gtest
, zlib
, version
, sha256
# downstream dependencies
, python3
, grpc
, enableShared ? !stdenv.hostPlatform.isStatic
, ...
}:
stdenv.mkDerivation (finalAttrs: {
pname = "protobuf";
inherit version;
src = fetchFromGitHub {
owner = "protocolbuffers";
repo = "protobuf";
rev = "v${version}";
inherit sha256;
};
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace src/google/protobuf/testing/googletest.cc \
--replace 'tmpnam(b)' '"'$TMPDIR'/foo"'
'';
patches = lib.optionals (lib.versionOlder version "3.22") [
# fix protobuf-targets.cmake installation paths, and allow for CMAKE_INSTALL_LIBDIR to be absolute
# https://github.com/protocolbuffers/protobuf/pull/10090
(fetchpatch {
url = "https://github.com/protocolbuffers/protobuf/commit/a7324f88e92bc16b57f3683403b6c993bf68070b.patch";
sha256 = "sha256-SmwaUjOjjZulg/wgNmR/F5b8rhYA2wkKAjHIOxjcQdQ=";
})
] ++ lib.optionals stdenv.hostPlatform.isStatic [
./static-executables-have-no-rpath.patch
];
nativeBuildInputs =
let
protobufVersion = "${lib.versions.major version}_${lib.versions.minor version}";
in
[
cmake
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
# protoc of the same version must be available for build. For non-cross builds, it's able to
# re-use the executable generated as part of the build
buildPackages."protobuf${protobufVersion}"
];
buildInputs = [
gtest
zlib
];
propagatedBuildInputs = [
abseil-cpp
];
strictDeps = true;
cmakeDir = if lib.versionOlder version "3.22" then "../cmake" else null;
cmakeFlags = [
"-Dprotobuf_USE_EXTERNAL_GTEST=ON"
"-Dprotobuf_ABSL_PROVIDER=package"
] ++ lib.optionals enableShared [
"-Dprotobuf_BUILD_SHARED_LIBS=ON"
]
# Tests fail to build on 32-bit platforms; fixed in 3.22
# https://github.com/protocolbuffers/protobuf/issues/10418
++ lib.optionals (stdenv.targetPlatform.is32bit && lib.versionOlder version "3.22") [
"-Dprotobuf_BUILD_TESTS=OFF"
];
# FIXME: investigate. 3.24 and 3.23 have different errors.
# At least some of it is not reproduced on some other machine; example:
# https://hydra.nixos.org/build/235677717/nixlog/4/tail
doCheck = !(stdenv.isDarwin && lib.versionAtLeast version "3.23");
passthru = {
tests = {
pythonProtobuf = python3.pkgs.protobuf.override (_: {
protobuf = finalAttrs.finalPackage;
});
inherit grpc;
};
inherit abseil-cpp;
};
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.
'';
license = lib.licenses.bsd3;
platforms = lib.platforms.all;
homepage = "https://protobuf.dev/";
maintainers = with lib.maintainers; [ jonringer ];
mainProgram = "protoc";
};
})

4
pkgs/development/libraries/protobuf/generic.nix
View file

@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "protocolbuffers";
repo = "protobuf";
rev = "v${version}";
sha256 = hash;
inherit hash;
};
postPatch = lib.optionalString stdenv.isDarwin ''
@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
# https://github.com/protocolbuffers/protobuf/pull/10090
(fetchpatch {
url = "https://github.com/protocolbuffers/protobuf/commit/a7324f88e92bc16b57f3683403b6c993bf68070b.patch";
sha256 = "sha256-SmwaUjOjjZulg/wgNmR/F5b8rhYA2wkKAjHIOxjcQdQ=";
hash = "sha256-SmwaUjOjjZulg/wgNmR/F5b8rhYA2wkKAjHIOxjcQdQ=";
})
] ++ lib.optionals stdenv.hostPlatform.isStatic [
./static-executables-have-no-rpath.patch

4
pkgs/servers/redpanda/server.nix
View file

@ -16,7 +16,7 @@
, p11-kit
, pkg-config
, procps
, protobuf3_21
, protobuf_21
, python3
, snappy
, src
@ -100,7 +100,7 @@ llvmPackages_14.stdenv.mkDerivation rec {
dpdk
hdr-histogram
p11-kit
protobuf3_21
protobuf_21
rapidjson
seastar
snappy

3
pkgs/top-level/aliases.nix
View file

@ -689,6 +689,9 @@ mapAliases ({
prometheus-speedtest-exporter = throw "prometheus-speedtest-exporter was removed as unmaintained"; # Added 2023-07-31
protobuf3_17 = throw "protobuf3_17 does not receive updates anymore and has been removed"; # Added 2023-05-21
protobuf3_19 = throw "protobuf3_19 does not receive updates anymore and has been removed"; # Added 2023-10-01
protobuf3_24 = protobuf_24;
protobuf3_23 = protobuf_23;
protobuf3_21 = protobuf_21;
protonup = protonup-ng; # Added 2022-11-06
proxmark3-rrg = proxmark3; # Added 2023-07-25
proxmark3-unstable = throw "removed in favor of rfidresearchgroup fork"; # Added 2023-07-25

91
pkgs/top-level/all-packages.nix
View file

@ -770,7 +770,7 @@ with pkgs;
protoc-gen-go-vtproto = callPackage ../development/tools/protoc-gen-go-vtproto { };
protoc-gen-grpc-web = callPackage ../development/tools/protoc-gen-grpc-web {
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
protoc-gen-connect-go = callPackage ../development/tools/protoc-gen-connect-go { };
@ -1094,7 +1094,7 @@ with pkgs;
antlr = antlr4_10;
boost = boost177; # Configure checks for specific version.
icu = icu69;
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
broadlink-cli = callPackage ../tools/misc/broadlink-cli { };
@ -2672,7 +2672,7 @@ with pkgs;
gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { };
goldberg-emu = callPackage ../applications/emulators/goldberg-emu {
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
gopsuinfo = callPackage ../tools/system/gopsuinfo { };
@ -4172,7 +4172,7 @@ with pkgs;
amoco = callPackage ../tools/security/amoco { };
anbox = callPackage ../os-specific/linux/anbox {
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
androidenv = callPackage ../development/mobile/androidenv { };
@ -4728,7 +4728,7 @@ with pkgs;
common-licenses = callPackage ../data/misc/common-licenses { };
compactor = callPackage ../applications/networking/compactor {
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
consul = callPackage ../servers/consul { };
@ -5542,7 +5542,7 @@ with pkgs;
ghdorker = callPackage ../tools/security/ghdorker { };
ghidra = darwin.apple_sdk_11_0.callPackage ../tools/security/ghidra/build.nix {
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
ghidra-bin = callPackage ../tools/security/ghidra { };
@ -6862,7 +6862,7 @@ with pkgs;
clementine = libsForQt5.callPackage ../applications/audio/clementine {
gst_plugins =
with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav ];
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
mellowplayer = libsForQt5.callPackage ../applications/audio/mellowplayer { };
@ -7065,7 +7065,7 @@ with pkgs;
mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc {
stdenv = clangStdenv;
protobuf = pkgs.protobuf3_21.overrideDerivation (_: { stdenv = clangStdenv; });
protobuf = pkgs.protobuf_21.overrideDerivation (_: { stdenv = clangStdenv; });
};
rime = callPackage ../tools/inputmethods/ibus-engines/ibus-rime { };
@ -10261,7 +10261,7 @@ with pkgs;
netdata = callPackage ../tools/system/netdata {
inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit;
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
# Exposed here so the bots can auto-upgrade it
netdata-go-plugins = callPackage ../tools/system/netdata/go.d.plugin.nix { };
@ -11402,7 +11402,7 @@ with pkgs;
nq = callPackage ../tools/system/nq { };
nsjail = callPackage ../tools/security/nsjail {
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd { };
@ -11534,7 +11534,7 @@ with pkgs;
oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { };
ola = callPackage ../applications/misc/ola {
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
olive-editor = qt6Packages.callPackage ../applications/video/olive-editor {
@ -11811,7 +11811,7 @@ with pkgs;
p3x-onenote = callPackage ../applications/office/p3x-onenote { };
p4c = callPackage ../development/compilers/p4c {
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
p7zip = callPackage ../tools/archivers/p7zip { };
@ -15204,7 +15204,7 @@ with pkgs;
zasm = callPackage ../development/compilers/zasm { };
zbackup = callPackage ../tools/backup/zbackup {
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
zbar = libsForQt5.callPackage ../tools/graphics/zbar {
@ -20139,12 +20139,12 @@ with pkgs;
};
spoofer = callPackage ../tools/networking/spoofer {
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
spoofer-gui = callPackage ../tools/networking/spoofer {
withGUI = true;
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
spooles = callPackage ../development/libraries/science/math/spooles { };
@ -20879,7 +20879,7 @@ with pkgs;
cmrt = callPackage ../development/libraries/cmrt { };
codecserver = callPackage ../applications/audio/codecserver {
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
coeurl = callPackage ../development/libraries/coeurl { };
@ -21391,7 +21391,7 @@ with pkgs;
gallia = callPackage ../tools/security/gallia { };
gamenetworkingsockets = callPackage ../development/libraries/gamenetworkingsockets {
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
game-music-emu = callPackage ../development/libraries/audio/game-music-emu { };
@ -23415,7 +23415,7 @@ with pkgs;
libptytty = callPackage ../development/libraries/libptytty { };
libpulsar = callPackage ../development/libraries/libpulsar {
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
libpwquality = callPackage ../development/libraries/libpwquality {
@ -23824,7 +23824,7 @@ with pkgs;
lightspark = callPackage ../misc/lightspark { };
lightstep-tracer-cpp = callPackage ../development/libraries/lightstep-tracer-cpp {
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
ligolo-ng = callPackage ../tools/networking/ligolo-ng { };
@ -24589,23 +24589,14 @@ with pkgs;
prospector = callPackage ../development/tools/prospector { };
protobuf = protobuf3_24;
protobuf = protobuf_24;
# C++ 4.24 runtime, Python 4.24 runtime
protobuf_24 = callPackage ../development/libraries/protobuf/24.nix { };
# C++ 4.23 runtime, Python 4.23 runtime
protobuf_23 = callPackage ../development/libraries/protobuf/23.nix { };
# C++ 3.21 runtime, Python 4.21 runtime
protobuf_21 = callPackage ../development/libraries/protobuf/21.nix {
abseil-cpp = abseil-cpp_202103;
};
protobuf3_24 = callPackage ../development/libraries/protobuf/3.24.nix { };
protobuf3_23 = callPackage ../development/libraries/protobuf/3.23.nix { };
protobuf3_21 = callPackage ../development/libraries/protobuf/3.21.nix {
abseil-cpp = abseil-cpp_202103;
};
protobuf3_20 = callPackage ../development/libraries/protobuf/3.20.nix {
abseil-cpp = abseil-cpp_202103;
};
@ -24775,7 +24766,7 @@ with pkgs;
qm-dsp = callPackage ../development/libraries/audio/qm-dsp { };
qradiolink = callPackage ../applications/radio/qradiolink {
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
qrupdate = callPackage ../development/libraries/qrupdate { };
@ -25453,7 +25444,7 @@ with pkgs;
valhalla = callPackage ../development/libraries/valhalla {
boost = boost.override { enablePython = true; python = python38; };
protobuf = protobuf3_21.override {
protobuf = protobuf_21.override {
abseil-cpp = abseil-cpp_202103.override {
cxxStandard = "17";
};
@ -26992,7 +26983,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreServices;
boost = boost177; # Configure checks for specific version.
icu = icu69;
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { };
@ -27278,7 +27269,7 @@ with pkgs;
rethinkdb = callPackage ../servers/nosql/rethinkdb {
stdenv = clangStdenv;
libtool = darwin.cctools;
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
rippled = callPackage ../servers/rippled {
@ -28724,7 +28715,7 @@ with pkgs;
sgx-ssl = callPackage ../os-specific/linux/sgx/ssl { };
sgx-psw = callPackage ../os-specific/linux/sgx/psw {
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
shadow = callPackage ../os-specific/linux/shadow { };
@ -30494,7 +30485,7 @@ with pkgs;
astroid = callPackage ../applications/networking/mailreaders/astroid {
vim = vim-full.override { features = "normal"; };
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
aucatctl = callPackage ../applications/audio/aucatctl { };
@ -32528,7 +32519,7 @@ with pkgs;
};
hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng {
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { };
@ -34023,14 +34014,14 @@ with pkgs;
avahi = avahi-compat;
pulseSupport = config.pulseaudio or false;
iceSupport = config.murmur.iceSupport or true;
protobuf = protobuf3_21;
protobuf = protobuf_21;
}).murmur;
mumble = (callPackages ../applications/networking/mumble {
avahi = avahi-compat;
jackSupport = config.mumble.jackSupport or false;
speechdSupport = config.mumble.speechdSupport or false;
protobuf = protobuf3_21;
protobuf = protobuf_21;
}).mumble;
mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix {
@ -34158,7 +34149,7 @@ with pkgs;
osm2pgsql = callPackage ../tools/misc/osm2pgsql { };
ostinato = libsForQt5.callPackage ../applications/networking/ostinato {
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
p4 = callPackage ../applications/version-management/p4 {
@ -34267,7 +34258,7 @@ with pkgs;
shogun = callPackage ../applications/science/machine-learning/shogun {
opencv = opencv3;
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
smplayer = libsForQt5.callPackage ../applications/video/smplayer { };
@ -34630,7 +34621,7 @@ with pkgs;
osmo-sip-connector = callPackage ../servers/osmocom/osmo-sip-connector { };
osmscout-server = libsForQt5.callPackage ../applications/misc/osmscout-server {
protobuf = protobuf3_21.override {
protobuf = protobuf_21.override {
abseil-cpp = abseil-cpp_202103.override {
cxxStandard = "17";
};
@ -35149,7 +35140,7 @@ with pkgs;
rgp = libsForQt5.callPackage ../development/tools/rgp { };
ricochet = libsForQt5.callPackage ../applications/networking/instant-messengers/ricochet {
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
ries = callPackage ../applications/science/math/ries { };
@ -35472,7 +35463,7 @@ with pkgs;
curaengine = callPackage ../applications/misc/curaengine {
inherit (python3.pkgs) libarcus;
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
cura = libsForQt5.callPackage ../applications/misc/cura { };
@ -35861,7 +35852,7 @@ with pkgs;
tijolo = callPackage ../applications/editors/tijolo { };
tilemaker = callPackage ../applications/misc/tilemaker {
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
timbreid = callPackage ../applications/audio/pd-plugins/timbreid {
@ -37063,11 +37054,11 @@ with pkgs;
bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc {
withGui = true;
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
bitcoind-abc = callPackage ../applications/blockchains/bitcoin-abc {
mkDerivation = stdenv.mkDerivation;
protobuf = protobuf3_21;
protobuf = protobuf_21;
withGui = false;
};
@ -37642,7 +37633,7 @@ with pkgs;
ckan = callPackage ../games/ckan { };
cockatrice = libsForQt5.callPackage ../games/cockatrice {
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
commandergenius = callPackage ../games/commandergenius { };
@ -38237,12 +38228,12 @@ with pkgs;
pong3d = callPackage ../games/pong3d { };
pokerth = libsForQt5.callPackage ../games/pokerth {
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
pokerth-server = libsForQt5.callPackage ../games/pokerth {
target = "server";
protobuf = protobuf3_21;
protobuf = protobuf_21;
};
pokete = callPackage ../games/pokete { };
@ -39333,7 +39324,7 @@ with pkgs;
or-tools = callPackage ../development/libraries/science/math/or-tools {
python = python3;
protobuf = protobuf3_21;
protobuf = protobuf_21;
# or-tools builds with -std=c++20, so abseil-cpp must
# also be built that way
abseil-cpp = abseil-cpp_202206.override {

4
pkgs/top-level/python-packages.nix
View file

@ -6068,7 +6068,7 @@ self: super: with self; {
};
libarcus = callPackage ../development/python-modules/libarcus {
protobuf = pkgs.protobuf3_21;
protobuf = pkgs.protobuf_21;
};
libasyncns = callPackage ../development/python-modules/libasyncns {
@ -9487,7 +9487,7 @@ self: super: with self; {
# Protobuf 4.x
protobuf = callPackage ../development/python-modules/protobuf {
# If a protobuf upgrade causes many Python packages to fail, please pin it here to the previous version.
protobuf = pkgs.protobuf_24;
protobuf = pkgs.protobuf;
};
# Protobuf 3.x