From a9750940a48b68329a33a4c588900428d89cc02e Mon Sep 17 00:00:00 2001 From: Rowan Goemans Date: Wed, 28 Aug 2024 00:56:18 +0200 Subject: [PATCH] warp-terminal: Add Aarch64 support --- pkgs/by-name/wa/warp-terminal/package.nix | 13 +++++++++---- pkgs/by-name/wa/warp-terminal/update.sh | 9 +++++++-- pkgs/by-name/wa/warp-terminal/versions.json | 6 +++++- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/wa/warp-terminal/package.nix b/pkgs/by-name/wa/warp-terminal/package.nix index 8eae7a2a5dbd..71c23dc8f751 100644 --- a/pkgs/by-name/wa/warp-terminal/package.nix +++ b/pkgs/by-name/wa/warp-terminal/package.nix @@ -23,12 +23,17 @@ pname = "warp-terminal"; versions = lib.importJSON ./versions.json; passthru.updateScript = ./update.sh; +linux_arch = + if stdenv.hostPlatform.system == "x86_64-linux" + then "x86_64" + else "aarch64"; + linux = stdenv.mkDerivation (finalAttrs: { inherit pname meta passthru; - inherit (versions.linux) version; + inherit (versions."linux_${linux_arch}") version; src = fetchurl { - inherit (versions.linux) hash; - url = "https://releases.warp.dev/stable/v${finalAttrs.version}/warp-terminal-v${finalAttrs.version}-1-x86_64.pkg.tar.zst"; + inherit (versions."linux_${linux_arch}") hash; + url = "https://releases.warp.dev/stable/v${finalAttrs.version}/warp-terminal-v${finalAttrs.version}-1-${linux_arch}.pkg.tar.zst"; }; sourceRoot = "."; @@ -100,7 +105,7 @@ meta = with lib; { license = licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ emilytrau imadnyc donteatoreo johnrtitor ]; - platforms = platforms.darwin ++ [ "x86_64-linux" ]; + platforms = platforms.darwin ++ [ "x86_64-linux" "aarch64-linux" ]; }; in diff --git a/pkgs/by-name/wa/warp-terminal/update.sh b/pkgs/by-name/wa/warp-terminal/update.sh index 2c9c69dc0cec..2ea6f06b9e18 100755 --- a/pkgs/by-name/wa/warp-terminal/update.sh +++ b/pkgs/by-name/wa/warp-terminal/update.sh @@ -27,10 +27,14 @@ resolve_url() { pkg=macos sfx=dmg ;; - linux) + linux_x86_64) pkg=pacman sfx=pkg.tar.zst ;; + linux_aarch64) + pkg=pacman_arm64 + sfx=pkg.tar.zst + ;; *) err "Unexpected download type: $1" ;; @@ -64,7 +68,8 @@ sri_get() { } -for sys in darwin linux; do +for sys in darwin linux_x86_64 linux_aarch64; do + echo ${sys} url=$(resolve_url ${sys}) version=$(get_version "${url}") if [[ ${version} != "$(json_get ".${sys}.version")" ]]; then diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 936d8cbd3598..2ae689c98528 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -3,8 +3,12 @@ "hash": "sha256-EDhj4Gb0ykFX8W2G8osusjggemcuHO7hkUKb151cQ6g=", "version": "0.2024.08.20.08.02.stable_00" }, - "linux": { + "linux_x86_64": { "hash": "sha256-Uk5pSoAvEppjLnskLc5/ftcCaiJnXATJfCPDP2QpBo8=", "version": "0.2024.08.20.08.02.stable_00" + }, + "linux_aarch64": { + "hash": "sha256-B0mUAwydIgi7Nhm/iUhEjkV3LL+qLfXZcOz6+7eDZGc=", + "version": "0.2024.08.20.08.02.stable_00" } }