From ff7add2d60ac720d43ce9d7bb1a4a76aafb9d2ac Mon Sep 17 00:00:00 2001 From: IndeedNotJames Date: Thu, 9 Feb 2023 03:31:08 +0100 Subject: [PATCH 1/3] caddy: add indeednotjames as maintainer --- pkgs/servers/caddy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 37d6b7251a32..cfb3600706b7 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -60,6 +60,6 @@ buildGoModule { homepage = "https://caddyserver.com"; description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS"; license = licenses.asl20; - maintainers = with maintainers; [ Br1ght0ne techknowlogick ]; + maintainers = with maintainers; [ Br1ght0ne indeednotjames techknowlogick ]; }; } From f446d27253311cfd5cf27a2d91f9bd6f71be1919 Mon Sep 17 00:00:00 2001 From: IndeedNotJames Date: Thu, 9 Feb 2023 03:31:08 +0100 Subject: [PATCH 2/3] caddy: 2.6.2 -> 2.6.3 https://github.com/caddyserver/caddy/releases/tag/v2.6.3 --- pkgs/servers/caddy/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index cfb3600706b7..2c2f153626d1 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -7,12 +7,12 @@ , installShellFiles }: let - version = "2.6.2"; + version = "2.6.3"; dist = fetchFromGitHub { owner = "caddyserver"; repo = "dist"; rev = "v${version}"; - sha256 = "sha256-EXs+LNb87RWkmSWvs8nZIVqRJMutn+ntR241gqI7CUg="; + sha256 = "sha256-SJO1q4g9uyyky9ZYSiqXJgNIvyxT5RjrpYd20YDx8ec="; }; in buildGoModule { @@ -23,10 +23,10 @@ buildGoModule { owner = "caddyserver"; repo = "caddy"; rev = "v${version}"; - sha256 = "sha256-Tbf6RB3106OEZGc/Wx7vk+I82Z8/Q3WqnID4f8uZ6z0="; + sha256 = "sha256-YH+lo6gKqmhu1/3HZdWXnxTXaUwC8To+OCmGpji6i3k="; }; - vendorSha256 = "sha256-YxGXk3Q1qw6uZxrGc8l2lKExP2GP+nm3eYbHDoEbgdY="; + vendorSha256 = "sha256-sqjN+NgwdP2qw7/CBxKvSwwA3teg/trXg/oa1Ff0N8s="; subPackages = [ "cmd/caddy" ]; @@ -58,7 +58,7 @@ buildGoModule { meta = with lib; { homepage = "https://caddyserver.com"; - description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS"; + description = "Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS"; license = licenses.asl20; maintainers = with maintainers; [ Br1ght0ne indeednotjames techknowlogick ]; }; From f5a06f7150d534ab3a849ca500164b9707e1bb69 Mon Sep 17 00:00:00 2001 From: IndeedNotJames Date: Thu, 9 Feb 2023 03:36:10 +0100 Subject: [PATCH 3/3] nixos/caddy: fix `caddy fmt` for caddy v2.6.3 The nixos module uses `caddy fmt` to *format* the generated Caddyfile. v2.6.3 slightly altered `caddy fmt`'s behavior. Excerpt from https://github.com/caddyserver/caddy/releases/tag/v2.6.3 > cmd: caddy fmt return code is 1 if not formatted > cmd: fmt exit successfully after overwriting config file Which is why the internal `Caddyfile-formatted` now uses `cp` and `caddy fmt --overwrite` instead --- nixos/modules/services/web-servers/caddy/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix index 50213ec252ff..f5a9cfac5d77 100644 --- a/nixos/modules/services/web-servers/caddy/default.nix +++ b/nixos/modules/services/web-servers/caddy/default.nix @@ -35,7 +35,8 @@ let Caddyfile-formatted = pkgs.runCommand "Caddyfile-formatted" { nativeBuildInputs = [ cfg.package ]; } '' mkdir -p $out - ${cfg.package}/bin/caddy fmt ${Caddyfile}/Caddyfile > $out/Caddyfile + cp --no-preserve=mode ${Caddyfile}/Caddyfile $out/Caddyfile + caddy fmt --overwrite $out/Caddyfile ''; in "${if pkgs.stdenv.buildPlatform == pkgs.stdenv.hostPlatform then Caddyfile-formatted else Caddyfile}/Caddyfile";