From 6683ab94b5be92bd1390493e4c2d023699628cab Mon Sep 17 00:00:00 2001 From: Ethan Turkeltaub Date: Thu, 10 Sep 2026 22:41:18 -0400 Subject: [PATCH] Update package versions, other tweaks --- flake.lock | 6 +++--- .../prometheus-exporters-exportarr-sabnzbd/default.nix | 1 - modules/packages/fileflows/default.nix | 4 ++++ modules/packages/tracearr/default.nix | 6 +++--- modules/packages/unifi-os-server-image/default.nix | 8 ++++---- modules/profiles/home-automation/frigate/default.nix | 3 +++ modules/profiles/media-management/sabnzbd/default.nix | 6 ++++-- 7 files changed, 21 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 247295d4..931c730b 100644 --- a/flake.lock +++ b/flake.lock @@ -1472,11 +1472,11 @@ "treefmt": "treefmt_2" }, "locked": { - "lastModified": 1786115169, - "narHash": "sha256-cItgXHoQjjj3/JhSBv9alyaAFk6clTGn4xhNioB7zns=", + "lastModified": 1787934782, + "narHash": "sha256-m0mFFRsHuUrdSpM+htSJe5YtWygDm+Hz+yfuduYXQks=", "owner": "ethnt", "repo": "plex_exporter", - "rev": "c2717a264e9d99a161b47374cc8e878ac0d2c6b3", + "rev": "2d9260947a8947ada86512eb080f6cb7de966eb1", "type": "github" }, "original": { diff --git a/modules/nixos/services/prometheus-exporters-exportarr-sabnzbd/default.nix b/modules/nixos/services/prometheus-exporters-exportarr-sabnzbd/default.nix index 427a2978..d4820fb9 100644 --- a/modules/nixos/services/prometheus-exporters-exportarr-sabnzbd/default.nix +++ b/modules/nixos/services/prometheus-exporters-exportarr-sabnzbd/default.nix @@ -9,7 +9,6 @@ with lib; let cfg = config.services.prometheus.exporters.exportarr-sabnzbd; - in { options.services.prometheus.exporters.exportarr-sabnzbd = { diff --git a/modules/packages/fileflows/default.nix b/modules/packages/fileflows/default.nix index d8d874f7..149cbe92 100644 --- a/modules/packages/fileflows/default.nix +++ b/modules/packages/fileflows/default.nix @@ -23,6 +23,8 @@ let cd "$FILEFLOWS_SERVER_BASE_DIR" + rm -rf Server Node FlowRunner + cp -r @OUT@/fileflows/Server . cp -r @OUT@/fileflows/Node . cp -r @OUT@/fileflows/FlowRunner . @@ -42,6 +44,8 @@ let cd "$FILEFLOWS_NODE_BASE_DIR" + rm -rf Node FlowRunner + cp -r @OUT@/fileflows/Node . cp -r @OUT@/fileflows/FlowRunner . chmod -R u+w Node FlowRunner diff --git a/modules/packages/tracearr/default.nix b/modules/packages/tracearr/default.nix index 8acdbabf..09ff1e76 100644 --- a/modules/packages/tracearr/default.nix +++ b/modules/packages/tracearr/default.nix @@ -11,20 +11,20 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "tracearr"; - version = "2.1.0"; + version = "2.2.3"; src = fetchFromGitHub { owner = "connorgallopo"; repo = "Tracearr"; tag = "v${finalAttrs.version}"; - hash = "sha256-075XXIFuOYcshElOD11TAjc2679Y7d8GU1XVuqBMquc="; + hash = "sha256-IJYfpQqb3HwvacjK0+TBLd+so5BOPertjuy+EwxV+iI="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 4; - hash = "sha256-siXWtc8O8lWT+KGxGaPNDeTqXONFZhOHhNdXMwOGS1s="; + hash = "sha256-Xt2pDiNSkq/WUG+HBj/u9Y40jRRArJhkL5VpEoan3D4="; }; # The pnpm version is required, but nixpkgs doesn't provide the exact version that Tracearr requires diff --git a/modules/packages/unifi-os-server-image/default.nix b/modules/packages/unifi-os-server-image/default.nix index 20ee1556..bf951f00 100644 --- a/modules/packages/unifi-os-server-image/default.nix +++ b/modules/packages/unifi-os-server-image/default.nix @@ -1,9 +1,9 @@ { lib, pkgs }: let - imageVersion = "d7bbd4816078"; - installerVersion = "5.1.37"; - url = "https://fw-download.ubnt.com/data/unifi-os-server/9aee-linux-x64-5.1.37-a88d909c-2ac0-43f8-bb22-2bff3b673cbb.37-x64"; - sha256 = "sha256-SlsffynyVzPPxfdJemPj29T0phazUsu9gXqJ6x+ma2E="; + imageVersion = "c9603dec9010"; + installerVersion = "5.1.42"; + url = "https://fw-download.ubnt.com/data/unifi-os-server/5172-linux-x64-5.1.42-12e9e3cf-8f8b-4e54-928c-76b80a10c8a4.42-x64"; + sha256 = "sha256-9hEek5akLHQBb13emwH770hqb+ae/hN5Nebji3wi+U0="; in pkgs.stdenvNoCC.mkDerivation { pname = "unifi-os-server"; diff --git a/modules/profiles/home-automation/frigate/default.nix b/modules/profiles/home-automation/frigate/default.nix index dc6f08ce..a1455244 100644 --- a/modules/profiles/home-automation/frigate/default.nix +++ b/modules/profiles/home-automation/frigate/default.nix @@ -76,6 +76,9 @@ let user = cameraUsername; password = cameraPassword; }; + motion = { + mask = [ "0.899,0.732,0.885,0.811,0.852,0.801,0.856,0.715" ]; + }; record = { enabled = true; alerts = { diff --git a/modules/profiles/media-management/sabnzbd/default.nix b/modules/profiles/media-management/sabnzbd/default.nix index 69102eff..e82178a2 100644 --- a/modules/profiles/media-management/sabnzbd/default.nix +++ b/modules/profiles/media-management/sabnzbd/default.nix @@ -1,7 +1,7 @@ { flake, config, ... }: let - downloadDir = "/data/local/tmp/sabnzbd/inter"; - completeDir = "/data/local/tmp/sabnzbd/dst"; + downloadDir = "/mnt/blockbuster/tmp/sabnzbd/inter"; + completeDir = "/mnt/blockbuster/tmp/sabnzbd/dst"; in { sops = { @@ -269,6 +269,8 @@ in "d '${completeDir}' 0777 ${config.services.sabnzbd.user} ${config.services.sabnzbd.group} - -" ]; + systemd.services.sabnzbd.unitConfig.RequiresMountsFor = [ "/mnt/blockbuster" ]; + services.prometheus.exporters.exportarr-sabnzbd = { enable = true; url = "https://sabnzbd.e10.camp";