From 8a985abbe85d7cb82f4ae6b1c17f06a5df952476 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Sun, 23 Nov 2025 20:22:00 +0000 Subject: [PATCH] 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";