From 678fae38c73075b5309e4ab79e2f27e9c932e134 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Tue, 24 Dec 2024 17:00:07 +0800 Subject: [PATCH 1/2] keyguard: add update script --- pkgs/by-name/ke/keyguard/package.nix | 2 ++ pkgs/by-name/ke/keyguard/update.sh | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100755 pkgs/by-name/ke/keyguard/update.sh diff --git a/pkgs/by-name/ke/keyguard/package.nix b/pkgs/by-name/ke/keyguard/package.nix index 477dc9e3fff1..827a05718a1a 100644 --- a/pkgs/by-name/ke/keyguard/package.nix +++ b/pkgs/by-name/ke/keyguard/package.nix @@ -60,6 +60,8 @@ stdenv.mkDerivation (finalAttrs: { useBwrap = false; }; + passthru.updateScript = ./update.sh; + doCheck = false; gradleFlags = [ "-Dorg.gradle.java.home=${jdk17}" ]; diff --git a/pkgs/by-name/ke/keyguard/update.sh b/pkgs/by-name/ke/keyguard/update.sh new file mode 100755 index 000000000000..57df067cd413 --- /dev/null +++ b/pkgs/by-name/ke/keyguard/update.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p bash nixVersions.latest curl coreutils jq common-updater-scripts + +set -eou pipefail + +ROOT="$(dirname "$(readlink -f "$0")")" + +latest=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/AChep/keyguard-app/releases/latest) +latestTag=$(echo "$latest" | jq -r ".tag_name") +latestName=$(echo "$latest" | jq -r ".name") +latestVersion=$(echo "$latestName" | awk -F'v|-' '{print $2}') + +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; keyguard.version" | tr -d '"') + +echo "latest version: $latestVersion" +echo "current version: $currentVersion" + +if [[ "$latestVersion" == "$currentVersion" ]]; then + echo "package is up-to-date" + exit 0 +fi + +hash=$(nix hash convert --hash-algo sha256 --to sri $(nix-prefetch-url --unpack "https://github.com/AChep/keyguard-app/archive/refs/tags/${latestTag}.tar.gz")) +update-source-version keyguard $latestVersion $hash + +sed -i "s/tag = \"r[0-9]\+\";/tag = \"$latestTag\";/g" "$ROOT/package.nix" + +$(nix-build -A keyguard.mitmCache.updateScript) From 1721806b16a14ef047cff87c6cf1dc5b0e252112 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Tue, 24 Dec 2024 17:00:31 +0800 Subject: [PATCH 2/2] keyguard: 1.7.1 -> 1.7.2 --- pkgs/by-name/ke/keyguard/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ke/keyguard/package.nix b/pkgs/by-name/ke/keyguard/package.nix index 827a05718a1a..787b18bb6d11 100644 --- a/pkgs/by-name/ke/keyguard/package.nix +++ b/pkgs/by-name/ke/keyguard/package.nix @@ -21,13 +21,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "keyguard"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "AChep"; repo = "keyguard-app"; - tag = "r20241221"; - hash = "sha256-AeomyFazONZatbxT6qaTt+/5eBAkgWYwti62CD98jkg="; + tag = "r20241223"; + hash = "sha256-7fMSpTKEEjSXfYotZ/qxX1m+i8GheCLboo+XoA3gTbc="; }; gradleBuildTask = ":desktopApp:createDistributable";