From 04bd70460a061d4b85251c298bf255e183592aa8 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sun, 17 Aug 2025 17:43:05 +0200 Subject: [PATCH] radicle-tui: use fetchFromRadicle (cherry picked from commit 914c4f23461c546d580675742b0c5bd4f04b4796) --- pkgs/by-name/ra/radicle-tui/package.nix | 10 ++++++---- pkgs/by-name/ra/radicle-tui/update.sh | 9 +++------ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ra/radicle-tui/package.nix b/pkgs/by-name/ra/radicle-tui/package.nix index 46f954274414..0135691e39dd 100644 --- a/pkgs/by-name/ra/radicle-tui/package.nix +++ b/pkgs/by-name/ra/radicle-tui/package.nix @@ -1,7 +1,7 @@ { lib, rustPlatform, - fetchgit, + fetchFromRadicle, stdenv, libiconv, zlib, @@ -13,9 +13,11 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "radicle-tui"; version = "0.6.0"; - src = fetchgit { - url = "https://seed.radicle.xyz/z39mP9rQAaGmERfUMPULfPUi473tY.git"; - rev = "refs/namespaces/z6MkswQE8gwZw924amKatxnNCXA55BMupMmRg7LvJuim2C1V/refs/tags/${finalAttrs.version}"; + src = fetchFromRadicle { + seed = "seed.radicle.xyz"; + repo = "z39mP9rQAaGmERfUMPULfPUi473tY"; + node = "z6MkswQE8gwZw924amKatxnNCXA55BMupMmRg7LvJuim2C1V"; + tag = finalAttrs.version; hash = "sha256-rz9l9GtycqZoROUI6Hn0Fv5Br0YCIrcHlEWLMP4hasQ="; leaveDotGit = true; postFetch = '' diff --git a/pkgs/by-name/ra/radicle-tui/update.sh b/pkgs/by-name/ra/radicle-tui/update.sh index 2f423909a9de..36a50daf217f 100755 --- a/pkgs/by-name/ra/radicle-tui/update.sh +++ b/pkgs/by-name/ra/radicle-tui/update.sh @@ -6,13 +6,10 @@ set -euo pipefail dirname="$(dirname "${BASH_SOURCE[0]}")" url=$(nix-instantiate --eval --raw -A radicle-tui.src.url) -old_ref=$(nix-instantiate --eval --raw -A radicle-tui.src.rev) -new_ref=$(git ls-remote "$url" 'refs/namespaces/*/refs/tags/*' | cut -f2 | tail -1) +old_node=$(nix-instantiate --eval --raw -A radicle-tui.src.node) -[[ "$old_ref" =~ ^refs/namespaces/([^/]+)/refs/tags/([^/]+)$ ]] -old_node="${BASH_REMATCH[1]}" - -[[ "$new_ref" =~ ^refs/namespaces/([^/]+)/refs/tags/([^/]+)$ ]] +ref=$(git ls-remote "$url" 'refs/namespaces/*/refs/tags/*' | cut -f2 | tail -1) +[[ "$ref" =~ ^refs/namespaces/([^/]+)/refs/tags/([^/]+)$ ]] new_node="${BASH_REMATCH[1]}" version="${BASH_REMATCH[2]}"