b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

croc: 9.6.2 -> 9.6.3, disable extra test on darwin, cleanup

Browse source 
Diff: https://github.com/schollz/croc/compare/v9.6.2...v9.6.3
This commit is contained in:
Sandro Jäckel 2023-02-22 11:06:45 +01:00 committed by Sandro Jäckel
parent dd73b3e57b
commit dd50092fda
No known key found for this signature in database
GPG key ID: 3AF5A43A3EECC2E5
2 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/tools/networking/croc/default.nix
View file

@ -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 = [ "." ];

33
pkgs/tools/networking/croc/test-local-relay.nix
View file

@ -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;
};
}