From 672a32a0719f4b54f07a6b880256c660073f3814 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Fri, 10 May 2024 13:26:36 +0200
Subject: [PATCH 1/3] caddy, xcaddy: move to pkgs/by-name

---
 .../caddy/default.nix => by-name/ca/caddy/package.nix}        | 0
 .../caddy => by-name/xc}/xcaddy/inject_version_info.diff      | 0
 .../xcaddy/default.nix => by-name/xc/xcaddy/package.nix}      | 0
 .../caddy => by-name/xc}/xcaddy/use_tmpdir_on_darwin.diff     | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 5 files changed, 4 deletions(-)
 rename pkgs/{servers/caddy/default.nix => by-name/ca/caddy/package.nix} (100%)
 rename pkgs/{servers/caddy => by-name/xc}/xcaddy/inject_version_info.diff (100%)
 rename pkgs/{servers/caddy/xcaddy/default.nix => by-name/xc/xcaddy/package.nix} (100%)
 rename pkgs/{servers/caddy => by-name/xc}/xcaddy/use_tmpdir_on_darwin.diff (100%)

diff --git a/pkgs/servers/caddy/default.nix b/pkgs/by-name/ca/caddy/package.nix
similarity index 100%
rename from pkgs/servers/caddy/default.nix
rename to pkgs/by-name/ca/caddy/package.nix
diff --git a/pkgs/servers/caddy/xcaddy/inject_version_info.diff b/pkgs/by-name/xc/xcaddy/inject_version_info.diff
similarity index 100%
rename from pkgs/servers/caddy/xcaddy/inject_version_info.diff
rename to pkgs/by-name/xc/xcaddy/inject_version_info.diff
diff --git a/pkgs/servers/caddy/xcaddy/default.nix b/pkgs/by-name/xc/xcaddy/package.nix
similarity index 100%
rename from pkgs/servers/caddy/xcaddy/default.nix
rename to pkgs/by-name/xc/xcaddy/package.nix
diff --git a/pkgs/servers/caddy/xcaddy/use_tmpdir_on_darwin.diff b/pkgs/by-name/xc/xcaddy/use_tmpdir_on_darwin.diff
similarity index 100%
rename from pkgs/servers/caddy/xcaddy/use_tmpdir_on_darwin.diff
rename to pkgs/by-name/xc/xcaddy/use_tmpdir_on_darwin.diff
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a50946305779..56af2aebe0c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4487,10 +4487,6 @@ with pkgs;
     '';
   });
 
-  caddy = callPackage ../servers/caddy { };
-
-  xcaddy = callPackage ../servers/caddy/xcaddy { };
-
   traefik = callPackage ../servers/traefik { };
 
   traefik-certs-dumper = callPackage ../tools/misc/traefik-certs-dumper { };

From 544289dfb99536482485fb9264f575cc8524d147 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Fri, 10 May 2024 17:09:55 +0200
Subject: [PATCH 2/3] caddy: substituteInPlace use replace-fail

---
 pkgs/by-name/ca/caddy/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ca/caddy/package.nix b/pkgs/by-name/ca/caddy/package.nix
index 399ce426d9dc..c9bb2c103b50 100644
--- a/pkgs/by-name/ca/caddy/package.nix
+++ b/pkgs/by-name/ca/caddy/package.nix
@@ -40,8 +40,10 @@ buildGoModule {
   postInstall = ''
     install -Dm644 ${dist}/init/caddy.service ${dist}/init/caddy-api.service -t $out/lib/systemd/system
 
-    substituteInPlace $out/lib/systemd/system/caddy.service --replace "/usr/bin/caddy" "$out/bin/caddy"
-    substituteInPlace $out/lib/systemd/system/caddy-api.service --replace "/usr/bin/caddy" "$out/bin/caddy"
+    substituteInPlace $out/lib/systemd/system/caddy.service \
+      --replace-fail "/usr/bin/caddy" "$out/bin/caddy"
+    substituteInPlace $out/lib/systemd/system/caddy-api.service \
+      --replace-fail "/usr/bin/caddy" "$out/bin/caddy"
 
     $out/bin/caddy manpage --directory manpages
     installManPage manpages/*

From 3f36f949d5a1bbc01539458a1c675bd7ea520aac Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Fri, 10 May 2024 17:10:27 +0200
Subject: [PATCH 3/3] caddy: Disable manpage and shell completion on
 cross-compile

---
 pkgs/by-name/ca/caddy/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/ca/caddy/package.nix b/pkgs/by-name/ca/caddy/package.nix
index c9bb2c103b50..73ab67366483 100644
--- a/pkgs/by-name/ca/caddy/package.nix
+++ b/pkgs/by-name/ca/caddy/package.nix
@@ -5,6 +5,7 @@
 , caddy
 , testers
 , installShellFiles
+, stdenv
 }:
 let
   version = "2.7.6";
@@ -44,6 +45,9 @@ buildGoModule {
       --replace-fail "/usr/bin/caddy" "$out/bin/caddy"
     substituteInPlace $out/lib/systemd/system/caddy-api.service \
       --replace-fail "/usr/bin/caddy" "$out/bin/caddy"
+  '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    # Generating man pages and completions fail on cross-compilation
+    # https://github.com/NixOS/nixpkgs/issues/308283
 
     $out/bin/caddy manpage --directory manpages
     installManPage manpages/*