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 637e04ab..67b33e00 100644 --- a/flake.lock +++ b/flake.lock @@ -59,11 +59,11 @@ ] }, "locked": { - "lastModified": 1725753098, - "narHash": "sha256-/NO/h/qD/eJXAQr/fHA4mdDgYsNT9thHQ+oT6KPi2ac=", + "lastModified": 1726665257, + "narHash": "sha256-rEzEZtd3iyVo5RJ1OGujOlnywNf3gsrOnjAn1NLciD4=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "e4a13203112a036fc7f437d391c7810f3dd5ab52", + "rev": "752d0fbd141fabb5a1e7f865199b80e6e76f8d8e", "type": "github" }, "original": { @@ -79,11 +79,11 @@ ] }, "locked": { - "lastModified": 1726336469, - "narHash": "sha256-2cunUf3tVOWUkQit6boTsoNR6hdLs5Ma0qxX1sMspfU=", + "lastModified": 1726684282, + "narHash": "sha256-WGlDZRRDFGNLxegOBnsIMIxOuY1wfTCRo1d79pb/Lfo=", "owner": "Aylur", "repo": "astal", - "rev": "71ee1ea4bf4edd790edb7067f8fb0ae6c450ce5e", + "rev": "36adb5a19bf0414c7bd3703f4c6244c44fb8e68e", "type": "github" }, "original": { @@ -172,11 +172,11 @@ ] }, "locked": { - "lastModified": 1726297657, - "narHash": "sha256-IQBqFWZoqy7HA+T1xvmdc4pQsZkn86aX5srYjn+ccd4=", + "lastModified": 1726667154, + "narHash": "sha256-XrJnRYcyUW2w78typU6MS4+ZUxhnF+0eEJOj/dzn1Uo=", "owner": "matt1432", "repo": "discord-nightly-overlay", - "rev": "197516196c6a6b1d3fc925abbd509038a2df2406", + "rev": "64c50d0adcd64c805c0f1adc6d881341007b1387", "type": "github" }, "original": { @@ -379,11 +379,11 @@ ] }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -431,11 +431,11 @@ "gpu-screen-recorder-src": { "flake": false, "locked": { - "lastModified": 1726404901, - "narHash": "sha256-OVlznKSUnuwSYpgItyoBXLovZ3ZxAY7LttAR73d7Vg0=", + "lastModified": 1726671714, + "narHash": "sha256-PhlTPZjWtRsBsMxHHtm/Pb/QpJ7hUrJwGomuoGAMvnw=", "ref": "refs/heads/master", - "rev": "4a8544eeb321d37cdc3058305268f4c2ee177ca7", - "revCount": 776, + "rev": "6e73e40bb16f3b34f39364314b67f4f41e46b9a8", + "revCount": 790, "type": "git", "url": "https://repo.dec05eba.com/gpu-screen-recorder" }, @@ -534,11 +534,11 @@ ] }, "locked": { - "lastModified": 1726440980, - "narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=", + "lastModified": 1726611255, + "narHash": "sha256-/bxaYvIK6/d3zqpW26QFS0rqfd0cO4qreSNWvYLTl/w=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff", + "rev": "d2493de5cd1da06b6a4c3e97f4e7d5dd791df457", "type": "github" }, "original": { @@ -612,11 +612,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1726430622, - "narHash": "sha256-50vt1snpVwS5lqvvH4p6DHiEWspJUZuJ1kYy1DKtrfM=", + "lastModified": 1726681673, + "narHash": "sha256-n7EMRe/uMZ4QdM/DWsewc7LLRaR0GGzQIV3uu9BFZbU=", "ref": "refs/heads/main", - "rev": "9e356562446f44c471ae38a80506a9df039305d6", - "revCount": 5224, + "rev": "e6cf643f5ab1c1545fb858ab1fd9d7538ef9e0f3", + "revCount": 5235, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -894,11 +894,11 @@ ] }, "locked": { - "lastModified": 1726115155, - "narHash": "sha256-VDylz5VX4JD4/TZv6xUJDwuvNdgLRGoOpue1dlZGdIQ=", + "lastModified": 1726630303, + "narHash": "sha256-6xF6AqSGl/fNXeliuXAIOnEb4tMTUXOl1Yr1v4hURxg=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "02cf60ce20b6034fc0459e5116cec7016aaff6e4", + "rev": "f7a1bb0db21db79dfbee6950220e2816330a08b1", "type": "github" }, "original": { @@ -935,11 +935,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1726402305, - "narHash": "sha256-Ps21x+17J0rclqg68crak2Vo/P3+1fZStqmV+OI7k6M=", + "lastModified": 1726600542, + "narHash": "sha256-4ZP8rYtad1Z0LY3vZ1eYSRUzqPd3x7K0j7SpP3vReWc=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "90b637e33ab9be23e0ba3c57905a1837561923ea", + "rev": "e0cc0b05b0296fdc52fa683d47a3470dfe4f79ea", "type": "github" }, "original": { @@ -1077,11 +1077,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1723372011, - "narHash": "sha256-zqenoufFiPfobw74idorZMG8AXG3DnFzbHplt/Nkvrg=", + "lastModified": 1726529941, + "narHash": "sha256-jj7gvddyUQ3xnZxApiGv5xQaa75f1hYKFdtOfvtkcZ0=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "8802412b8747633e9d80639897e4d58fa6290909", + "rev": "a7cdbbbd9a7755489267dfd1297c613c824a5920", "type": "github" }, "original": { @@ -1211,11 +1211,11 @@ ] }, "locked": { - "lastModified": 1726370017, - "narHash": "sha256-CJOV4JiLhd++w9K+h2z00DiB4R1CCuElWzhldrXSq5w=", + "lastModified": 1726449931, + "narHash": "sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs+yE=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "0a2fba621b6bbf06be0b4edd974236e3d2fcc1a9", + "rev": "c1b0fa0bec5478185eae2fd3f39b9e906fc83995", "type": "github" }, "original": { @@ -1261,11 +1261,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1724296831, - "narHash": "sha256-+X9cc5fNEUtp6e+EZ2d9tjfPiXVcqkddEz1T/C9H5sc=", + "lastModified": 1726640797, + "narHash": "sha256-tuqkFa7ZxcGwU8gTbKO61oGMdTmG9CiaI+NiaOV7SCI=", "owner": "nix-community", "repo": "nixd", - "rev": "f6ca74330b49c45f50cead6d0ac0469f8f830f88", + "rev": "e2f0d908d6f2ee7bf72c620ed3c78817143b50ae", "type": "github" }, "original": { @@ -1276,16 +1276,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726243404, - "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", + "lastModified": 1726658796, + "narHash": "sha256-SiiWCVg/W8i6jvpgQj3NNd3YtV+jfnn/t3Za7hfn1iE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", + "rev": "75ac2a58e988a346960938ab16cea903a3cb053a", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } @@ -1407,11 +1407,11 @@ ] }, "locked": { - "lastModified": 1726435407, - "narHash": "sha256-Zun0SGBQ1EzqerJx/WX07llRwFC7F+4RJlwnuEl3wHE=", + "lastModified": 1726690818, + "narHash": "sha256-VCeS4+H3/BdIrMMJ7JeSdUw6VlCDM/7loDFS3SuHTuQ=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "a36467efcbd5633e0b518a5c222a34bf2b1be9c1", + "rev": "aaedb02a116f7f0456690ee090541b1a26018535", "type": "github" }, "original": { @@ -1737,11 +1737,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1726218807, - "narHash": "sha256-z7CoWbSOtsOz8TmRKDnobURkKfv6nPZCo3ayolNuQGc=", + "lastModified": 1726524647, + "narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f30b1bac192e2dc252107ac8a59a03ad25e1b96e", + "rev": "e2d404a7ea599a013189aa42947f66cede0645c8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index cb36159b..e1b0da05 100644 --- a/flake.nix +++ b/flake.nix @@ -263,7 +263,7 @@ }; nixpkgs = { owner = "NixOS"; - ref = "nixos-unstable"; + ref = "nixos-unstable-small"; repo = "nixpkgs"; type = "github"; }; 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 {