From dd50092fdaedcfe8e1fffe64ceddf461752d512a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Wed, 22 Feb 2023 11:06:45 +0100
Subject: [PATCH] croc: 9.6.2 -> 9.6.3, disable extra test on darwin, cleanup

Diff: https://github.com/schollz/croc/compare/v9.6.2...v9.6.3
---
 pkgs/tools/networking/croc/default.nix        |  6 ++--
 .../networking/croc/test-local-relay.nix      | 33 ++++++++++++-------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix
index 77d8de4294b0..1ff3a511f692 100644
--- a/pkgs/tools/networking/croc/default.nix
+++ b/pkgs/tools/networking/croc/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "croc";
-  version = "9.6.2";
+  version = "9.6.3";
 
   src = fetchFromGitHub {
     owner = "schollz";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-MaIvxO2bvLGrZmBLXZk2vgW1NtyoVKRxXEZALEwI/lY=";
+    sha256 = "sha256-nAziLnuLkkPl1/RskKEehvQBMG4sYTEv+uPOQemum9w=";
   };
 
-  vendorSha256 = "sha256-X+DxN0DAyZ/z8YRRjuezegcPHa6SJ3/XXPYP+1Apmjw=";
+  vendorSha256 = "sha256-yZ7S/6I5xdrfmyPkZsUUavXum8RqEVrlgrkJMQZc6IQ=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/tools/networking/croc/test-local-relay.nix b/pkgs/tools/networking/croc/test-local-relay.nix
index bdcecb6b54c2..a3aa0f3c966d 100644
--- a/pkgs/tools/networking/croc/test-local-relay.nix
+++ b/pkgs/tools/networking/croc/test-local-relay.nix
@@ -2,18 +2,27 @@
 
 stdenv.mkDerivation {
   name = "croc-test-local-relay";
-  meta.timeout = 300;
+
+  nativeBuildInputs = [ croc ];
+
   buildCommand = ''
-          HOME=$(mktemp -d)
-          # start a local relay
-          ${croc}/bin/croc relay --ports 11111,11112 &
-          # start sender in background
-          MSG="See you later, alligator!"
-          ${croc}/bin/croc --relay localhost:11111 send --code correct-horse-battery-staple --text "$MSG" &
-          # wait for things to settle
-          sleep 1
-          MSG2=$(${croc}/bin/croc --relay localhost:11111 --yes correct-horse-battery-staple)
-          # compare
-          [ "$MSG" = "$MSG2" ] && touch $out
+    HOME=$(mktemp -d)
+    # start a local relay
+    croc relay --ports 11111,11112 &
+    # start sender in background
+    MSG="See you later, alligator!"
+    croc --relay localhost:11111 send --code correct-horse-battery-staple --text "$MSG" &
+    # wait for things to settle
+    sleep 1
+    MSG2=$(croc --relay localhost:11111 --yes correct-horse-battery-staple)
+    # compare
+    [ "$MSG" = "$MSG2" ] && touch $out
   '';
+
+  __darwinAllowLocalNetworking = true;
+
+  meta = {
+    timeout = 300;
+    broken = stdenv.isDarwin;
+  };
 }