From 0606bc57509649f9cb335e78a3a1ed9d7b0d9aac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=99=A8=E6=BD=87?= <3220101835@zju.edu.cn> Date: Tue, 13 Aug 2024 23:37:05 +0800 Subject: [PATCH 1/4] termius: 8.12.9 -> 9.3.1 --- pkgs/applications/networking/termius/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index 38e5a50b339a..505f79449500 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "termius"; - version = "8.12.9"; + version = "9.3.1"; src = fetchurl { # find the latest version with @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_url' -r # and the sha512 with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r - url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_194.snap"; - hash = "sha512-48SHa0KQzbDRD9Z6qb63jH+8/jcjGefSjqsCK52Ob2vnzDDBdsmrRLmFDs/K/FBIjzFV4GAjQx61v9jQtvAsmA=="; + url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_199.snap"; + hash = "sha512-CYbJDNtJV71kL1cH1D+8nk8VQQWbHY7a8Yaiva5PI4wFxKNWRDpty6DETtOPz03vxpjnEcHjt3b4d7eya8aGfA=="; }; desktopItem = makeDesktopItem { From bbd14a62d092bdd32b2335fd63bc9d082fa9d65e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=99=A8=E6=BD=87?= <3220101835@zju.edu.cn> Date: Tue, 13 Aug 2024 23:39:58 +0800 Subject: [PATCH 2/4] termius: fix desktop icon not found --- pkgs/applications/networking/termius/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index 505f79449500..801ef04a8dc0 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { mkdir -p $out/opt/termius cp -r ./ $out/opt/termius - mkdir -p "$out/share/applications" "$out/share/pixmaps/termius-app.png" + mkdir -p "$out/share/applications" "$out/share/pixmaps" cp "${desktopItem}/share/applications/"* "$out/share/applications" cp meta/gui/icon.png $out/share/pixmaps/termius-app.png From a7735432d9c6e62636f6b3e7cb5e2789f11b79b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=99=A8=E6=BD=87?= <3220101835@zju.edu.cn> Date: Tue, 13 Aug 2024 23:44:54 +0800 Subject: [PATCH 3/4] termius: add update script --- .../networking/termius/default.nix | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index 801ef04a8dc0..5d11c95288fb 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -10,11 +10,13 @@ , mesa , udev , wrapGAppsHook3 +, writeScript }: stdenv.mkDerivation rec { pname = "termius"; version = "9.3.1"; + revision = "199"; src = fetchurl { # find the latest version with @@ -23,7 +25,7 @@ stdenv.mkDerivation rec { # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_url' -r # and the sha512 with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r - url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_199.snap"; + url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_${revision}.snap"; hash = "sha512-CYbJDNtJV71kL1cH1D+8nk8VQQWbHY7a8Yaiva5PI4wFxKNWRDpty6DETtOPz03vxpjnEcHjt3b4d7eya8aGfA=="; }; @@ -77,6 +79,28 @@ stdenv.mkDerivation rec { "''${gappsWrapperArgs[@]}" ''; + passthru.updateScript = writeScript "update-termius" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts curl jq + + set -eu -o pipefail + + data=$(curl -H 'X-Ubuntu-Series: 16' \ + 'https://api.snapcraft.io/api/v1/snaps/details/termius-app?fields=download_sha512,revision,version') + + version=$(jq -r .version <<<"$data") + + if [[ "x$UPDATE_NIX_OLD_VERSION" != "x$version" ]]; then + + revision=$(jq -r .revision <<<"$data") + hash=$(nix hash to-sri "sha512:$(jq -r .download_sha512 <<<"$data")") + + update-source-version "$UPDATE_NIX_ATTR_PATH" "$version" "$hash" + update-source-version --ignore-same-hash --version-key=revision "$UPDATE_NIX_ATTR_PATH" "$revision" "$hash" + + fi + ''; + meta = with lib; { description = "Cross-platform SSH client with cloud data sync and more"; homepage = "https://termius.com/"; From 6435628c2d5b4f5aac69c83d922da30c94b39742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=99=A8=E6=BD=87?= <3220101835@zju.edu.cn> Date: Fri, 16 Aug 2024 13:36:02 +0800 Subject: [PATCH 4/4] termius: 9.3.1 -> 9.3.2 --- pkgs/applications/networking/termius/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index 5d11c95288fb..e5ea9ae91dce 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { pname = "termius"; - version = "9.3.1"; - revision = "199"; + version = "9.3.2"; + revision = "200"; src = fetchurl { # find the latest version with @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # and the sha512 with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_${revision}.snap"; - hash = "sha512-CYbJDNtJV71kL1cH1D+8nk8VQQWbHY7a8Yaiva5PI4wFxKNWRDpty6DETtOPz03vxpjnEcHjt3b4d7eya8aGfA=="; + hash = "sha512-LPNwyDqVRFVAmhtZGpxoYEQK5B8BIdaV/ylTD0JfvAJAHWpGrbBJT1jMpT7LetNH5XQyXW81nY26JlcmXHaAwg=="; }; desktopItem = makeDesktopItem {