Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge pull request #314508 from aaronjheng/croc

authored by Sandro and committed by GitHub f37d2a28 baf1c6e1

Changed files
+9 -3
pkgs
tools
+3 -2
pkgs/tools/networking/croc/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "croc"; 5 - version = "9.6.16"; 5 + version = "10.0.5"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "schollz"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-rAOWiu0f9f1v1oD5HI/kl1knoHkU2LgS3D2qsdd98y4="; 11 + hash = "sha256-JrlNvfOxoOhvsjaRacGLZAc4r9HG69UdjFjb3GnSnW0="; 12 12 }; 13 13 14 14 vendorHash = "sha256-SxdN1IyQd/DLI8ZXyCWsW3JLi4dlGSvpr+ub/Oqkw70="; ··· 20 20 local-relay = callPackage ./test-local-relay.nix { }; 21 21 }; 22 22 }; 23 + 23 24 meta = with lib; { 24 25 description = "Easily and securely send things from one computer to another"; 25 26 longDescription = ''
+6 -1
pkgs/tools/networking/croc/test-local-relay.nix
··· 6 6 nativeBuildInputs = [ croc ]; 7 7 8 8 buildCommand = '' 9 - HOME=$(mktemp -d) 9 + HOME="$(mktemp -d)" 10 10 # start a local relay 11 11 croc relay --ports 11111,11112 & 12 + 13 + export CROC_SECRET="sN3nx4hGLeihmn8G" 14 + 12 15 # start sender in background 13 16 MSG="See you later, alligator!" 14 17 croc --relay localhost:11111 send --code correct-horse-battery-staple --text "$MSG" & 18 + 15 19 # wait for things to settle 16 20 sleep 1 17 21 MSG2=$(croc --relay localhost:11111 --yes correct-horse-battery-staple) 22 + 18 23 # compare 19 24 [ "$MSG" = "$MSG2" ] && touch $out 20 25 '';