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

pkgs/tools/system/actkbd/default.nix

@@ -0,0 +1,34 @@
+{ fetchurl, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "actkbd-0.2.8";
+
+  src = fetchurl {
+    url = "http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/files/${name}.tar.bz2";
+    sha256 = "1ipb7k5q7k7p54is96ij2n74jfa6xc0llb9lpjwxhsqviqxn9slm";
+  };
+
+  preConfigure = ''
+    substituteInPlace Makefile \
+      --replace /usr/local $out \
+      --replace /etc $out/etc
+  '';
+
+  postInstall = ''
+    mkdir -p $out/share/doc/actkbd
+    cp -r README samples $out/share/doc/actkbd
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A keyboard shortcut daemon";
+    longDescription = ''
+      actkbd is a simple daemon that binds actions to keyboard events
+      directly on evdev interface (that is, no X11 required). It
+      recognises key combinations and can handle press, repeat and
+      release events.
+    '';
+    license = licenses.gpl2;
+    homepage = "http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/";
+    platforms = platforms.linux;
+  };
+}

pkgs/tools/system/augeas/default.nix

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig readline libxml2 ];
 
   meta = with stdenv.lib; {
-    description = "Configuration editing tool.";
+    description = "Configuration editing tool";
     license = licenses.lgpl2;
     homepage = http://augeas.net/;
     maintainers = with maintainers; [offline];

pkgs/tools/system/honcho/default.nix

@@ -20,7 +20,7 @@ let honcho = buildPythonPackage rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    description = "A Python clone of Foreman, a tool for managing Procfile-based applications.";
+    description = "A Python clone of Foreman, a tool for managing Procfile-based applications";
     license = licenses.mit;
     homepage = https://github.com/nickstenning/honcho;
     maintainers = with maintainers; [ benley ];

pkgs/tools/system/stress-ng/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, attr }:
 
-let version = "0.03.22"; in
+let version = "0.04.00"; in
 stdenv.mkDerivation rec {
   name = "stress-ng-${version}";
 
   src = fetchurl {
-    sha256 = "0byhaqw332894vg4rkc8mwxyzh6ggx4l7qnzzk1m3b2j52m908mn";
+    sha256 = "1rivmqa3qy9saxcz7mg211imcfyfwdhyhl2z6k1zc55vhnjdwhih";
     url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
   };