From 2d97a15541ddd138d780c0bac722d04ac783823a Mon Sep 17 00:00:00 2001 From: matt1432 Date: Wed, 18 Sep 2024 17:47:10 -0400 Subject: [PATCH] chore: update flake.lock MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake Inputs: • Updated input 'astal': 'github:Aylur/astal/71ee1ea' (2024-09-14) → 'github:Aylur/astal/36adb5a' (2024-09-18) • Updated input 'discord-overlay': 'github:matt1432/discord-nightly-overlay/1975161' (2024-09-14) → 'github:matt1432/discord-nightly-overlay/64c50d0' (2024-09-18) • Updated input 'gpu-screen-recorder-src': 'git+https://repo.dec05eba.com/gpu-screen-recorder?ref=refs/heads/master&rev=4a8544e' (2024-09-15) → 'git+https://repo.dec05eba.com/gpu-screen-recorder?ref=refs/heads/master&rev=6e73e40' (2024-09-18) • Updated input 'home-manager': 'github:nix-community/home-manager/a9c9cc6' (2024-09-15) → 'github:nix-community/home-manager/d2493de' (2024-09-17) • Updated input 'hyprland': 'git+https://github.com/hyprwm/Hyprland?ref=refs/heads/main&rev=9e35656&submodules=1' (2024-09-15) → 'git+https://github.com/hyprwm/Hyprland?ref=refs/heads/main&rev=e6cf643&submodules=1' (2024-09-18) • Updated input 'hyprland/aquamarine': 'github:hyprwm/aquamarine/e4a1320' (2024-09-07) → 'github:hyprwm/aquamarine/752d0fb' (2024-09-18) • Updated input 'jovian': 'github:Jovian-Experiments/Jovian-NixOS/02cf60c' (2024-09-12) → 'github:Jovian-Experiments/Jovian-NixOS/f7a1bb0' (2024-09-18) • Updated input 'nix-index-db': 'github:Mic92/nix-index-database/0a2fba6' (2024-09-15) → 'github:Mic92/nix-index-database/c1b0fa0' (2024-09-16) • Updated input 'nixd': 'github:nix-community/nixd/f6ca743' (2024-08-22) → 'github:nix-community/nixd/e2f0d90' (2024-09-18) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/a36467e' (2024-09-15) → 'github:nix-community/nixpkgs-wayland/aaedb02' (2024-09-18) • Updated input 'sops-nix': 'github:Mic92/sops-nix/f30b1ba' (2024-09-13) → 'github:Mic92/sops-nix/e2d404a' (2024-09-16) Docker Images: • vegardit/gitea-act-runner dind-latest: sha256:acc510a4754aa871dcaac69396055fea3117b5378a36efd9fbf3b3db542fa81a → sha256:378efec2a8f9e17874965b6a03ea935b0195eb85bdf60305eee994f684134f27 • ghcr.io/linuxserver/bazarr latest: sha256:476c315f0381d0b8c7921fbf3116b65e96ae32128df5fd27600e97213b862809 → sha256:71f545e4a6cfda02798fd531bfc27b14cbf7345bb28fe503467fb1ab13c3bfbc • ghcr.io/linuxserver/prowlarr latest: sha256:c1318191d5211ac7462c754422eafe350ed0de61c4160065a420896068ec1ccc → sha256:bddc64a17aa38972f4c032f67efc3bf0a498883257e615a2d807ca44550cebf0 Firefox Addons: darkreader: 4.9.89 -> 4.9.92 --- common/default.nix | 14 +------------- .../docker/forgejo/images/act_runner.nix | 4 ++-- .../docker/media/bazarr/images/bazarr.nix | 4 ++-- .../docker/media/prowlarr/images/prowlarr.nix | 4 ++-- flake.lock | Bin 54234 -> 54240 bytes flake.nix | Bin 9043 -> 9049 bytes .../generated-firefox-addons.nix | 6 +++--- .../extended-ollama-conversation.nix | 1 + outputs.nix | 2 +- 9 files changed, 12 insertions(+), 23 deletions(-) diff --git a/common/default.nix b/common/default.nix index b3582201..7810eed6 100644 --- a/common/default.nix +++ b/common/default.nix @@ -27,19 +27,7 @@ }; nix = { - # FIXME: wait for this to reach nixos-unstable https://pr-tracker.nelim.org/?pr=341007 - package = pkgs.nixVersions.nix_2_24.overrideAttrs (o: rec { - version = "2.24.6"; - - src = pkgs.fetchFromGitHub { - owner = "NixOS"; - repo = "nix"; - rev = version; - hash = "sha256-kgq3B+olx62bzGD5C6ighdAoDweLq+AebxVHcDnKH4w="; - }; - - meta = removeAttrs o.meta ["knownVulnerabilities"]; - }); + package = pkgs.nixVersions.nix_2_24; # Edit nix.conf settings = { diff --git a/devices/nos/modules/docker/forgejo/images/act_runner.nix b/devices/nos/modules/docker/forgejo/images/act_runner.nix index 2d2caf94..9babbbf1 100644 --- a/devices/nos/modules/docker/forgejo/images/act_runner.nix +++ b/devices/nos/modules/docker/forgejo/images/act_runner.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "vegardit/gitea-act-runner"; - imageDigest = "sha256:acc510a4754aa871dcaac69396055fea3117b5378a36efd9fbf3b3db542fa81a"; - sha256 = "12a9gw7nl5g4ji8jcg9w55a5zx7q9ny80bfk5qhl05yj7h6514ni"; + imageDigest = "sha256:378efec2a8f9e17874965b6a03ea935b0195eb85bdf60305eee994f684134f27"; + sha256 = "1g5apdg8mycda2rwfnfjr3h5005l3gn2i2s5zywiijfx6piif3k4"; finalImageName = "vegardit/gitea-act-runner"; finalImageTag = "dind-latest"; } diff --git a/devices/nos/modules/docker/media/bazarr/images/bazarr.nix b/devices/nos/modules/docker/media/bazarr/images/bazarr.nix index 9264149e..5a250660 100644 --- a/devices/nos/modules/docker/media/bazarr/images/bazarr.nix +++ b/devices/nos/modules/docker/media/bazarr/images/bazarr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/linuxserver/bazarr"; - imageDigest = "sha256:476c315f0381d0b8c7921fbf3116b65e96ae32128df5fd27600e97213b862809"; - sha256 = "0c59zsddmp8din5c516zhcsxfjx6a5w0yam7ynavsa227cjxa0m5"; + imageDigest = "sha256:71f545e4a6cfda02798fd531bfc27b14cbf7345bb28fe503467fb1ab13c3bfbc"; + sha256 = "1ibq19ixkls3dwmmqcjz9ybia6fmyw5bb0zmx5sl53qnnbr707j4"; finalImageName = "ghcr.io/linuxserver/bazarr"; finalImageTag = "latest"; } diff --git a/devices/nos/modules/docker/media/prowlarr/images/prowlarr.nix b/devices/nos/modules/docker/media/prowlarr/images/prowlarr.nix index 99f61670..77c0216a 100644 --- a/devices/nos/modules/docker/media/prowlarr/images/prowlarr.nix +++ b/devices/nos/modules/docker/media/prowlarr/images/prowlarr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage { imageName = "ghcr.io/linuxserver/prowlarr"; - imageDigest = "sha256:c1318191d5211ac7462c754422eafe350ed0de61c4160065a420896068ec1ccc"; - sha256 = "1ddvrlh24x0blk1vkvxvxwi9hv4hqagy8fd4183vvpcf3c1rfpps"; + imageDigest = "sha256:bddc64a17aa38972f4c032f67efc3bf0a498883257e615a2d807ca44550cebf0"; + sha256 = "0wrs6vw4nbbcvjkyfbjbfbwwv1h77m2m6374jd59qffq5bpz1fw7"; finalImageName = "ghcr.io/linuxserver/prowlarr"; finalImageTag = "latest"; } diff --git a/flake.lock b/flake.lock index 637e04abd453223a1ab10114b17fc76d7c03a8d5..67b33e000956e7c76bb688dbcb053ee1ac0423bb 100644 GIT binary patch delta 1842 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 E7d*0A8vpo@iHlqSDIW!~ diff --git a/legacyPackages/firefox-addons/generated-firefox-addons.nix b/legacyPackages/firefox-addons/generated-firefox-addons.nix index a328e2ea..74c1061a 100644 --- a/legacyPackages/firefox-addons/generated-firefox-addons.nix +++ b/legacyPackages/firefox-addons/generated-firefox-addons.nix @@ -82,10 +82,10 @@ }; "darkreader" = buildFirefoxXpiAddon { pname = "darkreader"; - version = "4.9.89"; + version = "4.9.92"; addonId = "addon@darkreader.org"; - url = "https://addons.mozilla.org/firefox/downloads/file/4341235/darkreader-4.9.89.xpi"; - sha256 = "f4a5b4d5966d99cc68b31a9d2072cdb6388efefa9d45746f03d76e3c897c49be"; + url = "https://addons.mozilla.org/firefox/downloads/file/4351387/darkreader-4.9.92.xpi"; + sha256 = "be55b3ea5bab95743d43823d9290fa820035b89c4d07943b568111d837a98226"; meta = with lib; { homepage = "https://darkreader.org/"; description = "Dark mode for every website. Take care of your eyes, use dark theme for night and daily browsing."; diff --git a/legacyPackages/hass-components/extended-ollama-conversation.nix b/legacyPackages/hass-components/extended-ollama-conversation.nix index 7046404e..affc726b 100644 --- a/legacyPackages/hass-components/extended-ollama-conversation.nix +++ b/legacyPackages/hass-components/extended-ollama-conversation.nix @@ -10,6 +10,7 @@ manifest = fromJSON (readFile "${extended-ollama-conversation-src}/custom_components/extended_ollama_conversation/manifest.json"); openai = python3Packages.openai.overrideAttrs (o: rec { + name = "${o.pname}-${version}"; version = "1.3.8"; src = fetchFromGitHub { diff --git a/outputs.nix b/outputs.nix index dfd39fa1..f06eabc1 100644 --- a/outputs.nix +++ b/outputs.nix @@ -11,7 +11,7 @@ nixpkgs = mkInput { owner = "NixOS"; repo = "nixpkgs"; - ref = "nixos-unstable"; + ref = "nixos-unstable-small"; }; home-manager = mkDep {