From 2143771374d7906552b48cd22d3261c7f8f459c8 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 14 May 2025 23:05:53 +0200 Subject: [PATCH 1/2] lomiri.lomiri-filemanager-app: 1.1.3 -> 1.1.4 --- .../applications/lomiri-filemanager-app/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix index 31c006767689..cb7b7ca5e07e 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-filemanager-app"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitLab { owner = "ubports"; repo = "development/apps/lomiri-filemanager-app"; tag = "v${finalAttrs.version}"; - hash = "sha256-qOzQba1NJBH1hE3XYQQowfkggLlaZl6Vz8uVW7dCzWI="; + hash = "sha256-2NDz9XcUMEYHOLaomTVImjuQHLzZ/pat/Fe9uWe29as="; }; postPatch = '' @@ -81,7 +81,9 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "File Manager application for Ubuntu Touch devices"; homepage = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app"; - changelog = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/blob/v${finalAttrs.version}/ChangeLog"; + changelog = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/blob/${ + if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev + }/ChangeLog"; license = lib.licenses.gpl3Only; mainProgram = "lomiri-filemanager-app"; teams = [ lib.teams.lomiri ]; From 66301f51a371c9d7af9dc27688ff374ca9526195 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 14 May 2025 23:38:38 +0200 Subject: [PATCH 2/2] nixosTests.lomiri-filemanager-app: Fix OCR --- nixos/tests/lomiri-filemanager-app.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/nixos/tests/lomiri-filemanager-app.nix b/nixos/tests/lomiri-filemanager-app.nix index efde3a01c114..ef0556875e38 100644 --- a/nixos/tests/lomiri-filemanager-app.nix +++ b/nixos/tests/lomiri-filemanager-app.nix @@ -34,14 +34,22 @@ machine.wait_for_x() with subtest("lomiri filemanager launches"): - machine.execute("lomiri-filemanager-app >&2 &") + machine.succeed("lomiri-filemanager-app >&2 &") + machine.wait_for_console_text("QFSFileEngine::open: No file name specified") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text(r"(filemanager.ubports|alice|items|directories|files|folder)") machine.screenshot("lomiri-filemanager_open") machine.succeed("pkill -f lomiri-filemanager-app") with subtest("lomiri filemanager localisation works"): - machine.execute("env LANG=de_DE.UTF-8 lomiri-filemanager-app >&2 &") + machine.succeed("env LANG=de_DE.UTF-8 lomiri-filemanager-app >&2 &") + machine.wait_for_console_text("QFSFileEngine::open: No file name specified") + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text(r"(Elemente|Verzeichnisse|Dateien|Ordner)") machine.screenshot("lomiri-filemanager_localised") '';