Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bc8b634072f7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a5e8ef5a744e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 29, 2017

  1. awesome: 4.1 -> 4.2 

    - update to version 4.2
- remove 1639.patch, which has been integrated in release
    @romildo
    romildo committed Jul 29, 2017
    Copy the full SHA
    47689bf View commit details

  2. Merge pull request #27739 from romildo/upd.awesome 

    awesome: 4.1 -> 4.2
    @Mic92
    Mic92 authored Jul 29, 2017
    Copy the full SHA
    a5e8ef5 View commit details
Showing with 3 additions and 10 deletions.
  1. +3 −10 pkgs/applications/window-managers/awesome/default.nix
13 changes: 3 additions & 10 deletions pkgs/applications/window-managers/awesome/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ]}";