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

4 files changed, 108 insertions, 49 deletions

diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix
index 7efacafd6a1c2..5a79c0829b5a0 100644
--- a/pkgs/applications/window-managers/compton/default.nix
+++ b/pkgs/applications/window-managers/compton/default.nix
@@ -1,10 +1,8 @@
-{ stdenv, fetchurl, pkgconfig
-, dbus, libconfig, libdrm, libxml2, mesa, pcre
-, libXcomposite, libXfixes, libXdamage, libXinerama
-, libXrandr, libXrender, libXext }:
+{ stdenv, fetchurl, pkgconfig, dbus, libconfig, libdrm, libxml2, mesa, pcre,
+  libXcomposite, libXfixes, libXdamage, libXinerama, libXrandr, libXrender,
+  libXext, xwininfo }:
 
 stdenv.mkDerivation rec {
-
   name = "compton-0.1_beta2";
 
   src = fetchurl {
@@ -12,18 +10,36 @@ stdenv.mkDerivation rec {
     sha256 = "1mpgn1d98dv66xs2j8gaxjiw26nzwl9a641lrday7h40g3k45g9v";
   };
 
-  buildInputs = [ pkgconfig dbus libconfig libdrm libxml2 mesa pcre
-    libXcomposite libXfixes libXdamage libXinerama libXrandr libXrender libXext ];
+  buildInputs = [
+    pkgconfig
+    dbus
+    libconfig
+    libdrm
+    libxml2
+    mesa
+    pcre
+    libXcomposite
+    libXfixes
+    libXdamage
+    libXinerama
+    libXrandr
+    libXrender
+    libXext
+  ];
+  
+  propagatedBuildInputs = [ xwininfo ];
+  
   installFlags = "PREFIX=$(out)";
 
   meta = with stdenv.lib; {
     homepage = https://github.com/chjj/compton/;
     description = "A fork of XCompMgr, a sample compositing manager for X servers";
     longDescription = ''
-      A fork of XCompMgr, which is a  sample compositing manager for X servers
-      supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE extensions.  It enables
-      basic eye-candy effects. This fork adds additional features, such as additional
-      effects, and a fork at a well-defined and proper place.
+      A fork of XCompMgr, which is a sample compositing manager for X
+      servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE
+      extensions. It enables basic eye-candy effects. This fork adds
+      additional features, such as additional effects, and a fork at a
+      well-defined and proper place.
     '';
     license = licenses.mit;
     platforms = platforms.linux;
diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix
index f4907f881af89..afa7d123107b0 100644
--- a/pkgs/applications/window-managers/compton/git.nix
+++ b/pkgs/applications/window-managers/compton/git.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, asciidoc, dbus, docbook_xml_dtd_45,
   docbook_xml_xslt, libconfig, libdrm, libxml2, libxslt, mesa, pcre,
   pkgconfig, libXcomposite, libXdamage, libXext, libXfixes, libXinerama,
-  libXrandr, libXrender }:
+  libXrandr, libXrender, xwininfo }:
 
 stdenv.mkDerivation {
   name = "compton-git-2015-09-21";
@@ -37,6 +37,8 @@ stdenv.mkDerivation {
     pcre
   ];
 
+  propagatedBuildInputs = [ xwininfo ];
+
   installFlags = "PREFIX=$(out)";
 
   meta = with stdenv.lib; {
@@ -47,7 +49,7 @@ stdenv.mkDerivation {
     longDescription = ''
       A fork of XCompMgr, which is a sample compositing manager for X
       servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE
-      extensions.  It enables basic eye-candy effects. This fork adds
+      extensions. It enables basic eye-candy effects. This fork adds
       additional features, such as additional effects, and a fork at a
       well-defined and proper place.
     '';
diff --git a/pkgs/applications/window-managers/pekwm/default.nix b/pkgs/applications/window-managers/pekwm/default.nix
new file mode 100644
index 0000000000000..60753e4684086
--- /dev/null
+++ b/pkgs/applications/window-managers/pekwm/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, pkgconfig
+, libpng, libjpeg
+, libXext, libXft, libXpm, libXrandr, libXinerama }:
+
+stdenv.mkDerivation rec {
+
+  name = "pekwm-${version}";
+  version = "0.1.17";
+
+  src = fetchurl {
+    url = "https://www.pekwm.org/projects/pekwm/files/${name}.tar.bz2";
+    sha256 = "003x6bxj1lb2ljxz3v414bn0rdl6z68c0r185fxwgs1qkyzx67wa";
+  };
+
+  buildInputs = [ pkgconfig libpng libjpeg
+  libXext libXft libXpm libXrandr libXinerama ];
+
+  meta = with stdenv.lib; {
+    description = "A lightweight window manager";
+    longDescription = ''
+      pekwm is a window manager that once upon a time was based on the
+      aewm++ window manager, but it has evolved enough that it no
+      longer resembles aewm++ at all. It has a much expanded
+      feature-set, including window grouping (similar to ion, pwm, or
+      fluxbox), autoproperties, xinerama, keygrabber that supports
+      keychains, and much more.      
+      - Lightweight and Unobtrusive, a window manager shouldn't be
+        noticed.
+      - Very configurable, we all work and think in different ways.
+      - Automatic properties, for all the lazy people, make things
+        appear as they should when starting applications.
+      - Chainable Keygrabber, usability for everyone.
+    '';
+      homepage = https://www.pekwm.org;
+      license = licenses.gpl2;
+      maintainers = [ maintainers.AndersonTorres ];
+      platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index 81fbedc4917bf..62b0b9c11eab8 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -3,39 +3,41 @@
 , wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs
 }:
 
-stdenv.mkDerivation rec {
-  name = "sway-${version}";
-  version = "0.7";
-
-  src = fetchFromGitHub {
-    owner = "Sircmpwn";
-    repo = "sway";
-    rev = "0.7";
-    sha256 = "05mn68brqz7j3a1sb5xd3pxzzdd8swnhw2g7cc9f7rdjr5dlrjip";
-  };
-
-  nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ];
-
-  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;
-  '';
-
-  makeFlags = "PREFIX=$(out)";
-  installPhase = "PREFIX=$out make install";
-
-  LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ wlc dbus_libs ];
-  preFixup = ''
-    wrapProgram $out/bin/sway \
-      --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}";
-  '';
-
-  meta = with stdenv.lib; {
-    description = "i3-compatible window manager for Wayland";
-    homepage    = "http://swaywm.org";
-    license     = licenses.mit;
-    platforms   = platforms.linux;
-    maintainers = with maintainers; [ ];
-  };
-}
+let
+  version = "0.8";
+in
+  stdenv.mkDerivation rec {
+    name = "sway-${version}";
+
+    src = fetchFromGitHub {
+      owner = "Sircmpwn";
+      repo = "sway";
+      rev = "${version}";
+      sha256 = "10i62cn1z7fwg0jwkskmzcaha39lprkl4zvkp59jr5wvpjligdq3";
+    };
+
+    nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ];
+
+    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;
+    '';
+
+    makeFlags = "PREFIX=$(out)";
+    installPhase = "PREFIX=$out make install";
+
+    LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ wlc dbus_libs ];
+    preFixup = ''
+      wrapProgram $out/bin/sway \
+        --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}";
+    '';
+
+    meta = with stdenv.lib; {
+      description = "i3-compatible window manager for Wayland";
+      homepage    = "http://swaywm.org";
+      license     = licenses.mit;
+      platforms   = platforms.linux;
+      maintainers = with maintainers; [ ];
+    };
+  }