From a6dea93ee37d113c2e3408775c1edbe0b912aea2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Oct 2024 14:07:11 +0000 Subject: [PATCH 1/3] croc: 10.0.11 -> 10.0.13 --- pkgs/tools/networking/croc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index d719c3f9b06a..817917aaf032 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "10.0.11"; + version = "10.0.13"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - hash = "sha256-vW67Q/11BPRHkDA1m99+PdxQUoylMt2sx6gZFEzgSNY="; + hash = "sha256-GrdJAXHdkJYB+k2RexcCWhIhxY9UNY9IVJbzlLKDcKA="; }; - vendorHash = "sha256-eejDwlovkGLENvNywtFPmqKcwqr+HB+oURL/sDfhOuA="; + vendorHash = "sha256-gTSc2mDNt7K954GXxUjjxPR0NkZwSTCjQDQ9x57ookw="; subPackages = [ "." ]; From fc264c25c2fe4edec0712ff52027715875ad330c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 9 Oct 2024 17:39:40 +0200 Subject: [PATCH 2/3] croc: remove inactive maintainer; nixos/tests/croc: match maintainer with package --- nixos/tests/croc.nix | 2 +- pkgs/tools/networking/croc/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/croc.nix b/nixos/tests/croc.nix index 5d709eb3d1cb..ea14c59446a1 100644 --- a/nixos/tests/croc.nix +++ b/nixos/tests/croc.nix @@ -7,7 +7,7 @@ let in { name = "croc"; meta = with pkgs.lib.maintainers; { - maintainers = [ hax404 julm ]; + maintainers = [ equirosa SuperSandro2000 ]; }; nodes = { diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 817917aaf032..ce301d0e3416 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -38,7 +38,7 @@ buildGoModule rec { ''; homepage = "https://github.com/schollz/croc"; license = licenses.mit; - maintainers = with maintainers; [ hugoreeves equirosa SuperSandro2000 ]; + maintainers = with maintainers; [ equirosa SuperSandro2000 ]; mainProgram = "croc"; }; } From cb097d74cc5090a0e3e47386c8189361ec507083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 9 Oct 2024 17:40:39 +0200 Subject: [PATCH 3/3] nixos/tests/croc: fix --pass argument and code passing --- nixos/tests/croc.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/croc.nix b/nixos/tests/croc.nix index ea14c59446a1..2e910f525261 100644 --- a/nixos/tests/croc.nix +++ b/nixos/tests/croc.nix @@ -3,7 +3,7 @@ let client = { pkgs, ... }: { environment.systemPackages = [ pkgs.croc ]; }; - pass = pkgs.writeText "pass" "PassRelay"; + pass = "PassRelay"; in { name = "croc"; meta = with pkgs.lib.maintainers; { @@ -38,12 +38,12 @@ in { sender.execute("echo Hello World > testfile01.txt") sender.execute("echo Hello Earth > testfile02.txt") sender.execute( - "croc --pass ${pass} --relay relay send --code topSecret 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 receiver.succeed( - "croc --pass ${pass} --yes --relay relay topSecret" + "env CROC_SECRET=topSecret croc --pass ${pass} --yes --relay relay" ) assert "Hello World" in receiver.succeed("cat testfile01.txt") assert "Hello Earth" in receiver.succeed("cat testfile02.txt")