From 3881f6f864fcd788efc7402bd8149ac5d07e6882 Mon Sep 17 00:00:00 2001
From: Tomas Antonio Lopez <entropy.overseer@entropic.network>
Date: Tue, 14 Nov 2023 01:09:33 +0100
Subject: sourcehut.pastesrht: add myself as maintainer

---
 pkgs/applications/version-management/sourcehut/paste.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/applications/version-management/sourcehut')

diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix
index d62ee38fc2335..faa8e26f5ef8b 100644
--- a/pkgs/applications/version-management/sourcehut/paste.nix
+++ b/pkgs/applications/version-management/sourcehut/paste.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     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 ];
   };
 }
-- 
cgit 1.4.1


From 5476b490d4c47655ee6345a120b663fa5351ee07 Mon Sep 17 00:00:00 2001
From: Tomas Antonio Lopez <entropy.overseer@entropic.network>
Date: Sat, 26 Aug 2023 15:13:52 +0200
Subject: nixos/sourcehut: compile and integrate paste.sr.ht API component

---
 nixos/modules/services/misc/sourcehut/default.nix   |  5 +++++
 .../version-management/sourcehut/paste.nix          | 21 +++++++++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

(limited to 'pkgs/applications/version-management/sourcehut')

diff --git a/nixos/modules/services/misc/sourcehut/default.nix b/nixos/modules/services/misc/sourcehut/default.nix
index f2b09f4bc4b61..8719a176973c6 100644
--- a/nixos/modules/services/misc/sourcehut/default.nix
+++ b/nixos/modules/services/misc/sourcehut/default.nix
@@ -1316,6 +1316,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" {
diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix
index faa8e26f5ef8b..689ae0dad132f 100644
--- a/pkgs/applications/version-management/sourcehut/paste.nix
+++ b/pkgs/applications/version-management/sourcehut/paste.nix
@@ -1,13 +1,14 @@
 { lib
 , fetchFromSourcehut
+, buildGoModule
 , buildPythonPackage
 , srht
 , pyyaml
 , python
+, unzip
 }:
 
-buildPythonPackage rec {
-  pname = "pastesrht";
+let
   version = "0.15.1";
 
   src = fetchFromSourcehut {
@@ -17,6 +18,17 @@ buildPythonPackage rec {
     sha256 = "sha256-IUFX7/V8AWqN+iuisLAyu7lMNIUCzSMoOfcZiYJTnrM=";
   };
 
+  pastesrht-api = buildGoModule ({
+    inherit src version;
+    pname = "pastesrht-api";
+    modRoot = "api";
+    vendorSha256 = "sha256-jiE73PUPSHxtWp7XBdH4mJw95pXmZjCl4tk2wQUf2M4";
+  } // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
+in
+buildPythonPackage rec {
+  inherit src version;
+  pname = "pastesrht";
+
   postPatch = ''
     substituteInPlace Makefile \
       --replace "all: api" ""
@@ -32,6 +44,11 @@ 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; {
-- 
cgit 1.4.1


From d84b211fea38cb5f1e6fcfd6d34ab3bd29a14a79 Mon Sep 17 00:00:00 2001
From: Tomas Antonio Lopez <entropy.overseer@entropic.network>
Date: Tue, 14 Nov 2023 11:07:51 +0100
Subject: sourcehut.pastesrht: 0.15.1 -> 0.15.2

---
 pkgs/applications/version-management/sourcehut/paste.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/applications/version-management/sourcehut')

diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix
index 689ae0dad132f..9f1aa7f91a792 100644
--- a/pkgs/applications/version-management/sourcehut/paste.nix
+++ b/pkgs/applications/version-management/sourcehut/paste.nix
@@ -9,20 +9,20 @@
 }:
 
 let
-  version = "0.15.1";
+  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";
-    vendorSha256 = "sha256-jiE73PUPSHxtWp7XBdH4mJw95pXmZjCl4tk2wQUf2M4";
+    vendorHash = "sha256-jiE73PUPSHxtWp7XBdH4mJw95pXmZjCl4tk2wQUf2M4=";
   } // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
 in
 buildPythonPackage rec {
-- 
cgit 1.4.1