From 66d53b3e782e1b6c406fed9c7a4bb232c6bd386c Mon Sep 17 00:00:00 2001 From: Lorenz Leutgeb Date: Mon, 2 Jun 2025 17:49:56 +0200 Subject: [PATCH 1/2] =?UTF-8?q?radicle-node:=201.1.0=20=E2=86=92=201.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...5b5b5ad715e2b812087947281f0add9aa05e.patch | 22 ------------------- pkgs/by-name/ra/radicle-node/package.nix | 12 ++++------ 2 files changed, 4 insertions(+), 30 deletions(-) delete mode 100644 pkgs/by-name/ra/radicle-node/61865b5b5ad715e2b812087947281f0add9aa05e.patch diff --git a/pkgs/by-name/ra/radicle-node/61865b5b5ad715e2b812087947281f0add9aa05e.patch b/pkgs/by-name/ra/radicle-node/61865b5b5ad715e2b812087947281f0add9aa05e.patch deleted file mode 100644 index 742ac55a7f54..000000000000 --- a/pkgs/by-name/ra/radicle-node/61865b5b5ad715e2b812087947281f0add9aa05e.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 61865b5b5ad715e2b812087947281f0add9aa05e -Author: Fintan Halpenny -Date: 2024-11-19 14:38:38 +0100 - - cob: fix documentation - - `no_run` will compile but not run the code. Use `ignore` instead, and also added - `rust` for syntax highlighting. - -diff --git a/radicle-cob/src/backend/git/stable.rs b/radicle-cob/src/backend/git/stable.rs -index 0d8ea27b..ef18ae55 100644 ---- a/radicle-cob/src/backend/git/stable.rs -+++ b/radicle-cob/src/backend/git/stable.rs -@@ -53,7 +53,7 @@ pub fn read_timestamp() -> i64 { - /// - /// # Usage - /// --/// ```no_run -+/// ```rust, ignore - /// let oid1 = with_advanced_timestamp(|| cob.update("New revision OID")); - /// let oid2 = with_advanced_timestamp(|| cob.update("Another revision OID")); - /// ``` diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index 22dab16a679e..1dd45c64f398 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -19,20 +19,16 @@ }: rustPlatform.buildRustPackage rec { pname = "radicle-node"; - version = "1.1.0"; + version = "1.2.0"; env.RADICLE_VERSION = version; src = fetchgit { url = "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git"; - rev = "refs/namespaces/z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT/refs/tags/v${version}"; - hash = "sha256-M4oz9tWjI/eqV4Gz1b512MEmvsZ5u3R9y6P9VeeH9CA="; + rev = "refs/namespaces/z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM/refs/tags/v${version}"; + hash = "sha256-RB8yDfttVTkZmk01ubLkwrwD6IYo3Ehe7bPosJzoQk4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-SzwBQxTqQafHDtH8+OWkAMDnKh3AH0PeSMBWpHprQWM="; - - patches = [ - ./61865b5b5ad715e2b812087947281f0add9aa05e.patch - ]; + cargoHash = "sha256-/6VlRwWtJfHf6tXD2HJUTbThwTYeZFTJqtaxclrm3+c="; nativeBuildInputs = [ asciidoctor From afa09e5e8525f6753fec6b9b45fd76b198edf235 Mon Sep 17 00:00:00 2001 From: Lorenz Leutgeb Date: Mon, 2 Jun 2025 19:13:07 +0200 Subject: [PATCH 2/2] radicle-node: Preserve Git commit hash and date Co-authored-by: Defelo Co-authored-by: Martin Joerg --- pkgs/by-name/ra/radicle-node/package.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index 1dd45c64f398..9024e11bddde 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -25,7 +25,13 @@ rustPlatform.buildRustPackage rec { src = fetchgit { url = "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git"; rev = "refs/namespaces/z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM/refs/tags/v${version}"; - hash = "sha256-RB8yDfttVTkZmk01ubLkwrwD6IYo3Ehe7bPosJzoQk4="; + hash = "sha256-AWgLhL6GslE3r2FcZu2imV5ZtEKlUD+a4C5waRGO2lM="; + leaveDotGit = true; + postFetch = '' + git -C $out rev-parse HEAD > $out/.git_head + git -C $out log -1 --pretty=%ct HEAD > $out/.git_time + rm -rf $out/.git + ''; }; useFetchCargoVendor = true; cargoHash = "sha256-/6VlRwWtJfHf6tXD2HJUTbThwTYeZFTJqtaxclrm3+c="; @@ -37,6 +43,11 @@ rustPlatform.buildRustPackage rec { ]; nativeCheckInputs = [ git ]; + preBuild = '' + export GIT_HEAD=$(<$src/.git_head) + export SOURCE_DATE_EPOCH=$(<$src/.git_time) + ''; + # tests regularly time out on aarch64 doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86;