about summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2017-12-28 08:22:27 +0800
committerGitHub <noreply@github.com>2017-12-28 08:22:27 +0800
commit779805181719b488b41bcc920fd858246ad53ec8 (patch)
treee0df3600d1861eece2e7b1382c8e43fd29b03bac /pkgs/desktops
parentd890212ac872aa9f5e05b35579be9e7d1e649c16 (diff)
parent269e5c4cc1280d1080578b538087a284495c878c (diff)
downloadnixlib-779805181719b488b41bcc920fd858246ad53ec8.tar
nixlib-779805181719b488b41bcc920fd858246ad53ec8.tar.gz
nixlib-779805181719b488b41bcc920fd858246ad53ec8.tar.bz2
nixlib-779805181719b488b41bcc920fd858246ad53ec8.tar.lz
nixlib-779805181719b488b41bcc920fd858246ad53ec8.tar.xz
nixlib-779805181719b488b41bcc920fd858246ad53ec8.tar.zst
nixlib-779805181719b488b41bcc920fd858246ad53ec8.zip
Merge pull request #32927 from peterhoeg/u/kdeapp
kde-applications: 17.08.3 -> 17.12.0
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/kde-4.14/CVE-2014-8600.diff19
-rw-r--r--pkgs/desktops/kde-4.14/default.nix36
-rw-r--r--pkgs/desktops/kde-4.14/files/ksysguard-0001-disable-signalplottertest.patch36
-rw-r--r--pkgs/desktops/kde-4.14/kactivities.nix21
-rw-r--r--pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix15
-rw-r--r--pkgs/desktops/kde-4.14/kde-package/4.14.3.nix71
-rw-r--r--pkgs/desktops/kde-4.14/kde-package/default.nix138
-rwxr-xr-xpkgs/desktops/kde-4.14/kde-package/kde-manifest.sh173
-rw-r--r--pkgs/desktops/kde-4.14/kde-package/kde-submodules.xslt22
-rw-r--r--pkgs/desktops/kde-4.14/kdeedu/marble.nix12
-rw-r--r--pkgs/desktops/kde-4.14/kdegraphics/libkdcraw.nix11
-rw-r--r--pkgs/desktops/kde-4.14/kdegraphics/libkexiv2.nix10
-rw-r--r--pkgs/desktops/kde-4.14/kdegraphics/okular.nix17
-rw-r--r--pkgs/desktops/kde-4.14/kdegraphics/svgpart.nix10
-rw-r--r--pkgs/desktops/kde-4.14/kdelibs/baloo.nix18
-rw-r--r--pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix14
-rw-r--r--pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix8
-rw-r--r--pkgs/desktops/kde-4.14/kdepimlibs.nix35
-rw-r--r--pkgs/desktops/kde-4.14/l10n/default.nix52
-rwxr-xr-xpkgs/desktops/kde-4.14/l10n/l10n-manifest.sh32
-rw-r--r--pkgs/desktops/kde-4.14/l10n/manifest-4.14.3.nix267
-rw-r--r--pkgs/desktops/kde-4.14/support/akonadi/default.nix24
-rw-r--r--pkgs/desktops/plasma-5/breeze-qt4.nix17
-rw-r--r--pkgs/desktops/plasma-5/default.nix1
24 files changed, 0 insertions, 1059 deletions
diff --git a/pkgs/desktops/kde-4.14/CVE-2014-8600.diff b/pkgs/desktops/kde-4.14/CVE-2014-8600.diff
deleted file mode 100644
index 1fe26484605e..000000000000
--- a/pkgs/desktops/kde-4.14/CVE-2014-8600.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/kioslave/bookmarks/kio_bookmarks.cpp
-+++ b/kioslave/bookmarks/kio_bookmarks.cpp
-@@ -22,6 +22,7 @@
- #include <stdlib.h>
- 
- #include <qregexp.h>
-+#include <qtextdocument.h>
- 
- #include <kapplication.h>
- #include <kcmdlineargs.h>
-@@ -197,7 +198,7 @@
-     echoImage(regexp.cap(1), regexp.cap(2), url.queryItem("size"));
-   } else {
-     echoHead();
--    echo("<p class=\"message\">" + i18n("Wrong request: %1",path) + "</p>");
-+    echo("<p class=\"message\">" + i18n("Bad request: %1", Qt::escape(Qt::escape(url.prettyUrl()))) + "</p>");
-   }
-   finished();
- }
diff --git a/pkgs/desktops/kde-4.14/default.nix b/pkgs/desktops/kde-4.14/default.nix
deleted file mode 100644
index 02cd509537d1..000000000000
--- a/pkgs/desktops/kde-4.14/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.14.3", kdelibs }:
-
-let
-  branch = "4.14";
-
-  # Need callPackageOrig to avoid infinite cycle
-  kde = callPackageOrig ./kde-package {
-    inherit release branch ignoreList extraSubpkgs callPackage;
-  };
-
-  # The list of igored individual modules
-  ignoreList = {
-    # Doesn't work yet
-    kdeutils = [ "ksecrets" ];
-    # kdeadmin/strigi-analyzer has no real code
-    kdeadmin = [ "strigi-analyzer" ];
-    # Most of kdebindings do not compile due to a bug in the buildsystem
-    kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde" "qyoto" ];
-  };
-
-  # Extra subpackages in the manifest format
-  extraSubpkgs = {};
-
-in
-
-kde.modules // kde.individual //
-{
-  akonadi = callPackage ./support/akonadi { };
-
-  inherit release;
-
-  l10n = callPackage ./l10n {
-    inherit release branch;
-    inherit (kde.manifest) stable;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/files/ksysguard-0001-disable-signalplottertest.patch b/pkgs/desktops/kde-4.14/files/ksysguard-0001-disable-signalplottertest.patch
deleted file mode 100644
index cd19b7e2d72a..000000000000
--- a/pkgs/desktops/kde-4.14/files/ksysguard-0001-disable-signalplottertest.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 38f35dcec38458f7192424b3d63bc0c614bb86e0 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 7 Sep 2015 18:55:44 -0500
-Subject: [PATCH] ksysguard disable signalplottertest
-
----
- libs/ksysguard/tests/CMakeLists.txt | 16 ----------------
- 1 file changed, 16 deletions(-)
-
-diff --git a/libs/ksysguard/tests/CMakeLists.txt b/libs/ksysguard/tests/CMakeLists.txt
-index d472fd7..f178b71 100644
---- a/libs/ksysguard/tests/CMakeLists.txt
-+++ b/libs/ksysguard/tests/CMakeLists.txt
-@@ -14,19 +14,3 @@ target_link_libraries(processtest processui ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIB
- set( signalplotterbenchmark_SRCS signalplotterbenchmark.cpp ../signalplotter/ksignalplotter.cpp)
- kde4_add_unit_test( signalplotterbenchmark TESTNAME ksysguard-signalplottertest ${signalplotterbenchmark_SRCS} )
- target_link_libraries( signalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} )
--
--
--# KGraphicsSignalPlotter benchmark
--set( graphicssignalplotterbenchmark_SRCS graphicssignalplotterbenchmark.cpp ../signalplotter/kgraphicssignalplotter.cpp)
--kde4_add_unit_test( graphicssignalplotterbenchmark TESTNAME ksysguard-signalplottertest ${graphicssignalplotterbenchmark_SRCS} )
--target_link_libraries( graphicssignalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} )
--
--
--# KSignalPlotter unit test
--set( signalplottertest_SRCS signalplottertest.cpp ../signalplotter/ksignalplotter.cpp)
--kde4_add_unit_test( signalplottertest TESTNAME ksysguard-signalplottertest ${signalplottertest_SRCS} )
--target_link_libraries( signalplottertest ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} )
--
--
--
--
--- 
-2.5.0
-
diff --git a/pkgs/desktops/kde-4.14/kactivities.nix b/pkgs/desktops/kde-4.14/kactivities.nix
deleted file mode 100644
index dd14e0429ddb..000000000000
--- a/pkgs/desktops/kde-4.14/kactivities.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ fetchurl, kde, kdelibs }:
-
-kde {
-
-  src = fetchurl {
-    url = "mirror://kde/stable/4.13.3/src/kactivities-4.13.3.tar.xz";
-    sha256 = "12l9brpq8mr9hqqmnlz9xfsfr8ry6283b32nfqfx0p3f7w19vjy7";
-  };
-
-  outputs = [ "out" "dev" ];
-
-  outputInclude = "out";
-
-  setOutputFlags = false;
-
-  propagatedBuildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE activities library and daemon";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix
deleted file mode 100644
index df211f491993..000000000000
--- a/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ stdenv, kde, kdelibs, html-tidy, kactivities, libXt }:
-
-kde {
-  postPatch = ''
-    substituteInPlace konq-plugins/validators/tidy_validator.cpp \
-      --replace buffio.h tidybuffio.h
-  '';
-
-  buildInputs = [ kdelibs html-tidy kactivities libXt ];
-
-  meta = {
-    description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix
deleted file mode 100644
index 5d9e2401ca82..000000000000
--- a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix
+++ /dev/null
@@ -1,71 +0,0 @@
-{stable=true;
-hashes=builtins.listToAttrs[
-  {name="baloo";value="0p3awsrc20q79kq04x0vjz84acxz6gjm9jc7j2al4kybkyzx5p4y";}
-  {name="kde-baseapps";value="1nz6mm257rd916dklnbrix4r25scylvjil99b1djb35blx1aynqj";}
-  {name="kdepimlibs";value="1mv8k0wr0wr0hnlb1al50nmz8d77vbm73p2hhipipgliq6zb3vb5";}
-  {name="kfilemetadata";value="0wak1nphnphcam8r6pba7m2gld4w04dkk8qn23myjammv3myc59i";}
-  {name="libkcddb";value="0xrmg53p5lh4ral2l5zh96angaf9czhih3zzvwr9qr9h9ks5vrn1";}
-  {name="libkdcraw";value="0ksarwq8aaxc77cp0ryfnw1n311wkykzdlhj03rln8jjlbdm3j3q";}
-  {name="libkexiv2";value="1z8fmxfphx7szf4a17fs7zfjyxj6wncbvsphfvf6i5rlqy60g1y4";}
-  {name="marble";value="1w603miykq0s84jk6j17b7pg44rd4az0dhzgq7j7d6dfcz7nfrjd";}
-  {name="okular";value="0ijw71vkk1lj873hqczc23vllhkc9s0miipsbllxblx57rgi5qp6";}
-  {name="svgpart";value="1bj9gaaj6nqdgchmqnn381288aqw09ky0kbm1naddqa82pk196f6";}
-];
-versions=builtins.listToAttrs[
-  {name="baloo";value="4.14.3";}
-  {name="kactivities";value="4.13.3";}
-  {name="kde-baseapps";value="4.14.3";}
-  {name="kdepimlibs";value="4.14.3";}
-  {name="kde-runtime";value="4.14.3";}
-  {name="kfilemetadata";value="4.14.3";}
-  {name="libkcddb";value="4.14.3";}
-  {name="libkdcraw";value="4.14.3";}
-  {name="libkexiv2";value="4.14.3";}
-  {name="marble";value="4.14.3";}
-  {name="okular";value="4.14.3";}
-  {name="svgpart";value="4.14.3";}
-];
-modules=[
-{
-  module="kdemultimedia";
-  split=true;
-  pkgs=[
-    { name="libkcddb";  }
-  ];
-}
-{
-  module="kdegraphics";
-  split=true;
-  pkgs=[
-    { name="libkdcraw";  }
-    { name="libkexiv2";  }
-    { name="okular";  }
-    { name="svgpart";  }
-  ];
-}
-{
-  module="kdelibs";
-  split=true;
-  pkgs=[
-    { name = "baloo";  }
-    { name = "kfilemetadata";  }
-  ];
-}
-{
-  module="kdeedu";
-  split=true;
-  pkgs=[
-    { name="marble";  }
-  ];
-}
-{
-  module="kde-baseapps";
-sane="kde_baseapps";  split=true;
-  pkgs=[
-    { name="kde-baseapps"; sane="kde_baseapps"; }
-  ];
-}
-{ module="kactivities";  split=false;}
-{ module="kdepimlibs";  split=false;}
-];
-}
diff --git a/pkgs/desktops/kde-4.14/kde-package/default.nix b/pkgs/desktops/kde-4.14/kde-package/default.nix
deleted file mode 100644
index 94f878097ded..000000000000
--- a/pkgs/desktops/kde-4.14/kde-package/default.nix
+++ /dev/null
@@ -1,138 +0,0 @@
-{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake_2_8, automoc4, perl, pkgconfig
-, release, branch, ignoreList, extraSubpkgs
-}:
-
-let
-  inherit (stdenv.lib) filter fold;
-  inherit (builtins) getAttr hasAttr remoteAttrs listToAttrs tail head;
-  cmake = cmake_2_8;
-in
-rec {
-  manifest = import (./. + "/${release}.nix");
-
-  # src attribute for $name tarball
-  kdesrc = name: version: fetchurl {
-    url = "mirror://kde/" + (if manifest.stable then "" else "un")
-      + "stable/${release}/src/${name}-${version}.tar.xz";
-    sha256 = getAttr name manifest.hashes;
-  };
-
-  # Default meta attribute
-  defMeta = {
-    homepage = http://www.kde.org;
-    inherit branch;
-    platforms = stdenv.lib.platforms.linux;
-    inherit (qt4.meta) maintainers;
-  };
-
-  # KDE package built from the whole tarball
-  # This function is used both for monolithic modules and modules which are
-  # released as individual tarballs
-  kdeMonoPkg = name:
-    let n_ = name; v_ = getAttr name manifest.versions; in
-    a@{meta, name ? n_, version ? v_, nativeBuildInputs ? [], ...}:
-    stdenv.mkDerivation ({
-      name = "${name}-${version}";
-      src = kdesrc name version;
-      nativeBuildInputs = nativeBuildInputs ++ [ automoc4 cmake perl pkgconfig ];
-      meta = defMeta // meta;
-      enableParallelBuilding = true;
-    } // (removeAttrs a [ "meta" "name" "nativeBuildInputs" ]));
-
-  # kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs
-  # API.
-  kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name;
-
-  # Build subdirectory ${subdir} of tarball ${module}-${release}.tar.xz
-  kdeSubdirPkg = module:
-    {name, subdir ? name, sane ? name}:
-    let name_ = name; version_ = getAttr module manifest.versions; in
-    a@{cmakeFlags ? [], name ? name_, version ? version_, meta ? {}, nativeBuildInputs ? [], ...}:
-    stdenv.mkDerivation ({
-      name = "${name}-${release}";
-      src = kdesrc module version;
-      nativeBuildInputs = nativeBuildInputs ++ [ automoc4 cmake perl pkgconfig ];
-      cmakeFlags =
-        [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
-          "-DBUILD_doc=TRUE"
-          "-DBUILD_${subdir}=TRUE"
-        ] ++ cmakeFlags;
-      meta = defMeta // meta;
-      enableParallelBuilding = module.enableParallelBuilding or true;
-    } // (removeAttrs a [ "meta" "name" "cmakeFlags" "nativeBuildInputs" ]));
-
-  # A KDE monolithic module
-  kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; };
-
-  # Combine packages in one module.
-  # Arguments:
-  #  * pkgFun --- a function of the following signature:
-  #               module: manifest_attrs: manual_attrs: derivation;
-  #  * module --- name of the module
-  #  * pkgs --- list of packages in manifest format
-  combinePkgs = pkgFun: module: pkgs:
-    let
-      f = p@{name, ...}:
-        callPackage (./.. + "/${module}/${name}.nix") { kde = pkgFun module p; };
-      list = map f pkgs;
-      attrs = listToAttrs (map
-        ({name, sane ? name, ...}@p: { name = sane; value = f p; })
-        pkgs);
-    in
-      runCommand "${module}-${release}"
-      ({passthru = attrs // {
-         propagatedUserEnvPackages = list;
-         projects = attrs;
-       };})
-        ''
-          mkdir -pv $out/nix-support
-          printWords ${toString list} | tee $out/nix-support/propagated-user-env-packages
-        '';
-
-  # Given manifest module data, return the module
-  kdeModule = { module, sane ? module, split, pkgs ? [] }:
-    let
-      pkgs_ = filterPkgs module pkgs;
-    in
-    # Module is splitted by upstream
-    if split then combinePkgs kdeSplittedPkg module pkgs_
-    # Monolithic module
-    else if pkgs == [] then kdeMonoModule module (./.. + "/${module}.nix")
-    # Module is splitted by us
-    else combinePkgs kdeSubdirPkg module pkgs_;
-
-  # The same, as nameValuePair with sane name
-  kdeModuleNV = a@{ module, sane ? module, ... }:
-    { name = sane; value = kdeModule a; };
-
-  filterPkgs = module: (p:
-      removeNames (stdenv.lib.attrByPath [module] [] ignoreList) p
-      ++ (stdenv.lib.attrByPath [module] [] extraSubpkgs));
-
-  # Remove attrsets with x.name in subst. Optimized for empty subst.
-  removeNames = subst: big:
-    fold (s: out: filter (x: x.name != s) out) big subst;
-
-  allModules = listToAttrs (map kdeModuleNV manifest.modules);
-
-  modules =
-    let unsplit = filter (a: ! (a ? pkgs)) manifest.modules;
-    in listToAttrs (map kdeModuleNV unsplit);
-
-  splittedModuleList =
-    let
-      splitted = filter (a: a ? pkgs) manifest.modules;
-      names = map ({module, sane ? module, ...}: sane) splitted;
-    in
-    map (m: m.projects) (stdenv.lib.attrVals names allModules);
-
-  individual =
-    stdenv.lib.zipAttrsWith
-    (
-      name: list:
-      if tail list == []
-      then head list
-      else abort "Multiple modules define ${name}"
-    )
-    splittedModuleList;
-}
diff --git a/pkgs/desktops/kde-4.14/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.14/kde-package/kde-manifest.sh
deleted file mode 100755
index 1da7bc810c32..000000000000
--- a/pkgs/desktops/kde-4.14/kde-package/kde-manifest.sh
+++ /dev/null
@@ -1,173 +0,0 @@
-#! /bin/sh
-
-# Usage: download kde release to $dir, then run
-# $0 $dir
-
-dir="$1"
-
-
-if [[ -z $(type -p xsltproc) ]]; then
-  echo "Please provide libxslt" >&2
-  exit 1
-fi
-
-release=$(ls "${dir}"/kdelibs-*.tar.xz | \
-  sed -e 's/.*kdelibs-//' -e 's/\.tar\.xz//')
-
-# Detect release number & whether it is a stable release
-if [[ $? -ne 0 || -z $release ]]; then
-  echo "'${dir}' is not a directory (or kdelibs...tar.xz doesn't exist)!" >&2
-  exit 1
-fi
-
-if [[ ${release##*.} -gt 50 ]]; then
-  stable="false"
-else
-  stable="true"
-fi
-
-echo "Detected release ${release}" >&2
-
-declare -A hash
-declare -A version
-declare -A modules
-declare -a packages
-declare -a top_level
-
-if [[ ! -f ${dir}/kde_projects.xml ]]; then
-  if ! curl -o "${dir}/kde_projects.xml" -J http://projects.kde.org/kde_projects.xml; then
-    echo "Could not download http://projects.kde.org/kde_projects.xml to ${dir}/kde_projects.xml" >&2
-    exit 1
-  fi
-fi
-# xsltproc output declares -A module
-eval `xsltproc kde-submodules.xslt ${dir}/kde_projects.xml`
-
-module[kde-baseapps]=kde-baseapps
-unset module[kactivities]
-
-print_sane() {
-  echo "Called print_sane $1" >&2
-  sane="${1//[^a-z0-9_]/_}"
-  if [[ "$sane" != "$1" ]]; then
-    echo "Sane version is $sane" >&2
-    echo -n "sane=\"$sane\";"
-  fi
-}
-
-for i in `cd "${dir}"; ls *.tar.xz`; do
-  package=${i%.tar.xz}
-  v=${package##*-}
-  package=${i%-*}
-  packages+=( "$package" )
-  echo -n "${package}.. " >&2
-  hash[$package]=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
-  echo -n ${hash[$package]} >&2
-
-  version[$package]=$v
-
-  if [ -n "${module[$package]}" ]; then
-    m="${module[$package]}"
-    echo " (${m})" >&2
-    modules[$m]=1
-  else
-    top_level+=( "$package" )
-    echo " (top-level)" >&2
-  fi
-  nix-store --add-fixed sha256 "${dir}/${i}" >&2
-done
-
-
-print_pkg_hash() {
-  echo "  {name=\"${1}\";value=\"${hash[$1]}\";}"
-}
-
-print_pkg_version() {
-  echo "  {name=\"${1}\";value=\"${version[$1]}\";}"
-}
-
-print_hashes(){
-  echo "hashes=builtins.listToAttrs["
-  for p in "${packages[@]}"; do print_pkg_hash "$p"; done
-  echo "];"
-}
-
-print_versions(){
-  echo "versions=builtins.listToAttrs["
-  for p in "${packages[@]}"; do print_pkg_version "$p"; done
-  echo "];"
-}
-
-print_split_module(){
-  echo -n "$1:" >&2
-  echo -e "{\n  module=\"$1\";"
-  print_sane "$1"
-  echo "  split=true;"
-  echo "  pkgs=["
-  for p in "${packages[@]}"; do
-    if [[ "${module[$p]}" == "$1" ]]; then
-      echo -n "    { name=\"$p\"; "
-      print_sane "$p"
-      echo " }"
-      echo -n " $p" >&2
-    fi
-  done
-  echo "  ];"
-  echo "}"
-  echo >&2
-}
-
-print_mono_module(){
-  echo -en "{ module=\"$1\"; "
-  print_sane "$1"
-  echo -n "$1 ... " >&2
-  pkg=$(cd "$dir"; echo "$1"-*.tar.xz)
-  pkg="${pkg%.tar.xz}"
-  echo -n " split=false;"
-  cml="$pkg/CMakeLists.txt"
-  tar -xf "${dir}/$pkg.tar.xz" "$cml"
-  if grep '^[^#]*add_subdirectory' $cml >/dev/null; then
-    if grep '^[^#]*add_subdirectory' $cml | grep -v macro_optional_add_subdirectory >/dev/null; then
-      echo " is monolithic (has unconditionally added subdirs)" >&2
-    else
-      subdirs=( `grep '^[^#]*add_subdirectory' $cml |
-        sed -e 's/[^#]*add_subdirectory *( *\(.*\) *)/\1/' |
-        grep -v '\(doc\|cmake\)'` )
-      echo " seems splittable, subdirs: ${subdirs[*]}" >&2
-      echo -e "\n  pkgs=["
-      for s in "${subdirs[@]}"; do
-        echo -en "    {"
-		echo -n " name=\"${s//\//-}\"; "
-        print_sane "$s"
-        if [[ $s != "${s//\//-}" ]]; then
-          echo -n "subdir=\"$s\"; "
-        fi
-        echo "}"
-      done
-      echo -e "  ];\n"
-    fi
-  else
-    echo " is monolithic (has no subdirs)" >&2
-  fi
-  rm $cml
-  rmdir "$pkg"
-  echo "}"
-}
-
-print_modules(){
-  echo "modules=["
-  echo "Printing modules splitted by upstream" >&2
-  for m in "${!modules[@]}"; do print_split_module "$m"; done
-  echo >&2
-  echo "Printing modules not splitted by upstream (${top_level[*]})" >&2
-  for m in "${top_level[@]}"; do print_mono_module "$m"; done
-  echo "];"
-}
-
-echo "Writing ${release}.nix" >&2
-exec > "${release}.nix"
-echo "{stable=${stable};"
-print_hashes
-print_versions
-print_modules
-echo "}"
diff --git a/pkgs/desktops/kde-4.14/kde-package/kde-submodules.xslt b/pkgs/desktops/kde-4.14/kde-package/kde-submodules.xslt
deleted file mode 100644
index 952a05a9d274..000000000000
--- a/pkgs/desktops/kde-4.14/kde-package/kde-submodules.xslt
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- xslt file for http://projects.kde.org/kde_projects.xml -->
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-	<xsl:output method="text" />
-	<xsl:template match="/">
-		<xsl:for-each select="kdeprojects/component[@identifier='kde']">
-			<xsl:text>declare -A module
</xsl:text>
-			<xsl:for-each select="module">
-				<xsl:variable name="module" select='@identifier' />
-				<xsl:for-each select=".//project[repo]">
-					<xsl:text>module["</xsl:text>
-					<xsl:value-of select='@identifier' />
-					<xsl:text>"]="</xsl:text>
-					<xsl:value-of select="$module" />
-					<xsl:text>"
</xsl:text>
-				</xsl:for-each>
-			</xsl:for-each>
-		</xsl:for-each>
-	</xsl:template>
-</xsl:stylesheet>
diff --git a/pkgs/desktops/kde-4.14/kdeedu/marble.nix b/pkgs/desktops/kde-4.14/kdeedu/marble.nix
deleted file mode 100644
index 2dc07d14a0d9..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/marble.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs, gpsd }:
-
-kde {
-
-# TODO: package QextSerialPort, libshp(shapelib), QtMobility, QtLocation, libwlocate, quazip
-
-  buildInputs = [ kdelibs gpsd ];
-
-  meta = {
-    description = "Marble Virtual Globe";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.14/kdegraphics/libkdcraw.nix
deleted file mode 100644
index 18697e13b66c..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/libkdcraw.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ stdenv, kde, kdelibs, pkgconfig, libraw, lcms2 }:
-
-kde {
-
-  buildInputs = [ kdelibs libraw lcms2 ];
-
-  meta = {
-    description = "Library for decoding RAW images";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/libkexiv2.nix b/pkgs/desktops/kde-4.14/kdegraphics/libkexiv2.nix
deleted file mode 100644
index 46ec45fad01a..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/libkexiv2.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, kde, kdelibs, exiv2 }:
-
-kde {
-  buildInputs = [ kdelibs exiv2 ];
-
-  meta = {
-    description = "Exiv2 support library";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/okular.nix b/pkgs/desktops/kde-4.14/kdegraphics/okular.nix
deleted file mode 100644
index de7b77999936..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/okular.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, poppler_qt4, qca2
-, qimageblitz, libtiff, kactivities, pkgconfig, libkexiv2 }:
-
-kde {
-
-# TODO: package activeapp, qmobipocket
-
-  buildInputs = [ kdelibs chmlib djvulibre ebook_tools libspectre poppler_qt4
-                  qca2 qimageblitz libtiff kactivities libkexiv2 ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "Okular, the KDE document viewer";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/svgpart.nix b/pkgs/desktops/kde-4.14/kdegraphics/svgpart.nix
deleted file mode 100644
index 2fc0e373dbdf..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/svgpart.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "SVG KPart";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdelibs/baloo.nix b/pkgs/desktops/kde-4.14/kdelibs/baloo.nix
deleted file mode 100644
index 8883c03274df..000000000000
--- a/pkgs/desktops/kde-4.14/kdelibs/baloo.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, kde, kdelibs, pkgconfig, doxygen, kdepimlibs, xapian, qjson, akonadi, kfilemetadata, boost
-}:
-
-kde {
-
-# TODO: qmobipocket
-
-  buildInputs = [
-    kdelibs kdepimlibs xapian qjson akonadi kfilemetadata boost
-  ];
-
-  nativeBuildInputs = [ pkgconfig doxygen ];
-
-  meta = {
-    description = "Baloo";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix b/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix
deleted file mode 100644
index 6068516ba2b2..000000000000
--- a/pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ stdenv, kde, kdelibs, pkgconfig, doxygen, poppler_qt4, taglib, exiv2, ffmpeg }:
-
-kde {
-  buildInputs = [
-    kdelibs poppler_qt4 taglib exiv2 ffmpeg
-  ];
-
-  nativeBuildInputs = [ pkgconfig doxygen ];
-
-  meta = {
-    description = "KFileMetaData";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix b/pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix
deleted file mode 100644
index 66b0cfe869f6..000000000000
--- a/pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-#todo: libmusicbrainz5
-  buildInputs = [ kdelibs ];
-  meta = {
-    description = "A library used to retrieve audio CD meta data from the internet";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdepimlibs.nix b/pkgs/desktops/kde-4.14/kdepimlibs.nix
deleted file mode 100644
index 1f412d3c766e..000000000000
--- a/pkgs/desktops/kde-4.14/kdepimlibs.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ kde, pkgconfig, boost, cyrus_sasl, gpgme, libical, openldap, prison
-, kdelibs, akonadi, libxslt
-, shared_mime_info, shared_desktop_ontologies, qjson
-, automoc4, cmake_2_8, perl
-}:
-
-kde {
-  outputs = [ "out" "dev" ];
-
-  outputInclude = "out";
-
-  setOutputFlags = false;
-
-  nativeBuildInputs = [ automoc4 cmake_2_8 perl pkgconfig ];
-
-  cmakeFlags = [
-    "-DCMAKE_MINIMUM_REQUIRED_VERSION=3.3"
-  ];
-
-  buildInputs =
-    [ boost gpgme libical libxslt qjson prison
-      openldap cyrus_sasl akonadi shared_desktop_ontologies
-      shared_mime_info
-    ];
-
-  propagatedBuildInputs = [ kdelibs ];
-
-  # Prevent a dependency on boost.dev. FIXME: move this cmake file to .dev.
-  postInstall = "rm $out/lib/gpgmepp/GpgmeppConfig.cmake";
-
-  meta = {
-    description = "KDE PIM libraries";
-    license = "LGPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/l10n/default.nix b/pkgs/desktops/kde-4.14/l10n/default.nix
deleted file mode 100644
index b4c272cb328e..000000000000
--- a/pkgs/desktops/kde-4.14/l10n/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
-, kdelibs, gettext, release, branch, stable
-}:
-
-let
-
-  inherit (stdenv.lib) attrByPath singleton;
-
-  kdeL10nDerivation =
-    { lang, saneName, sha256 }:
-
-    stdenv.mkDerivation rec {
-      name = "kde-l10n-${saneName}-${release}";
-
-      src = fetchurl {
-        url = "mirror://kde/${if stable then "" else "un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.xz";
-        name = "${name}.tar.xz";
-        inherit sha256;
-      };
-
-      buildInputs = [ gettext kdelibs ];
-
-      nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
-
-      cmakeFlags = [
-        "-Wno-dev"
-      ];
-
-      meta = {
-        description = "KDE translation for ${lang}";
-        inherit branch;
-        license = "GPL";
-        platforms = stdenv.lib.platforms.linux;
-        inherit (kdelibs.meta) maintainers homepage;
-      };
-    };
-
-  kdeL10nRelease =
-    builtins.listToAttrs (
-      map ({lang, saneName, sha256}:
-        {
-          name = saneName;
-          value = kdeL10nDerivation { inherit lang saneName sha256; };
-        }
-      ) (import (./manifest + "-${release}.nix"))
-    );
-
-in
-{
-  inherit kdeL10nDerivation;
-  recurseForDerivations = true;
-} // kdeL10nRelease
diff --git a/pkgs/desktops/kde-4.14/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.14/l10n/l10n-manifest.sh
deleted file mode 100755
index ec159a1e2047..000000000000
--- a/pkgs/desktops/kde-4.14/l10n/l10n-manifest.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-# Usage: download kde-l10n to $dir, then run
-# $0 $dir
-
-dir=$1
-
-if [[ ! -d "${dir}" ]]; then
-  echo "${dir} is not a directory (or doesn't exist)!" >&2
-  exit 1
-fi
-
-release=$(ls "${dir}"/kde-l10n-en_GB-*.tar.xz | \
-	sed -e 's/.*en_GB-//' -e 's/\.tar\.xz//')
-
-echo "Detected release ${release}" >&2
-
-exec > "manifest-${release}.nix"
-echo "["
-for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.xz`; do
-  lang=${i%-${release}.tar.xz}
-  lang=${lang#kde-l10n-}
-  echo -n "${lang}.. " >&2
-  hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
-  echo "{"
-  echo "  lang = \"${lang}\";"
-  echo "  saneName = \"$(echo $lang | sed s^@^_^g)\";"
-  echo "  sha256 = \"${hash}\";"
-  echo "}"
-  echo $hash >&2
-done
-echo "]"
diff --git a/pkgs/desktops/kde-4.14/l10n/manifest-4.14.3.nix b/pkgs/desktops/kde-4.14/l10n/manifest-4.14.3.nix
deleted file mode 100644
index a6d48ae51bf2..000000000000
--- a/pkgs/desktops/kde-4.14/l10n/manifest-4.14.3.nix
+++ /dev/null
@@ -1,267 +0,0 @@
-[
-{
-  lang = "ar";
-  saneName = "ar";
-  sha256 = "1amzzwa4zhwm0r1b1fdi0fjp883wpbjh12wn9q42g04xzza6nq04";
-}
-{
-  lang = "bg";
-  saneName = "bg";
-  sha256 = "1x1yx6lw86bwv2d7lcfb061k1pqgqw6abqwrga7pnzfmk2fcaawb";
-}
-{
-  lang = "bs";
-  saneName = "bs";
-  sha256 = "148195dk6wmymk6jib467a10w9jajh3bmx1igxl29l7vp33xpgng";
-}
-{
-  lang = "ca";
-  saneName = "ca";
-  sha256 = "04bgjfwr5pwn79lh3wixajswmccfcqll5dnjhf84zw7p09138m0v";
-}
-{
-  lang = "ca@valencia";
-  saneName = "ca_valencia";
-  sha256 = "0p257jjilkmjrq9ddvwfdh41911b2yrcrid1j31g7gg9gp7iriq4";
-}
-{
-  lang = "cs";
-  saneName = "cs";
-  sha256 = "0kjn9pq9p8bfja6ca4pcpqgli9k1mfyh77j6i8p28i37wfmgv0cn";
-}
-{
-  lang = "da";
-  saneName = "da";
-  sha256 = "1w0ylqnxkbqz6camk8045nrxpz1n4dbz8cgl559l31m7zacq1rmb";
-}
-{
-  lang = "de";
-  saneName = "de";
-  sha256 = "0i97h1jcm8lpv3pap7wiz8nvjwf00jav5z5ymsbklagvmbmwyfyk";
-}
-{
-  lang = "el";
-  saneName = "el";
-  sha256 = "1br19741hmn08g3vzmx8dilx2kdfbg5zv1rjxnigdfwi0zphqyw9";
-}
-{
-  lang = "en_GB";
-  saneName = "en_GB";
-  sha256 = "1flp57prc12ri2rhh6vwf6hb5mqj8w1sj94pnji02ylmkghcc466";
-}
-{
-  lang = "es";
-  saneName = "es";
-  sha256 = "0waccr5mih5nv4q31k6xn07iws2by8n67riij6k9nsfsrlrxv21g";
-}
-{
-  lang = "et";
-  saneName = "et";
-  sha256 = "1bqd4jaws8890r2zjzpf6pw1k9v7h2lr7xk1dzfs8ak7gny32fm9";
-}
-{
-  lang = "eu";
-  saneName = "eu";
-  sha256 = "0q4cac4vp1s7fda328xxyzhqll0iqinn5v9syb93xfj29kij4ja2";
-}
-{
-  lang = "fa";
-  saneName = "fa";
-  sha256 = "0avabmdm9bxyb5b5d0mrv8mmwp6j1r4ch7y0ab7b4zl380blw7d3";
-}
-{
-  lang = "fi";
-  saneName = "fi";
-  sha256 = "0lk0r03r2wmqpf8n9zvwpsbl7s11dipa8kc3lmkh1yrjk8c4z2sw";
-}
-{
-  lang = "fr";
-  saneName = "fr";
-  sha256 = "1gzwc6yj7x7x3jx0270ap5nf70ckl25lqccrxiyzwx3mqfxgfbx2";
-}
-{
-  lang = "ga";
-  saneName = "ga";
-  sha256 = "0bkf62cqj4rfgz81yj9jspv5jfa932hsyhk4kq0r2hqsm8gndddd";
-}
-{
-  lang = "gl";
-  saneName = "gl";
-  sha256 = "00m4m480fqls5i1cvdidkq3nb8xzqhgyqqp0zk3j3qybxfq98yg5";
-}
-{
-  lang = "he";
-  saneName = "he";
-  sha256 = "1488lk7jniv0hj77wcfxplxw10srp3df6lv6llss8b5m3yqb061a";
-}
-{
-  lang = "hi";
-  saneName = "hi";
-  sha256 = "16ni7257b1ch0wabncvq17569c57ncz7pzqgqm830bj8ldpk9zzv";
-}
-{
-  lang = "hr";
-  saneName = "hr";
-  sha256 = "1si90cnwjsvw553pmppb0aakfk7fan2jk44ag0j191kdiir2b3xk";
-}
-{
-  lang = "hu";
-  saneName = "hu";
-  sha256 = "1x2s2cd521ffp5azzrzq2w2cr4sjz6gpg1a1h9jg4749xwqfhc1a";
-}
-{
-  lang = "ia";
-  saneName = "ia";
-  sha256 = "1ybaihygv0lviw6bq3a6ki40glgs49gsk29abq4y95bi9ymlrryc";
-}
-{
-  lang = "id";
-  saneName = "id";
-  sha256 = "1s8zliwc737avc04n2l27rhhh9isz9ag81nsajai27yxif0ncn7x";
-}
-{
-  lang = "is";
-  saneName = "is";
-  sha256 = "1x2mag8jwlmbh8v8y3rmvp9n69sv2xfwwsxw7c9vb8qg4cybax1c";
-}
-{
-  lang = "it";
-  saneName = "it";
-  sha256 = "1ng2hzrbvcak3nhbmlb3h64a15h34zfrgabzwrjvi2b0fv8liycw";
-}
-{
-  lang = "ja";
-  saneName = "ja";
-  sha256 = "01klhf9bmha9x6s39r4wnd0hxn35jg5bh7h9rwqij3nf06rddfrj";
-}
-{
-  lang = "kk";
-  saneName = "kk";
-  sha256 = "149fi65z1x64svs00rn82njmw6l0pncgs4b5d66fb18ah3bjlfg2";
-}
-{
-  lang = "km";
-  saneName = "km";
-  sha256 = "17hjv0gi2fqa5gkjgmqkxb4k7z3zizrxax6inq8s03g4f2vfibaz";
-}
-{
-  lang = "ko";
-  saneName = "ko";
-  sha256 = "19yhacc0v5grxc35bmks9r4qy091qij26yfi2qvs3rca7cc374jp";
-}
-{
-  lang = "lt";
-  saneName = "lt";
-  sha256 = "0y0nkvqidc12paf8ghk4p6z213gxcyv27nvglk120l2602980idj";
-}
-{
-  lang = "lv";
-  saneName = "lv";
-  sha256 = "0msw54v8d9p08c7prw6m20w29qf8f0yb32s378knhsql6abv5gln";
-}
-{
-  lang = "mr";
-  saneName = "mr";
-  sha256 = "05kcm7x7jj4lppn6fd1jlzl37r3gs9wrz0cckwpscc2m6y2g7p55";
-}
-{
-  lang = "nb";
-  saneName = "nb";
-  sha256 = "0wsdr8yyjjik2h30xy7y38i5hagy4jya98cqjbcrrab35i677l9a";
-}
-{
-  lang = "nds";
-  saneName = "nds";
-  sha256 = "0lr5z1r8v3fkqpkcjvnml2s9jh50wmqsqiyls9ivr46ygwm8wcbq";
-}
-{
-  lang = "nl";
-  saneName = "nl";
-  sha256 = "09w8cniq3z11900axjcdlm24jbzjjsqcpdwpvhvc9z78hfsjqp36";
-}
-{
-  lang = "nn";
-  saneName = "nn";
-  sha256 = "1b304wg1143pk7ib8k451g2riq87c1h0611khslghy428q4rviwd";
-}
-{
-  lang = "pa";
-  saneName = "pa";
-  sha256 = "02y56ld5hiywph88khh55hqg0gpcvmqcqrbpsidzx3qdgh5j40nl";
-}
-{
-  lang = "pl";
-  saneName = "pl";
-  sha256 = "137mfrr7wza2pg4yzqqi93bsmsrjvj0ar27gi3lk1qh6zniwyjai";
-}
-{
-  lang = "pt";
-  saneName = "pt";
-  sha256 = "1zb454rg4pigkldg9jp97r2r7k8azwxbal77zscky2q6rbw0sjcn";
-}
-{
-  lang = "pt_BR";
-  saneName = "pt_BR";
-  sha256 = "1zrn09k99pfscnc5zyxh1jzyrbirhy8ilwacbgg913maaanjprny";
-}
-{
-  lang = "ro";
-  saneName = "ro";
-  sha256 = "1lkr14if7jmfcxmb10pf11a6xjxxqxrq45lwdx19kj3djgr5l4pc";
-}
-{
-  lang = "ru";
-  saneName = "ru";
-  sha256 = "1ldf4y9wck339n0jq8x43x9h57jvfg3qk0spfv9d5fw9qyxygwwi";
-}
-{
-  lang = "sk";
-  saneName = "sk";
-  sha256 = "1n4qjwvpkddwizl8k3gr1xwv8icwd6lqsg09cypax049g3q2sy4p";
-}
-{
-  lang = "sl";
-  saneName = "sl";
-  sha256 = "1k111r9ssprgali6sg3wpbvp635hb56ckmcgpdhyvk6bbkcbnbmr";
-}
-{
-  lang = "sr";
-  saneName = "sr";
-  sha256 = "0pini77jlnrv2fhl0j99wjxylwlj77bihcbfvnkf5bganffgwc11";
-}
-{
-  lang = "sv";
-  saneName = "sv";
-  sha256 = "0ykxy95a4q0pp5ibmw20ckg33b3h89g2m86p6fcfnqf6350nxs2v";
-}
-{
-  lang = "tr";
-  saneName = "tr";
-  sha256 = "15vcfpyc30ia6bsjgwv3zhydv2nlnmggr8i2yjpnb5dlynn3sywh";
-}
-{
-  lang = "ug";
-  saneName = "ug";
-  sha256 = "0qhzfbd3j0d7grg4ghzn7y5vrl031iz9krifv7dv6jgp68fzz1h0";
-}
-{
-  lang = "uk";
-  saneName = "uk";
-  sha256 = "03n2myhwx9lvm1vzqvrg2sgl3y1m0rrrskqa22m06fjmh4vxawhx";
-}
-{
-  lang = "wa";
-  saneName = "wa";
-  sha256 = "11b7gyy31n2zfhkaj304pd4lkr14sp1sgi4pzv86c824sr6lp01v";
-}
-{
-  lang = "zh_CN";
-  saneName = "zh_CN";
-  sha256 = "1r5gxadd94ckdpkwcchwa8k735g2y9x7bi6px6hm7qlxdbi9sjmq";
-}
-{
-  lang = "zh_TW";
-  saneName = "zh_TW";
-  sha256 = "04bvvb3na4arns483fz27npjs045hf3s53p2rkd2nvq9gwvn0kmi";
-}
-]
diff --git a/pkgs/desktops/kde-4.14/support/akonadi/default.nix b/pkgs/desktops/kde-4.14/support/akonadi/default.nix
deleted file mode 100644
index ecfb4913a429..000000000000
--- a/pkgs/desktops/kde-4.14/support/akonadi/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano, sqlite, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  name = "akonadi-1.13.0";
-  
-  src = fetchurl {
-    url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2";
-    sha256 = "8c7f690002ea22c139f3a64394aef2e816e00ca47fd971af7d54a66087356dd2";
-  };
-
-  buildInputs = [ qt4 soprano libxslt boost sqlite ];
-
-  nativeBuildInputs = [ cmake automoc4 shared_mime_info pkgconfig ];
-
-  enableParallelBuilding = true;
-  
-  meta = with stdenv.lib; {
-    description = "KDE PIM Storage Service";
-    license = "LGPL";
-    homepage = http://pim.kde.org/akonadi;
-    maintainers = [ maintainers.sander maintainers.phreedom ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/plasma-5/breeze-qt4.nix b/pkgs/desktops/plasma-5/breeze-qt4.nix
deleted file mode 100644
index 6c31398037b0..000000000000
--- a/pkgs/desktops/plasma-5/breeze-qt4.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  mkDerivation, lib,
-  automoc4, cmake, perl, pkgconfig,
-  kdelibs4, qt4, xproto
-}:
-
-mkDerivation {
-  name = "breeze-qt4";
-  sname = "breeze";
-  buildInputs = [ kdelibs4 qt4 xproto ];
-  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
-  outputs = [ "out" "dev" ];
-  cmakeFlags = [
-    "-DUSE_KDE4=ON"
-    "-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake"
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index cae5c74b4428..0972673b7b87 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -100,7 +100,6 @@ let
     in {
       bluedevil = callPackage ./bluedevil.nix {};
       breeze-gtk = callPackage ./breeze-gtk.nix {};
-      breeze-qt4 = callPackage ./breeze-qt4.nix {};
       breeze-qt5 = callPackage ./breeze-qt5.nix {};
       breeze-grub = callPackage ./breeze-grub.nix {};
       breeze-plymouth = callPackage ./breeze-plymouth {};