Merge branch 'master' into stdenv-updates

Conflicts:
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/top-level/all-packages.nix

Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.

1 files changed, 19 insertions, 0 deletions

diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix
new file mode 100644
index 000000000000..9d7b6fa7a281
--- /dev/null
+++ b/pkgs/applications/misc/evtest/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchgit, autoconf, automake, pkgconfig, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "evtest-1.30";
+
+  preConfigure = "autoreconf -iv";
+
+  buildInputs = [ autoconf automake pkgconfig libxml2 ];
+
+  src = fetchgit {
+    url = "git://anongit.freedesktop.org/evtest";
+    rev = "1a50f2479c4775e047f234a24d95dda82441bfbd";
+  };
+
+  meta = {
+    description = "Simple tool for input event debugging";
+    license = "GPLv2";
+  };
+}