diff options
| -rw-r--r-- | pkgs/by-name/ca/caddy/package.nix (renamed from pkgs/servers/caddy/default.nix) | 10 | ||||
| -rw-r--r-- | pkgs/by-name/xc/xcaddy/inject_version_info.diff (renamed from pkgs/servers/caddy/xcaddy/inject_version_info.diff) | 0 | ||||
| -rw-r--r-- | pkgs/by-name/xc/xcaddy/package.nix (renamed from pkgs/servers/caddy/xcaddy/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/by-name/xc/xcaddy/use_tmpdir_on_darwin.diff (renamed from pkgs/servers/caddy/xcaddy/use_tmpdir_on_darwin.diff) | 0 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
5 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/servers/caddy/default.nix b/pkgs/by-name/ca/caddy/package.nix index 399ce426d9dc6..73ab67366483b 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/by-name/ca/caddy/package.nix @@ -5,6 +5,7 @@ , caddy , testers , installShellFiles +, stdenv }: let version = "2.7.6"; @@ -40,8 +41,13 @@ 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" + '' + 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/* diff --git a/pkgs/servers/caddy/xcaddy/inject_version_info.diff b/pkgs/by-name/xc/xcaddy/inject_version_info.diff index 4d87aa6878781..4d87aa6878781 100644 --- a/pkgs/servers/caddy/xcaddy/inject_version_info.diff +++ b/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 index 69a531c70767a..69a531c70767a 100644 --- a/pkgs/servers/caddy/xcaddy/default.nix +++ b/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 index 064d8feb5a05a..064d8feb5a05a 100644 --- a/pkgs/servers/caddy/xcaddy/use_tmpdir_on_darwin.diff +++ b/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 546a9d953a9c7..b406a5a718bf6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4485,10 +4485,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 { }; |