summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2016-05-03 23:12:48 +0300
committerTuomas Tynkkynen <tuomas@tuxera.com>2016-05-03 23:12:48 +0300
commitaadaa913792b0fdeb68b02425e4f03d2f8286a1f (patch)
treeea582b078a00e6ba27e2c887a9df5a792c37fb0e /pkgs/development/libraries
parent2362891dc815160e343e52458f25db22508ac487 (diff)
parente7d3166656af0d98da9f59c78e2213cec842d743 (diff)
downloadnixpkgs-aadaa913792b0fdeb68b02425e4f03d2f8286a1f.tar
nixpkgs-aadaa913792b0fdeb68b02425e4f03d2f8286a1f.tar.gz
nixpkgs-aadaa913792b0fdeb68b02425e4f03d2f8286a1f.tar.bz2
nixpkgs-aadaa913792b0fdeb68b02425e4f03d2f8286a1f.tar.lz
nixpkgs-aadaa913792b0fdeb68b02425e4f03d2f8286a1f.tar.xz
nixpkgs-aadaa913792b0fdeb68b02425e4f03d2f8286a1f.tar.zst
nixpkgs-aadaa913792b0fdeb68b02425e4f03d2f8286a1f.zip
Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/alure/default.nix20
-rw-r--r--pkgs/development/libraries/cimg/builder.sh7
-rw-r--r--pkgs/development/libraries/cimg/default.nix15
-rw-r--r--pkgs/development/libraries/enet/default.nix1
-rw-r--r--pkgs/development/libraries/fmod/4.24.16.nix2
-rw-r--r--pkgs/development/libraries/fmod/default.nix2
-rw-r--r--pkgs/development/libraries/folly/default.nix14
-rw-r--r--pkgs/development/libraries/gobject-introspection/darwin-fixups.patch26
-rw-r--r--pkgs/development/libraries/gobject-introspection/default.nix3
-rw-r--r--pkgs/development/libraries/ijs/default.nix13
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/attica.nix11
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/baloo.nix25
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix17
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix10
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/default.nix114
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix20
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/nix-lib-path.patch37
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/series1
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh81
-rwxr-xr-xpkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh57
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix17
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix22
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix12
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/karchive.nix11
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kauth/cmake-install-paths.patch17
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix16
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kauth/series1
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix25
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch25
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix17
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix11
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix14
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix16
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch25
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix17
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix16
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix16
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix17
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix22
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kded.nix19
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/default.nix36
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch13
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/series1
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/setup-hook.sh1
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix34
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix13
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix13
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix13
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix19
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch12
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix17
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/cmake-install-paths.patch13
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/default.nix14
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/series1
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix23
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix13
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/khtml.nix21
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix17
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch13
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix18
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series1
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix15
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix13
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch42
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix17
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix33
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch28
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kio/series1
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix11
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix11
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix16
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kjs.nix16
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix17
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix15
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix17
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix21
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix13
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch13
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix23
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch26
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kpackage/series2
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kparts.nix17
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix15
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix11
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kpty.nix10
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kross.nix14
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/krunner.nix16
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch25
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch25
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix18
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix22
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch36
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series1
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix16
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix10
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix21
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix11
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix13
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix18
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix10
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix13
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix13
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix13
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix25
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/solid.nix17
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix13
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/srcs.nix565
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix11
-rw-r--r--pkgs/development/libraries/kerberos/krb5.nix4
-rw-r--r--pkgs/development/libraries/libass/default.nix4
-rw-r--r--pkgs/development/libraries/libdigidoc/default.nix28
-rw-r--r--pkgs/development/libraries/libdigidocpp/default.nix31
-rw-r--r--pkgs/development/libraries/libdvdread/default.nix4
-rw-r--r--pkgs/development/libraries/libdwg/default.nix10
-rw-r--r--pkgs/development/libraries/libev/default.nix4
-rw-r--r--pkgs/development/libraries/libevdev/default.nix4
-rw-r--r--pkgs/development/libraries/libiberty/default.nix22
-rw-r--r--pkgs/development/libraries/libmatchbox/default.nix7
-rw-r--r--pkgs/development/libraries/libmemcached/default.nix3
-rw-r--r--pkgs/development/libraries/libnatspec/default.nix8
-rw-r--r--pkgs/development/libraries/libopus/default.nix4
-rw-r--r--pkgs/development/libraries/libpwquality/default.nix7
-rw-r--r--pkgs/development/libraries/libressl/2.2.nix4
-rw-r--r--pkgs/development/libraries/libressl/2.3.nix4
-rw-r--r--pkgs/development/libraries/libseccomp/default.nix4
-rw-r--r--pkgs/development/libraries/libsecret/default.nix6
-rw-r--r--pkgs/development/libraries/libsolv/default.nix25
-rw-r--r--pkgs/development/libraries/libu2f-host/default.nix4
-rw-r--r--pkgs/development/libraries/libuv/default.nix87
-rw-r--r--pkgs/development/libraries/libxmp/default.nix4
-rw-r--r--pkgs/development/libraries/menu-cache/default.nix8
-rw-r--r--pkgs/development/libraries/nlopt/default.nix4
-rw-r--r--pkgs/development/libraries/openh264/default.nix6
-rw-r--r--pkgs/development/libraries/openssl/default.nix8
-rw-r--r--pkgs/development/libraries/ortp/default.nix5
-rw-r--r--pkgs/development/libraries/sqlite/default.nix6
-rw-r--r--pkgs/development/libraries/sqlite/sqlite3_analyzer.nix2
-rw-r--r--pkgs/development/libraries/v8/3.16.14.nix6
-rw-r--r--pkgs/development/libraries/v8/4.5.nix4
-rw-r--r--pkgs/development/libraries/v8/generic.nix4
-rw-r--r--pkgs/development/libraries/xalanc/default.nix28
-rw-r--r--pkgs/development/libraries/xml-security-c/default.nix34
-rw-r--r--pkgs/development/libraries/xsd/default.nix38
-rw-r--r--pkgs/development/libraries/xsd/xsdcxx.patch126
144 files changed, 451 insertions, 2553 deletions
diff --git a/pkgs/development/libraries/alure/default.nix b/pkgs/development/libraries/alure/default.nix
new file mode 100644
index 00000000000..200ff1ca2e7
--- /dev/null
+++ b/pkgs/development/libraries/alure/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, cmake, openal }:
+
+stdenv.mkDerivation rec {
+  name = "alure-${version}";
+  version = "1.2";
+
+  src = fetchurl {
+    url = "http://kcat.strangesoft.net/alure-releases/alure-${version}.tar.bz2";
+    sha256 = "0w8gsyqki21s1qb2s5ac1kj08i6nc937c0rr08xbw9w9wvd6lpj6";
+  };
+
+  buildInputs = [ cmake openal ];
+
+  meta = with stdenv.lib; {
+    description = "A utility library to help manage common tasks with OpenAL applications";
+    homepage = http://kcat.strangesoft.net/alure.html;
+    license = licenses.mit;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/cimg/builder.sh b/pkgs/development/libraries/cimg/builder.sh
index bbd5f712551..6473395493c 100644
--- a/pkgs/development/libraries/cimg/builder.sh
+++ b/pkgs/development/libraries/cimg/builder.sh
@@ -4,9 +4,8 @@ source $stdenv/setup
 unpackPhase
 cd $sourceRoot
 
-install -dm 755 $out/include/cimg $out/share/doc/cimg/html $out/share/cimg/examples $out/share/cimg/plugins
+install -dm 755 $out/include/cimg $doc/share/doc/cimg/html $doc/share/cimg/examples $doc/share/cimg/plugins
 
 install -m 644 CImg.h $out/include/cimg
-cp -dr --no-preserve=ownership html/* $out/share/doc/cimg/html/
-cp -dr --no-preserve=ownership examples/* $out/share/cimg/examples/
-cp -dr --no-preserve=ownership plugins/* $out/share/cimg/plugins/
+cp -dr --no-preserve=ownership examples/* $doc/share/cimg/examples/
+cp -dr --no-preserve=ownership plugins/* $doc/share/cimg/plugins/
diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix
index dc397adf491..722852f1270 100644
--- a/pkgs/development/libraries/cimg/default.nix
+++ b/pkgs/development/libraries/cimg/default.nix
@@ -4,21 +4,22 @@
 stdenv.mkDerivation rec {
 
   name = "cimg-${version}";
-  version = "1.5.9";
+  version = "1.7.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/cimg/CImg-${version}.zip";
-    sha256 = "1xn20643gcbl76kvy9ajhwbyjjb73mg65q32ma8mdkwn1qhn7f7c";
+    url = "http://cimg.eu/files/CImg_${version}.zip";
+    sha256 = "06j3n7gvgxzvprqwf56nnca195y38dcbdlszrxyn5p9w9al437zj";
   };
 
-  buildInputs = with stdenv.lib;
-  [ unzip ];
+  buildInputs = [ unzip ];
 
   builder = ./builder.sh;
-  
+
+  outputs = [ "out" "doc" ];
+
   meta = with stdenv.lib; {
     description = "A small, open source, C++ toolkit for image processing";
-    homepage = http://cimg.sourceforge.net/;
+    homepage = http://cimg.eu/;
     license = licenses.cecill-c;
     maintainers = [ maintainers.AndersonTorres ];
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix
index 0d5bd834787..4c3d67b8f31 100644
--- a/pkgs/development/libraries/enet/default.nix
+++ b/pkgs/development/libraries/enet/default.nix
@@ -13,5 +13,6 @@ stdenv.mkDerivation rec {
     description = "Simple and robust network communication layer on top of UDP";
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/fmod/4.24.16.nix b/pkgs/development/libraries/fmod/4.24.16.nix
index b78b1a46e25..191db2f6f6d 100644
--- a/pkgs/development/libraries/fmod/4.24.16.nix
+++ b/pkgs/development/libraries/fmod/4.24.16.nix
@@ -5,7 +5,7 @@ let
   bits = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") "64";
 
   libPath = stdenv.lib.makeLibraryPath
-    [ stdenv.cc.libc stdenv.cc.cc ] + ":${stdenv.cc.cc}/lib64";
+    [ stdenv.cc.libc stdenv.cc.cc ] + ":${stdenv.cc.cc.lib}/lib64";
   patchLib = x: "patchelf --set-rpath ${libPath} ${x}";
 
   src =
diff --git a/pkgs/development/libraries/fmod/default.nix b/pkgs/development/libraries/fmod/default.nix
index f014c4cecb6..621d6dc405f 100644
--- a/pkgs/development/libraries/fmod/default.nix
+++ b/pkgs/development/libraries/fmod/default.nix
@@ -5,7 +5,7 @@ let
   bits = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") "64";
 
   libPath = stdenv.lib.makeLibraryPath
-    [ stdenv.cc.libc stdenv.cc.cc ] + ":${stdenv.cc.cc}/lib64";
+    [ stdenv.cc.libc stdenv.cc.cc ] + ":${stdenv.cc.cc.lib}/lib64";
   patchLib = x: "patchelf --set-rpath ${libPath} ${x}";
 in
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index 63fb8de0fff..dc07c481b10 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -2,24 +2,16 @@
 , google-gflags, python, libiberty, openssl }:
 
 stdenv.mkDerivation rec {
-  version = "0.57.0";
   name = "folly-${version}";
+  version = "2016-04-29";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "folly";
-    rev = "v${version}";
-    sha256 = "12b9bkwmndfwmsknc209kpplxn9wqmwr3p2h0l2szrppq4qqyfq9";
+    rev = "b31eb722e444ab0293a73fe9de3f94e657ca6de9";
+    sha256 = "0s95y0wnz4xbrkzbiksnb0n0d0qrkcsbssznng57kwlq8jlfka24";
   };
 
-  patches = [
-    # Fix compatibility with Boost 1.59
-    (fetchpatch {
-      url = "https://github.com/facebook/folly/commit/29193aca605bb93d82a3c92acd95bb342115f3a4.patch";
-      sha256 = "1ixpgq1wjr3i7madx4faw72n17ilc9cr435k5w1x95jr954m9j7b";
-    })
-  ];
-
   nativeBuildInputs = [ autoreconfHook python ];
   buildInputs = [ libiberty boost libevent double_conversion glog google-gflags openssl ];
 
diff --git a/pkgs/development/libraries/gobject-introspection/darwin-fixups.patch b/pkgs/development/libraries/gobject-introspection/darwin-fixups.patch
deleted file mode 100644
index 02443d56afa..00000000000
--- a/pkgs/development/libraries/gobject-introspection/darwin-fixups.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur gobject-introspection-1.46.0-orig/giscanner/ccompiler.py gobject-introspection-1.46.0/giscanner/ccompiler.py
---- gobject-introspection-1.46.0-orig/giscanner/ccompiler.py	2016-02-01 12:25:41.000000000 -0500
-+++ gobject-introspection-1.46.0/giscanner/ccompiler.py	2016-02-01 15:50:36.000000000 -0500
-@@ -128,11 +128,7 @@
-                     self.compiler.add_runtime_library_dir('.')
- 
-                 # https://bugzilla.gnome.org/show_bug.cgi?id=625195
--                args.append('-Wl,-rpath=.')
--
--                # Ensure libraries are always linked as we are going to use ldd to work
--                # out their names later
--                args.append('-Wl,--no-as-needed')
-+                args.append('-Wl,-rpath,.')
- 
-             for library in libraries:
-                 self.compiler.add_library(library)
-@@ -140,7 +136,7 @@
-                 for library_path in libpaths:
-                     args.append('-L' + library_path)
-                     if os.path.isabs(library_path):
--                        args.append('-Wl,-rpath=' + library_path)
-+                        args.append('-Wl,-rpath,' + library_path)
- 
-         else:
-             # libtool case: assemble linker command arguments, like we did before
-Only in gobject-introspection-1.46.0/giscanner: ccompiler.py~
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 55abb21845b..0b48ef076b1 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -40,9 +40,6 @@ stdenv.mkDerivation rec {
   patches = stdenv.lib.singleton (substituteAll {
     src = ./absolute_shlib_path.patch;
     inherit nixStoreDir;
-  }) ++ optional stdenv.isDarwin (substituteAll {
-    src = ./darwin-fixups.patch;
-    inherit nixStoreDir;
   });
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix
index 0c7d412fee6..a08a653dc71 100644
--- a/pkgs/development/libraries/ijs/default.nix
+++ b/pkgs/development/libraries/ijs/default.nix
@@ -1,14 +1,9 @@
-{ stdenv, fetchurl, fetchpatch, autoreconfHook }:
+{ stdenv, fetchurl, fetchpatch, autoreconfHook, ghostscript }:
 
-let version = "9.18";
-in
 stdenv.mkDerivation {
-  name = "ijs-${version}";
+  name = "ijs-${ghostscript.version}";
 
-  src = fetchurl {
-    url = "http://downloads.ghostscript.com/public/ghostscript-${version}.tar.bz2";
-    sha256 = "18ad90za28dxybajqwf3y3dld87cgkx1ljllmcnc7ysspfxzbnl3";
-  };
+  inherit (ghostscript) src;
 
   patches = [
     # http://bugs.ghostscript.com/show_bug.cgi?id=696246
@@ -28,7 +23,7 @@ stdenv.mkDerivation {
   configureFlags = [ "--disable-static" "--enable-shared" ];
 
   meta = with stdenv.lib; {
-    homepage = https://www.openprinting.org/download/ijs/;
+    homepage = "https://www.openprinting.org/download/ijs/";
     description = "Raster printer driver architecture";
 
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/attica.nix b/pkgs/development/libraries/kde-frameworks-5.19/attica.nix
deleted file mode 100644
index 98721876c12..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/attica.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "attica";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.19/baloo.nix
deleted file mode 100644
index 38c41d9271d..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/baloo.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig
-, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime
-, kio, lmdb, makeQtWrapper, qtbase, qtquick1, solid
-}:
-
-kdeFramework {
-  name = "baloo";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [
-    kconfig kcrash kdbusaddons lmdb qtquick1 solid
-  ];
-  propagatedBuildInputs = [
-    kauth kcoreaddons kfilemetadata ki18n kio kidletime qtbase
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/baloo_file"
-    wrapQtProgram "$out/bin/baloo_file_extractor"
-    wrapQtProgram "$out/bin/balooctl"
-    wrapQtProgram "$out/bin/baloosearch"
-    wrapQtProgram "$out/bin/balooshow"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix
deleted file mode 100644
index f981b0516f7..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, qtdeclarative
-}:
-
-kdeFramework {
-  name = "bluez-qt";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtdeclarative ];
-  preConfigure = ''
-    substituteInPlace CMakeLists.txt \
-      --replace /lib/udev/rules.d "$out/lib/udev/rules.d"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix
deleted file mode 100644
index 44cc99daf26..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kdeFramework
-, extra-cmake-modules
-, qtsvg
-}:
-
-kdeFramework {
-  name = "breeze-icons";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtsvg ];
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/default.nix
deleted file mode 100644
index bb96048d6ff..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/default.nix
+++ /dev/null
@@ -1,114 +0,0 @@
-# Maintainer's Notes:
-#
-# How To Update
-#  1. Edit the URL in ./manifest.sh
-#  2. Run ./manifest.sh
-#  3. Fix build errors.
-
-{ pkgs, debug ? false }:
-
-let
-
-  inherit (pkgs) lib makeSetupHook stdenv;
-
-  mirror = "mirror://kde";
-  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
-
-  packages = self: with self; {
-    kdeFramework = args:
-      let
-        inherit (args) name;
-        inherit (srcs."${name}") src version;
-      in stdenv.mkDerivation (args // {
-        name = "${name}-${version}";
-        inherit src;
-
-        outputs = args.outputs or [ "dev" "out" ];
-
-        cmakeFlags =
-          (args.cmakeFlags or [])
-          ++ [ "-DBUILD_TESTING=OFF" ]
-          ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
-
-        meta = {
-          license = with lib.licenses; [
-            lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
-          ];
-          platforms = lib.platforms.linux;
-          homepage = "http://www.kde.org";
-        } // (args.meta or {});
-      });
-
-    attica = callPackage ./attica.nix {};
-    baloo = callPackage ./baloo.nix {};
-    bluez-qt = callPackage ./bluez-qt.nix {};
-    breeze-icons = callPackage ./breeze-icons.nix {};
-    extra-cmake-modules = callPackage ./extra-cmake-modules {};
-    frameworkintegration = callPackage ./frameworkintegration.nix {};
-    kactivities = callPackage ./kactivities.nix {};
-    kapidox = callPackage ./kapidox.nix {};
-    karchive = callPackage ./karchive.nix {};
-    kauth = callPackage ./kauth {};
-    kbookmarks = callPackage ./kbookmarks.nix {};
-    kcmutils = callPackage ./kcmutils {};
-    kcodecs = callPackage ./kcodecs.nix {};
-    kcompletion = callPackage ./kcompletion.nix {};
-    kconfig = callPackage ./kconfig.nix {};
-    kconfigwidgets = callPackage ./kconfigwidgets {};
-    kcoreaddons = callPackage ./kcoreaddons.nix {};
-    kcrash = callPackage ./kcrash.nix {};
-    kdbusaddons = callPackage ./kdbusaddons.nix {};
-    kdeclarative = callPackage ./kdeclarative.nix {};
-    kded = callPackage ./kded.nix {};
-    kdelibs4support = callPackage ./kdelibs4support {};
-    kdesignerplugin = callPackage ./kdesignerplugin.nix {};
-    kdewebkit = callPackage ./kdewebkit.nix {};
-    kdesu = callPackage ./kdesu.nix {};
-    kdnssd = callPackage ./kdnssd.nix {};
-    kdoctools = callPackage ./kdoctools {};
-    kemoticons = callPackage ./kemoticons.nix {};
-    kfilemetadata = callPackage ./kfilemetadata {};
-    kglobalaccel = callPackage ./kglobalaccel.nix {};
-    kguiaddons = callPackage ./kguiaddons.nix {};
-    khtml = callPackage ./khtml.nix {};
-    ki18n = callPackage ./ki18n.nix {};
-    kiconthemes = callPackage ./kiconthemes {};
-    kidletime = callPackage ./kidletime.nix {};
-    kimageformats = callPackage ./kimageformats.nix {};
-    kinit = callPackage ./kinit {};
-    kio = callPackage ./kio {};
-    kitemmodels = callPackage ./kitemmodels.nix {};
-    kitemviews = callPackage ./kitemviews.nix {};
-    kjobwidgets = callPackage ./kjobwidgets.nix {};
-    kjs = callPackage ./kjs.nix {};
-    kjsembed = callPackage ./kjsembed.nix {};
-    kmediaplayer = callPackage ./kmediaplayer.nix {};
-    knewstuff = callPackage ./knewstuff.nix {};
-    knotifications = callPackage ./knotifications.nix {};
-    knotifyconfig = callPackage ./knotifyconfig.nix {};
-    kpackage = callPackage ./kpackage {};
-    kparts = callPackage ./kparts.nix {};
-    kpeople = callPackage ./kpeople.nix {};
-    kplotting = callPackage ./kplotting.nix {};
-    kpty = callPackage ./kpty.nix {};
-    kross = callPackage ./kross.nix {};
-    krunner = callPackage ./krunner.nix {};
-    kservice = callPackage ./kservice {};
-    ktexteditor = callPackage ./ktexteditor {};
-    ktextwidgets = callPackage ./ktextwidgets.nix {};
-    kunitconversion = callPackage ./kunitconversion.nix {};
-    kwallet = callPackage ./kwallet.nix {};
-    kwidgetsaddons = callPackage ./kwidgetsaddons.nix {};
-    kwindowsystem = callPackage ./kwindowsystem.nix {};
-    kxmlgui = callPackage ./kxmlgui.nix {};
-    kxmlrpcclient = callPackage ./kxmlrpcclient.nix {};
-    modemmanager-qt = callPackage ./modemmanager-qt.nix {};
-    networkmanager-qt = callPackage ./networkmanager-qt.nix {};
-    oxygen-icons5 = callPackage ./oxygen-icons5.nix {};
-    plasma-framework = callPackage ./plasma-framework {};
-    solid = callPackage ./solid.nix {};
-    sonnet = callPackage ./sonnet.nix {};
-    threadweaver = callPackage ./threadweaver.nix {};
-  };
-
-in packages
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix
deleted file mode 100644
index 1c2ea70442d..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore, cmake, pkgconfig, qttools }:
-
-kdeFramework {
-  name = "extra-cmake-modules";
-
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-
-  outputs = [ "out" ];  # this package has no runtime components
-  setupHook = ./setup-hook.sh;
-
-  # It is OK to propagate these inputs as long as
-  # extra-cmake-modules is never a propagated input
-  # of some other derivation.
-  propagatedNativeBuildInputs = [ cmake pkgconfig qttools ];
-
-  meta = with lib; {
-    license = licenses.bsd2;
-    maintainers = [ maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/nix-lib-path.patch b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/nix-lib-path.patch
deleted file mode 100644
index a74340a6dc9..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/nix-lib-path.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: extra-cmake-modules-5.18.0/kde-modules/KDEInstallDirs.cmake
-===================================================================
---- extra-cmake-modules-5.18.0.orig/kde-modules/KDEInstallDirs.cmake
-+++ extra-cmake-modules-5.18.0/kde-modules/KDEInstallDirs.cmake
-@@ -200,32 +200,6 @@
- # GNUInstallDirs code deals with re-configuring, but that is dealt with
- # by the _define_* macros in this module).
- set(_LIBDIR_DEFAULT "lib")
--# Override this default 'lib' with 'lib64' iff:
--#  - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
--#  - we are NOT on debian
--#  - we are on a 64 bits system
--# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
--# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
--# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
--# See http://wiki.debian.org/Multiarch
--if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
--   AND NOT CMAKE_CROSSCOMPILING)
--  if (EXISTS "/etc/debian_version") # is this a debian system ?
--    if(CMAKE_LIBRARY_ARCHITECTURE)
--      set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
--    endif()
--  else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
--    if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
--      message(AUTHOR_WARNING
--        "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. "
--        "Please enable at least one language before including KDEInstallDirs.")
--    else()
--      if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
--        set(_LIBDIR_DEFAULT "lib64")
--      endif()
--    endif()
--  endif()
--endif()
- 
- set(_gnu_install_dirs_vars
-     BINDIR
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/series b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/series
deleted file mode 100644
index b4569e50a5f..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/series
+++ /dev/null
@@ -1 +0,0 @@
-nix-lib-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh
deleted file mode 100644
index 56ed09f4ea5..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-_ecmSetXdgDirs() {
-    addToSearchPathOnce XDG_DATA_DIRS "$1/share"
-    addToSearchPathOnce XDG_CONFIG_DIRS "$1/etc/xdg"
-    addToSearchPathOnce NIX_WRAP_XDG_CONFIG_DIRS "$1/etc/xdg"
-}
-
-_ecmPropagateSharedData() {
-    local sharedPaths=( \
-        "config.cfg" \
-        "doc" \
-        "kconf_update" \
-        "kservices5" \
-        "kservicetypes5" \
-        "kxmlgui5" \
-        "knotifications5" \
-        "icons" \
-        "sounds" \
-        "templates" \
-        "wallpapers" \
-        "applications" \
-        "desktop-directories" \
-        "mime" \
-        "info" \
-        "dbus-1" \
-        "interfaces" \
-        "services" \
-        "system-services" )
-    for dir in ${sharedPaths[@]}; do
-        if [ -d "$1/share/$dir" ]; then
-            addToSearchPathOnce NIX_WRAP_XDG_DATA_DIRS "$1/share"
-            propagateOnce propagatedUserEnvPkgs "$1"
-            break
-        fi
-    done
-}
-
-_ecmConfig() {
-    # Because we need to use absolute paths here, we must set *all* the paths.
-    cmakeFlags+=" -DKDE_INSTALL_EXECROOTDIR=${!outputBin}"
-    cmakeFlags+=" -DKDE_INSTALL_BINDIR=${!outputBin}/bin"
-    cmakeFlags+=" -DKDE_INSTALL_SBINDIR=${!outputBin}/sbin"
-    cmakeFlags+=" -DKDE_INSTALL_LIBDIR=${!outputLib}/lib"
-    cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputLib}/lib/libexec"
-    cmakeFlags+=" -DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake"
-    cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputLib}/lib/qt5/plugins"
-    cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputLib}/lib/qt5/plugins"
-    cmakeFlags+=" -DKDE_INSTALL_QTQUICKIMPORTSDIR=${!outputLib}/lib/qt5/imports"
-    cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputLib}/lib/qt5/qml"
-    cmakeFlags+=" -DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include"
-    cmakeFlags+=" -DKDE_INSTALL_LOCALSTATEDIR=/var"
-    cmakeFlags+=" -DKDE_INSTALL_DATAROOTDIR=${!outputLib}/share"
-    cmakeFlags+=" -DKDE_INSTALL_DATADIR=${!outputLib}/share"
-    cmakeFlags+=" -DKDE_INSTALL_DOCBUNDLEDIR=${!outputLib}/share/doc/HTML"
-    cmakeFlags+=" -DKDE_INSTALL_KCFGDIR=${!outputLib}/share/config.kcfg"
-    cmakeFlags+=" -DKDE_INSTALL_KCONFUPDATEDIR=${!outputLib}/share/kconf_update"
-    cmakeFlags+=" -DKDE_INSTALL_KSERVICES5DIR=${!outputLib}/share/kservices5"
-    cmakeFlags+=" -DKDE_INSTALL_KSERVICETYPES5DIR=${!outputLib}/share/kservicetypes5"
-    cmakeFlags+=" -DKDE_INSTALL_KXMLGUI5DIR=${!outputLib}/share/kxmlgui5"
-    cmakeFlags+=" -DKDE_INSTALL_KNOTIFY5RCDIR=${!outputLib}/share/knotifications5"
-    cmakeFlags+=" -DKDE_INSTALL_ICONDIR=${!outputLib}/share/icons"
-    cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale"
-    cmakeFlags+=" -DKDE_INSTALL_SOUNDDIR=${!outputLib}/share/sounds"
-    cmakeFlags+=" -DKDE_INSTALL_TEMPLATEDIR=${!outputLib}/share/templates"
-    cmakeFlags+=" -DKDE_INSTALL_WALLPAPERDIR=${!outputLib}/share/wallpapers"
-    cmakeFlags+=" -DKDE_INSTALL_APPDIR=${!outputLib}/share/applications"
-    cmakeFlags+=" -DKDE_INSTALL_DESKTOPDIR=${!outputLib}/share/desktop-directories"
-    cmakeFlags+=" -DKDE_INSTALL_MIMEDIR=${!outputLib}/share/mime/packages"
-    cmakeFlags+=" -DKDE_INSTALL_METAINFODIR=${!outputLib}/share/appdata"
-    cmakeFlags+=" -DKDE_INSTALL_MANDIR=${!outputLib}/share/man"
-    cmakeFlags+=" -DKDE_INSTALL_INFODIR=${!outputLib}/share/info"
-    cmakeFlags+=" -DKDE_INSTALL_DBUSDIR=${!outputLib}/share/dbus-1"
-    cmakeFlags+=" -DKDE_INSTALL_DBUSINTERFACEDIR=${!outputLib}/share/dbus-1/interfaces"
-    cmakeFlags+=" -DKDE_INSTALL_DBUSSERVICEDIR=${!outputLib}/share/dbus-1/services"
-    cmakeFlags+=" -DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputLib}/share/dbus-1/system-services"
-    cmakeFlags+=" -DKDE_INSTALL_SYSCONFDIR=${!outputLib}/etc"
-    cmakeFlags+=" -DKDE_INSTALL_CONFDIR=${!outputLib}/etc/xdg"
-    cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputLib}/etc/xdg/autostart"
-}
-
-envHooks+=(_ecmSetXdgDirs _ecmPropagateSharedData)
-preConfigureHooks+=(_ecmConfig)
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh b/pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh
deleted file mode 100755
index 7937e6f8bed..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -i bash -p coreutils findutils gnused nix wget
-
-set -x
-
-# The trailing slash at the end is necessary!
-RELEASE_URL="http://download.kde.org/stable/frameworks/5.19/"
-EXTRA_WGET_ARGS='-A *.tar.xz'
-
-mkdir tmp; cd tmp
-
-rm -f ../srcs.csv
-
-wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS
-
-find . | while read src; do
-    if [[ -f "${src}" ]]; then
-        # Sanitize file name
-        filename=$(basename "$src" | tr '@' '_')
-        nameVersion="${filename%.tar.*}"
-        name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,')
-        version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
-        echo "$name,$version,$src,$filename" >>../srcs.csv
-    fi
-done
-
-cat >../srcs.nix <<EOF
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
-EOF
-
-gawk -F , "{ print \$1 }" ../srcs.csv | sort | uniq | while read name; do
-    versions=$(gawk -F , "/^$name,/ { print \$2 }" ../srcs.csv)
-    latestVersion=$(echo "$versions" | sort -rV | head -n 1)
-    src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" ../srcs.csv)
-    filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" ../srcs.csv)
-    url="${src:2}"
-    sha256=$(nix-hash --type sha256 --base32 --flat "$src")
-    cat >>../srcs.nix <<EOF
-  $name = {
-    version = "$latestVersion";
-    src = fetchurl {
-      url = "\${mirror}/$url";
-      sha256 = "$sha256";
-      name = "$filename";
-    };
-  };
-EOF
-done
-
-echo "}" >>../srcs.nix
-
-rm -f ../srcs.csv
-
-cd ..
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix
deleted file mode 100644
index 26987c385ad..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kbookmarks, kcompletion
-, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications
-, kwidgetsaddons, libXcursor, qtx11extras
-}:
-
-kdeFramework {
-  name = "frameworkintegration";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kbookmarks kcompletion kconfig knotifications kwidgetsaddons
-    libXcursor
-  ];
-  propagatedBuildInputs = [ kconfigwidgets ki18n kio kiconthemes qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix
deleted file mode 100644
index 3225098f439..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig
-, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n
-, kio, kservice, kwindowsystem, kxmlgui, makeQtWrapper, qtdeclarative
-}:
-
-kdeFramework {
-  name = "kactivities";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [
-    boost kcmutils kconfig kcoreaddons kdbusaddons kservice
-    kxmlgui
-  ];
-  propagatedBuildInputs = [
-    kdeclarative kglobalaccel ki18n kio kwindowsystem qtdeclarative
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kactivitymanagerd"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix b/pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix
deleted file mode 100644
index 647be8f052c..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, python
-}:
-
-kdeFramework {
-  name = "kapidox";
-  nativeBuildInputs = [ extra-cmake-modules python ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/karchive.nix b/pkgs/development/libraries/kde-frameworks-5.19/karchive.nix
deleted file mode 100644
index a8d9a0003c3..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/karchive.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "karchive";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kauth/cmake-install-paths.patch b/pkgs/development/libraries/kde-frameworks-5.19/kauth/cmake-install-paths.patch
deleted file mode 100644
index c66f5ecd008..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kauth/cmake-install-paths.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: kauth-5.18.0/KF5AuthConfig.cmake.in
-===================================================================
---- kauth-5.18.0.orig/KF5AuthConfig.cmake.in
-+++ kauth-5.18.0/KF5AuthConfig.cmake.in
-@@ -4,9 +4,9 @@ set(KAUTH_STUB_FILES_DIR "@PACKAGE_KDE_I
- 
- set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@")
- set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@")
--set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@")
--set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@")
--set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR "@KAUTH_HELPER_INSTALL_ABSOLUTE_DIR@")
-+set(KAUTH_POLICY_FILES_INSTALL_DIR "${KDE_INSTALL_DATADIR}/polkit-1/actions")
-+set(KAUTH_HELPER_INSTALL_DIR "${KDE_INSTALL_LIBEXECDIR}")
-+set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR "${KDE_INSTALL_LIBEXECDIR}")
- 
- find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")
- 
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix
deleted file mode 100644
index 1352d8c5821..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules
-, kcoreaddons
-, polkit-qt
-}:
-
-kdeFramework {
-  name = "kauth";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ polkit-qt ];
-  propagatedBuildInputs = [ kcoreaddons ];
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kauth/series b/pkgs/development/libraries/kde-frameworks-5.19/kauth/series
deleted file mode 100644
index d2689425c38..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kauth/series
+++ /dev/null
@@ -1 +0,0 @@
-cmake-install-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix
deleted file mode 100644
index 1a469ab4db6..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kcodecs
-, kconfig
-, kconfigwidgets
-, kcoreaddons
-, kiconthemes
-, kxmlgui
-}:
-
-kdeFramework {
-  name = "kbookmarks";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcodecs
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kiconthemes
-    kxmlgui
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
deleted file mode 100644
index 0d861fa9501..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f14d2a275323a47104b33eb61c5b6910ae1a9f59 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:43:53 -0500
-Subject: [PATCH] qdiriterator follow symlinks
-
----
- src/kpluginselector.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
-index 9c3431d..d6b1ee2 100644
---- a/src/kpluginselector.cpp
-+++ b/src/kpluginselector.cpp
-@@ -305,7 +305,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
-     QStringList desktopFileNames;
-     const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
-     Q_FOREACH (const QString &dir, dirs) {
--        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
-+      QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             desktopFileNames.append(it.next());
-         }
--- 
-2.5.2
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix
deleted file mode 100644
index dbbb783ac61..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets
-, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews
-, kpackage, kservice, kxmlgui
-}:
-
-kdeFramework {
-  name = "kcmutils";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcoreaddons kiconthemes kitemviews kpackage kxmlgui
-  ];
-  propagatedBuildInputs = [ kconfigwidgets kdeclarative ki18n kservice ];
-  patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix
deleted file mode 100644
index 53a69a69b69..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "kcodecs";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix
deleted file mode 100644
index e393774f16a..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kconfig
-, kwidgetsaddons
-}:
-
-kdeFramework {
-  name = "kcompletion";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kconfig kwidgetsaddons ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix b/pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix
deleted file mode 100644
index e132afe5988..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, makeQtWrapper
-}:
-
-kdeFramework {
-  name = "kconfig";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kreadconfig5"
-    wrapQtProgram "$out/bin/kwriteconfig5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
deleted file mode 100644
index 7a6c0ee9053..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4f84780893d505b2d62a14633dd983baa8ec6e28 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:47:01 -0500
-Subject: [PATCH] qdiriterator follow symlinks
-
----
- src/khelpclient.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp
-index 53a331e..80fbb01 100644
---- a/src/khelpclient.cpp
-+++ b/src/khelpclient.cpp
-@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname)
-     QString docPath;
-     const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
-     Q_FOREACH (const QString &dir, desktopDirs) {
--        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
-+        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             const QString desktopPath(it.next());
-             KDesktopFile desktopFile(desktopPath);
--- 
-2.5.2
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix
deleted file mode 100644
index 0e14d06edd3..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig
-, kdoctools, kguiaddons, ki18n, kwidgetsaddons, makeQtWrapper
-}:
-
-kdeFramework {
-  name = "kconfigwidgets";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [ kguiaddons ];
-  propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ];
-  patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/preparetips5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix
deleted file mode 100644
index f3a1db7bd48..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib, makeQtWrapper
-, extra-cmake-modules
-, shared_mime_info
-}:
-
-kdeFramework {
-  name = "kcoreaddons";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ shared_mime_info ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/desktoptojson"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix
deleted file mode 100644
index bbab78ccb40..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kcoreaddons
-, kwindowsystem
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kcrash";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons ];
-  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix
deleted file mode 100644
index d2ceab31d14..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, makeQtWrapper
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kdbusaddons";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  propagatedBuildInputs = [ qtx11extras ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kquitapp5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix
deleted file mode 100644
index 74d107466cf..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, epoxy, kconfig
-, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage
-, kwidgetsaddons, kwindowsystem, makeQtWrapper, pkgconfig
-, qtdeclarative
-}:
-
-kdeFramework {
-  name = "kdeclarative";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [
-    epoxy kguiaddons kiconthemes kwidgetsaddons
-  ];
-  propagatedBuildInputs = [
-    kconfig kglobalaccel ki18n kio kpackage kwindowsystem qtdeclarative
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kpackagelauncherqml"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kded.nix b/pkgs/development/libraries/kde-frameworks-5.19/kded.nix
deleted file mode 100644
index 47ae2d68c68..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kded.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kconfig
-, kcoreaddons
-, kcrash
-, kdbusaddons
-, kdoctools
-, kinit
-, kservice
-}:
-
-kdeFramework {
-  name = "kded";
-  buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ];
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/default.nix
deleted file mode 100644
index 843db83a99b..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules, docbook_xml_dtd_45, kauth
-, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons
-, kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons
-, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels
-, kinit, knotifications, kparts, kservice, ktextwidgets
-, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui
-, networkmanager, qtsvg, qtx11extras, xlibs
-}:
-
-# TODO: debug docbook detection
-
-kdeFramework {
-  name = "kdelibs4support";
-  outputs = [ "dev" "out" ];
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  setupHook = ./setup-hook.sh;
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [
-    kcompletion kconfig kded kservice kwidgetsaddons
-    kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
-  ];
-  propagatedBuildInputs = [
-    kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons
-    kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n kio
-    kiconthemes kitemmodels kinit knotifications kparts ktextwidgets
-    kunitconversion kwindowsystem
-  ];
-  cmakeFlags = [
-    "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
-    "-DDocBookXML4_DTD_VERSION=4.5"
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch
deleted file mode 100644
index eabb7025448..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kdelibs4support-5.18.0/src/kdecore/kstandarddirs.cpp
-===================================================================
---- kdelibs4support-5.18.0.orig/src/kdecore/kstandarddirs.cpp
-+++ kdelibs4support-5.18.0/src/kdecore/kstandarddirs.cpp
-@@ -292,7 +292,7 @@ static QString relativeInstallPath(const
-             return QFile::decodeName(ICON_INSTALL_DIR "/");
-         }
-         if (strcmp("include", type) == 0) {
--            return QFile::decodeName(INCLUDE_INSTALL_DIR "/");
-+            return QFile::decodeName(qgetenv("NIX_KDE_INCLUDE_DIR"));
-         }
-         break;
-     case 'l':
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/series b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/series
deleted file mode 100644
index 9b08ab20877..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/series
+++ /dev/null
@@ -1 +0,0 @@
-nix-kde-include-dir.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/setup-hook.sh
deleted file mode 100644
index 21ac2e83b5d..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/setup-hook.sh
+++ /dev/null
@@ -1 +0,0 @@
-export NIX_KDE_INCLUDE_DIR="@dev@/include/"  # trailing slash is required!
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix
deleted file mode 100644
index cbc114ccca0..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ kdeFramework, lib, makeQtWrapper
-, extra-cmake-modules
-, kcompletion
-, kconfig
-, kconfigwidgets
-, kcoreaddons
-, kdewebkit
-, kdoctools
-, kiconthemes
-, kio
-, kitemviews
-, kplotting
-, ktextwidgets
-, kwidgetsaddons
-, kxmlgui
-, sonnet
-}:
-
-kdeFramework {
-  name = "kdesignerplugin";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit
-    kiconthemes kitemviews kplotting ktextwidgets kwidgetsaddons
-    kxmlgui
-  ];
-  propagatedBuildInputs = [ kio sonnet ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kgendesignerplugin"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix
deleted file mode 100644
index 364fbd6a720..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty
-, kservice
-}:
-
-kdeFramework {
-  name = "kdesu";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons kservice ];
-  propagatedBuildInputs = [ ki18n kpty ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix
deleted file mode 100644
index d361313d1d4..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, ki18n, kio, kjobwidgets, kparts, kservice, kwallet, qtwebkit
-}:
-
-kdeFramework {
-  name = "kdewebkit";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kconfig kcoreaddons kjobwidgets kparts kservice kwallet ];
-  propagatedBuildInputs = [ ki18n kio qtwebkit ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix
deleted file mode 100644
index f00432b0c9c..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, avahi
-}:
-
-kdeFramework {
-  name = "kdnssd";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ avahi ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix
deleted file mode 100644
index f67c19f4239..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45
-, docbook5_xsl, karchive, ki18n, makeQtWrapper, perl, perlPackages
-}:
-
-kdeFramework {
-  name = "kdoctools";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ karchive ];
-  propagatedBuildInputs = [ ki18n ];
-  propagatedNativeBuildInputs = [ makeQtWrapper perl perlPackages.URI ];
-  cmakeFlags = [
-    "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
-    "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
-  ];
-  patches = [ ./kdoctools-no-find-docbook-xml.patch ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
deleted file mode 100644
index 4e3a33efab3..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5c4863c..f731775 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES
-                       )
- 
- 
--find_package(DocBookXML4 "4.5")
- 
- set_package_properties(DocBookXML4 PROPERTIES
-                        TYPE REQUIRED
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix
deleted file mode 100644
index d165f84e3a2..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, karchive
-, kconfig
-, kcoreaddons
-, kservice
-}:
-
-kdeFramework {
-  name = "kemoticons";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ karchive kconfig kcoreaddons ];
-  propagatedBuildInputs = [ kservice ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/cmake-install-paths.patch b/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/cmake-install-paths.patch
deleted file mode 100644
index 732f7b69c82..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/cmake-install-paths.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kfilemetadata-5.18.0/src/CMakeLists.txt
-===================================================================
---- kfilemetadata-5.18.0.orig/src/CMakeLists.txt
-+++ kfilemetadata-5.18.0/src/CMakeLists.txt
-@@ -49,7 +49,7 @@ install(TARGETS KF5FileMetaData EXPORT K
- 
- install(EXPORT KF5FileMetaDataTargets
-         NAMESPACE KF5::
--        DESTINATION ${LIB_INSTALL_DIR}/cmake/KF5FileMetaData
-+        DESTINATION ${KDE_INSTALL_FULL_CMAKEPACKAGEDIR}/KF5FileMetaData
-         FILE KF5FileMetaDataTargets.cmake)
- 
- install(FILES
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/default.nix
deleted file mode 100644
index 9bb4831cf8d..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules
-, attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, taglib
-}:
-
-kdeFramework {
-  name = "kfilemetadata";
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive poppler taglib ];
-  propagatedBuildInputs = [ qtbase ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/series b/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/series
deleted file mode 100644
index d2689425c38..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/series
+++ /dev/null
@@ -1 +0,0 @@
-cmake-install-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix
deleted file mode 100644
index c535b3590a3..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kconfig
-, kcoreaddons
-, kcrash
-, kdbusaddons
-, kwindowsystem
-, makeQtWrapper
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kglobalaccel";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ];
-  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kglobalaccel5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix
deleted file mode 100644
index bc4e9ab1184..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kguiaddons";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.19/khtml.nix
deleted file mode 100644
index d40df466ebb..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/khtml.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, giflib, karchive
-, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs
-, knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons
-, kwindowsystem, kxmlgui, perl, phonon, qtx11extras, sonnet
-}:
-
-kdeFramework {
-  name = "khtml";
-  nativeBuildInputs = [ extra-cmake-modules perl ];
-  buildInputs = [
-    giflib karchive kiconthemes knotifications kwallet kwidgetsaddons
-    kxmlgui phonon
-  ];
-  propagatedBuildInputs = [
-    kcodecs kglobalaccel ki18n kio kjs kparts ktextwidgets
-    kwindowsystem qtx11extras sonnet
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix b/pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix
deleted file mode 100644
index 268006512e7..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, gettext
-, python
-, qtdeclarative
-, qtscript
-}:
-
-kdeFramework {
-  name = "ki18n";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtdeclarative qtscript ];
-  propagatedNativeBuildInputs = [ gettext python ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch
deleted file mode 100644
index 5b3b15d5d5b..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kiconthemes-5.17.0/src/kicontheme.cpp
-===================================================================
---- kiconthemes-5.17.0.orig/src/kicontheme.cpp
-+++ kiconthemes-5.17.0/src/kicontheme.cpp
-@@ -557,7 +557,7 @@ void KIconTheme::reconfigure()
- // static
- QString KIconTheme::defaultThemeName()
- {
--    return QStringLiteral("oxygen");
-+    return QStringLiteral("breeze");
- }
- 
- void KIconTheme::assignIconsToContextMenu(ContextMenus type,
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix
deleted file mode 100644
index b78b25582be..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules, makeQtWrapper
-, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg
-}:
-
-kdeFramework {
-  name = "kiconthemes";
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ kconfigwidgets kitemviews qtsvg ];
-  propagatedBuildInputs = [ breeze-icons ki18n ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kiconfinder5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series
deleted file mode 100644
index ab5cc8a3edb..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series
+++ /dev/null
@@ -1 +0,0 @@
-default-theme-breeze.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix b/pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix
deleted file mode 100644
index fc086560023..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, qtbase
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kidletime";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras ];
-  propagatedBuildInputs = [ qtbase ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix b/pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix
deleted file mode 100644
index 49d66bbcc2c..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, ilmbase
-}:
-
-kdeFramework {
-  name = "kimageformats";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch
deleted file mode 100644
index 9c76079a382..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sat, 13 Jun 2015 08:57:55 -0500
-Subject: [PATCH] kinit libpath
-
----
- src/kdeinit/kinit.cpp | 18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
-index 9e775b6..0ac5646 100644
---- a/src/kdeinit/kinit.cpp
-+++ b/src/kdeinit/kinit.cpp
-@@ -660,15 +660,17 @@ static pid_t launch(int argc, const char *_name, const char *args,
-         if (!libpath.isEmpty()) {
-             if (!l.load()) {
-                 if (libpath_relative) {
--                    // NB: Because Qt makes the actual dlopen() call, the
--                    //     RUNPATH of kdeinit is *not* respected - see
--                    //     https://sourceware.org/bugzilla/show_bug.cgi?id=13945
--                    //     - so we try hacking it in ourselves
--                    QString install_lib_dir = QFile::decodeName(
--                            CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/");
--                    libpath = install_lib_dir + libpath;
--                    l.setFileName(libpath);
-+                  // Use QT_PLUGIN_PATH to find shared library directories
-+                  // For KF5, the plugin path is /lib/qt5/plugins/, so kdeinit5
-+                  // shared libraries should be in /lib/qt5/plugins/../../
-+                  const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]"));
-+                  const QString up = QString::fromLocal8Bit("/../../");
-+                  const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts);
-+                  Q_FOREACH (const QString &path, paths) {
-+                    l.setFileName(path + up + libpath);
-                     l.load();
-+                    if (l.isLoaded()) break;
-+                  }
-                 }
-             }
-             if (!l.isLoaded()) {
--- 
-2.4.2
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix
deleted file mode 100644
index 5f644d7c424..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcrash
-, kdoctools, ki18n, kio, kservice, kwindowsystem, libcap
-, libcap_progs
-}:
-
-# TODO: setuid wrapper
-
-kdeFramework {
-  name = "kinit";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ];
-  buildInputs = [ kconfig kcrash kservice libcap ];
-  propagatedBuildInputs = [ ki18n kio kwindowsystem ];
-  patches = [ ./0001-kinit-libpath.patch ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix
deleted file mode 100644
index a2131ff3385..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules, acl, karchive
-, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons
-, kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews
-, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet
-, kwidgetsaddons, kwindowsystem, kxmlgui, makeQtWrapper
-, qtscript, qtx11extras, solid
-}:
-
-kdeFramework {
-  name = "kio";
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    acl karchive kconfig kcoreaddons kdbusaddons kiconthemes
-    knotifications ktextwidgets kwallet kwidgetsaddons
-    qtscript
-  ];
-  propagatedBuildInputs = [
-    kbookmarks kcompletion kconfigwidgets ki18n kitemviews kjobwidgets
-    kservice kwindowsystem kxmlgui solid qtx11extras
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kcookiejar5"
-    wrapQtProgram "$out/bin/ktelnetservice5"
-    wrapQtProgram "$out/bin/ktrash5"
-    wrapQtProgram "$out/bin/kmailservice5"
-    wrapQtProgram "$out/bin/protocoltojson"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch b/pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch
deleted file mode 100644
index c9ad46b41bb..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: kio-5.17.0/src/core/ksambashare.cpp
-===================================================================
---- kio-5.17.0.orig/src/core/ksambashare.cpp
-+++ kio-5.17.0/src/core/ksambashare.cpp
-@@ -67,13 +67,18 @@ KSambaSharePrivate::~KSambaSharePrivate(
- 
- bool KSambaSharePrivate::isSambaInstalled()
- {
--    if (QFile::exists(QStringLiteral("/usr/sbin/smbd"))
--            || QFile::exists(QStringLiteral("/usr/local/sbin/smbd"))) {
--        return true;
-+    const QByteArray pathEnv = qgetenv("PATH");
-+    if (!pathEnv.isEmpty()) {
-+        QLatin1Char pathSep(':');
-+        QStringList paths = QFile::decodeName(pathEnv).split(pathSep, QString::SkipEmptyParts);
-+        for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) {
-+            it->append("/smbd");
-+            if (QFile::exists(*it)) {
-+                return true;
-+            }
-+        }
-     }
- 
--    //qDebug() << "Samba is not installed!";
--
-     return false;
- }
- 
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/series b/pkgs/development/libraries/kde-frameworks-5.19/kio/series
deleted file mode 100644
index 77ca1545004..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kio/series
+++ /dev/null
@@ -1 +0,0 @@
-samba-search-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix
deleted file mode 100644
index a9024d771cc..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "kitemmodels";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix b/pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix
deleted file mode 100644
index 931019ce495..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "kitemviews";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix
deleted file mode 100644
index 746edf12eea..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kcoreaddons
-, kwidgetsaddons
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kjobwidgets";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons kwidgetsaddons ];
-  propagatedBuildInputs = [ qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjs.nix b/pkgs/development/libraries/kde-frameworks-5.19/kjs.nix
deleted file mode 100644
index 768720f178c..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kjs.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kdoctools
-, makeQtWrapper
-}:
-
-kdeFramework {
-  name = "kjs";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kjs5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix
deleted file mode 100644
index 22eef2d47bd..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs
-, makeQtWrapper, qtsvg
-}:
-
-kdeFramework {
-  name = "kjsembed";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [ qtsvg ];
-  propagatedBuildInputs = [ ki18n kjs ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kjscmd5"
-    wrapQtProgram "$out/bin/kjsconsole"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix
deleted file mode 100644
index 460458b2232..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kparts
-, kxmlgui
-}:
-
-kdeFramework {
-  name = "kmediaplayer";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kxmlgui ];
-  propagatedBuildInputs = [ kparts ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix b/pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix
deleted file mode 100644
index 5bcd6f30146..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, attica, karchive
-, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio
-, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui
-}:
-
-kdeFramework {
-  name = "knewstuff";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    karchive kcompletion kconfig kcoreaddons kiconthemes
-    kitemviews ktextwidgets kwidgetsaddons
-  ];
-  propagatedBuildInputs = [ attica ki18n kio kservice kxmlgui ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix b/pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix
deleted file mode 100644
index 7e301dd0f26..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kcodecs
-, kconfig
-, kcoreaddons
-, kwindowsystem
-, phonon
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "knotifications";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcodecs kconfig kcoreaddons phonon
-  ];
-  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix
deleted file mode 100644
index dd99d2d4f1e..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig
-, ki18n, kio, phonon
-}:
-
-kdeFramework {
-  name = "knotifyconfig";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcompletion kconfig phonon ];
-  propagatedBuildInputs = [ ki18n kio ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch
deleted file mode 100644
index e9d74444814..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kpackage-5.18.0/src/kpackage/package.cpp
-===================================================================
---- kpackage-5.18.0.orig/src/kpackage/package.cpp
-+++ kpackage-5.18.0/src/kpackage/package.cpp
-@@ -808,7 +808,7 @@ PackagePrivate::PackagePrivate()
-     : QSharedData(),
-       fallbackPackage(0),
-       metadata(0),
--      externalPaths(false),
-+      externalPaths(true),
-       valid(false),
-       checkedValid(false)
- {
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix
deleted file mode 100644
index aea1b0d31a0..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules
-, karchive
-, kconfig
-, kcoreaddons
-, kdoctools
-, ki18n
-, makeQtWrapper
-}:
-
-kdeFramework {
-  name = "kpackage";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [ karchive kconfig ];
-  propagatedBuildInputs = [ kcoreaddons ki18n ];
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  postInstall = ''
-    wrapQtProgram "$out/bin/kpackagetool5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
deleted file mode 100644
index ddbf17d0006..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: kpackage-5.18.0/src/kpackage/packageloader.cpp
-===================================================================
---- kpackage-5.18.0.orig/src/kpackage/packageloader.cpp
-+++ kpackage-5.18.0/src/kpackage/packageloader.cpp
-@@ -241,7 +241,7 @@ QList<KPluginMetaData> PackageLoader::li
-         } else {
-             //qDebug() << "Not cached";
-             // If there's no cache file, fall back to listing the directory
--            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories;
-+            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks;
-             const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop")) << QStringLiteral("metadata.json");
- 
-             QDirIterator it(plugindir, nameFilters, QDir::Files, flags);
-Index: kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp
-===================================================================
---- kpackage-5.18.0.orig/src/kpackage/private/packagejobthread.cpp
-+++ kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp
-@@ -146,7 +146,7 @@ bool indexDirectory(const QString& dir,
- 
-     QJsonArray plugins;
- 
--    QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories);
-+    QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-     while (it.hasNext()) {
-         it.next();
-         const QString path = it.fileInfo().absoluteFilePath();
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/series b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/series
deleted file mode 100644
index 9b7f076efc7..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/series
+++ /dev/null
@@ -1,2 +0,0 @@
-allow-external-paths.patch
-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kparts.nix b/pkgs/development/libraries/kde-frameworks-5.19/kparts.nix
deleted file mode 100644
index 1c3e0b2cbc5..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kparts.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, ki18n, kiconthemes, kio, kjobwidgets, knotifications, kservice
-, ktextwidgets, kwidgetsaddons, kxmlgui
-}:
-
-kdeFramework {
-  name = "kparts";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kconfig kcoreaddons kiconthemes kjobwidgets knotifications
-    kservice kwidgetsaddons
-  ];
-  propagatedBuildInputs = [ ki18n kio ktextwidgets kxmlgui ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix b/pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix
deleted file mode 100644
index 4c3877e7efd..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n
-, kitemviews, kservice, kwidgetsaddons, qtdeclarative
-}:
-
-kdeFramework {
-  name = "kpeople";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcoreaddons kitemviews kservice kwidgetsaddons
-  ];
-  propagatedBuildInputs = [ ki18n qtdeclarative ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix b/pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix
deleted file mode 100644
index c16f51b5ac3..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "kplotting";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpty.nix b/pkgs/development/libraries/kde-frameworks-5.19/kpty.nix
deleted file mode 100644
index 2e34e6f674c..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kpty.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n }:
-
-kdeFramework {
-  name = "kpty";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kcoreaddons ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kross.nix b/pkgs/development/libraries/kde-frameworks-5.19/kross.nix
deleted file mode 100644
index 7c6f079feaa..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kross.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcompletion, kcoreaddons
-, kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons
-, kxmlgui, qtscript
-}:
-
-kdeFramework {
-  name = "kross";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ kcompletion kcoreaddons kxmlgui ];
-  propagatedBuildInputs = [ ki18n kiconthemes kio kparts kwidgetsaddons qtscript ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/krunner.nix b/pkgs/development/libraries/kde-frameworks-5.19/krunner.nix
deleted file mode 100644
index 12d2b54d0eb..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/krunner.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, ki18n, kio, kservice, plasma-framework, qtquick1, solid
-, threadweaver
-}:
-
-kdeFramework {
-  name = "krunner";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kconfig kcoreaddons kservice qtquick1 solid threadweaver
-  ];
-  propagatedBuildInputs = [ ki18n kio plasma-framework ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
deleted file mode 100644
index 3d8397d8ee2..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ae8919eb81abad369e4a26ffcd845b140983398d Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:28:57 -0500
-Subject: [PATCH 1/2] qdiriterator follow symlinks
-
----
- src/sycoca/kbuildsycoca.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sycoca/kbuildsycoca.cpp b/src/sycoca/kbuildsycoca.cpp
-index 1deae14..250baa8 100644
---- a/src/sycoca/kbuildsycoca.cpp
-+++ b/src/sycoca/kbuildsycoca.cpp
-@@ -208,7 +208,7 @@ bool KBuildSycoca::build()
-         QStringList relFiles;
-         const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_resourceSubdir, QStandardPaths::LocateDirectory);
-         Q_FOREACH (const QString &dir, dirs) {
--            QDirIterator it(dir, QDirIterator::Subdirectories);
-+            QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-             while (it.hasNext()) {
-                 const QString filePath = it.next();
-                 Q_ASSERT(filePath.startsWith(dir)); // due to the line below...
--- 
-2.5.2
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch
deleted file mode 100644
index 685c6852611..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 46d124da602d84b7611a7ff0ac0862168d451cdb Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:31:29 -0500
-Subject: [PATCH 2/2] no canonicalize path
-
----
- src/sycoca/vfolder_menu.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sycoca/vfolder_menu.cpp b/src/sycoca/vfolder_menu.cpp
-index d3e31c3..d15d743 100644
---- a/src/sycoca/vfolder_menu.cpp
-+++ b/src/sycoca/vfolder_menu.cpp
-@@ -415,7 +415,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR
-     }
- 
-     if (!relative) {
--        QString resolved = QDir(dir).canonicalPath();
-+      QString resolved = QDir::cleanPath(dir);
-         if (!resolved.isEmpty()) {
-             dir = resolved;
-         }
--- 
-2.5.2
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix
deleted file mode 100644
index 3a27d85b916..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem
-}:
-
-kdeFramework {
-  name = "kservice";
-  propagatedNativeBuildInputs = [ extra-cmake-modules ];
-  nativeBuildInputs = [ kdoctools ];
-  buildInputs = [ kcrash kdbusaddons ];
-  propagatedBuildInputs = [ kconfig kcoreaddons ki18n kwindowsystem ];
-  patches = [
-    ./0001-qdiriterator-follow-symlinks.patch
-    ./0002-no-canonicalize-path.patch
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix
deleted file mode 100644
index b8df6a5f4c0..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules, makeQtWrapper, perl
-, karchive, kconfig, kguiaddons, kiconthemes, kparts
-, libgit2
-, qtscript, qtxmlpatterns
-, ki18n, kio, sonnet
-}:
-
-kdeFramework {
-  name = "ktexteditor";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper perl ];
-  buildInputs = [
-    karchive kconfig kguiaddons kiconthemes kparts
-    libgit2
-    qtscript qtxmlpatterns
-  ];
-  propagatedBuildInputs = [ ki18n kio sonnet ];
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch
deleted file mode 100644
index 19ab1e1e551..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp
-===================================================================
---- ktexteditor-5.18.0.orig/src/syntax/data/katehighlightingindexer.cpp
-+++ ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp
-@@ -55,19 +55,16 @@ QStringList readListing(const QString &f
- 
- int main(int argc, char *argv[])
- {
--    // get app instance
--    QCoreApplication app(argc, argv);
--
-     // ensure enough arguments are passed
--    if (app.arguments().size() < 3)
-+    if (argc < 3)
-         return 1;
- 
-     // open schema
-     QXmlSchema schema;
--    if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2))))
-+    if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2]))))
-         return 2;
- 
--    const QString hlFilenamesListing = app.arguments().value(3);
-+    const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]);
-     if (hlFilenamesListing.isEmpty()) {
-         return 1;
-     }
-@@ -152,7 +149,7 @@ int main(int argc, char *argv[])
-         return anyError;
- 
-     // create outfile, after all has worked!
--    QFile outFile(app.arguments().at(1));
-+    QFile outFile(QString::fromLocal8Bit(argv[1]));
-     if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
-         return 7;
- 
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series
deleted file mode 100644
index 46cd23829a2..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series
+++ /dev/null
@@ -1 +0,0 @@
-no-qcoreapplication.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix
deleted file mode 100644
index e332d4ff9a8..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig
-, kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem
-, sonnet
-}:
-
-kdeFramework {
-  name = "ktextwidgets";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcompletion kconfig kconfigwidgets kiconthemes kservice
-  ];
-  propagatedBuildInputs = [ ki18n kwindowsystem sonnet ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix
deleted file mode 100644
index 3cf0f847d83..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, ki18n }:
-
-kdeFramework {
-  name = "kunitconversion";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix
deleted file mode 100644
index 5ade5f63a8d..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kconfigwidgets
-, kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes
-, knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt
-, makeQtWrapper }:
-
-kdeFramework {
-  name = "kwallet";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes
-    knotifications kservice kwidgetsaddons libgcrypt
-  ];
-  propagatedBuildInputs = [ ki18n kwindowsystem ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kwalletd5"
-    wrapQtProgram "$out/bin/kwallet-query"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix
deleted file mode 100644
index d95f44d3fec..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "kwidgetsaddons";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix
deleted file mode 100644
index 09ab1f2200d..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kwindowsystem";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix
deleted file mode 100644
index f081d5f9170..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, attica, kconfig
-, kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews
-, ktextwidgets, kwindowsystem, sonnet
-}:
-
-kdeFramework {
-  name = "kxmlgui";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    attica kconfig kiconthemes kitemviews ktextwidgets
-  ];
-  propagatedBuildInputs = [
-    kconfigwidgets kglobalaccel ki18n kwindowsystem sonnet
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix
deleted file mode 100644
index 20a300b68bc..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, ki18n, kio }:
-
-kdeFramework {
-  name = "kxmlrpcclient";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ ki18n kio ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix
deleted file mode 100644
index 7d7f769d6a9..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, modemmanager
-}:
-
-kdeFramework {
-  name = "modemmanager-qt";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ modemmanager ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix
deleted file mode 100644
index 333378bd143..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, networkmanager
-}:
-
-kdeFramework {
-  name = "networkmanager-qt";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ networkmanager ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix
deleted file mode 100644
index ee350f8e153..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework
-, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "oxygen-icons5";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    license = lib.licenses.lgpl3Plus;
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix
deleted file mode 100644
index d8846f77723..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kactivities, karchive
-, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
-, kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio
-, knotifications, kpackage, kservice, kwindowsystem, kxmlgui
-, makeQtWrapper, qtscript, qtx11extras
-}:
-
-kdeFramework {
-  name = "plasma-framework";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons
-    kiconthemes knotifications kxmlgui qtscript
-  ];
-  propagatedBuildInputs = [
-    kactivities kdeclarative kglobalaccel ki18n kio kpackage kservice kwindowsystem
-    qtx11extras
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/plasmapkg2"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/solid.nix b/pkgs/development/libraries/kde-frameworks-5.19/solid.nix
deleted file mode 100644
index afd125e3c59..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/solid.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, makeQtWrapper
-, qtdeclarative
-}:
-
-kdeFramework {
-  name = "solid";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ qtdeclarative ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/solid-hardware5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix b/pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix
deleted file mode 100644
index 943fe04a1c9..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, hunspell
-}:
-
-kdeFramework {
-  name = "sonnet";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ hunspell ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.19/srcs.nix
deleted file mode 100644
index b86c0b71224..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/srcs.nix
+++ /dev/null
@@ -1,565 +0,0 @@
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
-  attica = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/attica-5.19.0.tar.xz";
-      sha256 = "0cbvjnv2fcqsxspiy5pzmnnzrpfamlsc9j927kd6gpzai1ckf1lv";
-      name = "attica-5.19.0.tar.xz";
-    };
-  };
-  baloo = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/baloo-5.19.0.tar.xz";
-      sha256 = "02yy0w13h5wxm74a87zi439f6yd9miid6rb54nia0pgvcka98svg";
-      name = "baloo-5.19.0.tar.xz";
-    };
-  };
-  bluez-qt = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/bluez-qt-5.19.0.tar.xz";
-      sha256 = "0609i7rzhnnnp4fqnwscwp6y646ji8kl2hw5sy7azc87yllisnyv";
-      name = "bluez-qt-5.19.0.tar.xz";
-    };
-  };
-  breeze-icons = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/breeze-icons-5.19.0.tar.xz";
-      sha256 = "0bwix0jl1dscqfb7ygn9drpd9ivfx4g15vz6h01mswvxa9lz1vj0";
-      name = "breeze-icons-5.19.0.tar.xz";
-    };
-  };
-  extra-cmake-modules = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/extra-cmake-modules-5.19.0.tar.xz";
-      sha256 = "1dl3hhbara7iswb5wsc5dp17ar3ljw5f0nrncl8vry9smaz2zl63";
-      name = "extra-cmake-modules-5.19.0.tar.xz";
-    };
-  };
-  frameworkintegration = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/frameworkintegration-5.19.0.tar.xz";
-      sha256 = "00la7p7wcyqpxyi73h4fjrmm9d2gqzdaljn4468xya4bfns5ijy3";
-      name = "frameworkintegration-5.19.0.tar.xz";
-    };
-  };
-  kactivities = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kactivities-5.19.0.tar.xz";
-      sha256 = "0yml1sbn3z4jd4vsfs25kqrl03pmlcgamzbgpw3248sabhyg7ks3";
-      name = "kactivities-5.19.0.tar.xz";
-    };
-  };
-  kapidox = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kapidox-5.19.0.tar.xz";
-      sha256 = "0a9731xrkd6mnqh72592rx6gfnxxdfd7xl8pdpgdn7qs3394k1yz";
-      name = "kapidox-5.19.0.tar.xz";
-    };
-  };
-  karchive = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/karchive-5.19.0.tar.xz";
-      sha256 = "043spmi7s2d1bj8d3wbgzbhisip6h92kqjhlvg8gyv0a7vy54ymv";
-      name = "karchive-5.19.0.tar.xz";
-    };
-  };
-  kauth = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kauth-5.19.0.tar.xz";
-      sha256 = "0fm9ih2hkh2rpmlf98yw8z1r5bn2qmpva2k7mrv6ijd5h767fxss";
-      name = "kauth-5.19.0.tar.xz";
-    };
-  };
-  kbookmarks = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kbookmarks-5.19.0.tar.xz";
-      sha256 = "0q418jpdc348nqgdavsmxxka4g8sldpdi9n89i1pllfmq10kw9sd";
-      name = "kbookmarks-5.19.0.tar.xz";
-    };
-  };
-  kcmutils = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kcmutils-5.19.0.tar.xz";
-      sha256 = "0qhdjb3zvqq9ycfgb52lz4flgipyplj5ksz8h8y71bbs4w6lazd8";
-      name = "kcmutils-5.19.0.tar.xz";
-    };
-  };
-  kcodecs = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kcodecs-5.19.0.tar.xz";
-      sha256 = "1rzp314fv9n5168j7nhv1c8fjaszpmgdx6javrx4w0hyrjdfkg66";
-      name = "kcodecs-5.19.0.tar.xz";
-    };
-  };
-  kcompletion = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kcompletion-5.19.0.tar.xz";
-      sha256 = "05n0y5kf3bcc4wgn6k0js5cravv1k93xxzrgapm21323qgvfagwd";
-      name = "kcompletion-5.19.0.tar.xz";
-    };
-  };
-  kconfig = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kconfig-5.19.0.tar.xz";
-      sha256 = "0nk5hfl8yh0kgaa7xi0cc05dl6nf7prvbvxv0i99207xh9dafdmm";
-      name = "kconfig-5.19.0.tar.xz";
-    };
-  };
-  kconfigwidgets = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kconfigwidgets-5.19.0.tar.xz";
-      sha256 = "1nld27chcjwjgwv76s2j77ifmca235yp10bm08rjmvnfn6778ypv";
-      name = "kconfigwidgets-5.19.0.tar.xz";
-    };
-  };
-  kcoreaddons = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kcoreaddons-5.19.0.tar.xz";
-      sha256 = "07sm0givfdx28p302fkynzsd3xkpn1hbs43d4rscyx18yxfsldcw";
-      name = "kcoreaddons-5.19.0.tar.xz";
-    };
-  };
-  kcrash = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kcrash-5.19.0.tar.xz";
-      sha256 = "1dy03gp1sj96wn0zfa0dpbvz8pz0ia1j7p1wcif3iqk55pjxdgyl";
-      name = "kcrash-5.19.0.tar.xz";
-    };
-  };
-  kdbusaddons = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kdbusaddons-5.19.0.tar.xz";
-      sha256 = "1bb5aik0kl3kab5399drfjxrm8iysgkf813xgr0y4k64c9kwfp28";
-      name = "kdbusaddons-5.19.0.tar.xz";
-    };
-  };
-  kdeclarative = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kdeclarative-5.19.0.tar.xz";
-      sha256 = "03g02zy7wjzmpvqzxx32z8ap7jyj9sf432g1d3csb0dcbx2ny52g";
-      name = "kdeclarative-5.19.0.tar.xz";
-    };
-  };
-  kded = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kded-5.19.0.tar.xz";
-      sha256 = "0nyvg0h2aqy7qr57bad6wyc2rmcv9nhdq0py4fxc3irb6516p9hz";
-      name = "kded-5.19.0.tar.xz";
-    };
-  };
-  kdelibs4support = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/portingAids/kdelibs4support-5.19.0.tar.xz";
-      sha256 = "0iqnb2j6gfy8006arwv65vljfhxdnk6aia0zppngb481jnd9n2pn";
-      name = "kdelibs4support-5.19.0.tar.xz";
-    };
-  };
-  kdesignerplugin = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kdesignerplugin-5.19.0.tar.xz";
-      sha256 = "11inmvyair796rx4842naf1dnxqvc6bqqzrv700ycvisad646ws5";
-      name = "kdesignerplugin-5.19.0.tar.xz";
-    };
-  };
-  kdesu = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kdesu-5.19.0.tar.xz";
-      sha256 = "19w8m7ji61bpd368lzkwlizcwa1l968l568lksgm2mm9pnyjjhgz";
-      name = "kdesu-5.19.0.tar.xz";
-    };
-  };
-  kdewebkit = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kdewebkit-5.19.0.tar.xz";
-      sha256 = "04b5qanhxggffnvmi28lspyi8kj4kq7mxhxndar9fmkzzgvy70hj";
-      name = "kdewebkit-5.19.0.tar.xz";
-    };
-  };
-  kdnssd = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kdnssd-5.19.0.tar.xz";
-      sha256 = "15a8w2i29mrbhadw6y123mr0cc45ijabnwdfp3lbkd40lk8nq314";
-      name = "kdnssd-5.19.0.tar.xz";
-    };
-  };
-  kdoctools = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kdoctools-5.19.0.tar.xz";
-      sha256 = "06g77n9wxpiv4skc1kz794ppfb2mkmd3fgn6an5kr301xc76cnpn";
-      name = "kdoctools-5.19.0.tar.xz";
-    };
-  };
-  kemoticons = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kemoticons-5.19.0.tar.xz";
-      sha256 = "0fiix2sf2wrvmrpx8whdr1bzm7gbv7pvg02y47w5bl6s9gh176g5";
-      name = "kemoticons-5.19.0.tar.xz";
-    };
-  };
-  kfilemetadata = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kfilemetadata-5.19.0.tar.xz";
-      sha256 = "11j8if3xhp3xxwibwm6nxb4lh8wx40ni3zf5hki327pxv4vpq3qr";
-      name = "kfilemetadata-5.19.0.tar.xz";
-    };
-  };
-  kglobalaccel = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kglobalaccel-5.19.0.tar.xz";
-      sha256 = "021j98f7217m83aqxpamg0lzlaiskdaqsd9iabc8wrp1g0nkm05d";
-      name = "kglobalaccel-5.19.0.tar.xz";
-    };
-  };
-  kguiaddons = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kguiaddons-5.19.0.tar.xz";
-      sha256 = "019xaf7vpgifcw8wibli9d2b50brhgdaypsqknh6mqq8q9g06jhy";
-      name = "kguiaddons-5.19.0.tar.xz";
-    };
-  };
-  khtml = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/portingAids/khtml-5.19.0.tar.xz";
-      sha256 = "0hqa54a9nxy954vy8gf52y89xd3ibz9b4jgh6w347b1alp1zn145";
-      name = "khtml-5.19.0.tar.xz";
-    };
-  };
-  ki18n = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/ki18n-5.19.0.tar.xz";
-      sha256 = "0v3arc20y5d8afm9zfrz1skd2xg3ng62cq1xvxiq645w6mxf7y05";
-      name = "ki18n-5.19.0.tar.xz";
-    };
-  };
-  kiconthemes = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kiconthemes-5.19.0.tar.xz";
-      sha256 = "0riicirgda3w2b30dzsa2lq9xrr4y04qwhxyzq1p8gn2x4pp3g3n";
-      name = "kiconthemes-5.19.0.tar.xz";
-    };
-  };
-  kidletime = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kidletime-5.19.0.tar.xz";
-      sha256 = "0jlbzqv36ddhfhk8xkkgw0xhq8s371z9ama1cyv2xq8kk4vjywc6";
-      name = "kidletime-5.19.0.tar.xz";
-    };
-  };
-  kimageformats = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kimageformats-5.19.0.tar.xz";
-      sha256 = "1ydizc6b0ncndazk62h8y249yfcx381pwzyivfpka1f69zfgyvv5";
-      name = "kimageformats-5.19.0.tar.xz";
-    };
-  };
-  kinit = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kinit-5.19.0.tar.xz";
-      sha256 = "03l7pijqdnnsfg6yz9p73p7xa86sldayggl6rc5hpkzmgyczcfzm";
-      name = "kinit-5.19.0.tar.xz";
-    };
-  };
-  kio = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kio-5.19.0.tar.xz";
-      sha256 = "0c7smp7cajivx53shy65mp9zcc51pha9iyvh37dggfflxy3xf9nv";
-      name = "kio-5.19.0.tar.xz";
-    };
-  };
-  kitemmodels = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kitemmodels-5.19.0.tar.xz";
-      sha256 = "0skmim986qnncbzd84vm1wp1fr41jn04af2dgckirsk23d35bln7";
-      name = "kitemmodels-5.19.0.tar.xz";
-    };
-  };
-  kitemviews = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kitemviews-5.19.0.tar.xz";
-      sha256 = "118zv46mvrfwbvl06bb1m8axv92wnp4pfs36hsxvnjl7gfjk5xjn";
-      name = "kitemviews-5.19.0.tar.xz";
-    };
-  };
-  kjobwidgets = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kjobwidgets-5.19.0.tar.xz";
-      sha256 = "1qzf8nzy8rxkdai9aj2lyrww90245v0p2q115xiz73bsg9rahmji";
-      name = "kjobwidgets-5.19.0.tar.xz";
-    };
-  };
-  kjs = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/portingAids/kjs-5.19.0.tar.xz";
-      sha256 = "08m01762hb25vm020g3v37bh40cgvcfrj45ql135klx96x9imfaf";
-      name = "kjs-5.19.0.tar.xz";
-    };
-  };
-  kjsembed = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/portingAids/kjsembed-5.19.0.tar.xz";
-      sha256 = "1wmkgy8jgm21y2cvcbv1fdv29dxxla8n6ws78kzzbbw4cgqwwl48";
-      name = "kjsembed-5.19.0.tar.xz";
-    };
-  };
-  kmediaplayer = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/portingAids/kmediaplayer-5.19.0.tar.xz";
-      sha256 = "1vhqr2c7q8vwzdj29vpmfjfhyal8wp9ffirrnqc98vb6sffs85ay";
-      name = "kmediaplayer-5.19.0.tar.xz";
-    };
-  };
-  knewstuff = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/knewstuff-5.19.0.tar.xz";
-      sha256 = "12acd12vxk9z83zg3yz8lvmmb8737z9lzd4hs9a3jcs1z5k2nhb4";
-      name = "knewstuff-5.19.0.tar.xz";
-    };
-  };
-  knotifications = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/knotifications-5.19.0.tar.xz";
-      sha256 = "0grgm0ws16gp2j77nslqpl1jpxbi0m6g59zr7v1xnmzdk2j6n4av";
-      name = "knotifications-5.19.0.tar.xz";
-    };
-  };
-  knotifyconfig = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/knotifyconfig-5.19.0.tar.xz";
-      sha256 = "161brvryxzdkny7sf6icn1jpyi6rnw6jc808gdf5g41v50xpnxfj";
-      name = "knotifyconfig-5.19.0.tar.xz";
-    };
-  };
-  kpackage = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kpackage-5.19.0.tar.xz";
-      sha256 = "1km4sjgxfljp2pnjnzj48q3c574zvj7341a57n4ifhjwj37yzxdv";
-      name = "kpackage-5.19.0.tar.xz";
-    };
-  };
-  kparts = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kparts-5.19.0.tar.xz";
-      sha256 = "05g59x2mrqygawzcwgw3igl5n96l649h0kpzh37sfq4i8kg15g7l";
-      name = "kparts-5.19.0.tar.xz";
-    };
-  };
-  kpeople = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kpeople-5.19.0.tar.xz";
-      sha256 = "1ksf6g71li1xk4q98cvwkam8m8g32x2815kj1gfwbg4g6iw74w98";
-      name = "kpeople-5.19.0.tar.xz";
-    };
-  };
-  kplotting = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kplotting-5.19.0.tar.xz";
-      sha256 = "169x4m9ms8yhfha8zclnl8wrnfhfqshpwwg4b5bd046pcrkqmnqq";
-      name = "kplotting-5.19.0.tar.xz";
-    };
-  };
-  kpty = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kpty-5.19.0.tar.xz";
-      sha256 = "0289vzfjwppwqj9h03flzhwm18dnxz11hqhdhr9990x7rw6a4n03";
-      name = "kpty-5.19.0.tar.xz";
-    };
-  };
-  kross = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/portingAids/kross-5.19.0.tar.xz";
-      sha256 = "1nv7mrhn7wa4bs2a164x42d3b37akyvhkxqs8cg5fqp4vr2wkw0p";
-      name = "kross-5.19.0.tar.xz";
-    };
-  };
-  krunner = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/portingAids/krunner-5.19.0.tar.xz";
-      sha256 = "054s8309lxi27gpbg7iygbcxsp0pwrzbzww3h8zp2a9yiic4s5mx";
-      name = "krunner-5.19.0.tar.xz";
-    };
-  };
-  kservice = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kservice-5.19.0.tar.xz";
-      sha256 = "02lbia26r2462nwksizaxjfkhxfqqs732dp495yx8bjc7wcv3srm";
-      name = "kservice-5.19.0.tar.xz";
-    };
-  };
-  ktexteditor = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/ktexteditor-5.19.0.tar.xz";
-      sha256 = "0v3l44w4k43ajs81i8386hszk3x7rajjlb6z3jb7q98vhp91b5dp";
-      name = "ktexteditor-5.19.0.tar.xz";
-    };
-  };
-  ktextwidgets = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/ktextwidgets-5.19.0.tar.xz";
-      sha256 = "1xydb76r6x1p10bkr2nlqg3md78jw8zvqad0h42dgvl4f5xvjknp";
-      name = "ktextwidgets-5.19.0.tar.xz";
-    };
-  };
-  kunitconversion = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kunitconversion-5.19.0.tar.xz";
-      sha256 = "11g1vhqkrb1k748drj7klkbb7jca3dybakcmcgqf53g8vxfih8kb";
-      name = "kunitconversion-5.19.0.tar.xz";
-    };
-  };
-  kwallet = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kwallet-5.19.0.tar.xz";
-      sha256 = "0z0c62fdfx9syrq6z7bk0ihac4yqyxpycll7h3mijj29km4jnpjm";
-      name = "kwallet-5.19.0.tar.xz";
-    };
-  };
-  kwidgetsaddons = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kwidgetsaddons-5.19.0.tar.xz";
-      sha256 = "0b85ng0dj5gpzifqmhyzgx61nb37vq7d0gvfpfazlcp5n27ywivm";
-      name = "kwidgetsaddons-5.19.0.tar.xz";
-    };
-  };
-  kwindowsystem = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kwindowsystem-5.19.0.tar.xz";
-      sha256 = "115xs34r74j9zcsw69glnh8w59iyh764n3gniawwrk23c6yb8fch";
-      name = "kwindowsystem-5.19.0.tar.xz";
-    };
-  };
-  kxmlgui = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kxmlgui-5.19.0.tar.xz";
-      sha256 = "1al2xifiyvl3zpva9nqap8gb6vqfgmf2fnhkmymm02rwg4yn4gah";
-      name = "kxmlgui-5.19.0.tar.xz";
-    };
-  };
-  kxmlrpcclient = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kxmlrpcclient-5.19.0.tar.xz";
-      sha256 = "0lji7cxvh2lmjz42lx6ymz962gr4cyqfzksz0n5vgzfk5z0vq98g";
-      name = "kxmlrpcclient-5.19.0.tar.xz";
-    };
-  };
-  modemmanager-qt = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/modemmanager-qt-5.19.0.tar.xz";
-      sha256 = "05x9jicryjw9fj02arpya8xsh79rsnljnqjfpwbb7pi38f9i8v4w";
-      name = "modemmanager-qt-5.19.0.tar.xz";
-    };
-  };
-  networkmanager-qt = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/networkmanager-qt-5.19.0.tar.xz";
-      sha256 = "0wi0mkygzbvvyil1nyzc3ihgilvpx6j7caqaa9k38p85g93vsq13";
-      name = "networkmanager-qt-5.19.0.tar.xz";
-    };
-  };
-  oxygen-icons5 = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/oxygen-icons5-5.19.0.tar.xz";
-      sha256 = "09vfwcyidj3bl0qr4sq78bkc69zp9x8dwp8bsay5y05q8591dkg0";
-      name = "oxygen-icons5-5.19.0.tar.xz";
-    };
-  };
-  plasma-framework = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/plasma-framework-5.19.0.tar.xz";
-      sha256 = "1588r1jag0s9hhw4qq7mr2mcdd3d9az5ngb3z1l58xdhvfcc4497";
-      name = "plasma-framework-5.19.0.tar.xz";
-    };
-  };
-  solid = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/solid-5.19.0.tar.xz";
-      sha256 = "02bnvhscb55r6q5hkyh7rqi6zsc3r974y3x9shi8l0xbs78snkgz";
-      name = "solid-5.19.0.tar.xz";
-    };
-  };
-  sonnet = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/sonnet-5.19.0.tar.xz";
-      sha256 = "02ringh0wyiq1n19c200bcyf5x2w5jhw0pcxvfjzjai1sjig03x7";
-      name = "sonnet-5.19.0.tar.xz";
-    };
-  };
-  threadweaver = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/threadweaver-5.19.0.tar.xz";
-      sha256 = "1jm1sw7xq76s2ggghm6qqdn7452myy9n7p5zzdb01qbaw2y1x4pw";
-      name = "threadweaver-5.19.0.tar.xz";
-    };
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix b/pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix
deleted file mode 100644
index 52817921cc7..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "threadweaver";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 5b2b0954203..332ca526b6b 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -11,11 +11,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "${type}krb5-${version}";
-  version = "1.14";
+  version = "1.14.2";
 
   src = fetchurl {
     url = "${meta.homepage}dist/krb5/1.14/krb5-${version}.tar.gz";
-    sha256 = "1sgr61cnkgc5xazijaww6wpn5fnxl9vyj9ixk3r3y7ikv3x0gnyf";
+    sha256 = "09wbv969ak4fqlqr1ip5bi62fny1zlp1vwjarvj6a6cdfzkdgjkb";
   };
 
   configureFlags = optional stdenv.isFreeBSD ''WARN_CFLAGS=""'';
diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix
index ab300729acc..1acd71c30c8 100644
--- a/pkgs/development/libraries/libass/default.nix
+++ b/pkgs/development/libraries/libass/default.nix
@@ -18,11 +18,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libass-${version}";
-  version = "0.12.2";
+  version = "0.13.2";
 
   src = fetchurl {
     url = "https://github.com/libass/libass/releases/download/${version}/${name}.tar.xz";
-    sha256 = "1qzibgqmnnqk2r116lpk1br764g0v74f2zp12y5id0p1plaing37";
+    sha256 = "1kpsw4zw95v4cjvild9wpk73dzavn1khsm3bm32kcz6amnkd166n";
   };
 
   configureFlags = [
diff --git a/pkgs/development/libraries/libdigidoc/default.nix b/pkgs/development/libraries/libdigidoc/default.nix
new file mode 100644
index 00000000000..e060f8c1d76
--- /dev/null
+++ b/pkgs/development/libraries/libdigidoc/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, cmake, openssl, pcsclite, opensc, libxml2 }:
+
+stdenv.mkDerivation rec {
+
+  version = "3.10.1.1212";
+  name = "libdigidoc-${version}";
+  
+  src = fetchurl {
+    url = "https://installer.id.ee/media/ubuntu/pool/main/libd/libdigidoc/libdigidoc_3.10.1.1212.orig.tar.xz";
+    sha256 = "ad5e0603aea2e02977f17318cc93a53c3a19a815e57b2347d97136d11c110807";
+  };
+
+  unpackPhase = ''
+    mkdir src
+    tar xf $src -C src
+    cd src
+  '';
+
+  buildInputs = [ cmake openssl pcsclite opensc libxml2 ];
+  
+  meta = with stdenv.lib; {
+    description = "Library for creating DigiDoc signature files";
+    homepage = "http://www.id.ee/";
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.jagajaga ];
+  };
+}
diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix
new file mode 100644
index 00000000000..5ddc6303126
--- /dev/null
+++ b/pkgs/development/libraries/libdigidocpp/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, cmake, libdigidoc, minizip, pcsclite, opensc, openssl
+, xercesc, xml-security-c, pkgconfig, xsd, zlib, vim }:
+
+stdenv.mkDerivation rec {
+
+  version = "3.12.0.1317";
+  name = "libdigidocpp-${version}";
+
+  src = fetchurl {
+    url = "https://installer.id.ee/media/ubuntu/pool/main/libd/libdigidocpp/libdigidocpp_3.12.0.1317.orig.tar.xz";
+    sha256 = "8059e1dbab99f062d070b9da0b1334b7226f1ab9badcd7fddea3100519d1f9a9";
+  };
+
+  unpackPhase = ''
+    mkdir src
+    tar xf $src -C src
+    cd src
+  '';
+
+  buildInputs = [ cmake libdigidoc minizip pcsclite opensc openssl xercesc
+                  xml-security-c pkgconfig xsd zlib vim
+                ];
+  
+  meta = with stdenv.lib; {
+    description = "Library for creating DigiDoc signature files";
+    homepage = "http://www.id.ee/";
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.jagajaga ];
+  };
+}
diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix
index 493be4c8f86..ef717fedb22 100644
--- a/pkgs/development/libraries/libdvdread/default.nix
+++ b/pkgs/development/libraries/libdvdread/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libdvdread-${version}";
-  version = "5.0.2";
+  version = "5.0.3";
 
   src = fetchurl {
     url = "http://get.videolan.org/libdvdread/${version}/${name}.tar.bz2";
-    sha256 = "82cbe693f2a3971671e7428790b5498392db32185b8dc8622f7b9cd307d3cfbf";
+    sha256 = "0ayqiq0psq18rcp6f5pz82sxsq66v0kwv0y55dbrcg68plnxy71j";
   };
 
   buildInputs = [libdvdcss];
diff --git a/pkgs/development/libraries/libdwg/default.nix b/pkgs/development/libraries/libdwg/default.nix
index a80c0677a3b..8ffa1ff8192 100644
--- a/pkgs/development/libraries/libdwg/default.nix
+++ b/pkgs/development/libraries/libdwg/default.nix
@@ -1,13 +1,15 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, indent}:
 
 stdenv.mkDerivation {
-  name = "libdwg-0.3";
+  name = "libdwg-0.6";
 
   src = fetchurl {
-    url = mirror://sourceforge/libdwg/libdwg-0.3.tar.bz2;
-    sha256 = "0lx7ih00m11qw9wsc5ksmwvi3d80l0yfwnbrn5qfz182w4d3fpc9";
+    url = mirror://sourceforge/libdwg/libdwg-0.6.tar.bz2;
+    sha256 = "0l8ks1x70mkna1q7mzy1fxplinz141bd24qhrm1zkdil74mcsryc";
   };
 
+  nativeBuildInputs = [ indent ];
+
   meta = {
     description = "library reading dwg files";
     homepage = http://libdwg.sourceforge.net/en/;
diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix
index 0472aeef694..37e0c9b3431 100644
--- a/pkgs/development/libraries/libev/default.nix
+++ b/pkgs/development/libraries/libev/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libev-${version}";
-  version="4.20";
+  version="4.22";
 
   src = fetchurl {
     url = "http://dist.schmorp.de/libev/Attic/${name}.tar.gz";
-    sha256 = "17j47pbkr65a18mfvy2861p5k7w4pxmdgiw723ryfqd9gx636w7q";
+    sha256 = "1mhvy38g9947bbr0n0hzc34zwfvvfd99qgzpkbap8g2lmkl7jq3k";
   };
 
   meta = {
diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix
index c1587cedd16..3ff40141b16 100644
--- a/pkgs/development/libraries/libevdev/default.nix
+++ b/pkgs/development/libraries/libevdev/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python }:
 
 stdenv.mkDerivation rec {
-  name = "libevdev-1.4.5";
+  name = "libevdev-1.4.6";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libevdev/${name}.tar.xz";
-    sha256 = "07faqb47c7sjl25rc788cbslyiv5ijky0jc4g6312qz0hv55h779";
+    sha256 = "1lrja526iyg48yw6i0dxdhyj63q9gwbgvj6xk1hskxzrqyhf2akv";
   };
 
   buildInputs = [ python ];
diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix
index c3dc3a4e852..1f5ab2cf096 100644
--- a/pkgs/development/libraries/libiberty/default.nix
+++ b/pkgs/development/libraries/libiberty/default.nix
@@ -1,26 +1,16 @@
-{ stdenv, fetchurl, staticBuild ? false }:
+{ stdenv, lib, fetchurl, gcc, staticBuild ? false }:
 
 stdenv.mkDerivation rec {
-  version = "4.9.3";
-  name = "libiberty-${version}";
+  name = "libiberty-${gcc.cc.version}";
 
-  src = fetchurl {
-    url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
-    sha256 = "0zmnm00d2a1hsd41g34bhvxzvxisa2l584q3p447bd91lfjv4ci3";
-  };
+  inherit (gcc.cc) src;
 
   postUnpack = "sourceRoot=\${sourceRoot}/libiberty";
 
-  enable_shared = !staticBuild;
+  configureFlags = [ "--enable-install-libiberty" ] ++ lib.optional (!staticBuild) "--enable-shared";
 
-  installPhase = ''
-    mkdir -p $out/lib $out/include
-    cp ../include/libiberty.h $out/include/
-    if [ -z "$enabled_shared" ]; then
-      cp libiberty.a $out/lib/libiberty.a
-    else
-      cp pic/libiberty.a $out/lib/libiberty_pic.a
-    fi
+  postInstall = lib.optionalString (!staticBuild) ''
+    cp pic/libiberty.a $out/lib*/libiberty.a
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/development/libraries/libmatchbox/default.nix
index 38702817734..6cb7defb097 100644
--- a/pkgs/development/libraries/libmatchbox/default.nix
+++ b/pkgs/development/libraries/libmatchbox/default.nix
@@ -1,14 +1,15 @@
 { stdenv, fetchurl, libX11, libXext, libpng, libXft, libICE, pango, libjpeg}:
 
 stdenv.mkDerivation rec {
-  name = "libmatchbox-1.9";
+  name = "libmatchbox-${version}";
+  version = "1.11";
 
   buildInputs = [ libXft libICE pango libjpeg ];
   propagatedBuildInputs = [ libX11 libXext libpng ];
 
   src = fetchurl {
-    url = http://matchbox-project.org/sources/libmatchbox/1.9/libmatchbox-1.9.tar.bz2;
-    sha256 = "006zdrgs7rgh7dvakjmqsp1q9karq6c5cz4gki2l15fhx0cf40fv";
+    url = "http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/${version}/libmatchbox-${version}.tar.bz2";
+    sha256 = "0lvv44s3bf96zvkysa4ansxj2ffgj3b5kgpliln538q4wd9ank15";
   };
 
   meta = {
diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix
index 619aa014497..2570c645f26 100644
--- a/pkgs/development/libraries/libmemcached/default.nix
+++ b/pkgs/development/libraries/libmemcached/default.nix
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
       sha256 = "1nvxwdkxj2a2g39z0g8byxjwnw4pa5xlvsmdk081q63vmfywh7zb";
     });
 
-  buildInputs = [ cyrus_sasl libevent ];
+  buildInputs = [ libevent ];
+  propagatedBuildInputs = [ cyrus_sasl ];
 
   meta = with stdenv.lib; {
     homepage = http://libmemcached.org;
diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix
index 7dafe3434f9..cdde02c361f 100644
--- a/pkgs/development/libraries/libnatspec/default.nix
+++ b/pkgs/development/libraries/libnatspec/default.nix
@@ -1,13 +1,15 @@
-{ stdenv, fetchurl, popt, libiconv }:
+{ stdenv, fetchurl, autoreconfHook, popt, libiconv }:
 
 stdenv.mkDerivation (rec {
-  name = "libnatspec-0.2.6";
+  name = "libnatspec-0.3.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/natspec/${name}.tar.bz2";
-    sha256 = "0zvm9afh1skxgdv62ylrpwyykpjhhskxj0zv7yrdf7jhfdriz0y3";
+    sha256 = "0wffxjlc8svilwmrcg3crddpfrpv35mzzjgchf8ygqsvwbrbb3b7";
   };
 
+  nativeBuildInputs = [ autoreconfHook ];
+
   buildInputs = [ popt ];
 
   meta = {
diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix
index b8951e66c8b..20101fe6fe3 100644
--- a/pkgs/development/libraries/libopus/default.nix
+++ b/pkgs/development/libraries/libopus/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, fixedPoint ? false, withCustomModes ? true }:
 
 let
-  version = "1.1";
+  version = "1.1.2";
 in
 stdenv.mkDerivation rec {
   name = "libopus-${version}";
 
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/opus/opus-${version}.tar.gz";
-    sha256 = "158xprn2086arvdib3vbbygz7z6jqkw2nci7nlywzzwallap0wmr";
+    sha256 = "1z87x5c5x951lhnm70iqr2gqn15wns5cqsw8nnkvl48jwdw00a8f";
   };
 
   outputs = [ "dev" "out" ];
diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix
index aaa39783fa7..fa272f2ec6f 100644
--- a/pkgs/development/libraries/libpwquality/default.nix
+++ b/pkgs/development/libraries/libpwquality/default.nix
@@ -1,11 +1,12 @@
-{ stdenv, cracklib, fetchurl, python }:
+{ stdenv, fetchurl, cracklib, python }:
 
 stdenv.mkDerivation rec {
-  name = "libpwquality-1.2.3";
+  name = "libpwquality-${version}";
+  version = "1.3.0";
 
   src = fetchurl {
     url = "https://fedorahosted.org/releases/l/i/libpwquality/${name}.tar.bz2";
-    sha256 = "0sjiabvl5277nfxyy96jdz65a0a3pmkkwrfbziwgik83gg77j75i";
+    sha256 = "0aidriag6h0syfm33nzdfdsqgrnsgihwjv3a5lgkqch3w68fmlkl";
   };
 
   buildInputs = [ cracklib python ];
diff --git a/pkgs/development/libraries/libressl/2.2.nix b/pkgs/development/libraries/libressl/2.2.nix
index 09505217ae2..280c2e6bc94 100644
--- a/pkgs/development/libraries/libressl/2.2.nix
+++ b/pkgs/development/libraries/libressl/2.2.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libressl-${version}";
-  version = "2.2.6";
+  version = "2.2.7";
 
   src = fetchurl {
     url    = "mirror://openbsd/LibreSSL/${name}.tar.gz";
-    sha256 = "0kynb15l5gq1qgp3p4ncn20sc65sbl8lk89vyr07s17xrya9kq8y";
+    sha256 = "1kckv36dgvvjq1ap6ahxgma4hw57zp61xsp5vjvyza5vhfrnhb3y";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/libressl/2.3.nix b/pkgs/development/libraries/libressl/2.3.nix
index 129456e6657..a5052a9b499 100644
--- a/pkgs/development/libraries/libressl/2.3.nix
+++ b/pkgs/development/libraries/libressl/2.3.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libressl-${version}";
-  version = "2.3.3";
+  version = "2.3.4";
 
   src = fetchurl {
     url    = "mirror://openbsd/LibreSSL/${name}.tar.gz";
-    sha256 = "1a8anm8nsfyxds03csk738m2cmzjbsb867my1rz5ij3w31k32wvn";
+    sha256 = "1ag65pbvdikqj5y1w780jicl3ngi9ld2332ki6794y0gcar3a4bs";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix
index 444b68a23ee..63a60820e3f 100644
--- a/pkgs/development/libraries/libseccomp/default.nix
+++ b/pkgs/development/libraries/libseccomp/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, getopt }:
 
-let version = "2.2.3"; in
+let version = "2.3.0"; in
 
 stdenv.mkDerivation rec {
   name = "libseccomp-${version}";
 
   src = fetchurl {
     url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz";
-    sha256 = "d9b400b703cab7bb04b84b9b6e52076a630b673819d7541757bcc16467b6d49e";
+    sha256 = "07chdgr87aayn6sjm94y6gisl4j6si1hr9cqhs09l9bqfnky6mnp";
   };
 
   buildInputs = [ getopt ];
diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix
index 3ceabc3f1ac..bb8d971d6d4 100644
--- a/pkgs/development/libraries/libsecret/default.nix
+++ b/pkgs/development/libraries/libsecret/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl, gtk_doc
 , libgcrypt, gobjectIntrospection }:
 let
-  version = "0.18";
+  version = "0.18.5";
 in
 stdenv.mkDerivation rec {
   name = "libsecret-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libsecret/${version}/${name}.tar.xz";
-    sha256 = "1qq29c01xxjyx5sl6y5h22w8r0ff4c73bph3gfx3h7mx5mvalwqc";
+    url = "mirror://gnome/sources/libsecret/0.18/${name}.tar.xz";
+    sha256 = "1cychxc3ff8fp857iikw0n2s13s2mhw2dn1mr632f7w3sn6vvrww";
   };
 
   propagatedBuildInputs = [ glib ];
diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix
new file mode 100644
index 00000000000..cece520e3c5
--- /dev/null
+++ b/pkgs/development/libraries/libsolv/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, cmake, zlib, expat, rpm, db }:
+
+stdenv.mkDerivation rec {
+  rev  = "0.6.20";
+  name = "libsolv-${rev}";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner  = "openSUSE";
+    repo   = "libsolv";
+    sha256 = "1gammarbnjbbkw2vlgcj9ynp1kgi5nns6xcl6ab8b5i4zgq91v2p";
+  };
+
+  cmakeFlags = "-DENABLE_RPMMD=true -DENABLE_RPMDB=true -DENABLE_PUBKEY=true -DENABLE_RPMDB_BYRPMHEADER=true";
+
+  buildInputs = [ cmake zlib expat rpm db ];
+
+  meta = with stdenv.lib; {
+    description = "A free package dependency solver";
+    license     = licenses.bsd3;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ copumpkin ];
+  };
+}
+
diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix
index dc2481a2e85..98dbe517591 100644
--- a/pkgs/development/libraries/libu2f-host/default.nix
+++ b/pkgs/development/libraries/libu2f-host/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, json_c, hidapi }:
 
 stdenv.mkDerivation rec {
-  name = "libu2f-host-1.0.0";
+  name = "libu2f-host-1.1.1";
 
   src = fetchurl {
     url = "https://developers.yubico.com/libu2f-host/Releases/${name}.tar.xz";
-    sha256 = "0x232rp325k1l3rdh1b9d7w3w2z2lhjmp95v4mlmd8pybjdnpi8q";
+    sha256 = "0g0f012w0c00cvj5g319x2b8prbh0d3fcac9960cy7xsd8chckg1";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index 48d12321248..e039711e457 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -2,84 +2,29 @@
 
 , ApplicationServices, CoreServices }:
 
-let
-  stable = "stable";
-  unstable = "unstable";
+stdenv.mkDerivation rec {
+  version = "1.9.0";
+  name = "libuv-${version}";
 
-  meta = with lib; {
-    description = "A multi-platform support library with a focus on asynchronous I/O";
-    homepage    = https://github.com/libuv/libuv;
-    maintainers = with maintainers; [ cstrahan ];
-    platforms   = with platforms; linux ++ darwin;
-  };
-
-  mkName = stability: version:
-    if stability == stable
-    then "libuv-${version}"
-    else "libuv-${stability}-${version}";
-
-  mkSrc = version: sha256: fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "libuv";
     repo = "libuv";
     rev = "v${version}";
-    inherit sha256;
+    sha256 = "0sq8c8n7xixn2xxp35crprvh35ry18i5mcxgwh12lydwv9ks0d4k";
   };
 
-  # for versions < 0.11.6
-  mkWithoutAutotools = stability: version: sha256: stdenv.mkDerivation {
-    name = mkName stability version;
-    src = mkSrc version sha256;
-    buildPhase = lib.optionalString stdenv.isDarwin ''
-      mkdir extrapath
-      ln -s /usr/sbin/dtrace extrapath/dtrace
-      export PATH=$PATH:`pwd`/extrapath
-    '' + ''
-      mkdir build
-      make builddir_name=build
+  buildInputs = [ automake autoconf libtool pkgconfig ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ];
 
-      rm -r build/src
-      rm build/libuv.a
-      cp -r include build
+  preConfigure = ''
+    LIBTOOLIZE=libtoolize ./autogen.sh
+  '';
 
-      mkdir build/lib
-      mv build/libuv.* build/lib
-
-      pushd build/lib
-      lib=$(basename libuv.*)
-      ext="''${lib##*.}"
-      mv $lib libuv.10.$ext
-      ln -s libuv.10.$ext libuv.$ext
-      popd
-    '';
-    installPhase = ''
-      cp -r build $out
-    '';
-    inherit meta;
-  };
-
-  # for versions > 0.11.6
-  mkWithAutotools = stability: version: sha256: stdenv.mkDerivation {
-    name = mkName stability version;
-    src = mkSrc version sha256;
-    buildInputs = [ automake autoconf libtool pkgconfig ]
-      ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ];
-    preConfigure = ''
-      LIBTOOLIZE=libtoolize ./autogen.sh
-    '';
-    inherit meta;
+  meta = with lib; {
+    description = "A multi-platform support library with a focus on asynchronous I/O";
+    homepage    = https://github.com/libuv/libuv;
+    maintainers = with maintainers; [ cstrahan ];
+    platforms   = with platforms; linux ++ darwin;
   };
 
-  toVersion = with lib; name:
-    replaceChars ["_"] ["."] (removePrefix "v" name);
-
-in
-
-  with lib;
-
-  mapAttrs (v: h: mkWithAutotools unstable (toVersion v) h) {
-    v0_11_29 = "1z07phfwryfy2155p3lxcm2a33h20sfl96lds5dghn157x6csz7m";
-  }
-  //
-  mapAttrs (v: h: mkWithAutotools stable (toVersion v) h) {
-    v1_7_5 = "18x6cy2xn31am97vn6jli7kmb2fbp4c8kmv7jm97vggh0x55flsc";
-  }
+}
diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/development/libraries/libxmp/default.nix
index 106fcee257f..28584d14a87 100644
--- a/pkgs/development/libraries/libxmp/default.nix
+++ b/pkgs/development/libraries/libxmp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libxmp-4.3.11";
+  name = "libxmp-4.3.12";
 
   meta = with stdenv.lib; {
     description = "Extended module player library";
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/xmp/libxmp/${name}.tar.gz";
-    sha256 = "0r9qhps2a8nc850bislkgjzlamwl671r1sag1mi8k1a9gxq4n9kx";
+    sha256 = "1536dfxgxl6dyvkdby8lxzi9f7y2qlwl8ylrkybips3ampcqgkhm";
   };
 }
diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix
index 3131b6b2918..b6d187e7a0e 100644
--- a/pkgs/development/libraries/menu-cache/default.nix
+++ b/pkgs/development/libraries/menu-cache/default.nix
@@ -1,15 +1,17 @@
 { stdenv, fetchurl, glib, pkgconfig, libfm-extra }:
 
-let name = "menu-cache-0.7.0";
+let name = "menu-cache-1.0.1";
 in
 stdenv.mkDerivation {
   inherit name;
   src = fetchurl {
     url = "mirror://sourceforge/lxde/${name}.tar.xz";
-    sha256 = "0wwkk4jrcl2sp11bspabplchh4ipi1zyn39j3skyzgbm8k40gkhk";
+    sha256 = "0ngxvwfj9drabqi3lyzgpi0d0za6431sy2ijb010filrj54jdiqa";
   };
 
-  buildInputs = [ glib pkgconfig libfm-extra ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ glib libfm-extra ];
 
   meta = with stdenv.lib; {
     homepage = "http://blog.lxde.org/?tag=menu-cache";
diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix
index 080f09dfdf4..ddf47cf31d8 100644
--- a/pkgs/development/libraries/nlopt/default.nix
+++ b/pkgs/development/libraries/nlopt/default.nix
@@ -16,6 +16,10 @@ stdenv.mkDerivation rec {
         "M_INSTALL_DIR=$(out)/${octave.sitePath}/m " +
         "OCT_INSTALL_DIR=$(out)/${octave.sitePath}/oct ");
 
+  preConfigure = ''
+    find octave -name '*.cc' | xargs sed -i 's|Octave_map|octave_map|g'
+  '';
+
   meta = {
     homepage = "http://ab-initio.mit.edu/nlopt/";
     description = "Free open-source library for nonlinear optimization";
diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix
index 76188d484f9..71983b30a2c 100644
--- a/pkgs/development/libraries/openh264/default.nix
+++ b/pkgs/development/libraries/openh264/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, nasm }:
 
 stdenv.mkDerivation rec {
-  name = "openh264-1.4.0";
+  name = "openh264-1.5.0";
 
   src = fetchurl {
-    url = "https://github.com/cisco/openh264/archive/v1.4.0.tar.gz";
-    sha256 = "08haj0xkyjlwbpqdinxk0cmvqw89bx89ly0kqs9lf87fy6ksgfd1";
+    url = "https://github.com/cisco/openh264/archive/v1.5.0.tar.gz";
+    sha256 = "1d97dh5hzmy46jamfw03flvcz8md1hxp6y5n0b787h8ks7apn1wq";
   };
 
   buildInputs = [ nasm ];
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 304b575eb92..157ce5fb9de 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -105,13 +105,13 @@ let
 in {
 
   openssl_1_0_1 = common {
-    version = "1.0.1s";
-    sha256 = "e7e81d82f3cd538ab0cdba494006d44aab9dd96b7f6233ce9971fb7c7916d511";
+    version = "1.0.1t";
+    sha256 = "4a6ee491a2fdb22e519c76fdc2a628bb3cec12762cd456861d207996c8a07088";
   };
 
   openssl_1_0_2 = common {
-    version = "1.0.2g";
-    sha256 = "b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33";
+    version = "1.0.2h";
+    sha256 = "1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919";
   };
 
 }
diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix
index 746f10eebed..15bd39a031f 100644
--- a/pkgs/development/libraries/ortp/default.nix
+++ b/pkgs/development/libraries/ortp/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ortp-0.24.2";
+  name = "ortp-${version}";
+  version = "0.25.0";
 
   src = fetchurl {
     url = "mirror://savannah/linphone/ortp/sources/${name}.tar.gz";
-    sha256 = "05k6ianphr533qnjwxsv7jnh7fb2sq0dj1pdy1bk2w5khmlwfdyb";
+    sha256 = "16ldzrn1268dr6kdl8mibg2knd6w75a1v0iqfsgk5zdig5mq5sqd";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index feb5e5d3040..b34e2f648ec 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -3,11 +3,11 @@
 assert interactive -> readline != null && ncurses != null;
 
 stdenv.mkDerivation {
-  name = "sqlite-3.11.1";
+  name = "sqlite-3.12.2";
 
   src = fetchurl {
-    url = "http://sqlite.org/2016/sqlite-autoconf-3110100.tar.gz";
-    sha1 = "c4b4dcd735a4daf5a2e2bb90f374484c8d4dad29";
+    url = "http://sqlite.org/2016/sqlite-autoconf-3120200.tar.gz";
+    sha1 = "b43c2e7238e54c50b95fbbd85c48792f4f39af8c";
   };
 
   outputs = [ "dev" "out" "bin" ];
diff --git a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
index 4e5d360aea0..d3e1a6dc17e 100644
--- a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
+++ b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, unzip, tcl }:
 
 stdenv.mkDerivation {
-  name = "sqlite3_analzer-3.8.10.1";
+  name = "sqlite3_analyzer-3.8.10.1";
 
   src = fetchurl {
     url = "https://www.sqlite.org/2015/sqlite-src-3081001.zip";
diff --git a/pkgs/development/libraries/v8/3.16.14.nix b/pkgs/development/libraries/v8/3.16.14.nix
index c79357cd907..d9addab3030 100644
--- a/pkgs/development/libraries/v8/3.16.14.nix
+++ b/pkgs/development/libraries/v8/3.16.14.nix
@@ -3,7 +3,10 @@
 assert readline != null;
 
 let
-  arch = if stdenv.is64bit then "x64" else "ia32";
+  arch = if stdenv.isArm
+    then (if stdenv.is64bit then "arm64" else "arm")
+    else (if stdenv.is64bit then "x64" else "ia32");
+  armHardFloat = stdenv.isArm && (stdenv.platform.gcc.float or null) == "hard";
 in
 
 stdenv.mkDerivation rec {
@@ -34,6 +37,7 @@ stdenv.mkDerivation rec {
         -Dconsole=readline \
         -Dcomponent=shared_library \
         -Dv8_target_arch=${arch} \
+        ${lib.optionalString armHardFloat "-Dv8_use_arm_eabi_hardfloat=true"} \
         --depth=. -Ibuild/standalone.gypi \
         build/all.gyp
   '';
diff --git a/pkgs/development/libraries/v8/4.5.nix b/pkgs/development/libraries/v8/4.5.nix
index 50fc2b7b0d9..065b656147d 100644
--- a/pkgs/development/libraries/v8/4.5.nix
+++ b/pkgs/development/libraries/v8/4.5.nix
@@ -122,8 +122,8 @@ stdenv.mkDerivation rec {
     install -vD out/Release/mksnapshot "$out/bin/mksnapshot"
     ${if stdenv.isDarwin then ''
     install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib"
-    install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/bin/d8
-    install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib
+    install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/bin/d8
+    install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib
     '' else ''
     install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so"
     ''}
diff --git a/pkgs/development/libraries/v8/generic.nix b/pkgs/development/libraries/v8/generic.nix
index 349b35549b6..d603fda3225 100644
--- a/pkgs/development/libraries/v8/generic.nix
+++ b/pkgs/development/libraries/v8/generic.nix
@@ -67,8 +67,8 @@ stdenv.mkDerivation rec {
   '';
 
   postFixup = if stdenv.isDarwin then ''
-    install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/bin/d8
-    install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib
+    install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/bin/d8
+    install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib
   '' else null;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/xalanc/default.nix b/pkgs/development/libraries/xalanc/default.nix
new file mode 100644
index 00000000000..8284fd7707f
--- /dev/null
+++ b/pkgs/development/libraries/xalanc/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, xercesc }:
+
+stdenv.mkDerivation rec {
+  name = "xalan-c-${version}";
+  version = "1.11";
+
+  src = fetchurl {
+    url = "http://www.eu.apache.org/dist/xalan/xalan-c/sources/xalan_c-${version}-src.tar.gz";
+    sha256 = "0a3a2b15vpacnqgpp6fiy1pwyc8q6ywzvyb5445f6wixfdspypjg";
+  };
+
+  configurePhase = ''
+    export XALANCROOT=`pwd`/c
+    cd `pwd`/c
+    mkdir -p $out/usr
+    ./runConfigure -p linux -c gcc -x g++ -P$out/usr
+  '';
+
+  buildInputs = [ xercesc ];
+
+  meta = {
+    homepage = http://xalan.apache.org/;
+    description = "A XSLT processor for transforming XML documents";
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.jagajaga ];
+  };
+}
diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix
new file mode 100644
index 00000000000..1932acbd7ed
--- /dev/null
+++ b/pkgs/development/libraries/xml-security-c/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, xalanc, xercesc, openssl, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "xml-security-c-${version}";
+  version = "1.7.3";
+
+  src = fetchurl {
+    url = "http://www.apache.org/dist/santuario/c-library/${name}.tar.gz";
+    sha256 = "e5226e7319d44f6fd9147a13fb853f5c711b9e75bf60ec273a0ef8a190592583";
+  };
+
+  patchPhase = ''
+    mkdir -p xsec/yes/lib
+    sed -i -e 's/-O2 -DNDEBUG/-DNDEBUG/g' configure
+  '';
+
+  configurePhase = ''
+    ./configure --prefix=$out \
+                --with-openssl \
+                --with-xerces \
+                --with-xalan \
+                --disable-static
+  '';
+
+  buildInputs = [ xalanc xercesc openssl pkgconfig ];
+
+  meta = {
+    homepage = http://santuario.apache.org/;
+    description = "C++ Implementation of W3C security standards for XML";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.jagajaga ];
+  };
+}
diff --git a/pkgs/development/libraries/xsd/default.nix b/pkgs/development/libraries/xsd/default.nix
new file mode 100644
index 00000000000..bef2e46e073
--- /dev/null
+++ b/pkgs/development/libraries/xsd/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, xercesc }:
+
+let
+  fixed_paths = ''LDFLAGS="-L${xercesc}/lib" CPPFLAGS="-I${xercesc}/include"'';
+in
+stdenv.mkDerivation rec {
+  name = "xsd-${version}";
+  version = "4.0.0";
+
+  src = fetchurl {
+    url = "http://codesynthesis.com/download/xsd/4.0/xsd-4.0.0+dep.tar.bz2";
+    sha256 = "05wqhmd5cd4pdky8i8qysnh96d2h16ly8r73whmbxkajiyf2m9gc";
+  };
+
+  patches = [ ./xsdcxx.patch ];
+
+  configurePhase = ''
+    patchShebangs .
+  '';
+
+  buildPhase = ''
+    make ${fixed_paths}
+  '';
+
+  buildInputs = [ xercesc ];
+
+  installPhase = ''
+    make ${fixed_paths} install_prefix="$out" install
+  '';
+
+  meta = {
+    homepage = http://www.codesynthesis.com/products/xsd;
+    description = "An open-source, cross-platform W3C XML Schema to C++ data binding compiler";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.jagajaga ];
+  };
+}
diff --git a/pkgs/development/libraries/xsd/xsdcxx.patch b/pkgs/development/libraries/xsd/xsdcxx.patch
new file mode 100644
index 00000000000..88a893c6e60
--- /dev/null
+++ b/pkgs/development/libraries/xsd/xsdcxx.patch
@@ -0,0 +1,126 @@
+--- xsd-4.0.0+dep/xsd/doc/xsd.1~	2014-09-14 12:25:36.862267587 +0000
++++ xsd-4.0.0+dep/xsd/doc/xsd.1	2014-09-14 12:28:25.728229892 +0000
+@@ -1,16 +1,16 @@
+ .\" Process this file with
+-.\" groff -man -Tascii xsd.1
++.\" groff -man -Tascii xsdcxx.1
+ .\"
+ .TH XSD 1 "July 2014" "XSD 4.0.0"
+ .SH NAME
+-xsd \- W3C XML Schema to C++ Compiler
++xsdcxx \- W3C XML Schema to C++ Compiler
+ .\"
+ .\"
+ .\"
+ .\"--------------------------------------------------------------------
+ .SH SYNOPSIS
+ .\"--------------------------------------------------------------------
+-.B xsd
++.B xsdcxx
+ .I command
+ .B [
+ .I options
+@@ -20,19 +20,19 @@
+ .I file
+ .B ...]
+ .in
+-.B xsd help
++.B xsdcxx help
+ .B [
+ .I command
+ .B ]
+ .in
+-.B xsd version
++.B xsdcxx version
+ .\"
+ .\"
+ .\"
+ .\"--------------------------------------------------------------------
+ .SH DESCRIPTION
+ .\"--------------------------------------------------------------------
+-.B xsd
++.B xsdcxx
+ generates vocabulary-specific, statically-typed C++ mapping from W3C XML
+ Schema definitions. Particular mapping to produce is selected by a
+ .IR command .
+@@ -96,7 +96,7 @@
+ .PP
+ .RS
+ .RS 3
+-.B xsd help
++.B xsdcxx help
+ .I command
+ .RE
+ .PP
+@@ -206,7 +206,7 @@
+ \fIfilename\fP \fInamespace\fP
+ 
+ For example, if you have file \fBhello\.xsd\fP with namespace
+-\fBhttp://example\.com/hello\fP and you run \fBxsd\fP on this file, then the
++\fBhttp://example\.com/hello\fP and you run \fBxsdcxx\fP on this file, then the
+ string in question will be:
+ 
+ \fBhello\.xsd\. http://example\.com/hello\fP
+@@ -1632,7 +1632,7 @@
+ .\"
+ .SH DIAGNOSTICS
+ If the input file is not a valid W3C XML Schema definition,
+-.B xsd
++.B xsdcxx
+ will issue diagnostic messages to
+ .B STDERR
+ and exit with non-zero exit code.
+--- xsd-4.0.0+dep/xsd/doc/xsd.xhtml~	2014-09-14 12:28:37.731513138 +0000
++++ xsd-4.0.0+dep/xsd/doc/xsd.xhtml	2014-09-14 12:30:11.277789610 +0000
+@@ -50,19 +50,19 @@
+ 
+   <h1>NAME</h1>
+ 
+-  <p>xsd - W3C XML Schema to C++ Compiler</p>
++  <p>xsdcxx - W3C XML Schema to C++ Compiler</p>
+ 
+   <h1>SYNOPSIS</h1>
+ 
+   <dl id="synopsis">
+-    <dt><code><b>xsd</b> <i>command</i> [<i>options</i>] <i>file</i> [<i>file</i> ...]</code></dt>
+-    <dt><code><b>xsd help</b> [<i>command</i>]</code></dt>
+-    <dt><code><b>xsd version</b></code></dt>
++    <dt><code><b>xsdcxx</b> <i>command</i> [<i>options</i>] <i>file</i> [<i>file</i> ...]</code></dt>
++    <dt><code><b>xsdcxx help</b> [<i>command</i>]</code></dt>
++    <dt><code><b>xsdcxx version</b></code></dt>
+   </dl>
+ 
+   <h1>DESCRIPTION</h1>
+ 
+-  <p><code><b>xsd</b></code> generates vocabulary-specific, statically-typed
++  <p><code><b>xsdcxx</b></code> generates vocabulary-specific, statically-typed
+   C++ mapping from W3C XML Schema definitions. Particular mapping to
+   produce is selected by a <code><i>command</i></code>. Each mapping has
+   a number of mapping-specific <code><i>options</i></code> that should
+@@ -104,7 +104,7 @@
+ 
+     <dt><code><b>help</b></code></dt>
+     <dd>Print usage information and exit. Use
+-      <p><code><b>xsd help</b> <i>command</i></code></p>
++      <p><code><b>xsdcxx help</b> <i>command</i></code></p>
+       for command-specific help.
+     </dd>
+ 
+@@ -219,7 +219,7 @@
+ 
+   <p>For example, if you have file <code><b>hello.xsd</b></code> with
+   namespace <code><b>http://example.com/hello</b></code> and you run
+-  <code><b>xsd</b></code> on this file, then the string in question will
++  <code><b>xsdcxx</b></code> on this file, then the string in question will
+   be:</p>
+ 
+   <p><code><b>hello.xsd. http://example.com/hello</b></code></p>
+@@ -1530,7 +1530,7 @@
+   <h1>DIAGNOSTICS</h1>
+ 
+   <p>If the input file is not a valid W3C XML Schema definition,
+-    <code><b>xsd</b></code> will issue diagnostic messages to STDERR
++    <code><b>xsdcxx</b></code> will issue diagnostic messages to STDERR
+     and exit with non-zero exit code.</p>
+ 
+   <h1>BUGS</h1>