pyrox.dev
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
authored by Sandro Jäckel and committed by Sandro Jäckel dd50092f dd73b3e5
+3
-3
pkgs/tools/networking/croc/default.nix
+3
-3
pkgs/tools/networking/croc/default.nix
···
2
2
3
3
buildGoModule rec {
4
4
pname = "croc";
5
-
version = "9.6.2";
5
+
version = "9.6.3";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = "schollz";
9
9
repo = pname;
10
10
rev = "v${version}";
11
-
sha256 = "sha256-MaIvxO2bvLGrZmBLXZk2vgW1NtyoVKRxXEZALEwI/lY=";
11
+
sha256 = "sha256-nAziLnuLkkPl1/RskKEehvQBMG4sYTEv+uPOQemum9w=";
12
12
};
13
13
14
-
vendorSha256 = "sha256-X+DxN0DAyZ/z8YRRjuezegcPHa6SJ3/XXPYP+1Apmjw=";
14
+
vendorSha256 = "sha256-yZ7S/6I5xdrfmyPkZsUUavXum8RqEVrlgrkJMQZc6IQ=";
15
15
16
16
subPackages = [ "." ];
17
17
+21
-12
pkgs/tools/networking/croc/test-local-relay.nix
+21
-12
pkgs/tools/networking/croc/test-local-relay.nix
···
2
2
3
3
stdenv.mkDerivation {
4
4
name = "croc-test-local-relay";
5
-
meta.timeout = 300;
5
+
6
+
nativeBuildInputs = [ croc ];
7
+
6
8
buildCommand = ''
7
-
HOME=$(mktemp -d)
8
-
# start a local relay
9
-
${croc}/bin/croc relay --ports 11111,11112 &
10
-
# start sender in background
11
-
MSG="See you later, alligator!"
12
-
${croc}/bin/croc --relay localhost:11111 send --code correct-horse-battery-staple --text "$MSG" &
13
-
# wait for things to settle
14
-
sleep 1
15
-
MSG2=$(${croc}/bin/croc --relay localhost:11111 --yes correct-horse-battery-staple)
16
-
# compare
17
-
[ "$MSG" = "$MSG2" ] && touch $out
9
+
HOME=$(mktemp -d)
10
+
# start a local relay
11
+
croc relay --ports 11111,11112 &
12
+
# start sender in background
13
+
MSG="See you later, alligator!"
14
+
croc --relay localhost:11111 send --code correct-horse-battery-staple --text "$MSG" &
15
+
# wait for things to settle
16
+
sleep 1
17
+
MSG2=$(croc --relay localhost:11111 --yes correct-horse-battery-staple)
18
+
# compare
19
+
[ "$MSG" = "$MSG2" ] && touch $out
18
20
'';
21
+
22
+
__darwinAllowLocalNetworking = true;
23
+
24
+
meta = {
25
+
timeout = 300;
26
+
broken = stdenv.isDarwin;
27
+
};
19
28
}