Merge remote-tracking branch 'upstream/master' into staging

Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix

pkgs/misc/drivers/epson-escpr/default.nix

@@ -1,15 +1,15 @@
 { stdenv, fetchurl, cups }:
 
 let
-  version = "1.6.4";
+  version = "1.6.5";
 in
   stdenv.mkDerivation {
 
     name = "epson-escpr-${version}";
   
     src = fetchurl {
-      url = "https://download3.ebz.epson.net/dsc/f/03/00/04/37/97/88177bc0dc7025905eae4a0da1e841408f82e33c/epson-inkjet-printer-escpr-1.6.4-1lsb3.2.tar.gz"; 
-      sha256 = "76c66461a30be82b9cc37d663147a72f488fe060ef54578120602bb87a3f7754"; 
+      url = "https://download3.ebz.epson.net/dsc/f/03/00/04/54/27/b73564748bfde7b7ce625e20d4a3257d447bec79/epson-inkjet-printer-escpr-1.6.5-1lsb3.2.tar.gz"; 
+      sha256 = "1cd9e0506bf181e1476bd8305f1c6b8dbc4354eab9415d0d5529850856129e4c"; 
     }; 
 
     patches = [ ./cups-filter-ppd-dirs.patch ]; 
@@ -17,7 +17,7 @@ in
     buildInputs = [ cups ];
 
     meta = with stdenv.lib; {
-      homepage = https://github.com/artuuge/NixOS-files/;
+      homepage = "http://download.ebz.epson.net/dsc/search/01/search/";
       description = "ESC/P-R Driver (generic driver)";
       longDescription = ''
         Epson Inkjet Printer Driver (ESC/P-R) for Linux and the

pkgs/misc/drivers/hplip/default.nix

@@ -10,16 +10,16 @@
 let
 
   name = "hplip-${version}";
-  version = "3.15.11";
+  version = "3.16.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/hplip/${name}.tar.gz";
-    sha256 = "0vbw815a3wffp6l5m7j6f78xwp9pl1vn43ppyf0lp8q4vqdp3i1k";
+    sha256 = "1501qdnkjp1ybgagy5188fmf6cgmj5555ygjl3543nlbwcp31lj2";
   };
 
   plugin = fetchurl {
     url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
-    sha256 = "00ii36y3914jd8zz4h6rn3xrf1w8szh1z8fngbl2qvs3qr9cm1m9";
+    sha256 = "03q730w0kbh8i55i95vfb59yc0kjxz01hjpb3l05w2jw3hmfzvdp";
   };
 
   hplipState =

pkgs/misc/ghostscript/default.nix

@@ -126,6 +126,8 @@ stdenv.mkDerivation rec {
     install_name_tool -change libgs.dylib.${version} $out/lib/libgs.dylib.${version} $out/bin/gs
   '';
 
+  passthru = { inherit version; };
+
   meta = {
     homepage = "http://www.ghostscript.com/";
     description = "PostScript interpreter (mainline version)";

pkgs/misc/themes/greybird/default.nix

@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+  pname = "Greybird";
+  version = "2016-03-11";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    repo = "${pname}";
+    owner = "shimmerproject";
+    rev = "77f3cbd94b0c87f502aaeeaa7fd6347283c876cf";
+    sha256 = "1gqq9j61izdw8arly8kzr629wa904rn6mq48cvlaksknimw0hf2h";
+  };
+
+  buildInputs = [ gtk-engine-murrine ];
+  
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/share/themes/${pname}{," Bright"," Compact"," a11y"}
+    cp -a * $out/share/themes/${pname}/
+    mv $out/share/themes/${pname}/xfce-notify-4.0_bright $out/share/themes/${pname}" Bright"/xfce-notify-4.0
+    mv $out/share/themes/${pname}/xfwm4-compact $out/share/themes/${pname}" Compact"/xfwm4
+    mv $out/share/themes/${pname}/xfwm4-a11y $out/share/themes/${pname}" a11y"/xfwm4
+  '';
+
+  meta = {
+    description = "Grey and blue theme (Gtk, Xfce, Emerald, Metacity, Mutter, Unity)";
+    homepage = http://shimmerproject.org/our-projects/greybird/;
+    license = with stdenv.lib.licenses; [ gpl2Plus cc-by-nc-sa-30 ];
+    maintainers = [ stdenv.lib.maintainers.romildo ];
+  };
+}

pkgs/misc/vim-plugins/default.nix

@@ -1,6 +1,6 @@
 # TODO check that no license information gets lost
 { fetchurl, bash, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip
-, which, fetchgit, fetchFromGitHub, fetchhg, fetchzip, llvmPackages, zip
+, which, fetchgit, fetchFromGitHub, fetchhg, fetchzip, llvmPackages_38, zip
 , vim_configurable, vimPlugins, xkb_switch, git
 , Cocoa ? null
 }:
@@ -453,12 +453,12 @@ rec {
 
   };
 
-  vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2016-04-15";
+  vim-go = buildVimPluginFrom2Nix {
+    name = "vim-go-2016-05-01";
     src = fetchgit {
       url = "git://github.com/fatih/vim-go";
-      rev = "b3fddb60fdab980d1fc339fbcbc879abd6cbf524";
-      sha256 = "1ggjisbc187kyzdizqffkicjdkz67mhgpxmqjcvzaq2wc2w44aja";
+      rev = "91ffc410832d0b027f2258c7a91dbbfa378bf71a";
+      sha256 = "00793ick6vralihvmmx8np7japxrd3jkbn5ggqzq0ymgr508gxj4";
     };
     dependencies = [];
 
@@ -938,17 +938,17 @@ rec {
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2016-04-10";
+    name = "youcompleteme-2016-04-28";
     src = fetchgit {
       url = "git://github.com/valloric/youcompleteme";
-      rev = "f67033c990ff5d37ef91ba02da94f6d7409e1c5a";
-      sha256 = "0hwpbj5hr9d26xdcjfxbssyrsl4926c8g999jzpah0sls1r3y2f0";
+      rev = "cb5756943fdd3ba062f101a5aba34acdd34d1356";
+      sha256 = "1fg85mf4x48g6jpn9idjp0k2nz1i34lrx1bxbvp0189ph1xfq7jj";
     };
     dependencies = [];
     buildInputs = [
       python go cmake
-      (if stdenv.isDarwin then llvmPackages.clang else llvmPackages.clang-unwrapped)
-      llvmPackages.llvm
+      (if stdenv.isDarwin then llvmPackages_38.clang else llvmPackages_38.clang-unwrapped)
+      llvmPackages_38.llvm
     ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
 
     buildPhase = ''