From 88b5bff4ca431bd47a968f81af3e86392c82ea99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 23 Feb 2025 20:50:39 +0100
Subject: [PATCH 1/2] go-camo: 2.6.1 -> 2.6.2

Changelog: https://github.com/cactus/go-camo/releases/tag/v2.6.2
---
 pkgs/by-name/go/go-camo/package.nix | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/go-camo/package.nix b/pkgs/by-name/go/go-camo/package.nix
index 55ae97fc3bed..54a24c15e853 100644
--- a/pkgs/by-name/go/go-camo/package.nix
+++ b/pkgs/by-name/go/go-camo/package.nix
@@ -1,21 +1,28 @@
 {
   lib,
-  buildGoModule,
+  buildGo124Module,
   fetchFromGitHub,
+  installShellFiles,
+  scdoc,
 }:
 
-buildGoModule rec {
+buildGo124Module rec {
   pname = "go-camo";
-  version = "2.6.1";
+  version = "2.6.2";
 
   src = fetchFromGitHub {
     owner = "cactus";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-916XMmSRopudpLVKSBVp415nGkRCGkkunvQZiR46aSU=";
+    hash = "sha256-f4XviRqu4muc2owwV3p7y5Rehl1jrf0jDhQQvGxnw7M=";
   };
 
-  vendorHash = "sha256-IYXVc6SkhayYtHKbojHrQSaCQlt3E+nwrZ4sR/fuV0Y=";
+  vendorHash = "sha256-s6OPmtTx2/AxSm6Y0UjYORSuozPUemGyfdtv1NNlZHc=";
+
+  nativeBuildInputs = [
+    installShellFiles
+    scdoc
+  ];
 
   ldflags = [
     "-s"
@@ -23,6 +30,14 @@ buildGoModule rec {
     "-X=main.ServerVersion=${version}"
   ];
 
+  postBuild = ''
+    make man
+  '';
+
+  postInstall = ''
+    installManPage build/man/*
+  '';
+
   preCheck = ''
     # requires network access
     rm pkg/camo/proxy_{,filter_}test.go

From ad0bf1f4c5799f3cec5568fc3ec579f3e714ec18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 24 Feb 2025 15:26:44 +0100
Subject: [PATCH 2/2] nixos/all-tests: add go-camo

---
 nixos/tests/all-tests.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 1f817fbf153c..e4222cc298ec 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -439,6 +439,7 @@ in {
   gns3-server = handleTest ./gns3-server.nix {};
   gnupg = handleTest ./gnupg.nix {};
   goatcounter = handleTest ./goatcounter.nix {};
+  go-camo = handleTest ./go-camo.nix { };
   go-neb = handleTest ./go-neb.nix {};
   gobgpd = handleTest ./gobgpd.nix {};
   gocd-agent = handleTest ./gocd-agent.nix {};