Remove kde4.kdiff3

- Already updated to KDE 5 in Nixpkgs

4 files changed, 33 insertions, 56 deletions

diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix
index 664fb87b5205..f1ae958ed637 100644
--- a/pkgs/tools/text/kdiff3/default.nix
+++ b/pkgs/tools/text/kdiff3/default.nix
@@ -1,22 +1,37 @@
-{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
-, kdelibs, gettext
+{
+  kdeDerivation, kdeWrapper, lib, fetchgit,
+  ecm, kdoctools, kconfig, kinit, kparts
 }:
 
-stdenv.mkDerivation rec {
-  name = "kdiff3-0.9.98";
-  src = fetchurl {
-    url = "mirror://sourceforge/kdiff3/${name}.tar.gz";
-    sha256 = "0s6n1whkf5ck2r8782a9l8b736cj2p05and1vjjh7d02pax1lb40";
-  };
+let
+  rev = "468652ce70b1214842cef0a021c81d056ec6aa01";
+
+  unwrapped = kdeDerivation rec {
+    name = "kdiff3-${version}";
+    version = "1.7.0-${lib.strings.substring 0 7 rev}";
+
+    src = fetchgit {
+      url = "https://gitlab.com/tfischer/kdiff3";
+      sha256 = "126xl7jbb26v2970ba1rw1d6clhd14p1f2avcwvj8wzqmniq5y5m";
+      inherit rev;
+    };
 
-  buildInputs = [ kdelibs ];
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
+    preConfigure = "cd kdiff3";
 
-  meta = {
-    homepage = http://kdiff3.sourceforge.net/;
-    license = stdenv.lib.licenses.gpl2Plus;
-    description = "Compares and merges 2 or 3 files or directories";
-    maintainers = with stdenv.lib.maintainers; [viric urkud];
-    platforms = with stdenv.lib.platforms; linux;
+    nativeBuildInputs = [ ecm kdoctools ];
+
+    propagatedBuildInputs = [ kconfig kinit kparts ];
+
+    meta = with lib; {
+      homepage = http://kdiff3.sourceforge.net/;
+      license = licenses.gpl2Plus;
+      description = "Compares and merges 2 or 3 files or directories";
+      maintainers = with maintainers; [ viric urkud peterhoeg ];
+      platforms = with platforms; linux;
+    };
   };
+
+in kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/kdiff3" ];
 }
diff --git a/pkgs/tools/text/kdiff3/kde5.nix b/pkgs/tools/text/kdiff3/kde5.nix
deleted file mode 100644
index f1ae958ed637..000000000000
--- a/pkgs/tools/text/kdiff3/kde5.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  kdeDerivation, kdeWrapper, lib, fetchgit,
-  ecm, kdoctools, kconfig, kinit, kparts
-}:
-
-let
-  rev = "468652ce70b1214842cef0a021c81d056ec6aa01";
-
-  unwrapped = kdeDerivation rec {
-    name = "kdiff3-${version}";
-    version = "1.7.0-${lib.strings.substring 0 7 rev}";
-
-    src = fetchgit {
-      url = "https://gitlab.com/tfischer/kdiff3";
-      sha256 = "126xl7jbb26v2970ba1rw1d6clhd14p1f2avcwvj8wzqmniq5y5m";
-      inherit rev;
-    };
-
-    preConfigure = "cd kdiff3";
-
-    nativeBuildInputs = [ ecm kdoctools ];
-
-    propagatedBuildInputs = [ kconfig kinit kparts ];
-
-    meta = with lib; {
-      homepage = http://kdiff3.sourceforge.net/;
-      license = licenses.gpl2Plus;
-      description = "Compares and merges 2 or 3 files or directories";
-      maintainers = with maintainers; [ viric urkud peterhoeg ];
-      platforms = with platforms; linux;
-    };
-  };
-
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/kdiff3" ];
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d6d32e59d2b7..4d721bfdad09 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -59,6 +59,7 @@ doNotDisplayTwice rec {
   inotifyTools = inotify-tools;
   joseki = apache-jena-fuseki; # added 2016-02-28
   jquery_ui = jquery-ui;  # added 2014-09-07
+  kdiff3-qt5 = kdiff3; # added 2017-02-18
   keepassx2-http = keepassx-reboot; # added 2016-10-17
   keepassx-reboot = keepassx-community; # added 2017-02-01
   keybase-go = keybase;  # added 2016-08-24
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84229ed4e3a2..204881c49983 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2455,7 +2455,7 @@ with pkgs;
 
   kronometer = qt5.callPackage ../tools/misc/kronometer { };
 
-  kdiff3-qt5 = qt5.callPackage ../tools/text/kdiff3/kde5.nix { };
+  kdiff3 = qt5.callPackage ../tools/text/kdiff3 { };
 
   peruse = qt5.callPackage ../tools/misc/peruse { };
 
@@ -16735,8 +16735,6 @@ with pkgs;
 
         kdesvn = callPackage ../applications/version-management/kdesvn { };
 
-        kdiff3 = callPackage ../tools/text/kdiff3 { };
-
         kgraphviewer = callPackage ../applications/graphics/kgraphviewer { };
 
         kile = callPackage ../applications/editors/kile { };