From 58dc2a62df72c33c34cd171292b84e06060b1221 Mon Sep 17 00:00:00 2001 From: Jeremy Fleischman Date: Mon, 9 Jun 2025 23:39:15 -0600 Subject: [PATCH] Upgrade freescout, remove `package` workaround https://cyberchaos.dev/e1mo/freescout-nix-flake/-/merge_requests/1 has landed upstream. We can remove this workaround =) --- flake.lock | 8 ++++---- non-critical-infra/modules/mailserver/freescout.nix | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 93d36a19..8c29830b 100644 --- a/flake.lock +++ b/flake.lock @@ -250,11 +250,11 @@ ] }, "locked": { - "lastModified": 1743845578, - "narHash": "sha256-tS1fQfOasIbzOnCCBZHAjdOCsKD/Zt5btciC/cgcwWc=", + "lastModified": 1749312894, + "narHash": "sha256-Ol0SFRi4a+f54PuT3e4Cv4ibgLBuWeA6spxfwwZ1Y2o=", "ref": "refs/heads/main", - "rev": "2b5bcee06a673c13c5b5a62b4f4dd1300ce85903", - "revCount": 33, + "rev": "cc5652b7137bfa99853702f16696dbc029cfc5a2", + "revCount": 36, "type": "git", "url": "https://cyberchaos.dev/e1mo/freescout-nix-flake.git" }, diff --git a/non-critical-infra/modules/mailserver/freescout.nix b/non-critical-infra/modules/mailserver/freescout.nix index ec41394b..d36b76e9 100644 --- a/non-critical-infra/modules/mailserver/freescout.nix +++ b/non-critical-infra/modules/mailserver/freescout.nix @@ -1,7 +1,6 @@ { inputs, config, - pkgs, ... }: @@ -13,8 +12,6 @@ services.freescout = { enable = true; - # Workaround for https://cyberchaos.dev/e1mo/freescout-nix-flake/-/merge_requests/1 - package = inputs.freescout.packages.${pkgs.system}.default; domain = "freescout.nixos.org"; settings.APP_KEY._secret = config.sops.secrets.freescout-app-key.path;