diff --git a/pkgs/by-name/an/antigravity-cli/package.nix b/pkgs/by-name/an/antigravity-cli/package.nix index 21da4d2caa59..496b0c4e2731 100644 --- a/pkgs/by-name/an/antigravity-cli/package.nix +++ b/pkgs/by-name/an/antigravity-cli/package.nix @@ -6,8 +6,9 @@ versionCheckHook, }: let - wholeVersion = "1.0.12-6156052174077952"; # unfortunately this has dumb versioning - version = builtins.head (lib.splitString "-" wholeVersion); + version = "1.0.12"; + buildId = "6156052174077952"; + wholeVersion = "${version}-${buildId}"; throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"; diff --git a/pkgs/by-name/an/antigravity-cli/update.sh b/pkgs/by-name/an/antigravity-cli/update.sh index 746a57dd87e7..835800502981 100755 --- a/pkgs/by-name/an/antigravity-cli/update.sh +++ b/pkgs/by-name/an/antigravity-cli/update.sh @@ -3,6 +3,7 @@ set -euo pipefail +packageFile=pkgs/by-name/an/antigravity-cli/package.nix baseUrl=https://storage.googleapis.com/antigravity-public/antigravity-cli currentVersion=$(nix-instantiate --eval --raw -E "with import ./. {}; antigravity-cli.version or (lib.getVersion antigravity-cli)") @@ -15,8 +16,11 @@ fi # urls unfortunately include a weird buildid that make it hard to get latestWholeVersion=$(curl $baseUrl/$latestVersion/manifest.json | jq -r '.platforms."linux-x64".url' | cut -d/ -f6) +latestBuildId=${latestWholeVersion#*-} +currentBuildId=$(sed -n 's/.*buildId = "\([^"]*\)";.*/\1/p' "$packageFile") -update-source-version --version-key=wholeVersion antigravity-cli $latestWholeVersion || true +sed -i "s/buildId = \"$currentBuildId\";/buildId = \"$latestBuildId\";/" "$packageFile" +update-source-version --version-key=version antigravity-cli $latestVersion || true for system in \ x86_64-linux \ @@ -25,5 +29,5 @@ for system in \ aarch64-darwin; do hash=$(nix store prefetch-file --json --hash-type sha256 \ $(nix-instantiate --eval --raw -E "with import ./. {}; antigravity-cli.src.url" --system "$system") | jq -r '.hash') - update-source-version --version-key=wholeVersion antigravity-cli $latestWholeVersion $hash --system=$system --ignore-same-version + update-source-version --version-key=version antigravity-cli $latestVersion $hash --system=$system --ignore-same-version done