diff options
Diffstat (limited to 'pkgs/applications/window-managers/i3')
12 files changed, 43 insertions, 87 deletions
diff --git a/pkgs/applications/window-managers/i3/auto-layout.nix b/pkgs/applications/window-managers/i3/auto-layout.nix index bfcb35a870c94..ef6c27de438ef 100644 --- a/pkgs/applications/window-managers/i3/auto-layout.nix +++ b/pkgs/applications/window-managers/i3/auto-layout.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-gpVYVyh+2y4Tttvw1SuCf7mx/nxR330Ob2R4UmHZSJs="; }; - cargoSha256 = "sha256-OxQ7S+Sqc3aRH53Bs53Y+EKOYFgboGOBsQ7KJgICcGo="; + cargoHash = "sha256-OxQ7S+Sqc3aRH53Bs53Y+EKOYFgboGOBsQ7KJgICcGo="; # Currently no tests are implemented, so we avoid building the package twice doCheck = false; diff --git a/pkgs/applications/window-managers/i3/balance-workspace.nix b/pkgs/applications/window-managers/i3/balance-workspace.nix index bb0ea94e77c34..de68a06d896e2 100644 --- a/pkgs/applications/window-managers/i3/balance-workspace.nix +++ b/pkgs/applications/window-managers/i3/balance-workspace.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-zJdn/Q6r60FQgfehtQfeDkmN0Rz3ZaqgNhiWvjyQFy0="; + hash = "sha256-zJdn/Q6r60FQgfehtQfeDkmN0Rz3ZaqgNhiWvjyQFy0="; }; propagatedBuildInputs = [ i3ipc ]; diff --git a/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix b/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix index 6a1dda5842072..5810070d2ff43 100644 --- a/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix +++ b/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix @@ -28,7 +28,7 @@ in brightness.propagatedBuildInputs = [ ]; caffeine.propagatedBuildInputs = [ pkgs.xdg-utils pkgs.xdotool pkgs.xorg.xprop pkgs.libnotify ]; cmus.propagatedBuildInputs = [ pkgs.cmus ]; - cpu.propagatedBuildInputs = [ py.psutil pkgs.gnome.gnome-system-monitor ]; + cpu.propagatedBuildInputs = [ py.psutil pkgs.gnome-system-monitor ]; cpu2.propagatedBuildInputs = [ py.psutil pkgs.lm_sensors ]; cpu3.propagatedBuildInputs = [ py.psutil pkgs.lm_sensors ]; currency.propagatedBuildInputs = [ py.requests ]; @@ -85,8 +85,8 @@ in # NOTE: Yes, there is also a plugin named `layout-xkbswitch` with a dash. layout_xkbswitch.propagatedBuildInputs = [ pkgs.xkb-switch ]; libvirtvms.propagatedBuildInputs = [ py.libvirt ]; - load.propagatedBuildInputs = [ pkgs.gnome.gnome-system-monitor ]; - memory.propagatedBuildInputs = [ pkgs.gnome.gnome-system-monitor ]; + load.propagatedBuildInputs = [ pkgs.gnome-system-monitor ]; + memory.propagatedBuildInputs = [ pkgs.gnome-system-monitor ]; messagereceiver = { }; mocp.propagatedBuildInputs = [ pkgs.moc ]; mpd.propagatedBuildInputs = [ pkgs.mpc-cli ]; diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 16dd2e6485e77..6438eee19525d 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv, pkg-config, makeWrapper, meson, ninja, installShellFiles, libxcb, xcbutilkeysyms , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre2, libev , yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon -, xorgserver, xvfb-run +, xorgserver, xvfb-run, xdotool, xorg, which , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs }: @@ -29,27 +29,42 @@ stdenv.mkDerivation rec { libstartup_notification libX11 pcre2 libev yajl xcb-util-cursor perl pango perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun perlPackages.ExtUtilsPkgConfig perlPackages.InlineC - xorgserver xvfb-run + ] ++ lib.optionals doCheck [ + xorgserver xvfb-run xdotool xorg.setxkbmap xorg.xrandr which ]; configureFlags = [ "--disable-builddir" ]; postPatch = '' patchShebangs . + + # This testcase generates a Perl executable file with a shebang, and + # patchShebangs can't replace a shebang in the middle of a file. + if [ -f testcases/t/318-i3-dmenu-desktop.t ]; then + substituteInPlace testcases/t/318-i3-dmenu-desktop.t \ + --replace-fail "#!/usr/bin/env perl" "#!${perl}/bin/perl" + fi ''; - # Tests have been failing (at least for some people in some cases) - # and have been disabled until someone wants to fix them. Some - # initial digging uncovers that the tests call out to `git`, which - # they shouldn't, and then even once that's fixed have some - # perl-related errors later on. For more, see - # https://github.com/NixOS/nixpkgs/issues/7957 - doCheck = false; # stdenv.hostPlatform.system == "x86_64-linux"; - - checkPhase = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") - '' - (cd testcases && xvfb-run ./complete-run.pl -p 1 --keep-xserver-output) - ! grep -q '^not ok' testcases/latest/complete-run.log + # xvfb-run is available only on Linux + doCheck = stdenv.isLinux; + + checkPhase = '' + test_failed= + # "| cat" disables fancy progress reporting which makes the log unreadable. + ./complete-run.pl -p 1 --keep-xserver-output | cat || test_failed="complete-run.pl returned $?" + if [ -z "$test_failed" ]; then + # Apparently some old versions of `complete-run.pl` did not return a + # proper exit code, so check the log for signs of errors too. + grep -q '^not ok' latest/complete-run.log && test_failed="test log contains errors" ||: + fi + if [ -n "$test_failed" ]; then + echo "***** Error: $test_failed" + echo "===== Test log =====" + cat latest/complete-run.log + echo "===== End of test log =====" + false + fi ''; postInstall = '' diff --git a/pkgs/applications/window-managers/i3/i3-ratiosplit.nix b/pkgs/applications/window-managers/i3/i3-ratiosplit.nix index 0903ceb3185af..ad585ef08885d 100644 --- a/pkgs/applications/window-managers/i3/i3-ratiosplit.nix +++ b/pkgs/applications/window-managers/i3/i3-ratiosplit.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0yfmr5zk2c2il9d31yjjbr48sqgcq6hp4a99hl5mjm2ajyhy5bz3"; }; - cargoSha256 = "134sgc9d0j57swknl9sgil6212rws2hhp92s3cg1yzz5ygx21c76"; + cargoHash = "sha256-5rAg+vPlfx8eG1qkC6HQPIsgDI1PJ2on16dI0BJ7mow="; # Currently no tests are implemented, so we avoid building the package twice doCheck = false; diff --git a/pkgs/applications/window-managers/i3/i3-resurrect.nix b/pkgs/applications/window-managers/i3/i3-resurrect.nix index 015bbee6013f2..2040cdba806a1 100644 --- a/pkgs/applications/window-managers/i3/i3-resurrect.nix +++ b/pkgs/applications/window-managers/i3/i3-resurrect.nix @@ -6,7 +6,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-13FKRvEE4vHq5G51G1UyBnfNiWeS9Q/SYCG16E1Sn4c="; + hash = "sha256-13FKRvEE4vHq5G51G1UyBnfNiWeS9Q/SYCG16E1Sn4c="; }; propagatedBuildInputs = [ click psutil xprop natsort i3ipc xdotool importlib-metadata ]; diff --git a/pkgs/applications/window-managers/i3/kitti3.nix b/pkgs/applications/window-managers/i3/kitti3.nix index 3068baee5d996..4a88518d508bb 100644 --- a/pkgs/applications/window-managers/i3/kitti3.nix +++ b/pkgs/applications/window-managers/i3/kitti3.nix @@ -36,6 +36,6 @@ buildPythonApplication rec { description = "Kitty drop-down service for sway & i3wm"; mainProgram = "kitti3"; license = licenses.bsd3; - maintainers = with maintainers; [ Enzime ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/window-managers/i3/layout-manager.nix b/pkgs/applications/window-managers/i3/layout-manager.nix index b2a3adb98f907..df5bb41d85ecc 100644 --- a/pkgs/applications/window-managers/i3/layout-manager.nix +++ b/pkgs/applications/window-managers/i3/layout-manager.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { mainProgram = "layout_manager"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix deleted file mode 100644 index 66450eec6c321..0000000000000 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib -, fetchFromGitHub -, libpulseaudio -, libnotify -, gobject-introspection -, python3Packages -, extraLibs ? [] }: - -python3Packages.buildPythonApplication rec { - # i3pystatus moved to rolling release: - # https://github.com/enkore/i3pystatus/issues/584 - version = "unstable-2020-06-12"; - pname = "i3pystatus"; - - src = fetchFromGitHub { - owner = "enkore"; - repo = "i3pystatus"; - rev = "dad5eb0c5c8a2ecd20c37ade4732586c6e53f44b"; - sha256 = "18ygvkl92yr69kxsym57k1mc90asdxpz4b943i61qr0s4fc5n4mq"; - }; - - nativeBuildInputs = [ - gobject-introspection - ]; - - buildInputs = [ libpulseaudio libnotify ]; - - propagatedBuildInputs = with python3Packages; [ - keyring colour netifaces psutil basiciw pygobject3 - ] ++ extraLibs; - - makeWrapperArgs = [ - # LC_TIME != C results in locale.Error: unsupported locale setting - "--set" "LC_TIME" "C" - "--suffix" "LD_LIBRARY_PATH" ":" "${lib.makeLibraryPath [ libpulseaudio ]}" - ]; - - postPatch = '' - makeWrapperArgs+=(--set GI_TYPELIB_PATH "$GI_TYPELIB_PATH") - ''; - - postInstall = '' - makeWrapper ${python3Packages.python.interpreter} $out/bin/${pname}-python-interpreter \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - ''${makeWrapperArgs[@]} - ''; - - # no tests in tarball - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/enkore/i3pystatus"; - description = "Complete replacement for i3status"; - longDescription = '' - i3pystatus is a growing collection of python scripts for status output compatible - to i3status / i3bar of the i3 window manager. - ''; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.igsha ]; - }; -} diff --git a/pkgs/applications/window-managers/i3/rounded.nix b/pkgs/applications/window-managers/i3/rounded.nix index ee04f4246fefa..45e80f7fb1a7a 100644 --- a/pkgs/applications/window-managers/i3/rounded.nix +++ b/pkgs/applications/window-managers/i3/rounded.nix @@ -13,6 +13,9 @@ i3.overrideAttrs (oldAttrs: rec { buildInputs = oldAttrs.buildInputs ++ [ pcre ]; + # Some tests are failing. + doCheck = false; + meta = with lib; { description = "Fork of i3-gaps that adds rounding to window corners"; homepage = "https://github.com/LinoBigatti/i3-rounded"; diff --git a/pkgs/applications/window-managers/i3/swallow.nix b/pkgs/applications/window-managers/i3/swallow.nix index 31101721e4c45..7b6644d0a9983 100644 --- a/pkgs/applications/window-managers/i3/swallow.nix +++ b/pkgs/applications/window-managers/i3/swallow.nix @@ -39,6 +39,6 @@ buildPythonApplication rec { license = licenses.mit; platforms = platforms.linux; mainProgram = "swallow"; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/window-managers/i3/wsr.nix b/pkgs/applications/window-managers/i3/wsr.nix index e64194ac38170..f282e38b6dcab 100644 --- a/pkgs/applications/window-managers/i3/wsr.nix +++ b/pkgs/applications/window-managers/i3/wsr.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Mq4TpQDiIYePUS3EwBfOe2+QmvF6+WEDK12WahbuhSU="; }; - cargoSha256 = "sha256-hybvzHwHM0rQwgZfQpww/w9wQDW5h9P2KSjpAScVTBo="; + cargoHash = "sha256-hybvzHwHM0rQwgZfQpww/w9wQDW5h9P2KSjpAScVTBo="; nativeBuildInputs = [ python3 ]; buildInputs = [ libxcb ]; |