diff --git a/nixos/tests/web-servers/stargazer.nix b/nixos/tests/web-servers/stargazer.nix index f56d1b8c9454..52bc93af1719 100644 --- a/nixos/tests/web-servers/stargazer.nix +++ b/nixos/tests/web-servers/stargazer.nix @@ -1,9 +1,9 @@ { pkgs, lib, ... }: let - test_script = pkgs.stdenv.mkDerivation rec { + test_script = pkgs.stdenv.mkDerivation { pname = "stargazer-test-script"; inherit (pkgs.stargazer) version src; - buildInputs = with pkgs; [ (python3.withPackages (ps: with ps; [ cryptography ])) ]; + buildInputs = with pkgs; [ (python3.withPackages (ps: with ps; [ cryptography urllib3 ])) ]; dontBuild = true; doCheck = false; installPhase = '' @@ -11,7 +11,7 @@ let cp scripts/gemini-diagnostics $out/bin/test ''; }; - test_env = pkgs.stdenv.mkDerivation rec { + test_env = pkgs.stdenv.mkDerivation { pname = "stargazer-test-env"; inherit (pkgs.stargazer) version src; buildPhase = '' @@ -23,7 +23,7 @@ let cp -r * $out/ ''; }; - scgi_server = pkgs.stdenv.mkDerivation rec { + scgi_server = pkgs.stdenv.mkDerivation { pname = "stargazer-test-scgi-server"; inherit (pkgs.stargazer) version src; buildInputs = with pkgs; [ python3 ]; @@ -100,7 +100,12 @@ in } { route = "localhost:/no-exist"; - root = "./does_not_exist"; + root = "${test_env}/does_not_exist"; + } + { + route = "localhost=/rss.xml"; + root = "${test_env}/test_data/test_site"; + mime-override = "application/atom+xml"; } ]; }; diff --git a/pkgs/servers/gemini/stargazer/default.nix b/pkgs/servers/gemini/stargazer/default.nix index a77f64a75a9d..e6f2e63430f8 100644 --- a/pkgs/servers/gemini/stargazer/default.nix +++ b/pkgs/servers/gemini/stargazer/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "stargazer"; - version = "1.1.0"; + version = "1.2.1"; src = fetchFromSourcehut { owner = "~zethra"; repo = "stargazer"; rev = version; - hash = "sha256-c0gKvVaMiUOGHlPmtaW6it8J9MusQY7BA/5F9I3ysMc="; + hash = "sha256-pYize+MGChi1GxCNaQsNlHELtsPUvfFZMPl0Q+pOTp0="; }; - cargoHash = "sha256-8VrEZZNSFLAjUagsiRApvjiXusBHLLn1O/+QKtQY4wg="; + cargoHash = "sha256-KmVNRVyKD5q4/vWtnHM4nfiGg+uZvRl+l+Zk5hjWg9E="; doCheck = false; # Uses external testing framework that requires network