From 0f7c125ca4b208589e620b4a255188cd666a1036 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 5 Mar 2015 23:56:32 +0100 Subject: [PATCH 1/2] awesome: 3.5.5 -> 3.5.6 --- pkgs/applications/window-managers/awesome/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 20cd15abf1c..b51de4a02a9 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -6,15 +6,15 @@ , docbook_xsl }: let - version = "3.5.5"; + version = "3.5.6"; in with luaPackages; stdenv.mkDerivation rec { name = "awesome-${version}"; - + src = fetchurl { url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz"; - sha256 = "0iwd4pjvq0akm9dbipbl4m4fm24m017l06arasr445v2qkbxnc5z"; + sha256 = "1ms6a3l1i2jdhzrd1zr25cqckznmb44qgz4n635jam42hzhrvx1p"; }; meta = with stdenv.lib; { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ lovek323 ]; platforms = platforms.linux; }; - + buildInputs = [ asciidoc cairo From 421e79b8d1388b812a1e6ba300d0bff5a5376544 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 6 Mar 2015 00:04:46 +0100 Subject: [PATCH 2/2] awesome: do not depend on rxvt_unicode, but xterm xterm is being used as terminal in the default configuration. --- pkgs/applications/window-managers/awesome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index b51de4a02a9..3b655b55c9c 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf , xlibs, libstartup_notification, libxdg_basedir, libpthreadstubs , xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter -, compton, procps, iproute, coreutils, curl, alsaUtils, findutils, rxvt_unicode +, compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm , which, dbus, nettools, git, asciidoc, doxygen, xmlto, docbook_xml_dtd_45 , docbook_xsl }: @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { --prefix LUA_PATH ";" '"${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"' \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix LD_LIBRARY_PATH : "${cairo}/lib:${pango}/lib:${gobjectIntrospection}/lib" \ - --prefix PATH : "${compton}/bin:${unclutter}/bin:${procps}/bin:${iproute}/sbin:${coreutils}/bin:${curl}/bin:${alsaUtils}/bin:${findutils}/bin:${rxvt_unicode}/bin" + --prefix PATH : "${compton}/bin:${unclutter}/bin:${procps}/bin:${iproute}/sbin:${coreutils}/bin:${curl}/bin:${alsaUtils}/bin:${findutils}/bin:${xterm}/bin" wrapProgram $out/bin/awesome-client \ --prefix PATH : "${which}/bin"