herbstluftwm: 0.8.3 → 0.9.1

Also enables the packages' tests.
The tests need a few patches to fix runtime generated script's shebangs.
There is also a fix to pass PATH environment variable to subprocess'
calls so that they can find some binaries (like xterm).
This commit is contained in:
Thibaut Marty 2020-11-20 16:40:08 +00:00
parent 5ce3719c43
commit b1eb0af283
2 changed files with 58 additions and 11 deletions

View file

@ -1,35 +1,37 @@
{ lib, stdenv, fetchurl, cmake, pkgconfig, glib, libX11, libXext, libXinerama, libXrandr
, withDoc ? stdenv.buildPlatform == stdenv.targetPlatform, asciidoc ? null }:
{ lib, stdenv, fetchurl, cmake, pkgconfig, python3, libX11, libXext, libXinerama, libXrandr, asciidoc
, xdotool, xorgserver, xsetroot, xterm, runtimeShell }:
# Doc generation is disabled by default when cross compiling because asciidoc
# does not cross compile for now
# dependency is broken when cross compiling for now
assert withDoc -> asciidoc != null;
let
cross = stdenv.buildPlatform != stdenv.targetPlatform;
stdenv.mkDerivation rec {
in stdenv.mkDerivation rec {
pname = "herbstluftwm";
version = "0.8.3";
version = "0.9.1";
src = fetchurl {
url = "https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz";
sha256 = "1qmb4pjf2f6g0dvcg11cw9njwmxblhqzd70ai8qnlgqw1iz3nkm1";
sha256 = "0r4qaklv97qcq8p0pnz4f2zqg69vfai6c2qi1ydi2kz24xqjf5hy";
};
outputs = [
"out"
] ++ lib.optionals withDoc [
"doc"
"doc" # share/doc exists with examples even without generated html documentation
] ++ lib.optionals (!cross) [
"man"
];
cmakeFlags = [
"-DCMAKE_INSTALL_SYSCONF_PREFIX=${placeholder "out"}/etc"
] ++ lib.optional (!withDoc) "-DWITH_DOCUMENTATION=OFF";
] ++ lib.optional cross "-DWITH_DOCUMENTATION=OFF";
nativeBuildInputs = [
cmake
pkgconfig
] ++ lib.optional withDoc asciidoc;
python3
] ++ lib.optional (!cross) asciidoc;
buildInputs = [
libX11
@ -38,6 +40,41 @@ stdenv.mkDerivation rec {
libXrandr
];
patches = [
./test-path-environment.patch
];
postPatch = ''
patchShebangs doc/gendoc.py
# fix /etc/xdg/herbstluftwm paths in documentation and scripts
grep -rlZ /etc/xdg/herbstluftwm share/ doc/ scripts/ | while IFS="" read -r -d "" path; do
substituteInPlace "$path" --replace /etc/xdg/herbstluftwm $out/etc/xdg/herbstluftwm
done
# fix shebang in generated scripts
substituteInPlace tests/conftest.py --replace "/usr/bin/env bash" ${runtimeShell}
substituteInPlace tests/test_herbstluftwm.py --replace "/usr/bin/env bash" ${runtimeShell}
'';
doCheck = true;
checkInputs = [
(python3.withPackages (ps: with ps; [ ewmh pytest xlib ]))
xdotool
xorgserver
xsetroot
xterm
python3.pkgs.pytestCheckHook
];
# make the package's module avalaible
preCheck = ''
export PYTHONPATH="$PYTHONPATH:../python"
'';
pytestFlagsArray = [ "../tests" ];
meta = with lib; {
description = "A manual tiling window manager for X";
homepage = "https://herbstluftwm.org/";

View file

@ -0,0 +1,10 @@
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -43,6 +43,7 @@
self.next_client_id = 0
self.env = {
'DISPLAY': display,
+ 'PATH': os.environ['PATH']
}
self.env = extend_env_with_whitelist(self.env)
self.hlwm_process = hlwm_process