mirror of
https://github.com/nmasur/dotfiles
synced 2026-11-18 18:19:14 +00:00
fix(nixos): update api input for actual 26.10.0 and fix caddy build
This commit is contained in:
1 parent
6095b8aaa2
commit
23aee86f4b
3 files changed
+15
-5
No files matched your search
@@ -1,5 +1,10 @@
|
|||||||
# Changelog
|
# 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
|
## 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`.
|
- **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`.
|
||||||
|
|||||||
Generated
+3
-3
@@ -8,11 +8,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1789309229,
|
"lastModified": 1794786684,
|
||||||
"narHash": "sha256-WwZ2xdbka1e4Ukj8TurSXWKy4BZA17VkJ5D8T9XWjDs=",
|
"narHash": "sha256-w73rRZUOdXLrqLpJ/t0wo2sqkDAg8+cD+fajMyPowNM=",
|
||||||
"owner": "nmasur",
|
"owner": "nmasur",
|
||||||
"repo": "api",
|
"repo": "api",
|
||||||
"rev": "55e0de891dbe12acc9fb5ce09524c3ca69e68a44",
|
"rev": "4e310cf417e3b6bda5909a0aa660d1059c3a264e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -5,7 +5,12 @@
|
|||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
|
||||||
pkgs.caddy.withPlugins {
|
(pkgs.caddy.withPlugins {
|
||||||
plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];
|
plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];
|
||||||
hash = "sha256-HuVBmiT3kD6RrDejQ6SnjCN8f7pFdZlGtZFbEf47bks=";
|
hash = "sha256-HuVBmiT3kD6RrDejQ6SnjCN8f7pFdZlGtZFbEf47bks=";
|
||||||
}
|
}).overrideAttrs
|
||||||
|
{
|
||||||
|
postConfigure = ''
|
||||||
|
rm -f cmd/x509rootsfallback.go caddy/cmd/x509rootsfallback.go vendor/github.com/caddyserver/caddy/v2/cmd/x509rootsfallback.go
|
||||||
|
'';
|
||||||
|
}
|
||||||
Reference in new issue
Block a user