kdePackages: Gear 24.05.2 -> 24.08.0

- kweathercore to gear
- kipi removed
- knotes removed
- kgraphviewer and massif-visualizer added
- kdevelop and friends to qt6

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

@@ -73,6 +73,9 @@ OK_MISSING_BY_PACKAGE = {
     "kwin": {
         "display-info",  # newer versions identify as libdisplay-info
     },
+    "libksysguard": {
+        "Libcap",  # used to call setcap at build time and nothing else
+    },
     "mlt": {
         "Qt5",  # intentionally disabled
         "SWIG",
@@ -88,6 +91,9 @@ OK_MISSING_BY_PACKAGE = {
     "powerdevil": {
         "DDCUtil",  # cursed, intentionally disabled
     },
+    "print-manager": {
+        "PackageKitQt6",  # used for auto-installing drivers which does not work for obvious reasons
+    },
     "pulseaudio-qt": {
         "Qt6Qml",  # tests only
         "Qt6Quick",

pkgs/kde/default.nix

@@ -55,13 +55,10 @@
       plasma-wayland-protocols = libsForQt5.plasma-wayland-protocols;
 
       selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub
-      # Not ported to Qt6 yet
-      kdevelop-pg-qt = null;
-      okteta = null;
-      libmediawiki = null;
 
       alpaka = self.callPackage ./misc/alpaka {};
       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 {};
       kirigami-addons = self.callPackage ./misc/kirigami-addons {};
       kio-extras-kf5 = self.callPackage ./misc/kio-extras-kf5 {};
@@ -69,7 +66,6 @@
       ktextaddons = self.callPackage ./misc/ktextaddons {};
       kunifiedpush = self.callPackage ./misc/kunifiedpush {};
       kup = self.callPackage ./misc/kup {};
-      kweathercore = self.callPackage ./misc/kweathercore {};
       marknote = self.callPackage ./misc/marknote {};
       mpvqt = self.callPackage ./misc/mpvqt {};
       oxygen-icons = self.callPackage ./misc/oxygen-icons {};

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-po8ykNdP0+8gVUcebxqpo+p3Jm4DzZlskmgfBwzVc5s=",
+  cargoHash ? "sha256-XZ40qGBPRz7xyem3EP4+hzTliryxxDyGtvfjbNNVDQo=",
 }:
 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-GHXZKP4K5+ii2RyG9phllRSms4gRAl7kbFUyTUO59s0=",
+  cargoHash ? "sha256-y7iJGN3ATK3IT8ko64puGlFXBM9OZw9u8JenrOBDuFA=",
   qcoro,
 }:
 mkKdeDerivation rec {

pkgs/kde/gear/ark/default.nix

@@ -1,21 +1,11 @@
 {
   mkKdeDerivation,
-  fetchpatch,
   libarchive,
   libzip,
 }:
 mkKdeDerivation {
   pname = "ark";
 
-  # Backport fix to clean up temporary folders with Qt 6.7
-  # FIXME: remove in next update
-  patches = [
-    (fetchpatch {
-      url = "https://invent.kde.org/utilities/ark/-/commit/85c5e26f581cf011638a53e62b92e1da8fd55fcd.patch";
-      hash = "sha256-ZjVdKgFoGE0Jme8JhGVn7+PODJqdwHQhglrHzsxePf8=";
-    })
-  ];
-
   extraBuildInputs = [libarchive libzip];
   meta.mainProgram = "ark";
 }

pkgs/kde/gear/default.nix

@@ -105,6 +105,7 @@
   kget = callPackage ./kget {};
   kgoldrunner = callPackage ./kgoldrunner {};
   kgpg = callPackage ./kgpg {};
+  kgraphviewer = callPackage ./kgraphviewer {};
   khangman = callPackage ./khangman {};
   khealthcertificate = callPackage ./khealthcertificate {};
   khelpcenter = callPackage ./khelpcenter {};
@@ -118,7 +119,6 @@
   kio-extras = callPackage ./kio-extras {};
   kio-gdrive = callPackage ./kio-gdrive {};
   kio-zeroconf = callPackage ./kio-zeroconf {};
-  kipi-plugins = callPackage ./kipi-plugins {};
   kirigami-gallery = callPackage ./kirigami-gallery {};
   kiriki = callPackage ./kiriki {};
   kiten = callPackage ./kiten {};
@@ -145,7 +145,6 @@
   knavalbattle = callPackage ./knavalbattle {};
   knetwalk = callPackage ./knetwalk {};
   knights = callPackage ./knights {};
-  knotes = callPackage ./knotes {};
   koko = callPackage ./koko {};
   kolf = callPackage ./kolf {};
   kollision = callPackage ./kollision {};
@@ -195,6 +194,7 @@
   kwalletmanager = callPackage ./kwalletmanager {};
   kwave = callPackage ./kwave {};
   kweather = callPackage ./kweather {};
+  kweathercore = callPackage ./kweathercore {};
   kwordquiz = callPackage ./kwordquiz {};
   libgravatar = callPackage ./libgravatar {};
   libkcddb = callPackage ./libkcddb {};
@@ -205,7 +205,6 @@
   libkeduvocdocument = callPackage ./libkeduvocdocument {};
   libkexiv2 = callPackage ./libkexiv2 {};
   libkgapi = callPackage ./libkgapi {};
-  libkipi = callPackage ./libkipi {};
   libkleo = callPackage ./libkleo {};
   libkmahjongg = callPackage ./libkmahjongg {};
   libkomparediff2 = callPackage ./libkomparediff2 {};
@@ -218,6 +217,7 @@
   mailimporter = callPackage ./mailimporter {};
   marble = callPackage ./marble {};
   markdownpart = callPackage ./markdownpart {};
+  massif-visualizer = callPackage ./massif-visualizer {};
   mbox-importer = callPackage ./mbox-importer {};
   merkuro = callPackage ./merkuro {};
   messagelib = callPackage ./messagelib {};

pkgs/kde/gear/francis/default.nix

@@ -1,20 +1,10 @@
 {
   mkKdeDerivation,
-  fetchpatch,
   qtsvg,
   knotifications,
 }:
 mkKdeDerivation {
   pname = "francis";
 
-  patches = [
-    # Fix linking issue
-    # FIXME: remove in next update
-    (fetchpatch {
-      url = "https://invent.kde.org/utilities/francis/-/commit/4d5407a42e4871d66f4de4522fbbf83c35604550.patch";
-      hash = "sha256-p9DVc92e8QBDHwZybVLNzSH8dr0XmRzrnIT45YD9t/Q=";
-    })
-  ];
-
   extraBuildInputs = [qtsvg knotifications];
 }

pkgs/kde/gear/kalarm/default.nix

@@ -1,9 +1,10 @@
 {
   mkKdeDerivation,
   libcanberra,
+  libvlc,
 }:
 mkKdeDerivation {
   pname = "kalarm";
 
-  extraBuildInputs = [libcanberra];
+  extraBuildInputs = [libcanberra libvlc];
 }

pkgs/kde/gear/kdeconnect-kde/default.nix

@@ -19,10 +19,6 @@ mkKdeDerivation {
       src = ./hardcode-sshfs-path.patch;
       sshfs = lib.getExe sshfs;
     })
-    # We build OpenSSH without ssh-dss support, so sshfs explodes at runtime.
-    # See: https://github.com/NixOS/nixpkgs/commit/6ee4b8c8bf815567f7d0fa131576d2b8c0a18167
-    # FIXME: upstream?
-    ./remove-ssh-dss.patch
   ];
 
   # Hardcoded as a QString, which is UTF-16 so Nix can't pick it up automatically

pkgs/kde/gear/kdeconnect-kde/remove-ssh-dss.patch

@@ -1,13 +0,0 @@
-diff --git a/plugins/sftp/mounter.cpp b/plugins/sftp/mounter.cpp
-index 29e94f3b..0f300c63 100644
---- a/plugins/sftp/mounter.cpp
-+++ b/plugins/sftp/mounter.cpp
-@@ -122,7 +122,7 @@ void Mounter::onPacketReceived(const NetworkPacket &np)
-                       << QStringLiteral("-o") << QStringLiteral("IdentityFile=") + KdeConnectConfig::instance().privateKeyPath()
-                       << QStringLiteral("-o") << QStringLiteral("StrictHostKeyChecking=no") // Do not ask for confirmation because it is not a known host
-                       << QStringLiteral("-o") << QStringLiteral("UserKnownHostsFile=/dev/null") // Prevent storing as a known host
--                      << QStringLiteral("-o") << QStringLiteral("HostKeyAlgorithms=+ssh-dss\\,ssh-rsa") // https://bugs.kde.org/show_bug.cgi?id=351725
-+                      << QStringLiteral("-o") << QStringLiteral("HostKeyAlgorithms=+ssh-rsa") // https://bugs.kde.org/show_bug.cgi?id=351725
-                       << QStringLiteral("-o") << QStringLiteral("PubkeyAcceptedKeyTypes=+ssh-rsa") // https://bugs.kde.org/show_bug.cgi?id=443155
-                       << QStringLiteral("-o") << QStringLiteral("uid=") + QString::number(getuid())
-                       << QStringLiteral("-o") << QStringLiteral("gid=") + QString::number(getgid())

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-NygCWuhwODsmUxwsMZNChVYUMI7Ryu+0MxBIsZaelC8=",
+  cargoHash ? "sha256-ZKLoX6sMKc6o7cnmxPYXL0d+Lmh8+n6Ko6VR/CzfZGs=",
 }:
 mkKdeDerivation rec {
   pname = "kdepim-addons";

pkgs/kde/gear/kdesdk-kio/default.nix

@@ -1,4 +1,9 @@
-{mkKdeDerivation}:
+{
+  mkKdeDerivation,
+  perl,
+}:
 mkKdeDerivation {
   pname = "kdesdk-kio";
+
+  extraNativeBuildInputs = [perl];
 }

pkgs/kde/gear/kdev-php/default.nix

@@ -1,6 +1,9 @@
-{mkKdeDerivation}:
+{
+  mkKdeDerivation,
+  kdevelop-pg-qt,
+}:
 mkKdeDerivation {
   pname = "kdev-php";
-  # FIXME(qt5)
+
-  meta.broken = true;
+  extraNativeBuildInputs = [kdevelop-pg-qt];
 }

pkgs/kde/gear/kdev-python/default.nix

@@ -1,6 +1,4 @@
 {mkKdeDerivation}:
 mkKdeDerivation {
   pname = "kdev-python";
-  # FIXME(qt5)
-  meta.broken = true;
 }

pkgs/kde/gear/kdevelop/default.nix

@@ -1,11 +1,46 @@
 {
+  lib,
   mkKdeDerivation,
-  extra-cmake-modules,
+  qtwebengine,
+  qttools,
+  kdevelop-pg-qt,
+  pkg-config,
+  shared-mime-info,
+  apr,
+  aprutil,
+  boost,
+  libastyle,
+  libclang,
+  libllvm,
+  subversion,
 }:
 mkKdeDerivation {
   pname = "kdevelop";
 
-  extraBuildInputs = [extra-cmake-modules];
+  extraNativeBuildInputs = [
-  # FIXME(qt5)
+    kdevelop-pg-qt
-  meta.broken = true;
+    pkg-config
+    shared-mime-info
+  ];
+
+  extraPropagatedBuildInputs = [
+    qtwebengine
+  ];
+
+  extraBuildInputs = [
+    qttools
+    apr
+    aprutil
+    boost
+    libastyle
+    libclang
+    libllvm
+    subversion
+  ];
+
+  extraCmakeFlags = [
+    "-DCLANG_BUILTIN_DIR=${libclang.lib}/lib/clang/${lib.versions.major libclang.version}/include"
+    "-DAPR_CONFIG_PATH=${apr.dev}/bin"
+    "-DAPU_CONFIG_PATH=${aprutil.dev}/bin"
+  ];
 }

pkgs/kde/gear/kgraphviewer/default.nix

@@ -0,0 +1,14 @@
+{
+  mkKdeDerivation,
+  pkg-config,
+  qt5compat,
+  qtsvg,
+  boost,
+  graphviz,
+}:
+mkKdeDerivation {
+  pname = "kgraphviewer";
+
+  extraNativeBuildInputs = [ pkg-config ];
+  extraBuildInputs = [ qt5compat qtsvg boost graphviz ];
+}

pkgs/kde/gear/kio-extras/default.nix

@@ -19,7 +19,7 @@
 mkKdeDerivation {
   pname = "kio-extras";
 
-  extraNativeBuildInputs = [pkg-config shared-mime-info];
+  extraNativeBuildInputs = [pkg-config gperf shared-mime-info];
   extraBuildInputs = [
     qt5compat
     qtsvg

pkgs/kde/gear/kipi-plugins/default.nix

@@ -1,6 +0,0 @@
-{mkKdeDerivation}:
-mkKdeDerivation {
-  pname = "kipi-plugins";
-  # FIXME(qt5)
-  meta.broken = true;
-}

pkgs/kde/gear/kirigami-gallery/default.nix

@@ -1,11 +1,10 @@
 {
   mkKdeDerivation,
   qtsvg,
+  qttools,
 }:
 mkKdeDerivation {
   pname = "kirigami-gallery";
 
-  extraBuildInputs = [qtsvg];
+  extraNativeBuildInputs = [qtsvg qttools];
-  # FIXME(qt5)
-  meta.broken = true;
 }

pkgs/kde/gear/kmime/default.nix

@@ -1,9 +1,11 @@
 {
   mkKdeDerivation,
+  qttools,
   ki18n,
 }:
 mkKdeDerivation {
   pname = "kmime";
 
+  extraNativeBuildInputs = [qttools];
   extraBuildInputs = [ki18n];
 }

pkgs/kde/gear/knotes/default.nix

@@ -1,9 +0,0 @@
-{
-  mkKdeDerivation,
-  libxslt,
-}:
-mkKdeDerivation {
-  pname = "knotes";
-
-  extraNativeBuildInputs = [libxslt];
-}

pkgs/kde/gear/kompare/default.nix

@@ -1,8 +1,5 @@
 {mkKdeDerivation}:
 mkKdeDerivation {
   pname = "kompare";
-  meta = {
+  meta.mainProgram = "kompare";
-    mainProgram = "kompare";
-    broken = true; # Qt5
-  };
 }

pkgs/kde/gear/konqueror/default.nix

@@ -6,7 +6,8 @@
 mkKdeDerivation {
   pname = "konqueror";
 
-  extraBuildInputs = [qtwebengine hunspell];
+  extraNativeBuildInputs = [hunspell];
+  extraBuildInputs = [qtwebengine];
 
   extraCmakeFlags = [
     "-DWebEngineDictConverter_EXECUTABLE=${qtwebengine}/libexec/qwebengine_convert_dict"

pkgs/kde/gear/kontact/default.nix

@@ -4,7 +4,6 @@
   akregator,
   kaddressbook,
   kmail,
-  knotes,
   korganizer,
   zanshin,
 }:
@@ -16,7 +15,6 @@ mkKdeDerivation {
     akregator
     kaddressbook
     kmail
-    knotes
     korganizer
     zanshin
   ];

pkgs/kde/gear/kosmindoormap/default.nix

@@ -2,9 +2,11 @@
   mkKdeDerivation,
   bison,
   flex,
+  recastnavigation,
 }:
 mkKdeDerivation {
   pname = "kosmindoormap";
 
   extraNativeBuildInputs = [bison flex];
+  extraBuildInputs = [recastnavigation];
 }

pkgs/kde/gear/krdc/default.nix

@@ -1,5 +1,7 @@
 {
   mkKdeDerivation,
+  pkg-config,
+  qtwayland,
   libssh,
   libvncserver,
   freerdp,
@@ -7,6 +9,8 @@
 mkKdeDerivation {
   pname = "krdc";
 
-  extraBuildInputs = [libssh libvncserver freerdp];
+  extraNativeBuildInputs = [pkg-config];
+  extraBuildInputs = [qtwayland libssh libvncserver freerdp];
+
   meta.mainProgram = "krdc";
 }

pkgs/kde/gear/kweathercore/default.nix

@@ -0,0 +1,9 @@
+{
+  mkKdeDerivation,
+  qtpositioning,
+}:
+mkKdeDerivation {
+  pname = "kweathercore";
+
+  extraBuildInputs = [ qtpositioning ];
+}

pkgs/kde/gear/libkipi/default.nix

@@ -1,6 +0,0 @@
-{mkKdeDerivation}:
-mkKdeDerivation {
-  pname = "libkipi";
-  # FIXME(qt5)
-  meta.broken = true;
-}

pkgs/kde/gear/libkomparediff2/default.nix

@@ -6,6 +6,4 @@ mkKdeDerivation {
   pname = "libkomparediff2";
 
   extraBuildInputs = [qt5compat];
-
-  meta.broken = true; # Qt5
 }

pkgs/kde/gear/lokalize/default.nix

@@ -1,6 +1,11 @@
-{mkKdeDerivation}:
+{
+  mkKdeDerivation,
+  pkg-config,
+  hunspell,
+}:
 mkKdeDerivation {
   pname = "lokalize";
-  # FIXME(qt5)
+
-  meta.broken = true;
+  extraNativeBuildInputs = [pkg-config];
+  extraBuildInputs = [hunspell];
 }

pkgs/kde/gear/massif-visualizer/default.nix

@@ -0,0 +1,12 @@
+{
+  mkKdeDerivation,
+  shared-mime-info,
+  qt5compat,
+  qtsvg,
+}:
+mkKdeDerivation {
+  pname = "massif-visualizer";
+
+  extraBuildInputs = [ qt5compat qtsvg ];
+  extraNativeBuildInputs = [ shared-mime-info ];
+}

pkgs/kde/gear/poxml/default.nix

@@ -1,6 +1,4 @@
 {mkKdeDerivation}:
 mkKdeDerivation {
   pname = "poxml";
-  # FIXME(qt5)
-  meta.broken = true;
 }

pkgs/kde/generated/dependencies.json

@@ -618,10 +618,6 @@
     "croutons": [
       "extra-cmake-modules"
     ],
-    "crow-translate": [
-      "extra-cmake-modules",
-      "kwayland"
-    ],
     "daykountdown": [
       "extra-cmake-modules",
       "kcoreaddons",
@@ -6238,5 +6234,5 @@
       "kwindowsystem"
     ]
   },
-  "version": "65b48b30"
+  "version": "55fdd899"
 }

pkgs/kde/generated/licenses.json

@@ -110,6 +110,7 @@
     "GPL-2.0-or-later"
   ],
   "angelfish": [
+    "BSD-2-Clause",
     "BSD-3-Clause",
     "CC0-1.0",
     "GPL-2.0-only",
@@ -343,7 +344,8 @@
     "LGPL-2.1-only",
     "LGPL-3.0-only",
     "LicenseRef-KDE-Accepted-GPL",
-    "LicenseRef-KDE-Accepted-LGPL"
+    "LicenseRef-KDE-Accepted-LGPL",
+    "MIT"
   ],
   "dolphin-plugins": [
     "CC0-1.0",
@@ -398,7 +400,8 @@
     "MIT"
   ],
   "falkon": [
-    "CC0-1.0"
+    "CC0-1.0",
+    "GPL-3.0-or-later"
   ],
   "ffmpegthumbs": [
     "BSD-3-Clause",
@@ -409,7 +412,10 @@
     "CC0-1.0",
     "GPL-2.0-only",
     "GPL-3.0-only",
-    "LicenseRef-KDE-Accepted-GPL"
+    "LGPL-2.1-only",
+    "LGPL-3.0-only",
+    "LicenseRef-KDE-Accepted-GPL",
+    "LicenseRef-KDE-Accepted-LGPL"
   ],
   "flatpak-kcm": [
     "BSD-2-Clause",
@@ -524,6 +530,7 @@
   "kaddressbook": [
     "BSD-3-Clause",
     "CC0-1.0",
+    "GPL-2.0-only",
     "GPL-2.0-or-later",
     "LGPL-2.0-or-later",
     "Qt-Commercial-exception-1.0"
@@ -676,7 +683,8 @@
   "kcalc": [
     "BSD-3-Clause",
     "CC0-1.0",
-    "GPL-2.0-or-later"
+    "GPL-2.0-or-later",
+    "MIT"
   ],
   "kcalendarcore": [
     "BSD-3-Clause",
@@ -909,7 +917,6 @@
     "GPL-2.0-only",
     "GPL-3.0-only",
     "GPL-3.0-or-later",
-    "LGPL-2.1-only",
     "LGPL-3.0-only",
     "LicenseRef-KDE-Accepted-GPL",
     "LicenseRef-KDE-Accepted-LGPL",
@@ -987,7 +994,8 @@
     "GPL-3.0-only",
     "LGPL-2.0-only",
     "LGPL-2.0-or-later",
-    "LicenseRef-KDE-Accepted-GPL"
+    "LicenseRef-KDE-Accepted-GPL",
+    "MIT"
   ],
   "kdev-python": [
     "CC0-1.0",
@@ -1050,10 +1058,15 @@
     "LicenseRef-KDE-Accepted-LGPL"
   ],
   "keditbookmarks": [
+    "BSD-2-Clause",
     "BSD-3-Clause",
     "CC0-1.0",
+    "GPL-2.0-only",
+    "GPL-2.0-or-later",
+    "GPL-3.0-only",
     "LGPL-2.0-only",
-    "LGPL-2.0-or-later"
+    "LGPL-2.0-or-later",
+    "LicenseRef-KDE-Accepted-GPL"
   ],
   "keysmith": [
     "BSD-2-Clause",
@@ -1118,6 +1131,9 @@
     "GPL-3.0-only",
     "LicenseRef-KDE-Accepted-GPL"
   ],
+  "kgraphviewer": [
+    "CC0-1.0"
+  ],
   "kguiaddons": [
     "BSD-2-Clause",
     "CC0-1.0",
@@ -1163,6 +1179,7 @@
   ],
   "ki18n": [
     "BSD-3-Clause",
+    "BSD-3-clause",
     "CC0-1.0",
     "LGPL-2.0-or-later",
     "LGPL-2.1-only",
@@ -1309,9 +1326,6 @@
     "GPL-2.0-or-later",
     "LGPL-2.0-only"
   ],
-  "kipi-plugins": [
-    "CC0-1.0"
-  ],
   "kirigami": [
     "BSD-2-Clause",
     "BSD-3-Clause",
@@ -1328,7 +1342,8 @@
   "kirigami-gallery": [
     "BSD-3-Clause",
     "CC0-1.0",
-    "LGPL-2.0"
+    "LGPL-2.0",
+    "LGPL-2.0-or-later"
   ],
   "kiriki": [
     "BSD-3-Clause",
@@ -1343,7 +1358,6 @@
   "kitemviews": [
     "CC0-1.0",
     "GPL-2.0-or-later",
-    "LGPL-2.0-only",
     "LGPL-2.0-or-later"
   ],
   "kiten": [
@@ -1380,6 +1394,9 @@
     "BSD-3-Clause",
     "CC0-1.0",
     "LGPL-2.0-or-later",
+    "LGPL-2.1-only",
+    "LGPL-3.0-only",
+    "LicenseRef-KDE-Accepted-LGPL",
     "MIT"
   ],
   "kleopatra": [
@@ -1514,17 +1531,6 @@
     "GPL-3.0-only",
     "LicenseRef-KDE-Accepted-GPL"
   ],
-  "knotes": [
-    "BSD-3-Clause",
-    "CC0-1.0",
-    "GPL-2.0-or-later",
-    "LGPL-2.0-only",
-    "LGPL-2.0-or-later",
-    "LGPL-2.1-only",
-    "LGPL-3.0-only",
-    "LicenseRef-KDE-Accepted-LGPL",
-    "Qt-Commercial-exception-1.0"
-  ],
   "knotifications": [
     "BSD-3-Clause",
     "CC0-1.0",
@@ -1572,7 +1578,8 @@
     "BSD-3-Clause",
     "CC-BY-SA-4.0",
     "CC0-1.0",
-    "GPL-3.0-or-later"
+    "GPL-3.0-or-later",
+    "LGPL-3.0-or-later"
   ],
   "konqueror": [
     "BSD-2-Clause",
@@ -1646,6 +1653,7 @@
   "korganizer": [
     "BSD-3-Clause",
     "CC0-1.0",
+    "GPL-2.0-only",
     "GPL-2.0-or-later",
     "LGPL-2.0-only",
     "LGPL-2.0-or-later",
@@ -1753,7 +1761,10 @@
   "krdc": [
     "BSD-3-Clause",
     "CC0-1.0",
-    "GPL-2.0-or-later"
+    "GPL-2.0-or-later",
+    "LGPL-2.1-only",
+    "LGPL-3.0-only",
+    "LicenseRef-KDE-Accepted-LGPL"
   ],
   "krdp": [
     "BSD-2-Clause",
@@ -2026,6 +2037,10 @@
     "GPL-2.0-or-later",
     "LGPL-2.1-or-later"
   ],
+  "kweathercore": [
+    "CC0-1.0",
+    "LGPL-2.0-or-later"
+  ],
   "kwidgetsaddons": [
     "CC0-1.0",
     "GPL-2.0-or-later",
@@ -2141,11 +2156,6 @@
     "LGPL-3.0-only",
     "LicenseRef-KDE-Accepted-LGPL"
   ],
-  "libkipi": [
-    "BSD-3-Clause",
-    "CC0-1.0",
-    "GPL-2.0-or-later"
-  ],
   "libkleo": [
     "BSD-3-Clause",
     "CC0-1.0",
@@ -2276,6 +2286,9 @@
     "CC0-1.0",
     "LGPL-2.1-or-later"
   ],
+  "massif-visualizer": [
+    "CC0-1.0"
+  ],
   "mbox-importer": [
     "BSD-3-Clause",
     "CC0-1.0",
@@ -2334,6 +2347,7 @@
     "LGPL-2.0-only",
     "LGPL-2.0-or-later",
     "LGPL-2.1-only",
+    "LGPL-2.1-or-later",
     "LGPL-3.0-only",
     "LicenseRef-KDE-Accepted-GPL",
     "LicenseRef-KDE-Accepted-LGPL"
@@ -2456,11 +2470,8 @@
   "pimcommon": [
     "BSD-3-Clause",
     "CC0-1.0",
-    "GPL-2.0-only",
     "GPL-2.0-or-later",
-    "GPL-3.0-only",
+    "LGPL-2.0-or-later"
-    "LGPL-2.0-or-later",
-    "LicenseRef-KDE-Accepted-GPL"
   ],
   "plasma-activities": [
     "CC0-1.0",
@@ -2736,6 +2747,7 @@
     "LGPL-2.1-only",
     "LGPL-2.1-or-later",
     "LGPL-3.0-only",
+    "LicenseRef-KDE-Accepted-GPL",
     "LicenseRef-KDE-Accepted-LGPL",
     "LicenseRef-KFQF-Accepted-GPL",
     "LicenseRef-Qt-Commercial",
@@ -2838,6 +2850,7 @@
     "BSD-3-Clause",
     "CC0-1.0",
     "GPL-2.0-only",
+    "LGPL",
     "LGPL-2.0-or-later",
     "MIT"
   ],

pkgs/kde/generated/projects.json

@@ -764,7 +764,7 @@
   "crow-translate": {
     "description": "Application that allows you to translate and speak text",
     "name": "crow-translate",
-    "project_path": "playground/office/crow-translate",
+    "project_path": "kde/office/crow-translate",
     "repo_path": "office/crow-translate"
   },
   "cutehmi": {

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

@@ -46,11 +46,14 @@ self: {
         fullName = "W3C Software Notice and Document License (2015-05-13)";
       };
 
+      "LGPL" = lib.licenses.lgpl2Plus;
+
       # Technically not exact
       "bzip2-1.0.6" = lib.licenses.bsdOriginal;
 
       # FIXME: typo lol
       "ICS" = lib.licenses.isc;
+      "BSD-3-clause" = lib.licenses.bsd3;
 
       # These are only relevant to Qt commercial users
       "Qt-Commercial-exception-1.0" = null;

pkgs/kde/misc/kdevelop-pg-qt/default.nix

@@ -0,0 +1,30 @@
+{
+  lib,
+  mkKdeDerivation,
+  fetchurl,
+  bison,
+  flex,
+}:
+mkKdeDerivation rec {
+  pname = "kdevelop-pg-qt";
+  version = "2.3.0";
+
+  # Breaks with split -dev
+  outputs = ["out"];
+
+  src = fetchurl {
+    url = "mirror://kde/stable/kdevelop-pg-qt/${version}/src/kdevelop-pg-qt-${version}.tar.xz";
+    hash = "sha256-PT7zyzlelnDmDDmepthlzHluAOUsNV7tlD++yn2nEg0=";
+  };
+
+  extraNativeBuildInputs = [ bison flex ];
+
+  meta.license = with lib.licenses; [
+    bsd3
+    gpl2Plus
+    gpl3Plus
+    lgpl2Only
+    lgpl2Plus
+    mit
+  ];
+}

pkgs/kde/misc/kweathercore/default.nix

@@ -1,19 +0,0 @@
-{
-  lib,
-  mkKdeDerivation,
-  fetchurl,
-  qtpositioning,
-}:
-mkKdeDerivation rec {
-  pname = "kweathercore";
-  version = "0.8.0";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/kweathercore/${version}/kweathercore-${version}.tar.xz";
-    hash = "sha256-m8rBPa+YcF4vDVsGshoahpSWIHj84b9iDbvDZIc6Dv4=";
-  };
-
-  extraBuildInputs = [qtpositioning];
-
-  meta.license = with lib.licenses; [cc-by-40 cc0 lgpl2Plus];
-}