Merge branch 'master' into staging

pkgs/development/libraries/kirigami/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig
-, plasma-framework, qtbase
+, plasma-framework, qtbase, qttranslations
 , qtquickcontrols ? null
 , qtquickcontrols2 ? null }:
 
@@ -15,7 +15,7 @@ let
       inherit sha256;
     };
 
-    buildInputs = [ plasma-framework qtbase qtqc ];
+    buildInputs = [ plasma-framework qtbase qtqc qttranslations ];
 
     nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ];
 

pkgs/development/libraries/libbsd/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libbsd-${version}";
-  version = "0.8.4";
+  version = "0.8.5";
 
   src = fetchurl {
     url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "1cya8bv976ijv5yy1ix3pzbnmp9k2qqpgw3dx98k2w0m55jg2yi1";
+    sha256 = "0a2vq0xdhs3yyj91b0612f19fakg7a9xlqy2f993128kyhjd0ivn";
   };
 
   # darwin changes configure.ac which means we need to regenerate

pkgs/development/libraries/libunwind/default.nix

@@ -9,6 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "1jsslwkilwrsj959dc8b479qildawz67r8m4lzxm7glcwa8cngiz";
   };
 
+  patches = [
+    ./version-1.2.1.patch
+  ];
+
   nativeBuildInputs = [ autoreconfHook ];
 
   outputs = [ "out" "dev" ];

pkgs/development/libraries/libunwind/version-1.2.1.patch

@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index a254bbe..fe0247b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,6 +1,6 @@
+ define(pkg_major, 1)
+-define(pkg_minor, 2.1)
+-define(pkg_extra, )
++define(pkg_minor, 2)
++define(pkg_extra, 1)
+ define(pkg_maintainer, libunwind-devel@nongnu.org)
+ define(mkvers, $1.$2$3)
+ dnl Process this file with autoconf to produce a configure script.

pkgs/development/libraries/utf8proc/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "utf8proc-${version}";
-  version = "2.0.2";
+  version = "2.1.0";
 
   src = fetchurl {
     url = "https://github.com/JuliaLang/utf8proc/archive/v${version}.tar.gz";
-    sha256 = "140vib1m6n5kwzkw1n9fbsi5gl6xymbd7yndwqx1sj15aakak776";
+    sha256 = "0q1jhdkk4f9b0zb8s2ql3sba3br5nvjsmbsaybmgj064k9hwbk15";
   };
 
   makeFlags = [ "prefix=$(out)" ];

pkgs/development/libraries/wlc/default.nix

@@ -6,12 +6,12 @@
 
 stdenv.mkDerivation rec {
   name = "wlc-${version}";
-  version = "0.0.8";
+  version = "0.0.9";
 
   src = fetchgit {
     url = "https://github.com/Cloudef/wlc";
     rev = "refs/tags/v${version}";
-    sha256 = "1lkxbqnxfmbk9j9k8wq2fl5z0a9ihzalad3x1pp8w2riz41j3by6";
+    sha256 = "1r6jf64gs7n9a8129wsc0mdwhcv44p8k87kg0714rhx3g2w22asg";
     fetchSubmodules = true;
    };