diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 51088486809..37d6b7251a3 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -7,7 +7,7 @@ , installShellFiles }: let - version = "2.6.1"; + version = "2.6.2"; dist = fetchFromGitHub { owner = "caddyserver"; repo = "dist"; @@ -23,20 +23,16 @@ buildGoModule { owner = "caddyserver"; repo = "caddy"; rev = "v${version}"; - sha256 = "sha256-Z8MiMhXH1er+uYvmDQiamF/jSxHbTMwjo61qbH0ioEo="; + sha256 = "sha256-Tbf6RB3106OEZGc/Wx7vk+I82Z8/Q3WqnID4f8uZ6z0="; }; - vendorSha256 = "sha256-6UTErIPB/z4RfndPSLKFJDFweLB3ax8WxEDA+3G5asI="; - - patches = [ - ./inject_version.diff - ]; + vendorSha256 = "sha256-YxGXk3Q1qw6uZxrGc8l2lKExP2GP+nm3eYbHDoEbgdY="; subPackages = [ "cmd/caddy" ]; ldflags = [ "-s" "-w" - "-X github.com/caddyserver/caddy/v2.ShortVersion=${version}" + "-X github.com/caddyserver/caddy/v2.CustomVersion=${version}" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/caddy/inject_version.diff b/pkgs/servers/caddy/inject_version.diff deleted file mode 100644 index 3636f026a77..00000000000 --- a/pkgs/servers/caddy/inject_version.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/caddy.go b/caddy.go -index 584865bd..082b9b6c 100644 ---- a/caddy.go -+++ b/caddy.go -@@ -840,7 +840,10 @@ func InstanceID() (uuid.UUID, error) { - // and https://github.com/golang/go/issues/50603. - // - // This function is experimental and subject to change or removal. -+var ShortVersion = "(devel)" -+ - func Version() (simple, full string) { -+ return ShortVersion, ShortVersion - // the currently-recommended way to build Caddy involves - // building it as a dependency so we can extract version - // information from go.mod tooling; once the upstream \ No newline at end of file