diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-01-29 18:01:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-29 18:01:37 +0000 |
| commit | 6a27b0be7424eb193560fe10638cfe08823fd789 (patch) | |
| tree | 2be61c643d1ca89a8766489d75d9a55c236c1cad /nixos | |
| parent | 2220b9a447eddc0db980ffef2b8c3a44bf4bb387 (diff) | |
| parent | 705d3d50879c4be3edcaeb25bd3063fa032d3d63 (diff) | |
| download | nixlib-6a27b0be7424eb193560fe10638cfe08823fd789.tar nixlib-6a27b0be7424eb193560fe10638cfe08823fd789.tar.gz nixlib-6a27b0be7424eb193560fe10638cfe08823fd789.tar.bz2 nixlib-6a27b0be7424eb193560fe10638cfe08823fd789.tar.lz nixlib-6a27b0be7424eb193560fe10638cfe08823fd789.tar.xz nixlib-6a27b0be7424eb193560fe10638cfe08823fd789.tar.zst nixlib-6a27b0be7424eb193560fe10638cfe08823fd789.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/budgie.nix | 4 | ||||
| -rw-r--r-- | nixos/tests/budgie.nix | 7 | ||||
| -rw-r--r-- | nixos/tests/netbird.nix | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index de4b2c0e50f5..463c45675cee 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -118,9 +118,7 @@ in { (budgie.budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; }) budgie.budgie-desktop-view budgie.budgie-screensaver - - # Required by the Budgie Desktop session. - (gnome.gnome-session.override { gnomeShellSupport = false; }) + budgie.budgie-session # Required by Budgie Menu. gnome-menus diff --git a/nixos/tests/budgie.nix b/nixos/tests/budgie.nix index 19d9b2bd0bed..fe0ed2cf80ed 100644 --- a/nixos/tests/budgie.nix +++ b/nixos/tests/budgie.nix @@ -33,14 +33,13 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { '' with subtest("Wait for login"): # wait_for_x() checks graphical-session.target, which is expected to be - # inactive on Budgie before #228946 (i.e. systemd managed gnome-session) is - # done on upstream. - # https://github.com/BuddiesOfBudgie/budgie-desktop/blob/v10.7.2/src/session/budgie-desktop.in#L16 + # inactive on Budgie before Budgie manages user session with systemd. + # https://github.com/BuddiesOfBudgie/budgie-desktop/blob/39e9f0895c978f76/src/session/budgie-desktop.in#L16 # # Previously this was unconditionally touched by xsessionWrapper but was # changed in #233981 (we have Budgie:GNOME in XDG_CURRENT_DESKTOP). # machine.wait_for_x() - machine.wait_until_succeeds('journalctl -t gnome-session-binary --grep "Entering running state"') + machine.wait_until_succeeds('journalctl -t budgie-session-binary --grep "Entering running state"') machine.wait_for_file("${user.home}/.Xauthority") machine.succeed("xauth merge ${user.home}/.Xauthority") diff --git a/nixos/tests/netbird.nix b/nixos/tests/netbird.nix index ef793cfe9881..7342e8d04a39 100644 --- a/nixos/tests/netbird.nix +++ b/nixos/tests/netbird.nix @@ -14,7 +14,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: testScript = '' start_all() - node.wait_for_unit("netbird.service") + node.wait_for_unit("netbird-wt0.service") node.wait_for_file("/var/run/netbird/sock") node.succeed("netbird status | grep -q 'Daemon status: NeedsLogin'") ''; |