Merge remote-tracking branch 'origin/master' into x-updates

Conflicts:
	pkgs/misc/maven/maven-1.0.nix
	pkgs/os-specific/linux/xf86-input-wacom/default.nix

5 files changed, 6 insertions, 54 deletions

diff --git a/pkgs/applications/window-managers/awesome/cmake284.patch b/pkgs/applications/window-managers/awesome/cmake284.patch
deleted file mode 100644
index 4af70227805f..000000000000
--- a/pkgs/applications/window-managers/awesome/cmake284.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 1aedd853fcaeeafadd24512f84e6e269f5db0b4e Mon Sep 17 00:00:00 2001
-From: Thomas Moschny <thomas.moschny@gmx.de>
-Date: Mon, 21 Feb 2011 17:58:04 +0100
-Subject: [PATCH] Normalize icon path names (fixes #869).
-
-The elements in ${icon_sources}, as returned by file(GLOB ...) contain
-double slashes, could be a bug in cmake. This causes building with
-cmake 2.8.4 to fail, due to dependency problems lateron.
-
-This patch works around the issue by normalizing all path names in
-${icon_sources} while appending them to ${ALL_ICONS}, thereby removing
-the double slashes.
----
- CMakeLists.txt |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 64be9b9..472bec2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -244,14 +244,15 @@ endif()
- 
- # {{{ Theme icons
- file(GLOB icon_sources RELATIVE ${SOURCE_DIR} ${SOURCE_DIR}/themes/*/titlebar/*.png)
--set(ALL_ICONS ${icon_sources})
- 
- foreach(icon ${icon_sources})
-     # Copy all icons to the build dir to simplify the following code.
-     # Source paths are interpreted relative to ${SOURCE_DIR}, target paths
-     # relative to ${BUILD_DIR}.
-     get_filename_component(icon_path ${icon} PATH)
-+    get_filename_component(icon_name ${icon} NAME)
-     file(COPY ${icon} DESTINATION ${icon_path})
-+    set(ALL_ICONS ${ALL_ICONS} "${icon_path}/${icon_name}")
- endforeach()
- 
- macro(a_icon_convert match replacement input)
--- 
-1.7.3.4
-
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 960b0bfe31be..61f2145ff33c 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -39,16 +39,6 @@ stdenv.mkDerivation rec {
       --replace "set(AWE_MAN_LANGS it es fr de ru)" \
                 "set(AWE_MAN_LANGS it es fr de)"
   '';
-
-  # XXX: maybe not needed anymore
-  # Somehow libev does not get into the rpath, although it should.
-  # Something may be wrong in the gcc wrapper.
-  preBuild = ''
-    export NIX_LDFLAGS_BEFORE="-lev";
-  '';
-
-  # Cmake fails strangely at finding lua. Looks to me like a cmake 2.8 error.
-  cmakeFlags = [ "-DLUA_LIBRARIES=${lua}/lib/liblua.a" ];
  
   meta = {
     homepage = http://awesome.naquadah.org/;
diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix
index ce66f7d9bcc0..b8ecf81f7fc7 100644
--- a/pkgs/applications/window-managers/trayer/default.nix
+++ b/pkgs/applications/window-managers/trayer/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, gdk_pixbuf, gtk, libXmu }:
 
 stdenv.mkDerivation rec {
-  name = "trayer-1.1.3";
+  name = "trayer-1.1.5";
 
   buildInputs = [ pkgconfig gdk_pixbuf gtk libXmu ];
 
   src = fetchurl {
           url = "https://github.com/sargon/trayer-srg/tarball/${name}";
           name = "${name}.tar.gz";
-          sha256 = "03be5ea47278ecdb6ffb1d3b5115a855a6eccd6aa6702b84e89ee047ddd76558";
+          sha256 = "98804500188c0bb99c7389ebea4b2e4dfffa2f3d06dc97e633b4934cf7c29757";
         };
 
   makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/applications/window-managers/xmonad/default.nix b/pkgs/applications/window-managers/xmonad/default.nix
index a490bc8018dd..fd215986fa30 100644
--- a/pkgs/applications/window-managers/xmonad/default.nix
+++ b/pkgs/applications/window-managers/xmonad/default.nix
@@ -14,7 +14,6 @@ cabal.mkDerivation (self: {
     platforms = self.ghc.meta.platforms;
     maintainers = [
       self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
     ];
   };
 
diff --git a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
index 42ffeae6f9c2..eefc865b537c 100644
--- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
@@ -10,7 +10,10 @@ cabal.mkDerivation (self: {
     hint libmpd mtl network parsec random regexPosix split X11 xmonad
     xmonadContrib
   ];
-  configureFlags = "-f-with_hlist";
+  patchPhase = ''
+    sed -i xmonad-extras.cabal -e 's|split .*|split|'
+  '';
+  configureFlags = "-f-with_hlist -fwith_split -fwith_parsec";
   meta = {
     homepage = "http://projects.haskell.org/xmonad-extras";
     description = "Third party extensions for xmonad with wacky dependencies";