Merge remote-tracking branch 'origin/master' into systemd-219

10 files changed, 271 insertions, 229 deletions

diff --git a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
index 6cb8ff336a0d..c00f0a9c37b2 100644
--- a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ which ]; # autogen.sh which is using gnome_common tends to require which
 
   patches = [(fetchurl {
+    name = "gnome-common-patch";
     url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935";
     sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl";
   })];
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix
index 98b7a1f8b63a..2762b3fa33bf 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix
@@ -11,6 +11,7 @@ in stdenv.mkDerivation rec {
   };
 
   patches = [(fetchurl {
+    name = "gnome-common-3-patch";
     url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935";
     sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl";
   })];
diff --git a/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix
index 11655edded00..9ed8494098d1 100644
--- a/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix
@@ -5,14 +5,15 @@
 , gnome3, librsvg, gnome_doc_utils, webkitgtk }:
 
 let
-  majorVersion = "0.8";
+  majorVersion = "0.10";
+  minorVersion = "0";
 in
 stdenv.mkDerivation rec {
-  name = "geary-${majorVersion}.2";
+  name = "geary-${majorVersion}.${minorVersion}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/geary/${majorVersion}/${name}.tar.xz";
-    sha256 = "3cfa626168935acf49c9415fad54c7849f17fd833026cfd3c224ba0fb892d641";
+    sha256 = "46197a5a1b8b040adcee99082dbfd9fff9ca804e3bf0055a2e90b13214bdbca5";
   };
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
@@ -39,7 +40,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  patches = [ ./disable_valadoc.patch ];
+  # patches = [ ./disable_valadoc.patch ];
   patchFlags = "-p0";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/kde-4.14/kde-runtime.nix b/pkgs/desktops/kde-4.14/kde-runtime.nix
index ae4959662626..655555cd140a 100644
--- a/pkgs/desktops/kde-4.14/kde-runtime.nix
+++ b/pkgs/desktops/kde-4.14/kde-runtime.nix
@@ -1,6 +1,6 @@
 { kde, kdelibs, bzip2, libssh, exiv2, attica, qca2, shared_mime_info
 , libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, xz, libpulseaudio
-, networkmanager, kactivities, kdepimlibs, openexr, ilmbase, gpgme
+, networkmanager, kactivities, kdepimlibs, openexr, ilmbase, gpgme, glib
 }:
 
 kde {
@@ -16,7 +16,7 @@ kde {
 
   nativeBuildInputs = [ shared_mime_info ];
 
-  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include";
 
   passthru.propagatedUserEnvPackages = [ virtuoso ];
 
diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix
index ec9873390e50..80c04a38a484 100644
--- a/pkgs/desktops/plasma-5.3/default.nix
+++ b/pkgs/desktops/plasma-5.3/default.nix
@@ -158,7 +158,7 @@ let
         breeze-qt4 = overrideDerivation super.breeze (drv: {
           name = "breeze-qt4-${version}";
           buildInputs = [ pkgs.xorg.xproto pkgs.kde4.kdelibs pkgs.qt4 ];
-          nativeBuildInputs = [ scope.cmake pkgs.pkgconfig ];
+          nativeBuildInputs = [ pkgs.automoc4 scope.cmake pkgs.pkgconfig ];
           cmakeFlags = [
             "-DUSE_KDE4=ON"
             "-DQT_QMAKE_EXECUTABLE=${scope.qt4}/bin/qmake"
diff --git a/pkgs/desktops/plasma-5.4/default.nix b/pkgs/desktops/plasma-5.4/default.nix
index db8747d74bd2..af2602c9afd0 100644
--- a/pkgs/desktops/plasma-5.4/default.nix
+++ b/pkgs/desktops/plasma-5.4/default.nix
@@ -11,7 +11,7 @@ let
 
   inherit (pkgs) lib stdenv symlinkJoin;
 
-  kf5 = pkgs.kf513;
+  kf5 = pkgs.kf514;
   kdeApps = pkgs.kdeApps_15_08;
 
   srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
diff --git a/pkgs/desktops/plasma-5.4/fetchsrcs.sh b/pkgs/desktops/plasma-5.4/fetchsrcs.sh
index e2c5bdc9d698..a9256c5014eb 100755
--- a/pkgs/desktops/plasma-5.4/fetchsrcs.sh
+++ b/pkgs/desktops/plasma-5.4/fetchsrcs.sh
@@ -1,37 +1,46 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i bash -p coreutils findutils gnused nix wget
+#! nix-shell -i bash -p coreutils findutils gawk gnused nix wget
 
 set -x
 
 # The trailing slash at the end is necessary!
-RELEASE_URL="http://download.kde.org/stable/plasma/5.4.1/"
+RELEASE_URL="http://download.kde.org/stable/plasma/5.4.2/"
 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 manifest.sh
+# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
 { fetchurl, mirror }:
 
 {
 EOF
 
-workdir=$(pwd)
-
-find . | while read src; do
-    if [[ -f "${src}" ]]; then
-        url="${src:2}"
-        # 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:]]*-\)\+,,')
-        sha256=$(nix-hash --type sha256 --base32 --flat "$src")
-        cat >>../srcs.nix <<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 = "$version";
+    version = "$latestVersion";
     src = fetchurl {
       url = "\${mirror}/$url";
       sha256 = "$sha256";
@@ -39,9 +48,10 @@ find . | while read src; do
     };
   };
 EOF
-    fi
 done
 
 echo "}" >>../srcs.nix
 
+rm -f ../srcs.csv
+
 cd ..
diff --git a/pkgs/desktops/plasma-5.4/srcs.nix b/pkgs/desktops/plasma-5.4/srcs.nix
index f9fa32509382..6bc3916f2c02 100644
--- a/pkgs/desktops/plasma-5.4/srcs.nix
+++ b/pkgs/desktops/plasma-5.4/srcs.nix
@@ -1,301 +1,301 @@
-# DO NOT EDIT! This file is generated automatically by manifest.sh
+# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
 { fetchurl, mirror }:
 
 {
-  plasma-nm = {
-    version = "5.4.1";
+  bluedevil = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/plasma-nm-5.4.1.tar.xz";
-      sha256 = "02rx63ff95nhq2i5hndk93mxixkzf46gp792768i93ss50wjr1li";
-      name = "plasma-nm-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/bluedevil-5.4.2.tar.xz";
+      sha256 = "1axx5bf7sdi81jccfa8r5pqz2figr0zkww4inpr9zsgs9xpv9dd0";
+      name = "bluedevil-5.4.2.tar.xz";
     };
   };
-  kmenuedit = {
-    version = "5.4.1";
+  breeze = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/kmenuedit-5.4.1.tar.xz";
-      sha256 = "1h0zv6ksfw3ym88y3v5yxwwmw8m9cqbwbrsca0rxa4dc43vinn5m";
-      name = "kmenuedit-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/breeze-5.4.2.tar.xz";
+      sha256 = "17l55qv1lc2xas7qj4m9kgvwvy506awwji0ngsn0cc0kgy362a4x";
+      name = "breeze-5.4.2.tar.xz";
     };
   };
-  kdecoration = {
-    version = "5.4.1";
+  kde-cli-tools = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/kdecoration-5.4.1.tar.xz";
-      sha256 = "04jz0b0cx5hwiws5f5d72zd6rr3hqchlbm5qd3xjhq9m8rdb28yv";
-      name = "kdecoration-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/kde-cli-tools-5.4.2.tar.xz";
+      sha256 = "0hcc1cjshwvqxqpac7ybc58s96ar9h6d9ga4vrxrly0ci6wp8r32";
+      name = "kde-cli-tools-5.4.2.tar.xz";
     };
   };
-  user-manager = {
-    version = "5.4.1";
+  kdecoration = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/user-manager-5.4.1.tar.xz";
-      sha256 = "19srb9dxl1693grjjbqbb4wl1bg7vp50dhsx82mgg09b4vs2szcp";
-      name = "user-manager-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/kdecoration-5.4.2.tar.xz";
+      sha256 = "0l500c0xzlszgn70fxa3qix40v18dcqw3989xjviqxq9wzjaww3x";
+      name = "kdecoration-5.4.2.tar.xz";
     };
   };
-  powerdevil = {
-    version = "5.4.1";
+  kde-gtk-config = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/powerdevil-5.4.1.tar.xz";
-      sha256 = "1l467ijhn7h6b0v5ms8vxpjprd4hjdnhplf0k5k0ynj5cgyk96vh";
-      name = "powerdevil-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/kde-gtk-config-5.4.2.tar.xz";
+      sha256 = "0h23nnyhgvrvhs30g0cysf0z7mfgcz1d1gqzbmhzqa5an2k7h70x";
+      name = "kde-gtk-config-5.4.2.tar.xz";
     };
   };
-  libkscreen = {
-    version = "5.4.1";
+  kdeplasma-addons = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/libkscreen-5.4.1.tar.xz";
-      sha256 = "07m340kcajhf0dslcy68msh1zn6gnc58nsxyqasbkikwv9sx4v7r";
-      name = "libkscreen-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/kdeplasma-addons-5.4.2.tar.xz";
+      sha256 = "0i634ch5xy3b12lr850v8q0ip6648i6jz6zskrr55pndgfazrkfk";
+      name = "kdeplasma-addons-5.4.2.tar.xz";
     };
   };
-  kwallet-pam = {
-    version = "5.4.1";
+  kgamma5 = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/kwallet-pam-5.4.1.tar.xz";
-      sha256 = "0y9b2r4cpmj8gidqzc2j9ki09fb76gp1958v2kkbalma9g0689kc";
-      name = "kwallet-pam-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/kgamma5-5.4.2.tar.xz";
+      sha256 = "02z6llrxrh8z92z4xq1p94sxg0slmy24x7c6m9g110grgq724x3y";
+      name = "kgamma5-5.4.2.tar.xz";
     };
   };
-  plasma-pa = {
-    version = "5.4.1";
+  khelpcenter = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/plasma-pa-5.4.1.tar.xz";
-      sha256 = "0c0lzhv8fnkb1359n181ys5bwm9pzfw6g4f7pxrx9vlqqhjbr06p";
-      name = "plasma-pa-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/khelpcenter-5.4.2.tar.xz";
+      sha256 = "0v25297ahnxa443jf182pfyp0wcjybdn820sagrs3w8238i3y5v6";
+      name = "khelpcenter-5.4.2.tar.xz";
     };
   };
-  ksysguard = {
-    version = "5.4.1";
+  khotkeys = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/ksysguard-5.4.1.tar.xz";
-      sha256 = "1n9sddx54i6xnr8xk65wbdyl6mpnfmdgzqllc534zj2nq9lgcpfj";
-      name = "ksysguard-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/khotkeys-5.4.2.tar.xz";
+      sha256 = "1hs4r94fz3zj2p76f46cyi8bqwznpcz0k7cjhbrkr8a94ld31v33";
+      name = "khotkeys-5.4.2.tar.xz";
     };
   };
-  bluedevil = {
-    version = "5.4.1";
+  kinfocenter = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/bluedevil-5.4.1.tar.xz";
-      sha256 = "1sy3v1fq2mw2mjy3xd183g8fpkjwlmz6sp384qzk55nav7clbjfq";
-      name = "bluedevil-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/kinfocenter-5.4.2.tar.xz";
+      sha256 = "1p9bvsshz1z1w016inxk8f0da7p336192gjv5lw4x9kksh6bazhq";
+      name = "kinfocenter-5.4.2.tar.xz";
     };
   };
-  milou = {
-    version = "5.4.1";
+  kmenuedit = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/milou-5.4.1.tar.xz";
-      sha256 = "0n2c94d8kza8m0gl93waa66r52ncn6b0yjbks7lszl0zwzi3wqyx";
-      name = "milou-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/kmenuedit-5.4.2.tar.xz";
+      sha256 = "0jv2yf2i17h1q2dhd88wj1ywr7hfnzpfpjhmab15wq1aan7rw9v5";
+      name = "kmenuedit-5.4.2.tar.xz";
     };
   };
-  plasma-workspace-wallpapers = {
-    version = "5.4.1";
+  kscreen = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/plasma-workspace-wallpapers-5.4.1.tar.xz";
-      sha256 = "0p92p3d4m6d8jnbwgfrk8hqij67aa9pvqhzlccn29gr88f1j7wii";
-      name = "plasma-workspace-wallpapers-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/kscreen-5.4.2.tar.xz";
+      sha256 = "0liiiaqpnbi49viqxf0ds5j187f3r11aw1kf4y961y9nkzqidwlp";
+      name = "kscreen-5.4.2.tar.xz";
     };
   };
-  kde-cli-tools = {
-    version = "5.4.1";
+  ksshaskpass = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/kde-cli-tools-5.4.1.tar.xz";
-      sha256 = "02b6w8hxz05s10ajb4vnasy1ayh8a9skw26asy20zvkm3xn32pc1";
-      name = "kde-cli-tools-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/ksshaskpass-5.4.2.tar.xz";
+      sha256 = "13ma9dx5l7bzv9yq6bcq7x17pizrgyc6sh1bki56dj8g3xfsvmrb";
+      name = "ksshaskpass-5.4.2.tar.xz";
     };
   };
-  kwin = {
-    version = "5.4.1";
+  ksysguard = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/kwin-5.4.1.tar.xz";
-      sha256 = "0mx95pwlvx7kfzmp6jcihaw3dmgjjrsizmv5baq8mgravp9zzglw";
-      name = "kwin-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/ksysguard-5.4.2.tar.xz";
+      sha256 = "1cy7z5723w0757184lq8bjv7i5l54ykmq12r6ydlh104fmpzq3fm";
+      name = "ksysguard-5.4.2.tar.xz";
     };
   };
-  muon = {
-    version = "5.4.1";
+  kwallet-pam = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/muon-5.4.1.tar.xz";
-      sha256 = "0g229c2h4k3qdhzhc4sq0vlnwvbmb6qp3d4lix4q65mgnamz4lwc";
-      name = "muon-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/kwallet-pam-5.4.2.tar.xz";
+      sha256 = "0sc9ld5n2j1icfzjni9xcn9v8ix8iszkg3qf1mp6lqw4rnx3z00l";
+      name = "kwallet-pam-5.4.2.tar.xz";
     };
   };
-  oxygen = {
-    version = "5.4.1";
+  kwayland = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/oxygen-5.4.1.tar.xz";
-      sha256 = "0a880jm8islbcqp08vwd9srn2kqgrn27lsz7wr0mq2b622hsyk1p";
-      name = "oxygen-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/kwayland-5.4.2.tar.xz";
+      sha256 = "1h8jy7zdx0hxfjzxgw0ahfr80375wjlqiyiglx2zc8r9q34axswp";
+      name = "kwayland-5.4.2.tar.xz";
     };
   };
-  plasma-mediacenter = {
-    version = "5.4.1";
+  kwayland-integration = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/plasma-mediacenter-5.4.1.tar.xz";
-      sha256 = "1rnmjhyn83ic77sxybz042ghlzrrfh8ig3ivh9nnshzv8gf58bpx";
-      name = "plasma-mediacenter-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/kwayland-integration-5.4.2.tar.xz";
+      sha256 = "088hvd665rnf0xlav202jjyqmnipfgan6pbi1mkfpdawwm47vif9";
+      name = "kwayland-integration-5.4.2.tar.xz";
     };
   };
-  kwrited = {
-    version = "5.4.1";
+  kwin = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/kwrited-5.4.1.tar.xz";
-      sha256 = "0y1ag8syf1g3mmzyr0hci4xcpxs85qh54jzwkj98xghb316akdrs";
-      name = "kwrited-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/kwin-5.4.2.tar.xz";
+      sha256 = "14a11l63mz0n2sgnjpbphbaqszafsk37ydm0dz36184m194jcj90";
+      name = "kwin-5.4.2.tar.xz";
     };
   };
-  plasma-sdk = {
-    version = "5.4.1";
+  kwrited = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/plasma-sdk-5.4.1.tar.xz";
-      sha256 = "03qazkqi3x5r8bsf7v73qsqnfgv60q12bv2hmg7rf637rbk1ys7s";
-      name = "plasma-sdk-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/kwrited-5.4.2.tar.xz";
+      sha256 = "0hl8v28wh223w2disbc9qhfpqb85wq2mzv49yi6fimlwkx1318s7";
+      name = "kwrited-5.4.2.tar.xz";
     };
   };
-  ksshaskpass = {
-    version = "5.4.1";
+  libkscreen = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/ksshaskpass-5.4.1.tar.xz";
-      sha256 = "1yjp78p4r5a9ldba5nda8ly8r71zm8niyd0vz262cr14n36l0j52";
-      name = "ksshaskpass-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/libkscreen-5.4.2.tar.xz";
+      sha256 = "0p2z22j7xflzk4v6ilyz3970pn6p9q4bcwjkakv29b2arpli28ys";
+      name = "libkscreen-5.4.2.tar.xz";
     };
   };
-  plasma-desktop = {
-    version = "5.4.1";
+  libksysguard = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/plasma-desktop-5.4.1.tar.xz";
-      sha256 = "1a3jllmyk12smpf9fczwkkvfp6ljcsy4m271d9wfahl4adwiycjq";
-      name = "plasma-desktop-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/libksysguard-5.4.2.tar.xz";
+      sha256 = "02m99j8ziskrdf1l323wzkn99bi6vg5yz9bpgcih9jz7d70pc8vi";
+      name = "libksysguard-5.4.2.tar.xz";
     };
   };
-  sddm-kcm = {
-    version = "5.4.1";
+  milou = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/sddm-kcm-5.4.1.tar.xz";
-      sha256 = "1vpwn7ybcz5qpx3v2yvhpdcwlicw34gmfy8yi6j199i4kba2c38l";
-      name = "sddm-kcm-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/milou-5.4.2.tar.xz";
+      sha256 = "05jk76pbgfvgj1jdq6afg0a6b1axp1h3minrxkgly0qc42rwlc9z";
+      name = "milou-5.4.2.tar.xz";
     };
   };
-  systemsettings = {
-    version = "5.4.1";
+  muon = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/systemsettings-5.4.1.tar.xz";
-      sha256 = "0nadq4gsv3caz8x237hvphc05zl15fpaanr1m0s2svg84k251k5l";
-      name = "systemsettings-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/muon-5.4.2.tar.xz";
+      sha256 = "0cnkp9bifiga0h2z01fkiivf137b2sq8wjfv8jh00avfqhr9p6z4";
+      name = "muon-5.4.2.tar.xz";
     };
   };
-  kwayland-integration = {
-    version = "5.4.1";
+  oxygen = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/kwayland-integration-5.4.1.tar.xz";
-      sha256 = "1hcvnbfzzc7rrbi48ar6hjlvj7mhii23lzlbvaizaqv3x8bgpvd7";
-      name = "kwayland-integration-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/oxygen-5.4.2.tar.xz";
+      sha256 = "0fi2wh6vngsh66j7sk43bvrci06ddj88f1plsh9by96617s1sr36";
+      name = "oxygen-5.4.2.tar.xz";
     };
   };
-  polkit-kde-agent = {
-    version = "1-5.4.1";
+  oxygen-fonts = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/polkit-kde-agent-1-5.4.1.tar.xz";
-      sha256 = "1g11kdv9wkqcn4gaijw7j71hkbfg5vi7vci8n880w536l173aa2i";
-      name = "polkit-kde-agent-1-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/oxygen-fonts-5.4.2.tar.xz";
+      sha256 = "1dvxlgsznxfa1wk4qcanfi9s58c85i1ja651lh1pjp423d1j1kkl";
+      name = "oxygen-fonts-5.4.2.tar.xz";
     };
   };
-  libksysguard = {
-    version = "5.4.1";
+  plasma-desktop = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/libksysguard-5.4.1.tar.xz";
-      sha256 = "03vffsn2bnx26svmm7rpl4rlvnb8kmrqmivqdi55q69fsxdrz1wp";
-      name = "libksysguard-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/plasma-desktop-5.4.2.tar.xz";
+      sha256 = "19ys6ymk82ash13cyq89y8yqx5lylvw9l84d3qpj4z0pmjmzp0qg";
+      name = "plasma-desktop-5.4.2.tar.xz";
     };
   };
-  plasma-workspace = {
-    version = "5.4.1";
+  plasma-mediacenter = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/plasma-workspace-5.4.1.tar.xz";
-      sha256 = "158p70m0dda84c2mskw5xczqr5p8773nb3fibl8h2lw1bn4db130";
-      name = "plasma-workspace-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/plasma-mediacenter-5.4.2.tar.xz";
+      sha256 = "0ni3a0f9f7df9nhqz035j5vj3bzhsq9zxb19p281pww4slh7y0if";
+      name = "plasma-mediacenter-5.4.2.tar.xz";
     };
   };
-  kgamma5 = {
-    version = "5.4.1";
+  plasma-nm = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/kgamma5-5.4.1.tar.xz";
-      sha256 = "1402cvwl9xjlzqi2z6hx59w388xqhh88igaxz0mwmfnlk6fdvrkv";
-      name = "kgamma5-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/plasma-nm-5.4.2.tar.xz";
+      sha256 = "1lny7sjxr7mi77gb3dy6afmbvfdgfq4rlffaxzffx5bq62gaws68";
+      name = "plasma-nm-5.4.2.tar.xz";
     };
   };
-  kde-gtk-config = {
-    version = "5.4.1";
+  plasma-pa = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/kde-gtk-config-5.4.1.tar.xz";
-      sha256 = "0g86ij6pqlmcjvaw7gc1n7mqf6v6nywsq874nkvja18k9yvr2cc3";
-      name = "kde-gtk-config-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/plasma-pa-5.4.2.tar.xz";
+      sha256 = "09irn20ikgi58hq5bwg6kmaqqy7h9hkbkadnyv478qxff81wis4i";
+      name = "plasma-pa-5.4.2.tar.xz";
     };
   };
-  kscreen = {
-    version = "5.4.1";
+  plasma-sdk = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/kscreen-5.4.1.tar.xz";
-      sha256 = "00kb1jrdq2hklkq5svjfpmfd4jj8c9mzi5r3kx96hlnwz9abfjcv";
-      name = "kscreen-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/plasma-sdk-5.4.2.tar.xz";
+      sha256 = "1q4kjml04mdkzcdqi8mbr3c7037339v0knzc38km8szpf995w750";
+      name = "plasma-sdk-5.4.2.tar.xz";
     };
   };
-  kdeplasma-addons = {
-    version = "5.4.1";
+  plasma-workspace = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/kdeplasma-addons-5.4.1.tar.xz";
-      sha256 = "0fn5z1p5hs9l0ggi62b0wyqpc4wyaaf49921zjn11nb8qs4y0vg1";
-      name = "kdeplasma-addons-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/plasma-workspace-5.4.2.tar.xz";
+      sha256 = "0byj4fljiyag781jz3zs5chz48h22gqqc4hb8ha9nfsk615v1irn";
+      name = "plasma-workspace-5.4.2.tar.xz";
     };
   };
-  khotkeys = {
-    version = "5.4.1";
+  plasma-workspace-wallpapers = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/khotkeys-5.4.1.tar.xz";
-      sha256 = "07wsf7257b48adn22x7dkws3ifdp9flw51spxk5nqyscs15dljm2";
-      name = "khotkeys-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/plasma-workspace-wallpapers-5.4.2.tar.xz";
+      sha256 = "18ggsdjmdcgbpamjynv068rzx5cqpm00b3a2a1ygkc04d5y430js";
+      name = "plasma-workspace-wallpapers-5.4.2.tar.xz";
     };
   };
-  oxygen-fonts = {
-    version = "5.4.1";
+  polkit-kde-agent = {
+    version = "1-5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/oxygen-fonts-5.4.1.tar.xz";
-      sha256 = "0qybgwqz7v37mlqs2gprmxaz5k2dlya3fvcq4kz96zmgrskwlv6v";
-      name = "oxygen-fonts-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/polkit-kde-agent-1-5.4.2.tar.xz";
+      sha256 = "0s0z0xkfps0vk6rr013n2vww7s1a77z5jzqk500xl692g8dc2cdh";
+      name = "polkit-kde-agent-1-5.4.2.tar.xz";
     };
   };
-  breeze = {
-    version = "5.4.1";
+  powerdevil = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/breeze-5.4.1.tar.xz";
-      sha256 = "0dram0iy3ym4rhxbmv1ssv52avmmqk694b7ja7b9zr7krm1n8gyh";
-      name = "breeze-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/powerdevil-5.4.2.tar.xz";
+      sha256 = "01qsm0byvjy6slbhz6k6bikbzn35jhchcaxcis1x3c1gczhvzajw";
+      name = "powerdevil-5.4.2.tar.xz";
     };
   };
-  kinfocenter = {
-    version = "5.4.1";
+  sddm-kcm = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/kinfocenter-5.4.1.tar.xz";
-      sha256 = "17j7akqi3av4b790c40cva2b9vissyzv8kf1mj5b4mxwhrjlhbrj";
-      name = "kinfocenter-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/sddm-kcm-5.4.2.tar.xz";
+      sha256 = "0x662plyyf3krfpp4ifsd9ddwwvrfds63v6cclzir5cs9db0rs0j";
+      name = "sddm-kcm-5.4.2.tar.xz";
     };
   };
-  khelpcenter = {
-    version = "5.4.1";
+  systemsettings = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/khelpcenter-5.4.1.tar.xz";
-      sha256 = "11aszn2ha1wjpdyfr25by963krsmgflqj30fmkns2la1axqq19x9";
-      name = "khelpcenter-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/systemsettings-5.4.2.tar.xz";
+      sha256 = "0cq7b3kas7qky199x54770dh4yd2xkbvs9j0cja90vgy4f2vacbs";
+      name = "systemsettings-5.4.2.tar.xz";
     };
   };
-  kwayland = {
-    version = "5.4.1";
+  user-manager = {
+    version = "5.4.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.1/kwayland-5.4.1.tar.xz";
-      sha256 = "0irw68c9vn4c2jaqll442wr3f6wzj9q2z2qfl5qpq3vb9lpzfafg";
-      name = "kwayland-5.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.2/user-manager-5.4.2.tar.xz";
+      sha256 = "1ikx55yflf8j4f88mdybzk9yfhk24j48h3f6brx6ic2f2dcl7lzm";
+      name = "user-manager-5.4.2.tar.xz";
     };
   };
 }
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 5fdab2ab81e6..2f563dbbf5ca 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -68,24 +68,24 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
   #### PANEL PLUGINS        from "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.{bz2,gz}"
 
 
-  xfce4_battery_plugin    = callPackage ./panel-plugins/xfce4-battery-plugin.nix    { };
-  xfce4_clipman_plugin    = callPackage ./panel-plugins/xfce4-clipman-plugin.nix    { };
-  xfce4_cpufreq_plugin    = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix    { };
-  xfce4_cpugraph_plugin   = callPackage ./panel-plugins/xfce4-cpugraph-plugin.nix   { };
-  xfce4_datetime_plugin   = callPackage ./panel-plugins/xfce4-datetime-plugin.nix   { };
-  xfce4_dict_plugin       = callPackage ./panel-plugins/xfce4-dict-plugin.nix       { };
-  xfce4_embed_plugin      = callPackage ./panel-plugins/xfce4-embed-plugin.nix      { };
-  xfce4_eyes_plugin       = callPackage ./panel-plugins/xfce4-eyes-plugin.nix       { };
-  xfce4_fsguard_plugin    = callPackage ./panel-plugins/xfce4-fsguard-plugin.nix    { };
-  xfce4_genmon_plugin     = callPackage ./panel-plugins/xfce4-genmon-plugin.nix     { };
-
-  xfce4_netload_plugin    = callPackage ./panel-plugins/xfce4-netload-plugin.nix    { };
-  xfce4_notes_plugin      = callPackage ./panel-plugins/xfce4-notes-plugin.nix      { };
-  xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { };
-  xfce4_verve_plugin      = callPackage ./panel-plugins/xfce4-verve-plugin.nix      { };
-  xfce4_xkb_plugin        = callPackage ./panel-plugins/xfce4-xkb-plugin.nix        { };
-
-
+  xfce4_battery_plugin     = callPackage ./panel-plugins/xfce4-battery-plugin.nix     { };
+  xfce4_clipman_plugin     = callPackage ./panel-plugins/xfce4-clipman-plugin.nix     { };
+  xfce4_cpufreq_plugin     = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix     { };
+  xfce4_cpugraph_plugin    = callPackage ./panel-plugins/xfce4-cpugraph-plugin.nix    { };
+  xfce4_datetime_plugin    = callPackage ./panel-plugins/xfce4-datetime-plugin.nix    { };
+  xfce4_dict_plugin        = callPackage ./panel-plugins/xfce4-dict-plugin.nix        { };
+  xfce4_embed_plugin       = callPackage ./panel-plugins/xfce4-embed-plugin.nix       { };
+  xfce4_eyes_plugin        = callPackage ./panel-plugins/xfce4-eyes-plugin.nix        { };
+  xfce4_fsguard_plugin     = callPackage ./panel-plugins/xfce4-fsguard-plugin.nix     { };
+  xfce4_genmon_plugin      = callPackage ./panel-plugins/xfce4-genmon-plugin.nix      { };
+
+  xfce4_netload_plugin     = callPackage ./panel-plugins/xfce4-netload-plugin.nix     { };
+  xfce4_notes_plugin       = callPackage ./panel-plugins/xfce4-notes-plugin.nix       { };
+  xfce4_systemload_plugin  = callPackage ./panel-plugins/xfce4-systemload-plugin.nix  { };
+  xfce4_verve_plugin       = callPackage ./panel-plugins/xfce4-verve-plugin.nix       { };
+  xfce4_xkb_plugin         = callPackage ./panel-plugins/xfce4-xkb-plugin.nix         { };
+
+  xfce4_whiskermenu_plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin.nix { };
 
 
 }; # xfce_self
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
new file mode 100644
index 000000000000..420eb128a420
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, intltool, libxfce4util, libxfcegui4
+, xfce4panel, gtk, exo, garcon }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  p_name  = "xfce4-whiskermenu-plugin";
+  ver_maj = "1.5";
+  ver_min = "1";
+  rev = "18c31a357c102ab38e98ac24c154f9e6187b3ef8";
+
+  name = "${p_name}-${ver_maj}.${ver_min}";
+
+  src = fetchFromGitHub {
+    owner = "gottcode";
+    repo = "xfce4-whiskermenu-plugin";
+    inherit rev;
+    sha256 = "442e887877ffc347378c23ded2466ebbfc7aacb6b91fc395b12071320616eb76";
+  };
+
+  buildInputs = [ cmake pkgconfig intltool libxfce4util libxfcegui4 xfce4panel
+                  gtk exo garcon ];
+
+  meta = {
+    homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+    description = "Whisker Menu is an alternate application launcher for Xfce.";
+    platforms = platforms.linux;
+    maintainers = [ maintainers.pjbarnoy ];
+  };
+}