Unverified Commit 5fb8b948 authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

Merge pull request #219677 from bobby285271/upd/pantheon.elementary-files 

pantheon.elementary-files: 6.2.2 -> 6.3.0 + nixosTests.pantheon: ensure the password box is focused when login
parents c7978283 27688662

nixos/tests/pantheon.nix

+5 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : 
    services.xserver.enable = true;

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



    environment.systemPackages = [ pkgs.xdotool ];

  };



  enableOCR = true;
@@ -29,6 +30,10 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : 
        machine.wait_for_text("${user.description}")

        # OCR was struggling with this one.

        # machine.wait_for_text("${bob.description}")

        # Ensure the password box is focused by clicking it.

        # Workaround for https://github.com/NixOS/nixpkgs/issues/211366.

        machine.succeed("XAUTHORITY=/var/lib/lightdm/.Xauthority DISPLAY=:0 xdotool mousemove 512 505 click 1")

        machine.sleep(2)

        machine.screenshot("elementary_greeter_lightdm")



    with subtest("Login with elementary-greeter"):

pkgs/desktops/pantheon/apps/elementary-files/default.nix

+12 −2
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, fetchpatch

, nix-update-script

, pkg-config

, meson
@@ -28,7 +29,7 @@ 


stdenv.mkDerivation rec {

  pname = "elementary-files";

  version = "6.2.2";

  version = "6.3.0";



  outputs = [ "out" "dev" ];
@@ -36,9 +37,18 @@ stdenv.mkDerivation rec { 
    owner = "elementary";

    repo = "files";

    rev = version;

    sha256 = "sha256-YV7fcRaLaDwa0m6zbdhayCAqeON5nqEdQ1IUtDKu5AY=";

    sha256 = "sha256-DS39jCeN+FFiEqJqxa5F2XRKF7SJsm2qi5KKb79guKo=";

  };



  patches = [

    # Avoid crash due to ref counting issues in Directory cache

    # https://github.com/elementary/files/pull/2149

    (fetchpatch {

      url = "https://github.com/elementary/files/commit/6a0d16e819dea2d0cd2d622414257da9433afe2f.patch";

      sha256 = "sha256-ijuSMZzVbSwWMWsK24A/24NfxjxgK/BU2qZlq6xLBEU=";

    })

  ];



  nativeBuildInputs = [

    desktop-file-utils

    meson