Merge pull request #22977 from ttuegel/triage-kde4

Remove KDE 4 desktop packages

14 files changed, 53 insertions, 339 deletions

diff --git a/pkgs/tools/bluetooth/bluedevil/default.nix b/pkgs/tools/bluetooth/bluedevil/default.nix
deleted file mode 100644
index e018972d2aaf..000000000000
--- a/pkgs/tools/bluetooth/bluedevil/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, cmake, automoc4, kdelibs, libbluedevil, shared_mime_info, gettext }:
-
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-  pname = "bluedevil";
-  # bluedevil must have the same major version (x.y) as libbluedevil!
-  # do not update this package without checking libbluedevil
-  version = "2.1.1";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
-    sha256 = "1rcx1dfm6sm90pvwyq224a1pph96chrmyiv1rry7zpb3hf2c73gi";
-  };
-
-  buildInputs = [ cmake kdelibs libbluedevil shared_mime_info automoc4 gettext ];
-
-  meta = with stdenv.lib; {
-    description = "Bluetooth manager for KDE";
-    license = stdenv.lib.licenses.gpl2;
-    inherit (kdelibs.meta) platforms;
-    maintainers = [ maintainers.phreedom ];
-  };
-
-}
diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix
index 4cab54d0b706..9af5de0476a7 100644
--- a/pkgs/tools/inputmethods/uim/default.nix
+++ b/pkgs/tools/inputmethods/uim/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs, ncurses,
+{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs4, ncurses,
  cmake, anthy, automoc4, m17n_lib, m17n_db}:
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     qt4
     gtk2
     gtk3
-    kdelibs
+    kdelibs4
     ncurses
     cmake
     anthy
diff --git a/pkgs/tools/misc/colord-kde/0.5.nix b/pkgs/tools/misc/colord-kde/0.5.nix
deleted file mode 100644
index 0c8e9d6bceef..000000000000
--- a/pkgs/tools/misc/colord-kde/0.5.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, lib, fetchurl
-, extra-cmake-modules, ki18n
-, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils
-, kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem
-, kitemviews, lcms2, libXrandr, qtx11extras
-}:
-
-stdenv.mkDerivation rec {
-  name = "colord-kde-${version}";
-  version = "0.5.0";
-
-  src = fetchurl {
-    url = "http://download.kde.org/stable/colord-kde/${version}/src/${name}.tar.xz";
-    sha256 = "0brdnpflm95vf4l41clrqxwvjrdwhs859n7401wxcykkmw4m0m3c";
-  };
-
-  nativeBuildInputs = [ extra-cmake-modules ki18n ];
-
-  buildInputs = [
-    kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes
-    kcmutils kio knotifications plasma-framework kwidgetsaddons
-    kwindowsystem kitemviews lcms2 libXrandr qtx11extras
-  ];
-
-  meta = with lib; {
-    homepage = "https://projects.kde.org/projects/playground/graphics/colord-kde";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ttuegel ];
-  };
-}
diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/tools/misc/colord-kde/default.nix
index 52e1845b300f..0c8e9d6bceef 100644
--- a/pkgs/tools/misc/colord-kde/default.nix
+++ b/pkgs/tools/misc/colord-kde/default.nix
@@ -1,26 +1,30 @@
-{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
-, colord, libX11, libXrandr, lcms2, kdelibs
+{ stdenv, lib, fetchurl
+, extra-cmake-modules, ki18n
+, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils
+, kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem
+, kitemviews, lcms2, libXrandr, qtx11extras
 }:
 
-stdenv.mkDerivation {
-  name = "colord-kde-0.3.0";
+stdenv.mkDerivation rec {
+  name = "colord-kde-${version}";
+  version = "0.5.0";
 
   src = fetchurl {
-    url = http://download.kde.org/stable/colord-kde/0.3.0/src/colord-kde-0.3.0.tar.bz2;
-    sha256 = "ab3cdb7c8c98aa2ee8de32a92f87770e1fbd58eade6471f3f24d932b50b4cf09";
+    url = "http://download.kde.org/stable/colord-kde/${version}/src/${name}.tar.xz";
+    sha256 = "0brdnpflm95vf4l41clrqxwvjrdwhs859n7401wxcykkmw4m0m3c";
   };
 
-  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
+  nativeBuildInputs = [ extra-cmake-modules ki18n ];
 
-  buildInputs = [ colord libX11 libXrandr lcms2 kdelibs ];
+  buildInputs = [
+    kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes
+    kcmutils kio knotifications plasma-framework kwidgetsaddons
+    kwindowsystem kitemviews lcms2 libXrandr qtx11extras
+  ];
 
-  patches = [ ./fix_check_include_files.patch ];
-  patchFlags = [ "-p0" ];
-
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "A colord front-end for KDE";
-    license = stdenv.lib.licenses.gpl2Plus;
+  meta = with lib; {
+    homepage = "https://projects.kde.org/projects/playground/graphics/colord-kde";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ ttuegel ];
   };
 }
diff --git a/pkgs/tools/misc/colord-kde/fix_check_include_files.patch b/pkgs/tools/misc/colord-kde/fix_check_include_files.patch
deleted file mode 100644
index 16d14a6a647a..000000000000
--- a/pkgs/tools/misc/colord-kde/fix_check_include_files.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- CMakeLists.txt.orig	2013-05-01 05:04:34.000000000 +1000

-+++ CMakeLists.txt	2015-12-10 20:43:51.351800988 +1100

-@@ -9,6 +9,7 @@

- include(FindPkgConfig)

- include(KDE4Defaults)

-+include(CheckIncludeFiles)

- include(ConfigureChecks.cmake)

- 

- message(STATUS "X randr is required, found: " ${XRANDR_1_3_FOUND})
\ No newline at end of file
diff --git a/pkgs/tools/misc/kde-gtk-config/default.nix b/pkgs/tools/misc/kde-gtk-config/default.nix
deleted file mode 100644
index 41aaad553463..000000000000
--- a/pkgs/tools/misc/kde-gtk-config/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, gtk2, gtk3, kdelibs, libxcb, libpthreadstubs, libXdmcp
-, glib, gdk_pixbuf
-}:
-
-stdenv.mkDerivation {
-  name = "kde-gtk-config-2.2.1";
-  src = fetchurl {
-    url = "mirror://kde/stable/kde-gtk-config/2.2.1/src/kde-gtk-config-2.2.1.tar.xz";
-    sha256 = "11aw86jcjcg3ywnzrxy9x8dvd73my18k0if52fnvyvmb75z0v2cw";
-  };
-
-  buildInputs = [
-    gdk_pixbuf glib gtk2 gtk3 kdelibs libxcb libpthreadstubs libXdmcp
-  ];
-
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-
-  patches = [
-    ./kde-gtk-config-2.2.1-install-paths.patch
-    ./kde-gtk-config-follow-symlinks.patch
-  ];
-
-  cmakeFlags = ''
-    -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include
-    -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include
-    -DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0
-    -DKDE4_LIBEXEC_INSTALL_DIR=lib/kde4/libexec
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://projects.kde.org/projects/extragear/base/kde-gtk-config;
-    description = "GTK configuration module for KDE System Settings";
-    longDescription = ''
-      Configuration dialog to adapt GTK applications appearance to your taste under KDE.
-      Among its many features, it lets you:
-      - Choose which theme is used for GTK2 and GTK3 applications.
-      - Tweak some GTK applications behaviour.
-      - Select what icon theme to use in GTK applications.
-      - Select GTK applications default fonts.
-      - Easily browse and install new GTK2 and GTK3 themes.
-    '';
-    platforms = platforms.linux;
-    license = licenses.gpl3;
-    maintainers = [ maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-2.2.1-install-paths.patch b/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-2.2.1-install-paths.patch
deleted file mode 100644
index e6596ef0dcc7..000000000000
--- a/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-2.2.1-install-paths.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur kde-gtk-config-2.2.1-a/gtk3proxies/CMakeLists.txt kde-gtk-config-2.2.1-b/gtk3proxies/CMakeLists.txt
---- kde-gtk-config-2.2.1-a/gtk3proxies/CMakeLists.txt	2013-03-18 06:02:39.000000000 -0500
-+++ kde-gtk-config-2.2.1-b/gtk3proxies/CMakeLists.txt	2013-12-24 18:57:59.854264894 -0600
-@@ -6,4 +6,4 @@
- 
- add_executable(gtk3_preview preview3.c)
- target_link_libraries(gtk3_preview ${GTK3_LIBRARY} ${GOBJECT2_LIBRARY} ${GLIB2_LIBRARY})
--install(TARGETS gtk3_preview  RUNTIME DESTINATION "${KDE4_LIBEXEC_INSTALL_DIR}")
-+install(TARGETS gtk3_preview  RUNTIME DESTINATION bin)
-diff -ur kde-gtk-config-2.2.1-a/gtkproxies/CMakeLists.txt kde-gtk-config-2.2.1-b/gtkproxies/CMakeLists.txt
---- kde-gtk-config-2.2.1-a/gtkproxies/CMakeLists.txt	2013-03-18 06:02:39.000000000 -0500
-+++ kde-gtk-config-2.2.1-b/gtkproxies/CMakeLists.txt	2013-12-24 18:57:40.967781611 -0600
-@@ -4,13 +4,13 @@
- 
- add_executable(reload_gtk_apps reload.c)
- target_link_libraries(reload_gtk_apps ${GTK2_LIBRARIES})
--install(TARGETS reload_gtk_apps RUNTIME DESTINATION "${KDE4_LIBEXEC_INSTALL_DIR}")
-+install(TARGETS reload_gtk_apps RUNTIME DESTINATION bin)
- 
- add_definitions("-DDATA_DIR=\\\"${DATA_INSTALL_DIR}/kcm-gtk-module/\\\"")
- 
- add_executable(gtk_preview preview.c)
- target_link_libraries(gtk_preview ${GTK2_LIBRARIES} ${GTK2_GIOMM_LIBRARY})
--install(TARGETS gtk_preview RUNTIME DESTINATION "${KDE4_LIBEXEC_INSTALL_DIR}")
-+install(TARGETS gtk_preview RUNTIME DESTINATION bin)
- 
- # preview file used for the gtk3 version too
- install(FILES preview.ui
diff --git a/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-follow-symlinks.patch b/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-follow-symlinks.patch
deleted file mode 100644
index e291589e82e3..000000000000
--- a/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-follow-symlinks.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/appearancegtk2.cpp b/src/appearancegtk2.cpp
-index 3d89c82..4dcce69 100644
---- a/src/appearancegtk2.cpp
-+++ b/src/appearancegtk2.cpp
-@@ -56,7 +56,7 @@ QString AppearanceGTK2::themesGtkrcFile(const QString& themeName) const
-     QStringList themes=installedThemes();
-     themes=themes.filter(QRegExp("/"+themeName+"/?$"));
-     if(themes.size()==1) {
--        QDirIterator it(themes.first(), QDirIterator::Subdirectories);
-+        QDirIterator it(themes.first(), QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while(it.hasNext()) {
-             it.next();
-             if(it.fileName()=="gtkrc") {
diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix
deleted file mode 100644
index 156f03dad876..000000000000
--- a/pkgs/tools/misc/partition-manager/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, cmake, gettext, automoc4, perl
-, parted, libuuid, qt4, kdelibs, kde_baseapps, phonon, libatasmart
-}:
-
-stdenv.mkDerivation rec {
-  name = "partitionmanager-1.0.3_p20120804";
-
-  src = fetchurl {
-    #url = "mirror://sourceforge/partitionman/${name}.tar.bz2";
-    # the upstream version is old and doesn't build
-    url = "http://dev.gentoo.org/~kensington/distfiles/${name}.tar.bz2";
-    sha256 = "1j6zpgj8xs98alzxvcibwch9yj8jsx0s7y864gbdx280jmj8c1np";
-  };
-
-  buildInputs = [
-    pkgconfig cmake gettext automoc4 perl
-    parted libuuid qt4 kdelibs kde_baseapps phonon libatasmart
-  ];
-
-  preConfigure = ''
-    export VERBOSE=1
-    cmakeFlagsArray=($cmakeFlagsArray -DGETTEXT_INCLUDE_DIR=${gettext}/include -DCMAKE_INCLUDE_PATH=${qt4}/include/QtGui )
-  '';
-
-  postInstall = ''
-    set -x
-    rpath=`patchelf --print-rpath $out/bin/partitionmanager-bin`:${qt4}/lib
-    for p in $out/bin/partitionmanager-bin; do
-      patchelf --set-rpath $rpath $p
-    done
-  '';
-
-  meta = {
-    description = "Utility program to help you manage the disk devices";
-    homepage = http://www.kde-apps.org/content/show.php/KDE+Partition+Manager?content=89595; # ?
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/tools/networking/plasma-nm/default.nix b/pkgs/tools/networking/plasma-nm/default.nix
deleted file mode 100644
index f0f379d38295..000000000000
--- a/pkgs/tools/networking/plasma-nm/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kdelibs, networkmanager, libnm-qt, glib }:
-
-let
-  pname = "plasma-nm";
-  version = "0.9.3.4";
-  name = "${pname}-${version}";
-in
-stdenv.mkDerivation {
-  inherit name;
-
-  src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${name}.tar.xz";
-    sha256 = "0xj14isvjq8ll70b6q66n8adm8ff4j9ng195ndk2gmavjf6bb751";
-  };
-
-  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
-
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-
-  buildInputs = [ kdelibs networkmanager libnm-qt ];
-
-  meta = with stdenv.lib; {
-    homepage = "https://projects.kde.org/projects/kde/workspace/plasma-nm";
-    description = "Plasma applet written in QML for managing network connections";
-    license = licenses.lgpl21;
-    inherit (kdelibs.meta) platforms;
-  };
-}
diff --git a/pkgs/tools/security/ksshaskpass/default.nix b/pkgs/tools/security/ksshaskpass/default.nix
deleted file mode 100644
index a668f57c5bbe..000000000000
--- a/pkgs/tools/security/ksshaskpass/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, kdelibs
-, automoc4, cmake, perl, pkgconfig
-}:
-
-stdenv.mkDerivation {
-  name = "ksshaskpass-0.5.3";
-
-  src = fetchurl {
-    url = http://kde-apps.org/CONTENT/content-files/50971-ksshaskpass-0.5.3.tar.gz;
-    sha256 = "0911i8jr0nzqah8xidb8wba55a2skaidj3klv3cw6bm5fjx7x953";
-  };
-
-  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
-
-  buildInputs = [ kdelibs ];
-
-  patchPhase = ''
-    sed -i 's@/usr/bin/@@' src/ksshaskpass.desktop
-  '';
-
-  meta = {
-    homepage = http://kde-apps.org/content/show.php?content=50971;
-    description = "A KDE 4 version of ssh-askpass with KWallet support";
-    license = stdenv.lib.licenses.gpl2Plus;
-    inherit (kdelibs.meta) platforms;
-  };
-}
diff --git a/pkgs/tools/security/polkit-kde-agent/default.nix b/pkgs/tools/security/polkit-kde-agent/default.nix
deleted file mode 100644
index 6b4bcf7ad637..000000000000
--- a/pkgs/tools/security/polkit-kde-agent/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kdelibs, polkit_qt4 }:
-
-stdenv.mkDerivation rec {
-  name = "polkit-kde-agent-1-0.99.0";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/apps/KDE4.x/admin/${name}.tar.bz2";
-    sha256 = "0rxlq6x0vhvha8i6w109zpzzacp4imins55v4p4fq7a3k0kgywg3";
-  };
-
-  buildInputs = [ kdelibs polkit_qt4 ];
-
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-
-  patchPhase = "sed -e s/KDE4_AUTOSTART/AUTOSTART/ -i CMakeLists.txt";
-
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
-    description = "PolicyKit authentication agent for KDE";
-  };
-}
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" ];
-}