diff options
author | K900 <me@0upti.me> | 2023-03-18 01:58:24 +0300 |
---|---|---|
committer | K900 <me@0upti.me> | 2023-03-18 02:10:20 +0300 |
commit | a5a292c7a82c694129c1045a4ee8a5078db37d71 (patch) | |
tree | 5993cea8d479a7ae9711164fe57682b99912a695 /pkgs/applications | |
parent | 509d8ca5c238a3507ed36109dca07044c6a63b9a (diff) | |
download | nixpkgs-a5a292c7a82c694129c1045a4ee8a5078db37d71.tar nixpkgs-a5a292c7a82c694129c1045a4ee8a5078db37d71.tar.gz nixpkgs-a5a292c7a82c694129c1045a4ee8a5078db37d71.tar.bz2 nixpkgs-a5a292c7a82c694129c1045a4ee8a5078db37d71.tar.lz nixpkgs-a5a292c7a82c694129c1045a4ee8a5078db37d71.tar.xz nixpkgs-a5a292c7a82c694129c1045a4ee8a5078db37d71.tar.zst nixpkgs-a5a292c7a82c694129c1045a4ee8a5078db37d71.zip |
treewide: clear out remaining qt5 conditionals
Diffstat (limited to 'pkgs/applications')
23 files changed, 18 insertions, 55 deletions
diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index 8fa12be3a8b..e816d3eeb41 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -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 diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 6968c50c609..c121d0fb539 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -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; }; }); diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix index 9e4ab1d4102..91ab0f8f57b 100644 --- a/pkgs/applications/kde/dolphin.nix +++ b/pkgs/applications/kde/dolphin.nix @@ -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 ]; diff --git a/pkgs/applications/kde/elisa.nix b/pkgs/applications/kde/elisa.nix index 51203271b1f..5073d869a3a 100644 --- a/pkgs/applications/kde/elisa.nix +++ b/pkgs/applications/kde/elisa.nix @@ -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"; }; } diff --git a/pkgs/applications/kde/filelight.nix b/pkgs/applications/kde/filelight.nix index 2a6e349f2f2..af1b131b5c7 100644 --- a/pkgs/applications/kde/filelight.nix +++ b/pkgs/applications/kde/filelight.nix @@ -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 = [ diff --git a/pkgs/applications/kde/grantleetheme/default.nix b/pkgs/applications/kde/grantleetheme/default.nix index 6d29d6e6d8c..ff4b8fc93ed 100644 --- a/pkgs/applications/kde/grantleetheme/default.nix +++ b/pkgs/applications/kde/grantleetheme/default.nix @@ -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 ]; diff --git a/pkgs/applications/kde/kdebugsettings.nix b/pkgs/applications/kde/kdebugsettings.nix index 6d407e0a50d..2ebf9c88944 100644 --- a/pkgs/applications/kde/kdebugsettings.nix +++ b/pkgs/applications/kde/kdebugsettings.nix @@ -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 = [ diff --git a/pkgs/applications/kde/kdenetwork-filesharing.nix b/pkgs/applications/kde/kdenetwork-filesharing.nix index a7da03ffdd1..74ed9386cf0 100644 --- a/pkgs/applications/kde/kdenetwork-filesharing.nix +++ b/pkgs/applications/kde/kdenetwork-filesharing.nix @@ -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 ]; diff --git a/pkgs/applications/kde/kirigami-gallery.nix b/pkgs/applications/kde/kirigami-gallery.nix index f012188ed99..c22cc16aaf9 100644 --- a/pkgs/applications/kde/kirigami-gallery.nix +++ b/pkgs/applications/kde/kirigami-gallery.nix @@ -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"; }; } diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix index 51e78b5f649..8dfd910eede 100644 --- a/pkgs/applications/kde/kmime.nix +++ b/pkgs/applications/kde/kmime.nix @@ -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"; } diff --git a/pkgs/applications/kde/konqueror.nix b/pkgs/applications/kde/konqueror.nix index cf4002a8f67..f048879ea54 100644 --- a/pkgs/applications/kde/konqueror.nix +++ b/pkgs/applications/kde/konqueror.nix @@ -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 = [ ]; }; } diff --git a/pkgs/applications/kde/kpimtextedit.nix b/pkgs/applications/kde/kpimtextedit.nix index e42c25e7463..040fbd122ef 100644 --- a/pkgs/applications/kde/kpimtextedit.nix +++ b/pkgs/applications/kde/kpimtextedit.nix @@ -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 = [ diff --git a/pkgs/applications/kde/kpkpass.nix b/pkgs/applications/kde/kpkpass.nix index e7b81477122..1d5454ac045 100644 --- a/pkgs/applications/kde/kpkpass.nix +++ b/pkgs/applications/kde/kpkpass.nix @@ -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 ]; diff --git a/pkgs/applications/kde/krdc.nix b/pkgs/applications/kde/krdc.nix index 9d9762523d9..dfa84dae31b 100644 --- a/pkgs/applications/kde/krdc.nix +++ b/pkgs/applications/kde/krdc.nix @@ -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"; }; } diff --git a/pkgs/applications/kde/kwave.nix b/pkgs/applications/kde/kwave.nix index 43f41c345fd..a315ce6bd9b 100644 --- a/pkgs/applications/kde/kwave.nix +++ b/pkgs/applications/kde/kwave.nix @@ -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 diff --git a/pkgs/applications/kde/libkgapi.nix b/pkgs/applications/kde/libkgapi.nix index de0be7ea49a..d5e34aa5024 100644 --- a/pkgs/applications/kde/libkgapi.nix +++ b/pkgs/applications/kde/libkgapi.nix @@ -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 ]; diff --git a/pkgs/applications/kde/minuet.nix b/pkgs/applications/kde/minuet.nix index 50a6a6f282e..0aaa5012a07 100644 --- a/pkgs/applications/kde/minuet.nix +++ b/pkgs/applications/kde/minuet.nix @@ -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 ]; diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix index 39e9f344c3e..cbba15beebc 100644 --- a/pkgs/applications/kde/spectacle.nix +++ b/pkgs/applications/kde/spectacle.nix @@ -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"; }; } diff --git a/pkgs/applications/maui/default.nix b/pkgs/applications/maui/default.nix index 6f045bda658..b91f13d1259 100644 --- a/pkgs/applications/maui/default.nix +++ b/pkgs/applications/maui/default.nix @@ -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; diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index 100be6c2dc8..bfe1d61818f 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -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; }; } diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix index 9efbaa60339..34f28ae7ff5 100644 --- a/pkgs/applications/plasma-mobile/default.nix +++ b/pkgs/applications/plasma-mobile/default.nix @@ -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; diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix index 239b5fd6d36..98bc6b031f1 100644 --- a/pkgs/applications/science/math/speedcrunch/default.nix +++ b/pkgs/applications/science/math/speedcrunch/default.nix @@ -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; }; } diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 061c00b3f32..ea7ba432a4a 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -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"; |