From ba913eda2df8eb72147259189d55932012df6301 Mon Sep 17 00:00:00 2001 From: Nano Twerpus Date: Fri, 31 May 2024 03:41:03 -0400 Subject: [PATCH] caddy: 2.7.6 -> 2.8.4 Starting with v2.8.0, Caddy recommends building with the `nobadger` build tag. The build tag makes go skip the compilation of the badger-db implementation from smallstep/nosql, as it isn't used by Caddy and thus slightly shrinks the resulting binary size. https://github.com/caddyserver/caddy/releases/tag/v2.8.4 https://github.com/caddyserver/caddy/releases/tag/v2.8.3 https://github.com/caddyserver/caddy/releases/tag/v2.8.2 https://github.com/caddyserver/caddy/releases/tag/v2.8.1 https://github.com/caddyserver/caddy/releases/tag/v2.8.0 diff: https://github.com/caddyserver/caddy/compare/v2.7.6...v2.8.4 --- pkgs/by-name/ca/caddy/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ca/caddy/package.nix b/pkgs/by-name/ca/caddy/package.nix index 73ab67366483..d6832d396c77 100644 --- a/pkgs/by-name/ca/caddy/package.nix +++ b/pkgs/by-name/ca/caddy/package.nix @@ -8,12 +8,12 @@ , stdenv }: let - version = "2.7.6"; + version = "2.8.4"; dist = fetchFromGitHub { owner = "caddyserver"; repo = "dist"; rev = "v${version}"; - hash = "sha256-aZ7hdAZJH1PvrX9GQLzLquzzZG3LZSKOvt7sWQhTiR8="; + hash = "sha256-O4s7PhSUTXoNEIi+zYASx8AgClMC5rs7se863G6w+l0="; }; in buildGoModule { @@ -24,10 +24,10 @@ buildGoModule { owner = "caddyserver"; repo = "caddy"; rev = "v${version}"; - hash = "sha256-th0R3Q1nGT0q5PGOygtD1/CpJmrT5TYagrwQR4t/Fvg="; + hash = "sha256-CBfyqtWp3gYsYwaIxbfXO3AYaBiM7LutLC7uZgYXfkQ="; }; - vendorHash = "sha256-ebnSehuhbCY58ctM8IRVMfNxxbJBp6ht9cbuLdGFNek="; + vendorHash = "sha256-1Api8bBZJ1/oYk4ZGIiwWCSraLzK9L+hsKXkFtk6iVM="; subPackages = [ "cmd/caddy" ]; @@ -36,6 +36,9 @@ buildGoModule { "-X github.com/caddyserver/caddy/v2.CustomVersion=${version}" ]; + # matches upstream since v2.8.0 + tags = [ "nobadger" ]; + nativeBuildInputs = [ installShellFiles ]; postInstall = ''