Merge pull request #104920 from ThibautMarty/herbstluftwm-0.9.0
This commit is contained in:
commit
710a84461b
@ -9083,6 +9083,12 @@
|
|||||||
githubId = 844343;
|
githubId = 844343;
|
||||||
name = "Thiago K. Okada";
|
name = "Thiago K. Okada";
|
||||||
};
|
};
|
||||||
|
thibautmarty = {
|
||||||
|
email = "github@thibautmarty.fr";
|
||||||
|
github = "ThibautMarty";
|
||||||
|
githubId = 3268082;
|
||||||
|
name = "Thibaut Marty";
|
||||||
|
};
|
||||||
thmzlt = {
|
thmzlt = {
|
||||||
email = "git@thomazleite.com";
|
email = "git@thomazleite.com";
|
||||||
github = "thmzlt";
|
github = "thmzlt";
|
||||||
|
@ -147,6 +147,7 @@ in
|
|||||||
haproxy = handleTest ./haproxy.nix {};
|
haproxy = handleTest ./haproxy.nix {};
|
||||||
hardened = handleTest ./hardened.nix {};
|
hardened = handleTest ./hardened.nix {};
|
||||||
hedgedoc = handleTest ./hedgedoc.nix {};
|
hedgedoc = handleTest ./hedgedoc.nix {};
|
||||||
|
herbstluftwm = handleTest ./herbstluftwm.nix {};
|
||||||
installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests {});
|
installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests {});
|
||||||
oci-containers = handleTestOn ["x86_64-linux"] ./oci-containers.nix {};
|
oci-containers = handleTestOn ["x86_64-linux"] ./oci-containers.nix {};
|
||||||
# 9pnet_virtio used to mount /nix partition doesn't support
|
# 9pnet_virtio used to mount /nix partition doesn't support
|
||||||
|
38
nixos/tests/herbstluftwm.nix
Normal file
38
nixos/tests/herbstluftwm.nix
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
import ./make-test-python.nix ({ lib, ...} : {
|
||||||
|
name = "herbstluftwm";
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
maintainers = with lib.maintainers; [ thibautmarty ];
|
||||||
|
timeout = 30;
|
||||||
|
};
|
||||||
|
|
||||||
|
machine = { pkgs, lib, ... }: {
|
||||||
|
imports = [ ./common/x11.nix ./common/user-account.nix ];
|
||||||
|
test-support.displayManager.auto.user = "alice";
|
||||||
|
services.xserver.displayManager.defaultSession = lib.mkForce "none+herbstluftwm";
|
||||||
|
services.xserver.windowManager.herbstluftwm.enable = true;
|
||||||
|
environment.systemPackages = [ pkgs.dzen2 ]; # needed for upstream provided panel
|
||||||
|
};
|
||||||
|
|
||||||
|
testScript = ''
|
||||||
|
with subtest("ensure x starts"):
|
||||||
|
machine.wait_for_x()
|
||||||
|
machine.wait_for_file("/home/alice/.Xauthority")
|
||||||
|
machine.succeed("xauth merge ~alice/.Xauthority")
|
||||||
|
|
||||||
|
with subtest("ensure client is available"):
|
||||||
|
machine.succeed("herbstclient --version")
|
||||||
|
|
||||||
|
with subtest("ensure keybindings are set"):
|
||||||
|
machine.wait_until_succeeds("herbstclient list_keybinds | grep xterm")
|
||||||
|
|
||||||
|
with subtest("ensure panel starts"):
|
||||||
|
machine.wait_for_window("dzen title")
|
||||||
|
|
||||||
|
with subtest("ensure we can open a new terminal"):
|
||||||
|
machine.send_key("alt-ret")
|
||||||
|
machine.wait_for_window(r"alice.*?machine")
|
||||||
|
machine.sleep(2)
|
||||||
|
machine.screenshot("terminal")
|
||||||
|
'';
|
||||||
|
})
|
@ -1,35 +1,38 @@
|
|||||||
{ lib, stdenv, fetchurl, cmake, pkgconfig, glib, libX11, libXext, libXinerama, libXrandr
|
{ lib, stdenv, fetchurl, cmake, pkgconfig, python3, libX11, libXext, libXinerama, libXrandr, asciidoc
|
||||||
, withDoc ? stdenv.buildPlatform == stdenv.targetPlatform, asciidoc ? null }:
|
, xdotool, xorgserver, xsetroot, xterm, runtimeShell
|
||||||
|
, nixosTests }:
|
||||||
|
|
||||||
# Doc generation is disabled by default when cross compiling because asciidoc
|
# 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";
|
pname = "herbstluftwm";
|
||||||
version = "0.8.3";
|
version = "0.9.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz";
|
url = "https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz";
|
||||||
sha256 = "1qmb4pjf2f6g0dvcg11cw9njwmxblhqzd70ai8qnlgqw1iz3nkm1";
|
sha256 = "0r4qaklv97qcq8p0pnz4f2zqg69vfai6c2qi1ydi2kz24xqjf5hy";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
"out"
|
"out"
|
||||||
] ++ lib.optionals withDoc [
|
"doc" # share/doc exists with examples even without generated html documentation
|
||||||
"doc"
|
] ++ lib.optionals (!cross) [
|
||||||
"man"
|
"man"
|
||||||
];
|
];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DCMAKE_INSTALL_SYSCONF_PREFIX=${placeholder "out"}/etc"
|
"-DCMAKE_INSTALL_SYSCONF_PREFIX=${placeholder "out"}/etc"
|
||||||
] ++ lib.optional (!withDoc) "-DWITH_DOCUMENTATION=OFF";
|
] ++ lib.optional cross "-DWITH_DOCUMENTATION=OFF";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
pkgconfig
|
pkgconfig
|
||||||
] ++ lib.optional withDoc asciidoc;
|
python3
|
||||||
|
] ++ lib.optional (!cross) asciidoc;
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
libX11
|
libX11
|
||||||
@ -38,10 +41,50 @@ stdenv.mkDerivation rec {
|
|||||||
libXrandr
|
libXrandr
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = {
|
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" ];
|
||||||
|
|
||||||
|
passthru = {
|
||||||
|
tests.herbstluftwm = nixosTests.herbstluftwm;
|
||||||
|
};
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
description = "A manual tiling window manager for X";
|
description = "A manual tiling window manager for X";
|
||||||
homepage = "https://herbstluftwm.org/";
|
homepage = "https://herbstluftwm.org/";
|
||||||
license = lib.licenses.bsd2;
|
license = licenses.bsd2;
|
||||||
platforms = lib.platforms.linux;
|
platforms = platforms.linux;
|
||||||
|
maintainers = with maintainers; [ thibautmarty ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -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
|
Loading…
x
Reference in New Issue
Block a user