HASH 615cea9f508c
DATE 2025-01-12
SUBJECT caddy: use nixpkgs caddy.withPlugins helper
FILES 2 CHANGED
HASH 615cea9f508c
DATE 2025-01-12
SUBJECT caddy: use nixpkgs caddy.withPlugins
helper
FILES 2 CHANGED
┌─ modules/nixos/server/webserver/caddy.nix ─────────────────────────────────┐
│ diff --git a/modules/nixos/server/webserver/caddy.nix b/modules/nixos/server/webse │
│ rver/caddy.nix │
│ index be8cd6a..b17b89a 100644 │
│ --- a/modules/nixos/server/webserver/caddy.nix │
│ +++ b/modules/nixos/server/webserver/caddy.nix │
│ @@ -1,7 +1,7 @@ │
│ { │
│ config, │
│ lib, │
│ - self', │
│ + pkgs, │
│ ... │
│ }: let │
│ inherit (lib) mkIf mkMerge; │
│ @@ -16,7 +16,13 @@ in { │
│ } │
│ │
│ (mkIf caddy.cloudflare.enable { │
│ - package = self'.packages.caddy-with-cloudflare; │
│ + package = pkgs.caddy.withPlugins { │
│ + plugins = [ │
│ + "github.com/caddy-dns/[email protected]" │
│ + "github.com/WeidiDeng/[email protected] │
│ 2aa13cb" │
│ + ]; │
│ + hash = "sha256-X3SNPfianAWLXnE0hpQpgaaCqIqHm0jgyp1clnQKmUg="; │
│ + }; │
│ globalConfig = '' │
│ servers { │
│ metrics │
└────────────────────────────────────────────────────────────────────────────────────┘
┌─ ...os/server/webserver/caddy.nix ───┐
│ diff --git a/modules/nixos/server/webserver/ │
│ caddy.nix b/modules/nixos/server/webserver/c │
│ addy.nix │
│ index be8cd6a..b17b89a 100644 │
│ --- a/modules/nixos/server/webserver/caddy.n │
│ ix │
│ +++ b/modules/nixos/server/webserver/caddy.n │
│ ix │
│ @@ -1,7 +1,7 @@ │
│ { │
│ config, │
│ lib, │
│ - self', │
│ + pkgs, │
│ ... │
│ }: let │
│ inherit (lib) mkIf mkMerge; │
│ @@ -16,7 +16,13 @@ in { │
│ } │
│ │
│ (mkIf caddy.cloudflare.enable { │
│ - package = self'.packages.caddy-with │
│ -cloudflare; │
│ + package = pkgs.caddy.withPlugins { │
│ + plugins = [ │
│ + "github.com/caddy-dns/cloudflar │
│ [email protected]" │
│ + "github.com/WeidiDeng/caddy-clo │
│ [email protected] │
│ b" │
│ + ]; │
│ + hash = "sha256-X3SNPfianAWLXnE0hp │
│ QpgaaCqIqHm0jgyp1clnQKmUg="; │
│ + }; │
│ globalConfig = '' │
│ servers { │
│ metrics │
└──────────────────────────────────────────────┘
┌─ outputs/pkgs/caddy-with-cloudflare/default.nix ───────────────────────────┐
│ diff --git a/outputs/pkgs/caddy-with-cloudflare/default.nix b/outputs/pkgs/caddy-w │
│ ith-cloudflare/default.nix │
│ index 1807b3b..2957fb5 100644 │
│ --- a/outputs/pkgs/caddy-with-cloudflare/default.nix │
│ +++ b/outputs/pkgs/caddy-with-cloudflare/default.nix │
│ @@ -35,7 +35,7 @@ caddy.override { │
│ installPhase = '' │
│ cp -r --reflink=auto . $out │
│ ''; │
│ - outputHash = "sha256-O3QWqgQtLOifsibyB0/UKricEGAx/3NhSjGbgu8+qgY="; │
│ + outputHash = "sha256-7FlCaHLuyESq+0YAkud7y83hY4oow7omJPTVVweEnJI="; │
│ outputHashMode = "recursive"; │
│ }; │
│ subPackages = ["."]; │
│ @@ -43,4 +43,3 @@ caddy.override { │
│ vendorHash = null; │
│ }); │
│ } │
│ - │
└────────────────────────────────────────────────────────────────────────────────────┘
┌─ ...y-with-cloudflare/default.nix ───┐
│ diff --git a/outputs/pkgs/caddy-with-cloudfl │
│ are/default.nix b/outputs/pkgs/caddy-with-cl │
│ oudflare/default.nix │
│ index 1807b3b..2957fb5 100644 │
│ --- a/outputs/pkgs/caddy-with-cloudflare/def │
│ ault.nix │
│ +++ b/outputs/pkgs/caddy-with-cloudflare/def │
│ ault.nix │
│ @@ -35,7 +35,7 @@ caddy.override { │
│ installPhase = '' │
│ cp -r --reflink=auto . $out │
│ ''; │
│ - outputHash = "sha256-O3QWqgQtLOif │
│ sibyB0/UKricEGAx/3NhSjGbgu8+qgY="; │
│ + outputHash = "sha256-7FlCaHLuyESq │
│ +0YAkud7y83hY4oow7omJPTVVweEnJI="; │
│ outputHashMode = "recursive"; │
│ }; │
│ subPackages = ["."]; │
│ @@ -43,4 +43,3 @@ caddy.override { │
│ vendorHash = null; │
│ }); │
│ } │
│ - │
└──────────────────────────────────────────────┘
[ BACK TO LOG ]
──────────────────────────────────────────────────────────────────────────────────────
OOKNET
────────────────────────────────────────────────
OOKNET