From 527c32fc742fd506fec84aaddcaafefdd0c35213 Mon Sep 17 00:00:00 2001 From: gaykitty <126119280+gaykitty@users.noreply.github.com> Date: Fri, 24 Nov 2023 19:26:56 -0500 Subject: [PATCH 1/3] stargazer: 1.0.5 -> 1.1.0 Includes security patch for RUSTSEC-2023-0052 Change log: https://git.sr.ht/~zethra/stargazer/refs/1.1.0 --- pkgs/servers/gemini/stargazer/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/gemini/stargazer/default.nix b/pkgs/servers/gemini/stargazer/default.nix index 4dc0ba5cc0f5..60dae05b70e7 100644 --- a/pkgs/servers/gemini/stargazer/default.nix +++ b/pkgs/servers/gemini/stargazer/default.nix @@ -9,18 +9,18 @@ rustPlatform.buildRustPackage rec { pname = "stargazer"; - version = "1.0.5"; + version = "1.1.0"; src = fetchFromSourcehut { owner = "~zethra"; repo = "stargazer"; rev = version; - hash = "sha256-n88X3RJD7PqOcVRK/bp/gMNLVrbwnJ2iwi2rCpsfp+o="; + hash = "sha256-c0gKvVaMiUOGHlPmtaW6it8J9MusQY7BA/5F9I3ysMc="; }; - cargoHash = "sha256-Yqh3AQIOahKz2mLeVNm58Yr6vhjU4aQwN62y3Z5/EJc="; + cargoHash = "sha256-8VrEZZNSFLAjUagsiRApvjiXusBHLLn1O/+QKtQY4wg="; - doCheck = false; # Uses extenal testing framework that requires network + doCheck = false; # Uses external testing framework that requires network nativeBuildInputs = [ installShellFiles scdoc ]; From 88273849a6e1dcd06c5edc37f58296e21f84415e Mon Sep 17 00:00:00 2001 From: gaykitty <126119280+gaykitty@users.noreply.github.com> Date: Fri, 24 Nov 2023 19:44:35 -0500 Subject: [PATCH 2/3] nixosTests.stargazer: switch to using gemget --- nixos/tests/web-servers/stargazer.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/web-servers/stargazer.nix b/nixos/tests/web-servers/stargazer.nix index c522cfee5dbc..6365d6a4fff1 100644 --- a/nixos/tests/web-servers/stargazer.nix +++ b/nixos/tests/web-servers/stargazer.nix @@ -24,7 +24,7 @@ geminiserver.wait_for_open_port(1965) with subtest("check is serving over gemini"): - response = geminiserver.succeed("${pkgs.gmni}/bin/gmni -j once -i -N gemini://localhost:1965") + response = geminiserver.succeed("${pkgs.gemget}/bin/gemget --header -o - gemini://localhost:1965") print(response) assert "Hello NixOS!" in response ''; From fe5f6ab623ef8ae59fa0d5d6c504048f5427d151 Mon Sep 17 00:00:00 2001 From: gaykitty <126119280+gaykitty@users.noreply.github.com> Date: Sun, 26 Nov 2023 11:02:02 -0500 Subject: [PATCH 3/3] stargazer: Add nixosTests.stargazer to passthru.tests --- pkgs/servers/gemini/stargazer/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/gemini/stargazer/default.nix b/pkgs/servers/gemini/stargazer/default.nix index 60dae05b70e7..5d346ec15a0c 100644 --- a/pkgs/servers/gemini/stargazer/default.nix +++ b/pkgs/servers/gemini/stargazer/default.nix @@ -5,6 +5,7 @@ , installShellFiles , scdoc , Security +, nixosTests }: rustPlatform.buildRustPackage rec { @@ -22,6 +23,10 @@ rustPlatform.buildRustPackage rec { doCheck = false; # Uses external testing framework that requires network + passthru.tests = { + basic-functionality = nixosTests.stargazer; + }; + nativeBuildInputs = [ installShellFiles scdoc ]; buildInputs = lib.optional stdenv.isDarwin Security;