From 3c24d2f1b287fd5e7e9e00424742978caa7874bf Mon Sep 17 00:00:00 2001 From: paumr Date: Tue, 9 Apr 2024 13:27:39 +0200 Subject: [PATCH 1/3] archi: 5.2.0 -> 5.3.0 --- pkgs/tools/misc/archi/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/archi/default.nix b/pkgs/tools/misc/archi/default.nix index 23c5372e5eef..5b368417890d 100644 --- a/pkgs/tools/misc/archi/default.nix +++ b/pkgs/tools/misc/archi/default.nix @@ -12,20 +12,20 @@ stdenv.mkDerivation rec { pname = "Archi"; - version = "5.2.0"; + version = "5.3.0"; src = { "x86_64-linux" = fetchurl { - url = "https://www.archimatetool.com/downloads/archi_5.php?/${version}/Archi-Linux64-${version}.tgz"; - hash = "sha256-uGW4Wl3E71ZCgWzPHkmXv/PluegDF8C64FUQ7C5/SDA="; + url = "https://www.archimatetool.com/downloads/archi/${version}/Archi-Linux64-${version}.tgz"; + hash = "sha256-ngO3YFCChsnefxdxtR00Dy736K2GYnTEYI4vKWLnPsw="; }; "x86_64-darwin" = fetchurl { - url = "https://www.archimatetool.com/downloads/archi_5.php?/${version}/Archi-Mac-${version}.dmg"; - hash = "sha256-GI9aIAYwu60RdjN0Y3O94sVMzJR1+nX4txVcvqn1r58="; + url = "https://www.archimatetool.com/downloads/archi/${version}/Archi-Mac-${version}.dmg"; + hash = "sha256-dL1c7IrbDMY/WbijQh1dCmCrRQQhj4fjGN+6m19OjO0="; }; "aarch64-darwin" = fetchurl { - url = "https://www.archimatetool.com/downloads/archi_5.php?/${version}/Archi-Mac-Silicon-${version}.dmg"; - hash = "sha256-Jg+tl902OWSm4GHxF7QXbRU5nxX4/5q6LTGubHWQ08E="; + url = "https://www.archimatetool.com/downloads/archi/${version}/Archi-Mac-Silicon-${version}.dmg"; + hash = "sha256-iczIUm1LCAjYKOyHXbFCgb+zoUxxATSOVkB8Ldk7pxQ="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); From 9f1a2da3e97ccc4c51e8fa1adbe5ca3e313d7e11 Mon Sep 17 00:00:00 2001 From: paumr Date: Tue, 9 Apr 2024 15:55:25 +0200 Subject: [PATCH 2/3] archi: fix GBM-DRV error --- pkgs/tools/misc/archi/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/archi/default.nix b/pkgs/tools/misc/archi/default.nix index 5b368417890d..d149e6209614 100644 --- a/pkgs/tools/misc/archi/default.nix +++ b/pkgs/tools/misc/archi/default.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { install -D -m755 Archi $out/libexec/Archi makeWrapper $out/libexec/Archi $out/bin/Archi \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ webkitgtk ])} \ + --set WEBKIT_DISABLE_DMABUF_RENDERER 1 \ --prefix PATH : ${jdk}/bin '' else From 8027f83d32f689611b5967ebed1d57b8233f8348 Mon Sep 17 00:00:00 2001 From: paumr Date: Mon, 6 May 2024 22:23:29 +0200 Subject: [PATCH 3/3] archi: removed OCR welcome check --- nixos/tests/archi.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/tests/archi.nix b/nixos/tests/archi.nix index 59f2e940c005..a8cb1c503d4f 100644 --- a/nixos/tests/archi.nix +++ b/nixos/tests/archi.nix @@ -24,7 +24,9 @@ import ./make-test-python.nix ({ lib, ... }: { machine.wait_for_window("Archi") # wait till main UI is open - machine.wait_for_text("Welcome to Archi") + # since OCR seems to be buggy wait_for_text was replaced by sleep, issue: #302965 + # machine.wait_for_text("Welcome to Archi") + machine.sleep(20) machine.screenshot("welcome-screen") '';