From 865320f255a4dbba40f5afe135a8b9ab19ec2463 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Jul 2026 09:46:47 +0000 Subject: [PATCH 1/3] croc: 10.4.6 -> 10.4.12 --- pkgs/by-name/cr/croc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cr/croc/package.nix b/pkgs/by-name/cr/croc/package.nix index 6c54f91f9708..24bcc1e1fcaa 100644 --- a/pkgs/by-name/cr/croc/package.nix +++ b/pkgs/by-name/cr/croc/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "croc"; - version = "10.4.6"; + version = "10.4.12"; src = fetchFromGitHub { owner = "schollz"; repo = "croc"; rev = "v${finalAttrs.version}"; - hash = "sha256-+KG1PHUymeoAj92UAn/sitQF6xC1xwl+cdisxy2ZtPs="; + hash = "sha256-ThMwPbQcxRBVvL/jxTluBc4gKbEIl1Wm69c/3r976s0="; }; vendorHash = "sha256-rwGunSDIgetBsk97LxQz0WHpzMDMMESHC1OhBWRuVjI="; From 4dd23d9a4a94271f861628a1cf7ae1779fa3d197 Mon Sep 17 00:00:00 2001 From: kaynetik Date: Thu, 9 Jul 2026 13:46:14 +0200 Subject: [PATCH 2/3] croc: fix passthrough tests Both tests target a specific relay on purpose, so the local-relay path is not what we want to exercise. Passing ``--no-local` on the sender disables the ephemeral local relay and LAN discovery, forcing the transfer through the relay under test and making the tests deterministic again. Signed-off-by: kaynetik --- nixos/tests/croc.nix | 4 ++-- pkgs/by-name/cr/croc/test-local-relay.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/croc.nix b/nixos/tests/croc.nix index f5eec96d6cc3..571a64f736ba 100644 --- a/nixos/tests/croc.nix +++ b/nixos/tests/croc.nix @@ -12,8 +12,8 @@ in meta = with pkgs.lib.maintainers; { maintainers = [ equirosa - SuperSandro2000 ryan4yin + kaynetik ]; }; @@ -45,7 +45,7 @@ in sender.execute("echo Hello World > testfile01.txt") sender.execute("echo Hello Earth > testfile02.txt") sender.execute( - "env CROC_SECRET=topSecret croc --pass ${pass} --relay relay send testfile01.txt testfile02.txt >&2 &" + "env CROC_SECRET=topSecret croc --pass ${pass} --relay relay send --no-local testfile01.txt testfile02.txt >&2 &" ) # receive the testfiles and check them diff --git a/pkgs/by-name/cr/croc/test-local-relay.nix b/pkgs/by-name/cr/croc/test-local-relay.nix index f0a66fcaba82..a9d0b36455db 100644 --- a/pkgs/by-name/cr/croc/test-local-relay.nix +++ b/pkgs/by-name/cr/croc/test-local-relay.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { # start sender in background MSG="See you later, alligator!" - croc --relay localhost:11111 send --code correct-horse-battery-staple --text "$MSG" & + croc --relay localhost:11111 send --no-local --code correct-horse-battery-staple --text "$MSG" & # wait for things to settle sleep 1 From db275fd72a637f314107b0f871e9a8241ec14f73 Mon Sep 17 00:00:00 2001 From: kaynetik Date: Fri, 10 Jul 2026 07:28:33 +0200 Subject: [PATCH 3/3] croc: bump to v10.4.13 Signed-off-by: kaynetik --- nixos/tests/croc.nix | 2 +- pkgs/by-name/cr/croc/package.nix | 4 ++-- pkgs/by-name/cr/croc/test-local-relay.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/tests/croc.nix b/nixos/tests/croc.nix index 571a64f736ba..bb5d5d6635e4 100644 --- a/nixos/tests/croc.nix +++ b/nixos/tests/croc.nix @@ -45,7 +45,7 @@ in sender.execute("echo Hello World > testfile01.txt") sender.execute("echo Hello Earth > testfile02.txt") sender.execute( - "env CROC_SECRET=topSecret croc --pass ${pass} --relay relay send --no-local testfile01.txt testfile02.txt >&2 &" + "env CROC_SECRET=topSecret croc --pass ${pass} --relay relay send testfile01.txt testfile02.txt >&2 &" ) # receive the testfiles and check them diff --git a/pkgs/by-name/cr/croc/package.nix b/pkgs/by-name/cr/croc/package.nix index 24bcc1e1fcaa..d10752e52d65 100644 --- a/pkgs/by-name/cr/croc/package.nix +++ b/pkgs/by-name/cr/croc/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "croc"; - version = "10.4.12"; + version = "10.4.13"; src = fetchFromGitHub { owner = "schollz"; repo = "croc"; rev = "v${finalAttrs.version}"; - hash = "sha256-ThMwPbQcxRBVvL/jxTluBc4gKbEIl1Wm69c/3r976s0="; + hash = "sha256-XhudK0wFk2VFYmd1ihW4SjJ4nzwNxOp9pTNUWJUg+AU="; }; vendorHash = "sha256-rwGunSDIgetBsk97LxQz0WHpzMDMMESHC1OhBWRuVjI="; diff --git a/pkgs/by-name/cr/croc/test-local-relay.nix b/pkgs/by-name/cr/croc/test-local-relay.nix index a9d0b36455db..f0a66fcaba82 100644 --- a/pkgs/by-name/cr/croc/test-local-relay.nix +++ b/pkgs/by-name/cr/croc/test-local-relay.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { # start sender in background MSG="See you later, alligator!" - croc --relay localhost:11111 send --no-local --code correct-horse-battery-staple --text "$MSG" & + croc --relay localhost:11111 send --code correct-horse-battery-staple --text "$MSG" & # wait for things to settle sleep 1