KDE Gear 24.08

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

@@ -73,6 +73,9 @@
     "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 @@
     "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/development/libraries/libvncserver/default.nix

@@ -25,6 +25,11 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-kqVZeCTp+Z6BtB6nzkwmtkJ4wtmjlSQBg05lD02cVvQ=";
   };
 
+  patches = [
+    # fix generated pkg-config files
+    ./pkgconfig.patch
+  ];
+
   nativeBuildInputs = [
     cmake
   ];

pkgs/development/libraries/libvncserver/pkgconfig.patch

@@ -0,0 +1,28 @@
+diff --git a/libvncclient.pc.cmakein b/libvncclient.pc.cmakein
+index ceeda39d..2516e643 100644
+--- a/libvncclient.pc.cmakein
++++ b/libvncclient.pc.cmakein
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
+-includedir=@CMAKE_INSTALL_PREFIX@/include
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+
+ Name: LibVNCClient
+ Description: A library for easy implementation of a VNC client.
+diff --git a/libvncserver.pc.cmakein b/libvncserver.pc.cmakein
+index 33ec6685..57244742 100644
+--- a/libvncserver.pc.cmakein
++++ b/libvncserver.pc.cmakein
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
+-includedir=@CMAKE_INSTALL_PREFIX@/include
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+
+ Name: LibVNCServer
+ Description: A library for easy implementation of a VNC server.

pkgs/development/tools/misc/astyle/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, cmake }:
+{ stdenv, lib, fetchurl, cmake, asLibrary ? false }:
 
 stdenv.mkDerivation rec {
   pname = "astyle";
@@ -11,6 +11,17 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
+  # upstream repo includes a build/ directory
+  cmakeBuildDir = "_build";
+
+  cmakeFlags = lib.optional asLibrary [
+    "-DBUILD_SHARED_LIBS=ON"
+  ];
+
+  postInstall = lib.optionalString asLibrary ''
+    install -Dm444 ../src/astyle.h $out/include/astyle.h
+  '';
+
   meta = with lib; {
     description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java";
     mainProgram = "astyle";

pkgs/kde/default.nix

@@ -55,21 +55,17 @@
       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 {};
       kio-fuse = self.callPackage ./misc/kio-fuse {};
       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/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];
-  # FIXME(qt5)
-  meta.broken = true;
+  extraNativeBuildInputs = [
+    kdevelop-pg-qt
+    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/kirigami-gallery/default.nix

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