cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #302814 from paumr/auto-update/archi

Browse source 
archi: 5.2.0 -> 5.3.0
This commit is contained in:
Peder Bergebakken Sundt 2024-05-08 13:07:09 +02:00 committed by GitHub
commit 9873938432
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/tests/archi.nix
View file

@ -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")
'';

15
pkgs/tools/misc/archi/default.nix
View file

@ -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}");
@ -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