From 23aee86f4b69063f0c6125d2c4284d2d2a51ee66 Mon Sep 17 00:00:00 2001 From: Noah Masur <7386960+nmasur@users.noreply.github.com> Date: Mon, 16 Nov 2026 00:33:08 +0000 Subject: [PATCH] fix(nixos): update api input for actual 26.10.0 and fix caddy build --- docs/CHANGELOG.md | 5 +++++ flake.lock | 6 +++--- pkgs/caddy/package.nix | 9 +++++++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 11b84b65..a487127e 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 2026-11-15: update api flake input to bump @actual-app/api to 26.10.0 and fix caddy build + +- **`flake.lock`**: Updated `api` input (`github:nmasur/api`) from `55e0de89` to `4e310cf4` so `api-actual` uses `@actual-app/api` 26.10.0 matching `actual-server` 26.10.0 (`1787013118115_add_account_groups.sql`) and resolves `out-of-sync-migrations` errors on `budget1`. +- **`pkgs/caddy/package.nix`**: Overrode `postConfigure` on `pkgs.caddy.withPlugins` to use `rm -f` across `cmd/x509rootsfallback.go`, `caddy/cmd/x509rootsfallback.go`, and `vendor/github.com/caddyserver/caddy/v2/cmd/x509rootsfallback.go` so `nix-caddy-withplugins` builds cleanly with nixpkgs' Caddy 2.11.7 derivation. + ## 2026-10-25: fix pgweb/mathesar postgresql.target dependency and refresh all DB collations - **pgweb & mathesar**: Added `requires = [ "postgresql.target" ];` to `systemd.services.pgweb` (`platforms/nixos/modules/nmasur/presets/services/pgweb.nix`) and `"postgresql.target"` to `systemd.services.mathesar.requires` (`platforms/nixos/modules/nmasur/presets/services/mathesar/mathesar.nix`). Previously they only set `after = [ "postgresql.target" ]`, allowing `switch-to-configuration` to start `pgweb.service` before `postgresql.target` was queued and causing `pgweb` to fail with `connect: no such file or directory` on `/run/postgresql/.s.PGSQL.5432`. diff --git a/flake.lock b/flake.lock index 73a8dd87..5c97804a 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1789309229, - "narHash": "sha256-WwZ2xdbka1e4Ukj8TurSXWKy4BZA17VkJ5D8T9XWjDs=", + "lastModified": 1794786684, + "narHash": "sha256-w73rRZUOdXLrqLpJ/t0wo2sqkDAg8+cD+fajMyPowNM=", "owner": "nmasur", "repo": "api", - "rev": "55e0de891dbe12acc9fb5ce09524c3ca69e68a44", + "rev": "4e310cf417e3b6bda5909a0aa660d1059c3a264e", "type": "github" }, "original": { diff --git a/pkgs/caddy/package.nix b/pkgs/caddy/package.nix index f396459d..ef0ec419 100644 --- a/pkgs/caddy/package.nix +++ b/pkgs/caddy/package.nix @@ -5,7 +5,12 @@ ... }: -pkgs.caddy.withPlugins { +(pkgs.caddy.withPlugins { plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ]; hash = "sha256-HuVBmiT3kD6RrDejQ6SnjCN8f7pFdZlGtZFbEf47bks="; -} +}).overrideAttrs + { + postConfigure = '' + rm -f cmd/x509rootsfallback.go caddy/cmd/x509rootsfallback.go vendor/github.com/caddyserver/caddy/v2/cmd/x509rootsfallback.go + ''; + }