From 26c854ff8e4cf8d000ce4791603df21c532e7929 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 19 Aug 2025 16:41:55 +0200 Subject: [PATCH 1/7] radicle-node: use finalAttrs pattern --- pkgs/by-name/ra/radicle-node/package.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index 347044035a06d..5d8100c6c41cc 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -17,16 +17,16 @@ testers, xdg-utils, }: -rustPlatform.buildRustPackage rec { + +rustPlatform.buildRustPackage (finalAttrs: { pname = "radicle-node"; version = "1.3.0"; - env.RADICLE_VERSION = version; src = fetchFromRadicle { seed = "seed.radicle.xyz"; repo = "z3gqcJUoA1n9HaHKufZs5FCSGazv5"; node = "z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0gK+fM/YGGpxlcR1HQixbLK0/sv+HH29h6ajEP2w2pI="; leaveDotGit = true; postFetch = '' @@ -38,6 +38,8 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-qLRFZXbVbsgMyXiljsb8lOBCDZKa17LcxWuPaUYSG70="; + env.RADICLE_VERSION = finalAttrs.version; + nativeBuildInputs = [ asciidoctor installShellFiles @@ -56,7 +58,7 @@ rustPlatform.buildRustPackage rec { "--package=radicle-remote-helper" ]; - cargoTestFlags = cargoBuildFlags; + cargoTestFlags = finalAttrs.cargoBuildFlags; # tests regularly time out on aarch64 doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86; @@ -166,4 +168,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "rad"; }; -} +}) From cda70f9efa652d2d9d10e95909e660b0139b3e6a Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 19 Aug 2025 16:43:10 +0200 Subject: [PATCH 2/7] radicle-node: use canonical release reference --- pkgs/by-name/ra/radicle-node/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index 5d8100c6c41cc..575be9bdd70ca 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -25,8 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromRadicle { seed = "seed.radicle.xyz"; repo = "z3gqcJUoA1n9HaHKufZs5FCSGazv5"; - node = "z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM"; - tag = "v${finalAttrs.version}"; + tag = "releases/${finalAttrs.version}"; hash = "sha256-0gK+fM/YGGpxlcR1HQixbLK0/sv+HH29h6ajEP2w2pI="; leaveDotGit = true; postFetch = '' From d6b07e06cc2ebe5698c2672ac02d644a9b54e0b3 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 19 Aug 2025 17:04:16 +0200 Subject: [PATCH 3/7] radicle-node: depend on gitMinimal instead of git --- pkgs/by-name/ra/radicle-node/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index 575be9bdd70ca..8f9f339fbea4d 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -1,7 +1,7 @@ { asciidoctor, fetchFromRadicle, - git, + gitMinimal, installShellFiles, jq, lib, @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: { installShellFiles makeWrapper ]; - nativeCheckInputs = [ git ]; + nativeCheckInputs = [ gitMinimal ]; preBuild = '' export GIT_HEAD=$(<$src/.git_head) @@ -90,7 +90,7 @@ rustPlatform.buildRustPackage (finalAttrs: { wrapProgram "$program" \ --prefix PATH : "${ lib.makeBinPath [ - git + gitMinimal man-db openssh xdg-utils @@ -125,7 +125,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rad debug | jq -e ' (.sshVersion | contains("${openssh.version}")) and - (.gitVersion | contains("${git.version}")) + (.gitVersion | contains("${gitMinimal.version}")) ' touch $out From 4f2c8f74eb89c6e616a9a2b573c305eb52650e28 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 19 Aug 2025 17:06:05 +0200 Subject: [PATCH 4/7] radicle-node: use makeBinaryWrapper --- pkgs/by-name/ra/radicle-node/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index 8f9f339fbea4d..618a2a26b3d4c 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -5,7 +5,7 @@ installShellFiles, jq, lib, - makeWrapper, + makeBinaryWrapper, man-db, nixos, nixosTests, @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ asciidoctor installShellFiles - makeWrapper + makeBinaryWrapper ]; nativeCheckInputs = [ gitMinimal ]; From 65c6af38ef2520b476759e5e74c3d926fdd7d3c0 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 19 Aug 2025 17:09:11 +0200 Subject: [PATCH 5/7] radicle-node: use versionCheckHook --- pkgs/by-name/ra/radicle-node/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index 618a2a26b3d4c..7e4138e972bcb 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -16,6 +16,7 @@ stdenv, testers, xdg-utils, + versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -84,6 +85,10 @@ rustPlatform.buildRustPackage (finalAttrs: { done ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + postFixup = '' for program in $out/bin/* ; do @@ -104,7 +109,6 @@ rustPlatform.buildRustPackage (finalAttrs: { package = radicle-node; in { - version = testers.testVersion { inherit package; }; basic = runCommand "${package.name}-basic-test" { From 3f62d854f851f72be6f845d01544574cd48b589f Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 19 Aug 2025 20:16:00 +0200 Subject: [PATCH 6/7] radicle-node: add updateScript --- pkgs/by-name/ra/radicle-node/package.nix | 1 + pkgs/by-name/ra/radicle-node/update.sh | 5 +++++ 2 files changed, 6 insertions(+) create mode 100755 pkgs/by-name/ra/radicle-node/update.sh diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index 7e4138e972bcb..e3ec0cc68bfc9 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -104,6 +104,7 @@ rustPlatform.buildRustPackage (finalAttrs: { done ''; + passthru.updateScript = ./update.sh; passthru.tests = let package = radicle-node; diff --git a/pkgs/by-name/ra/radicle-node/update.sh b/pkgs/by-name/ra/radicle-node/update.sh new file mode 100755 index 0000000000000..b1a79b18da559 --- /dev/null +++ b/pkgs/by-name/ra/radicle-node/update.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p coreutils gnused common-updater-scripts nix-update + +version=$(list-git-tags | tail -1 | sed 's|^releases/||') +nix-update --version="$version" radicle-node From 6203ba7f0b9addbfe687f241b0cae233a703298f Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 19 Aug 2025 16:43:48 +0200 Subject: [PATCH 7/7] radicle-node: add defelo as maintainer --- pkgs/by-name/ra/radicle-node/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index e3ec0cc68bfc9..fbdb2eebfa64e 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -169,6 +169,7 @@ rustPlatform.buildRustPackage (finalAttrs: { maintainers = with lib.maintainers; [ amesgen lorenzleutgeb + defelo ]; mainProgram = "rad"; };