b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #221732 from K900/remove-qt5-version-checks

Browse source 
treewide: clear out remaining qt5 conditionals
This commit is contained in:
K900 2023-03-18 10:12:49 +03:00 committed by GitHub
parent 4600fbf18b a5a292c7a8
commit 84e6e05c9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
32 changed files with 23 additions and 125 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/applications/kde/akonadi/default.nix
View file

@ -1,6 +1,6 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, shared-mime-info, qtbase, accounts-qt,
extra-cmake-modules, shared-mime-info, accounts-qt,
boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons,
kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mariadb,
postgresql, qttools, signond, xz,
@ -17,7 +17,6 @@ mkDerivation {
meta = {
license = [ lib.licenses.lgpl21 ];
maintainers = kdepimTeam;
broken = lib.versionOlder qtbase.version "5.13";
};
patches = [
./0001-akonadi-paths.patch

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

@ -30,9 +30,6 @@ still shows most of the available features is in `./gwenview.nix`.
}:
let
minQtVersion = "5.15";
broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion;
mirror = "mirror://kde";
srcs = import ./srcs.nix { inherit fetchurl mirror; };
@ -53,7 +50,6 @@ let
meta // {
homepage = meta.homepage or "http://www.kde.org";
platforms = meta.platforms or lib.platforms.linux;
broken = meta.broken or broken;
};
});

3
pkgs/applications/kde/dolphin.nix
View file

@ -5,7 +5,7 @@
kcompletion, kconfig, kcoreaddons, kdbusaddons,
kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications,
kparts, ktexteditor, kwindowsystem, phonon, solid,
wayland, qtbase, qtwayland
wayland, qtwayland
}:
mkDerivation {
@ -15,7 +15,6 @@ mkDerivation {
description = "KDE file manager";
license = with lib.licenses; [ gpl2Plus fdl12Plus ];
maintainers = [ lib.maintainers.ttuegel ];
broken = lib.versionOlder qtbase.version "5.14";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedUserEnvPkgs = [ baloo ];

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

@ -2,7 +2,6 @@
, lib
, extra-cmake-modules
, kdoctools
, qtbase
, qtmultimedia
, qtquickcontrols2
, qtwebsockets
@ -17,7 +16,7 @@
, libvlc
}:
mkDerivation rec {
mkDerivation {
pname = "elisa";
outputs = [ "out" "dev" ];
@ -45,6 +44,5 @@ mkDerivation rec {
description = "A simple media player for KDE";
license = licenses.gpl3;
maintainers = with maintainers; [ peterhoeg ];
broken = lib.versionOlder qtbase.version "5.15";
};
}

2
pkgs/applications/kde/filelight.nix
View file

@ -5,7 +5,6 @@
, kio
, kparts
, kxmlgui
, qtbase
, qtscript
, solid
, qtquickcontrols2
@ -21,7 +20,6 @@ mkDerivation {
homepage = "https://apps.kde.org/filelight/";
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ fridh vcunat ];
broken = lib.versionOlder qtbase.version "5.13";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [

1
pkgs/applications/kde/grantleetheme/default.nix
View file

@ -9,7 +9,6 @@ mkDerivation {
meta = {
license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ];
maintainers = kdepimTeam;
broken = lib.versionOlder qtbase.version "5.13.0";
};
output = [ "out" "dev" ];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];

3
pkgs/applications/kde/kdebugsettings.nix
View file

@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools,
gettext,
kcoreaddons, kconfig, kdbusaddons, kwidgetsaddons, kitemviews, kcompletion,
qtbase, python3
python3
}:
mkDerivation {
@ -13,7 +13,6 @@ mkDerivation {
description = "KDE debug settings";
license = with lib.licenses; [ gpl2 ];
maintainers = [ ];
broken = lib.versionOlder qtbase.version "5.13";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [

3
pkgs/applications/kde/kdenetwork-filesharing.nix
View file

@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kcoreaddons, kdeclarative, ki18n, kio, kwidgetsaddons, samba, qtbase,
kcoreaddons, kdeclarative, ki18n, kio, kwidgetsaddons, samba,
}:
mkDerivation {
@ -9,7 +9,6 @@ mkDerivation {
meta = {
license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
broken = lib.versionOlder qtbase.version "5.13";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kcoreaddons kdeclarative ki18n kio kwidgetsaddons samba ];

4
pkgs/applications/kde/kirigami-gallery.nix
View file

@ -6,10 +6,9 @@
, qtgraphicaleffects
, qtquickcontrols2
, qttools
, qtbase
}:
mkDerivation rec {
mkDerivation {
pname = "kirigami-gallery";
nativeBuildInputs = [ extra-cmake-modules qttools ];
@ -26,6 +25,5 @@ mkDerivation rec {
description = "View examples of Kirigami components";
license = licenses.lgpl2;
maintainers = with maintainers; [ shadowrz ];
broken = versionOlder qtbase.version "5.15";
};
}

1
pkgs/applications/kde/kmime.nix
View file

@ -13,5 +13,4 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kcodecs ki18n qtbase ];
outputs = [ "out" "dev" ];
meta.broken = lib.versionOlder qtbase.version "5.15.0";
}

5
pkgs/applications/kde/konqueror.nix
View file

@ -2,7 +2,7 @@
, mkDerivation
, extra-cmake-modules, kdoctools
, kinit, kcmutils, khtml, kdesu
, qtbase, qtwebengine, qtx11extras, qtscript, qtwayland
, qtwebengine, qtx11extras, qtscript, qtwayland
}:
mkDerivation {
@ -25,7 +25,6 @@ mkDerivation {
homepage = "https://apps.kde.org/konqueror/";
description = "Web browser, file manager and viewer";
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ ];
broken = lib.versionOlder qtbase.version "5.13";
maintainers = [ ];
};
}

3
pkgs/applications/kde/kpimtextedit.nix
View file

@ -2,7 +2,7 @@
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
grantlee, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio,
kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qtbase, qttools,
kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qttools,
qtspeech
}:
@ -11,7 +11,6 @@ mkDerivation {
meta = {
license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ];
maintainers = kdepimTeam;
broken = lib.versionOlder qtbase.version "5.13.0";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [

1
pkgs/applications/kde/kpkpass.nix
View file

@ -8,7 +8,6 @@ mkDerivation {
meta = {
license = with lib.licenses; [ lgpl21 ];
maintainers = [ lib.maintainers.bkchr ];
broken = lib.versionOlder qtbase.version "5.15";
};
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [ qtbase karchive ];

3
pkgs/applications/kde/krdc.nix
View file

@ -2,7 +2,7 @@
mkDerivation, lib,
extra-cmake-modules, kdoctools, makeWrapper,
kcmutils, kcompletion, kconfig, kdnssd, knotifyconfig, kwallet, kwidgetsaddons,
kwindowsystem, libvncserver, freerdp, qtbase,
kwindowsystem, libvncserver, freerdp,
}:
mkDerivation {
@ -22,6 +22,5 @@ mkDerivation {
license = with licenses; [ gpl2Plus lgpl21Plus fdl12Plus bsd3 ];
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.linux;
broken = lib.versionOlder qtbase.version "5.14";
};
}

3
pkgs/applications/kde/kwave.nix
View file

@ -1,6 +1,6 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, qtmultimedia, kcompletion, kconfig
, kcrash, kiconthemes, kio, audiofile, libsamplerate, alsa-lib, libpulseaudio, flac, id3lib
, libogg, libmad, libopus, libvorbis, fftw, librsvg, qtbase }:
, libogg, libmad, libopus, libvorbis, fftw, librsvg }:
mkDerivation {
pname = "kwave";
@ -11,7 +11,6 @@ mkDerivation {
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
broken = lib.versionOlder qtbase.version "5.14";
};
nativeBuildInputs = [
extra-cmake-modules

3
pkgs/applications/kde/libkgapi.nix
View file

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
qtbase, qtwebengine, kio, kcalendarcore, kcontacts,
qtwebengine, kio, kcalendarcore, kcontacts,
cyrus_sasl
}:
@ -10,7 +10,6 @@ mkDerivation {
meta = {
license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ];
maintainers = kdepimTeam;
broken = lib.versionOlder qtbase.version "5.14.0";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ qtwebengine kio kcalendarcore kcontacts cyrus_sasl ];

3
pkgs/applications/kde/minuet.nix
View file

@ -1,4 +1,4 @@
{ mkDerivation, qtbase
{ mkDerivation
, lib, extra-cmake-modules, gettext, python3
, drumstick, fluidsynth
, kcoreaddons, kcrash, kdoctools
@ -12,7 +12,6 @@ mkDerivation {
description = "Music Education Software";
license = with licenses; [ lgpl21 gpl3 ];
maintainers = with maintainers; [ peterhoeg HaoZeke ];
broken = lib.versionOlder qtbase.version "5.14";
};
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python3 qtdeclarative ];

3
pkgs/applications/kde/spectacle.nix
View file

@ -3,7 +3,7 @@
, ki18n, xcb-util-cursor
, kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins
, knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi
, qtbase, qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator
, qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator
}:
mkDerivation {
@ -23,6 +23,5 @@ mkDerivation {
homepage = "https://apps.kde.org/spectacle/";
description = "Screenshot capture utility";
maintainers = with maintainers; [ ttuegel ];
broken = versionOlder qtbase.version "5.15";
};
}

6
pkgs/applications/maui/default.nix
View file

@ -28,9 +28,6 @@ See also `pkgs/applications/kde` as this is what this is based on.
}:
let
minQtVersion = "5.15";
broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion;
mirror = "mirror://kde";
srcs = import ./srcs.nix { inherit fetchurl mirror; };
@ -51,11 +48,10 @@ let
meta // {
homepage = meta.homepage or "https://mauikit.org/";
platforms = meta.platforms or lib.platforms.linux;
broken = meta.broken or broken;
};
});
packages = self: with self;
packages = self:
let
callPackage = self.newScope {
inherit mkDerivation;

5
pkgs/applications/misc/qsyncthingtray/default.nix
View file

@ -64,9 +64,6 @@ mkDerivation rec {
license = licenses.lgpl3;
maintainers = with maintainers; [ zraexy peterhoeg ];
platforms = platforms.all;
# 0.5.7 segfaults when opening the main panel with qt 5.7 and fails to compile with qt 5.8
# but qt > 5.6 works when only using the native browser
# https://github.com/sieren/QSyncthingTray/issues/223
broken = (builtins.compareVersions qtbase.version "5.7.0" >= 0 && !preferNative) || stdenv.isDarwin;
broken = !preferNative || stdenv.isDarwin;
};
}

6
pkgs/applications/plasma-mobile/default.nix
View file

@ -28,9 +28,6 @@ See also `pkgs/applications/kde` as this is what this is based on.
}:
let
minQtVersion = "5.15";
broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion;
mirror = "mirror://kde";
srcs = import ./srcs.nix { inherit fetchurl mirror; };
@ -51,11 +48,10 @@ let
meta // {
homepage = meta.homepage or "https://www.plasma-mobile.org/";
platforms = meta.platforms or lib.platforms.linux;
broken = meta.broken or broken;
};
});
packages = self: with self;
packages = self:
let
callPackage = self.newScope {
inherit mkDerivation;

3
pkgs/applications/science/math/speedcrunch/default.nix
View file

@ -31,7 +31,6 @@ mkDerivation rec {
'';
maintainers = with maintainers; [ gebner j0hax ];
inherit (qtbase.meta) platforms;
# works with qt 5.6 and qt 5.8
broken = builtins.compareVersions qtbase.version "5.7.0" == 0 || stdenv.isDarwin;
broken = stdenv.isDarwin;
};
}

1
pkgs/applications/video/avidemux/default.nix
View file

@ -56,7 +56,6 @@ stdenv.mkDerivation rec {
++ lib.optional withVPX libvpx;
buildCommand = let
qtVersion = "5.${lib.versions.minor qtbase.version}";
wrapWith = makeWrapper: filename:
"${makeWrapper} ${filename} --set ADM_ROOT_DIR $out --prefix LD_LIBRARY_PATH : ${libXext}/lib";
wrapQtApp = wrapWith "wrapQtApp";

3
pkgs/desktops/plasma-5/default.nix
View file

@ -33,8 +33,6 @@
}:
let
minQtVersion = "5.15";
broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion;
maintainers = with lib.maintainers; [ ttuegel nyanloutre ];
license = with lib.licenses; [
lgpl21Plus
@ -107,7 +105,6 @@ let
license = meta.license or license;
maintainers = (meta.maintainers or [ ]) ++ maintainers;
platforms = meta.platforms or lib.platforms.linux;
broken = meta.broken or broken;
};
in
qtStdenv.mkDerivation (args // {

43
pkgs/development/libraries/appstream/fix-build-for-qt-olderthan-514.patch
View file

@ -1,43 +0,0 @@
diff --git a/qt/component.h b/qt/component.h
index 47abd1f3..74de943c 100644
--- a/qt/component.h
+++ b/qt/component.h
@@ -90,7 +90,7 @@ class APPSTREAMQT_EXPORT Component {
UrlKindContact,
// deprecated
- UrlTranslate [[deprecated]] = UrlKindTranslate,
+ UrlTranslate = UrlKindTranslate,
};
Q_ENUM(UrlKind)
diff --git a/qt/pool.h b/qt/pool.h
index b59829b7..5237f613 100644
--- a/qt/pool.h
+++ b/qt/pool.h
@@ -70,9 +70,9 @@ public:
FlagMonitor = 1 << 7,
// deprecated
- FlagReadCollection [[deprecated]] = FlagLoadOsCollection,
- FlagReadMetainfo [[deprecated]] = FlagLoadOsMetainfo,
- FlagReadDesktopFiles [[deprecated]] = FlagLoadOsDesktopFiles,
+ FlagReadCollection = FlagLoadOsCollection,
+ FlagReadMetainfo = FlagLoadOsMetainfo,
+ FlagReadDesktopFiles = FlagLoadOsDesktopFiles,
};
/**
@@ -84,9 +84,9 @@ public:
* Flags on how caching should be used.
**/
enum CacheFlags {
- CacheFlagNone [[deprecated]] = 0,
- CacheFlagUseUser [[deprecated]] = 1 << 0,
- CacheFlagUseSystem [[deprecated]] = 1 << 1,
+ CacheFlagNone = 0,
+ CacheFlagUseUser = 1 << 0,
+ CacheFlagUseSystem = 1 << 1,
};
/**

11
pkgs/development/libraries/appstream/qt.nix
View file

@ -1,4 +1,4 @@
{ lib, mkDerivation, appstream, qtbase, qttools, nixosTests }:
{ mkDerivation, appstream, qtbase, qttools, nixosTests }:
# TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here
@ -14,14 +14,7 @@ mkDerivation {
mesonFlags = appstream.mesonFlags ++ [ "-Dqt=true" ];
patches = (appstream.patches or []) ++ lib.optionals (lib.versionOlder qtbase.version "5.14") [
# Fix darwin build for libsForQt5.appstream-qt
# Old Qt moc doesn't know about fancy C++14 features
# ../qt/component.h:93: Parse error at "UrlTranslate"
# Remove both this patch and related comment in default.nix
# once Qt 5.14 or later becomes default on darwin
./fix-build-for-qt-olderthan-514.patch
];
patches = appstream.patches;
postFixup = ''
sed -i "$dev/lib/cmake/AppStreamQt/AppStreamQtConfig.cmake" \

4
pkgs/development/libraries/kde-frameworks/default.nix
View file

@ -27,9 +27,6 @@ existing packages here and modify it as necessary.
{ libsForQt5, lib, fetchurl }:
let
minQtVersion = "5.15";
broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion;
maintainers = with lib.maintainers; [ ttuegel nyanloutre ];
license = with lib.licenses; [
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12Plus
@ -86,7 +83,6 @@ let
license = meta.license or license;
maintainers = (meta.maintainers or []) ++ maintainers;
platforms = meta.platforms or lib.platforms.linux;
broken = meta.broken or broken;
};
in mkDerivation (args // {

4
pkgs/development/libraries/kde-frameworks/kimageformats.nix
View file

@ -16,8 +16,4 @@ mkDerivation {
cmakeFlags = [
"-DKIMAGEFORMATS_HEIF=ON"
];
meta = with lib; {
broken = versionOlder qtbase.version "5.14";
};
}

4
pkgs/development/libraries/kpmcore/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, extra-cmake-modules
, qca-qt5, kauth, kio, polkit-qt, qtbase
, qca-qt5, kauth, kio, polkit-qt
, util-linux
}:
@ -42,7 +42,5 @@ stdenv.mkDerivation rec {
homepage = "https://invent.kde.org/system/kpmcore";
license = with licenses; [ cc-by-40 cc0 gpl3Plus mit ];
maintainers = with maintainers; [ peterhoeg oxalica ];
# The build requires at least Qt 5.14:
broken = versionOlder qtbase.version "5.14";
};
}

2
pkgs/development/libraries/qt-5/modules/qtdeclarative.nix
View file

@ -8,7 +8,7 @@ qtModule {
preConfigure = ''
NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QML2_IMPORT_PREFIX=\"$qtQmlPrefix\""
'';
configureFlags = lib.optionals (lib.versionAtLeast qtbase.version "5.11.0") [ "-qml-debug" ];
configureFlags = [ "-qml-debug" ];
devTools = [
"bin/qml"
"bin/qmlcachegen"

3
pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
View file

@ -17,8 +17,7 @@ qtModule {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gstreamer gst-plugins-base ]
# https://github.com/NixOS/nixpkgs/pull/169336 regarding libpulseaudio
++ lib.optionals stdenv.isLinux [ libpulseaudio alsa-lib ]
++ lib.optional (lib.versionAtLeast qtbase.version "5.14.0" && stdenv.isLinux) wayland;
++ lib.optionals stdenv.isLinux [ libpulseaudio alsa-lib wayland ];
outputs = [ "bin" "dev" "out" ];
qmakeFlags = [ "GST_VERSION=1.0" ];
NIX_LDFLAGS = lib.optionalString (stdenv.isDarwin) "-lobjc";

1
pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
View file

@ -66,7 +66,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/tsujan/Kvantum";
license = licenses.gpl3Plus;
platforms = platforms.linux;
broken = lib.versionOlder qtbase.version "5.14";
maintainers = [ maintainers.romildo ];
};
}