Skip to content

Commit

Permalink
treewide: pin packages that don't build with new protobuf to old prot…
Browse files Browse the repository at this point in the history
…obuf
  • Loading branch information
K900 committed Aug 18, 2023
1 parent e0c33d7 commit e631034
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
4 changes: 2 additions & 2 deletions pkgs/applications/kde/marble.nix
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
, gpsd, perl, protobuf3_21
}:

mkDerivation {
Expand All @@ -15,7 +15,7 @@ mkDerivation {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ extra-cmake-modules kdoctools perl ];
propagatedBuildInputs = [
qtscript qtsvg qtquickcontrols qtwebengine shared-mime-info krunner kparts
protobuf3_21 qtscript qtsvg qtquickcontrols qtwebengine shared-mime-info krunner kparts
knewstuff gpsd
];
preConfigure = ''
Expand Down
7 changes: 6 additions & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6709,6 +6709,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;
};

mellowplayer = libsForQt5.callPackage ../applications/audio/mellowplayer { };
Expand Down Expand Up @@ -10039,6 +10040,7 @@ with pkgs;

netdata = callPackage ../tools/system/netdata {
inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit;
protobuf = protobuf3_21;
};
# Exposed here so the bots can auto-upgrade it
netdata-go-plugins = callPackage ../tools/system/netdata/go.d.plugin.nix { };
Expand Down Expand Up @@ -10739,7 +10741,9 @@ with pkgs;
electron = electron_22;
};

mosh = callPackage ../tools/networking/mosh { };
mosh = callPackage ../tools/networking/mosh {
protobuf = protobuf3_21;
};

motrix = callPackage ../tools/networking/motrix { };

Expand Down Expand Up @@ -26862,6 +26866,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreServices;
boost = boost177; # Configure checks for specific version.
icu = icu69;
protobuf = protobuf3_21;
};

mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { };
Expand Down

0 comments on commit e631034

Please sign in to comment.