From 230bb1ac5bede284938324d00f71f88930b787d8 Mon Sep 17 00:00:00 2001 From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> Date: Sat, 23 Mar 2024 07:57:09 +0000 Subject: [PATCH 1/2] warp-terminal: fix update.sh can not use `import ` on update machine as `` does not exist. therefore cd to the `warp-terminal` directory and use the relative path to nixpkgs root. https://r.ryantm.com/log/warp-terminal/2024-03-19.log --- pkgs/by-name/wa/warp-terminal/update.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/wa/warp-terminal/update.sh b/pkgs/by-name/wa/warp-terminal/update.sh index 1918f34db87e..2c9c69dc0cec 100755 --- a/pkgs/by-name/wa/warp-terminal/update.sh +++ b/pkgs/by-name/wa/warp-terminal/update.sh @@ -3,7 +3,8 @@ #shellcheck shell=bash set -eu -o pipefail -dirname="$(dirname "$0")" +cd "$(dirname "$0")" +nixpkgs=../../../../. err() { echo "$*" >&2 @@ -11,11 +12,11 @@ err() { } json_get() { - jq -r "$1" < "$dirname/versions.json" + jq -r "$1" < "./versions.json" } json_set() { - jq --arg x "$2" "$1 = \$x" < "$dirname/versions.json" | sponge "$dirname/versions.json" + jq --arg x "$2" "$1 = \$x" < "./versions.json" | sponge "./versions.json" } resolve_url() { @@ -53,10 +54,10 @@ get_version() { sri_get() { local ouput sri output=$(nix-build --expr \ - 'with import {}; + "with import $nixpkgs {}; fetchurl { - url = "'"$1"'"; - }' 2>&1 || true) + url = \"$1\"; + }" 2>&1 || true) sri=$(echo "$output" | awk '/^\s+got:\s+/{ print $2 }') [[ -z "$sri" ]] && err "$output" echo "$sri" From 33579e98bf39d7c957c274d1db3a977b34916d19 Mon Sep 17 00:00:00 2001 From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> Date: Sat, 23 Mar 2024 07:59:11 +0000 Subject: [PATCH 2/2] warp-terminal: 0.2024.03.12.08.02.stable_01 -> 0.2024.03.19.08.01.stable_01 --- pkgs/by-name/wa/warp-terminal/versions.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index dc1e3c73d77b..154c7ffdeccc 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,10 +1,10 @@ { "darwin": { - "hash": "sha256-GgaRlROSWYZgFlH0bH6PTnRE3L/bb0kX0P6m7nmPlsY=", - "version": "0.2024.03.12.08.02.stable_01" + "hash": "sha256-aOw/c6Y+4x6kwxcwnajHh92ZZDeaM/Y1df76HgUjVn8=", + "version": "0.2024.03.19.08.01.stable_01" }, "linux": { - "hash": "sha256-9reFBIu32TzxE46c3PBVzkZYaMV4HVDASvTAVQltYN0=", - "version": "0.2024.03.12.08.02.stable_01" + "hash": "sha256-efnYh48xcLneeotH9iSY0xQRgMXI/erM6F2fIH38yjY=", + "version": "0.2024.03.19.08.01.stable_01" } }