jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #314618 from gaykitty/stargazer-1.2.1

Browse Source 
stargazer: 1.1.0 -> 1.2.1
This commit is contained in:
Thomas Gerbet 2024-05-31 12:57:03 +02:00 committed by GitHub
commit 4e2290525d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nixos/tests/web-servers/stargazer.nix
View File

@ -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";
}
];
};

6
pkgs/servers/gemini/stargazer/default.nix
View File

@ -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