From cda9f4ca0c7fcb300eda46c589f906130afdf895 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 22 Oct 2020 15:59:13 +0300 Subject: [PATCH] kdeApplications: Use latest qt515 by default Backport of the PR https://github.com/NixOS/nixpkgs/pull/101369. All commits have been squashed, and other minor changes were made as well to align the state of 20.09 with that of master. --- .../services/x11/desktop-managers/plasma5.nix | 2 +- .../services/x11/display-managers/sddm.nix | 7 +- pkgs/applications/editors/kile/default.nix | 13 +- pkgs/applications/kde/default.nix | 321 +++++++++--------- .../default.nix => kde/kdeconnect-kde.nix} | 72 ++-- pkgs/applications/misc/tellico/default.nix | 7 +- .../networking/browsers/firefox/wrapper.nix | 4 +- pkgs/data/icons/maia-icon-theme/default.nix | 14 +- pkgs/desktops/lxqt/default.nix | 2 +- pkgs/desktops/plasma-5/default.nix | 2 - .../libraries/drumstick/default.nix | 4 +- .../libraries/kdiagram/default.nix | 17 +- .../development/libraries/kpmcore/default.nix | 4 +- pkgs/top-level/aliases.nix | 60 ++++ pkgs/top-level/all-packages.nix | 242 +++++-------- 15 files changed, 387 insertions(+), 384 deletions(-) rename pkgs/applications/{misc/kdeconnect/default.nix => kde/kdeconnect-kde.nix} (71%) diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 94e2082e90bceb..9d1346a66c4410 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -200,7 +200,7 @@ in security.wrappers = { kcheckpass.source = "${lib.getBin plasma5.kscreenlocker}/libexec/kcheckpass"; - start_kdeinit.source = "${lib.getBin pkgs.kinit}/libexec/kf5/start_kdeinit"; + start_kdeinit.source = "${lib.getBin pkgs.kdeFrameworks.kinit}/libexec/kf5/start_kdeinit"; kwin_wayland = { source = "${lib.getBin plasma5.kwin}/bin/kwin_wayland"; capabilities = "cap_sys_nice+ep"; diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index e63bb2e445396b..cd7148e68aad7d 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -9,7 +9,12 @@ let cfg = dmcfg.sddm; xEnv = config.systemd.services.display-manager.environment; - inherit (pkgs) sddm; + sddm = if config.services.xserver.desktopManager.lxqt.enable then + # TODO: Move lxqt to libsForQt515 + pkgs.libsForQt514.sddm + else + pkgs.libsForQt5.sddm + ; xserverWrapper = pkgs.writeScript "xserver-wrapper" '' #!/bin/sh diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix index fa25252fc6f84e..1b025db469e5e8 100644 --- a/pkgs/applications/editors/kile/default.nix +++ b/pkgs/applications/editors/kile/default.nix @@ -29,14 +29,17 @@ mkDerivation rec { sha256 = "BEmSEv/LJPs6aCkUmnyuTGrV15WYXwgIANbfcviMXfA="; }; - nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ]; + nativeBuildInputs = [ + extra-cmake-modules + wrapGAppsHook + kdoctools + ]; - propagatedBuildInputs = [ + buildInputs = [ kconfig kcrash kdbusaddons kdelibs4support - kdoctools kguiaddons kiconthemes kinit @@ -48,6 +51,10 @@ mkDerivation rec { poppler qtscript ]; + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; propagatedUserEnvPkgs = [ konsole ]; diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 5075761044561d..8de30e886a797b 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -25,7 +25,9 @@ still shows most of the available features is in `./gwenview.nix`. */ -{ lib, libsForQt5, fetchurl }: +{ + lib, libsForQt5, fetchurl, +}: let mirror = "mirror://kde"; @@ -57,161 +59,162 @@ let } // (args.meta or {}); }); - callPackage = libsForQt5.newScope - (self // { - inherit mkDerivation; - - # Team of maintainers assigned to the KDE PIM suite - kdepimTeam = with lib.maintainers; [ ttuegel vandenoever nyanloutre ]; - }); - - self = { - akonadi = callPackage ./akonadi {}; - akonadi-calendar = callPackage ./akonadi-calendar.nix {}; - akonadi-contacts = callPackage ./akonadi-contacts.nix {}; - akonadi-import-wizard = callPackage ./akonadi-import-wizard.nix {}; - akonadi-mime = callPackage ./akonadi-mime.nix {}; - akonadi-notes = callPackage ./akonadi-notes.nix {}; - akonadi-search = callPackage ./akonadi-search.nix {}; - akonadiconsole = callPackage ./akonadiconsole.nix {}; - akregator = callPackage ./akregator.nix {}; - ark = callPackage ./ark {}; - baloo-widgets = callPackage ./baloo-widgets.nix {}; - bovo = callPackage ./bovo.nix {}; - bomber = callPackage ./bomber.nix {}; - calendarsupport = callPackage ./calendarsupport.nix {}; - dolphin = callPackage ./dolphin.nix {}; - dolphin-plugins = callPackage ./dolphin-plugins.nix {}; - dragon = callPackage ./dragon.nix {}; - elisa = callPackage ./elisa.nix {}; - eventviews = callPackage ./eventviews.nix {}; - ffmpegthumbs = callPackage ./ffmpegthumbs.nix { }; - filelight = callPackage ./filelight.nix {}; - granatier = callPackage ./granatier.nix {}; - grantleetheme = callPackage ./grantleetheme {}; - gwenview = callPackage ./gwenview.nix {}; - incidenceeditor = callPackage ./incidenceeditor.nix {}; - k3b = callPackage ./k3b.nix {}; - kaddressbook = callPackage ./kaddressbook.nix {}; - kalarm = callPackage ./kalarm.nix {}; - kalarmcal = callPackage ./kalarmcal.nix {}; - kalzium = callPackage ./kalzium.nix {}; - kapman = callPackage ./kapman.nix {}; - kapptemplate = callPackage ./kapptemplate.nix { }; - kate = callPackage ./kate.nix {}; - katomic = callPackage ./katomic.nix {}; - kblackbox = callPackage ./kblackbox.nix {}; - kblocks = callPackage ./kblocks.nix {}; - kbounce = callPackage ./kbounce.nix {}; - kbreakout = callPackage ./kbreakout.nix {}; - kcachegrind = callPackage ./kcachegrind.nix {}; - kcalc = callPackage ./kcalc.nix {}; - kcalutils = callPackage ./kcalutils.nix {}; - kcharselect = callPackage ./kcharselect.nix {}; - kcolorchooser = callPackage ./kcolorchooser.nix {}; - kdebugsettings = callPackage ./kdebugsettings.nix {}; - kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {}; - kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {}; - kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {}; - kdenlive = callPackage ./kdenlive.nix {}; - kdepim-runtime = callPackage ./kdepim-runtime {}; - kdepim-addons = callPackage ./kdepim-addons.nix {}; - kdepim-apps-libs = callPackage ./kdepim-apps-libs {}; - kdf = callPackage ./kdf.nix {}; - kdialog = callPackage ./kdialog.nix {}; - kdiamond = callPackage ./kdiamond.nix {}; - keditbookmarks = callPackage ./keditbookmarks.nix {}; - kfind = callPackage ./kfind.nix {}; - kfloppy = callPackage ./kfloppy.nix {}; - kgeography = callPackage ./kgeography.nix {}; - kget = callPackage ./kget.nix {}; - kgpg = callPackage ./kgpg.nix {}; - khelpcenter = callPackage ./khelpcenter.nix {}; - kidentitymanagement = callPackage ./kidentitymanagement.nix {}; - kig = callPackage ./kig.nix {}; - kigo = callPackage ./kigo.nix {}; - killbots = callPackage ./killbots.nix {}; - kimap = callPackage ./kimap.nix {}; - kipi-plugins = callPackage ./kipi-plugins.nix {}; - kitinerary = callPackage ./kitinerary.nix {}; - kio-extras = callPackage ./kio-extras.nix {}; - kldap = callPackage ./kldap.nix {}; - kleopatra = callPackage ./kleopatra.nix {}; - klettres = callPackage ./klettres.nix {}; - klines = callPackage ./klines.nix {}; - kmag = callPackage ./kmag.nix {}; - kmahjongg = callPackage ./kmahjongg.nix {}; - kmail = callPackage ./kmail.nix {}; - kmail-account-wizard = callPackage ./kmail-account-wizard.nix {}; - kmailtransport = callPackage ./kmailtransport.nix {}; - kmbox = callPackage ./kmbox.nix {}; - kmime = callPackage ./kmime.nix {}; - kmines = callPackage ./kmines.nix {}; - kmix = callPackage ./kmix.nix {}; - kmplot = callPackage ./kmplot.nix {}; - knavalbattle = callPackage ./knavalbattle.nix {}; - knetwalk = callPackage ./knetwalk.nix {}; - knights = callPackage ./knights.nix {}; - knotes = callPackage ./knotes.nix {}; - kolf = callPackage ./kolf.nix {}; - kollision = callPackage ./kollision.nix {}; - kolourpaint = callPackage ./kolourpaint.nix {}; - kompare = callPackage ./kompare.nix {}; - konsole = callPackage ./konsole.nix {}; - kontact = callPackage ./kontact.nix {}; - kontactinterface = callPackage ./kontactinterface.nix {}; - konquest = callPackage ./konquest.nix {}; - konqueror = callPackage ./konqueror.nix {}; - korganizer = callPackage ./korganizer.nix {}; - kpat = callPackage ./kpat.nix {}; - kpimtextedit = callPackage ./kpimtextedit.nix {}; - ksmtp = callPackage ./ksmtp {}; - ksquares = callPackage ./ksquares.nix {}; - kqtquickcharts = callPackage ./kqtquickcharts.nix {}; - kpkpass = callPackage ./kpkpass.nix {}; - kreversi = callPackage ./kreversi.nix {}; - krdc = callPackage ./krdc.nix {}; - krfb = callPackage ./krfb.nix {}; - kruler = callPackage ./kruler.nix {}; - kshisen = callPackage ./kshisen.nix {}; - kspaceduel = callPackage ./kspaceduel.nix {}; - ksudoku = callPackage ./ksudoku.nix {}; - ksystemlog = callPackage ./ksystemlog.nix {}; - kteatime = callPackage ./kteatime.nix {}; - ktimer = callPackage ./ktimer.nix {}; - ktnef = callPackage ./ktnef.nix {}; - ktouch = callPackage ./ktouch.nix {}; - kturtle = callPackage ./kturtle.nix {}; - kwalletmanager = callPackage ./kwalletmanager.nix {}; - kwave = callPackage ./kwave.nix {}; - libgravatar = callPackage ./libgravatar.nix {}; - libkcddb = callPackage ./libkcddb.nix {}; - libkdcraw = callPackage ./libkdcraw.nix {}; - libkdegames = callPackage ./libkdegames.nix {}; - libkdepim = callPackage ./libkdepim.nix {}; - libkexiv2 = callPackage ./libkexiv2.nix {}; - libkgapi = callPackage ./libkgapi.nix {}; - libkipi = callPackage ./libkipi.nix {}; - libkleo = callPackage ./libkleo.nix {}; - libkmahjongg = callPackage ./libkmahjongg.nix {}; - libkomparediff2 = callPackage ./libkomparediff2.nix {}; - libksane = callPackage ./libksane.nix {}; - libksieve = callPackage ./libksieve.nix {}; - mailcommon = callPackage ./mailcommon.nix {}; - mailimporter = callPackage ./mailimporter.nix {}; - marble = callPackage ./marble.nix {}; - mbox-importer = callPackage ./mbox-importer.nix {}; - messagelib = callPackage ./messagelib.nix {}; - minuet = callPackage ./minuet.nix {}; - okular = callPackage ./okular.nix {}; - picmi = callPackage ./picmi.nix {}; - pimcommon = callPackage ./pimcommon.nix {}; - pim-data-exporter = callPackage ./pim-data-exporter.nix {}; - pim-sieve-editor = callPackage ./pim-sieve-editor.nix {}; - print-manager = callPackage ./print-manager.nix {}; - rocs = callPackage ./rocs.nix {}; - spectacle = callPackage ./spectacle.nix {}; - yakuake = callPackage ./yakuake.nix {}; - }; - -in self + packages = self: with self; + let + callPackage = self.newScope { + inherit mkDerivation; + + # Team of maintainers assigned to the KDE PIM suite + kdepimTeam = with lib.maintainers; [ ttuegel vandenoever nyanloutre ]; + }; + in { + akonadi = callPackage ./akonadi {}; + akonadi-calendar = callPackage ./akonadi-calendar.nix {}; + akonadi-contacts = callPackage ./akonadi-contacts.nix {}; + akonadi-import-wizard = callPackage ./akonadi-import-wizard.nix {}; + akonadi-mime = callPackage ./akonadi-mime.nix {}; + akonadi-notes = callPackage ./akonadi-notes.nix {}; + akonadi-search = callPackage ./akonadi-search.nix {}; + akonadiconsole = callPackage ./akonadiconsole.nix {}; + akregator = callPackage ./akregator.nix {}; + ark = callPackage ./ark {}; + baloo-widgets = callPackage ./baloo-widgets.nix {}; + bovo = callPackage ./bovo.nix {}; + bomber = callPackage ./bomber.nix {}; + calendarsupport = callPackage ./calendarsupport.nix {}; + dolphin = callPackage ./dolphin.nix {}; + dolphin-plugins = callPackage ./dolphin-plugins.nix {}; + dragon = callPackage ./dragon.nix {}; + elisa = callPackage ./elisa.nix {}; + eventviews = callPackage ./eventviews.nix {}; + ffmpegthumbs = callPackage ./ffmpegthumbs.nix { }; + filelight = callPackage ./filelight.nix {}; + granatier = callPackage ./granatier.nix {}; + grantleetheme = callPackage ./grantleetheme {}; + gwenview = callPackage ./gwenview.nix {}; + incidenceeditor = callPackage ./incidenceeditor.nix {}; + k3b = callPackage ./k3b.nix {}; + kaddressbook = callPackage ./kaddressbook.nix {}; + kalarm = callPackage ./kalarm.nix {}; + kalarmcal = callPackage ./kalarmcal.nix {}; + kalzium = callPackage ./kalzium.nix {}; + kapman = callPackage ./kapman.nix {}; + kapptemplate = callPackage ./kapptemplate.nix { }; + kate = callPackage ./kate.nix {}; + katomic = callPackage ./katomic.nix {}; + kblackbox = callPackage ./kblackbox.nix {}; + kblocks = callPackage ./kblocks.nix {}; + kbounce = callPackage ./kbounce.nix {}; + kbreakout = callPackage ./kbreakout.nix {}; + kcachegrind = callPackage ./kcachegrind.nix {}; + kcalc = callPackage ./kcalc.nix {}; + kcalutils = callPackage ./kcalutils.nix {}; + kcharselect = callPackage ./kcharselect.nix {}; + kcolorchooser = callPackage ./kcolorchooser.nix {}; + kdebugsettings = callPackage ./kdebugsettings.nix {}; + kdeconnect-kde = callPackage ./kdeconnect-kde.nix {}; + kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {}; + kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {}; + kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {}; + kdenlive = callPackage ./kdenlive.nix {}; + kdepim-runtime = callPackage ./kdepim-runtime {}; + kdepim-addons = callPackage ./kdepim-addons.nix {}; + kdepim-apps-libs = callPackage ./kdepim-apps-libs {}; + kdf = callPackage ./kdf.nix {}; + kdialog = callPackage ./kdialog.nix {}; + kdiamond = callPackage ./kdiamond.nix {}; + keditbookmarks = callPackage ./keditbookmarks.nix {}; + kfind = callPackage ./kfind.nix {}; + kfloppy = callPackage ./kfloppy.nix {}; + kgeography = callPackage ./kgeography.nix {}; + kget = callPackage ./kget.nix {}; + kgpg = callPackage ./kgpg.nix {}; + khelpcenter = callPackage ./khelpcenter.nix {}; + kidentitymanagement = callPackage ./kidentitymanagement.nix {}; + kig = callPackage ./kig.nix {}; + kigo = callPackage ./kigo.nix {}; + killbots = callPackage ./killbots.nix {}; + kimap = callPackage ./kimap.nix {}; + kipi-plugins = callPackage ./kipi-plugins.nix {}; + kitinerary = callPackage ./kitinerary.nix {}; + kio-extras = callPackage ./kio-extras.nix {}; + kldap = callPackage ./kldap.nix {}; + kleopatra = callPackage ./kleopatra.nix {}; + klettres = callPackage ./klettres.nix {}; + klines = callPackage ./klines.nix {}; + kmag = callPackage ./kmag.nix {}; + kmahjongg = callPackage ./kmahjongg.nix {}; + kmail = callPackage ./kmail.nix {}; + kmail-account-wizard = callPackage ./kmail-account-wizard.nix {}; + kmailtransport = callPackage ./kmailtransport.nix {}; + kmbox = callPackage ./kmbox.nix {}; + kmime = callPackage ./kmime.nix {}; + kmines = callPackage ./kmines.nix {}; + kmix = callPackage ./kmix.nix {}; + kmplot = callPackage ./kmplot.nix {}; + knavalbattle = callPackage ./knavalbattle.nix {}; + knetwalk = callPackage ./knetwalk.nix {}; + knights = callPackage ./knights.nix {}; + knotes = callPackage ./knotes.nix {}; + kolf = callPackage ./kolf.nix {}; + kollision = callPackage ./kollision.nix {}; + kolourpaint = callPackage ./kolourpaint.nix {}; + kompare = callPackage ./kompare.nix {}; + konsole = callPackage ./konsole.nix {}; + kontact = callPackage ./kontact.nix {}; + kontactinterface = callPackage ./kontactinterface.nix {}; + konquest = callPackage ./konquest.nix {}; + konqueror = callPackage ./konqueror.nix {}; + korganizer = callPackage ./korganizer.nix {}; + kpat = callPackage ./kpat.nix {}; + kpimtextedit = callPackage ./kpimtextedit.nix {}; + ksmtp = callPackage ./ksmtp {}; + ksquares = callPackage ./ksquares.nix {}; + kqtquickcharts = callPackage ./kqtquickcharts.nix {}; + kpkpass = callPackage ./kpkpass.nix {}; + kreversi = callPackage ./kreversi.nix {}; + krdc = callPackage ./krdc.nix {}; + krfb = callPackage ./krfb.nix {}; + kruler = callPackage ./kruler.nix {}; + kshisen = callPackage ./kshisen.nix {}; + kspaceduel = callPackage ./kspaceduel.nix {}; + ksudoku = callPackage ./ksudoku.nix {}; + ksystemlog = callPackage ./ksystemlog.nix {}; + kteatime = callPackage ./kteatime.nix {}; + ktimer = callPackage ./ktimer.nix {}; + ktnef = callPackage ./ktnef.nix {}; + ktouch = callPackage ./ktouch.nix {}; + kturtle = callPackage ./kturtle.nix {}; + kwalletmanager = callPackage ./kwalletmanager.nix {}; + kwave = callPackage ./kwave.nix {}; + libgravatar = callPackage ./libgravatar.nix {}; + libkcddb = callPackage ./libkcddb.nix {}; + libkdcraw = callPackage ./libkdcraw.nix {}; + libkdegames = callPackage ./libkdegames.nix {}; + libkdepim = callPackage ./libkdepim.nix {}; + libkexiv2 = callPackage ./libkexiv2.nix {}; + libkgapi = callPackage ./libkgapi.nix {}; + libkipi = callPackage ./libkipi.nix {}; + libkleo = callPackage ./libkleo.nix {}; + libkmahjongg = callPackage ./libkmahjongg.nix {}; + libkomparediff2 = callPackage ./libkomparediff2.nix {}; + libksane = callPackage ./libksane.nix {}; + libksieve = callPackage ./libksieve.nix {}; + mailcommon = callPackage ./mailcommon.nix {}; + mailimporter = callPackage ./mailimporter.nix {}; + marble = callPackage ./marble.nix {}; + mbox-importer = callPackage ./mbox-importer.nix {}; + messagelib = callPackage ./messagelib.nix {}; + minuet = callPackage ./minuet.nix {}; + okular = callPackage ./okular.nix {}; + picmi = callPackage ./picmi.nix {}; + pimcommon = callPackage ./pimcommon.nix {}; + pim-data-exporter = callPackage ./pim-data-exporter.nix {}; + pim-sieve-editor = callPackage ./pim-sieve-editor.nix {}; + print-manager = callPackage ./print-manager.nix {}; + rocs = callPackage ./rocs.nix {}; + spectacle = callPackage ./spectacle.nix {}; + yakuake = callPackage ./yakuake.nix {}; + }; + +in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/kde/kdeconnect-kde.nix similarity index 71% rename from pkgs/applications/misc/kdeconnect/default.nix rename to pkgs/applications/kde/kdeconnect-kde.nix index d042f011bb78f6..a1ebda75a9cc21 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/kde/kdeconnect-kde.nix @@ -1,39 +1,32 @@ { mkDerivation -, lib -, fetchurl -, fetchpatch , extra-cmake-modules +, fetchpatch , kcmutils , kconfigwidgets , kdbusaddons , kdoctools -, kiconthemes , ki18n +, kiconthemes +, kio +, kirigami2 , knotifications -, qca-qt5 -, libfakekey +, kpeople +, kpeoplevcard +, kwayland +, lib , libXtst -, qtx11extras -, qtmultimedia -, qtgraphicaleffects -, sshfs +, libfakekey , makeWrapper -, kwayland -, kio -, kpeoplevcard -, kpeople -, kirigami2 , pulseaudio-qt +, qca-qt5 +, qtgraphicaleffects +, qtmultimedia +, qtx11extras +, sshfs }: -mkDerivation rec { - pname = "kdeconnect"; - version = "20.08.2"; - - src = fetchurl { - url = "https://download.kde.org/stable/release-service/${version}/src/${pname}-kde-${version}.tar.xz"; - sha256 = "0rzfnkgkv759d4pa16qk0sw87wqzwgkd99yzrzfy2zcq423f6hvd"; - }; +mkDerivation { + name = "kdeconnect-kde"; patches = [ # https://invent.kde.org/network/kdeconnect-kde/-/merge_requests/328 @@ -44,39 +37,36 @@ mkDerivation rec { ]; buildInputs = [ - libfakekey - libXtst - qtmultimedia - qtgraphicaleffects - pulseaudio-qt - kpeoplevcard - kpeople - kirigami2 - ki18n - kiconthemes kcmutils kconfigwidgets kdbusaddons + ki18n + kiconthemes + kio + kirigami2 knotifications + kpeople + kpeoplevcard + kwayland + libXtst + libfakekey + pulseaudio-qt qca-qt5 + qtgraphicaleffects + qtmultimedia qtx11extras - makeWrapper - kwayland - kio ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; postInstall = '' wrapProgram $out/libexec/kdeconnectd --prefix PATH : ${lib.makeBinPath [ sshfs ]} ''; - enableParallelBuilding = true; - meta = with lib; { description = "KDE Connect provides several features to integrate your phone and your computer"; - homepage = "https://community.kde.org/KDEConnect"; - license = with licenses; [ gpl2 ]; + homepage = "https://community.kde.org/KDEConnect"; + license = with licenses; [ gpl2 ]; maintainers = with maintainers; [ fridh ]; }; } diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix index 3721d8f8be7ba0..6b8b0693e2866d 100644 --- a/pkgs/applications/misc/tellico/default.nix +++ b/pkgs/applications/misc/tellico/default.nix @@ -1,6 +1,7 @@ { lib , fetchurl , mkDerivation +, libkcddb , kinit , kdelibs4support , solid @@ -14,7 +15,6 @@ , exempi , extra-cmake-modules , libcdio -, libkcddb , poppler , makeWrapper , kdoctools @@ -41,6 +41,11 @@ mkDerivation rec { ]; buildInputs = [ + cmake + exempi + extra-cmake-modules + karchive + libkcddb kdelibs4support solid kxmlgui diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 9c8625495b202f..cc6cc72e27bee3 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -4,7 +4,7 @@ , flashplayer, hal-flash , ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd , gnome3/*.gnome-shell*/ -, browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow +, browserpass, chrome-gnome-shell, uget-integrator, plasma5, bukubrow , tridactyl-native , fx_cast_bridge , udev @@ -65,7 +65,7 @@ let ++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator - ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration + ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma5.plasma-browser-integration ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge ++ extraNativeMessagingHosts ); diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/data/icons/maia-icon-theme/default.nix index ee539981fbca3a..2a6dbc512accaa 100644 --- a/pkgs/data/icons/maia-icon-theme/default.nix +++ b/pkgs/data/icons/maia-icon-theme/default.nix @@ -1,4 +1,12 @@ -{ stdenv, fetchFromGitLab, cmake, extra-cmake-modules, gtk3, kdeFrameworks, hicolor-icon-theme }: +{ stdenv +, fetchFromGitLab +, cmake +, extra-cmake-modules +, gtk3 +, plasma-framework +, kwindowsystem +, hicolor-icon-theme +}: stdenv.mkDerivation { pname = "maia-icon-theme"; @@ -17,8 +25,8 @@ stdenv.mkDerivation { cmake extra-cmake-modules gtk3 - kdeFrameworks.plasma-framework - kdeFrameworks.kwindowsystem + plasma-framework + kwindowsystem ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 90e466f7471eca..1292da151acff6 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -43,7 +43,7 @@ let ### OPTIONAL qterminal = callPackage ./qterminal {}; - compton-conf = pkgs.qt5.callPackage ./compton-conf {}; + compton-conf = qt5.callPackage ./compton-conf {}; obconf-qt = callPackage ./obconf-qt {}; lximage-qt = callPackage ./lximage-qt {}; qps = callPackage ./qps {}; diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 8ab4b60156c66a..265c22b556556e 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -36,7 +36,6 @@ let }; mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; - qtbase = libsForQt5.callPackage ({ qtbase }: qtbase) {}; packages = self: with self; let @@ -83,7 +82,6 @@ let setupHook = args.setupHook or defaultSetupHook; meta = { - broken = lib.versionAtLeast qtbase.version "5.15"; license = with lib.licenses; [ lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 ]; diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index 0d3e2913ce8e10..7cd826b1fe397f 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, alsaLib, cmake, docbook_xsl, docbook_xml_dtd_45, doxygen -, fluidsynth, pkgconfig, qt5 +, fluidsynth, pkgconfig, qtbase, qtsvg }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_45 ]; buildInputs = [ - alsaLib doxygen fluidsynth qt5.qtbase qt5.qtsvg + alsaLib doxygen fluidsynth qtbase qtsvg ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/kdiagram/default.nix b/pkgs/development/libraries/kdiagram/default.nix index 4e854e445c6d4d..b9f16d3cfaef92 100644 --- a/pkgs/development/libraries/kdiagram/default.nix +++ b/pkgs/development/libraries/kdiagram/default.nix @@ -1,19 +1,18 @@ { - mkDerivation, fetchurl, lib, + mkDerivation, fetchFromGitLab, lib, extra-cmake-modules, qttools, qtbase, qtsvg, }: -let +mkDerivation rec { pname = "kdiagram"; version = "2.7.0"; -in - -mkDerivation { - inherit pname version; - src = fetchurl { - url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256:1pgvf2q8b59hw0jg5ajmj5nrn4q8cgnifpvdd0fynk2ml6zym8k3"; + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "graphics"; + repo = pname; + rev = "v${version}"; + sha256 = "NSBNHPr8JzBn3y3ivhL0RjiXjDuPwZsTTOeI22pq3vc="; }; nativeBuildInputs = [ extra-cmake-modules qttools ]; propagatedBuildInputs = [ qtbase qtsvg ]; diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix index 7903fc74639012..8cda52c4aecd56 100644 --- a/pkgs/development/libraries/kpmcore/default.nix +++ b/pkgs/development/libraries/kpmcore/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, extra-cmake-modules -, qtbase, kdeFrameworks +, qtbase, kio , libatasmart, parted , utillinux }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { libatasmart parted # we only need the library - kdeFrameworks.kio + kio utillinux # needs blkid (note that this is not provided by utillinux-compat) ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index aff38acc235adc..4805c931959af1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -220,6 +220,7 @@ mapAliases ({ kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16 julia_07 = throw "deprecated in favor of julia_10 LTS"; # added 2020-09-15 julia_11 = throw "deprecated in favor of latest Julia version"; # added 2020-09-15 + kdeconnect = kdeApplications.kdeconnect-kde; # added 2020-10-28 kdiff3-qt5 = kdiff3; # added 2017-02-18 keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02 keepassx-community = keepassxc; # added 2017-11 @@ -734,4 +735,63 @@ mapAliases ({ /* Cleanup before 21.03 */ riot-desktop = throw "riot-desktop is now element-desktop!"; riot-web = throw "riot-web is now element-web"; + + ant-dracula-theme = throw "ant-dracula-theme is now dracula-theme, and theme name is Dracula instead of Ant-Dracula."; + + /* If these are in the scope of all-packages.nix, they cause collisions + between mixed versions of qt. See: + https://github.com/NixOS/nixpkgs/pull/101369 */ + + inherit (kdeFrameworks) breeze-icons oxygen-icons5; + inherit (kdeApplications) + akonadi akregator ark + bomber bovo + dolphin dragon + elisa + ffmpegthumbs filelight + granatier gwenview + k3b + kaddressbook kalzium kapptemplate kapman kate katomic + kblackbox kblocks kbounce + kcachegrind kcalc kcharselect kcolorchooser + kdenlive kdf kdialog kdiamond + keditbookmarks + kfind kfloppy + kget kgpg + khelpcenter + kig kigo killbots kitinerary + kleopatra klettres klines + kmag kmail kmines kmix kmplot + knavalbattle knetwalk knights + kollision kolourpaint kompare konsole kontact korganizer + kpkpass + krdc kreversi krfb + kshisen ksquares ksystemlog + kteatime ktimer ktouch kturtle + kwalletmanager kwave + marble minuet + okular + picmi + spectacle + yakuake + ; + inherit (plasma5) + bluedevil breeze-gtk breeze-qt5 breeze-grub breeze-plymouth discover + kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5 + kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard + kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-browser-integration + plasma-desktop plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace + plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm + systemsettings user-manager xdg-desktop-portal-kde + ; + inherit (plasma5.thirdParty) + plasma-applet-caffeine-plus + kwin-dynamic-workspaces + kwin-tiling + krohnkite + ; + inherit (libsForQt5) + sddm + ; + }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1aaa5d59a663e0..bb63c69cd43298 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6057,8 +6057,6 @@ in packagekit = callPackage ../tools/package-management/packagekit { }; - packagekit-qt = libsForQt5.callPackage ../tools/package-management/packagekit/qt.nix { }; - packetdrill = callPackage ../tools/networking/packetdrill { }; pacman = callPackage ../tools/package-management/pacman { }; @@ -8554,8 +8552,6 @@ in dotty = callPackage ../development/compilers/scala/dotty.nix { jre = jre8;}; - drumstick = callPackage ../development/libraries/drumstick { }; - ecl = callPackage ../development/compilers/ecl { }; ecl_16_1_2 = callPackage ../development/compilers/ecl/16.1.2.nix { }; @@ -13037,7 +13033,7 @@ in let mkFrameworks = import ../development/libraries/kde-frameworks; attrs = { - libsForQt5 = libsForQt512; + inherit libsForQt5; inherit lib fetchurl; }; in @@ -13052,8 +13048,6 @@ in automake = automake111x; }; - kf5gpgmepp = libsForQt5.callPackage ../development/libraries/kf5gpgmepp { }; - krb5 = callPackage ../development/libraries/kerberos/krb5.nix { inherit (buildPackages.darwin) bootstrap_cmds; }; @@ -14833,8 +14827,6 @@ in inherit llvmPackages_5; }); - libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5); - qt514 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.14) { inherit newScope; @@ -14865,6 +14857,8 @@ in inherit llvmPackages_5; }); + libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5); + libsForQt514 = recurseIntoAttrs (lib.makeScope qt514.newScope mkLibsForQt5); libsForQt515 = recurseIntoAttrs (lib.makeScope qt515.newScope mkLibsForQt5); @@ -14880,39 +14874,52 @@ in ### KDE FRAMEWORKS inherit (kdeFrameworks.override { libsForQt5 = self; }) - attica baloo bluez-qt kactivities kactivities-stats karchive kauth - kbookmarks kcmutils kcalendarcore kcodecs kcompletion kconfig - kconfigwidgets kcoreaddons kcrash kdav kdbusaddons kdeclarative - kdelibs4support kdesignerplugin kdewebkit kdnssd kdoctools kemoticons - kfilemetadata kglobalaccel kguiaddons khtml ki18n kiconthemes kidletime - kimageformats kio kitemmodels kitemviews kjobwidgets kjs kjsembed - kmediaplayer knewstuff knotifications knotifyconfig kpackage kparts - kpeople kplotting kpty kross krunner kservice ktexteditor ktextwidgets - kunitconversion kwallet kwayland kwidgetsaddons kwindowsystem kxmlgui - kxmlrpcclient modemmanager-qt networkmanager-qt plasma-framework prison - qqc2-desktop-style solid sonnet syntax-highlighting syndication - threadweaver kirigami2 kholidays kpurpose kcontacts kquickcharts - kapidox; + attica baloo bluez-qt kactivities kactivities-stats + karchive kauth kbookmarks kcmutils kcalendarcore kcodecs kcompletion kconfig + kconfigwidgets kcoreaddons kcrash kdav kdbusaddons kdeclarative kdelibs4support + kdesignerplugin kdnssd kemoticons kfilemetadata kglobalaccel kguiaddons + khtml ki18n kiconthemes kidletime kimageformats kio kitemmodels kitemviews + kjobwidgets kjs kjsembed kmediaplayer knewstuff knotifications + knotifyconfig kpackage kparts kpeople kplotting kpty kross krunner + kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland + kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt + networkmanager-qt plasma-framework prison qqc2-desktop-style solid sonnet + syntax-highlighting syndication threadweaver kirigami2 kholidays kpurpose + kcontacts kquickcharts kdoctools kapidox kdesu kinit kded frameworkintegration + kdewebkit breeze-icons + ; ### KDE PLASMA 5 inherit (plasma5.override { libsForQt5 = self; }) - breeze-qt5 kdecoration khotkeys libkscreen libksysguard; + kdecoration khotkeys libkscreen libksysguard bluedevil + breeze-gtk breeze-qt5 breeze-grub breeze-plymouth discover kactivitymanagerd + kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5 kinfocenter kmenuedit + kscreen kscreenlocker ksshaskpass ksysguard kwallet-pam kwayland-integration + kwin kwrited milou oxygen plasma-browser-integration plasma-desktop + plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace + plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm + systemsettings user-manager xdg-desktop-portal-kde + ; + + inherit ((plasma5.override { libsForQt5 = self; }).thirdParty) + plasma-applet-caffeine-plus kwin-dynamic-workspaces kwin-tiling krohnkite + ; ### KDE APPLICATIONS - inherit - (import ../applications/kde { libsForQt5 = self; inherit lib fetchurl; }) - akonadi-calendar akonadi-contacts akonadi-import-wizard akonadi-mime - akonadi-notes akonadi-search baloo-widgets calendarsupport eventviews - grantleetheme incidenceeditor kalarmcal kcalutils kdegraphics-mobipocket - kdepim-addons kdepim-apps-libs kdepim-runtime kidentitymanagement kimap - kipi-plugins kitinerary kldap kmail-account-wizard kmailtransport kmbox - kmime kontactinterface kpimtextedit kpkpass kqtquickcharts ksmtp ktnef - libgravatar libkcddb libkdcraw libkdegames libkdepim libkexiv2 libkgapi - libkipi libkleo libkmahjongg libkomparediff2 libksane libksieve mailcommon - mailimporter marble messagelib pim-sieve-editor pimcommon - kdegraphics-thumbnailers kio-extras print-manager; + inherit (kdeApplications.override { libsForQt5 = self; }) + libkdcraw libkexiv2 libkipi libkomparediff2 libksane libkcddb akonadi-contacts + akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface + kldap akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight + granatier gwenview k3b kaddressbook kalzium kapptemplate kapman kate katomic + kblackbox kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser + kdenlive kdf kdialog kdiamond keditbookmarks kfind kfloppy kget kgpg khelpcenter + kig kigo killbots kitinerary kleopatra klettres klines kmag kmail kmines kmix kmplot + knavalbattle knetwalk knights kollision kolourpaint kompare konsole kontact korganizer + kpkpass krdc kreversi krfb kshisen ksquares ksystemlog kteatime ktimer ktouch kturtle + kwalletmanager kwave marble minuet okular picmi spectacle yakuake + ; ### LIBRARIES @@ -14924,6 +14931,8 @@ in dxflib = callPackage ../development/libraries/dxflib {}; + drumstick = callPackage ../development/libraries/drumstick { }; + fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; qgpgme = callPackage ../development/libraries/gpgme { }; @@ -14936,6 +14945,8 @@ in kdsoap = callPackage ../development/libraries/kdsoap { }; + kf5gpgmepp = callPackage ../development/libraries/kf5gpgmepp { }; + kproperty = callPackage ../development/libraries/kproperty { }; kpeoplevcard = callPackage ../development/libraries/kpeoplevcard { }; @@ -14954,6 +14965,8 @@ in libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { }; + packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { }; + libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { }; libqglviewer = callPackage ../development/libraries/libqglviewer { @@ -15024,6 +15037,9 @@ in qtwebkit-plugins = callPackage ../development/libraries/qtwebkit-plugins { }; + # Not a library, but we do want it to be built for every qt version there + # is, to allow users to choose the right build if needed. + sddm = callPackage ../applications/display-managers/sddm { }; }; qtEnv = qt5.env; @@ -18651,8 +18667,6 @@ in brise = callPackage ../data/misc/brise { }; - inherit (kdeFrameworks) breeze-icons; - cacert = callPackage ../data/misc/cacert { }; caladea = callPackage ../data/fonts/caladea {}; @@ -18818,7 +18832,9 @@ in fira-mono = callPackage ../data/fonts/fira-mono { }; - flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme { }; + flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme { + inherit (kdeFrameworks) breeze-icons; + }; font-awesome_4 = (callPackage ../data/fonts/font-awesome-5 { }).v4; font-awesome_5 = (callPackage ../data/fonts/font-awesome-5 { }).v5; @@ -18973,9 +18989,11 @@ in luculent = callPackage ../data/fonts/luculent { }; - luna-icons = callPackage ../data/icons/luna-icons { }; + luna-icons = callPackage ../data/icons/luna-icons { + inherit (kdeFrameworks) breeze-icons; + }; - maia-icon-theme = callPackage ../data/icons/maia-icon-theme { }; + maia-icon-theme = libsForQt5.callPackage ../data/icons/maia-icon-theme { }; mailcap = callPackage ../data/misc/mailcap { }; @@ -19088,15 +19106,17 @@ in oxygenfonts = callPackage ../data/fonts/oxygenfonts { }; - inherit (kdeFrameworks) oxygen-icons5; - paper-gtk-theme = callPackage ../data/themes/paper-gtk { }; paper-icon-theme = callPackage ../data/icons/paper-icon-theme { }; - papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme { }; + papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme { + inherit (kdeFrameworks) breeze-icons; + }; - papirus-maia-icon-theme = callPackage ../data/icons/papirus-maia-icon-theme { }; + papirus-maia-icon-theme = callPackage ../data/icons/papirus-maia-icon-theme { + inherit (kdeFrameworks) breeze-icons; + }; papis = with python3Packages; toPythonApplication papis; @@ -19126,7 +19146,9 @@ in pop-gtk-theme = callPackage ../data/themes/pop-gtk { }; - pop-icon-theme = callPackage ../data/icons/pop-icon-theme { }; + pop-icon-theme = callPackage ../data/icons/pop-icon-theme { + inherit (kdeFrameworks) breeze-icons; + }; posix_man_pages = callPackage ../data/documentation/man-pages-posix { }; @@ -19404,7 +19426,9 @@ in yaru-theme = callPackage ../data/themes/yaru {}; - zafiro-icons = callPackage ../data/icons/zafiro-icons { }; + zafiro-icons = callPackage ../data/icons/zafiro-icons { + inherit (kdeFrameworks) breeze-icons; + }; zeal = libsForQt514.callPackage ../data/documentation/zeal { }; @@ -19782,7 +19806,11 @@ in calligra = libsForQt514.callPackage ../applications/office/calligra { openjpeg = openjpeg_1; - poppler = poppler_0_61; + poppler = poppler_0_61.override { + qt5Support = true; + # Must be using the same qt version as calligra itself. + qtbase = qt514.qtbase; + }; }; perkeep = callPackage ../applications/misc/perkeep { }; @@ -21347,99 +21375,18 @@ in kdeApplications = let - forQt512 = - import ../applications/kde { - libsForQt5 = libsForQt512; - inherit lib fetchurl; - }; - forQt515 = - import ../applications/kde { - libsForQt5 = libsForQt515; - inherit lib fetchurl; - }; - default = { - inherit (forQt512) - ark - bomber bovo - dolphin dolphin-plugins dragon - ffmpegthumbs filelight - granatier gwenview - k3b - kalzium kapptemplate kapman kate katomic - kblackbox kblocks kbounce - kcachegrind kcalc kcharselect kcolorchooser - kdenetwork-filesharing kdenlive kdf kdialog kdiamond - keditbookmarks - kfind kfloppy - kget - khelpcenter - kig kigo killbots - klettres klines - kmag kmines kmix kmplot - knavalbattle knetwalk knights - kollision kolourpaint kompare konsole - kpat - krdc kreversi krfb - kshisen ksquares ksystemlog - kteatime ktimer ktouch kturtle - kwalletmanager - marble - okular - picmi - spectacle - yakuake; - }; - overrides = { - inherit (forQt515) - akonadi akregator elisa kaddressbook kgpg kitinerary kleopatra kmail - kontact korganizer kpkpass kwave minuet; - }; - compat = { - # Okteta was removed from kde applications and will now be released independently - # Lets keep an alias for compatibility reasons - inherit okteta; + mkApplications = import ../applications/kde; + attrs = { + inherit libsForQt5; + inherit lib fetchurl; }; in - default // overrides // compat; - - inherit (kdeApplications) - akonadi akregator ark - bomber bovo - dolphin dragon - elisa - ffmpegthumbs filelight - granatier gwenview - k3b - kaddressbook kalzium kapptemplate kapman kate katomic - kblackbox kblocks kbounce - kcachegrind kcalc kcharselect kcolorchooser - kdenetwork-filesharing kdenlive kdf kdialog kdiamond - keditbookmarks - kfind kfloppy - kget kgpg - khelpcenter - kig kigo killbots kitinerary - kleopatra klettres klines - kmag kmail kmines kmix kmplot - knavalbattle knetwalk knights - kollision kolourpaint kompare konsole kontact korganizer - kpkpass - krdc kreversi krfb - kshisen ksquares ksystemlog - kteatime ktimer ktouch kturtle - kwalletmanager kwave - marble minuet - okular - picmi - spectacle - yakuake; + recurseIntoAttrs (makeOverridable mkApplications attrs); okteta = libsForQt5.callPackage ../applications/editors/okteta { }; k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; - kdeconnect = libsForQt512.callPackage ../applications/misc/kdeconnect { }; - inherit (kdeFrameworks) kdesu; kdevelop-pg-qt = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; @@ -21479,7 +21426,7 @@ in kid3 = libsForQt5.callPackage ../applications/audio/kid3 { }; - kile = libsForQt512.callPackage ../applications/editors/kile { }; + kile = libsForQt5.callPackage ../applications/editors/kile { }; kino = callPackage ../applications/video/kino { inherit (gnome2) libglade; @@ -21499,7 +21446,7 @@ in kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { }; - kmymoney = libsForQt514.callPackage ../applications/office/kmymoney { }; + kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { }; kodestudio = callPackage ../applications/editors/kodestudio { }; @@ -23189,8 +23136,6 @@ in robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { }; - sddm = libsForQt512.callPackage ../applications/display-managers/sddm { }; - skrooge = libsForQt514.callPackage ../applications/office/skrooge {}; smartgithg = callPackage ../applications/version-management/smartgithg { @@ -25585,6 +25530,8 @@ in lumina = recurseIntoAttrs (callPackage ../desktops/lumina { }); lxqt = recurseIntoAttrs (import ../desktops/lxqt { + # TODO: Update these to qt515 at some point. When doing it, please remove + # the choice of libsForQt5*.sddm in sddm's module. qt5 = qt514; libsForQt5 = libsForQt514; inherit pkgs; @@ -25623,7 +25570,7 @@ in let mkPlasma5 = import ../desktops/plasma-5; attrs = { - libsForQt5 = libsForQt512; + inherit libsForQt5; inherit lib fetchurl; gconf = gnome2.GConf; inherit gsettings-desktop-schemas; @@ -25631,25 +25578,6 @@ in in recurseIntoAttrs (makeOverridable mkPlasma5 attrs); - inherit (kdeFrameworks) kded kinit frameworkintegration; - - inherit (plasma5) - bluedevil breeze-gtk breeze-qt5 breeze-grub breeze-plymouth discover - kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5 - kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard - kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-browser-integration - plasma-desktop plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace - plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm - systemsettings user-manager xdg-desktop-portal-kde; - - inherit (plasma5.thirdParty) - plasma-applet-caffeine-plus - kwin-dynamic-workspaces - kwin-tiling - krohnkite; - - ### SCIENCE - ### SCIENCE/CHEMISTY avogadro = callPackage ../applications/science/chemistry/avogadro {