From 545e675cefe39479d7e910d02b85c94dc2c5ebd9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 12:06:07 -0600
Subject: [PATCH] Remove kde4.konversation

- Already updated to KDE 5 in Nixpkgs
---
 .../networking/irc/konversation/1.6.nix       | 82 ----------------
 .../networking/irc/konversation/default.nix   | 96 +++++++++++++++----
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 77 insertions(+), 105 deletions(-)
 delete mode 100644 pkgs/applications/networking/irc/konversation/1.6.nix

diff --git a/pkgs/applications/networking/irc/konversation/1.6.nix b/pkgs/applications/networking/irc/konversation/1.6.nix
deleted file mode 100644
index 9724ae5f4bf0..000000000000
--- a/pkgs/applications/networking/irc/konversation/1.6.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-{ kdeDerivation
-, lib
-, fetchurl
-, ecm
-, kbookmarks
-, karchive
-, kconfig
-, kconfigwidgets
-, kcoreaddons
-, kdbusaddons
-, kdeWrapper
-, kdoctools
-, kemoticons
-, kglobalaccel
-, ki18n
-, kiconthemes
-, kidletime
-, kitemviews
-, knotifications
-, knotifyconfig
-, kio
-, kparts
-, kwallet
-, makeQtWrapper
-, solid
-, sonnet
-, phonon
-}:
-
-let
-  unwrapped = let
-    pname = "konversation";
-    version = "1.6.2";
-  in kdeDerivation rec {
-    name = "${pname}-${version}";
-
-    src = fetchurl {
-      url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
-      sha256 = "1798sslwz7a3h1v524ra33p0j5iqvcg0v1insyvb5qp4kv11slmn";
-    };
-
-    buildInputs = [
-      kbookmarks
-      karchive
-      kconfig
-      kconfigwidgets
-      kcoreaddons
-      kdbusaddons
-      kdoctools
-      kemoticons
-      kglobalaccel
-      ki18n
-      kiconthemes
-      kidletime
-      kitemviews
-      knotifications
-      knotifyconfig
-      kio
-      kparts
-      kwallet
-      solid
-      sonnet
-      phonon
-    ];
-
-    nativeBuildInputs = [
-      ecm
-      kdoctools
-    ];
-
-    meta = {
-      description = "Integrated IRC client for KDE";
-      license = with lib.licenses; [ gpl2 ];
-      maintainers = with lib.maintainers; [ fridh ];
-      homepage = https://konversation.kde.org;
-    };
-  };
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/konversation" ];
-}
-
diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix
index cbe4e3be28d4..9724ae5f4bf0 100644
--- a/pkgs/applications/networking/irc/konversation/default.nix
+++ b/pkgs/applications/networking/irc/konversation/default.nix
@@ -1,26 +1,82 @@
-{ stdenv, fetchurl, cmake, qt4, perl, gettext, libXScrnSaver
-, kdelibs, kdepimlibs, automoc4, phonon, qca2}:
+{ kdeDerivation
+, lib
+, fetchurl
+, ecm
+, kbookmarks
+, karchive
+, kconfig
+, kconfigwidgets
+, kcoreaddons
+, kdbusaddons
+, kdeWrapper
+, kdoctools
+, kemoticons
+, kglobalaccel
+, ki18n
+, kiconthemes
+, kidletime
+, kitemviews
+, knotifications
+, knotifyconfig
+, kio
+, kparts
+, kwallet
+, makeQtWrapper
+, solid
+, sonnet
+, phonon
+}:
 
 let
-  pn = "konversation";
-  v = "1.5.1";
-in
+  unwrapped = let
+    pname = "konversation";
+    version = "1.6.2";
+  in kdeDerivation rec {
+    name = "${pname}-${version}";
 
-stdenv.mkDerivation rec {
-  name = "${pn}-${v}";
+    src = fetchurl {
+      url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+      sha256 = "1798sslwz7a3h1v524ra33p0j5iqvcg0v1insyvb5qp4kv11slmn";
+    };
 
-  src = fetchurl {
-    url = "mirror://kde/stable/${pn}/${v}/src/${name}.tar.xz";
-    sha256 = "11hrjrq4r6v1v14ybx9llgzmrl3a45z26n292nb0q887rg1qv0wp";
-  };
-
-  buildInputs = [ cmake qt4 perl gettext libXScrnSaver kdelibs kdepimlibs
-    automoc4 phonon qca2 ];
-
-  meta = with stdenv.lib; {
-    description = "Integrated IRC client for KDE";
-    repositories.git = git://anongit.kde.org/konversation;
-    license = "GPL";
-    inherit (kdelibs.meta) maintainers platforms;
+    buildInputs = [
+      kbookmarks
+      karchive
+      kconfig
+      kconfigwidgets
+      kcoreaddons
+      kdbusaddons
+      kdoctools
+      kemoticons
+      kglobalaccel
+      ki18n
+      kiconthemes
+      kidletime
+      kitemviews
+      knotifications
+      knotifyconfig
+      kio
+      kparts
+      kwallet
+      solid
+      sonnet
+      phonon
+    ];
+
+    nativeBuildInputs = [
+      ecm
+      kdoctools
+    ];
+
+    meta = {
+      description = "Integrated IRC client for KDE";
+      license = with lib.licenses; [ gpl2 ];
+      maintainers = with lib.maintainers; [ fridh ];
+      homepage = https://konversation.kde.org;
+    };
   };
+in kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/konversation" ];
 }
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b2b40d142cb5..89ef5f5e4f78 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14020,7 +14020,7 @@ with pkgs;
     stdenv = overrideCC stdenv gcc49;
   };
 
-  konversation = qt5.callPackage ../applications/networking/irc/konversation/1.6.nix { };
+  konversation = qt5.callPackage ../applications/networking/irc/konversation { };
 
   krita = qt5.callPackage ../applications/graphics/krita {
     vc = vc_0_7;
@@ -16745,8 +16745,6 @@ with pkgs;
 
         kipi_plugins = callPackage ../applications/graphics/kipi-plugins { };
 
-        konversation = callPackage ../applications/networking/irc/konversation { };
-
         ktikz = callPackage ../applications/graphics/ktikz { };
 
         kvirc = callPackage ../applications/networking/irc/kvirc { };