kde/gear: 23.04.3 -> 23.08.0

pkgs/applications/kde/akonadi-calendar.nix

@@ -2,7 +2,7 @@
   mkDerivation, lib, kdepimTeam,
   extra-cmake-modules, kdoctools,
   akonadi, akonadi-contacts, kcalendarcore, kcalutils, kcontacts,
-  kidentitymanagement, kio, kmailtransport,
+  kidentitymanagement, kio, kmailtransport, messagelib
 }:
 
 mkDerivation {
@@ -14,7 +14,7 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     akonadi akonadi-contacts kcalendarcore kcalutils kcontacts kidentitymanagement
-    kio kmailtransport
+    kio kmailtransport messagelib
   ];
   outputs = [ "out" "dev" ];
   postInstall = ''

pkgs/applications/kde/angelfish.nix

@@ -4,6 +4,7 @@
 , cmake
 , corrosion
 , extra-cmake-modules
+, futuresql
 , kconfig
 , kcoreaddons
 , kdbusaddons
@@ -13,6 +14,7 @@
 , knotifications
 , kpurpose
 , kwindowsystem
+, qcoro
 , qtfeedback
 , qtquickcontrols2
 , qqc2-desktop-style
@@ -22,7 +24,7 @@
 , srcs
 
 # provided as callPackage input to enable easier overrides through overlays
-, cargoSha256 ? "sha256-Wthw7foadXO6jYJO1TB4OOYtpwnp8iCdda4tdiYg41A="
+, cargoSha256 ? "sha256-FI94TU3MgIl1tcjwJnzb2PKO1rbZ3uRB1mzXXkNU95I="
 }:
 
 mkDerivation rec {
@@ -45,6 +47,7 @@ mkDerivation rec {
   ];
 
   buildInputs = [
+    futuresql
     kconfig
     kcoreaddons
     kdbusaddons
@@ -54,6 +57,7 @@ mkDerivation rec {
     knotifications
     kpurpose
     kwindowsystem
+    qcoro
     qtfeedback
     qtquickcontrols2
     qqc2-desktop-style

pkgs/applications/kde/arianna.nix

@@ -1,51 +1,52 @@
 { lib
 , mkDerivation
-, fetchurl
 , cmake
 , extra-cmake-modules
-, pkg-config
-, baloo
-, kfilemetadata
-, kirigami2
-, kirigami-addons
-, kitemmodels
-, kquickcharts
-, plasma-framework
-, qqc2-desktop-style
 , qtbase
+, qtdeclarative
 , qtquickcontrols2
-, qtwebsockets
+, qtwebchannel
 , qtwebengine
+, qtwebsockets
+, baloo
+, karchive
+, kconfig
+, kcoreaddons
+, kdbusaddons
+, kfilemetadata
+, ki18n
+, kirigami-addons
+, kquickcharts
+, kwindowsystem
+, qqc2-desktop-style
 }:
 
-mkDerivation rec {
+mkDerivation {
   pname = "arianna";
-  version = "1.1.0";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/arianna/arianna-${version}.tar.xz";
-    hash = "sha256-C60PujiUTyw2DwImu8PVmU687CP9CuWZ+d8LuZKthKY=";
-  };
 
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
-    pkg-config
   ];
 
   buildInputs = [
-    baloo
-    kfilemetadata
-    kirigami2
-    kirigami-addons
-    kitemmodels
-    kquickcharts
-    plasma-framework
-    qqc2-desktop-style
     qtbase
+    qtdeclarative
     qtquickcontrols2
-    qtwebsockets
+    qtwebchannel
     qtwebengine
+    qtwebsockets
+    baloo
+    karchive
+    kconfig
+    kcoreaddons
+    kdbusaddons
+    kfilemetadata
+    ki18n
+    kirigami-addons
+    kquickcharts
+    kwindowsystem
+    qqc2-desktop-style
   ];
 
   meta = with lib; {

pkgs/applications/kde/audiotube.nix

@@ -4,12 +4,14 @@
 , extra-cmake-modules
 , wrapGAppsHook
 
+, futuresql
 , gst_all_1
 , kcoreaddons
 , kcrash
 , ki18n
 , kirigami2
 , kirigami-addons
+, qcoro
 , qtimageformats
 , qtmultimedia
 , qtquickcontrols2
@@ -27,11 +29,13 @@ mkDerivation rec {
   ];
 
   buildInputs = [
+    futuresql
     kcoreaddons
     kcrash
     ki18n
     kirigami2
     kirigami-addons
+    qcoro
     qtimageformats
     qtmultimedia
     qtquickcontrols2

pkgs/applications/kde/cantor.nix

@@ -93,12 +93,7 @@ mkDerivation {
 
   qtWrapperArgs = [
     "--prefix PATH : ${placeholder "out"}/bin"
-  ];
+  ] ++ lib.optional withSage "--prefix PATH : ${sage-with-env}/bin";
-
-  postInstall = lib.optionalString withSage ''
-    wrapProgram $out/share/cantor/sagebackend/cantor-execsage \
-      --prefix PATH : ${sage-with-env}/bin
-  '';
 
   meta = with lib; {
     description = "Front end to powerful mathematics and statistics packages";

pkgs/applications/kde/default.nix

@@ -73,6 +73,7 @@ let
       akonadiconsole = callPackage ./akonadiconsole.nix {};
       akregator = callPackage ./akregator.nix {};
       analitza = callPackage ./analitza.nix {};
+      arianna = callPackage ./arianna.nix {};
       ark = callPackage ./ark {};
       baloo-widgets = callPackage ./baloo-widgets.nix {};
       bomber = callPackage ./bomber.nix {};
@@ -99,7 +100,7 @@ let
       kaccounts-providers = callPackage ./kaccounts-providers.nix {};
       kaddressbook = callPackage ./kaddressbook.nix {};
       kalarm = callPackage ./kalarm.nix {};
-      kalendar = callPackage ./kalendar.nix {};
+      merkuro = callPackage ./merkuro.nix {};
       kalzium = callPackage ./kalzium.nix {};
       kamoso = callPackage ./kamoso.nix {};
       kapman = callPackage ./kapman.nix {};
@@ -134,7 +135,6 @@ let
       kdiamond = callPackage ./kdiamond.nix {};
       keditbookmarks = callPackage ./keditbookmarks.nix {};
       kfind = callPackage ./kfind.nix {};
-      kfloppy = callPackage ./kfloppy.nix {};
       kgeography = callPackage ./kgeography.nix {};
       kget = callPackage ./kget.nix {};
       kgpg = callPackage ./kgpg.nix {};

pkgs/applications/kde/fetch.sh

@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/release-service/23.04.3/src -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/release-service/23.08.0/src -A '*.tar.xz' )

pkgs/applications/kde/kdenlive/default.nix

@@ -17,6 +17,7 @@
 , knotifyconfig
 , kplotting
 , ktextwidgets
+, mediainfo
 , mlt
 , shared-mime-info
 , libv4l
@@ -58,6 +59,7 @@ mkDerivation {
     knotifyconfig
     kplotting
     ktextwidgets
+    mediainfo
     mlt
     phonon-backend-gstreamer
     qtdeclarative
@@ -77,9 +79,11 @@ mkDerivation {
   # Both MLT and FFMpeg paths must be set or Kdenlive will complain that it
   # doesn't find them. See:
   # https://github.com/NixOS/nixpkgs/issues/83885
-  patches = [ ./mlt-path.patch ./ffmpeg-path.patch ];
+  patches = [ ./dependency-paths.patch ];
-  inherit mlt;
+
+  inherit mlt mediainfo;
   ffmpeg = ffmpeg-full;
+
   postPatch =
     # Module Qt5::Concurrent must be included in `find_package` before it is used.
     ''

pkgs/applications/kde/kdenlive/dependency-paths.patch

@@ -0,0 +1,46 @@
+diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
+index 029849e5f..8befe4888 100644
+--- a/src/kdenlivesettings.kcfg
++++ b/src/kdenlivesettings.kcfg
+@@ -517,7 +517,7 @@
+   <group name="env">
+     <entry name="mltpath" type="Path">
+       <label>Mlt framework install path.</label>
+-      <default></default>
++      <default>@mlt@/share/mlt/profiles</default>
+     </entry>
+ 
+     <entry name="kdenliverendererpath" type="Path">
+@@ -527,27 +527,27 @@
+ 
+     <entry name="meltpath" type="Path">
+       <label>Mlt melt renderer install path.</label>
+-      <default></default>
++      <default>@mlt@/bin/melt</default>
+     </entry>
+ 
+     <entry name="ffmpegpath" type="Path">
+       <label>FFmpeg / Libav binary path.</label>
+-      <default></default>
++      <default>@ffmpeg@/bin/ffmpeg</default>
+     </entry>
+ 
+     <entry name="ffplaypath" type="Path">
+       <label>FFplay / avplay binary path.</label>
+-      <default></default>
++      <default>@ffmpeg@/bin/ffplay</default>
+     </entry>
+ 
+     <entry name="ffprobepath" type="Path">
+       <label>FFprobe / avprobe binary path.</label>
+-      <default></default>
++      <default>@ffmpeg@/bin/ffprobe</default>
+     </entry>
+ 
+     <entry name="mediainfopath" type="Path">
+       <label>mediaInfo binary path.</label>
+-      <default></default>
++      <default>@mediainfo@/bin/mediainfo</default>
+     </entry>
+ 
+     <entry name="processingthreads" type="Int">

pkgs/applications/kde/kdenlive/ffmpeg-path.patch

@@ -1,25 +0,0 @@
-diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
-index 5edad5ae7..d35347a40 100644
---- a/src/kdenlivesettings.kcfg
-+++ b/src/kdenlivesettings.kcfg
-@@ -403,17 +403,17 @@
- 
-     <entry name="ffmpegpath" type="Path">
-       <label>FFmpeg / Libav binary path.</label>
--      <default></default>
-+      <default>@ffmpeg@/bin/ffmpeg</default>
-     </entry>
- 
-     <entry name="ffplaypath" type="Path">
-       <label>FFplay / avplay binary path.</label>
--      <default></default>
-+      <default>@ffmpeg@/bin/ffplay</default>
-     </entry>
- 
-     <entry name="ffprobepath" type="Path">
-       <label>FFprobe / avprobe binary path.</label>
--      <default></default>
-+      <default>@ffmpeg@/bin/ffprobe</default>
-     </entry>
- 
-     <entry name="mltthreads" type="Int">

pkgs/applications/kde/kdenlive/mlt-path.patch

@@ -1,22 +0,0 @@
-diff -ruN old/src/kdenlivesettings.kcfg new/src/kdenlivesettings.kcfg
---- old/src/kdenlivesettings.kcfg	2019-09-10 23:20:27.555392353 -0400
-+++ new/src/kdenlivesettings.kcfg	2019-09-10 23:25:47.533964155 -0400
-@@ -378,14 +378,14 @@
- </group>
- 
-   <group name="env">
--    <entry name="mltpath" type="Path">
-+    <entry name="mltpath" type="Path" hidden="true">
-       <label>Mlt framework install path.</label>
--      <default></default>
-+      <default>@mlt@/share/mlt/profiles</default>
-     </entry>
- 
--    <entry name="rendererpath" type="Path">
-+    <entry name="rendererpath" type="Path" hidden="true">
-       <label>Mlt melt renderer install path.</label>
--      <default></default>
-+      <default>@mlt@/bin/melt</default>
-     </entry>
- 
-     <entry name="ffmpegpath" type="Path">

pkgs/applications/kde/kfloppy.nix

@@ -1,20 +0,0 @@
-{ mkDerivation, lib, extra-cmake-modules, kdoctools, kcompletion, kxmlgui }:
-
-mkDerivation {
-  pname = "kfloppy";
-  meta = with lib; {
-    homepage = "https://kde.org/applications/en/utilities/org.kde.kfloppy";
-    description = "Utility to format 3.5\" and 5.25\" floppy disks";
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    kdoctools
-    kcompletion
-    kxmlgui
-  ];
-}

pkgs/applications/kde/merkuro.nix

@@ -41,8 +41,8 @@
 , messagelib
 }:
 
-mkDerivation rec {
+mkDerivation {
-  pname = "kalendar";
+  pname = "merkuro";
 
   nativeBuildInputs = [
     cmake
@@ -89,14 +89,11 @@ mkDerivation rec {
   ];
 
   propagatedUserEnvPkgs = [ akonadi kdepim-runtime akonadi-search ];
-  postFixup = ''
+  qtWrapperArgs = [''--prefix PATH : "${lib.makeBinPath [ akonadi kdepim-runtime akonadi-search ]}"''];
-    wrapProgram "$out/bin/kalendar" \
-      --prefix PATH : "${lib.makeBinPath [ akonadi kdepim-runtime akonadi-search ]}"
-  '';
 
   meta = with lib; {
     description = "A calendar application using Akonadi to sync with external services (Nextcloud, GMail, ...)";
-    homepage = "https://apps.kde.org/kalendar/";
+    homepage = "https://invent.kde.org/pim/merkuro";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ Thra11 ];
     platforms = platforms.linux;

pkgs/applications/kde/neochat.nix

@@ -1,6 +1,5 @@
 { mkDerivation
 , lib
-, fetchpatch
 
 , cmake
 , extra-cmake-modules
@@ -33,14 +32,6 @@
 mkDerivation {
   pname = "neochat";
 
-  patches = [
-    (fetchpatch {
-      name = "libquotient-0.8.patch";
-      url = "https://invent.kde.org/network/neochat/-/commit/d9d5e17be2a2057ab2ee545561fab721cb211f7f.patch";
-      hash = "sha256-y1PEehFCW+69OH8YvL3SUGOb8Hhyf8xwRvSZzJ5J5Wc=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     extra-cmake-modules

pkgs/applications/kde/skanpage.nix

@@ -1,15 +1,15 @@
 { lib
 , mkDerivation
-, fetchurl
 , extra-cmake-modules
 , kirigami2
 , ktextwidgets
 , libksane
 , qtquickcontrols2
 , kpurpose
+, kquickimageedit
 }:
 
-mkDerivation rec {
+mkDerivation {
   pname = "skanpage";
 
   nativeBuildInputs = [ extra-cmake-modules ];
@@ -20,13 +20,13 @@ mkDerivation rec {
     libksane
     qtquickcontrols2
     kpurpose
+    kquickimageedit
   ];
 
   meta = with lib; {
     description = "KDE utility to scan images and multi-page documents";
     homepage = "https://apps.kde.org/skanpage";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
     platforms = platforms.linux;
   };
 }

pkgs/applications/kde/spectacle.nix

@@ -5,21 +5,12 @@
 , knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi
 , qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator
 , qcoro, qtquickcontrols2, wayland, plasma-wayland-protocols, kpurpose, kpipewire
-, wrapGAppsHook, fetchpatch
+, wrapGAppsHook
 }:
 
 mkDerivation {
   pname = "spectacle";
 
-  patches = [
-    # backport fix for region capture with multi-display high-dpi setups
-    # FIXME: remove in 23.08
-    (fetchpatch {
-      url = "https://invent.kde.org/graphics/spectacle/-/commit/d0886c85445fad227b256152a549cb33bd97b776.patch";
-      hash = "sha256-t0+X1pzjlS2OWduMwQBoYbjh+o/SF4hOkAqzz/MJw3E=";
-    })
-  ];
-
   nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
   buildInputs = [
     kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications

pkgs/applications/kde/tokodon.nix

@@ -20,6 +20,7 @@
 , qtwebsockets
 , kitemmodels
 , pimcommon
+, mpv
 }:
 
 mkDerivation {
@@ -47,6 +48,7 @@ mkDerivation {
     qtwebsockets
     kitemmodels
     pimcommon
+    mpv
   ];
 
   meta = with lib; {

pkgs/applications/misc/tellico/default.nix

@@ -34,11 +34,6 @@ mkDerivation rec {
     hash = "sha256-opg4FbfOM48eqWQUJnMHH7KSo6x4S2DHd7ucPw6iTzg=";
   };
 
-  postPatch = ''
-    substituteInPlace src/gui/imagewidget.h \
-      --replace ksane_version.h KF5/ksane_version.h
-  '';
-
   nativeBuildInputs = [
     cmake
     extra-cmake-modules

pkgs/development/libraries/futuresql/default.nix

@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, cmake, extra-cmake-modules, qtbase }:
+stdenv.mkDerivation rec {
+  pname = "futuresql";
+  version = "0.1.1";
+
+  src = fetchurl {
+    url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz";
+    hash = "sha256-5E7Y1alhizynuimD7ZxfdXLm4KWxmflIaINLccy+vUM=";
+  };
+
+  nativeBuildInputs = [ cmake extra-cmake-modules ];
+  buildInputs = [ qtbase ];
+
+  # a library, nothing to wrap
+  dontWrapQtApps = true;
+}

pkgs/top-level/aliases.nix

@@ -2020,20 +2020,20 @@ mapAliases ({
   https://github.com/NixOS/nixpkgs/pull/101369 */
 
   inherit (plasma5Packages)
-    akonadi akregator ark bluedevil bomber bovo breeze-grub breeze-gtk
+    akonadi akregator arianna ark bluedevil bomber bovo breeze-grub breeze-gtk
     breeze-icons breeze-plymouth breeze-qt5 colord-kde discover dolphin dragon elisa falkon
     ffmpegthumbs filelight granatier gwenview k3b kactivitymanagerd kaddressbook
-    kalendar kalzium kapman kapptemplate kate katomic kblackbox kblocks kbounce
+    kalzium kapman kapptemplate kate katomic kblackbox kblocks kbounce
     kcachegrind kcalc kcharselect kcolorchooser kde-cli-tools kde-gtk-config
     kdenlive kdeplasma-addons kdevelop-pg-qt kdevelop-unwrapped kdev-php
-    kdev-python kdevelop kdf kdialog kdiamond keditbookmarks kfind kfloppy
+    kdev-python kdevelop kdf kdialog kdiamond keditbookmarks kfind
     kgamma5 kget kgpg khelpcenter kig kigo killbots kinfocenter kitinerary
     kleopatra klettres klines kmag kmail kmenuedit kmines kmix kmplot
     knavalbattle knetwalk knights kollision kolourpaint kompare konsole kontact
     konversation korganizer kpkpass krdc kreversi krfb kscreen kscreenlocker
     kshisen ksquares ksshaskpass ksystemlog kteatime ktimer ktorrent ktouch
     kturtle kwallet-pam kwalletmanager kwave kwayland-integration kwin kwrited
-    marble milou minuet okular oxygen oxygen-icons5 picmi
+    marble merkuro milou minuet okular oxygen oxygen-icons5 picmi
     plasma-browser-integration plasma-desktop plasma-integration plasma-nano
     plasma-nm plasma-pa plasma-mobile plasma-systemmonitor plasma-thunderbolt
     plasma-vault plasma-workspace plasma-workspace-wallpapers polkit-kde-agent
@@ -2041,6 +2041,9 @@ mapAliases ({
     systemsettings xdg-desktop-portal-kde yakuake zanshin
   ;
 
+  kalendar = merkuro;  # Renamed in 23.08
+  kfloppy = throw "kfloppy has been removed upstream in KDE Gear 23.08";
+
   inherit (plasma5Packages.thirdParty)
     krohnkite
     krunner-ssh

pkgs/top-level/all-packages.nix

@@ -19287,6 +19287,8 @@ with pkgs;
 
   funzzy = callPackage ../development/tools/misc/funzzy { };
 
+  futuresql = libsForQt5.callPackage ../development/libraries/futuresql { };
+
   fzf-make = callPackage ../development/tools/misc/fzf-make { };
 
   gede = libsForQt5.callPackage ../development/tools/misc/gede { };
@@ -30475,8 +30477,6 @@ with pkgs;
 
   argo-rollouts = callPackage ../applications/networking/cluster/argo-rollouts { };
 
-  arianna = libsForQt5.callPackage ../applications/misc/arianna { };
-
   ario = callPackage ../applications/audio/ario { };
 
   arion = callPackage ../applications/virtualization/arion { };