From 5203b62db0aef17ea2a7402f3cd5b1d006341c79 Mon Sep 17 00:00:00 2001 From: paumr Date: Tue, 18 Nov 2025 19:47:03 +0100 Subject: [PATCH] archi: drop --- nixos/tests/all-tests.nix | 1 - nixos/tests/archi.nix | 36 --------- pkgs/by-name/ar/archi/package.nix | 126 ------------------------------ pkgs/by-name/ar/archi/update.sh | 25 ------ pkgs/top-level/aliases.nix | 1 + 5 files changed, 1 insertion(+), 188 deletions(-) delete mode 100644 nixos/tests/archi.nix delete mode 100644 pkgs/by-name/ar/archi/package.nix delete mode 100755 pkgs/by-name/ar/archi/update.sh diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index db34a192e767..0b4b244b263b 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -242,7 +242,6 @@ in apparmor = runTest ./apparmor; appliance-repart-image = runTest ./appliance-repart-image.nix; appliance-repart-image-verity-store = runTest ./appliance-repart-image-verity-store.nix; - archi = runTest ./archi.nix; aria2 = runTest ./aria2.nix; armagetronad = runTest ./armagetronad.nix; artalk = runTest ./artalk.nix; diff --git a/nixos/tests/archi.nix b/nixos/tests/archi.nix deleted file mode 100644 index 74cca03829c5..000000000000 --- a/nixos/tests/archi.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, ... }: -{ - name = "archi"; - meta.maintainers = with lib.maintainers; [ paumr ]; - - nodes.machine = - { pkgs, ... }: - { - imports = [ - ./common/x11.nix - ]; - - environment.systemPackages = with pkgs; [ archi ]; - }; - - enableOCR = true; - - testScript = '' - machine.wait_for_x() - - with subtest("createEmptyModel via CLI"): - machine.succeed("Archi -application com.archimatetool.commandline.app -consoleLog -nosplash --createEmptyModel --saveModel smoke.archimate") - machine.copy_from_vm("smoke.archimate", "") - - with subtest("UI smoketest"): - machine.succeed("DISPLAY=:0 Archi --createEmptyModel >&2 &") - machine.wait_for_window("Archi") - - # wait till main UI is open - # 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") - ''; -} diff --git a/pkgs/by-name/ar/archi/package.nix b/pkgs/by-name/ar/archi/package.nix deleted file mode 100644 index fc055a1c11b7..000000000000 --- a/pkgs/by-name/ar/archi/package.nix +++ /dev/null @@ -1,126 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - autoPatchelfHook, - makeWrapper, - jdk, - libsecret, - glib, - webkitgtk_4_1, - wrapGAppsHook3, - _7zz, - nixosTests, - copyDesktopItems, - makeDesktopItem, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "Archi"; - version = "5.7.0"; - - src = - { - "x86_64-linux" = fetchurl { - url = "https://github.com/archimatetool/archi.io/releases/download/57/Archi-Linux64-${finalAttrs.version}.tgz"; - hash = "sha256-MIUlWt3GP/1oQAeq4W2xnhG63a2zhGldgyoyZ9lNOiI="; - }; - "x86_64-darwin" = fetchurl { - url = "https://github.com/archimatetool/archi.io/releases/download/57/Archi-Mac-${finalAttrs.version}.dmg"; - hash = "sha256-wIlhJ6XmhL5rMb5zwHJYwamCwV13PK53wi9uEXIga5I="; - }; - "aarch64-darwin" = fetchurl { - url = "https://github.com/archimatetool/archi.io/releases/download/57/Archi-Mac-Silicon-${finalAttrs.version}.dmg"; - hash = "sha256-2/w4+aKfjfTGLjjl/nOouFtnv7/kjmfezkrmSa4ablc="; - }; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - buildInputs = [ - libsecret - ]; - - nativeBuildInputs = [ - makeWrapper - wrapGAppsHook3 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - _7zz - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - autoPatchelfHook - copyDesktopItems - ]; - - sourceRoot = if stdenv.hostPlatform.isDarwin then "." else null; - - installPhase = - if stdenv.hostPlatform.system == "x86_64-linux" then - '' - runHook preInstall - - mkdir -p $out/bin $out/libexec - for f in configuration features p2 plugins Archi.ini; do - cp -r $f $out/libexec - done - - install -D -m755 Archi $out/libexec/Archi - makeWrapper $out/libexec/Archi $out/bin/Archi \ - --prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ - glib - webkitgtk_4_1 - ] - } \ - --set WEBKIT_DISABLE_DMABUF_RENDERER 1 \ - --prefix PATH : ${jdk}/bin - - install -Dm444 icon.xpm $out/share/icons/hicolor/256x256/apps/archi.xpm - - runHook postInstall - '' - else - '' - runHook preInstall - - mkdir -p "$out/Applications" - mv Archi.app "$out/Applications/" - - runHook postInstall - ''; - - desktopItems = [ - (makeDesktopItem { - name = "archi"; - desktopName = "Archi"; - exec = "Archi"; - type = "Application"; - comment = finalAttrs.meta.description; - icon = "archi"; - categories = [ - "Development" - ]; - }) - ]; - - passthru.updateScript = ./update.sh; - - passthru.tests = { inherit (nixosTests) archi; }; - - meta = { - description = "ArchiMate modelling toolkit"; - longDescription = '' - Archi is an open source modelling toolkit to create ArchiMate - models and sketches. - ''; - homepage = "https://www.archimatetool.com/"; - sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; - license = lib.licenses.mit; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - maintainers = with lib.maintainers; [ - earldouglas - paumr - ]; - mainProgram = "Archi"; - }; -}) diff --git a/pkgs/by-name/ar/archi/update.sh b/pkgs/by-name/ar/archi/update.sh deleted file mode 100755 index d405a188d3d0..000000000000 --- a/pkgs/by-name/ar/archi/update.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq coreutils common-updater-scripts - -latestVersion=$(curl "https://api.github.com/repos/archimatetool/archi/tags" | jq -r '.[0].name' | tail -c +9) -currentVersion=$(nix-instantiate --eval -E "with import ./. {}; archi.version or (lib.getVersion archi)" | tr -d '"') - -echo "latest version: $latestVersion" -echo "current version: $currentVersion" - -if [[ "$latestVersion" == "$currentVersion" ]]; then - echo "package is up-to-date" - exit 0 -fi - -for i in \ - "aarch64-darwin Archi-Mac-Silicon-$latestVersion.dmg" \ - "x86_64-darwin Archi-Mac-$latestVersion.dmg" \ - "x86_64-linux Archi-Linux64-$latestVersion.tgz" -do - set -- $i - prefetch=$(nix-prefetch-url https://www.archimatetool.com/downloads/archi/$latestVersion/$2) - hash=$(nix-hash --type sha256 --to-sri $prefetch) - - update-source-version archi $latestVersion $hash --system=$1 --ignore-same-version -done diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c0c41379fe9d..b833de13b95a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -299,6 +299,7 @@ mapAliases { appthreat-depscan = throw "'appthreat-depscan' has been renamed to/replaced by 'dep-scan'"; # Converted to throw 2025-10-27 arangodb = throw "arangodb has been removed, as it was unmaintained and the packaged version does not build with supported GCC versions"; # Added 2025-08-12 arc-browser = throw "arc-browser was removed due to being unmaintained"; # Added 2025-09-03 + archi = throw "'archi' has been removed, since its upstream maintainers do not want it packaged"; # Added 2025-11-18 archipelago-minecraft = throw "archipelago-minecraft has been removed, as upstream no longer ships minecraft as a default APWorld."; # Added 2025-07-15 archivebox = throw "archivebox has been removed, since the packaged version was stuck on django 3."; # Added 2025-08-01 ardour_7 = throw "ardour_7 has been removed because it relies on gtk2, please use ardour instead."; # Aded 2025-10-04