Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

agate: 3.3.4 -> 3.3.7 #315838

Merged
merged 2 commits into from
Jun 2, 2024
Merged

agate: 3.3.4 -> 3.3.7 #315838

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01eec1f
agate: 3.3.4 -> 3.3.7
JohnRTitor Apr 6, 2024
efd4ac1
agate: cleanup
JohnRTitor May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 36 additions & 10 deletions pkgs/servers/gemini/agate/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,37 @@
{ lib, stdenv, nixosTests, fetchFromGitHub, rustPlatform, libiconv, Security }:
{
lib,
stdenv,
nixosTests,
fetchFromGitHub,
rustPlatform,
libiconv,
Security,
openssl,
pkg-config,
nix-update-script,
}:

rustPlatform.buildRustPackage rec {
pname = "agate";
version = "3.3.4";
version = "3.3.7";

src = fetchFromGitHub {
owner = "mbrubeck";
repo = "agate";
rev = "v${version}";
hash = "sha256-7z3iAA+Q3k5jEO9ZhA06h7/17gE0FWPqDOGK/XENRWg=";
hash = "sha256-pNfTgkl59NTRDH+w23P49MUWzIXh5ElnJitMEYfsBnc=";
};

cargoHash = "sha256-iTopJnuH2extGnaJXL+RPUwcvj2e+k5A4BT33v+sFiA=";
cargoHash = "sha256-RuSvweZhPWS2C2lwncxWAW2XLQN6+bAslv3p4IwQ2BA=";

buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
nativeBuildInputs = [ pkg-config ];

buildInputs =
[ openssl ]
++ lib.optionals stdenv.isDarwin [
libiconv
Security
];

doInstallCheck = true;
installCheckPhase = ''
Expand All @@ -25,11 +43,16 @@ rustPlatform.buildRustPackage rec {

__darwinAllowLocalNetworking = true;

passthru.tests = { inherit (nixosTests) agate; };
passthru = {
tests = {
inherit (nixosTests) agate;
};
updateScript = nix-update-script { };
};

meta = with lib; {
meta = {
homepage = "https://github.com/mbrubeck/agate";
changelog = "https://github.com/mbrubeck/agate/blob/master/CHANGELOG.md";
changelog = "https://github.com/mbrubeck/agate/releases/tag/v${version}";
description = "Very simple server for the Gemini hypertext protocol";
mainProgram = "agate";
longDescription = ''
Expand All @@ -38,7 +61,10 @@ rustPlatform.buildRustPackage rec {
static files. It uses async I/O, and should be quite efficient even when
running on low-end hardware and serving many concurrent requests.
'';
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ jk ];
license = with lib.licenses; [
asl20
mit
];
maintainers = with lib.maintainers; [ jk ];
};
}