Merge branch 'bugfix/kwidgetsaddons/5.42.1' into merge/qt-5.10.0

17 files changed, 419 insertions, 375 deletions

diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix
index f6676321860f..39a5a9869ba7 100644
--- a/pkgs/development/libraries/bullet/default.nix
+++ b/pkgs/development/libraries/bullet/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "bullet-${version}";
-  version = "2.86.1";
+  version = "2.87";
 
   src = fetchFromGitHub {
     owner = "bulletphysics";
     repo = "bullet3";
     rev = version;
-    sha256 = "1k81hr5y9rs2nsal6711fal21rxp6h573cpmjjk8x8ji2crqbqlz";
+    sha256 = "1msp7w3563vb43w70myjmqsdb97kna54dcfa7yvi9l3bvamb92w3";
   };
 
   buildInputs = [ cmake ] ++
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
      then with darwin.apple_sdk.frameworks; [ Cocoa OpenGL ]
      else [mesa freeglut]);
 
+  patches = [ ./gwen-narrowing.patch ];
+
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
     sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt
     sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt
diff --git a/pkgs/development/libraries/bullet/gwen-narrowing.patch b/pkgs/development/libraries/bullet/gwen-narrowing.patch
new file mode 100644
index 000000000000..c6c06325dae0
--- /dev/null
+++ b/pkgs/development/libraries/bullet/gwen-narrowing.patch
@@ -0,0 +1,22 @@
+commit a5d3497577c78b03c05c69d17df972fa9fb54f53
+Author: Linus Heckemann <git@sphalerite.org>
+Date:   Fri Jan 5 23:57:09 2018 +0100
+
+    Add -Wno-narrowing to GWEN's CMakeLists
+    
+    This avoids the compilation issue that occurs on aarch64 with gcc6.
+    (nixpkgs-specific patch)
+
+diff --git a/examples/ThirdPartyLibs/Gwen/CMakeLists.txt b/examples/ThirdPartyLibs/Gwen/CMakeLists.txt
+index 82fa0ffba..26c4bbd37 100644
+--- a/examples/ThirdPartyLibs/Gwen/CMakeLists.txt
++++ b/examples/ThirdPartyLibs/Gwen/CMakeLists.txt
+@@ -15,7 +15,7 @@ IF(NOT WIN32 AND NOT APPLE)
+         ADD_DEFINITIONS("-DDYNAMIC_LOAD_X11_FUNCTIONS=1")
+ ENDIF()
+ 
+-ADD_DEFINITIONS( -DGLEW_STATIC -DGWEN_COMPILE_STATIC -D_HAS_EXCEPTIONS=0 -D_STATIC_CPPLIB )
++ADD_DEFINITIONS( -DGLEW_STATIC -DGWEN_COMPILE_STATIC -D_HAS_EXCEPTIONS=0 -D_STATIC_CPPLIB -Wno-narrowing )
+ 
+ FILE(GLOB gwen_SRCS "*.cpp" "Controls/*.cpp" "Controls/Dialog/*.cpp" "Controls/Dialogs/*.cpp" "Controls/Layout/*.cpp" "Controls/Property/*.cpp" "Input/*.cpp" "Platforms/*.cpp" "Renderers/*.cpp" "Skins/*.cpp")
+ FILE(GLOB gwen_HDRS "*.h" "Controls/*.h" "Controls/Dialog/*.h" "Controls/Dialogs/*.h" "Controls/Layout/*.h" "Controls/Property/*.h" "Input/*.h" "Platforms/*.h" "Renderers/*.h" "Skins/*.h")
diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
index f6138fafaefc..bee80cb24ecf 100644
--- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
+++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, file, glibmm, gst_all_1 }:
 
 let
-  ver_maj = "1.8";
+  ver_maj = "1.10";
   ver_min = "0";
 in
 stdenv.mkDerivation rec {
@@ -9,16 +9,9 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url    = "mirror://gnome/sources/gstreamermm/${ver_maj}/${name}.tar.xz";
-    sha256 = "0i4sk6ns4dyi4szk45bkm4kvl57l52lgm15p2wg2rhx2gr2w3qry";
+    sha256 = "0q4dx9sncqbwgpzma0zvj6zssc279yl80pn8irb95qypyyggwn5y";
   };
 
-  patches = [
-    (fetchurl {
-      url = https://bug783628.bugzilla-attachments.gnome.org/attachment.cgi?id=354765;
-      sha256 = "082510a934bl05mz4cyakp8mfmd97cdj7vdrbvyqc4g58dcskvz0";
-    })
-  ];
-
   outputs = [ "out" "dev" ];
 
   nativeBuildInputs = [ pkgconfig file ];
@@ -31,8 +24,8 @@ stdenv.mkDerivation rec {
     description = "C++ interface for GStreamer";
     homepage = https://gstreamer.freedesktop.org/bindings/cplusplus.html;
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ romildo ];
     platforms = platforms.unix;
+    maintainers = with maintainers; [ romildo ];
   };
 
 }
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix
index bdb1b6c7bb7a..77465645d237 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix
@@ -12,6 +12,12 @@ stdenv.mkDerivation rec {
     sha256 = "148lw51dm6pgw8vc6v0fpvm7p233wr11nspdzmvq7bjp2cd7vbhf";
   };
 
+  postInstall = ''
+    # Fixes CVE-2016-9447
+    # Does not actually impact NSF playback
+    rm -v $out/lib/gstreamer-0.10/libgstnsf.so
+  '';
+
   buildInputs =
     [ pkgconfig glib gstreamer gst-plugins-base libdvdnav libdvdread orc ];
 
diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix
index 05ad908b3c36..df9b3f96c871 100644
--- a/pkgs/development/libraries/java/lombok/default.nix
+++ b/pkgs/development/libraries/java/lombok/default.nix
@@ -1,13 +1,18 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "lombok-1.16.8";
+  name = "lombok-1.16.20";
+
   src = fetchurl {
     url = "https://projectlombok.org/downloads/${name}.jar";
-    sha256 = "0s7ak6gx1h04da2rdhvc0fk896cwqm2m7g3chqcjpsrkgfdv4cpy";
+    sha256 = "0v8fq4qlpjh4b87xx35m32y2xpnj4d05xflrgghia6mar8c8n5y5";
   };
-  phases = [ "installPhase" ];
-  installPhase = "mkdir -p $out/share/java; cp $src $out/share/java/lombok.jar";
+
+  buildCommand = ''
+    mkdir -p $out/share/java
+    cp $src $out/share/java/lombok.jar
+  '';
+
   meta = {
     description = "A library that can write a lot of boilerplate for your Java project";
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index b9f6d0925715..119abbe9f530 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.41/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.42/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch
index 5e1007b7fc0b..cc041b9aa3b8 100644
--- a/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch
+++ b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch
@@ -1,13 +1,13 @@
-Index: kcmutils-5.33.0/src/kpluginselector.cpp
-===================================================================
---- kcmutils-5.33.0.orig/src/kpluginselector.cpp
-+++ kcmutils-5.33.0/src/kpluginselector.cpp
-@@ -305,7 +305,7 @@ void KPluginSelector::addPlugins(const Q
+diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
+index 137c865..097ab75 100644
+--- a/src/kpluginselector.cpp
++++ b/src/kpluginselector.cpp
+@@ -303,7 +303,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) {
+     for (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);
++        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
          while (it.hasNext()) {
              desktopFileNames.append(it.next());
          }
diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
index 7a6c0ee90534..3b6ea27d41e5 100644
--- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
+++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
@@ -1,25 +1,18 @@
-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
+index fbbc0fa..cb78741 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) {
+     for (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
-
+@@ -75,4 +75,3 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname)
+     // launch khelpcenter, or a browser for URIs not handled by khelpcenter
+     QDesktopServices::openUrl(url);
+ }
+-
diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
index d3a81b50bf17..a2a90e448d49 100644
--- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
+++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
@@ -4,7 +4,7 @@
   kactivities, karchive, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons,
   kdeclarative, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio,
   knotifications, kpackage, kservice, kwayland, kwindowsystem, kxmlgui,
-  qtbase, qtdeclarative, qtscript, qtx11extras,
+  qtbase, qtdeclarative, qtscript, qtx11extras, kirigami2
 }:
 
 mkDerivation {
@@ -14,7 +14,7 @@ mkDerivation {
   buildInputs = [
     kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons
     kdeclarative kglobalaccel kguiaddons ki18n kiconthemes kio knotifications
-    kwayland kwindowsystem kxmlgui qtdeclarative qtscript qtx11extras
+    kwayland kwindowsystem kxmlgui qtdeclarative qtscript qtx11extras kirigami2
   ];
   propagatedBuildInputs = [ kpackage kservice qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index d99c723082f1..f8d4bcf5c8f9 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,611 +3,611 @@
 
 {
   attica = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/attica-5.41.0.tar.xz";
-      sha256 = "1l97qhf053z7grl8d77p9zajdvaw3zicllwna9p2vyzbb6n6qyq7";
-      name = "attica-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/attica-5.42.0.tar.xz";
+      sha256 = "0icjsk5sbri6nwybb2301wc6ysc1h4p35rxqp0adifyksq8akyxd";
+      name = "attica-5.42.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/baloo-5.41.0.tar.xz";
-      sha256 = "1kl4xs09r21bi11b5dzjkmc8igh5iv8nvq0gxd00n7qjghpxa399";
-      name = "baloo-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/baloo-5.42.0.tar.xz";
+      sha256 = "18yknkcls1ypsp8n5l254bhlffiq4as5w1wgcjzhnf49cacys8nl";
+      name = "baloo-5.42.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/bluez-qt-5.41.0.tar.xz";
-      sha256 = "08wlsmr12n3whqr65zm3l9hmzbaca2jkkhb1wwq5ilqm3gvxxz0n";
-      name = "bluez-qt-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/bluez-qt-5.42.0.tar.xz";
+      sha256 = "0pbb0nn70hbsnp9q8jvqr3s85gh4bnnh1mp8xfkia2hp4c63ws9f";
+      name = "bluez-qt-5.42.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/breeze-icons-5.41.0.tar.xz";
-      sha256 = "1k06ms48cnnwnlrh9wdabsms581jy70nz5narwg1zpzb6clf9p4w";
-      name = "breeze-icons-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/breeze-icons-5.42.0.tar.xz";
+      sha256 = "0mrj0b022yfy669qqby09k4ij6aqyky23gpnjcp85df9saq0x44r";
+      name = "breeze-icons-5.42.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/extra-cmake-modules-5.41.0.tar.xz";
-      sha256 = "0rwz2rdyxr424z0mra29p8i6gf0b1402ifi94qrq7y4z1fa61bxs";
-      name = "extra-cmake-modules-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/extra-cmake-modules-5.42.0.tar.xz";
+      sha256 = "1ml6s3ssr5izm3vnzlg5gn2nkcbz5l5nmapvyr4ml7n0089b43a3";
+      name = "extra-cmake-modules-5.42.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/frameworkintegration-5.41.0.tar.xz";
-      sha256 = "1k67hkzc2jw5im7vc8j64fqsxz5m8fnlq696hm5dh4fbclyckh5s";
-      name = "frameworkintegration-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/frameworkintegration-5.42.0.tar.xz";
+      sha256 = "17fyny3c5chv7bipr19ayfjmd1amp2nms4ba5r7mwjp97xkphry7";
+      name = "frameworkintegration-5.42.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kactivities-5.41.0.tar.xz";
-      sha256 = "1zxwmizq48kk6pd9y350gzszqi87wjbqni8z4mxa1kmw9lq01xlc";
-      name = "kactivities-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kactivities-5.42.0.tar.xz";
+      sha256 = "0z0ac426npq99s1b8yzrqkjjjc34nbxlpw8pw388yj7fa41hw21r";
+      name = "kactivities-5.42.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kactivities-stats-5.41.0.tar.xz";
-      sha256 = "1nm34ln222x6mm4zpmvn8prqk9fr3jxyppn18kwlv0nfw16qmppq";
-      name = "kactivities-stats-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kactivities-stats-5.42.0.tar.xz";
+      sha256 = "0si70hayf4brr83jzdjdsfvp8nc1sb7vdk0q532liafhf8hw9mq8";
+      name = "kactivities-stats-5.42.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kapidox-5.41.0.tar.xz";
-      sha256 = "0jdphs536ymaj5f9gh5ycfgq1d41sas6bx4dzzjg13y26w6afyy6";
-      name = "kapidox-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kapidox-5.42.0.tar.xz";
+      sha256 = "0izyd66p5403gl09l7irzy97mb9b14n4zyjrwap800zjlpwh41pz";
+      name = "kapidox-5.42.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/karchive-5.41.0.tar.xz";
-      sha256 = "0hd7jy9517m53ijvprl9ci97kjx7nd42ga33af71kqx5x030zi23";
-      name = "karchive-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/karchive-5.42.0.tar.xz";
+      sha256 = "1vq2ngdxmdl6hzjwdcrv66ban8v9s5jiqwy1mgdqv4ak14l31qbi";
+      name = "karchive-5.42.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kauth-5.41.0.tar.xz";
-      sha256 = "1hkaf83p3xwcwkhlfbrdbg7b7nhw0gh0yw4lv8y3vpryn7pcd32l";
-      name = "kauth-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kauth-5.42.0.tar.xz";
+      sha256 = "04kqb2hhr9lkpkxiaqlnyk0kmk6p89z5fgp5i5g83hsi8maz7swi";
+      name = "kauth-5.42.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kbookmarks-5.41.0.tar.xz";
-      sha256 = "173rf85msrp1awmf2zsxwv6jjfkz7yc2pbh4jq0hfcgnqk46s9v0";
-      name = "kbookmarks-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kbookmarks-5.42.0.tar.xz";
+      sha256 = "08q413mr5ib04gwnqznvm9vkkfmnh16rgf6rqdvclnci9w7ml5x2";
+      name = "kbookmarks-5.42.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kcmutils-5.41.0.tar.xz";
-      sha256 = "165b5hk0cv769kk9dqqggc6ji6gzln8zns5k6rv12rz825aysnhs";
-      name = "kcmutils-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kcmutils-5.42.0.tar.xz";
+      sha256 = "1q67b0m6w3xvm22kq8b0b0rib1jzf25gf6dz7h286987zfbbs5n7";
+      name = "kcmutils-5.42.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kcodecs-5.41.0.tar.xz";
-      sha256 = "0y96mbp9j083kwkqxk0qgrjyhylp8f7f0ngcqcvhh8s6sgpb8xq9";
-      name = "kcodecs-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kcodecs-5.42.0.tar.xz";
+      sha256 = "0b19z432r9dnyjknvwffhcmrg969yhydjvy4qrkrf22026f4smwc";
+      name = "kcodecs-5.42.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kcompletion-5.41.0.tar.xz";
-      sha256 = "0b6bh5l4s5q8yi6vls11c8b8dpscykh138kydfi925nxkrms7yv3";
-      name = "kcompletion-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kcompletion-5.42.0.tar.xz";
+      sha256 = "0yqci2v0dk5v1mz4n3gca599a7mpihy563zc6sl8hsa30ld8li0f";
+      name = "kcompletion-5.42.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kconfig-5.41.0.tar.xz";
-      sha256 = "1jch9bpqshigwvc2qs46qa0mclr1hdn0sqlkxbl4b2xb5xj28nzn";
-      name = "kconfig-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kconfig-5.42.0.tar.xz";
+      sha256 = "08gg0d20c09j7hyxm8ydpzk2yf30c87g9ag7a9nfykrmi6cqirdq";
+      name = "kconfig-5.42.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kconfigwidgets-5.41.0.tar.xz";
-      sha256 = "1lbpjkhxmpah32ig1wlxkr1v1l3fqicnnvj6lhwpk0bxys8cdnd2";
-      name = "kconfigwidgets-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kconfigwidgets-5.42.0.tar.xz";
+      sha256 = "191zm24q2n001b65hcnfh2639k4iqhxwdmgdw29php3n2648xq4z";
+      name = "kconfigwidgets-5.42.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kcoreaddons-5.41.0.tar.xz";
-      sha256 = "1f45x4adql708903x4g27x1wbzvbwd809ibiqa5kiijayaqkjxqf";
-      name = "kcoreaddons-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kcoreaddons-5.42.0.tar.xz";
+      sha256 = "17qv7r6z72mm9a0hyx5dgk90ikhhgm41bkvnq2hjal0py2lsnrs9";
+      name = "kcoreaddons-5.42.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kcrash-5.41.0.tar.xz";
-      sha256 = "1jp06hz33mpcy2y93w4j3yqcvkphigiwq6j89mvgi9h21pahpjvy";
-      name = "kcrash-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kcrash-5.42.0.tar.xz";
+      sha256 = "049y0xdyw37y0qid3d3plj8szfys5gw98j7lhcakiini8mn5cins";
+      name = "kcrash-5.42.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kdbusaddons-5.41.0.tar.xz";
-      sha256 = "02d6zv43vpz5h8si100zlsf5yfgjajsgwldcxblckyjr0qn42xny";
-      name = "kdbusaddons-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kdbusaddons-5.42.0.tar.xz";
+      sha256 = "1613pc3r70jnzvpwm1xjdbdsmcpx28jwvcs2qq9swlywr5qr9hbd";
+      name = "kdbusaddons-5.42.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kdeclarative-5.41.0.tar.xz";
-      sha256 = "1hxfrz4d7xjm63b9kawhf382gz1xykvdi9q4syhkjfbpyacxfjga";
-      name = "kdeclarative-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kdeclarative-5.42.0.tar.xz";
+      sha256 = "1w604jy6vg2247vggz0ivl7wy2h5iapkz2z86mah3aw99f7dqa22";
+      name = "kdeclarative-5.42.0.tar.xz";
     };
   };
   kded = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kded-5.41.0.tar.xz";
-      sha256 = "10wmj3nb8vn90h1j0s5kfr8iydk7k853gg9v6hxivm92v6zr6l9g";
-      name = "kded-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kded-5.42.0.tar.xz";
+      sha256 = "0w25dl4pnvby28gz0yvij32vi9n3p8si4nm4x45j7zsi2cb70j4l";
+      name = "kded-5.42.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/portingAids/kdelibs4support-5.41.0.tar.xz";
-      sha256 = "1mkp3w8h8cyskbfxcwsl72v87376x66n20ig7b3b6ply36578br4";
-      name = "kdelibs4support-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/portingAids/kdelibs4support-5.42.0.tar.xz";
+      sha256 = "0aiig8akn6bdxrqdl96xjjy2pxw8hhfrsalbkkzyhh06j794snfb";
+      name = "kdelibs4support-5.42.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kdesignerplugin-5.41.0.tar.xz";
-      sha256 = "1c1pnjgp9nifynwvsyjp7c45j40i111xnmjp89bb1jk9fv9g2f99";
-      name = "kdesignerplugin-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kdesignerplugin-5.42.0.tar.xz";
+      sha256 = "004axa1fkj954d65x7l9z8dmw04209hb368rwa4gjzb8naf13ib6";
+      name = "kdesignerplugin-5.42.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kdesu-5.41.0.tar.xz";
-      sha256 = "126m7by50zzkmk0r778xlkqfbfpihwd6d3wzd4hbqkh9km18l1rb";
-      name = "kdesu-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kdesu-5.42.0.tar.xz";
+      sha256 = "0402p1h7wifk6sppg7ca9w0zfjllbhc1j5gsxj7ypq55g94np7hx";
+      name = "kdesu-5.42.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kdewebkit-5.41.0.tar.xz";
-      sha256 = "1rnixlm37x5k4cdwckml2zdmm30k938nklkd7qnbaal230dzvj6d";
-      name = "kdewebkit-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kdewebkit-5.42.0.tar.xz";
+      sha256 = "1csd4p996im7ygxc5rfdkzgdpngjgzyqakj12rl9rnfbsd15i8kb";
+      name = "kdewebkit-5.42.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kdnssd-5.41.0.tar.xz";
-      sha256 = "042dmh50rxvipb5pqz0csb3y7cvzc2ga2a5qcvd1vw84ii1mmjbh";
-      name = "kdnssd-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kdnssd-5.42.0.tar.xz";
+      sha256 = "1k1rz62h3mafliik5n0k98dc56b5v2v6qyqj40696mcyc2d1yvll";
+      name = "kdnssd-5.42.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kdoctools-5.41.0.tar.xz";
-      sha256 = "06v63br6m5nhvsdsynhb7i825yrry94s7zrk20k0xw4yahpvkjcs";
-      name = "kdoctools-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kdoctools-5.42.0.tar.xz";
+      sha256 = "1bby3avdllch1mji0mxzcix8q5yir5a0i6wpjs5lwckv1glh6kmz";
+      name = "kdoctools-5.42.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kemoticons-5.41.0.tar.xz";
-      sha256 = "1lj6c6k8dh2rgj1128ms2xv7dk1v9li5rcy2djqfynqdrvg5iy3g";
-      name = "kemoticons-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kemoticons-5.42.0.tar.xz";
+      sha256 = "0f6an1bwxnga41a2b35b2pdcni4p0hh76k4jvanl3g046v07f2wr";
+      name = "kemoticons-5.42.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kfilemetadata-5.41.0.tar.xz";
-      sha256 = "0y9ya18bqa8sfi2c10y2q0dkwdry0wfq5s2sb53q0fh2fph7hjvi";
-      name = "kfilemetadata-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kfilemetadata-5.42.0.tar.xz";
+      sha256 = "03wk38q3sq354ykz9dwbgykn73ldf94ryx6hxvpr66bq3a59jmwz";
+      name = "kfilemetadata-5.42.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kglobalaccel-5.41.0.tar.xz";
-      sha256 = "0i8aw0jbsh26asjmhs0lax1yv9qalpr82cd8m0nbyqn2s3f4jyaf";
-      name = "kglobalaccel-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kglobalaccel-5.42.0.tar.xz";
+      sha256 = "0nlza73i0qd79yhwhpnvgbh2xa9lvd1n2xg25p3bvfzwidcfdxg6";
+      name = "kglobalaccel-5.42.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kguiaddons-5.41.0.tar.xz";
-      sha256 = "0cva0qy946srqay9nmh97mjv7kf2lr51nipx9qx2jd21d8cvz8p1";
-      name = "kguiaddons-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kguiaddons-5.42.0.tar.xz";
+      sha256 = "193i8b4f13dkgp88m3pk9wzi0dhx7qmsnmpizxia3457gg016wn7";
+      name = "kguiaddons-5.42.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/portingAids/khtml-5.41.0.tar.xz";
-      sha256 = "0gbs63d7izb8kaf4k8ssp2lkcps9fqk32czjpmzx3fq1gnaczry3";
-      name = "khtml-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/portingAids/khtml-5.42.0.tar.xz";
+      sha256 = "1bfslndxvad0zgzr22w2mz1xwavix9bh5qrrv8dpshlh043bwr3l";
+      name = "khtml-5.42.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/ki18n-5.41.0.tar.xz";
-      sha256 = "12ylqsi7lsxvdcg9a1p9hkd6lpcj971k77zly6vpb4yb3s6z0jqd";
-      name = "ki18n-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/ki18n-5.42.0.tar.xz";
+      sha256 = "1rpriflb2a48j94zxgh63l6rzq4nlnlkvy89ns1vkdw42bnqrjx9";
+      name = "ki18n-5.42.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kiconthemes-5.41.0.tar.xz";
-      sha256 = "1ywg7b3vy3p7vmd055a72hmpnwp0l0yvf6cnb6nvmpnp3pm737g1";
-      name = "kiconthemes-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kiconthemes-5.42.0.tar.xz";
+      sha256 = "1nbxxpf8bv835xl35b17rk8s3zs110bh31078kqqh7dhvwzlxic7";
+      name = "kiconthemes-5.42.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kidletime-5.41.0.tar.xz";
-      sha256 = "0k4q8ssqfbgfqvjq1rpills16nz4fi92mc754644by3s0czh409w";
-      name = "kidletime-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kidletime-5.42.0.tar.xz";
+      sha256 = "019r41r28pcrcn1kwxsll53za705jkc9n23b6sr2lplgjk05bcxh";
+      name = "kidletime-5.42.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kimageformats-5.41.0.tar.xz";
-      sha256 = "11df264s3n192pggdmql2pklnflc8fn9v8zrjpn38f99hs46bq8s";
-      name = "kimageformats-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kimageformats-5.42.0.tar.xz";
+      sha256 = "1k67yrmszx7azjzrg478rimbz991lghx4d6dmg22p6dknajd78a6";
+      name = "kimageformats-5.42.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kinit-5.41.0.tar.xz";
-      sha256 = "05jqsnj33gwxp4lc81378kb58idnmcmn84smy3hkqwlakisnwgy9";
-      name = "kinit-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kinit-5.42.0.tar.xz";
+      sha256 = "05vpac41pw1n8y58l2z08vyknzv950x8dxxw66dnymm2v31w07ia";
+      name = "kinit-5.42.0.tar.xz";
     };
   };
   kio = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kio-5.41.0.tar.xz";
-      sha256 = "17k4pfbhkv1inx5c3wqm388c02cdf3wnqgnhky271v7gb5ww5i4h";
-      name = "kio-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kio-5.42.0.tar.xz";
+      sha256 = "1526a89x11ank55dp3rfp7xd04w8x7prjg3y6i7n2q9nabwhw7gc";
+      name = "kio-5.42.0.tar.xz";
     };
   };
   kirigami2 = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kirigami2-5.41.0.tar.xz";
-      sha256 = "04l7b86fs7s80dfrznc2c0zh6phpgirwsinykrzfqg792gmbvx2h";
-      name = "kirigami2-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kirigami2-5.42.0.tar.xz";
+      sha256 = "11gqn7amp0r9bgh8ldgisfc2lrkzkn5mq2a1madf24nvjbkvqnqv";
+      name = "kirigami2-5.42.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kitemmodels-5.41.0.tar.xz";
-      sha256 = "13kngcj8ifnhbp0jsrjwhw49my8pnw493g11y11cw17hw7sqg55k";
-      name = "kitemmodels-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kitemmodels-5.42.0.tar.xz";
+      sha256 = "0mcdzdqwmvf9pwirsrnjbhrgqphnfmanbl9zij4qsmin8n866mhc";
+      name = "kitemmodels-5.42.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kitemviews-5.41.0.tar.xz";
-      sha256 = "0147pm5p03w1b71mrr5rssmh2n80q54ghfpbjpq3spjdkjg1f26f";
-      name = "kitemviews-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kitemviews-5.42.0.tar.xz";
+      sha256 = "1j1q0b08f8mnfc3r2a7rplyb2nv9f0aq5a3fxskinvg70c6y248w";
+      name = "kitemviews-5.42.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kjobwidgets-5.41.0.tar.xz";
-      sha256 = "1fbdk6l8rbnyqn0cz2dm9cagn7x89zpy3wczj1cdvnc7k7wg75qv";
-      name = "kjobwidgets-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kjobwidgets-5.42.0.tar.xz";
+      sha256 = "1m3csdl7wh18ywv5p0qpbjpixvflgjcq3yvk3vlvh0sxxlwcz8k4";
+      name = "kjobwidgets-5.42.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/portingAids/kjs-5.41.0.tar.xz";
-      sha256 = "1a263cng8i304yh66iq45hwpgnl8ng6wvjrsl11hhqmyv07h2kk0";
-      name = "kjs-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/portingAids/kjs-5.42.0.tar.xz";
+      sha256 = "1m26sb2qyrcgmpkw76k2yv5my2pkhld96vw6aaqm77q90faw734g";
+      name = "kjs-5.42.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/portingAids/kjsembed-5.41.0.tar.xz";
-      sha256 = "1vxbh5rd9rdj3m7sag48c4cns443j479mlfbwxgnpm92z67ka7x7";
-      name = "kjsembed-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/portingAids/kjsembed-5.42.0.tar.xz";
+      sha256 = "10w4w4ncwr245bv1ii4sh154w91ghfz0l60k89j50lsydpcqcp3a";
+      name = "kjsembed-5.42.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/portingAids/kmediaplayer-5.41.0.tar.xz";
-      sha256 = "03420i82p984w6iqdiam2xam7b9khh76pll4ffn0c5k4wf1ba2z4";
-      name = "kmediaplayer-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/portingAids/kmediaplayer-5.42.0.tar.xz";
+      sha256 = "1k1pjc0cz36gs0pl2pxw8f9f82xkbqyy320nfyhan5waxbl1qd5n";
+      name = "kmediaplayer-5.42.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/knewstuff-5.41.0.tar.xz";
-      sha256 = "0j9qgswiacv7yj8c28q343falaglh5zc4wwcflwy1zvrp59bjcz4";
-      name = "knewstuff-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/knewstuff-5.42.0.tar.xz";
+      sha256 = "0i2gmyp67xzf2m5wnv7v574q3gsp1yxfflv1jgl0wy57vchwn9g6";
+      name = "knewstuff-5.42.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/knotifications-5.41.0.tar.xz";
-      sha256 = "1dsiigmzmhmg3x6y5nf2i9zq3hc4nca2gg2dvl0bz1lm438ddy84";
-      name = "knotifications-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/knotifications-5.42.0.tar.xz";
+      sha256 = "0awmwypmd104vhaj2v9k83niflxj26d4mbl6mzfcj75lgka6kffc";
+      name = "knotifications-5.42.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/knotifyconfig-5.41.0.tar.xz";
-      sha256 = "0hrdjh76php34wkcswnh5rfnkajf0g9n8mpqsdj4djxja39vi6vs";
-      name = "knotifyconfig-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/knotifyconfig-5.42.0.tar.xz";
+      sha256 = "1h07bjj71611v6912m5ajli6qszh9w925zqbk3vih8rn6pd2s3mc";
+      name = "knotifyconfig-5.42.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kpackage-5.41.0.tar.xz";
-      sha256 = "1663sshy52my9qbrj8ny1a6sipl94l2paxss4k5977fyyax15zdm";
-      name = "kpackage-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kpackage-5.42.0.tar.xz";
+      sha256 = "10amhh07x8d0jkyylb19cyzjs71k8dq1y8isfahqzb2kd43vijqa";
+      name = "kpackage-5.42.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kparts-5.41.0.tar.xz";
-      sha256 = "09ddh7n8jj8zisdm90lbmc4xk4axsibhx1cjbpaigzcfcvnj1b71";
-      name = "kparts-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kparts-5.42.0.tar.xz";
+      sha256 = "1mb5gp2ckmmrb4ym7cqvyl81wnp7cryk85gmizl7cnn69svlf40h";
+      name = "kparts-5.42.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kpeople-5.41.0.tar.xz";
-      sha256 = "1k72br66mnvkripzdq2wcchlrg6p7mxfqa0rbq0rq3q7npw1zzw5";
-      name = "kpeople-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kpeople-5.42.0.tar.xz";
+      sha256 = "050km3rpx58acx2341si46lxc2hywa59m8rwd849c2dnsxw3w1hm";
+      name = "kpeople-5.42.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kplotting-5.41.0.tar.xz";
-      sha256 = "197n2m3q9b588j56m30i12z55nbymbj4wgpgrkbsci7162jjjj1z";
-      name = "kplotting-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kplotting-5.42.0.tar.xz";
+      sha256 = "109b9grshrwralyp8ilkbf1k0akaggygqh6wafqdf0ris0ps13l9";
+      name = "kplotting-5.42.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kpty-5.41.0.tar.xz";
-      sha256 = "04xg5pn65nvk1bdh6bfznbsmlra6gzph72i7m28h9idnz143lr12";
-      name = "kpty-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kpty-5.42.0.tar.xz";
+      sha256 = "07s16zxs03ixy7yxy9fda83yqhcgqzx42gnvwjwkyc8q05njmma6";
+      name = "kpty-5.42.0.tar.xz";
     };
   };
   kross = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/portingAids/kross-5.41.0.tar.xz";
-      sha256 = "0xsfgwb3ihgby6r6wycxnqkd9d7zrj6w3h9bxw8n4asjfri7lgwi";
-      name = "kross-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/portingAids/kross-5.42.0.tar.xz";
+      sha256 = "1aqqwby6jslimpvx42d4n6gjsjc8l82gmsq5ajpv9zkkk91dqfqi";
+      name = "kross-5.42.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/krunner-5.41.0.tar.xz";
-      sha256 = "0vyxijs0vnpa19z7avd1438q1c7s4ka17hbsdq2r0jza3iwkfx83";
-      name = "krunner-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/krunner-5.42.0.tar.xz";
+      sha256 = "0xh9kss67l09am1ilsr9zyx1yhlmaq3g9x60hw0sx7h7wrl6zsw6";
+      name = "krunner-5.42.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kservice-5.41.0.tar.xz";
-      sha256 = "0k3ch3vbdy9rm82d9n6mf6ir3qm7l2fddp98jy4jmsr0qynqn50q";
-      name = "kservice-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kservice-5.42.0.tar.xz";
+      sha256 = "0z8zfpd00ndvkm1klp8l4mrcksshhyg280zgmg3gffz5rgh3gwri";
+      name = "kservice-5.42.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/ktexteditor-5.41.0.tar.xz";
-      sha256 = "1idvldchfbnvimvcrizigmmam62q7rpam06xprcizywyxq53yw7z";
-      name = "ktexteditor-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/ktexteditor-5.42.0.tar.xz";
+      sha256 = "020y3j6vm15sfpiwainr3qsx9i93j15mrvq523wmbmdj1z36yrh2";
+      name = "ktexteditor-5.42.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/ktextwidgets-5.41.0.tar.xz";
-      sha256 = "0m6n4v0njvcaky87f0ga47iwq12hsvghadj8pngjrksankvaj23n";
-      name = "ktextwidgets-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/ktextwidgets-5.42.0.tar.xz";
+      sha256 = "088azbv95ycwxmxxw4l63i2l14fmn8l473pb4djh2mvz1ypfqayk";
+      name = "ktextwidgets-5.42.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kunitconversion-5.41.0.tar.xz";
-      sha256 = "1kn6lw58b9w6f38mra2hizbnik64ka3gvgqk1xqp0mspqmr498rw";
-      name = "kunitconversion-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kunitconversion-5.42.0.tar.xz";
+      sha256 = "0219pna4l3vvhyf5acsc87n48jzdnws6kwyhaiy3hy1pzrilv32l";
+      name = "kunitconversion-5.42.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kwallet-5.41.0.tar.xz";
-      sha256 = "1gdzfp3gbr5qp821pkhaj6v8zg3q21xz6j11frjww8fn5nmp3v3l";
-      name = "kwallet-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kwallet-5.42.0.tar.xz";
+      sha256 = "1kv3v7593srfn0wd7qp4rhvb30rxp7d2qmlwi0n4nc9s6v59pabn";
+      name = "kwallet-5.42.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kwayland-5.41.0.tar.xz";
-      sha256 = "1dw2g6wwj7hhxlgzrjqk39ywpzh6ijwfjnzqjp6s8s5274fvjqbn";
-      name = "kwayland-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kwayland-5.42.0.tar.xz";
+      sha256 = "0wr6ygppahxsx3dh71h2wmybv7z7iyqdv7wn80cxb0mp4zpyinh7";
+      name = "kwayland-5.42.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.41.0";
+    version = "5.42.1";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kwidgetsaddons-5.41.0.tar.xz";
-      sha256 = "15fm7gni22wb64pski3fn5myrn9z22h077hzzcc34c3af21yh5s5";
-      name = "kwidgetsaddons-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kwidgetsaddons-5.42.1.tar.xz";
+      sha256 = "0h0vfrfl5zi01fpvmd825kazzlyawz3i66qrfkymdrnvqmfzcmlg";
+      name = "kwidgetsaddons-5.42.1.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kwindowsystem-5.41.0.tar.xz";
-      sha256 = "0x4jz9qkvxs5dlzk860f8vhlczgxg6di614y8ji6afra760nk17l";
-      name = "kwindowsystem-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kwindowsystem-5.42.0.tar.xz";
+      sha256 = "15k6x0f93qxka3mz7qfzak2ibdd88q77pz6akil8s3g41zsg2dqv";
+      name = "kwindowsystem-5.42.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kxmlgui-5.41.0.tar.xz";
-      sha256 = "0cgwx3lhnn982gvl2yv5272bs3il05ssfpjlkgmqgnrnz2qxlhlr";
-      name = "kxmlgui-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kxmlgui-5.42.0.tar.xz";
+      sha256 = "0kfxjx8wrhkys5bydnv84nqxc2jqvv92zb2l6zpi0km5ggmia5y0";
+      name = "kxmlgui-5.42.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/kxmlrpcclient-5.41.0.tar.xz";
-      sha256 = "0y7n6xk18a6zci36ka426h7ar8r7kkr80jn47mc6jw3qdk4nvri7";
-      name = "kxmlrpcclient-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/kxmlrpcclient-5.42.0.tar.xz";
+      sha256 = "0ciip27ilsfk9s3gslpbi06v8i6ipdbmcig2jf43z3amsxpq0ncn";
+      name = "kxmlrpcclient-5.42.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/modemmanager-qt-5.41.0.tar.xz";
-      sha256 = "1bp9mllzgvqr3dsjg9a81yv487whf26vfxiyim8hr42b9j8v8wj0";
-      name = "modemmanager-qt-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/modemmanager-qt-5.42.0.tar.xz";
+      sha256 = "0q6qzn60z55h0gyc9xwdfaq45mjpk3zrr6d4qqjjfkqsr3866sfx";
+      name = "modemmanager-qt-5.42.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/networkmanager-qt-5.41.0.tar.xz";
-      sha256 = "0vdrbfwamk5p6mm0i05bxvmrlqxm9c5d373pn7qrm0kzs916xhlv";
-      name = "networkmanager-qt-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/networkmanager-qt-5.42.0.tar.xz";
+      sha256 = "03hhvx8d52mfgbhd4gn0vhsk9k1fv1pvq24ixxdgs2mw44v884xq";
+      name = "networkmanager-qt-5.42.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/oxygen-icons5-5.41.0.tar.xz";
-      sha256 = "1zpcjfzw4pv73ms8pc1w4fpvxcbpasl2av0g4y6sj7rshzdgrj31";
-      name = "oxygen-icons5-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/oxygen-icons5-5.42.0.tar.xz";
+      sha256 = "0pnav9h0xmvbaamzpcyznjjv25slz8maszshx7sj7h07b5a23x46";
+      name = "oxygen-icons5-5.42.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/plasma-framework-5.41.0.tar.xz";
-      sha256 = "1risn810pyncfpn01xiqsb5j8pwsnmx60lfajnx7qygny6b69pl4";
-      name = "plasma-framework-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/plasma-framework-5.42.0.tar.xz";
+      sha256 = "079c8h0lmbkfr3srj5m8a40b50kyrxbgmy1n66329l8js9xrvaah";
+      name = "plasma-framework-5.42.0.tar.xz";
     };
   };
   prison = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/prison-5.41.0.tar.xz";
-      sha256 = "0q3r1a3047yxhsd3qfwzwsw261zrfdmsklnyq5d2ayflchcj5vxi";
-      name = "prison-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/prison-5.42.0.tar.xz";
+      sha256 = "0bhg2fjdwsv7mk16jh1nc3miwggz1dl9l99l2f20xvi75hn7rryg";
+      name = "prison-5.42.0.tar.xz";
     };
   };
   qqc2-desktop-style = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/qqc2-desktop-style-5.41.0.tar.xz";
-      sha256 = "166cjfaly8fzzchq8pk2s7f5mm63cwmayw3qc0p7amy5d0nykm0w";
-      name = "qqc2-desktop-style-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/qqc2-desktop-style-5.42.0.tar.xz";
+      sha256 = "1arlfhcshfs11pgf87jzjgln1p711zlx0v0q014740mbzb9g5wnk";
+      name = "qqc2-desktop-style-5.42.0.tar.xz";
     };
   };
   solid = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/solid-5.41.0.tar.xz";
-      sha256 = "0i2qxps26rg2x1576m35k4kj018i9jpsnlayzsk4fcj44kvsq9z3";
-      name = "solid-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/solid-5.42.0.tar.xz";
+      sha256 = "10lr8paaq6vaiqn833kzcdc3kkyv8j9fdchy7h8pvi9ajjjwq0lq";
+      name = "solid-5.42.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/sonnet-5.41.0.tar.xz";
-      sha256 = "1jhpl0ajqlln88fmzbwjxn0illbas4s0hbzwd3w56s9wg8j18s76";
-      name = "sonnet-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/sonnet-5.42.0.tar.xz";
+      sha256 = "1r3amddmy0nm8klw0jzvb8bl1l9hkrx50d8j0zq2lbjy36h3yliw";
+      name = "sonnet-5.42.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/syntax-highlighting-5.41.0.tar.xz";
-      sha256 = "0hmcb9f162hyvfb0mfkm69avgrbl146l7lyfzb93z1hk6f2gpxqc";
-      name = "syntax-highlighting-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/syntax-highlighting-5.42.0.tar.xz";
+      sha256 = "1iwiym50859jki4x41rfdmbd14jiq5lr2hdg46pjkyw17njdjd60";
+      name = "syntax-highlighting-5.42.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.41.0";
+    version = "5.42.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.41/threadweaver-5.41.0.tar.xz";
-      sha256 = "08nlskhdds13wplv4lwy4xshimkhl8jvzkz1h1qks6wggbwxf11m";
-      name = "threadweaver-5.41.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.42/threadweaver-5.42.0.tar.xz";
+      sha256 = "1isqlpnfxzxyz7mdm7yfrafgnx09mcndicdgdw3mi4r4misbrrbn";
+      name = "threadweaver-5.42.0.tar.xz";
     };
   };
 }
diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix
index 8948a74ad630..3f4f48775c1b 100644
--- a/pkgs/development/libraries/libbladeRF/default.nix
+++ b/pkgs/development/libraries/libbladeRF/default.nix
@@ -2,14 +2,14 @@
 , libusb1, udev }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.0";
+  version = "1.9.0";
   name = "libbladeRF-v${version}";
 
   src = fetchFromGitHub {
     owner = "Nuand";
     repo = "bladeRF";
     rev = "libbladeRF_v${version}";
-    sha256 = "1y00hqsmqaix4dql8mb75zx87zvn8b483yxv53x9qyjspksbs60c";
+    sha256 = "0frvphp4xxdxwzmi94b0asl7b891sd3fk8iw9kfk8h6f3cdhj8xa";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
     description = "Supporting library of the BladeRF SDR opensource hardware";
     license = licenses.lgpl21;
     maintainers = with maintainers; [ funfunctor ];
-    platforms = platforms.linux;
+    platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix
index f7e477ff34a1..b325c9b246c2 100644
--- a/pkgs/development/libraries/libvncserver/default.nix
+++ b/pkgs/development/libraries/libvncserver/default.nix
@@ -1,12 +1,8 @@
 {stdenv, fetchurl,
-  libtool, libjpeg, openssl, libX11, libXdamage, xproto, damageproto, 
-  xextproto, libXext, fixesproto, libXfixes, xineramaproto, libXinerama, 
-  libXrandr, randrproto, libXtst, zlib, libgcrypt, autoreconfHook
-  , systemd, pkgconfig, libpng
+ libtool, libjpeg, openssl, zlib, libgcrypt, autoreconfHook, pkgconfig, libpng,
+ systemd
 }:
 
-assert stdenv.isLinux;
-
 let
   s = # Generated upstream information
   rec {
@@ -16,27 +12,25 @@ let
     url="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${version}.tar.gz";
     sha256="15189n09r1pg2nqrpgxqrcvad89cdcrca9gx6qhm6akjf81n6g8r";
   };
-  buildInputs = [
-    libtool libjpeg openssl libX11 libXdamage xproto damageproto
-    xextproto libXext fixesproto libXfixes xineramaproto libXinerama
-    libXrandr randrproto libXtst zlib libgcrypt autoreconfHook systemd
-    pkgconfig libpng
-  ];
 in
 stdenv.mkDerivation {
   inherit (s) name version;
-  inherit buildInputs;
   src = fetchurl {
     inherit (s) url sha256;
   };
   preConfigure = ''
     sed -e 's@/usr/include/linux@${stdenv.cc.libc}/include/linux@g' -i configure
   '';
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  buildInputs = [
+    libtool libjpeg openssl libgcrypt libpng
+  ] ++ stdenv.lib.optional stdenv.isLinux systemd;
+  propagatedBuildInputs = [ zlib ];
   meta = {
     inherit (s) version;
     description =  "VNC server library";
     license = stdenv.lib.licenses.gpl2Plus ;
     maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/png++/default.nix b/pkgs/development/libraries/png++/default.nix
index 6ca4734a4f7d..ef4b3ea7e010 100644
--- a/pkgs/development/libraries/png++/default.nix
+++ b/pkgs/development/libraries/png++/default.nix
@@ -21,13 +21,17 @@ stdenv.mkDerivation rec {
 
   postCheck = "cat test/test.log";
 
-  buildInputs = [ ]
-    ++ stdenv.lib.optional docSupport doxygen;
+  buildInputs = stdenv.lib.optional docSupport doxygen;
 
   propagatedBuildInputs = [ libpng ];
 
-  makeFlags = [ "PREFIX=\${out}" ]
-    ++ stdenv.lib.optional docSupport "docs";
+  preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace error.hpp --replace "#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE" "#if (__clang__ || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE"
+  '' + ''
+    sed "s|\(PNGPP := .\)|PREFIX := ''${out}\n\\1|" -i Makefile
+  '';
+
+  makeFlags = stdenv.lib.optional docSupport "docs";
 
   enableParallelBuilding = true;
 
@@ -35,7 +39,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.nongnu.org/pngpp/;
     description = "C++ wrapper for libpng library";
     license = licenses.bsd3;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = [ maintainers.ramkromberg ];
   };
 }
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
index 2057aee3e995..79ed37dd2a9a 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchgit, qtbase, qtquick1, qmake, qtmultimedia }:
+{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia }:
 
 stdenv.mkDerivation rec {
   version = "0.1.0";
   name = "qmltermwidget-${version}";
 
-  src = fetchgit {
-    url = "https://github.com/Swordfish90/qmltermwidget.git";
-    rev = "refs/tags/v${version}";
+  src = fetchFromGitHub {
+    repo = "qmltermwidget";
+    owner = "Swordfish90";
+    rev = "v${version}";
     sha256 = "0ca500mzcqglkj0i6km0z512y3a025dbm24605xyv18l6y0l2ny3";
   };
 
diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix
index 6864db12f18d..24c4a50d874b 100644
--- a/pkgs/development/libraries/vapoursynth/default.nix
+++ b/pkgs/development/libraries/vapoursynth/default.nix
@@ -12,13 +12,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "vapoursynth-${version}";
-  version = "R39";
+  version = "R40";
 
   src = fetchFromGitHub {
     owner  = "vapoursynth";
     repo   = "vapoursynth";
     rev    = version;
-    sha256 = "0cw7w8xiwhxhwykydy13m44wm9vn9hrsi30z6017ngga9d84fhqy";
+    sha256 = "1ycc3fdhhryp7hap80z3qmh89br31kcswzp8ai3wlc07zfvcrfck";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook nasm ];
diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix
index b5bb73e3e33b..00973350e185 100644
--- a/pkgs/development/libraries/zimg/default.nix
+++ b/pkgs/development/libraries/zimg/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec{
   name = "zimg-${version}";
-  version = "2.6.1";
+  version = "2.7";
 
   src = fetchFromGitHub {
     owner  = "sekrit-twc";
     repo   = "zimg";
     rev    = "release-${version}";
-    sha256 = "08hynzcxz95a4i67k5cn6isafdb6xjgd0x0miyhlnp2xc220zfqj";
+    sha256 = "1jvx3a523mzkc54rrjab9kz66kc6q1snry9ymwmsx7rrd3kv3j6m";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/development/libraries/zxcvbn-c/default.nix b/pkgs/development/libraries/zxcvbn-c/default.nix
new file mode 100644
index 000000000000..1ba073943483
--- /dev/null
+++ b/pkgs/development/libraries/zxcvbn-c/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub }:
+stdenv.mkDerivation rec {
+  name = "zxcvbn-c-${version}";
+  version = "2.3";
+
+  src = fetchFromGitHub {
+    owner = "tsyrogit";
+    repo = "zxcvbn-c";
+    rev = "v${version}";
+    sha256 = "1m097b4qq1r3kk4b236pc3mpaj22il9fh43ifagad5wy54x8zf7b";
+  };
+
+  installPhase = ''
+    install -D -t $out/lib libzxcvbn.so*
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/tsyrogit/zxcvbn-c;
+    description = "A C/C++ implementation of the zxcvbn password strength estimation";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ xurei ];
+  };
+}