diff --git a/modules/nixos/services/caddy/default.nix b/modules/nixos/services/caddy/default.nix index e7ae8c5..6c2a927 100644 --- a/modules/nixos/services/caddy/default.nix +++ b/modules/nixos/services/caddy/default.nix @@ -14,7 +14,7 @@ let plugins = [ "github.com/caddy-dns/cloudflare@v0.2.2" ]; - hash = "sha256-dnhEjopeA0UiI+XVYHYpsjcEI6Y1Hacbi28hVKYQURg="; + hash = "sha256-biQdtiscdmrwP6VUsuXmZrvcdewl+g50kdmab5lhE0s="; }; # "github.com/hslatman/caddy-crowdsec-bouncer/http@v0.9.2" diff --git a/packages/bcachefs/default.nix b/packages/bcachefs/default.nix index 1ce6bd4..1fce422 100644 --- a/packages/bcachefs/default.nix +++ b/packages/bcachefs/default.nix @@ -24,22 +24,25 @@ installShellFiles, fuseSupport ? false, udevCheckHook, + namespace, }: +let + inherit (lib.trivial) importJSON; + inherit (lib.${namespace}) selectVariant mkAllSources; + versionSpec = importJSON ./version.json; + selected = selectVariant versionSpec null null; + sources = mkAllSources selected; +in stdenv.mkDerivation (finalAttrs: { pname = "bcachefs-tools"; version = "1.36.1"; - src = fetchFromGitHub { - owner = "koverstreet"; - repo = "bcachefs-tools"; - tag = "v${finalAttrs.version}"; - hash = "sha256-15Z1lHNeXTToDpdVc/YB5ojhoiB5qdgWs47O1aKoyFM="; - }; + src = sources.bcachefs-tools; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-YWsJUSgKNkK9W4Yuolix21bRRFSF01+sivoj7SJo7DY="; + hash = sources.cargoDeps.hash; }; postPatch = '' diff --git a/packages/bcachefs/version.json b/packages/bcachefs/version.json new file mode 100644 index 0000000..fd42a3c --- /dev/null +++ b/packages/bcachefs/version.json @@ -0,0 +1,16 @@ +{ + "schemaVersion": 1, + "sources": { + "bcachefs-tools": { + "fetcher": "git", + "url": "https://github.com/koverstreet/bcachefs-tools", + "tag": "1.36.1", + "hash": "sha256-15Z1lHNeXTToDpdVc/YB5ojhoiB5qdgWs47O1aKoyFM=", + "cargoHash": "sha256-YWsJUSgKNkK9W4Yuolix21bRRFSF01+sivoj7SJo7DY=" + }, + "cargoDeps": { + "hash": "sha256-YWsJUSgKNkK9W4Yuolix21bRRFSF01+sivoj7SJo7DY=" + } + } + } + \ No newline at end of file diff --git a/packages/homeassistant/ha-bedjet/default.nix b/packages/homeassistant/ha-bedjet/default.nix index 6adb45a..24bc4db 100644 --- a/packages/homeassistant/ha-bedjet/default.nix +++ b/packages/homeassistant/ha-bedjet/default.nix @@ -13,7 +13,8 @@ buildHomeAssistantComponent rec { owner = owner; repo = "ha-bedjet"; rev = version; - hash = "sha256-Vs35OvIfSxvwiK6HenZWKOi7V8xz/RMWgplYxhQtvxU="; + hash = "sha256-sb6zC/kFtIMVr6+/U00jcFwOZxAedNutRONq/LZfdKI="; + tag = "2.0.1"; }; nativeBuildInputs = with python3Packages; [ diff --git a/packages/homeassistant/ha-gehome/default.nix b/packages/homeassistant/ha-gehome/default.nix index 6e69ff1..355316e 100644 --- a/packages/homeassistant/ha-gehome/default.nix +++ b/packages/homeassistant/ha-gehome/default.nix @@ -15,7 +15,8 @@ buildHomeAssistantComponent rec { owner = owner; repo = "ha_gehome"; rev = version; - hash = "sha256-hxgQsHb0E/XQEZoVFtKOgdHEVsU5UgqhOjjkgKqlI1I="; + hash = "sha256-p34yBtoqAMVCiAZKyxWPTVOSjPaueD1sb5ZEzWF2OZ4="; + tag = "v2026.2.0"; }; nativeBuildInputs = diff --git a/packages/proton-cachyos/version.json b/packages/proton-cachyos/version.json index c9eb109..c41305d 100644 --- a/packages/proton-cachyos/version.json +++ b/packages/proton-cachyos/version.json @@ -19,44 +19,44 @@ "cachyos": { "variables": { "base": "10.0", - "release": "20260207" + "release": "20260227" }, "sources": { "proton": { - "hash": "sha256-hJKrcrrMbVx1gakpVWYWg9ALjq+uAfYeB/67JfFliTg=" + "hash": "sha256-kcWSmF+qwClI4qUkv3ShVBQ6plQ8q3jyo59o5uN4ueM=" } } }, "cachyos-v2": { "variables": { "base": "10.0", - "release": "20260207" + "release": "20260227" }, "sources": { "proton": { - "hash": "sha256-mNUB/NXwTWDuP1PBVkENgMX8u53yzkP0dhQ8HnbUScs=" + "hash": "sha256-kcWSmF+qwClI4qUkv3ShVBQ6plQ8q3jyo59o5uN4ueM=" } } }, "cachyos-v3": { "variables": { "base": "10.0", - "release": "20260207" + "release": "20260227" }, "sources": { "proton": { - "hash": "sha256-76iQrZKa2ysCDKV4jysWqthaiKMfjGWQR7r6IwilktI=" + "hash": "sha256-kcWSmF+qwClI4qUkv3ShVBQ6plQ8q3jyo59o5uN4ueM=" } } }, "cachyos-v4": { "variables": { "base": "10.0", - "release": "20260207" + "release": "20260227" }, "sources": { "proton": { - "hash": "sha256-/GkMdSjP3DkbYjvvDEZvI2Na4WFW27zVwxkf9sLQj80=" + "hash": "sha256-kcWSmF+qwClI4qUkv3ShVBQ6plQ8q3jyo59o5uN4ueM=" } } }, diff --git a/packages/python/python-roborock/default.nix b/packages/python/python-roborock/default.nix index 1553161..85040de 100644 --- a/packages/python/python-roborock/default.nix +++ b/packages/python/python-roborock/default.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonPackage rec { pname = "python-roborock"; - version = "4.12.0"; + version = "4.17.2"; pyproject = true; disabled = python3Packages.pythonOlder "3.11"; @@ -16,8 +16,8 @@ python3Packages.buildPythonPackage rec { src = fetchFromGitHub { owner = "humbertogontijo"; repo = "python-roborock"; - tag = "v${version}"; - hash = "sha256-H47NKOGKUCJs9LolVcTg6R8W6Fuq+YWBgrwJUB08JVA="; + tag = "v4.17.2"; + hash = "sha256-i2XVzhZP+qA0pAv1qcaxGlgvhcz4efELO9t4vylRGdw="; }; pythonRelaxDeps = [ diff --git a/packages/python/pyvesync/default.nix b/packages/python/pyvesync/default.nix index fc9cf70..6e6e874 100644 --- a/packages/python/pyvesync/default.nix +++ b/packages/python/pyvesync/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonPackage rec { pname = "pyvesync"; - version = "3.4.0"; + version = "3.4.1"; pyproject = true; disabled = python3Packages.pythonOlder "3.11"; @@ -15,7 +15,7 @@ python3Packages.buildPythonPackage rec { owner = "webdjoe"; repo = "pyvesync"; rev = version; - hash = "sha256-G1Ov8xXIVkklxfLqhHiYbRgHEsjTQhG7k1V6Amtc+w4="; + hash = "sha256-iqOKBpP/TYgbs6Tq+eWhxBCu/bHYRELXY7r4zjEXU3Q="; }; build-system = with python3Packages; [ setuptools ]; diff --git a/packages/raspberrypi/linux-rpi/version.json b/packages/raspberrypi/linux-rpi/version.json index 1d90473..8324541 100644 --- a/packages/raspberrypi/linux-rpi/version.json +++ b/packages/raspberrypi/linux-rpi/version.json @@ -12,8 +12,8 @@ "fetcher": "github", "owner": "raspberrypi", "repo": "linux", - "rev": "87e52a7868888c66b2782c949c8406c27f909c11", - "hash": "sha256-1ob91gGajlTEZjn7GRls4bL5TP8Ulj74hoRUUlmeICA=" + "rev": "061ed5b31ad6f3136e6094002204040cd9c1c4a3", + "hash": "sha256-1ob91gasjlTEZjn7GRls4bL5TP8Ulj74hoRUUlmeICA=" } }, "variants": { @@ -24,7 +24,7 @@ }, "unstable": { "variables": { - "modDirVersion": "6.18.10" + "modDirVersion": "7.0" } } }, diff --git a/packages/raspberrypi/raspberrypi-utils/version.json b/packages/raspberrypi/raspberrypi-utils/version.json index 89a31fd..d16cadf 100644 --- a/packages/raspberrypi/raspberrypi-utils/version.json +++ b/packages/raspberrypi/raspberrypi-utils/version.json @@ -5,8 +5,8 @@ "fetcher": "github", "owner": "raspberrypi", "repo": "utils", - "rev": "58d5da926965ad78fb863abacdd73a00dea022a1", - "hash": "sha256-EjJMuqyJopZ+CsGrFwyjpOGx/p5+gww7IaIX0ZqlczU=" + "rev": "60ea0df9b7a43b4198c0def6355b600eb2cfbfb1", + "hash": "sha256-P+SFkWcvNefpp1ZDf3GVMKuGG45POAWUeDKBvdMEAd0=" } } } diff --git a/packages/raspberrypi/raspberrypifw/default.nix b/packages/raspberrypi/raspberrypifw/default.nix index 5057af5..3b7c94c 100644 --- a/packages/raspberrypi/raspberrypifw/default.nix +++ b/packages/raspberrypi/raspberrypifw/default.nix @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation { pname = "raspberrypi-firmware"; version = vars.version; - src = sources.firmware; + src = sources.firmware-next; installPhase = '' mkdir -p $out/share/raspberrypi/ diff --git a/packages/raspberrypi/raspberrypifw/version.json b/packages/raspberrypi/raspberrypifw/version.json index e9051c5..dc0646b 100644 --- a/packages/raspberrypi/raspberrypifw/version.json +++ b/packages/raspberrypi/raspberrypifw/version.json @@ -10,6 +10,13 @@ "repo": "firmware", "tag": "${version}", "hash": "sha256-DqVgsPhppxCsZ+H6S7XY5bBoRhOgPipKibDwikqBk08=" + }, + "firmware-next": { + "fetcher": "github", + "owner": "raspberrypi", + "repo": "firmware", + "rev": "94a0176136cbb024858cf8debd547f3f233021b7", + "hash": "sha256-DqVgsPhppxssZ+H6S7XY5bBoRhOgPipKibDwikqBk08=" } } }