Skip to content

treewide: unpin protobuf_21 where possible #339631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alyssais wants to merge 4 commits into
base: master
Choose a base branch
from
Open

treewide: unpin protobuf_21 where possible #339631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e94c20e
marble: unpin protobuf
alyssais Sep 4, 2024
c10724c
tilemaker: unpin protobuf
alyssais Sep 4, 2024
c92fcb3
opencv4: unpin protobuf
alyssais Sep 4, 2024
f871bfd
bitcoin-abc,bitcoind-abc: unpin protobuf
alyssais Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/applications/kde/marble.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
, extra-cmake-modules, kdoctools
, qtscript, qtsvg, qtquickcontrols, qtwebengine
, krunner, shared-mime-info, kparts, knewstuff
, gpsd, perl, protobuf_21
, gpsd, perl, protobuf
}:

mkDerivation {
Expand All @@ -15,7 +15,7 @@ mkDerivation {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ extra-cmake-modules kdoctools perl ];
propagatedBuildInputs = [
protobuf_21 qtscript qtsvg qtquickcontrols qtwebengine shared-mime-info krunner kparts
protobuf qtscript qtsvg qtquickcontrols qtwebengine shared-mime-info krunner kparts
knewstuff gpsd
];
preConfigure = ''
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/ti/tilemaker/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
, installShellFiles
, boost
, lua
, protobuf_21
, protobuf
, rapidjson
, shapelib
, sqlite
Expand Down Expand Up @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {

nativeBuildInputs = [ cmake installShellFiles ];

buildInputs = [ boost lua protobuf_21 rapidjson shapelib sqlite zlib ];
buildInputs = [ boost lua protobuf rapidjson shapelib sqlite zlib ];

cmakeFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
(lib.cmakeFeature "PROTOBUF_PROTOC_EXECUTABLE" "${buildPackages.protobuf}/bin/protoc");
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/libraries/opencv/4.x.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
, boost
, glib
, gflags
, protobuf_21
, protobuf
, config
, ocl-icd
, buildPackages
Expand Down Expand Up @@ -302,7 +302,7 @@ effectiveStdenv.mkDerivation {
gflags
glib
pcre2
protobuf_21
protobuf
zlib
] ++ lib.optionals enablePython [
pythonPackages.python
Expand Down Expand Up @@ -408,7 +408,7 @@ effectiveStdenv.mkDerivation {
"-DOPENCV_GENERATE_PKGCONFIG=ON"
"-DWITH_OPENMP=ON"
"-DBUILD_PROTOBUF=OFF"
"-DProtobuf_PROTOC_EXECUTABLE=${lib.getExe buildPackages.protobuf_21}"
"-DProtobuf_PROTOC_EXECUTABLE=${lib.getExe buildPackages.protobuf}"
"-DPROTOBUF_UPDATE_FILES=ON"
"-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}"
"-DBUILD_TESTS=${printEnabled runAccuracyTests}"
Expand Down
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34914,11 +34914,9 @@ with pkgs;

bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc {
withGui = true;
protobuf = protobuf_21;
};
bitcoind-abc = callPackage ../applications/blockchains/bitcoin-abc {
mkDerivation = stdenv.mkDerivation;
protobuf = protobuf_21;
withGui = false;
};

Expand Down