Unverified Commit a61c7c58 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents c60d4823 2b356dae

maintainers/maintainer-list.nix

+12 −1
Original line number Diff line number Diff line
@@ -11420,6 +11420,16 @@ 
    githubId = 22817873;

    name = "Ember Keske";

  };

  n3oney = {

    name = "Michał Minarowski";

    email = "nixpkgs@neoney.dev";

    github = "n3oney";

    githubId = 30625554;

    matrix = "@neoney:matrix.org";

    keys = [{

      fingerprint = "9E6A 25F2 C1F2 9D76 ED00  1932 1261 173A 01E1 0298";

    }];

  };

  nadrieril = {

    email = "nadrieril@gmail.com";

    github = "Nadrieril";
@@ -11995,9 +12005,10 @@ 
  };

  NotAShelf = {

    name = "NotAShelf";

    email = "itsashelf@gmail.com";

    email = "raf@notashelf.dev";

    github = "NotAShelf";

    githubId = 62766066;

    matrix = "@raf:notashelf.dev";

  };

  notbandali = {

    name = "Amin Bandali";

nixos/tests/maestral.nix

+3 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { 


  testScript = { nodes, ... }:

    let

      user = nodes.cli.config.users.users.alice;

      user = nodes.cli.users.users.alice;

    in

    ''

      start_all()
@@ -65,7 +65,8 @@ import ./make-test-python.nix ({ pkgs, ... }: { 


      with subtest("GUI"):

        gui.wait_for_x()

        gui.succeed("xauth merge ${user.home}/.Xauthority")

        gui.wait_for_file("/tmp/xauth_*")

        gui.succeed("xauth merge /tmp/xauth_*")

        gui.wait_for_window("^Desktop ")

        gui.wait_for_unit("maestral.service", "${user.name}")

    '';

nixos/tests/plasma-bigscreen.nix

+3 −6
Original line number Diff line number Diff line
@@ -22,14 +22,11 @@ import ./make-test-python.nix ({ pkgs, ...} : 
    users.users.alice.extraGroups = ["uinput"];

  };



  testScript = { nodes, ... }: let

    user = nodes.machine.users.users.alice;

    xdo = "${pkgs.xdotool}/bin/xdotool";

  in ''

  testScript = { nodes, ... }: ''

    with subtest("Wait for login"):

        start_all()

        machine.wait_for_file("${user.home}/.Xauthority")

        machine.succeed("xauth merge ${user.home}/.Xauthority")

        machine.wait_for_file("/tmp/xauth_*")

        machine.succeed("xauth merge /tmp/xauth_*")



    with subtest("Check plasmashell started"):

        machine.wait_until_succeeds("pgrep plasmashell")

nixos/tests/plasma5-systemd-start.nix

+3 −5
Original line number Diff line number Diff line
@@ -23,13 +23,11 @@ import ./make-test-python.nix ({ pkgs, ...} : 
    };

  };



  testScript = { nodes, ... }: let

    user = nodes.machine.config.users.users.alice;

  in ''

  testScript = { nodes, ... }: ''

    with subtest("Wait for login"):

        start_all()

        machine.wait_for_file("${user.home}/.Xauthority")

        machine.succeed("xauth merge ${user.home}/.Xauthority")

        machine.wait_for_file("/tmp/xauth_*")

        machine.succeed("xauth merge /tmp/xauth_*")



    with subtest("Check plasmashell started"):

        machine.wait_until_succeeds("pgrep plasmashell")

nixos/tests/plasma5.nix

+7 −7
Original line number Diff line number Diff line
@@ -13,10 +13,8 @@ import ./make-test-python.nix ({ pkgs, ...} : 
    services.xserver.enable = true;

    services.xserver.displayManager.sddm.enable = true;

    services.xserver.displayManager.defaultSession = "plasma";

    services.xserver.desktopManager.plasma5 = {

      enable = true;

      excludePackages = [ pkgs.plasma5Packages.elisa ];

    };

    services.xserver.desktopManager.plasma5.enable = true;

    environment.plasma5.excludePackages = [ pkgs.plasma5Packages.elisa ];

    services.xserver.displayManager.autoLogin = {

      enable = true;

      user = "alice";
@@ -25,13 +23,13 @@ import ./make-test-python.nix ({ pkgs, ...} : 
  };



  testScript = { nodes, ... }: let

    user = nodes.machine.config.users.users.alice;

    user = nodes.machine.users.users.alice;

    xdo = "${pkgs.xdotool}/bin/xdotool";

  in ''

    with subtest("Wait for login"):

        start_all()

        machine.wait_for_file("${user.home}/.Xauthority")

        machine.succeed("xauth merge ${user.home}/.Xauthority")

        machine.wait_for_file("/tmp/xauth_*")

        machine.succeed("xauth merge /tmp/xauth_*")



    with subtest("Check plasmashell started"):

        machine.wait_until_succeeds("pgrep plasmashell")
@@ -46,6 +44,8 @@ import ./make-test-python.nix ({ pkgs, ...} : 
    with subtest("Ensure Elisa is not installed"):

        machine.fail("which elisa")



    machine.succeed("su - ${user.name} -c 'xauth merge /tmp/xauth_*'")



    with subtest("Run Dolphin"):

        machine.execute("su - ${user.name} -c 'DISPLAY=:0.0 dolphin >&2 &'")

        machine.wait_for_window(" Dolphin")