diff --git a/flake.lock b/flake.lock index 37573c6e..7c0ffa05 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1642953063, - "narHash": "sha256-qvAx5EC1RvKt5STFL9owjrfXJ3punShOCAYGzmf10IQ=", + "lastModified": 1643140235, + "narHash": "sha256-VYG+nut3u/4qVGV9UABgI8fChJ4bS9Bq6do1lgO3bRI=", "owner": "accentor", "repo": "flake", - "rev": "49edead906a37c54ad3006dfbc6e9c9eb0a30d0a", + "rev": "80152b5725340cde7a0e68868daffe79ff34b8ae", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "emacs-overlay": { "locked": { - "lastModified": 1643107455, - "narHash": "sha256-2wc0fqvUKTAbL9cWVL6F9kuwGidfiwBa8vpMjDAAqSY=", + "lastModified": 1643136333, + "narHash": "sha256-XfoLWYR4ODSKeFehDEN+3QlE9Ysbu3nIQwBwSo9N8Rw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f08e2e92111869cc23d5894d532c03e586a99e54", + "rev": "c6b057968bbb9a68541ce3edfdf4aa01c32de369", "type": "github" }, "original": { @@ -92,11 +92,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1642903813, - "narHash": "sha256-0lNfGW8sNfyTrixoQhVG00Drl/ECaf5GbfKAQ1ZDoyE=", + "lastModified": 1643080866, + "narHash": "sha256-iO3Z6jw0HEiie8UnXVpq1SxphprDYBXrVzubEa5D4eE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "689b76bcf36055afdeb2e9852f5ecdd2bf483f87", + "rev": "c07b471b52be8fbc49a7dc194e9b37a6e19ee04d", "type": "github" }, "original": { @@ -108,11 +108,11 @@ }, "nur": { "locked": { - "lastModified": 1643134083, - "narHash": "sha256-mKyP8EnWfm+QxLFfExvplvIYJHe3mqZwJWCJoI5n8C4=", + "lastModified": 1643139677, + "narHash": "sha256-S6GWmzPpwfF/JT9SNbw6IJHkwJ+8uurztJKZHdTlXtU=", "owner": "nix-community", "repo": "NUR", - "rev": "c819ced94dc56d0e3eea200eb0c8b2d46671e362", + "rev": "959ab99f4902dbbc79b243abdac6aa47526e2ddb", "type": "github" }, "original": { @@ -140,11 +140,11 @@ ] }, "locked": { - "lastModified": 1642952429, - "narHash": "sha256-GvoNZeArFDDJtPBUHawxd7IMPsQ47pgaw92QSjwXLc8=", + "lastModified": 1643139445, + "narHash": "sha256-zuQEOeElhgvzMqv3eFXCyUJiFZc3gczaKgbQaqtXiSY=", "owner": "chvp", "repo": "tetris", - "rev": "23dac5748f25a9f297f2e2a494d2f43603ccf2df", + "rev": "bca1c3659e3b3102b8e1566b60064c5c1afcfb94", "type": "github" }, "original": { diff --git a/patches/151902.patch b/patches/151902.patch deleted file mode 100644 index a37e4512..00000000 --- a/patches/151902.patch +++ /dev/null @@ -1,201 +0,0 @@ -From 2e719d1cdab9e81750c19425a1f5c7678b5e73ad Mon Sep 17 00:00:00 2001 -From: Michael Weiss -Date: Thu, 23 Dec 2021 20:19:41 +0100 -Subject: [PATCH] sway: 1.6.1 -> 1.7 - -Release notes: https://github.com/swaywm/sway/releases/tag/1.7 - -Notable (backward incompatible) changes: -- The default terminal changed from Alacritty to foot - -Known issues: -- `swaynag` will crash when Sway 1.6.1 is still running while the Nix - package (and thus `swaynag`) is already updated to version 1.7. -- The experimental Ozone/Wayland support of Electron apps will be broken - for a while. Electron version 17 should work but the Chromium fixes - haven't yet been backported to Electron version 16. - -NixOS module: programs.sway.extraPackages: The "alacritty" package was -replaced with "foot". - -VM test: We switched from the OpenGL ES 2.0 renderer to Pixman. The -terminal was also changed to foot but Alacritty is still used for the -XWayland test (since foot doesn't support X11). - -Co-authored-by: Patrick Hilhorst ---- - nixos/modules/programs/sway.nix | 4 +- - nixos/tests/sway.nix | 47 +++++++++++++------ - .../window-managers/sway/default.nix | 8 ++-- - pkgs/top-level/all-packages.nix | 4 +- - 4 files changed, 39 insertions(+), 24 deletions(-) - -diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix -index c64e01a20cb3d..bb9904d195606 100644 ---- a/nixos/modules/programs/sway.nix -+++ b/nixos/modules/programs/sway.nix -@@ -90,10 +90,10 @@ in { - extraPackages = mkOption { - type = with types; listOf package; - default = with pkgs; [ -- swaylock swayidle alacritty dmenu -+ swaylock swayidle foot dmenu - ]; - defaultText = literalExpression '' -- with pkgs; [ swaylock swayidle alacritty dmenu ]; -+ with pkgs; [ swaylock swayidle foot dmenu ]; - ''; - example = literalExpression '' - with pkgs; [ -diff --git a/nixos/tests/sway.nix b/nixos/tests/sway.nix -index 3476ebab3e26c..43b8c84730427 100644 ---- a/nixos/tests/sway.nix -+++ b/nixos/tests/sway.nix -@@ -1,4 +1,4 @@ --import ./make-test-python.nix ({ pkgs, lib, ...} : -+import ./make-test-python.nix ({ pkgs, lib, ... }: - - { - name = "sway"; -@@ -13,19 +13,38 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : - - environment = { - # For glinfo and wayland-info: -- systemPackages = with pkgs; [ mesa-demos wayland-utils ]; -+ systemPackages = with pkgs; [ mesa-demos wayland-utils alacritty ]; - # Use a fixed SWAYSOCK path (for swaymsg): - variables = { - "SWAYSOCK" = "/tmp/sway-ipc.sock"; -- "WLR_RENDERER_ALLOW_SOFTWARE" = "1"; -+ # TODO: Investigate if we can get hardware acceleration to work (via -+ # virtio-gpu and Virgil). We currently have to use the Pixman software -+ # renderer since the GLES2 renderer doesn't work inside the VM (even -+ # with WLR_RENDERER_ALLOW_SOFTWARE): -+ # "WLR_RENDERER_ALLOW_SOFTWARE" = "1"; -+ "WLR_RENDERER" = "pixman"; - }; - # For convenience: - shellAliases = { -- test-x11 = "glinfo | head -n 3 | tee /tmp/test-x11.out && touch /tmp/test-x11-exit-ok"; -+ test-x11 = "glinfo | tee /tmp/test-x11.out && touch /tmp/test-x11-exit-ok"; - test-wayland = "wayland-info | tee /tmp/test-wayland.out && touch /tmp/test-wayland-exit-ok"; - }; -+ -+ # To help with OCR: -+ etc."xdg/foot/foot.ini".text = lib.generators.toINI { } { -+ main = { -+ font = "inconsolata:size=14"; -+ }; -+ colors = rec { -+ foreground = "000000"; -+ background = "ffffff"; -+ regular2 = foreground; -+ }; -+ }; - }; - -+ fonts.fonts = [ pkgs.inconsolata ]; -+ - # Automatically configure and start Sway when logging in on tty1: - programs.bash.loginShellInit = '' - if [ "$(tty)" = "/dev/tty1" ]; then -@@ -61,7 +80,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : - machine.wait_for_file("/run/user/1000/wayland-1") - machine.wait_for_file("/tmp/sway-ipc.sock") - -- # Test XWayland: -+ # Test XWayland (foot does not support X): - machine.succeed( - "su - alice -c 'swaymsg exec WINIT_UNIX_BACKEND=x11 WAYLAND_DISPLAY=invalid alacritty'" - ) -@@ -69,21 +88,22 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : - machine.send_chars("test-x11\n") - machine.wait_for_file("/tmp/test-x11-exit-ok") - print(machine.succeed("cat /tmp/test-x11.out")) -+ machine.copy_from_vm("/tmp/test-x11.out") - machine.screenshot("alacritty_glinfo") - machine.succeed("pkill alacritty") - -- # Start a terminal (Alacritty) on workspace 3: -+ # Start a terminal (foot) on workspace 3: - machine.send_key("alt-3") -- machine.succeed( -- "su - alice -c 'swaymsg exec WINIT_UNIX_BACKEND=wayland DISPLAY=invalid alacritty'" -- ) -+ machine.sleep(3) -+ machine.send_key("alt-ret") - machine.wait_for_text("alice@machine") - machine.send_chars("test-wayland\n") - machine.wait_for_file("/tmp/test-wayland-exit-ok") - print(machine.succeed("cat /tmp/test-wayland.out")) -- machine.screenshot("alacritty_wayland_info") -+ machine.copy_from_vm("/tmp/test-wayland.out") -+ machine.screenshot("foot_wayland_info") - machine.send_key("alt-shift-q") -- machine.wait_until_fails("pgrep alacritty") -+ machine.wait_until_fails("pgrep foot") - - # Test gpg-agent starting pinentry-gnome3 via D-Bus (tests if - # $WAYLAND_DISPLAY is correctly imported into the D-Bus user env): -@@ -104,9 +124,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : - # Exit Sway and verify process exit status 0: - machine.succeed("su - alice -c 'swaymsg exit || true'") - machine.wait_until_fails("pgrep -x sway") -- -- # TODO: Sway currently segfaults after "swaymsg exit" but only in this VM test: -- # machine # [ 104.090032] sway[921]: segfault at 3f800008 ip 00007f7dbdc25f10 sp 00007ffe282182f8 error 4 in libwayland-server.so.0.1.0[7f7dbdc1f000+8000] -- # machine.wait_for_file("/tmp/sway-exit-ok") -+ machine.wait_for_file("/tmp/sway-exit-ok") - ''; - }) -diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix -index ec08568f0589c..72ca71d589605 100644 ---- a/pkgs/applications/window-managers/sway/default.nix -+++ b/pkgs/applications/window-managers/sway/default.nix -@@ -1,5 +1,5 @@ - { lib, stdenv, fetchFromGitHub, substituteAll, swaybg --, meson, ninja, pkg-config, wayland-scanner, scdoc -+, meson_0_60, ninja, pkg-config, wayland-scanner, scdoc - , wayland, libxkbcommon, pcre, json_c, dbus, libevdev - , pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg - , wlroots, wayland-protocols, libdrm -@@ -12,13 +12,13 @@ - - stdenv.mkDerivation rec { - pname = "sway-unwrapped"; -- version = "1.6.1"; -+ version = "1.7"; - - src = fetchFromGitHub { - owner = "swaywm"; - repo = "sway"; - rev = version; -- sha256 = "0j4sdbsrlvky1agacc0pcz9bwmaxjmrapjnzscbd2i0cria2fc5j"; -+ sha256 = "0ss3l258blyf2d0lwd7pi7ga1fxfj8pxhag058k7cmjhs3y30y5l"; - }; - - patches = [ -@@ -43,7 +43,7 @@ stdenv.mkDerivation rec { - ]; - - nativeBuildInputs = [ -- meson ninja pkg-config wayland-scanner scdoc -+ meson_0_60 ninja pkg-config wayland-scanner scdoc - ]; - - buildInputs = [ -diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix -index 0627a2fb20021..a6e0b133cd068 100644 ---- a/pkgs/top-level/all-packages.nix -+++ b/pkgs/top-level/all-packages.nix -@@ -26143,9 +26143,7 @@ with pkgs; - inherit (xorg) xcbutilrenderutil; - }; - -- sway-unwrapped = callPackage ../applications/window-managers/sway { -- wlroots = wlroots_0_14; -- }; -+ sway-unwrapped = callPackage ../applications/window-managers/sway { }; - sway = callPackage ../applications/window-managers/sway/wrapper.nix { }; - swaybg = callPackage ../applications/window-managers/sway/bg.nix { }; - swayidle = callPackage ../applications/window-managers/sway/idle.nix { };