Merge remote-tracking branch 'upstream/master' into hardened-stdenv

8 files changed, 58 insertions, 22 deletions

diff --git a/pkgs/applications/window-managers/clfswm/default.nix b/pkgs/applications/window-managers/clfswm/default.nix
index 5761d94526d1..97e399a133ef 100644
--- a/pkgs/applications/window-managers/clfswm/default.nix
+++ b/pkgs/applications/window-managers/clfswm/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = "https://gitlab.common-lisp.net/clfswm/clfswm.git";
     rev = "refs/heads/master";
-    sha256 = "1hkm6bn5xww932w34l13bg87m5hsnwnd0i1lka6sw0cq8whndya0";
+    sha256 = "0hynzh3a1zr719cxfb0k4cvh5lskzs616hwn7p942isyvhwzhynd";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix
index b1b63df574a0..861313431b07 100644
--- a/pkgs/applications/window-managers/icewm/default.nix
+++ b/pkgs/applications/window-managers/icewm/default.nix
@@ -8,7 +8,7 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "icewm-${version}";
-  version = "1.3.10";
+  version = "1.3.12";
 
   buildInputs =
   [ cmake gettext libjpeg libtiff libungif libpng imlib expat
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/bbidulock/icewm/archive/${version}.tar.gz";
-    sha256 = "01i7a21gf810spmzjx32dxsmx4527qivs744rhvhaw4gr00amrns";
+    sha256 = "0cmjnf0yvafwg73qy5wq7ghiknpn1jf1978c1yj7yabyn07zxq77";
   };
 
   preConfigure = ''
diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index 540e5d1c1e6f..2da76eabe937 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool, which, xorg,
-  libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp, libXmu,
-  libpng, libjpeg, expat, xproto, xextproto, xineramaproto, librsvg, gettext,
+{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool, gettext, which,
+  xorg, libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp,
+  libXmu, libpng, libjpeg, expat, xproto, xextproto, xineramaproto, librsvg,
   freetype, fontconfig }:
 
 stdenv.mkDerivation rec {
   name = "jwm-${version}";
-  version = "1495";
+  version = "1532";
   
   src = fetchurl {
      url = "https://github.com/joewing/jwm/archive/s${version}.tar.gz";
-     sha256 = "0sn9la3k36k1d9qyxab1sbv2mqicq2w7q4wgy4bj8d48zc8xjy6v";
+     sha256 = "02g3n72rmyy5l9hn6jdb7kzhsn1c0padazxfn0sv6s95w6r8hcvr";
   };
 
-  nativeBuildInputs = [ pkgconfig automake autoconf libtool which gettext ];
+  nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ];
 
   buildInputs = [ libX11 libXext libXinerama libXpm libXft xorg.libXrender
     libXau libXdmcp libXmu libpng libjpeg expat xproto xextproto xineramaproto
@@ -24,9 +24,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://joewing.net/projects/jwm/";
-    description = "A window manager for X11 that requires only Xlib";
+    description = "Joe's Window Manager is a light-weight X11 window manager";
     license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.romildo ];
     platforms   = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.romildo ];
   };
 }
diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/pkgs/applications/window-managers/kbdd/default.nix
index 595f989ff4e8..9bbb8f161328 100644
--- a/pkgs/applications/window-managers/kbdd/default.nix
+++ b/pkgs/applications/window-managers/kbdd/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = https://github.com/qnikst/kbdd;
     rev = "47dee0232f157cd865e43d92005a2ba107f6fd75";
-    sha256 = "1b9a66d216326a9759cad26393fbf8259fe7a0c2dd1075047fc989f0e52d969f";
+    sha256 = "1ys9w1lncsfg266g9sfnm95an2add3g51mryg0hnrzcqa4knz809";
   };
 
   buildInputs = [ pkgconfig xorg.libX11 dbus_glib autoreconfHook ];
diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix
index d19a537cadcb..bfbeb9739f1c 100644
--- a/pkgs/applications/window-managers/stumpwm/default.nix
+++ b/pkgs/applications/window-managers/stumpwm/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = "https://github.com/stumpwm/stumpwm";
     rev = "refs/tags/${version}";
-    sha256 = "05fkng2wlmhy3kb9zhrrv9zpa16g2p91p5y0wvmwkppy04cw04ps";
+    sha256 = "0hmvbdk2yr5wrkiwn9dfzf65s4xc2qifj0sn6w2mghzp96cph79k";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index 7f494f3e0f22..81fbedc4917b 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -1,23 +1,22 @@
-{ stdenv, fetchFromGitHub
-, makeWrapper, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl
+{ stdenv, fetchFromGitHub, pango, libinput
+, makeWrapper, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl, cairo
 , wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs
 }:
 
 stdenv.mkDerivation rec {
   name = "sway-${version}";
-  version = "git-2016-02-08";
+  version = "0.7";
 
   src = fetchFromGitHub {
     owner = "Sircmpwn";
     repo = "sway";
-
-    rev = "16e904634c65128610537bed7fcb16ac3bb45165";
-    sha256 = "04qvdjaarglq3qsjbb9crjkad3y1v7s51bk82sl8w26c71jbhklg";
+    rev = "0.7";
+    sha256 = "05mn68brqz7j3a1sb5xd3pxzzdd8swnhw2g7cc9f7rdjr5dlrjip";
   };
 
   nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ];
 
-  buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs ];
+  buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput ];
 
   patchPhase = ''
     sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt;
diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index 8c7227847476..d08907b59aa4 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   name = "weston-${version}";
-  version = "1.10.0";
+  version = "1.11.0";
 
   src = fetchurl {
     url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "1hd5593zz5s3s07vb6linp6akbs62wy2ijh3g7gksafq016h1cp0";
+    sha256 = "09biddxw3ar797kxf9mywjkb2iwky6my39gpp51ni846y7lqdq05";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/window-managers/yabar/default.nix b/pkgs/applications/window-managers/yabar/default.nix
new file mode 100644
index 000000000000..2f4a7f0e06c5
--- /dev/null
+++ b/pkgs/applications/window-managers/yabar/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, cairo, gdk_pixbuf, libconfig, pango, pkgconfig, xcbutilwm }:
+
+stdenv.mkDerivation rec {
+  name    = "yabar-${version}";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner  = "geommer";
+    repo   = "yabar";
+    rev    = "746387f0112f9b7aa2e2e27b3d69cb2892d8c63b";
+    sha256 = "1nw9dar1caqln5fr0dqk7dg6naazbpfwwzxwlkxz42shsc3w30a6";
+  };
+
+  buildInputs = [ cairo gdk_pixbuf libconfig pango pkgconfig xcbutilwm ];
+
+  postPatch = ''
+    substituteInPlace ./Makefile --replace "\$(shell git describe)" "${version}"
+  '';
+
+  buildPhase = ''
+    make DESTDIR=$out PREFIX=/
+  '';
+
+  installPhase = ''
+    make DESTDIR=$out PREFIX=/ install
+    mkdir -p $out/share/yabar/examples
+    cp -v examples/*.config $out/share/yabar/examples
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A modern and lightweight status bar for X window managers";
+    homepage    = "https://github.com/geommer/yabar";
+    maintainers = [ maintainers.hiberno ];
+    license     = licenses.mit;
+    platforms   = platforms.linux;
+  };
+}