Merge pull request #267538 from nessdoor/pkgs/paste.sr.ht

sourcehut.pastesrht: add missing backend component
This commit is contained in:
tomberek 2023-11-28 12:40:09 -05:00 committed by GitHub
commit a2de752222
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 5 deletions

View File

@ -1325,6 +1325,11 @@ in
(import ./service.nix "paste" {
inherit configIniOfService;
port = 5011;
extraServices.pastesrht-api = {
serviceConfig.Restart = "always";
serviceConfig.RestartSec = "5s";
serviceConfig.ExecStart = "${pkgs.sourcehut.pastesrht}/bin/pastesrht-api -b ${cfg.listenAddress}:${toString (cfg.paste.port + 100)}";
};
})
(import ./service.nix "todo" {

View File

@ -1,22 +1,34 @@
{ lib
, fetchFromSourcehut
, buildGoModule
, buildPythonPackage
, srht
, pyyaml
, python
, unzip
}:
buildPythonPackage rec {
pname = "pastesrht";
version = "0.15.1";
let
version = "0.15.2";
src = fetchFromSourcehut {
owner = "~sircmpwn";
repo = "paste.sr.ht";
rev = version;
sha256 = "sha256-IUFX7/V8AWqN+iuisLAyu7lMNIUCzSMoOfcZiYJTnrM=";
sha256 = "sha256-ZZzcd14Jbo1MfET7B56X/fl9xWXpCJ8TuKrGVgJwZfQ=";
};
pastesrht-api = buildGoModule ({
inherit src version;
pname = "pastesrht-api";
modRoot = "api";
vendorHash = "sha256-jiE73PUPSHxtWp7XBdH4mJw95pXmZjCl4tk2wQUf2M4=";
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
in
buildPythonPackage rec {
inherit src version;
pname = "pastesrht";
postPatch = ''
substituteInPlace Makefile \
--replace "all: api" ""
@ -32,12 +44,17 @@ buildPythonPackage rec {
export SRHT_PATH=${srht}/${python.sitePackages}/srht
'';
postInstall = ''
mkdir -p $out/bin
ln -s ${pastesrht-api}/bin/api $out/bin/pastesrht-api
'';
pythonImportsCheck = [ "pastesrht" ];
meta = with lib; {
homepage = "https://git.sr.ht/~sircmpwn/paste.sr.ht";
description = "Ad-hoc text file hosting service for the sr.ht network";
license = licenses.agpl3Only;
maintainers = with maintainers; [ eadwu ];
maintainers = with maintainers; [ eadwu nessdoor ];
};
}