Merge pull request #221733 from K900/kde-gear-23.04

KDE Gear: 22.12 -> 23.04
2023-04-20 13:09:42 +03:00
parent 1dac98952e e61a9650ee
commit cd620704a3
80 changed files with 1478 additions and 1171 deletions
@@ -429,7 +429,8 @@ in
            dolphin-plugins
            ffmpegthumbs
            kdegraphics-thumbnailers
-            pkgs.kio-admin
+            kde-inotify-survey
+            kio-admin
            kio-extras
          ];
          optionalPackages = [
@@ -1,43 +0,0 @@
-{ lib
-, stdenv
-, mkDerivation
-, fetchFromGitHub
-, qmake
-, pkg-config
-, qttools
-, qtwebengine
-, hunspell
-, cmark
-, multimarkdown
-, pandoc
-}:
-
-mkDerivation rec {
-  pname = "ghostwriter";
-  version = "2.2.0";
-
-  src = fetchFromGitHub {
-    owner = "KDE";
-    repo = pname;
-    rev = version;
-    hash = "sha256-8JtCO5jrkbZ4uEM7SALg64L4HSzdzzh7r1pldxzaXeI=";
-  };
-
-  nativeBuildInputs = [ qmake pkg-config qttools ];
-
-  buildInputs = [ qtwebengine hunspell ];
-
-  qtWrapperArgs = [
-    "--prefix" "PATH" ":" (lib.makeBinPath [ cmark multimarkdown pandoc ])
-  ];
-
-  meta = with lib; {
-    description = "A cross-platform, aesthetic, distraction-free Markdown editor";
-    homepage = "https://kde.github.io/ghostwriter";
-    changelog = "https://github.com/KDE/ghostwriter/blob/${src.rev}/CHANGELOG.md";
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ dotlambda erictapen ];
-    broken = stdenv.isDarwin;
-  };
-}
@@ -17,4 +17,8 @@ mkDerivation {
    kio kmailtransport
  ];
  outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
@@ -22,4 +22,8 @@ mkDerivation {
  ];
  propagatedBuildInputs = [ akonadi grantleetheme ];
  outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
@@ -13,4 +13,8 @@ mkDerivation {
  nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
  buildInputs = [ akonadi kdbusaddons ki18n kio kitemmodels kmime ];
  outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
@@ -15,4 +15,8 @@ mkDerivation {
    akonadi kcompletion ki18n kitemmodels kmime kxmlgui
  ];
  outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
@@ -17,4 +17,8 @@ mkDerivation {
    akonadi akonadi-mime kcalendarcore kcontacts kcoreaddons kmime qtbase
  ];
  outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
@@ -5,7 +5,7 @@ Subject: [PATCH 3/3] akonadi revert make relocatable

 ---
 CMakeLists.txt            | 3 ---
- KF5AkonadiConfig.cmake.in | 6 +++---
+ KPimAkonadiConfig.cmake.in | 6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)

 diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,8 +13,8 @@ index 4e8cc81..63161b7 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
@@ -368,9 +368,6 @@ configure_package_config_file(
-     "${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in"
-     "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake"
+     "${CMAKE_CURRENT_SOURCE_DIR}/KPimAkonadiConfig.cmake.in"
+     "${CMAKE_CURRENT_BINARY_DIR}/KPimAkonadiConfig.cmake"
     INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
 -    PATH_VARS AKONADI_DBUS_INTERFACES_INSTALL_DIR
 -              AKONADI_INCLUDE_DIR
@@ -22,10 +22,10 @@ index 4e8cc81..63161b7 100644
 )
 
 install(FILES
-diff --git a/KF5AkonadiConfig.cmake.in b/KF5AkonadiConfig.cmake.in
+diff --git a/KPimAkonadiConfig.cmake.in b/KPimAkonadiConfig.cmake.in
 index bcf7320..1574319 100644
--- a/KF5AkonadiConfig.cmake.in
-+++ b/KF5AkonadiConfig.cmake.in
+--- a/KPimAkonadiConfig.cmake.in
+++ b/KPimAkonadiConfig.cmake.in
@@ -1,10 +1,10 @@
 @PACKAGE_INIT@
 
@@ -44,10 +44,8 @@ mkDerivation {

  cmakeFlags = lib.optional (defaultDriver != "MYSQL") "-DDATABASE_BACKEND=${defaultDriver}";

-  # compatibility symlinks for kmymoney, can probably be removed in next kde bump
  postInstall = ''
-    ln -s $dev/include/KF5/AkonadiCore/Akonadi/Collection $dev/include/KF5/AkonadiCore/Collection
-    ln -s $dev/include/KF5/AkonadiCore/Akonadi/ItemFetchScope $dev/include/KF5/AkonadiCore/ItemFetchScope
-    ln -s $dev/include/KF5/AkonadiCore/Akonadi/RecursiveItemFetchJob $dev/include/KF5/AkonadiCore/RecursiveItemFetchJob
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
  '';
 }
@@ -3,7 +3,6 @@
 , cmake
 , corrosion
 , extra-cmake-modules
-, gcc12
 , kconfig
 , kcoreaddons
 , kdbusaddons
@@ -15,13 +14,14 @@
 , kwindowsystem
 , qtfeedback
 , qtquickcontrols2
+, qqc2-desktop-style
 , qtwebengine
 , rustPlatform
 , srcs

 # These must be updated in tandem with package updates.
-, cargoShaForVersion ? "23.01.0"
-, cargoSha256 ? "sha256-dIXA875HsG56baHrTWw9L560n4s0wRv6Ag/2oj1x0gk="
+, cargoShaForVersion ? "23.03.80"
+, cargoSha256 ? "sha256-nXWQNXVlPWRQdDPXR5NsHJR6kaLxV7UxPC0OIubH/4c="
 }:

 # Guard against incomplete updates.
@@ -46,7 +46,6 @@ mkDerivation rec {
    cmake
    corrosion
    extra-cmake-modules
-    gcc12 # doesn't build with GCC 9 from stdenv on aarch64
  ] ++ (with rustPlatform; [
    cargoSetupHook
    rust.cargo
@@ -65,6 +64,7 @@ mkDerivation rec {
    kwindowsystem
    qtfeedback
    qtquickcontrols2
+    qqc2-desktop-style
    qtwebengine
  ];

@@ -2,7 +2,6 @@
 , mkDerivation

 , extra-cmake-modules
-, gcc12
 , wrapGAppsHook

 , gst_all_1
@@ -10,6 +9,7 @@
 , kcrash
 , ki18n
 , kirigami2
+, kirigami-addons
 , qtimageformats
 , qtmultimedia
 , qtquickcontrols2
@@ -22,7 +22,6 @@ mkDerivation rec {
  nativeBuildInputs = [
    extra-cmake-modules
    wrapGAppsHook
-    gcc12 # doesn't build with GCC 9 from stdenv on aarch64
    python3Packages.wrapPython
    python3Packages.pybind11
  ];
@@ -32,6 +31,7 @@ mkDerivation rec {
    kcrash
    ki18n
    kirigami2
+    kirigami-addons
    qtimageformats
    qtmultimedia
    qtquickcontrols2
@@ -17,4 +17,8 @@ mkDerivation {
  ];
  propagatedBuildInputs = [ akonadi-calendar kidentitymanagement kmime ];
  outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
@@ -1,11 +1,11 @@
-{ mkDerivation, lib, fetchurl
+{ mkDerivation, lib
 , extra-cmake-modules, ki18n
 , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils
 , kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem
-, kitemviews, lcms2, libXrandr, qtx11extras
+, kitemmodels, kitemviews, lcms2, libXrandr, qtx11extras
 }:

-mkDerivation rec {
+mkDerivation {
  pname = "colord-kde";

  nativeBuildInputs = [ extra-cmake-modules ];
@@ -13,7 +13,7 @@ mkDerivation rec {
  buildInputs = [
    kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes
    kcmutils ki18n kio knotifications plasma-framework kwidgetsaddons
-    kwindowsystem kitemviews lcms2 libXrandr qtx11extras
+    kwindowsystem kitemmodels kitemviews lcms2 libXrandr qtx11extras
  ];

  meta = with lib; {
@@ -86,6 +86,7 @@ let
      falkon = callPackage ./falkon.nix {};
      ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
      filelight = callPackage ./filelight.nix {};
+      ghostwriter = callPackage ./ghostwriter.nix {};
      granatier = callPackage ./granatier.nix {};
      grantleetheme = callPackage ./grantleetheme {};
      gwenview = callPackage ./gwenview.nix {};
@@ -112,6 +113,7 @@ let
      kcalutils = callPackage ./kcalutils.nix {};
      kcharselect = callPackage ./kcharselect.nix {};
      kcolorchooser = callPackage ./kcolorchooser.nix {};
+      kde-inotify-survey = callPackage ./kde-inotify-survey.nix {};
      kdebugsettings = callPackage ./kdebugsettings.nix {};
      kdeconnect-kde = callPackage ./kdeconnect-kde.nix {};
      kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
@@ -140,6 +142,7 @@ let
      kigo = callPackage ./kigo.nix {};
      killbots = callPackage ./killbots.nix {};
      kimap = callPackage ./kimap.nix {};
+      kio-admin = callPackage ./kio-admin.nix {};
      kio-extras = callPackage ./kio-extras.nix {};
      kio-gdrive = callPackage ./kio-gdrive.nix {};
      kipi-plugins = callPackage ./kipi-plugins.nix {};
@@ -233,6 +236,26 @@ let
      umbrello = callPackage ./umbrello.nix {};
      yakuake = callPackage ./yakuake.nix {};
      zanshin = callPackage ./zanshin.nix {};
+
+      # Plasma Mobile Gear
+      alligator = callPackage ./alligator.nix {};
+      angelfish = callPackage ./angelfish.nix { inherit srcs; };
+      audiotube = callPackage ./audiotube.nix {};
+      calindori = callPackage ./calindori.nix {};
+      kalk = callPackage ./kalk.nix {};
+      kasts = callPackage ./kasts.nix {};
+      kclock = callPackage ./kclock.nix {};
+      keysmith = callPackage ./keysmith.nix {};
+      koko = callPackage ./koko.nix {};
+      kongress = callPackage ./kongress.nix {};
+      krecorder = callPackage ./krecorder.nix {};
+      ktrip = callPackage ./ktrip.nix {};
+      kweather = callPackage ./kweather.nix {};
+      neochat = callPackage ./neochat.nix {};
+      plasmatube = callPackage ./plasmatube {};
+      qmlkonsole = callPackage ./qmlkonsole.nix {};
+      telly-skout = callPackage ./telly-skout.nix {};
+      tokodon = callPackage ./tokodon.nix {};
    };

 in lib.makeScope libsForQt5.newScope packages
@@ -5,8 +5,7 @@
  kcompletion, kconfig, kcoreaddons, kdbusaddons,
  kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications,
  kparts, ktexteditor, kwindowsystem, phonon, solid,
-  kuserfeedback,
-  wayland, qtwayland
+  kuserfeedback, wayland, qtwayland, qtx11extras
 }:

 mkDerivation {
@@ -26,6 +25,7 @@ mkDerivation {
    phonon solid
    kuserfeedback
    wayland qtwayland
+    qtx11extras
  ];
  outputs = [ "out" "dev" ];
 }
@@ -17,4 +17,8 @@ mkDerivation {
    libkdepim qtbase qttools kholidays
  ];
  outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/release-service/22.12.3/src -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/release-service/23.04.0/src -A '*.tar.xz' )
@@ -0,0 +1,41 @@
+{ lib
+, mkDerivation
+, extra-cmake-modules
+, qttools
+, qtwebengine
+, kcoreaddons
+, kconfigwidgets
+, sonnet
+, kxmlgui
+, hunspell
+, cmark
+, multimarkdown
+, pandoc
+}:
+
+mkDerivation {
+  pname = "ghostwriter";
+
+  nativeBuildInputs = [ extra-cmake-modules qttools ];
+
+  buildInputs = [
+    qtwebengine
+    hunspell
+    kcoreaddons
+    kconfigwidgets
+    sonnet
+    kxmlgui
+  ];
+
+  qtWrapperArgs = [
+    "--prefix" "PATH" ":" (lib.makeBinPath [ cmark multimarkdown pandoc ])
+  ];
+
+  meta = with lib; {
+    description = "A cross-platform, aesthetic, distraction-free Markdown editor";
+    homepage = "https://ghostwriter.kde.org/";
+    changelog = "https://invent.kde.org/office/ghostwriter/-/blob/master/CHANGELOG.md";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ dotlambda erictapen ];
+  };
+}
@@ -16,4 +16,8 @@ mkDerivation {
    grantlee ki18n kiconthemes knewstuff kservice kxmlgui qtbase
  ];
  propagatedBuildInputs = [ grantlee kiconthemes knewstuff ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
@@ -3,7 +3,8 @@
  extra-cmake-modules, kdoctools,
  exiv2, lcms2, cfitsio,
  baloo, kactivities, kio, kipi-plugins, kitemmodels, kparts, libkdcraw, libkipi,
-  phonon, qtimageformats, qtsvg, qtx11extras, kinit, kpurpose, kcolorpicker, kimageannotator
+  phonon, qtimageformats, qtsvg, qtx11extras, kinit, kpurpose, kcolorpicker, kimageannotator,
+  wayland, wayland-protocols
 }:

 mkDerivation {
@@ -19,6 +20,7 @@ mkDerivation {
    baloo kactivities kio kitemmodels kparts libkdcraw libkipi phonon
    exiv2 lcms2 cfitsio
    qtimageformats qtsvg qtx11extras kpurpose kcolorpicker kimageannotator
+    wayland wayland-protocols
  ];
  propagatedUserEnvPkgs = [ kipi-plugins libkipi (lib.getBin kinit) ];
 }
@@ -17,4 +17,8 @@ mkDerivation {
    kldap kmime pimcommon qtbase
  ];
  outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, extra-cmake-modules, kdoctools, kcmutils, kcoreaddons, kwallet, accounts-qt, signond }:
+{ mkDerivation, lib, extra-cmake-modules, kdoctools, kcmutils, kcoreaddons, kwallet, accounts-qt, signond, qcoro }:

 mkDerivation {
  pname = "kaccounts-integration";
@@ -19,5 +19,6 @@ mkDerivation {
    kwallet
    accounts-qt
    signond
+    qcoro
  ];
 }
@@ -4,8 +4,7 @@
  kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n,
  kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole,
  kparts, ktexteditor, kwindowsystem, kwallet, kxmlgui, libgit2,
-  kuserfeedback,
-  plasma-framework, qtscript, threadweaver
+  kuserfeedback, plasma-framework, qtscript, threadweaver, qtx11extras
 }:

 mkDerivation {
@@ -33,8 +32,7 @@ mkDerivation {
    kactivities ki18n kio ktexteditor kwindowsystem plasma-framework
    qtscript kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts
    kxmlgui kdbusaddons kwallet kitemmodels knotifications threadweaver
-    knewstuff
-    kuserfeedback
+    knewstuff kuserfeedback qtx11extras
  ];
  propagatedUserEnvPkgs = [ konsole ];
 }
@@ -17,4 +17,8 @@ mkDerivation {
    kidentitymanagement kpimtextedit
  ];
  outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
@@ -0,0 +1,30 @@
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, kauth
+, kcoreaddons
+, kdbusaddons
+, ki18n
+, knotifications
+}:
+
+mkDerivation {
+  pname = "kde-inotify-survey";
+
+  nativeBuildInputs = [ extra-cmake-modules ];
+
+  buildInputs = [
+    kauth
+    kcoreaddons
+    kdbusaddons
+    ki18n
+    knotifications
+  ];
+
+  meta = {
+    description = "Tooling for monitoring inotify limits and informing the user when they have been or about to be reached";
+    homepage = "https://invent.kde.org/system/kde-inotify-survey";
+    license = lib.licenses.gpl2Plus;
+    maintainers = [];
+  };
+}
@@ -2,7 +2,7 @@
  mkDerivation, lib,
  extra-cmake-modules, kdoctools,
  gettext,
-  kcoreaddons, kconfig, kdbusaddons, kwidgetsaddons, kitemviews, kcompletion,
+  kcoreaddons, kconfig, kdbusaddons, kwidgetsaddons, kitemviews, kcompletion, kxmlgui,
  python3
 }:

@@ -16,7 +16,7 @@ mkDerivation {
  };
  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
  buildInputs = [
-    gettext kcoreaddons kconfig kdbusaddons kwidgetsaddons kitemviews kcompletion python3
+    gettext kcoreaddons kconfig kdbusaddons kwidgetsaddons kitemviews kcompletion kxmlgui python3
  ];
  propagatedUserEnvPkgs = [ ];
 }
@@ -16,6 +16,7 @@
 , libXtst
 , libfakekey
 , makeWrapper
+, modemmanager-qt
 , pulseaudio-qt
 , qca-qt5
 , qqc2-desktop-style
@@ -26,6 +27,7 @@
 , breeze-icons
 , sshfs
 , wayland
+, wayland-protocols
 , wayland-scanner
 , plasma-wayland-protocols
 }:
@@ -47,6 +49,7 @@ mkDerivation {
    kwayland
    libXtst
    libfakekey
+    modemmanager-qt
    pulseaudio-qt
    qca-qt5
    qqc2-desktop-style
@@ -55,6 +58,7 @@ mkDerivation {
    qtquickcontrols2
    qtx11extras
    wayland
+    wayland-protocols
    wayland-scanner
    plasma-wayland-protocols
    # otherwise buttons are blank on non-kde
@@ -1,7 +1,7 @@
 {
  mkDerivation, lib,
  extra-cmake-modules, kdoctools,
-  kcoreaddons, kdeclarative, ki18n, kio, kwidgetsaddons, samba,
+  kcoreaddons, kdeclarative, ki18n, kio, kwidgetsaddons, samba, qcoro
 }:

 mkDerivation {
@@ -11,5 +11,5 @@ mkDerivation {
    maintainers = [ lib.maintainers.ttuegel ];
  };
  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ kcoreaddons kdeclarative ki18n kio kwidgetsaddons samba ];
+  buildInputs = [ kcoreaddons kdeclarative ki18n kio kwidgetsaddons samba qcoro ];
 }
@@ -17,4 +17,8 @@ mkDerivation {
  ];
  propagatedBuildInputs = [ kcoreaddons kpimtextedit ];
  outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
@@ -1,7 +1,7 @@
 {
  mkDerivation, lib, kdepimTeam,
  extra-cmake-modules, kdoctools,
-  cyrus_sasl, kcoreaddons, ki18n, kio, kmime
+  cyrus_sasl, kcoreaddons, ki18n, kio, kmime, kitemmodels
 }:

 mkDerivation {
@@ -12,6 +12,10 @@ mkDerivation {
  };
  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
  buildInputs = [ ki18n kio ];
-  propagatedBuildInputs = [ cyrus_sasl kcoreaddons kmime ];
+  propagatedBuildInputs = [ cyrus_sasl kcoreaddons kmime kitemmodels ];
  outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
@@ -0,0 +1,16 @@
+{ mkDerivation, lib, extra-cmake-modules, qtbase, kio, ki18n, polkit-qt }:
+
+mkDerivation {
+  pname = "kio-admin";
+
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtbase kio ki18n polkit-qt ];
+
+  meta = with lib; {
+    description = "Manage files as administrator using the admin:// KIO protocol.";
+    homepage = "https://invent.kde.org/system/kio-admin";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ k900 ];
+  };
+}
@@ -1,7 +1,7 @@
 { mkDerivation, lib, extra-cmake-modules
 , qtdeclarative, ki18n, kmime, kpkpass
 , poppler, kcontacts, kcalendarcore
-, shared-mime-info
+, shared-mime-info, zxing-cpp
 }:

 mkDerivation {
@@ -16,11 +16,7 @@ mkDerivation {
  ];
  buildInputs = [
    qtdeclarative kmime kpkpass poppler
-    kcontacts kcalendarcore
-  ];
-
-  CXXFLAGS = [
-    "-I${lib.getDev ki18n}/include/KF5"  # Fixes: ki18n_version.h: No such file or directory
+    kcontacts kcalendarcore ki18n zxing-cpp
  ];

  outputs = [ "out" "dev" ];
@@ -14,4 +14,8 @@ mkDerivation {
  buildInputs = [ ki18n kio kmbox libsecret qtkeychain ];
  propagatedBuildInputs = [ cyrus_sasl openldap ];
  outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
@@ -2,7 +2,7 @@
  mkDerivation, lib, kdepimTeam,
  extra-cmake-modules, kdoctools,
  boost, gpgme, kcmutils, kdbusaddons, kiconthemes, kitemmodels, kmime,
-  knotifications, kwindowsystem, kxmlgui, libkleo, kcrash
+  knotifications, kwindowsystem, kxmlgui, libkleo, kcrash, kpipewire
 }:

 mkDerivation {
@@ -12,7 +12,7 @@ mkDerivation {

  buildInputs = [
    boost gpgme kcmutils kdbusaddons kiconthemes kitemmodels kmime
-    knotifications kwindowsystem kxmlgui libkleo kcrash
+    knotifications kwindowsystem kxmlgui libkleo kcrash kpipewire
  ];

  meta = {
@@ -19,4 +19,8 @@ mkDerivation {
  ];
  propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ];
  outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
@@ -13,4 +13,8 @@ mkDerivation {
  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
  buildInputs = [ kmime qtbase kcodecs ];
  outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
@@ -13,4 +13,8 @@ mkDerivation {
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [ kcodecs ki18n qtbase ];
  outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
@@ -0,0 +1,36 @@
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, qtquickcontrols2
+, kcalendarcore
+, kconfig
+, kcoreaddons
+, kdbusaddons
+, kirigami2
+, ki18n
+, knotifications
+}:
+
+mkDerivation {
+  pname = "kongress";
+
+  nativeBuildInputs = [ extra-cmake-modules ];
+
+  buildInputs = [
+    qtquickcontrols2
+    kcalendarcore
+    kconfig
+    kcoreaddons
+    kdbusaddons
+    kirigami2
+    ki18n
+    knotifications
+  ];
+
+  meta = {
+    description = "A companion application for conferences";
+    homepage = "https://apps.kde.org/kongress/";
+    license = lib.licenses.gpl3;
+    maintainers = [];
+  };
+}
@@ -4,7 +4,7 @@
  kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons,
  ki18n, kiconthemes, kinit, kio, knotifications,
  knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons,
-  kwindowsystem, kxmlgui, qtscript, knewstuff
+  kwindowsystem, kxmlgui, qtscript, knewstuff, qtmultimedia
 }:

 mkDerivation {
@@ -19,7 +19,7 @@ mkDerivation {
  buildInputs = [
    kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons
    kguiaddons ki18n kiconthemes kinit kio knotifications knotifyconfig kparts kpty
-    kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript knewstuff
+    kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript knewstuff qtmultimedia
  ];

  passthru.tests.test = nixosTests.terminal-emulators.konsole;
@@ -1,7 +1,8 @@
 {
  mkDerivation, lib, kdepimTeam,
  extra-cmake-modules, kdoctools,
-  kiconthemes, kparts, kwindowsystem, kxmlgui
+  kiconthemes, kparts, kwindowsystem, kxmlgui,
+  qtx11extras
 }:

 mkDerivation {
@@ -12,7 +13,11 @@ mkDerivation {
  };
  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
  buildInputs = [
-    kiconthemes kwindowsystem kxmlgui
+    kiconthemes kwindowsystem kxmlgui qtx11extras
  ];
  propagatedBuildInputs = [ kparts ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$out/include/KF5"
+  '';
 }
@@ -19,4 +19,8 @@ mkDerivation {
  ];
  propagatedBuildInputs = [ ktextwidgets ];
  outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
@@ -1,6 +1,9 @@
 { mkDerivation
 , lib
 , extra-cmake-modules
+, qtquickcontrols2
+, networkmanager-qt
+, ki18n
 }:

 mkDerivation {
@@ -10,4 +13,10 @@ mkDerivation {
    maintainers = [ maintainers.samueldr ];
  };
  nativeBuildInputs = [ extra-cmake-modules ];
+
+  buildInputs = [
+    qtquickcontrols2
+    networkmanager-qt
+    ki18n
+  ];
 }
@@ -1,7 +1,7 @@
 { mkDerivation, lib
 , extra-cmake-modules, kdoctools
 , kconfig, kcoreaddons, kcrash, kdbusaddons, kdnssd, knotifications, kwallet
-, kwidgetsaddons, kwindowsystem, kxmlgui, kwayland
+, kwidgetsaddons, kwindowsystem, kxmlgui, kwayland, kpipewire
 , libvncserver, libXtst, libXdamage
 , qtx11extras, pipewire, plasma-wayland-protocols, wayland
 }:
@@ -18,7 +18,7 @@ mkDerivation {
  buildInputs = [
    libvncserver libXtst libXdamage
    kconfig kcoreaddons kcrash kdbusaddons knotifications kwallet kwidgetsaddons
-    kwindowsystem kxmlgui kwayland
+    kwindowsystem kxmlgui kwayland kpipewire
    qtx11extras
    pipewire
    plasma-wayland-protocols
@@ -1,25 +0,0 @@
-From 749769232e7387ec8c8f2d3da845d8a6ae7d5977 Mon Sep 17 00:00:00 2001
-From: gnidorah <gnidorah@users.noreply.github.com>
-Date: Fri, 22 Dec 2017 19:32:47 +0300
-Subject: [PATCH] Use KDE_INSTALL_TARGETS_DEFAULT_ARGS when installing targets
-
---
- src/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 83c2bcb..5f6d47c 100644
--- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -51,7 +51,7 @@ ecm_generate_headers(KSMTP_CamelCase_HEADERS
-     REQUIRED_HEADERS KSMTP_HEADERS
- )
- 
-install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS})
-+install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
- 
- install(FILES
-     ${CMAKE_CURRENT_BINARY_DIR}/ksmtp_export.h
-- 
-2.15.1
-
@@ -13,5 +13,8 @@ mkDerivation {
  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
  buildInputs = [ kcoreaddons kio kmime ];
  propagatedBuildInputs = [ cyrus_sasl ];
-  patches = [ ./0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$out/include/KF5"
+  '';
 }
@@ -15,4 +15,8 @@ mkDerivation {
    kcalendarcore kcalutils kcontacts
  ];
  outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
@@ -15,4 +15,8 @@ mkDerivation {
    kconfig kio ktextwidgets kwidgetsaddons pimcommon
  ];
  outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
@@ -1,5 +1,5 @@
 { mkDerivation, lib, extra-cmake-modules, qtbase, kdoctools
-, kcodecs, ki18n, kio, kwidgetsaddons
+, kcodecs, ki18n, kio, kwidgetsaddons, kcmutils
 , libmusicbrainz5 }:

 mkDerivation {
@@ -9,7 +9,7 @@ mkDerivation {
    maintainers = with maintainers; [ peterhoeg ];
  };
  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ qtbase ];
+  buildInputs = [ qtbase kcmutils ];
  propagatedBuildInputs = [
    kcodecs ki18n kio kwidgetsaddons
    libmusicbrainz5
@@ -18,4 +18,8 @@ mkDerivation {
    kconfigwidgets kcontacts ki18n kiconthemes kio kitemviews kjobwidgets kldap
    kwallet
  ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$out/include/KF5"
+  '';
 }
@@ -18,4 +18,8 @@ mkDerivation {
  ];
  propagatedBuildInputs = [ qgpgme ];
  outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
@@ -19,4 +19,8 @@ mkDerivation {
    kwindowsystem mailimporter messagelib phonon libkdepim
  ];
  outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
@@ -16,4 +16,8 @@ mkDerivation {
    akonadi akonadi-mime karchive kcompletion kconfig kcoreaddons ki18n kmime
    kxmlgui libkdepim pimcommon
  ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$out/include/KF5"
+  '';
 }
@@ -26,4 +26,8 @@ mkDerivation {
    qtwebengine
  ];
  outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
@@ -1,6 +1,5 @@
-{ gcc12Stdenv
+{ mkDerivation
 , lib
-, srcs

 , cmake
 , extra-cmake-modules
@@ -30,10 +29,8 @@
 , sonnet
 }:

-# Workaround for AArch64 not using GCC11 yet.
-gcc12Stdenv.mkDerivation rec {
+mkDerivation {
  pname = "neochat";
-  inherit (srcs.neochat) version src;

  nativeBuildInputs = [
    cmake
@@ -5,7 +5,7 @@
 , kdbusaddons, kdegraphics-mobipocket, kiconthemes, kjs, khtml, kio, kparts
 , kpty, kpurpose, kwallet, kwindowsystem, libkexiv2, libspectre, libzip, phonon, poppler
 , qca-qt5, qtdeclarative, qtsvg, threadweaver, kcrash
-, withSpeech ? true, qtspeech
+, withSpeech ? true, qtspeech, qtx11extras
 }:

 mkDerivation {
@@ -18,7 +18,7 @@ mkDerivation {
    kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons
    kdegraphics-mobipocket kiconthemes kjs khtml kio kparts kpty kpurpose kwallet
    kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5
-    qtdeclarative qtsvg threadweaver kcrash chmlib
+    qtdeclarative qtsvg threadweaver kcrash chmlib qtx11extras
  ] ++ lib.optional withSpeech qtspeech;

  # InitialPreference values are too high and end up making okular
@@ -4,7 +4,7 @@
  akonadi, akonadi-contacts, akonadi-mime, akonadi-search, grantlee, karchive, kcmutils, kcodecs,
  kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons,
  kiconthemes, kimap, kio, kitemmodels, kjobwidgets, kldap, knewstuff, kpimtextedit,
-  kpurpose, kwallet, kwindowsystem, libkdepim, qtwebengine
+  kpurpose, kwallet, kwindowsystem, libkdepim, qtwebengine, ktextaddons
 }:

 mkDerivation {
@@ -17,7 +17,7 @@ mkDerivation {
  buildInputs = [
    akonadi-mime grantlee karchive kcmutils kcodecs kcompletion kconfigwidgets
    kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kldap
-    kpurpose kwallet kwindowsystem libkdepim qtwebengine
+    kpurpose kwallet kwindowsystem libkdepim qtwebengine ktextaddons
  ];
  propagatedBuildInputs = [
    akonadi akonadi-contacts akonadi-search kconfig kcontacts kimap kpimtextedit
@@ -11,7 +11,6 @@
 , mpv
 , qtmultimedia
 , qtquickcontrols2
-, yt-dlp
 }:

 mkDerivation {
@@ -37,15 +36,6 @@ mkDerivation {
    gstreamer
  ]);

-  patches = [
-    ./0001-Add-placeholders-for-runtime-dependencies.patch
-  ];
-
-  postPatch = ''
-    substituteInPlace src/videomodel.cpp \
-      --replace "@yt-dlp@" "${yt-dlp}/bin/yt-dlp"
-  '';
-
  preFixup = ''
    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
  '';
@@ -4,6 +4,7 @@
 , kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins
 , knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi
 , qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator
+, qcoro, qtquickcontrols2, wayland, plasma-wayland-protocols, kpurpose, kpipewire
 }:

 mkDerivation {
@@ -12,7 +13,8 @@ mkDerivation {
  buildInputs = [
    kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
    kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor
-    knewstuff kwayland kcolorpicker kimageannotator
+    knewstuff kwayland kcolorpicker kimageannotator qcoro qtquickcontrols2
+    wayland plasma-wayland-protocols kpurpose kpipewire
  ];
  postPatch = ''
    substituteInPlace desktop/org.kde.spectacle.desktop.cmake \
@@ -0,0 +1,24 @@
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, qtquickcontrols2
+, kcoreaddons
+, kconfig
+, ki18n
+, kirigami2
+}:
+
+mkDerivation {
+  pname = "telly-skout";
+
+  nativeBuildInputs = [ extra-cmake-modules ];
+
+  buildInputs = [ qtquickcontrols2 kcoreaddons kconfig ki18n kirigami2 ];
+
+  meta = {
+    description = "A convergent Kirigami TV guide";
+    homepage = "https://apps.kde.org/telly-skout/";
+    license = lib.licenses.gpl2Plus;
+    maintainers = [];
+  };
+}
@@ -11,7 +11,6 @@
 , kirigami2
 , kirigami-addons
 , knotifications
-, libwebsockets
 , qqc2-desktop-style
 , qtbase
 , qtkeychain
@@ -21,29 +20,11 @@
 , qtwebsockets
 , kitemmodels
 , pimcommon
-
-# Workarounds for the point release being missing.
-, libsForQt5
-, fetchFromGitLab
 }:

-# NOTE: we cannot use `mkDerivation` injected by the Plasma Mobile package
-#       set for the point release, as the point release was not uploaded to
-#       the Plasma Mobile gear repo, and the injected `mkDerivation` only can
-#       use the src (and version) from the `srcs` set.
-libsForQt5.mkDerivation rec {
+mkDerivation {
  pname = "tokodon";

-  version = "23.01.0";
-  # NOTE: the tokodon point release was not uploaded to the Plasma Mobile gear repo.
-  src = fetchFromGitLab {
-    domain = "invent.kde.org";
-    owner = "network";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-iJRyKEFdoWtZLZ/nkMvy2S7EF+JRHXi3O0DswfrClDU=";
-  };
-
  nativeBuildInputs = [
    cmake
    extra-cmake-modules
@@ -60,7 +60,7 @@ let
      # libraries
      mauikit = callPackage ./mauikit.nix { };
      mauikit-accounts = callPackage ./mauikit-accounts.nix { };
-      mauikit-calendar = callPackage ./mauikit-calendar.nix { };
+      mauikit-calendar = callPackage ./mauikit-calendar { };
      mauikit-filebrowsing = callPackage ./mauikit-filebrowsing.nix { };
      mauikit-imagetools = callPackage ./mauikit-imagetools.nix { };
      mauikit-texteditor = callPackage ./mauikit-texteditor.nix { };
@@ -0,0 +1,10 @@
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -89,6 +89,7 @@ set_package_properties(Qt5QuickCompiler PROPERTIES
+ find_package(MauiKit)
+
+ find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
+find_package(KF5AkonadiCalendar ${AKONADI_VERSION} CONFIG REQUIRED)
+ find_package(KF5AkonadiContact ${AKONADI_CONTACT_VERSION} CONFIG REQUIRED)
+ find_package(KF5CalendarSupport ${CALENDARSUPPORT_LIB_VERSION} CONFIG REQUIRED)
+ find_package(KF5EventViews ${EVENTVIEW_LIB_VERSION} CONFIG REQUIRED)
@@ -6,6 +6,7 @@
 , qtquickcontrols2
 , akonadi
 , akonadi-contacts
+, akonadi-calendar
 , calendarsupport
 , eventviews
 }:
@@ -13,6 +14,8 @@
 mkDerivation {
  pname = "mauikit-calendar";

+  patches = [ ./add-akonadi-calendar.patch ];
+
  nativeBuildInputs = [
    cmake
    extra-cmake-modules
@@ -21,6 +24,7 @@ mkDerivation {
  buildInputs = [
    akonadi
    akonadi-contacts
+    akonadi-calendar
    calendarsupport
    eventviews
    mauikit
@@ -57,26 +57,10 @@ let
        inherit mkDerivation;
      };
    in {
-      alligator = callPackage ./alligator.nix {};
-      angelfish = callPackage ./angelfish.nix { inherit srcs; };
-      audiotube = callPackage ./audiotube.nix {};
-      calindori = callPackage ./calindori.nix {};
-      kalk = callPackage ./kalk.nix {};
-      kasts = callPackage ./kasts.nix {};
-      kclock = callPackage ./kclock.nix {};
-      keysmith = callPackage ./keysmith.nix {};
-      koko = callPackage ./koko.nix {};
-      krecorder = callPackage ./krecorder.nix {};
-      ktrip = callPackage ./ktrip.nix {};
-      kweather = callPackage ./kweather.nix {};
-      neochat = callPackage ./neochat.nix { inherit srcs; };
      plasma-dialer = callPackage ./plasma-dialer.nix {};
      plasma-phonebook = callPackage ./plasma-phonebook.nix {};
      plasma-settings = callPackage ./plasma-settings.nix {};
-      plasmatube = callPackage ./plasmatube {};
-      qmlkonsole = callPackage ./qmlkonsole.nix {};
      spacebar = callPackage ./spacebar.nix {};
-      tokodon = callPackage ./tokodon.nix {};
    };

 in lib.makeScope libsForQt5.newScope packages
@@ -1,25 +0,0 @@
-From 7a9405ed02b0d86839644a2c237ca7ca8b891b76 Mon Sep 17 00:00:00 2001
-From: Samuel Dionne-Riel <samuel@dionne-riel.com>
-Date: Wed, 30 Nov 2022 21:07:56 -0500
-Subject: [PATCH] Add placeholders for runtime dependencies
-
---
- src/videomodel.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/videomodel.cpp b/src/videomodel.cpp
-index 4bb3451..b558f31 100644
--- a/src/videomodel.cpp
-+++ b/src/videomodel.cpp
-@@ -121,7 +121,7 @@ QString VideoModel::remoteUrl()
-         return {};
-     }
- 
-    QString youtubeDl = QStringLiteral("yt-dlp");
-+    QString youtubeDl = QStringLiteral("@yt-dlp@");
-     QStringList arguments;
-     arguments << QLatin1String("--dump-json")
-               << m_videoId;
-- 
-2.38.0
-
@@ -1,25 +0,0 @@
-{ lib, stdenv, fetchFromGitLab, cmake, extra-cmake-modules, qtbase, wrapQtAppsHook, kio, ki18n, polkit-qt }:
-
-stdenv.mkDerivation rec {
-  pname = "kio-admin";
-  version = "1.0.0";
-
-  src = fetchFromGitLab {
-    domain = "invent.kde.org";
-    owner = "system";
-    repo = "kio-admin";
-    rev = "v${version}";
-    hash = "sha256-llnUsOttqFJVArJdZS9s6qHS9eGbdtdoaPMXKHtsUn4=";
-  };
-
-  nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ];
-  buildInputs = [ qtbase kio ki18n polkit-qt ];
-
-  meta = with lib; {
-    description = "Manage files as administrator using the admin:// KIO protocol.";
-    homepage = "https://invent.kde.org/system/kio-admin";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ k900 ];
-  };
-}
@@ -80,7 +80,7 @@ mapAliases ({
  amuleDaemon = throw "amuleDaemon was renamed to amule-daemon"; # Added 2022-02-11
  amuleGui = throw "amuleGui was renamed to amule-gui"; # Added 2022-02-11
  amsn = throw "amsn has been removed due to being unmaintained"; # Added 2020-12-09
-  angelfish = libsForQt5.plasmaMobileGear.angelfish; # Added 2021-10-06
+  angelfish = libsForQt5.kdeGear.angelfish; # Added 2021-10-06
  ansible_2_11 = throw "Ansible 2.11 goes end of life in 2022/11 and can't be supported throughout the 22.05 release cycle"; # Added 2022-03-30
  ansible_2_10 = throw "Ansible 2.10 went end of life in 2022/05 and has subsequently been dropped"; # Added 2022-03-30
  ansible_2_9 = throw "Ansible 2.9 went end of life in 2022/05 and has subsequently been dropped"; # Added 2022-03-30
@@ -545,6 +545,7 @@ mapAliases ({
  getmail = throw "getmail has been removed from nixpkgs, migrate to getmail6"; # Added 2022-01-12
  gettextWithExpat = throw "'gettextWithExpat' has been renamed to/replaced by 'gettext'"; # Converted to throw 2022-02-22
  gfm = throw "gfm has been removed"; # Added 2021-01-15
+  ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18
  giblib = throw " giblib has been removed from nixpkgs because upstream is gone"; # Added 2022-01-23
  giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # Added 2020-02-12
  git-annex-remote-b2 = throw "git-annex-remote-b2 has been dropped due to the lack of maintanence from upstream since 2016"; # Added 2022-06-02
@@ -781,13 +782,14 @@ mapAliases ({
  kexectools = kexec-tools; # Added 2021-09-03
  kexpand = "kexpand awless has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-01
  keybase-go = throw "'keybase-go' has been renamed to/replaced by 'keybase'"; # Converted to throw 2022-02-22
-  keysmith = libsForQt5.plasmaMobileGear.keysmith; # Added 2021-07-14
+  keysmith = libsForQt5.kdeGear.keysmith; # Added 2021-07-14
  kgx = gnome-console; # Added 2022-02-19
  kibana7-oss = throw "kibana7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09
  kicad-with-packages3d = kicad; # Added 2019-11-25
  kindlegen = throw "kindlegen has been removed from nixpkgs, as it's abandoned and no longer available for download"; # Added 2021-03-09
  kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned"; # Added 2020-04-28
  kino = throw "kino has been removed because it was broken and abandoned"; # Added 2021-04-25
+  kio-admin = libsForQt5.kdeGear.kio-admin; # Added 2023-03-18
  knockknock = throw "knockknock has been removed from nixpkgs because the upstream project is abandoned"; # Added 2022-01-01
  kodestudio = throw "kodestudio has been removed from nixpkgs, as the nix package has been long unmaintained and out of date."; # Added 2022-06-07
  kodiGBM = kodi-gbm;
@@ -1085,7 +1087,7 @@ mapAliases ({
  navit = throw "navit has been removed from nixpkgs, due to being unmaintained"; # Added 2021-06-07
  ncat = throw "'ncat' has been renamed to/replaced by 'nmap'"; # Converted to throw 2022-02-22
  neap = throw "neap was removed from nixpkgs, as it relies on python2"; # Added 2022-01-12
-  neochat = libsForQt5.plasmaMobileGear.neochat; # added 2022-05-10
+  neochat = libsForQt5.kdeGear.neochat; # added 2022-05-10
  netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # Added 2020-08-31
  nettools_mptcp = throw "'nettools_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04
  networkmanager_fortisslvpn = throw "'networkmanager_fortisslvpn' has been renamed to/replaced by 'networkmanager-fortisslvpn'"; # Converted to throw 2022-02-22
@@ -8963,8 +8963,6 @@ with pkgs;

  kibi = callPackage ../applications/editors/kibi { };

-  kio-admin = libsForQt5.callPackage ../tools/filesystems/kio-admin { };
-
  kio-fuse = libsForQt5.callPackage ../tools/filesystems/kio-fuse { };

  kismet = callPackage ../applications/networking/sniffers/kismet { };
@@ -30079,8 +30077,6 @@ with pkgs;

  geoipupdate = callPackage ../applications/misc/geoipupdate { };

-  ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { };
-
  globe-cli = callPackage ../applications/misc/globe-cli { };

  gnss-sdr = callPackage ../applications/radio/gnss-sdr { };