From 8a985abbe85d7cb82f4ae6b1c17f06a5df952476 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Sun, 23 Nov 2025 20:22:00 +0000
Subject: [PATCH 1/3] caddy: Add versionCheckHook

---
 pkgs/by-name/ca/caddy/package.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ca/caddy/package.nix b/pkgs/by-name/ca/caddy/package.nix
index 021d03c96ca1..28eca35284a2 100644
--- a/pkgs/by-name/ca/caddy/package.nix
+++ b/pkgs/by-name/ca/caddy/package.nix
@@ -5,10 +5,10 @@
   fetchFromGitHub,
   nixosTests,
   caddy,
-  testers,
   installShellFiles,
   stdenv,
   writableTmpDirAsHomeHook,
+  versionCheckHook,
 }:
 let
   version = "2.10.2";
@@ -75,15 +75,18 @@ buildGo125Module {
   passthru = {
     tests = {
       inherit (nixosTests) caddy;
-      version = testers.testVersion {
-        command = "${caddy}/bin/caddy version";
-        package = caddy;
-      };
       acme-integration = nixosTests.acme.caddy;
     };
     withPlugins = callPackage ./plugins.nix { inherit caddy; };
   };
 
+  nativeInstallCheckInputs = [
+    writableTmpDirAsHomeHook
+    versionCheckHook
+  ];
+  versionCheckKeepEnvironment = [ "HOME" ];
+  doInstallCheck = true;
+
   meta = {
     homepage = "https://caddyserver.com";
     description = "Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS";

From 9449efacb17ade603ebfd464db26fa1aac022bb9 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Sun, 23 Nov 2025 20:26:08 +0000
Subject: [PATCH 2/3] caddy: Add finalAttrs

---
 pkgs/by-name/ca/caddy/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ca/caddy/package.nix b/pkgs/by-name/ca/caddy/package.nix
index 28eca35284a2..2c071a475f60 100644
--- a/pkgs/by-name/ca/caddy/package.nix
+++ b/pkgs/by-name/ca/caddy/package.nix
@@ -19,14 +19,14 @@ let
     hash = "sha256-D1qI7TDJpSvtgpo1FsPZk6mpqRvRharFZ8soI7Mn3RE=";
   };
 in
-buildGo125Module {
+buildGo125Module (finalAttrs: {
   pname = "caddy";
   inherit version;
 
   src = fetchFromGitHub {
     owner = "caddyserver";
     repo = "caddy";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-KvikafRYPFZ0xCXqDdji1rxlkThEDEOHycK8GP5e8vk=";
   };
 
@@ -35,7 +35,7 @@ buildGo125Module {
   ldflags = [
     "-s"
     "-w"
-    "-X github.com/caddyserver/caddy/v2.CustomVersion=${version}"
+    "-X github.com/caddyserver/caddy/v2.CustomVersion=${finalAttrs.version}"
   ];
 
   # matches upstream since v2.8.0
@@ -99,4 +99,4 @@ buildGo125Module {
       ryan4yin
     ];
   };
-}
+})

From bf9f78f87ddb3237547f439bae984ba3d8d11d60 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Sun, 23 Nov 2025 20:26:24 +0000
Subject: [PATCH 3/3] caddy: Add changelog

---
 pkgs/by-name/ca/caddy/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ca/caddy/package.nix b/pkgs/by-name/ca/caddy/package.nix
index 2c071a475f60..87ab46c64e38 100644
--- a/pkgs/by-name/ca/caddy/package.nix
+++ b/pkgs/by-name/ca/caddy/package.nix
@@ -90,6 +90,7 @@ buildGo125Module (finalAttrs: {
   meta = {
     homepage = "https://caddyserver.com";
     description = "Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS";
+    changelog = "https://github.com/caddyserver/caddy/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
     mainProgram = "caddy";
     maintainers = with lib.maintainers; [