From 67bf3bcc1ad15029ebedf0988461b6a162da0b0e Mon Sep 17 00:00:00 2001 From: Thomas Butter Date: Sun, 3 May 2026 04:47:14 +0000 Subject: [PATCH] cjdns: 22.1 -> 22.3 --- pkgs/by-name/cj/cjdns/package.nix | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/cj/cjdns/package.nix b/pkgs/by-name/cj/cjdns/package.nix index e30db3812057..e9e8f81cae95 100644 --- a/pkgs/by-name/cj/cjdns/package.nix +++ b/pkgs/by-name/cj/cjdns/package.nix @@ -15,36 +15,22 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cjdns"; - version = "22.1"; + version = "22.3"; src = fetchFromGitHub { owner = "cjdelisle"; repo = "cjdns"; tag = "cjdns-v${finalAttrs.version}"; - hash = "sha256-0imQrkcvIA+2Eq/zlC65USMR7T3OUKwQxrB1KtVexyU="; + hash = "sha256-A5KPcjFrCIYhT/6W+J4Nvb1y23cAgv9M6PWcyN43st4="; }; patches = [ (replaceVars ./system-libsodium.patch { libsodium_include_dir = "${libsodium.dev}/include"; }) - # Remove mkpasswd since it is failing the build - (fetchpatch { - url = "https://github.com/cjdelisle/cjdns/commit/6391dba3f5fdab45df4b4b6b71dbe9620286ce32.patch"; - hash = "sha256-XVA4tdTVMLrV6zuGoBCkOgQq6NXh0x7u8HgmaxFeoRI="; - }) - (fetchpatch { - url = "https://github.com/cjdelisle/cjdns/commit/436d9a9784bae85734992c2561c778fbd2f5ac32.patch"; - hash = "sha256-THcYNGVbMx/xf3/5UIxEhz3OlODE0qiYgDBOlHunhj8="; - }) - # Fix build failure with Rust 1.89.0 (https://github.com/cjdelisle/cjdns/pull/1271) - (fetchpatch { - url = "https://github.com/cjdelisle/cjdns/commit/68b786aca5bfa427e5f58c029e4d9cc74969ef87.patch"; - hash = "sha256-FmrooDzrIWUIAnzwZTVDXI+Cl8pMngPqxsJjUHVhry8="; - }) ]; - cargoHash = "sha256-f96y6ZW0HxC+73ts5re8GIo2aigQgK3gXyF7fMrcJ0o="; + cargoHash = "sha256-tob45/99svE0R1Kk7G1+H7waBWYmI9VKC8ffl3ZmdcU="; nativeBuildInputs = [ which