caddy: Add versionCheckHook (#464626)
This commit is contained in:
@@ -5,10 +5,10 @@
|
||||
fetchFromGitHub,
|
||||
nixosTests,
|
||||
caddy,
|
||||
testers,
|
||||
installShellFiles,
|
||||
stdenv,
|
||||
writableTmpDirAsHomeHook,
|
||||
versionCheckHook,
|
||||
}:
|
||||
let
|
||||
version = "2.10.2";
|
||||
@@ -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
|
||||
@@ -75,18 +75,22 @@ 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";
|
||||
changelog = "https://github.com/caddyserver/caddy/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "caddy";
|
||||
maintainers = with lib.maintainers; [
|
||||
@@ -96,4 +100,4 @@ buildGo125Module {
|
||||
ryan4yin
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user