BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #249752 from K900/pin-old-protobuf-some

Browse source 
[staging-next] treewide: pin packages that don't build with new protobuf to old protobuf
This commit is contained in:
K900 2023-08-18 18:42:46 +03:00 committed by GitHub
commit edeb36315b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 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
, gpsd, perl, protobuf3_21
}:
mkDerivation {
@ -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 = ''

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

@ -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 { };
@ -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 { };
@ -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 { };
@ -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 { };