diff options
| author | Aaron Andersen <aaron@fosslib.net> | 2021-11-29 09:16:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-29 23:16:25 +0900 |
| commit | a4977db2e8984d7976163f22331711bd99c56286 (patch) | |
| tree | 1e8e47fdddfdf81208b5b60be1967a0ae8a2dbbf /pkgs/servers | |
| parent | bcc975b98e774dd7398d11817f77a9e02b80b6a1 (diff) | |
| download | nixpkgs-a4977db2e8984d7976163f22331711bd99c56286.tar nixpkgs-a4977db2e8984d7976163f22331711bd99c56286.tar.gz nixpkgs-a4977db2e8984d7976163f22331711bd99c56286.tar.bz2 nixpkgs-a4977db2e8984d7976163f22331711bd99c56286.tar.lz nixpkgs-a4977db2e8984d7976163f22331711bd99c56286.tar.xz nixpkgs-a4977db2e8984d7976163f22331711bd99c56286.tar.zst nixpkgs-a4977db2e8984d7976163f22331711bd99c56286.zip | |
caddy: include and utilize systemd service from upstream (#147305)
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/caddy/default.nix | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 50c95c8f8da..46ce2a94a6b 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -1,20 +1,35 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests }: - -buildGoModule rec { - pname = "caddy"; +let version = "2.4.6"; + dist = fetchFromGitHub { + owner = "caddyserver"; + repo = "dist"; + rev = "v${version}"; + sha256 = "sha256-EXs+LNb87RWkmSWvs8nZIVqRJMutn+ntR241gqI7CUg="; + }; +in +buildGoModule { + pname = "caddy"; + inherit version; subPackages = [ "cmd/caddy" ]; src = fetchFromGitHub { owner = "caddyserver"; - repo = pname; + repo = "caddy"; rev = "v${version}"; sha256 = "sha256-xNCxzoNpXkj8WF9+kYJfO18ux8/OhxygkGjA49+Q4vY="; }; vendorSha256 = "sha256-NomgHqIiugSISbEtvIbJDn5GRn6Dn72adLPkAvLbUQU="; + 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" + ''; + passthru.tests = { inherit (nixosTests) caddy; }; meta = with lib; { |