kdePackages: Gear 24.08 -> 24.12

maintainers/scripts/kde/collect-missing-deps.py

@@ -26,6 +26,7 @@ OK_MISSING_BY_PACKAGE = {
         "Python3",  # only used for license checks
     },
     "discover": {
+        "ApkQt",  # we don't have APK (duh)
         "rpm-ostree-1",  # we don't have rpm-ostree (duh)
         "Snapd",  # we don't have snaps and probably never will
         "packagekitqt6",  # intentionally disabled

pkgs/kde/default.nix

@@ -68,7 +68,6 @@ let
         selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub
 
         alpaka = self.callPackage ./misc/alpaka { };
-        calligra = self.callPackage ./misc/calligra { };
         kdiagram = self.callPackage ./misc/kdiagram { };
         kdevelop-pg-qt = self.callPackage ./misc/kdevelop-pg-qt { };
         kdsoap-ws-discovery-client = self.callPackage ./misc/kdsoap-ws-discovery-client { };
@@ -77,7 +76,6 @@ let
         kio-fuse = self.callPackage ./misc/kio-fuse { };
         klevernotes = self.callPackage ./misc/klevernotes { };
         ktextaddons = self.callPackage ./misc/ktextaddons { };
-        kunifiedpush = self.callPackage ./misc/kunifiedpush { };
         kup = self.callPackage ./misc/kup { };
         marknote = self.callPackage ./misc/marknote { };
         mpvqt = self.callPackage ./misc/mpvqt { };

pkgs/kde/gear/akonadi-notes/default.nix

@@ -1,4 +0,0 @@
-{ mkKdeDerivation }:
-mkKdeDerivation {
-  pname = "akonadi-notes";
-}

pkgs/kde/gear/akonadi-search/default.nix

@@ -7,7 +7,7 @@
   cargo,
   rustc,
   # provided as callPackage input to enable easier overrides through overlays
-  cargoHash ? "sha256-9cwNQSw0ueWyyL/qgWXXqIRsi4Lk/DX48CIbvQFNgP8=",
+  cargoHash ? "sha256-0lGK71Xk2p/mtOKnoyCtLzvjZKdVFNTz8eP/xg1RBC0=",
 }:
 mkKdeDerivation rec {
   pname = "akonadi-search";

pkgs/kde/gear/angelfish/default.nix

@@ -8,7 +8,7 @@
   cargo,
   rustc,
   # provided as callPackage input to enable easier overrides through overlays
-  cargoHash ? "sha256-gE3wrRI8TaiA6LNqyrpEuw8ALnprGjzWQduCckG1Eo0=",
+  cargoHash ? "sha256-xF0tqJ//BacdfyCYvCuhg7bEjQh/RadBrRDfSVGdGXE=",
   qcoro,
 }:
 mkKdeDerivation rec {

pkgs/kde/gear/calligra/default.nix

@@ -1,9 +1,9 @@
 {
   mkKdeDerivation,
   lib,
-  fetchurl,
   boost,
   eigen,
+  gsl,
   imath,
   libetonyek,
   libgit2,
@@ -19,20 +19,17 @@
   poppler,
   qtkeychain,
   qtsvg,
+  qtwebengine,
+  shared-mime-info,
 }:
 
-mkKdeDerivation rec {
+mkKdeDerivation {
   pname = "calligra";
-  version = "4.0.1";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/calligra/calligra-${version}.tar.xz";
-    hash = "sha256-1AH15z9PG9wLNUjqGlCwrBd4we3jCmozWUTtf72I2V8=";
-  };
 
   extraBuildInputs = [
     boost
     eigen
+    gsl
     imath
     libetonyek
     libgit2
@@ -46,11 +43,13 @@ mkKdeDerivation rec {
     poppler
     qtkeychain
     qtsvg
+    qtwebengine
   ];
 
   extraNativeBuildInputs = [
     perl
     pkg-config
+    shared-mime-info
   ];
 
   # Recommended by the upstream packaging instructions. RELEASE_BUILD disables
@@ -67,10 +66,6 @@ mkKdeDerivation rec {
       zraexy
       sigmasquadron
     ];
-    license = with lib.licenses; [
-      gpl2
-      lgpl2
-    ];
     mainProgram = "calligralauncher";
   };
 }

pkgs/kde/gear/cantor/default.nix

@@ -1,11 +1,34 @@
 {
   mkKdeDerivation,
+
+  pkg-config,
   shared-mime-info,
+
+  qtsvg,
+  qttools,
+  qtwebengine,
+
+  libqalculate,
+  libspectre,
+  luajit,
+  poppler,
 }:
 mkKdeDerivation {
   pname = "cantor";
 
-  extraNativeBuildInputs = [ shared-mime-info ];
+  extraNativeBuildInputs = [
-  # FIXME(qt5)
+    pkg-config
-  meta.broken = true;
+    shared-mime-info
+  ];
+  extraBuildInputs = [
+    qtsvg
+    qttools
+    qtwebengine
+
+    libqalculate
+    libspectre
+    luajit
+    poppler
+    # FIXME: can't find R, Julia - if anyone needs this, feel free to investigate
+  ];
 }

pkgs/kde/gear/default.nix

@@ -7,7 +7,6 @@
   akonadi-contacts = callPackage ./akonadi-contacts { };
   akonadi-import-wizard = callPackage ./akonadi-import-wizard { };
   akonadi-mime = callPackage ./akonadi-mime { };
-  akonadi-notes = callPackage ./akonadi-notes { };
   akonadi-search = callPackage ./akonadi-search { };
   akonadiconsole = callPackage ./akonadiconsole { };
   akregator = callPackage ./akregator { };
@@ -26,6 +25,7 @@
   bovo = callPackage ./bovo { };
   calendarsupport = callPackage ./calendarsupport { };
   calindori = callPackage ./calindori { };
+  calligra = callPackage ./calligra { };
   cantor = callPackage ./cantor { };
   cervisia = callPackage ./cervisia { };
   colord-kde = callPackage ./colord-kde { };
@@ -192,6 +192,7 @@
   ktuberling = callPackage ./ktuberling { };
   kturtle = callPackage ./kturtle { };
   kubrick = callPackage ./kubrick { };
+  kunifiedpush = callPackage ./kunifiedpush { };
   kwalletmanager = callPackage ./kwalletmanager { };
   kwave = callPackage ./kwave { };
   kweather = callPackage ./kweather { };

pkgs/kde/gear/itinerary/optional-runtime-dependencies.patch

@@ -1,15 +1,13 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 55ae3280..cac86220 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -85,8 +85,8 @@ ecm_find_qmlmodule(QtPositioning 6.0)
+@@ -80,8 +80,8 @@ ecm_find_qmlmodule(QtPositioning 6.0)
- ecm_find_qmlmodule(org.kde.kitemmodels 5.245)
+ ecm_find_qmlmodule(org.kde.kitemmodels ${KF_MIN_VERSION})
- ecm_find_qmlmodule(org.kde.prison 5.245)
+ ecm_find_qmlmodule(org.kde.prison ${KF_MIN_VERSION})
- ecm_find_qmlmodule(org.kde.prison.scanner 5.245)
+ ecm_find_qmlmodule(org.kde.prison.scanner ${KF_MIN_VERSION})
--ecm_find_qmlmodule(org.kde.kosmindoormap 24.02 REQUIRED)
+-ecm_find_qmlmodule(org.kde.kosmindoormap ${GEAR_MIN_VERSION} REQUIRED)
--ecm_find_qmlmodule(org.kde.kopeninghours 24.02 REQUIRED)
+-ecm_find_qmlmodule(org.kde.kopeninghours ${GEAR_MIN_VERSION} REQUIRED)
-+ecm_find_qmlmodule(org.kde.kosmindoormap 24.02)
++ecm_find_qmlmodule(org.kde.kosmindoormap ${GEAR_MIN_VERSION})
-+ecm_find_qmlmodule(org.kde.kopeninghours 24.02)
++ecm_find_qmlmodule(org.kde.kopeninghours ${GEAR_MIN_VERSION})
  
  # runtime dependencies are build-time dependencies on Android
  if (ANDROID)

pkgs/kde/gear/kalk/default.nix

@@ -1,7 +1,6 @@
 {
   mkKdeDerivation,
   qtdeclarative,
-  kirigami-addons,
   pkg-config,
   bison,
   flex,
@@ -19,7 +18,6 @@ mkKdeDerivation {
   ];
   extraBuildInputs = [
     qtdeclarative
-    kirigami-addons
     gmp
     mpfr
     libqalculate

pkgs/kde/gear/kdenetwork-filesharing/default.nix

@@ -16,8 +16,7 @@ mkKdeDerivation {
       usermod = lib.getExe' shadow "usermod";
     })
 
-    # Provide a better looking and more NixOS specific Samba hint
+    # Provide a more NixOS specific Samba hint
-    # Proposed upstream: https://invent.kde.org/network/kdenetwork-filesharing/-/merge_requests/56
     ./samba-hint.patch
   ];
 

pkgs/kde/gear/kdenetwork-filesharing/samba-hint.patch

@@ -1,34 +1,11 @@
-diff --git a/samba/filepropertiesplugin/qml/MissingSambaPage.qml b/samba/filepropertiesplugin/qml/MissingSambaPage.qml
-index 327c4a7..9e2eba7 100644
 --- a/samba/filepropertiesplugin/qml/MissingSambaPage.qml
 +++ b/samba/filepropertiesplugin/qml/MissingSambaPage.qml
-@@ -6,20 +6,17 @@
+@@ -16,7 +16,7 @@ Item {
- import QtQuick 2.12
+ 
- import QtQuick.Controls 2.5 as QQC2
+         icon.name: "dialog-error"
- import QtQuick.Layouts 1.14
--import org.kde.kirigami 2.4 as Kirigami
--import org.kde.filesharing.samba 1.0 as Samba
-+import org.kde.kirigami as Kirigami
  
- // When built without packagekit we cannot do auto-installation.
--ColumnLayout {
--    QQC2.Label {
--        Layout.alignment: Qt.AlignHCenter
--        Layout.fillWidth: true
 -        text: xi18nc("@info", "The <application>Samba</application> file sharing service must be installed before folders can be shared.")
 -        explanation: i18n("Because this distro does not include PackageKit, we cannot show you a nice \"Install it\" button, and you will have to use your package manager to install the <command>samba</command> server package manually.")
--        wrapMode: Text.Wrap
--    }
--    Item {
--        Layout.alignment: Qt.AlignHCenter
--        Layout.fillHeight: true // space everything up
-+Item {
-+    Kirigami.PlaceholderMessage {
-+        anchors.centerIn: parent
-+        width: parent.width - (Kirigami.Units.largeSpacing * 4)
-+
-+        icon.name: "dialog-error"
-+
 +        text: xi18nc("@info", "File sharing service unavailable")
 +        explanation: i18n("Please enable the `services.samba.enable` and `services.samba.usershares.enable` options in your NixOS configuration.")
      }

pkgs/kde/gear/kdepim-addons/default.nix

@@ -8,7 +8,7 @@
   corrosion,
   alpaka,
   # provided as callPackage input to enable easier overrides through overlays
-  cargoHash ? "sha256-2t4i7lTJxVNjsU5eO6svadZBIerSyXt6BMScpEl119s=",
+  cargoHash ? "sha256-5RPNVw2oYbe4U1rweYArK8G/8XoTRpgbwq6OYkaZnZk=",
 }:
 mkKdeDerivation rec {
   pname = "kdepim-addons";

pkgs/kde/gear/kmix/default.nix

@@ -1,6 +1,16 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+
+  alsa-lib,
+  libcanberra,
+  libpulseaudio,
+}:
 mkKdeDerivation {
   pname = "kmix";
-  # FIXME(qt5)
+
-  meta.broken = true;
+  extraBuildInputs = [
+    alsa-lib
+    libcanberra
+    libpulseaudio
+  ];
 }

pkgs/kde/gear/koko/default.nix

@@ -6,7 +6,6 @@
   qtpositioning,
   qtsvg,
   exiv2,
-  kirigami-addons,
 }:
 let
   # URLs snapshotted through
@@ -34,13 +33,16 @@ mkKdeDerivation {
     ln -s ${cities1000} src/cities1000.zip
   '';
 
+  patches = [
+    ./optional-runtime-dependencies.patch
+  ];
+
   extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
     qtmultimedia
     qtpositioning
     qtsvg
     exiv2
-    kirigami-addons
   ];
   meta.mainProgram = "koko";
 }

pkgs/kde/gear/koko/optional-runtime-dependencies.patch

@@ -0,0 +1,13 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -76,8 +76,8 @@ set_package_properties(KF6Kirigami PROPERTIES
+     TYPE RUNTIME
+ )
+ 
+-ecm_find_qmlmodule(org.kde.kirigamiaddons.formcard REQUIRED)
+-ecm_find_qmlmodule(org.kde.kirigamiaddons.delegates REQUIRED)
++ecm_find_qmlmodule(org.kde.kirigamiaddons.formcard)
++ecm_find_qmlmodule(org.kde.kirigamiaddons.delegates)
+ 
+ find_package(KF6KirigamiAddons)
+ set_package_properties(KF6KirigamiAddons PROPERTIES

pkgs/kde/gear/krdc/default.nix

@@ -1,6 +1,7 @@
 {
   mkKdeDerivation,
   pkg-config,
+  shared-mime-info,
   qtwayland,
   libssh,
   libvncserver,
@@ -9,7 +10,11 @@
 mkKdeDerivation {
   pname = "krdc";
 
-  extraNativeBuildInputs = [ pkg-config ];
+  extraNativeBuildInputs = [
+    pkg-config
+    shared-mime-info
+  ];
+
   extraBuildInputs = [
     qtwayland
     libssh

pkgs/kde/gear/kunifiedpush/default.nix

@@ -0,0 +1,17 @@
+{
+  mkKdeDerivation,
+  qtwebsockets,
+  kdeclarative,
+  kpackage,
+}:
+mkKdeDerivation {
+  pname = "kunifiedpush";
+
+  extraBuildInputs = [
+    qtwebsockets
+    kdeclarative
+    kpackage
+  ];
+
+  meta.mainProgram = "kunifiedpush-distributor";
+}

pkgs/kde/gear/kwave/default.nix

@@ -1,6 +1,38 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  pkg-config,
+
+  qtmultimedia,
+
+  alsa-lib,
+  audiofile,
+  fftw,
+  flac,
+  id3lib,
+  libogg,
+  libopus,
+  libmad,
+  libpulseaudio,
+  libsamplerate,
+  libvorbis,
+}:
 mkKdeDerivation {
   pname = "kwave";
-  # FIXME(qt5)
+
-  meta.broken = true;
+  extraNativeBuildInputs = [ pkg-config ];
+  extraBuildInputs = [
+    qtmultimedia
+
+    alsa-lib
+    audiofile
+    fftw
+    flac
+    id3lib
+    libogg
+    libopus
+    libmad
+    libpulseaudio
+    libsamplerate
+    libvorbis
+  ];
 }

pkgs/kde/gear/marble/default.nix

@@ -1,6 +1,45 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+
+  perl,
+  pkg-config,
+  shared-mime-info,
+
+  qtpositioning,
+  qtsvg,
+  qttools,
+  qtwebengine,
+
+  krunner,
+  libplasma,
+  phonon,
+
+  gpsd,
+  protobuf,
+  shapelib,
+}:
 mkKdeDerivation {
   pname = "marble";
-  # FIXME(qt5)
+
-  meta.broken = true;
+  extraNativeBuildInputs = [
+    perl
+    pkg-config
+    shared-mime-info
+  ];
+
+  extraBuildInputs = [
+    qtpositioning
+    qtsvg
+    qttools
+    qtwebengine
+
+    krunner
+    libplasma
+    phonon
+
+    gpsd
+    # FIXME: libwlocate
+    protobuf
+    shapelib
+  ];
 }

pkgs/kde/generated/dependencies.json

@@ -30,6 +30,7 @@
       "kcalendarcore",
       "kcalutils",
       "kcontacts",
+      "kcrash",
       "kdbusaddons",
       "kidentitymanagement",
       "kmailtransport",
@@ -122,7 +123,8 @@
       "kuserfeedback",
       "libkdepim",
       "messagelib",
-      "pimcommon"
+      "pimcommon",
+      "plasma-activities"
     ],
     "alkimia": [
       "extra-cmake-modules",
@@ -139,12 +141,12 @@
     ],
     "alligator": [
       "extra-cmake-modules",
+      "kcolorscheme",
       "kconfig",
       "kcoreaddons",
       "ki18n",
       "kirigami",
       "kirigami-addons",
-      "qqc2-desktop-style",
       "syndication"
     ],
     "alpaka": [
@@ -453,7 +455,6 @@
     "calendarsupport": [
       "akonadi",
       "akonadi-calendar",
-      "akonadi-notes",
       "extra-cmake-modules",
       "kcalendarcore",
       "kcalutils",
@@ -528,6 +529,7 @@
       "threadweaver"
     ],
     "cantor": [
+      "analitza",
       "extra-cmake-modules",
       "karchive",
       "kcompletion",
@@ -630,6 +632,7 @@
       "kidletime",
       "kio",
       "kirigami-addons",
+      "kitemmodels",
       "knewstuff",
       "knotifications",
       "kservice",
@@ -764,7 +767,6 @@
       "extra-cmake-modules",
       "kcalendarcore",
       "kcalutils",
-      "kconfigwidgets",
       "kdiagram",
       "kmime",
       "libkdepim"
@@ -897,6 +899,7 @@
       "extra-cmake-modules",
       "kconfig",
       "kcoreaddons",
+      "kcrash",
       "kdbusaddons",
       "kdoctools",
       "kglobalaccel",
@@ -963,6 +966,7 @@
       "kcalendarcore",
       "kcalutils",
       "kdiagram",
+      "kguiaddons",
       "kidentitymanagement",
       "kldap",
       "kmime",
@@ -1111,7 +1115,19 @@
       "kontactinterface",
       "kuserfeedback",
       "libkdepim",
-      "pimcommon"
+      "pimcommon",
+      "plasma-activities"
+    ],
+    "kaffeine": [
+      "extra-cmake-modules",
+      "kcoreaddons",
+      "kdbusaddons",
+      "ki18n",
+      "kio",
+      "kwidgetsaddons",
+      "kwindowsystem",
+      "kxmlgui",
+      "solid"
     ],
     "kaidan": [
       "extra-cmake-modules",
@@ -1178,6 +1194,7 @@
       "kcoreaddons",
       "ki18n",
       "kirigami",
+      "kirigami-addons",
       "kunitconversion",
       "qqc2-desktop-style"
     ],
@@ -1206,6 +1223,7 @@
       "kconfig",
       "kconfigwidgets",
       "kcoreaddons",
+      "kcrash",
       "kdoctools",
       "ki18n",
       "kio",
@@ -1269,12 +1287,12 @@
     "kapptemplate": [
       "extra-cmake-modules",
       "karchive",
-      "kcompletion",
-      "kconfigwidgets",
       "kcoreaddons",
       "kdoctools",
       "ki18n",
-      "kio"
+      "kio",
+      "kirigami",
+      "kirigami-addons"
     ],
     "karchive": [
       "extra-cmake-modules"
@@ -1284,6 +1302,7 @@
       "kcolorscheme",
       "kconfig",
       "kcoreaddons",
+      "kcrash",
       "ki18n",
       "kirigami",
       "kirigami-addons",
@@ -1303,7 +1322,6 @@
       "kiconthemes",
       "knewstuff",
       "ktexteditor",
-      "ktextwidgets",
       "kuserfeedback",
       "qtkeychain",
       "selenium-webdriver-at-spi"
@@ -1441,6 +1459,7 @@
     ],
     "kcalc": [
       "extra-cmake-modules",
+      "kcolorscheme",
       "kconfigwidgets",
       "kcoreaddons",
       "kcrash",
@@ -1477,6 +1496,7 @@
       "extra-cmake-modules",
       "kconfig",
       "kcoreaddons",
+      "kcrash",
       "kdbusaddons",
       "ki18n",
       "kirigami",
@@ -1552,11 +1572,15 @@
     ],
     "kcron": [
       "extra-cmake-modules",
+      "kauth",
       "kcmutils",
       "kconfigwidgets",
+      "kcoreaddons",
+      "kdeclarative",
       "kdoctools",
       "ki18n",
-      "kio"
+      "kio",
+      "kirigami-addons"
     ],
     "kdav": [
       "extra-cmake-modules",
@@ -1646,6 +1670,7 @@
       "kcompletion",
       "kconfig",
       "kcoreaddons",
+      "kcrash",
       "kdbusaddons",
       "ki18n",
       "kiconthemes",
@@ -1764,7 +1789,9 @@
       "kaddressbook",
       "kcalendarcore",
       "kcalutils",
+      "kcolorscheme",
       "kconfig",
+      "kconfigwidgets",
       "kcontacts",
       "kdbusaddons",
       "kdeclarative",
@@ -1791,6 +1818,7 @@
       "mailimporter",
       "messagelib",
       "pimcommon",
+      "plasma-activities",
       "prison"
     ],
     "kdepim-runtime": [
@@ -1798,7 +1826,6 @@
       "akonadi-calendar",
       "akonadi-contacts",
       "akonadi-mime",
-      "akonadi-notes",
       "extra-cmake-modules",
       "kcalendarcore",
       "kcalutils",
@@ -1819,9 +1846,9 @@
       "knotifications",
       "knotifyconfig",
       "ktextaddons",
-      "ktextwidgets",
       "kwindowsystem",
       "libkgapi",
+      "plasma-activities",
       "qtkeychain"
     ],
     "kdeplasma-addons": [
@@ -2015,6 +2042,7 @@
       "kcmutils",
       "kconfig",
       "kcoreaddons",
+      "kcrash",
       "kdoctools",
       "kio",
       "kjobwidgets",
@@ -2080,6 +2108,7 @@
       "kcodecs",
       "kconfigwidgets",
       "kcoreaddons",
+      "kcrash",
       "kdoctools",
       "ki18n",
       "kiconthemes",
@@ -2150,6 +2179,7 @@
       "extra-cmake-modules",
       "karchive",
       "kcoreaddons",
+      "kcrash",
       "kdoctools",
       "kfilemetadata",
       "ki18n",
@@ -2548,6 +2578,7 @@
     ],
     "kio-gdrive": [
       "extra-cmake-modules",
+      "kaccounts-integration",
       "kdoctools",
       "ki18n",
       "kio",
@@ -2597,6 +2628,7 @@
     "kirigami-gallery": [
       "extra-cmake-modules",
       "kirigami",
+      "kirigami-addons",
       "kitemmodels"
     ],
     "kiriki": [
@@ -2826,7 +2858,6 @@
       "kservice",
       "kstatusnotifieritem",
       "ktextaddons",
-      "ktextwidgets",
       "ktnef",
       "kuserfeedback",
       "kwidgetsaddons",
@@ -2839,6 +2870,7 @@
       "mailcommon",
       "messagelib",
       "pimcommon",
+      "plasma-activities",
       "qtkeychain",
       "sonnet"
     ],
@@ -2865,6 +2897,7 @@
     ],
     "kmenuedit": [
       "extra-cmake-modules",
+      "kcrash",
       "kdbusaddons",
       "kdoctools",
       "kglobalaccel",
@@ -2898,11 +2931,14 @@
       "extra-cmake-modules",
       "kconfig",
       "kconfigwidgets",
+      "kcoreaddons",
+      "kcrash",
       "kdbusaddons",
       "kdoctools",
       "kglobalaccel",
       "ki18n",
       "knotifications",
+      "kstatusnotifieritem",
       "kwidgetsaddons",
       "kwindowsystem",
       "kxmlgui",
@@ -3079,6 +3115,7 @@
       "ki18n",
       "kio",
       "kirigami",
+      "kirigami-addons",
       "knotifications",
       "kquickimageeditor",
       "purpose"
@@ -3117,12 +3154,12 @@
     ],
     "kolourpaint": [
       "extra-cmake-modules",
+      "kcrash",
       "kdoctools",
       "kguiaddons",
       "ki18n",
       "kio",
       "kjobwidgets",
-      "ktextwidgets",
       "kwidgetsaddons",
       "kxmlgui",
       "libksane"
@@ -3243,6 +3280,7 @@
       "extra-cmake-modules",
       "futuresql",
       "kcoreaddons",
+      "kcrash",
       "kdoctools",
       "ki18n",
       "kirigami",
@@ -3298,7 +3336,6 @@
       "akonadi",
       "akonadi-calendar",
       "akonadi-contacts",
-      "akonadi-notes",
       "calendarsupport",
       "eventviews",
       "extra-cmake-modules",
@@ -3307,7 +3344,6 @@
       "kcalutils",
       "kcmutils",
       "kconfig",
-      "kconfigwidgets",
       "kcontacts",
       "kcoreaddons",
       "kcrash",
@@ -3330,7 +3366,8 @@
       "kwindowsystem",
       "kxmlgui",
       "libkdepim",
-      "pimcommon"
+      "pimcommon",
+      "plasma-activities"
     ],
     "kosmindoormap": [
       "extra-cmake-modules",
@@ -3457,6 +3494,7 @@
       "kcmutils",
       "kcompletion",
       "kconfig",
+      "kcrash",
       "kdnssd",
       "ki18n",
       "kiconthemes",
@@ -3473,6 +3511,7 @@
       "extra-cmake-modules",
       "kcmutils",
       "kconfig",
+      "kcrash",
       "kdbusaddons",
       "kpipewire",
       "kstatusnotifieritem"
@@ -3539,6 +3578,7 @@
       "extra-cmake-modules",
       "kconfig",
       "kcoreaddons",
+      "kcrash",
       "kdbusaddons",
       "kdnssd",
       "kdoctools",
@@ -3565,6 +3605,7 @@
     ],
     "kruler": [
       "extra-cmake-modules",
+      "kcrash",
       "kdoctools",
       "ki18n",
       "knotifications",
@@ -3797,6 +3838,7 @@
       "kcompletion",
       "kconfig",
       "kcoreaddons",
+      "kcrash",
       "kdoctools",
       "ki18n",
       "kio",
@@ -3808,6 +3850,7 @@
     "ksystemstats": [
       "extra-cmake-modules",
       "kcoreaddons",
+      "kcrash",
       "kio",
       "libksysguard",
       "solid"
@@ -3831,8 +3874,8 @@
       "breeze-icons",
       "extra-cmake-modules",
       "karchive",
+      "kcolorscheme",
       "kconfig",
-      "kconfigwidgets",
       "kcoreaddons",
       "ki18n",
       "kio",
@@ -3872,6 +3915,7 @@
       "kconfig",
       "kconfigwidgets",
       "kcoreaddons",
+      "kcrash",
       "kdbusaddons",
       "kdoctools",
       "ki18n",
@@ -4102,6 +4146,7 @@
       "extra-cmake-modules",
       "kconfig",
       "kcoreaddons",
+      "kcrash",
       "ki18n",
       "kirigami",
       "kirigami-addons",
@@ -4248,6 +4293,7 @@
     ],
     "libgravatar": [
       "extra-cmake-modules",
+      "kconfigwidgets",
       "pimcommon"
     ],
     "libkcddb": [
@@ -4347,6 +4393,7 @@
     ],
     "libksieve": [
       "extra-cmake-modules",
+      "kcolorscheme",
       "kidentitymanagement",
       "kimap",
       "kmailtransport",
@@ -4450,7 +4497,8 @@
       "mailimporter",
       "messagelib",
       "phonon",
-      "pimcommon"
+      "pimcommon",
+      "plasma-activities"
     ],
     "mailimporter": [
       "akonadi",
@@ -4460,7 +4508,15 @@
       "pimcommon"
     ],
     "marble": [
-      "extra-cmake-modules"
+      "extra-cmake-modules",
+      "kconfig",
+      "kcoreaddons",
+      "kcrash",
+      "ki18n",
+      "kio",
+      "knewstuff",
+      "kparts",
+      "kwallet"
     ],
     "mark": [
       "extra-cmake-modules",
@@ -4575,6 +4631,7 @@
       "kcalutils",
       "kconfigwidgets",
       "kcontacts",
+      "kcrash",
       "kdepim-runtime",
       "kirigami",
       "kirigami-addons",
@@ -4839,7 +4896,6 @@
     ],
     "pim-data-exporter": [
       "akonadi",
-      "akonadi-notes",
       "extra-cmake-modules",
       "kcalendarcore",
       "kcontacts",
@@ -4890,11 +4946,11 @@
       "kparts",
       "kservice",
       "ktextaddons",
-      "ktextwidgets",
       "kwidgetsaddons",
       "kwindowsystem",
       "kxmlgui",
       "libkdepim",
+      "plasma-activities",
       "purpose",
       "sonnet"
     ],
@@ -5409,6 +5465,7 @@
       "kcoreaddons",
       "kguiaddons",
       "ki18n",
+      "kio",
       "knotifications",
       "libksysguard",
       "solid"
@@ -5473,6 +5530,7 @@
       "libkscreen",
       "plasma-activities",
       "plasma-workspace",
+      "selenium-webdriver-at-spi",
       "solid"
     ],
     "powerplant": [
@@ -5702,6 +5760,7 @@
     "skanlite": [
       "extra-cmake-modules",
       "kcoreaddons",
+      "kcrash",
       "kdoctools",
       "ki18n",
       "kio",
@@ -5811,6 +5870,7 @@
       "extra-cmake-modules",
       "kconfig",
       "kcoreaddons",
+      "kcrash",
       "kdbusaddons",
       "kdoctools",
       "kglobalaccel",
@@ -5924,7 +5984,8 @@
       "kwidgetsaddons",
       "kwindowsystem",
       "kxmlgui",
-      "plasma-activities"
+      "plasma-activities",
+      "selenium-webdriver-at-spi"
     ],
     "tellico": [
       "extra-cmake-modules",
@@ -6077,6 +6138,7 @@
       "kconfig",
       "kconfigwidgets",
       "kcoreaddons",
+      "kcrash",
       "ki18n",
       "kiconthemes",
       "kio",
@@ -6136,11 +6198,12 @@
       "akonadi-calendar",
       "extra-cmake-modules",
       "kcoreaddons",
+      "kcrash",
       "ki18n",
       "kontactinterface",
       "krunner",
       "kwindowsystem"
     ]
   },
-  "version": "9fe21091"
+  "version": "c8684032"
 }

pkgs/kde/generated/licenses.json

@@ -58,11 +58,6 @@
     "LGPL-3.0-only",
     "LicenseRef-KDE-Accepted-LGPL"
   ],
-  "akonadi-notes": [
-    "BSD-3-Clause",
-    "CC0-1.0",
-    "LGPL-2.0-or-later"
-  ],
   "akonadi-search": [
     "BSD-3-Clause",
     "CC0-1.0",
@@ -127,6 +122,7 @@
   "arianna": [
     "BSD-2-Clause",
     "BSD-3-Clause",
+    "CC-BY-SA-4.0",
     "CC0-1.0",
     "GPL-2.0-only",
     "GPL-3.0-only",
@@ -144,6 +140,7 @@
     "BSD-2-Clause",
     "CC0-1.0",
     "GPL-2.0-or-later",
+    "LGPL-3.0-only",
     "MIT"
   ],
   "artikulate": [
@@ -304,6 +301,23 @@
     "CC0-1.0",
     "GPL-3.0-or-later"
   ],
+  "calligra": [
+    "BSD-2-Clause",
+    "BSD-3-Clause",
+    "BSD-3-Clauses",
+    "BSL-1.0",
+    "CC0-1.0",
+    "CPL-1.0",
+    "GPL-2.0-only",
+    "GPL-2.0-or-later",
+    "GPL-3.0-only",
+    "GPL-3.0-or-later",
+    "LGPL-2.0-only",
+    "LGPL-2.0-or-later",
+    "LGPL-2.1-only",
+    "LGPL-2.1-or-later",
+    "LicenseRef-KDE-Accepted-GPL"
+  ],
   "cantor": [
     "BSD-3-Clause",
     "CC0-1.0",
@@ -596,10 +610,12 @@
     "GPL-2.0-or-later"
   ],
   "kapptemplate": [
+    "CC-BY-SA-4.0",
     "CC0-1.0",
     "GPL-2.0-only",
     "GPL-2.0-or-later",
     "GPL-3.0-only",
+    "LGPL-2.1-or-later",
     "LicenseRef-KDE-Accepted-GPL"
   ],
   "karchive": [
@@ -610,6 +626,7 @@
   "kasts": [
     "BSD-2-Clause",
     "BSD-3-Clause",
+    "CC-BY-SA-4.0",
     "CC0-1.0",
     "GPL-2.0-only",
     "GPL-2.0-or-later",
@@ -915,11 +932,13 @@
     "BSD-2-Clause",
     "BSD-3-Clause",
     "BSL-1.0",
+    "CC-BY-SA-4.0",
     "CC0-1.0",
     "GPL-2.0-only",
     "GPL-3.0-only",
     "GPL-3.0-or-later",
     "LGPL-3.0-only",
+    "LGPL-3.0-or-later",
     "LicenseRef-KDE-Accepted-GPL",
     "LicenseRef-KDE-Accepted-LGPL",
     "MIT"
@@ -1075,7 +1094,10 @@
     "BSD-3-Clause",
     "CC-BY-SA-4.0",
     "CC0-1.0",
-    "GPL-3.0-or-later"
+    "GPL-3.0-or-later",
+    "LGPL-2.1-only",
+    "LGPL-3.0-only",
+    "LicenseRef-KDE-Accepted-LGPL"
   ],
   "kfilemetadata": [
     "BSD-3-Clause",
@@ -1411,6 +1433,7 @@
     "LGPL-2.1-only",
     "LGPL-2.1-or-later",
     "LGPL-3.0-only",
+    "LGPL-3.0-or-later",
     "LicenseRef-KDE-Accepted-LGPL"
   ],
   "klettres": [
@@ -1745,6 +1768,7 @@
     "BSD-3-Clause",
     "CC0-1.0",
     "LGPL-2.0-or-later",
+    "LGPL-2.1-or-later",
     "MIT",
     "ODbL-1.0"
   ],
@@ -1792,6 +1816,8 @@
   "krfb": [
     "BSD-3-Clause",
     "CC0-1.0",
+    "GPL-2.0-or-later",
+    "GPL-3.0-or-later",
     "LGPL-2.1-only",
     "LGPL-3.0-only",
     "LicenseRef-KDE-Accepted-LGPL"
@@ -1936,7 +1962,8 @@
   ],
   "ktimer": [
     "BSD-3-Clause",
-    "CC0-1.0"
+    "CC0-1.0",
+    "GPL-2.0-or-later"
   ],
   "ktnef": [
     "BSD-3-Clause",
@@ -1981,6 +2008,12 @@
     "CC0-1.0",
     "GPL-2.0-or-later"
   ],
+  "kunifiedpush": [
+    "BSD-2-Clause",
+    "BSD-3-Clause",
+    "CC0-1.0",
+    "LGPL-2.0-or-later"
+  ],
   "kunitconversion": [
     "CC0-1.0",
     "LGPL-2.0-or-later"
@@ -2121,6 +2154,7 @@
     "LGPL-2.0-or-later"
   ],
   "libkcompactdisc": [
+    "BSD-3-Clause",
     "CC0-1.0"
   ],
   "libkdcraw": [
@@ -2274,6 +2308,7 @@
   "marble": [
     "Apache-2.0",
     "BSD-3-Clause",
+    "BSL-1.0",
     "CC0-1.0",
     "GPL-3.0-only",
     "GPL-3.0-or-later",
@@ -2283,6 +2318,7 @@
     "LGPL-3.0-only",
     "LicenseRef-Qt-Commercial",
     "MIT",
+    "ODbL-1.0",
     "Qt-LGPL-exception-1.1"
   ],
   "markdownpart": [
@@ -2461,6 +2497,7 @@
   "pim-data-exporter": [
     "BSD-3-Clause",
     "CC0-1.0",
+    "GFDL-1.2-or-later",
     "GPL-2.0-or-later",
     "LGPL-2.0-or-later"
   ],
@@ -2909,7 +2946,6 @@
   "tokodon": [
     "BSD-2-Clause",
     "BSD-3-Clause",
-    "BSL-1.0",
     "CC0-1.0",
     "GPL-2.0-only",
     "GPL-2.0-or-later",
@@ -2920,7 +2956,8 @@
     "LGPL-2.1-or-later",
     "LGPL-3.0-only",
     "LicenseRef-KDE-Accepted-GPL",
-    "LicenseRef-KDE-Accepted-LGPL"
+    "LicenseRef-KDE-Accepted-LGPL",
+    "MIT"
   ],
   "umbrello": [
     "CC0-1.0",

pkgs/kde/generated/projects.json

@@ -875,6 +875,12 @@
     "project_path": "documentation/docs-krita-org",
     "repo_path": "documentation/docs-krita-org"
   },
+  "documentation-docs-labplot-org": {
+    "description": "Documentation for Labplot",
+    "name": "documentation-docs-labplot-org",
+    "project_path": "documentation/docs-labplot-org",
+    "repo_path": "documentation/docs-labplot-org"
+  },
   "documentation-docs-plasma-mobile-org": {
     "description": "Plasma Mobile documentation based on Sphinx",
     "name": "documentation-docs-plasma-mobile-org",
@@ -1421,6 +1427,12 @@
     "project_path": "playground/edu/kard",
     "repo_path": "education/kard"
   },
+  "karp": {
+    "description": "Simple PDF editor to arrange, merge and improve PDF file(s)",
+    "name": "karp",
+    "project_path": "playground/graphics/karp",
+    "repo_path": "graphics/karp"
+  },
   "kartesio": {
     "description": "Calculate best fit curves with experimental points using regression or neural networks",
     "name": "kartesio",
@@ -1440,7 +1452,7 @@
     "repo_path": "libraries/kasync"
   },
   "kate": {
-    "description": "Modern text editor built on the KDE Frameworks and Qt",
+    "description": "Advanced text editor",
     "name": "kate",
     "project_path": "kde/applications/kate",
     "repo_path": "utilities/kate"
@@ -6185,6 +6197,12 @@
     "project_path": "kde/kdebindings/smoke/smokeqt",
     "repo_path": "unmaintained/smokeqt"
   },
+  "snap-kcm": {
+    "description": "KCM allowing changing permissions which have granted to installed Snap applications.",
+    "name": "snap-kcm",
+    "project_path": "kdereview/snap-kcm",
+    "repo_path": "plasma/snap-kcm"
+  },
   "snap-kf5": {
     "description": "Content Snap for Qt5 and KF5",
     "name": "snap-kf5",
@@ -6431,6 +6449,12 @@
     "project_path": "sysadmin/bugzilla-bot",
     "repo_path": "sysadmin/bugzilla-bot"
   },
+  "sysadmin-ci-images": {
+    "description": "Images for use on the KDE CI System",
+    "name": "sysadmin-ci-images",
+    "project_path": "sysadmin/ci-images",
+    "repo_path": "sysadmin/ci-images"
+  },
   "sysadmin-ci-management": {
     "description": "Contains all management jobs and other data needed to run our Gitlab CI infrastructure.",
     "name": "sysadmin-ci-management",
@@ -6635,6 +6659,12 @@
     "project_path": "sysadmin/neon-sftp-bridge",
     "repo_path": "sysadmin/neon-sftp-bridge"
   },
+  "sysadmin-neon-tooling": {
+    "description": "",
+    "name": "sysadmin-neon-tooling",
+    "project_path": "sysadmin/neon-tooling",
+    "repo_path": "sysadmin/neon-tooling"
+  },
   "sysadmin-projects-api": {
     "description": "",
     "name": "sysadmin-projects-api",

pkgs/kde/lib/mk-kde-derivation.nix

@@ -55,6 +55,7 @@ let
       # FIXME: typo lol
       "ICS" = lib.licenses.isc;
       "BSD-3-clause" = lib.licenses.bsd3;
+      "BSD-3-Clauses" = lib.licenses.bsd3;
 
       # These are only relevant to Qt commercial users
       "Qt-Commercial-exception-1.0" = null;

pkgs/kde/misc/kunifiedpush/default.nix

@@ -1,31 +0,0 @@
-{
-  lib,
-  mkKdeDerivation,
-  fetchurl,
-  qtwebsockets,
-  kdeclarative,
-  kpackage,
-}:
-mkKdeDerivation rec {
-  pname = "kunifiedpush";
-  version = "1.0.0";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/kunifiedpush/kunifiedpush-${version}.tar.xz";
-    sha256 = "sha256-Ld66ITBtAwcRTsUKLDgVnsYjWfn8bN1Y2jCjafvVUM8=";
-  };
-
-  extraBuildInputs = [
-    qtwebsockets
-    kdeclarative
-    kpackage
-  ];
-
-  meta.license = with lib.licenses; [
-    bsd2
-    bsd3
-    cc0
-    lgpl2Plus
-  ];
-  meta.mainProgram = "kunifiedpush-distributor";
-}