nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork

Configure Feed

Select the types of activity you want to include in your feed.

treewide: clear out remaining qt5 conditionals

K900 a5a292c7 509d8ca5

+23 -125
+1 -2
pkgs/applications/kde/akonadi/default.nix
··· 1 1 { 2 2 mkDerivation, lib, kdepimTeam, 3 - extra-cmake-modules, shared-mime-info, qtbase, accounts-qt, 3 + extra-cmake-modules, shared-mime-info, accounts-qt, 4 4 boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons, 5 5 kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mariadb, 6 6 postgresql, qttools, signond, xz, ··· 17 17 meta = { 18 18 license = [ lib.licenses.lgpl21 ]; 19 19 maintainers = kdepimTeam; 20 - broken = lib.versionOlder qtbase.version "5.13"; 21 20 }; 22 21 patches = [ 23 22 ./0001-akonadi-paths.patch
-4
pkgs/applications/kde/default.nix
··· 30 30 }: 31 31 32 32 let 33 - minQtVersion = "5.15"; 34 - broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion; 35 - 36 33 mirror = "mirror://kde"; 37 34 srcs = import ./srcs.nix { inherit fetchurl mirror; }; 38 35 ··· 50 53 meta // { 51 54 homepage = meta.homepage or "http://www.kde.org"; 52 55 platforms = meta.platforms or lib.platforms.linux; 53 - broken = meta.broken or broken; 54 56 }; 55 57 }); 56 58
+1 -2
pkgs/applications/kde/dolphin.nix
··· 5 5 kcompletion, kconfig, kcoreaddons, kdbusaddons, 6 6 kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications, 7 7 kparts, ktexteditor, kwindowsystem, phonon, solid, 8 - wayland, qtbase, qtwayland 8 + wayland, qtwayland 9 9 }: 10 10 11 11 mkDerivation { ··· 15 15 description = "KDE file manager"; 16 16 license = with lib.licenses; [ gpl2Plus fdl12Plus ]; 17 17 maintainers = [ lib.maintainers.ttuegel ]; 18 - broken = lib.versionOlder qtbase.version "5.14"; 19 18 }; 20 19 nativeBuildInputs = [ extra-cmake-modules kdoctools ]; 21 20 propagatedUserEnvPkgs = [ baloo ];
+1 -3
pkgs/applications/kde/elisa.nix
··· 2 2 , lib 3 3 , extra-cmake-modules 4 4 , kdoctools 5 - , qtbase 6 5 , qtmultimedia 7 6 , qtquickcontrols2 8 7 , qtwebsockets ··· 16 17 , libvlc 17 18 }: 18 19 19 - mkDerivation rec { 20 + mkDerivation { 20 21 pname = "elisa"; 21 22 22 23 outputs = [ "out" "dev" ]; ··· 44 45 description = "A simple media player for KDE"; 45 46 license = licenses.gpl3; 46 47 maintainers = with maintainers; [ peterhoeg ]; 47 - broken = lib.versionOlder qtbase.version "5.15"; 48 48 }; 49 49 }
-2
pkgs/applications/kde/filelight.nix
··· 5 5 , kio 6 6 , kparts 7 7 , kxmlgui 8 - , qtbase 9 8 , qtscript 10 9 , solid 11 10 , qtquickcontrols2 ··· 20 21 homepage = "https://apps.kde.org/filelight/"; 21 22 license = with lib.licenses; [ gpl2 ]; 22 23 maintainers = with lib.maintainers; [ fridh vcunat ]; 23 - broken = lib.versionOlder qtbase.version "5.13"; 24 24 }; 25 25 nativeBuildInputs = [ extra-cmake-modules kdoctools ]; 26 26 propagatedBuildInputs = [
-1
pkgs/applications/kde/grantleetheme/default.nix
··· 9 9 meta = { 10 10 license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 11 11 maintainers = kdepimTeam; 12 - broken = lib.versionOlder qtbase.version "5.13.0"; 13 12 }; 14 13 output = [ "out" "dev" ]; 15 14 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+1 -2
pkgs/applications/kde/kdebugsettings.nix
··· 3 3 extra-cmake-modules, kdoctools, 4 4 gettext, 5 5 kcoreaddons, kconfig, kdbusaddons, kwidgetsaddons, kitemviews, kcompletion, 6 - qtbase, python3 6 + python3 7 7 }: 8 8 9 9 mkDerivation { ··· 13 13 description = "KDE debug settings"; 14 14 license = with lib.licenses; [ gpl2 ]; 15 15 maintainers = [ ]; 16 - broken = lib.versionOlder qtbase.version "5.13"; 17 16 }; 18 17 nativeBuildInputs = [ extra-cmake-modules kdoctools ]; 19 18 buildInputs = [
+1 -2
pkgs/applications/kde/kdenetwork-filesharing.nix
··· 1 1 { 2 2 mkDerivation, lib, 3 3 extra-cmake-modules, kdoctools, 4 - kcoreaddons, kdeclarative, ki18n, kio, kwidgetsaddons, samba, qtbase, 4 + kcoreaddons, kdeclarative, ki18n, kio, kwidgetsaddons, samba, 5 5 }: 6 6 7 7 mkDerivation { ··· 9 9 meta = { 10 10 license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ]; 11 11 maintainers = [ lib.maintainers.ttuegel ]; 12 - broken = lib.versionOlder qtbase.version "5.13"; 13 12 }; 14 13 nativeBuildInputs = [ extra-cmake-modules kdoctools ]; 15 14 buildInputs = [ kcoreaddons kdeclarative ki18n kio kwidgetsaddons samba ];
+1 -3
pkgs/applications/kde/kirigami-gallery.nix
··· 6 6 , qtgraphicaleffects 7 7 , qtquickcontrols2 8 8 , qttools 9 - , qtbase 10 9 }: 11 10 12 - mkDerivation rec { 11 + mkDerivation { 13 12 pname = "kirigami-gallery"; 14 13 15 14 nativeBuildInputs = [ extra-cmake-modules qttools ]; ··· 25 26 description = "View examples of Kirigami components"; 26 27 license = licenses.lgpl2; 27 28 maintainers = with maintainers; [ shadowrz ]; 28 - broken = versionOlder qtbase.version "5.15"; 29 29 }; 30 30 }
-1
pkgs/applications/kde/kmime.nix
··· 13 13 nativeBuildInputs = [ extra-cmake-modules ]; 14 14 buildInputs = [ kcodecs ki18n qtbase ]; 15 15 outputs = [ "out" "dev" ]; 16 - meta.broken = lib.versionOlder qtbase.version "5.15.0"; 17 16 }
+2 -3
pkgs/applications/kde/konqueror.nix
··· 2 2 , mkDerivation 3 3 , extra-cmake-modules, kdoctools 4 4 , kinit, kcmutils, khtml, kdesu 5 - , qtbase, qtwebengine, qtx11extras, qtscript, qtwayland 5 + , qtwebengine, qtx11extras, qtscript, qtwayland 6 6 }: 7 7 8 8 mkDerivation { ··· 25 25 homepage = "https://apps.kde.org/konqueror/"; 26 26 description = "Web browser, file manager and viewer"; 27 27 license = with lib.licenses; [ gpl2 ]; 28 - maintainers = with lib.maintainers; [ ]; 29 - broken = lib.versionOlder qtbase.version "5.13"; 28 + maintainers = [ ]; 30 29 }; 31 30 }
+1 -2
pkgs/applications/kde/kpimtextedit.nix
··· 2 2 mkDerivation, lib, kdepimTeam, 3 3 extra-cmake-modules, kdoctools, 4 4 grantlee, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio, 5 - kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qtbase, qttools, 5 + kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qttools, 6 6 qtspeech 7 7 }: 8 8 ··· 11 11 meta = { 12 12 license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 13 13 maintainers = kdepimTeam; 14 - broken = lib.versionOlder qtbase.version "5.13.0"; 15 14 }; 16 15 nativeBuildInputs = [ extra-cmake-modules kdoctools ]; 17 16 buildInputs = [
-1
pkgs/applications/kde/kpkpass.nix
··· 8 8 meta = { 9 9 license = with lib.licenses; [ lgpl21 ]; 10 10 maintainers = [ lib.maintainers.bkchr ]; 11 - broken = lib.versionOlder qtbase.version "5.15"; 12 11 }; 13 12 nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; 14 13 buildInputs = [ qtbase karchive ];
+1 -2
pkgs/applications/kde/krdc.nix
··· 2 2 mkDerivation, lib, 3 3 extra-cmake-modules, kdoctools, makeWrapper, 4 4 kcmutils, kcompletion, kconfig, kdnssd, knotifyconfig, kwallet, kwidgetsaddons, 5 - kwindowsystem, libvncserver, freerdp, qtbase, 5 + kwindowsystem, libvncserver, freerdp, 6 6 }: 7 7 8 8 mkDerivation { ··· 22 22 license = with licenses; [ gpl2Plus lgpl21Plus fdl12Plus bsd3 ]; 23 23 maintainers = with maintainers; [ peterhoeg ]; 24 24 platforms = platforms.linux; 25 - broken = lib.versionOlder qtbase.version "5.14"; 26 25 }; 27 26 }
+1 -2
pkgs/applications/kde/kwave.nix
··· 1 1 { mkDerivation, lib, extra-cmake-modules, kdoctools, qtmultimedia, kcompletion, kconfig 2 2 , kcrash, kiconthemes, kio, audiofile, libsamplerate, alsa-lib, libpulseaudio, flac, id3lib 3 - , libogg, libmad, libopus, libvorbis, fftw, librsvg, qtbase }: 3 + , libogg, libmad, libopus, libvorbis, fftw, librsvg }: 4 4 5 5 mkDerivation { 6 6 pname = "kwave"; ··· 11 11 maintainers = with maintainers; [ freezeboy ]; 12 12 license = licenses.gpl2Plus; 13 13 platforms = platforms.linux; 14 - broken = lib.versionOlder qtbase.version "5.14"; 15 14 }; 16 15 nativeBuildInputs = [ 17 16 extra-cmake-modules
+1 -2
pkgs/applications/kde/libkgapi.nix
··· 1 1 { 2 2 mkDerivation, lib, kdepimTeam, 3 3 extra-cmake-modules, kdoctools, 4 - qtbase, qtwebengine, kio, kcalendarcore, kcontacts, 4 + qtwebengine, kio, kcalendarcore, kcontacts, 5 5 cyrus_sasl 6 6 }: 7 7 ··· 10 10 meta = { 11 11 license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; 12 12 maintainers = kdepimTeam; 13 - broken = lib.versionOlder qtbase.version "5.14.0"; 14 13 }; 15 14 nativeBuildInputs = [ extra-cmake-modules kdoctools ]; 16 15 buildInputs = [ qtwebengine kio kcalendarcore kcontacts cyrus_sasl ];
+1 -2
pkgs/applications/kde/minuet.nix
··· 1 - { mkDerivation, qtbase 1 + { mkDerivation 2 2 , lib, extra-cmake-modules, gettext, python3 3 3 , drumstick, fluidsynth 4 4 , kcoreaddons, kcrash, kdoctools ··· 12 12 description = "Music Education Software"; 13 13 license = with licenses; [ lgpl21 gpl3 ]; 14 14 maintainers = with maintainers; [ peterhoeg HaoZeke ]; 15 - broken = lib.versionOlder qtbase.version "5.14"; 16 15 }; 17 16 18 17 nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python3 qtdeclarative ];
+1 -2
pkgs/applications/kde/spectacle.nix
··· 3 3 , ki18n, xcb-util-cursor 4 4 , kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins 5 5 , knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi 6 - , qtbase, qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator 6 + , qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator 7 7 }: 8 8 9 9 mkDerivation { ··· 23 23 homepage = "https://apps.kde.org/spectacle/"; 24 24 description = "Screenshot capture utility"; 25 25 maintainers = with maintainers; [ ttuegel ]; 26 - broken = versionOlder qtbase.version "5.15"; 27 26 }; 28 27 }
+1 -5
pkgs/applications/maui/default.nix
··· 28 28 }: 29 29 30 30 let 31 - minQtVersion = "5.15"; 32 - broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion; 33 - 34 31 mirror = "mirror://kde"; 35 32 srcs = import ./srcs.nix { inherit fetchurl mirror; }; 36 33 ··· 48 51 meta // { 49 52 homepage = meta.homepage or "https://mauikit.org/"; 50 53 platforms = meta.platforms or lib.platforms.linux; 51 - broken = meta.broken or broken; 52 54 }; 53 55 }); 54 56 55 - packages = self: with self; 57 + packages = self: 56 58 let 57 59 callPackage = self.newScope { 58 60 inherit mkDerivation;
+1 -4
pkgs/applications/misc/qsyncthingtray/default.nix
··· 64 64 license = licenses.lgpl3; 65 65 maintainers = with maintainers; [ zraexy peterhoeg ]; 66 66 platforms = platforms.all; 67 - # 0.5.7 segfaults when opening the main panel with qt 5.7 and fails to compile with qt 5.8 68 - # but qt > 5.6 works when only using the native browser 69 - # https://github.com/sieren/QSyncthingTray/issues/223 70 - broken = (builtins.compareVersions qtbase.version "5.7.0" >= 0 && !preferNative) || stdenv.isDarwin; 67 + broken = !preferNative || stdenv.isDarwin; 71 68 }; 72 69 }
+1 -5
pkgs/applications/plasma-mobile/default.nix
··· 28 28 }: 29 29 30 30 let 31 - minQtVersion = "5.15"; 32 - broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion; 33 - 34 31 mirror = "mirror://kde"; 35 32 srcs = import ./srcs.nix { inherit fetchurl mirror; }; 36 33 ··· 48 51 meta // { 49 52 homepage = meta.homepage or "https://www.plasma-mobile.org/"; 50 53 platforms = meta.platforms or lib.platforms.linux; 51 - broken = meta.broken or broken; 52 54 }; 53 55 }); 54 56 55 - packages = self: with self; 57 + packages = self: 56 58 let 57 59 callPackage = self.newScope { 58 60 inherit mkDerivation;
+1 -2
pkgs/applications/science/math/speedcrunch/default.nix
··· 31 31 ''; 32 32 maintainers = with maintainers; [ gebner j0hax ]; 33 33 inherit (qtbase.meta) platforms; 34 - # works with qt 5.6 and qt 5.8 35 - broken = builtins.compareVersions qtbase.version "5.7.0" == 0 || stdenv.isDarwin; 34 + broken = stdenv.isDarwin; 36 35 }; 37 36 }
-1
pkgs/applications/video/avidemux/default.nix
··· 56 56 ++ lib.optional withVPX libvpx; 57 57 58 58 buildCommand = let 59 - qtVersion = "5.${lib.versions.minor qtbase.version}"; 60 59 wrapWith = makeWrapper: filename: 61 60 "${makeWrapper} ${filename} --set ADM_ROOT_DIR $out --prefix LD_LIBRARY_PATH : ${libXext}/lib"; 62 61 wrapQtApp = wrapWith "wrapQtApp";
-3
pkgs/desktops/plasma-5/default.nix
··· 33 33 }: 34 34 35 35 let 36 - minQtVersion = "5.15"; 37 - broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion; 38 36 maintainers = with lib.maintainers; [ ttuegel nyanloutre ]; 39 37 license = with lib.licenses; [ 40 38 lgpl21Plus ··· 105 107 license = meta.license or license; 106 108 maintainers = (meta.maintainers or [ ]) ++ maintainers; 107 109 platforms = meta.platforms or lib.platforms.linux; 108 - broken = meta.broken or broken; 109 110 }; 110 111 in 111 112 qtStdenv.mkDerivation (args // {
-43
pkgs/development/libraries/appstream/fix-build-for-qt-olderthan-514.patch
··· 1 - diff --git a/qt/component.h b/qt/component.h 2 - index 47abd1f3..74de943c 100644 3 - --- a/qt/component.h 4 - +++ b/qt/component.h 5 - @@ -90,7 +90,7 @@ class APPSTREAMQT_EXPORT Component { 6 - UrlKindContact, 7 - 8 - // deprecated 9 - - UrlTranslate [[deprecated]] = UrlKindTranslate, 10 - + UrlTranslate = UrlKindTranslate, 11 - }; 12 - Q_ENUM(UrlKind) 13 - 14 - diff --git a/qt/pool.h b/qt/pool.h 15 - index b59829b7..5237f613 100644 16 - --- a/qt/pool.h 17 - +++ b/qt/pool.h 18 - @@ -70,9 +70,9 @@ public: 19 - FlagMonitor = 1 << 7, 20 - 21 - // deprecated 22 - - FlagReadCollection [[deprecated]] = FlagLoadOsCollection, 23 - - FlagReadMetainfo [[deprecated]] = FlagLoadOsMetainfo, 24 - - FlagReadDesktopFiles [[deprecated]] = FlagLoadOsDesktopFiles, 25 - + FlagReadCollection = FlagLoadOsCollection, 26 - + FlagReadMetainfo = FlagLoadOsMetainfo, 27 - + FlagReadDesktopFiles = FlagLoadOsDesktopFiles, 28 - }; 29 - 30 - /** 31 - @@ -84,9 +84,9 @@ public: 32 - * Flags on how caching should be used. 33 - **/ 34 - enum CacheFlags { 35 - - CacheFlagNone [[deprecated]] = 0, 36 - - CacheFlagUseUser [[deprecated]] = 1 << 0, 37 - - CacheFlagUseSystem [[deprecated]] = 1 << 1, 38 - + CacheFlagNone = 0, 39 - + CacheFlagUseUser = 1 << 0, 40 - + CacheFlagUseSystem = 1 << 1, 41 - }; 42 - 43 - /**
+2 -9
pkgs/development/libraries/appstream/qt.nix
··· 1 - { lib, mkDerivation, appstream, qtbase, qttools, nixosTests }: 1 + { mkDerivation, appstream, qtbase, qttools, nixosTests }: 2 2 3 3 # TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here 4 4 ··· 14 14 15 15 mesonFlags = appstream.mesonFlags ++ [ "-Dqt=true" ]; 16 16 17 - patches = (appstream.patches or []) ++ lib.optionals (lib.versionOlder qtbase.version "5.14") [ 18 - # Fix darwin build for libsForQt5.appstream-qt 19 - # Old Qt moc doesn't know about fancy C++14 features 20 - # ../qt/component.h:93: Parse error at "UrlTranslate" 21 - # Remove both this patch and related comment in default.nix 22 - # once Qt 5.14 or later becomes default on darwin 23 - ./fix-build-for-qt-olderthan-514.patch 24 - ]; 17 + patches = appstream.patches; 25 18 26 19 postFixup = '' 27 20 sed -i "$dev/lib/cmake/AppStreamQt/AppStreamQtConfig.cmake" \
-4
pkgs/development/libraries/kde-frameworks/default.nix
··· 27 27 { libsForQt5, lib, fetchurl }: 28 28 29 29 let 30 - 31 - minQtVersion = "5.15"; 32 - broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion; 33 30 maintainers = with lib.maintainers; [ ttuegel nyanloutre ]; 34 31 license = with lib.licenses; [ 35 32 lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12Plus ··· 83 86 license = meta.license or license; 84 87 maintainers = (meta.maintainers or []) ++ maintainers; 85 88 platforms = meta.platforms or lib.platforms.linux; 86 - broken = meta.broken or broken; 87 89 }; 88 90 89 91 in mkDerivation (args // {
-4
pkgs/development/libraries/kde-frameworks/kimageformats.nix
··· 16 16 cmakeFlags = [ 17 17 "-DKIMAGEFORMATS_HEIF=ON" 18 18 ]; 19 - 20 - meta = with lib; { 21 - broken = versionOlder qtbase.version "5.14"; 22 - }; 23 19 }
+1 -3
pkgs/development/libraries/kpmcore/default.nix
··· 1 1 { stdenv, lib, fetchurl, extra-cmake-modules 2 - , qca-qt5, kauth, kio, polkit-qt, qtbase 2 + , qca-qt5, kauth, kio, polkit-qt 3 3 , util-linux 4 4 }: 5 5 ··· 42 42 homepage = "https://invent.kde.org/system/kpmcore"; 43 43 license = with licenses; [ cc-by-40 cc0 gpl3Plus mit ]; 44 44 maintainers = with maintainers; [ peterhoeg oxalica ]; 45 - # The build requires at least Qt 5.14: 46 - broken = versionOlder qtbase.version "5.14"; 47 45 }; 48 46 }
+1 -1
pkgs/development/libraries/qt-5/modules/qtdeclarative.nix
··· 8 8 preConfigure = '' 9 9 NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QML2_IMPORT_PREFIX=\"$qtQmlPrefix\"" 10 10 ''; 11 - configureFlags = lib.optionals (lib.versionAtLeast qtbase.version "5.11.0") [ "-qml-debug" ]; 11 + configureFlags = [ "-qml-debug" ]; 12 12 devTools = [ 13 13 "bin/qml" 14 14 "bin/qmlcachegen"
+1 -2
pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
··· 17 17 nativeBuildInputs = [ pkg-config ]; 18 18 buildInputs = [ gstreamer gst-plugins-base ] 19 19 # https://github.com/NixOS/nixpkgs/pull/169336 regarding libpulseaudio 20 - ++ lib.optionals stdenv.isLinux [ libpulseaudio alsa-lib ] 21 - ++ lib.optional (lib.versionAtLeast qtbase.version "5.14.0" && stdenv.isLinux) wayland; 20 + ++ lib.optionals stdenv.isLinux [ libpulseaudio alsa-lib wayland ]; 22 21 outputs = [ "bin" "dev" "out" ]; 23 22 qmakeFlags = [ "GST_VERSION=1.0" ]; 24 23 NIX_LDFLAGS = lib.optionalString (stdenv.isDarwin) "-lobjc";
-1
pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
··· 66 66 homepage = "https://github.com/tsujan/Kvantum"; 67 67 license = licenses.gpl3Plus; 68 68 platforms = platforms.linux; 69 - broken = lib.versionOlder qtbase.version "5.14"; 70 69 maintainers = [ maintainers.romildo ]; 71 70 }; 72 71 }