Update Caddy to build plugins directly from new package.
This commit is contained in:
parent
773850a674
commit
d95f2c6ca9
3 changed files with 4 additions and 105 deletions
73
pkgs/caddy/flake.lock
generated
73
pkgs/caddy/flake.lock
generated
|
@ -1,73 +0,0 @@
|
|||
{
|
||||
"nodes": {
|
||||
"caddy": {
|
||||
"locked": {
|
||||
"lastModified": 1742276417,
|
||||
"narHash": "sha256-iEGJYhUsjJdxFviduw7zUGdYewf/W7QodEuF1w8MqF0=",
|
||||
"owner": "vincentbernat",
|
||||
"repo": "caddy-nix",
|
||||
"rev": "f0f28d2b4bd1fd433726e334a462d029f0440baa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "vincentbernat",
|
||||
"repo": "caddy-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 0,
|
||||
"narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=",
|
||||
"path": "/nix/store/sr3gj4wcx3kwy0q5gcxl49ja733bqm7b-source",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"caddy": "caddy",
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
"version": 7
|
||||
}
|
|
@ -1,31 +0,0 @@
|
|||
{
|
||||
inputs = {
|
||||
nixpkgs.url = "nixpkgs";
|
||||
flake-utils.url = "github:numtide/flake-utils";
|
||||
caddy.url = "github:vincentbernat/caddy-nix";
|
||||
};
|
||||
outputs =
|
||||
{
|
||||
self,
|
||||
nixpkgs,
|
||||
flake-utils,
|
||||
caddy,
|
||||
}:
|
||||
flake-utils.lib.eachDefaultSystem (
|
||||
system:
|
||||
let
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
overlays = [ caddy.overlays.default ];
|
||||
};
|
||||
in
|
||||
{
|
||||
packages = {
|
||||
default = pkgs.caddy.withPlugins {
|
||||
plugins = [ "github.com/tailscale/caddy-tailscale@f21c01b660c896bdd6bacc37178dc00d9af282b4" ];
|
||||
hash = "sha256-pqM4d4MAKvIJ5O7VkrHDqu36LDTOzUoBa6m4D20wlyw=";
|
||||
};
|
||||
};
|
||||
}
|
||||
);
|
||||
}
|
|
@ -8,7 +8,10 @@
|
|||
{
|
||||
services.caddy = {
|
||||
enable = true;
|
||||
package = inputs.caddy.packages.${pkgs.stdenv.hostPlatform.system}.default;
|
||||
package = pkgs.caddy.withPlugins {
|
||||
plugins = [ "github.com/tailscale/caddy-tailscale@f21c01b660c896bdd6bacc37178dc00d9af282b4" ];
|
||||
hash = "sha256-pqM4d4MAKvIJ5O7VkrHDqu36LDTOzUoBa6m4D20wlyw=";
|
||||
};
|
||||
email = "nolan@thewordnerd.info";
|
||||
};
|
||||
age.secrets.tsAuthKey = {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue