From 0f72d3c8cc8e2328d3aa23bddae2616a206661d1 Mon Sep 17 00:00:00 2001
From: Klemens Nanni <klemens@posteo.de>
Date: Fri, 8 Jul 2022 01:44:40 +0400
Subject: [PATCH] konversation: Update/move to KDE Gear

1.7.7 from october 2020 was the last version before Konversation adapted
the KDE Gear versioning schema, so move and thus update it accordingly.
---
 pkgs/applications/kde/default.nix              |  1 +
 .../default.nix => kde/konversation.nix}       | 14 +++++---------
 pkgs/top-level/aliases.nix                     | 18 +++++++++---------
 pkgs/top-level/all-packages.nix                |  2 --
 4 files changed, 15 insertions(+), 20 deletions(-)
 rename pkgs/applications/{networking/irc/konversation/default.nix => kde/konversation.nix} (80%)

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index b5494ceffb63..146ee9b145a7 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -173,6 +173,7 @@ let
       konquest = callPackage ./konquest.nix {};
       konsole = callPackage ./konsole.nix {};
       kontact = callPackage ./kontact.nix {};
+      konversation = callPackage ./konversation.nix {};
       kontactinterface = callPackage ./kontactinterface.nix {};
       korganizer = callPackage ./korganizer.nix {};
       kpat = callPackage ./kpat.nix {};
diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/kde/konversation.nix
similarity index 80%
rename from pkgs/applications/networking/irc/konversation/default.nix
rename to pkgs/applications/kde/konversation.nix
index 3c80ef09aaf7..696a44a8d3b9 100644
--- a/pkgs/applications/networking/irc/konversation/default.nix
+++ b/pkgs/applications/kde/konversation.nix
@@ -1,7 +1,5 @@
 { mkDerivation
 , lib
-, fetchurl
-, fetchpatch
 , extra-cmake-modules
 , kdoctools
 , kbookmarks
@@ -17,6 +15,7 @@
 , kiconthemes
 , kidletime
 , kitemviews
+, knewstuff
 , knotifications
 , knotifyconfig
 , kwindowsystem
@@ -26,16 +25,11 @@
 , solid
 , sonnet
 , phonon
+, qtmultimedia
 }:
 
-mkDerivation rec {
+mkDerivation {
   pname = "konversation";
-  version = "1.7.7";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
-    sha256 = "R+wWHBOFmBqLmdKMQZ6Iskgj3AG2j7FiOJSBiXTCGKc=";
-  };
 
   buildInputs = [
     kbookmarks
@@ -52,6 +46,7 @@ mkDerivation rec {
     kiconthemes
     kidletime
     kitemviews
+    knewstuff
     knotifications
     knotifyconfig
     kwindowsystem
@@ -61,6 +56,7 @@ mkDerivation rec {
     solid
     sonnet
     phonon
+    qtmultimedia
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 22efa20655eb..bf0a61c3c2e8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1655,15 +1655,15 @@ mapAliases ({
     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
-    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 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 powerdevil qqc2-breeze-style
-    sddm-kcm skanlite skanpage spectacle systemsettings xdg-desktop-portal-kde
-    yakuake zanshin
+    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
+    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
+    powerdevil qqc2-breeze-style sddm-kcm skanlite skanpage spectacle
+    systemsettings xdg-desktop-portal-kde yakuake zanshin
   ;
 
   inherit (plasma5Packages.thirdParty)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dba8666286e7..a618c2a757fd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28043,8 +28043,6 @@ with pkgs;
 
   kondo = callPackage ../applications/misc/kondo { };
 
-  konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { };
-
   kooha = callPackage ../applications/video/kooha { };
 
   # Qt 5.15 is not default on mac, tdesktop requires 5.15 (and kotatogram subsequently)