-
-
Notifications
You must be signed in to change notification settings - Fork 14.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
caddy: add suport for compiling Caddy with plugins (#358586)
- Loading branch information
Showing
3 changed files
with
110 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -267,6 +267,21 @@ | |
|
||
- `bind.cacheNetworks` now only controls access for recursive queries, where it previously controlled access for all queries. | ||
|
||
- Caddy can now be built with plugins by using `caddy.withPlugins`, a `passthru` function that accepts an attribute set as a parameter. The `plugins` argument represents a list of Caddy plugins, with each Caddy plugin being a versioned module. The `hash` argument represents the `vendorHash` of the resulting Caddy source code with the plugins added. | ||
|
||
Example: | ||
```nix | ||
services.caddy = { | ||
enable = true; | ||
package = pkgs.caddy.withPlugins { | ||
plugins = [ "github.com/caddy-dns/[email protected]" ]; | ||
hash = "sha256-F/jqR4iEsklJFycTjSaW8B/V3iTGqqGOzwYBUXxRKrc="; | ||
}; | ||
}; | ||
``` | ||
|
||
To get the necessary hash of the vendored dependencies, omit `hash`. The build will fail and tell you the correct value. | ||
|
||
- `programs.fzf.keybindings` now supports the fish shell. | ||
|
||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
{ | ||
lib, | ||
stdenv, | ||
go, | ||
xcaddy, | ||
cacert, | ||
git, | ||
caddy, | ||
}: | ||
{ | ||
plugins, | ||
hash ? lib.fakeHash, | ||
}: | ||
let | ||
pluginsSorted = lib.sort lib.lessThan plugins; | ||
pluginsList = lib.concatMapStrings (plugin: "${plugin}-") pluginsSorted; | ||
pluginsHash = builtins.hashString "md5" pluginsList; | ||
pluginsWithoutVersion = lib.filter (p: !lib.hasInfix "@" p) pluginsSorted; | ||
in | ||
assert lib.assertMsg ( | ||
lib.length pluginsWithoutVersion == 0 | ||
) "All plugins should have a version (eg ${lib.elemAt pluginsWithoutVersion 0}@x.y.z)!"; | ||
caddy.overrideAttrs ( | ||
finalAttrs: prevAttrs: { | ||
vendorHash = null; | ||
subPackages = [ "." ]; | ||
|
||
src = stdenv.mkDerivation { | ||
pname = "caddy-src-with-plugins-${pluginsHash}"; | ||
version = finalAttrs.version; | ||
|
||
nativeBuildInputs = [ | ||
go | ||
xcaddy | ||
cacert | ||
git | ||
]; | ||
dontUnpack = true; | ||
buildPhase = | ||
let | ||
withArgs = lib.concatMapStrings (plugin: "--with ${plugin} ") pluginsSorted; | ||
in | ||
'' | ||
export GOCACHE=$TMPDIR/go-cache | ||
export GOPATH="$TMPDIR/go" | ||
XCADDY_SKIP_BUILD=1 TMPDIR="$PWD" xcaddy build v${finalAttrs.version} ${withArgs} | ||
(cd buildenv* && go mod vendor) | ||
''; | ||
installPhase = '' | ||
mv buildenv* $out | ||
''; | ||
|
||
outputHashMode = "recursive"; | ||
outputHash = hash; | ||
outputHashAlgo = "sha256"; | ||
}; | ||
|
||
doInstallCheck = true; | ||
installCheckPhase = '' | ||
runHook preInstallCheck | ||
${lib.toShellVar "notfound" pluginsSorted} | ||
while read kind module version; do | ||
[[ "$kind" = "dep" ]] || continue | ||
module="''${module}@''${version}" | ||
for i in "''${!notfound[@]}"; do | ||
if [[ ''${notfound[i]} = ''${module} ]]; then | ||
unset 'notfound[i]' | ||
fi | ||
done | ||
done < <($out/bin/caddy build-info) | ||
if (( ''${#notfound[@]} )); then | ||
>&2 echo "Plugins not found: ''${notfound[@]}" | ||
exit 1 | ||
fi | ||
runHook postInstallCheck | ||
''; | ||
} | ||
) |