diff --git a/apps/config/package.json b/apps/config/package.json index 04c704e9..d7d293d0 100644 --- a/apps/config/package.json +++ b/apps/config/package.json @@ -11,6 +11,6 @@ "jiti": "2.4.2", "pkg-types": "1.3.0", "typescript": "5.7.2", - "typescript-eslint": "8.19.0" + "typescript-eslint": "8.19.1" } } diff --git a/apps/extract-subs/default.nix b/apps/extract-subs/default.nix index 589088d3..bdf4b1f2 100644 --- a/apps/extract-subs/default.nix +++ b/apps/extract-subs/default.nix @@ -5,7 +5,7 @@ }: buildApp { src = ./.; - npmDepsHash = "sha256-Ze7WxJ4WVso3Bn+jEDstLhGPjI29kKoJrdeZFiW6jZ0="; + npmDepsHash = "sha256-j9nFdIPnN1nlBkWK0yYyShRTaAo2z0hiE+5nSMnWWYM="; runtimeInputs = [ ffmpeg-full diff --git a/apps/extract-subs/package-lock.json b/apps/extract-subs/package-lock.json index aea96c7d..e815dd8f 100644 Binary files a/apps/extract-subs/package-lock.json and b/apps/extract-subs/package-lock.json differ diff --git a/apps/update-sources/default.nix b/apps/update-sources/default.nix index 9dd53400..91dd63b7 100644 --- a/apps/update-sources/default.nix +++ b/apps/update-sources/default.nix @@ -9,7 +9,7 @@ }: buildApp { src = ./.; - npmDepsHash = "sha256-XncG28x8w3Ufi1jZBrYa+CQMeYnqPTP8bSoLuHAHtNM="; + npmDepsHash = "sha256-Y4qFOepOdKihQPyEx/E5+ySCbsFeDOLM9h+angwJR4Y="; runtimeInputs = [ go diff --git a/apps/update-sources/package-lock.json b/apps/update-sources/package-lock.json index 3cf8a4b6..4ca8f404 100644 Binary files a/apps/update-sources/package-lock.json and b/apps/update-sources/package-lock.json differ diff --git a/configurations/cluster/modules/caddy/plugins.nix b/configurations/cluster/modules/caddy/plugins.nix index f5a65488..e1281256 100644 --- a/configurations/cluster/modules/caddy/plugins.nix +++ b/configurations/cluster/modules/caddy/plugins.nix @@ -7,5 +7,5 @@ }; }; - hash = "sha256-WGV/Ve7hbVry5ugSmTYWDihoC9i+D3Ct15UKgdpYc9U="; + hash = "sha256-JoujVXRXjKUam1Ej3/zKVvF0nX97dUizmISjy3M3Kr8="; } diff --git a/configurations/nos/modules/docker/freshrss/images/rss-bridge.nix b/configurations/nos/modules/docker/freshrss/images/rss-bridge.nix index 4a89306b..ac783f99 100644 --- a/configurations/nos/modules/docker/freshrss/images/rss-bridge.nix +++ b/configurations/nos/modules/docker/freshrss/images/rss-bridge.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "rssbridge/rss-bridge"; - imageDigest = "sha256:d4cb094a7bdc2d825db7ae5ebfcd2415e3ca5ff78a4fb56a045f1074fa3ae5b4"; - hash = "sha256-PJthdPayVAUjD0nkgFt+8NOYSDxjVW46IHo9KrPAMvM="; + imageDigest = "sha256:dc9aecdbbc73f2e78628a04d4e6973f8947b38f648a7d97927b80c6da340f22f"; + hash = "sha256-ZUznzJjc9z9LObMdLxzTrH5XaKJjrtX+fEKY7PffpFQ="; finalImageName = imageName; finalImageTag = "latest"; } diff --git a/configurations/nos/modules/docker/media/sonarr/images/sonarr.nix b/configurations/nos/modules/docker/media/sonarr/images/sonarr.nix index 76643fd8..05991889 100644 --- a/configurations/nos/modules/docker/media/sonarr/images/sonarr.nix +++ b/configurations/nos/modules/docker/media/sonarr/images/sonarr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "ghcr.io/linuxserver/sonarr"; - imageDigest = "sha256:6221d75e172247220c320bb340ce0ff96a09339216de52b8d861424bfc501cef"; - hash = "sha256-+fnvtqiXa/xxUiNp14eLjjd699zSBhx4G47iF401EGU="; + imageDigest = "sha256:23f6911b2b81cb69aa03166b53c15081d5c3a5ed58f5b183c5900c2d8fc9759a"; + hash = "sha256-VUDLCXGaVXX/gQC9vsFeAPJmf1b0c/QRVYdSRfEK3FA="; finalImageName = imageName; finalImageTag = "latest"; } diff --git a/flake.lock b/flake.lock index 20a27fc1..fe9706f2 100644 Binary files a/flake.lock and b/flake.lock differ diff --git a/modules/ags/config/default.nix b/modules/ags/config/default.nix index 4b77de27..a770ddd5 100644 --- a/modules/ags/config/default.nix +++ b/modules/ags/config/default.nix @@ -1,3 +1,3 @@ { - npmDepsHash = "sha256-CJzED23vNDsVEo/rJKuMYFcfwppxzhp3FJ4eYN5d0tY="; + npmDepsHash = "sha256-zOr430F6vkj9r8Cf1UcSRu5lWkOG101SC2iuWCu4LDA="; } diff --git a/modules/ags/config/package-lock.json b/modules/ags/config/package-lock.json index 55cd4b0d..71411add 100644 Binary files a/modules/ags/config/package-lock.json and b/modules/ags/config/package-lock.json differ diff --git a/modules/ags/config/package.json b/modules/ags/config/package.json index 3f9cd94b..a3a7a980 100644 --- a/modules/ags/config/package.json +++ b/modules/ags/config/package.json @@ -10,6 +10,6 @@ "eslint-plugin-jsdoc": "50.6.1", "fzf": "0.5.2", "jiti": "2.4.2", - "typescript-eslint": "8.19.0" + "typescript-eslint": "8.19.1" } } diff --git a/packages/homepage/default.nix b/packages/homepage/default.nix index caaddfa1..771bf226 100644 --- a/packages/homepage/default.nix +++ b/packages/homepage/default.nix @@ -15,7 +15,7 @@ installLocalIcons = import ./icons.nix {inherit fetchFromGitHub;}; pname = "homepage-dashboard"; - version = "0.10.8"; + version = "0.10.9"; in buildNpmPackage { inherit pname version; @@ -24,7 +24,7 @@ in owner = "gethomepage"; repo = "homepage"; rev = "v${version}"; - hash = "sha256-eFRWkwPSXQFhyKORpOTe9ifCX25ZeyVG7iezRmMxPvA="; + hash = "sha256-q8+uoikHMQVuTrVSH8tPsoI5655ZStMc/7tmoAfoZIY="; }; npmDepsHash = "sha256-N39gwct2U4UxlIL5ceDzzU7HpA6xh2WksrZNxGz04PU="; diff --git a/scopedPackages/firefox-addons/generated-firefox-addons.nix b/scopedPackages/firefox-addons/generated-firefox-addons.nix index 67865ae5..995a2441 100644 --- a/scopedPackages/firefox-addons/generated-firefox-addons.nix +++ b/scopedPackages/firefox-addons/generated-firefox-addons.nix @@ -103,10 +103,10 @@ }; "floccus" = buildFirefoxXpiAddon { pname = "floccus"; - version = "5.4.0"; + version = "5.4.2.1"; addonId = "floccus@handmadeideas.org"; - url = "https://addons.mozilla.org/firefox/downloads/file/4397347/floccus-5.4.0.xpi"; - sha256 = "b0ce34be12a6e7906e10199f3a85481cb116ad39d4cb98b9b9a81c1a0a5ce35b"; + url = "https://addons.mozilla.org/firefox/downloads/file/4414946/floccus-5.4.2.1.xpi"; + sha256 = "ce2dbc9a11027d27c1d6b1d77be56d7cb5f7831959638706efeb3d0bc515bd04"; meta = with lib; { homepage = "https://floccus.org"; description = "Sync your bookmarks and tabs across browsers via Nextcloud, any WebDAV service, any Git service, via a local file, via Google Drive."; diff --git a/scopedPackages/hass-components/default.nix b/scopedPackages/hass-components/default.nix index bdfdb615..904e86c8 100644 --- a/scopedPackages/hass-components/default.nix +++ b/scopedPackages/hass-components/default.nix @@ -12,6 +12,6 @@ in { material-symbols = buildHassComponent ./material-symbols {}; netdaemon = buildHassComponent ./netdaemon {}; spotifyplus = import ./spotifyplus ({inherit buildHassComponent;} // inputs); - tuya-local = buildHassComponent ./tuya-local {}; + tuya-local = import ./tuya-local ({inherit buildHassComponent;} // inputs); yamaha-soundbar = buildHassComponent ./yamaha-soundbar {}; }) diff --git a/scopedPackages/hass-components/tuya-local/default.nix b/scopedPackages/hass-components/tuya-local/default.nix index 53010744..91522fc2 100644 --- a/scopedPackages/hass-components/tuya-local/default.nix +++ b/scopedPackages/hass-components/tuya-local/default.nix @@ -1,22 +1,20 @@ { - tuya-local-src, - buildHomeAssistantComponent, - python3Packages, + buildHassComponent, + pkgs, ... }: let - inherit (builtins) fromJSON readFile; - - manifest = fromJSON (readFile "${tuya-local-src}/custom_components/tuya_local/manifest.json"); + python3Packages = pkgs.python3Packages.override { + overrides = final: prev: { + tinytuya = prev.tinytuya.overrideAttrs (o: rec { + version = "1.16.0"; + src = pkgs.fetchFromGitHub { + owner = "jasonacox"; + repo = "tinytuya"; + rev = "v${version}"; + hash = "sha256-K65kZjLa5AJG9FEYAs/Jf2UC8qiP7BkC8znHMHMYeg4="; + }; + }); + }; + }; in - buildHomeAssistantComponent { - owner = "make-all"; - - inherit (manifest) domain version; - - src = tuya-local-src; - - propagatedBuildInputs = with python3Packages; [ - tinytuya - tuya-device-sharing-sdk - ]; - } + buildHassComponent ./tinytuya.nix {inherit python3Packages;} diff --git a/scopedPackages/hass-components/tuya-local/tinytuya.nix b/scopedPackages/hass-components/tuya-local/tinytuya.nix new file mode 100644 index 00000000..53010744 --- /dev/null +++ b/scopedPackages/hass-components/tuya-local/tinytuya.nix @@ -0,0 +1,22 @@ +{ + tuya-local-src, + buildHomeAssistantComponent, + python3Packages, + ... +}: let + inherit (builtins) fromJSON readFile; + + manifest = fromJSON (readFile "${tuya-local-src}/custom_components/tuya_local/manifest.json"); +in + buildHomeAssistantComponent { + owner = "make-all"; + + inherit (manifest) domain version; + + src = tuya-local-src; + + propagatedBuildInputs = with python3Packages; [ + tinytuya + tuya-device-sharing-sdk + ]; + }