summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorromildo <malaquias@gmail.com>2017-07-29 10:32:42 -0300
committerromildo <malaquias@gmail.com>2017-07-29 10:32:42 -0300
commit47689bf70627c1f6ca74d79ee6a176f8aabece97 (patch)
treeee6dfc4d75835f981c1cb8a62d9996f642dba56d /pkgs/applications
parentdbefaeaab2b25f9ec40be9cb3e4eb505ec1c3847 (diff)
downloadnixlib-47689bf70627c1f6ca74d79ee6a176f8aabece97.tar
nixlib-47689bf70627c1f6ca74d79ee6a176f8aabece97.tar.gz
nixlib-47689bf70627c1f6ca74d79ee6a176f8aabece97.tar.bz2
nixlib-47689bf70627c1f6ca74d79ee6a176f8aabece97.tar.lz
nixlib-47689bf70627c1f6ca74d79ee6a176f8aabece97.tar.xz
nixlib-47689bf70627c1f6ca74d79ee6a176f8aabece97.tar.zst
nixlib-47689bf70627c1f6ca74d79ee6a176f8aabece97.zip
awesome: 4.1 -> 4.2
- update to version 4.2
- remove 1639.patch, which has been integrated in release
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/window-managers/awesome/default.nix13
1 files changed, 3 insertions, 10 deletions
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 6f56ff98998f..a441de5ed19f 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk_pixbuf
+{ stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk_pixbuf
 , xorg, libstartup_notification, libxdg_basedir, libpthreadstubs
 , xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter
 , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm
@@ -9,13 +9,13 @@
 
 with luaPackages; stdenv.mkDerivation rec {
   name = "awesome-${version}";
-  version = "4.1";
+  version = "4.2";
   
   src = fetchFromGitHub {
     owner = "awesomewm";
     repo = "awesome";
     rev = "v${version}";
-    sha256 = "1qik8h5nwjq4535lpdpal85vas1k7am3s6l5r763kpdzxhfcyyaj";
+    sha256 = "1pcgagcvm6rdky8p8dd810j3ywaz0ncyk5xgaykslaixzrq60kff";
   };
 
   nativeBuildInputs = [
@@ -38,13 +38,6 @@ with luaPackages; stdenv.mkDerivation rec {
                   xorg.xcbutilrenderutil xorg.xcbutilwm libxkbcommon
                   xcbutilxrm ];
 
-  patches = [
-    (fetchurl {
-      url = "https://patch-diff.githubusercontent.com/raw/awesomeWM/awesome/pull/1639.patch";
-      sha256 = "00piynmbxajd2xbg960gmf0zlqn7m489f4ww482y49ravfy1jhsj";
-    })
-  ];
-
   #cmakeFlags = "-DGENERATE_MANPAGES=ON";
 
   LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ cairo pango gobjectIntrospection ]}";