From 676cf8d49ed7207d897944b40a9853957376b27a Mon Sep 17 00:00:00 2001 From: Giovanni d'Amelio Date: Wed, 23 Oct 2024 12:34:06 -0700 Subject: [PATCH] Remove broken caddy package --- src/nixosModules/core/caddy.nix | 5 +---- src/packages/caddy-dns-cloudflare.nix | 19 ------------------- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 src/packages/caddy-dns-cloudflare.nix diff --git a/src/nixosModules/core/caddy.nix b/src/nixosModules/core/caddy.nix index 7faab35..06ef48e 100644 --- a/src/nixosModules/core/caddy.nix +++ b/src/nixosModules/core/caddy.nix @@ -1,9 +1,6 @@ -{root, ...}: {pkgs, ...}: let - caddyDnsCloudflare = root.packages.caddy-dns-cloudflare {inherit pkgs;}; -in { +_: _: { services.caddy = { enable = true; - package = caddyDnsCloudflare; globalConfig = '' email admin@gio.ninja diff --git a/src/packages/caddy-dns-cloudflare.nix b/src/packages/caddy-dns-cloudflare.nix deleted file mode 100644 index 2c4be6e..0000000 --- a/src/packages/caddy-dns-cloudflare.nix +++ /dev/null @@ -1,19 +0,0 @@ -# Nasty package that fetches Caddy from the internet... -# Just being used until this is resolved upstream -# See: https://github.com/NixOS/nixpkgs/pull/259275 -_: {pkgs, ...}: -pkgs.stdenv.mkDerivation rec { - name = "caddy-dns-cloudflare"; - src = builtins.fetchurl { - url = "https://caddyserver.com/api/download?os=linux&arch=amd64&p=github.com%2Fcaddy-dns%2Fcloudflare"; - name = "caddy-dns-cloudflare"; - sha256 = "sha256:0250jmb8wy9414xwjm5mjhmjpn5gj5ri6ajh3q53wlvnydgrl9dc"; - }; - dontUnpack = true; - - installPhase = '' - mkdir -p $out/bin - cp ${src} $out/bin/caddy - chmod 755 $out/bin/caddy - ''; -}