Unverified Commit 4e229052 authored by Thomas Gerbet's avatar Thomas Gerbet Committed by GitHub
Browse files

Merge pull request #314618 from gaykitty/stargazer-1.2.1 

stargazer: 1.1.0 -> 1.2.1
parents 2dc0bf57 43b1df20

nixos/tests/web-servers/stargazer.nix

+10 −5
Original line number Diff line number Diff line 
{ 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";

          }

        ];

      };

pkgs/servers/gemini/stargazer/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -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