From 873adbaaec9861601c3f76ac4157a646e5a36df2 Mon Sep 17 00:00:00 2001 From: Katherina Walshe-Grey Date: Fri, 11 Jul 2025 16:23:29 +0100 Subject: [PATCH 1/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'colmena': 'github:zhaofengli/colmena/3ceec72cfb396a8a8de5fe96a9d75a9ce88cc18e' (2025-06-28) → 'github:zhaofengli/colmena/f560ed613a568aee178576b21c6818ef50819ca5' (2025-07-09) • Updated input 'firefox-addons': 'gitlab:rycee/nur-expressions/fa40d85b15cbfb1a488ef9a119ff2d40a481c8da?dir=pkgs/firefox-addons' (2025-06-30) → 'gitlab:rycee/nur-expressions/680d0ba892443d95ad1afdc523686573111e6c1a?dir=pkgs/firefox-addons' (2025-07-11) • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569' (2025-06-08) → 'github:hercules-ci/flake-parts/77826244401ea9de6e3bac47c2db46005e1f30b5' (2025-07-01) • Updated input 'flake-parts/nixpkgs-lib': 'github:nix-community/nixpkgs.lib/656a64127e9d791a334452c6b6606d17539476e2' (2025-06-01) → 'github:nix-community/nixpkgs.lib/14a40a1d7fb9afa4739275ac642ed7301a9ba1ab' (2025-06-29) • Updated input 'home-manager': 'github:nix-community/home-manager/366f00797b1efb70f2882d3da485e3c10fd3d557' (2025-06-24) → 'github:nix-community/home-manager/c6a01e54af81b381695db796a43360bf6db5702f' (2025-07-11) • Updated input 'home-manager-unstable': 'github:nix-community/home-manager/f6deff178cc4d6049d30785dbfc831e6c6e3a219' (2025-06-29) → 'github:nix-community/home-manager/e90b28967cacc64de7fb8742314ed0d7d12f47c6' (2025-07-11) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/b43c397f6c213918d6cfe6e3550abfe79b5d1c51' (2025-06-29) → 'github:NixOS/nixpkgs/88983d4b665fb491861005137ce2b11a9f89f203' (2025-07-08) • Updated input 'nixpkgs-small': 'github:NixOS/nixpkgs/e410afb41ba16a2ceeaeff85c536d35f10bbbdcf' (2025-06-29) → 'github:NixOS/nixpkgs/0d81cd273efaaca0aa5c9685a462c6b91fc704fd' (2025-07-10) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/30e2e2857ba47844aa71991daa6ed1fc678bcbb7' (2025-06-27) → 'github:NixOS/nixpkgs/9807714d6944a957c2e036f84b0ff8caf9930bc0' (2025-07-08) • Updated input 'nixpkgs-unstable-small': 'github:NixOS/nixpkgs/cbb0f33478508488b2affe24a939dae57cb5a157' (2025-06-30) → 'github:NixOS/nixpkgs/1bd4d0d4a678d48b63eb18f457d74df2fcee6c69' (2025-07-11) • Updated input 'randomcat': 'github:randomnetcat/nix-configs/09459a091c79ead8efe75735da4f784f272e0f48' (2025-06-30) → 'github:randomnetcat/nix-configs/36ec1db331a6fd39e1f9d8ee3ef36d887fe1e2d1' (2025-07-11) --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 073b9f3..72b0b18 100644 --- a/flake.lock +++ b/flake.lock @@ -34,11 +34,11 @@ "stable": [] }, "locked": { - "lastModified": 1751144689, - "narHash": "sha256-cgIntaqhcm62V1KU6GmrAGpHpahT4UExEWW2ryS02ZU=", + "lastModified": 1752070778, + "narHash": "sha256-2ArxrGPb39YxeyMgEzFX/YiUwwOgz62qazHhYJnZQss=", "owner": "zhaofengli", "repo": "colmena", - "rev": "3ceec72cfb396a8a8de5fe96a9d75a9ce88cc18e", + "rev": "f560ed613a568aee178576b21c6818ef50819ca5", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1751256218, - "narHash": "sha256-WC1YSV4lFT41AaEhpiQZRuofe+2WLI9PNuuqgdRmjVM=", + "lastModified": 1752206617, + "narHash": "sha256-/Pu0pBOI3hsg3eIK6AsQ6kwvONqE2b1b/zOz06ePJKE=", "owner": "rycee", "repo": "nur-expressions", - "rev": "fa40d85b15cbfb1a488ef9a119ff2d40a481c8da", + "rev": "680d0ba892443d95ad1afdc523686573111e6c1a", "type": "gitlab" }, "original": { @@ -75,11 +75,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1750792728, - "narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=", + "lastModified": 1752208517, + "narHash": "sha256-aRY1cYOdVdXdNjcL/Twpa27CknO7pVHxooPsBizDraE=", "owner": "nix-community", "repo": "home-manager", - "rev": "366f00797b1efb70f2882d3da485e3c10fd3d557", + "rev": "c6a01e54af81b381695db796a43360bf6db5702f", "type": "github" }, "original": { @@ -164,11 +164,11 @@ ] }, "locked": { - "lastModified": 1751239699, - "narHash": "sha256-zA1uUdAq3c26fHm26xMWMuF5COhI18EzaH7az/P2OWM=", + "lastModified": 1752246954, + "narHash": "sha256-c1Rq5Hc4WZLKj1RkmjLFCcX4QHBwrL+DIZNMEHno7DU=", "owner": "nix-community", "repo": "home-manager", - "rev": "f6deff178cc4d6049d30785dbfc831e6c6e3a219", + "rev": "e90b28967cacc64de7fb8742314ed0d7d12f47c6", "type": "github" }, "original": { @@ -214,11 +214,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751211869, - "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", + "lastModified": 1751943650, + "narHash": "sha256-7orTnNqkGGru8Je6Un6mq1T8YVVU/O5kyW4+f9C1mZQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51", + "rev": "88983d4b665fb491861005137ce2b11a9f89f203", "type": "github" }, "original": { @@ -230,11 +230,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1748740939, - "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", + "lastModified": 1751159883, + "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "656a64127e9d791a334452c6b6606d17539476e2", + "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", "type": "github" }, "original": { @@ -245,11 +245,11 @@ }, "nixpkgs-small": { "locked": { - "lastModified": 1751230698, - "narHash": "sha256-ANWE9dHPeACz3SIbUhbWZforTgfAvOS5Tg1l4yYa/B0=", + "lastModified": 1752140043, + "narHash": "sha256-TPZMmQNsGdsZcsTz+MbunpJ2k1H/IIrOUFhRhggVjCI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e410afb41ba16a2ceeaeff85c536d35f10bbbdcf", + "rev": "0d81cd273efaaca0aa5c9685a462c6b91fc704fd", "type": "github" }, "original": { @@ -261,11 +261,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1751011381, - "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { @@ -277,11 +277,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1751247197, - "narHash": "sha256-QSX8/v7sbRO/vX/1Cdb+ZI17bH+5EpnFi9OcfODNpgA=", + "lastModified": 1752206449, + "narHash": "sha256-NVAbC/s4CupABWGXF8M9mDiVw/n0YCftxwc1KatVjDk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cbb0f33478508488b2affe24a939dae57cb5a157", + "rev": "1bd4d0d4a678d48b63eb18f457d74df2fcee6c69", "type": "github" }, "original": { @@ -317,11 +317,11 @@ "randomcat": { "flake": false, "locked": { - "lastModified": 1751261560, - "narHash": "sha256-IrT1jAtRE1BiwEQtqU+PyvwnE08mrf8xeIdGxDIE2zs=", + "lastModified": 1752199904, + "narHash": "sha256-gyBZSXxgbq2HLJ8xWn52rF75EaydPn/1NUAqR/+KGpY=", "owner": "randomnetcat", "repo": "nix-configs", - "rev": "09459a091c79ead8efe75735da4f784f272e0f48", + "rev": "36ec1db331a6fd39e1f9d8ee3ef36d887fe1e2d1", "type": "github" }, "original": { From 0ecedcf56e310456d87073cdb16b4c6a2f2f7576 Mon Sep 17 00:00:00 2001 From: Katherina Walshe-Grey Date: Sat, 12 Jul 2025 20:45:15 +0100 Subject: [PATCH 2/3] actual: Use package from unstable --- services/actual.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/services/actual.nix b/services/actual.nix index 3a006ea..36a2d33 100644 --- a/services/actual.nix +++ b/services/actual.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, inputs, ... }: let inherit (lib) mkIf mkOption mkEnableOption types; @@ -28,6 +28,10 @@ in services.actual = { enable = true; + # nixos 25.05 is on actual-server 25.6.1 which contains an annoying bug + # nixpkgs maintainers declined to backport a newer version, so get this from unstable for now + # ref. https://github.com/NixOS/nixpkgs/issues/423541 + package = (import inputs.nixpkgs-unstable-small { system = "x86_64-linux"; }).actual-server; settings.port = 5006; }; }; From 804494ddb3a6f41a3600c1bf3e8f2f522e971e4c Mon Sep 17 00:00:00 2001 From: Katherina Walshe-Grey Date: Sat, 12 Jul 2025 20:46:11 +0100 Subject: [PATCH 3/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'colmena': 'github:zhaofengli/colmena/f560ed613a568aee178576b21c6818ef50819ca5' (2025-07-09) → 'github:zhaofengli/colmena/d2beb694d54db653399b8597c0f6e15e20b26405' (2025-07-12) • Updated input 'firefox-addons': 'gitlab:rycee/nur-expressions/680d0ba892443d95ad1afdc523686573111e6c1a?dir=pkgs/firefox-addons' (2025-07-11) → 'gitlab:rycee/nur-expressions/bf437c46b2b92baa4a0d3341c27b25fcfa285ec0?dir=pkgs/firefox-addons' (2025-07-12) • Updated input 'home-manager-unstable': 'github:nix-community/home-manager/e90b28967cacc64de7fb8742314ed0d7d12f47c6' (2025-07-11) → 'github:nix-community/home-manager/ea24675e4f4f4c494ccb04f6645db2a394d348ee' (2025-07-12) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/88983d4b665fb491861005137ce2b11a9f89f203' (2025-07-08) → 'github:NixOS/nixpkgs/10e687235226880ed5e9f33f1ffa71fe60f2638a' (2025-07-10) • Updated input 'nixpkgs-small': 'github:NixOS/nixpkgs/0d81cd273efaaca0aa5c9685a462c6b91fc704fd' (2025-07-10) → 'github:NixOS/nixpkgs/739c8f530a2c5e0b9eefc8019d201654264cb974' (2025-07-11) • Updated input 'nixpkgs-unstable-small': 'github:NixOS/nixpkgs/1bd4d0d4a678d48b63eb18f457d74df2fcee6c69' (2025-07-11) → 'github:NixOS/nixpkgs/d3807bc34e7d086b4754e1c842505570e23f9d01' (2025-07-12) • Updated input 'randomcat': 'github:randomnetcat/nix-configs/36ec1db331a6fd39e1f9d8ee3ef36d887fe1e2d1' (2025-07-11) → 'github:randomnetcat/nix-configs/8d3718931bbc5cd9bf6b4acfbbdd6925f119c179' (2025-07-12) --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 72b0b18..98047af 100644 --- a/flake.lock +++ b/flake.lock @@ -34,11 +34,11 @@ "stable": [] }, "locked": { - "lastModified": 1752070778, - "narHash": "sha256-2ArxrGPb39YxeyMgEzFX/YiUwwOgz62qazHhYJnZQss=", + "lastModified": 1752287590, + "narHash": "sha256-U1IqFnxlgCRrPaeT5IGCdH0j9CNLPFcI/fRAidi0aDQ=", "owner": "zhaofengli", "repo": "colmena", - "rev": "f560ed613a568aee178576b21c6818ef50819ca5", + "rev": "d2beb694d54db653399b8597c0f6e15e20b26405", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1752206617, - "narHash": "sha256-/Pu0pBOI3hsg3eIK6AsQ6kwvONqE2b1b/zOz06ePJKE=", + "lastModified": 1752292998, + "narHash": "sha256-ybCnRdrK49s7xgsaWLuabM/FC5ociZrMkSmzNE119Os=", "owner": "rycee", "repo": "nur-expressions", - "rev": "680d0ba892443d95ad1afdc523686573111e6c1a", + "rev": "bf437c46b2b92baa4a0d3341c27b25fcfa285ec0", "type": "gitlab" }, "original": { @@ -164,11 +164,11 @@ ] }, "locked": { - "lastModified": 1752246954, - "narHash": "sha256-c1Rq5Hc4WZLKj1RkmjLFCcX4QHBwrL+DIZNMEHno7DU=", + "lastModified": 1752348734, + "narHash": "sha256-w3s5y+9Nn0oKUk6yS77YG1iRSizNStxqhEsgIlJKRtw=", "owner": "nix-community", "repo": "home-manager", - "rev": "e90b28967cacc64de7fb8742314ed0d7d12f47c6", + "rev": "ea24675e4f4f4c494ccb04f6645db2a394d348ee", "type": "github" }, "original": { @@ -214,11 +214,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751943650, - "narHash": "sha256-7orTnNqkGGru8Je6Un6mq1T8YVVU/O5kyW4+f9C1mZQ=", + "lastModified": 1752162966, + "narHash": "sha256-3MxxkU8ZXMHXcbFz7UE4M6qnIPTYGcE/7EMqlZNnVDE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88983d4b665fb491861005137ce2b11a9f89f203", + "rev": "10e687235226880ed5e9f33f1ffa71fe60f2638a", "type": "github" }, "original": { @@ -245,11 +245,11 @@ }, "nixpkgs-small": { "locked": { - "lastModified": 1752140043, - "narHash": "sha256-TPZMmQNsGdsZcsTz+MbunpJ2k1H/IIrOUFhRhggVjCI=", + "lastModified": 1752244816, + "narHash": "sha256-xi2uQTCjKev5kzfhLFMrOoCPBYnePmvRWtpCVKP4o94=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0d81cd273efaaca0aa5c9685a462c6b91fc704fd", + "rev": "739c8f530a2c5e0b9eefc8019d201654264cb974", "type": "github" }, "original": { @@ -277,11 +277,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1752206449, - "narHash": "sha256-NVAbC/s4CupABWGXF8M9mDiVw/n0YCftxwc1KatVjDk=", + "lastModified": 1752298176, + "narHash": "sha256-wY7/8k5mJbljXxBUX1bDHFVUcMrWdrDT8FNDrcPwLbA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1bd4d0d4a678d48b63eb18f457d74df2fcee6c69", + "rev": "d3807bc34e7d086b4754e1c842505570e23f9d01", "type": "github" }, "original": { @@ -317,11 +317,11 @@ "randomcat": { "flake": false, "locked": { - "lastModified": 1752199904, - "narHash": "sha256-gyBZSXxgbq2HLJ8xWn52rF75EaydPn/1NUAqR/+KGpY=", + "lastModified": 1752307483, + "narHash": "sha256-84dSpidztRZ7eY6bDdrt7616Za0qMHpiATI0nUHoH9U=", "owner": "randomnetcat", "repo": "nix-configs", - "rev": "36ec1db331a6fd39e1f9d8ee3ef36d887fe1e2d1", + "rev": "8d3718931bbc5cd9bf6b4acfbbdd6925f119c179", "type": "github" }, "original": {