From c0da60564f2b2432b4d67ea084e76b718a54137f Mon Sep 17 00:00:00 2001 From: phaer Date: Wed, 26 Nov 2025 01:14:01 +0100 Subject: [PATCH 01/10] system.build.images: warn if system.build.image is defined... but still define the images (plural) options. If both are used, conflicts due to colliding priorities will pop up, but if we just skip defining `system.build.images`, users of e.g. `nixos-rebuild build-image` will receive confusing error messages. With this change, they'll see the evaluation warning, providing import context for the errors below the warning. --- nixos/modules/image/images.nix | 44 ++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/nixos/modules/image/images.nix b/nixos/modules/image/images.nix index b0f86ed5c455..b8729e6e3e6a 100644 --- a/nixos/modules/image/images.nix +++ b/nixos/modules/image/images.nix @@ -81,22 +81,30 @@ in }; }; - config.image.modules = lib.mkIf (!config.system.build ? image) imageModules; - config.system.build.images = lib.mkIf (!config.system.build ? image) ( - lib.mapAttrs ( - name: nixos: - let - inherit (nixos) config; - inherit (config.image) filePath; - builder = - config.system.build.image - or (throw "Module for `system.build.images.${name}` misses required `system.build.image` option."); - in - lib.recursiveUpdate builder { - passthru = { - inherit config filePath; - }; - } - ) imageConfigs - ); + config.image.modules = imageModules; + config.system.build.images = + lib.warnIf (config.system.build ? image) + '' + `system.build.image` is defined, while `system.build.images` is used. + The former will conflict with variants in the latter. + Maybe you are importing an image-building module into the toplevel? + Add it to `image.modules` instead, or adjust priorities manually. + '' + ( + lib.mapAttrs ( + name: nixos: + let + inherit (nixos) config; + inherit (config.image) filePath; + builder = + config.system.build.image + or (throw "Module for `system.build.images.${name}` misses required `system.build.image` option."); + in + lib.recursiveUpdate builder { + passthru = { + inherit config filePath; + }; + } + ) imageConfigs + ); } From d34b0bc642e2d70658753f1023327d2ba3b4bdb0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Jan 2026 03:49:53 +0000 Subject: [PATCH 02/10] fonttosfnt: 1.2.4 -> 1.2.5 --- pkgs/by-name/fo/fonttosfnt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fo/fonttosfnt/package.nix b/pkgs/by-name/fo/fonttosfnt/package.nix index f7228391f4f9..10176a54726b 100644 --- a/pkgs/by-name/fo/fonttosfnt/package.nix +++ b/pkgs/by-name/fo/fonttosfnt/package.nix @@ -12,7 +12,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "fonttosfnt"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "app"; repo = "fonttosfnt"; tag = "fonttosfnt-${finalAttrs.version}"; - hash = "sha256-DPPouSLsPurJ7fscxraF9HEYENbuCvZcxZ44bBY7ytU="; + hash = "sha256-W516e6ChCyvyjW4AT5DKzg12s+up0fO5UMDedAcO68o="; }; strictDeps = true; From 6f801cf400374ebc1e0fdfad6b3b636c47621881 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 9 Jan 2026 00:12:28 +0000 Subject: [PATCH 03/10] ruff: 0.14.10 -> 0.14.11 Diff: https://github.com/astral-sh/ruff/compare/v0.4.10...0.14.11 Changelog: https://github.com/astral-sh/ruff/releases/tag/0.14.11 --- pkgs/by-name/ru/ruff/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index 7e2f0084c645..fc50449ca92d 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -16,18 +16,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ruff"; - version = "0.14.10"; + version = "0.14.11"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; tag = finalAttrs.version; - hash = "sha256-YwgW3sjI3l3H9Tq2BO7yDOhiiaIy///xxj4UQYq39gI="; + hash = "sha256-W8BYc0m/3WsguchDweUapreLrNp47jzkuldI5yEWgvA="; }; cargoBuildFlags = [ "--package=ruff" ]; - cargoHash = "sha256-NyNXR1PGds+GXAha9u4DglUyy7T+yqLjNpGnchYn6oc="; + cargoHash = "sha256-0axyrkSHjBPhv40LvdcRDUqC+j0mUL/VzpgL/I0R5/o="; nativeBuildInputs = [ installShellFiles ]; From aa14673b7a8e74ea381086796b74578d9528a22f Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Fri, 9 Jan 2026 22:33:27 +0000 Subject: [PATCH 04/10] nixos/test-driver: Adjust `__call__` timeout parameter to match new name --- nixos/lib/test-script-prepend.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/test-script-prepend.py b/nixos/lib/test-script-prepend.py index 067fd20fe7c5..6be20270c6cc 100644 --- a/nixos/lib/test-script-prepend.py +++ b/nixos/lib/test-script-prepend.py @@ -13,7 +13,7 @@ from unittest import TestCase class RetryProtocol(Protocol): - def __call__(self, fn: Callable, timeout: int = 900) -> None: + def __call__(self, fn: Callable, timeout_seconds: int = 900) -> None: raise Exception("This is just type information for the Nix test driver") From 106bc9379a91594e4fe5e2f4d1e96a7db69f13ad Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Fri, 9 Jan 2026 22:35:08 +0000 Subject: [PATCH 05/10] nixos/lomiri: Adjust `retry()` timeout parameter --- nixos/tests/lomiri.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix index cb24a77618fe..c7cc33d94a94 100644 --- a/nixos/tests/lomiri.nix +++ b/nixos/tests/lomiri.nix @@ -137,7 +137,7 @@ let with machine.nested("Waiting for the screen to have launcherColor {} on it:".format(launcherColor)): retry(check_for_color(launcherColor)) with machine.nested("Ensuring launcherColor {} stays present on the screen:".format(launcherColor)): - retry(fn=check_for_color_continued_presence(launcherColor), timeout=30) + retry(fn=check_for_color_continued_presence(launcherColor), timeout_seconds=30) machine.screenshot("lomiri_launched") From 60f586548a944368583c7a7ffb2c498de1518e52 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 12 Jan 2026 14:58:31 +1000 Subject: [PATCH 06/10] linux_6_18: 6.18.4 -> 6.18.5 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 3ea3be0917cf..a3fc11f0db59 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -30,8 +30,8 @@ "lts": true }, "6.18": { - "version": "6.18.4", - "hash": "sha256:1asza9m4vb7lghxaiy5fpnbwmb9a44pgjclbpgv1p77plnf16l7q", + "version": "6.18.5", + "hash": "sha256:0h6r5w7755gd8ys18zi9rgw95wrd2yalbq0h88ihv3ggki01z78q", "lts": false } } From bd8514d46a59dc84954db5b101be60d53439f639 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 12 Jan 2026 14:59:02 +1000 Subject: [PATCH 07/10] linux_6_12: 6.12.64 -> 6.12.65 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index a3fc11f0db59..37b047786c24 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -25,8 +25,8 @@ "lts": true }, "6.12": { - "version": "6.12.64", - "hash": "sha256:18j9ivimvlm1afzfiw03n3r35qv91nbjhh2gi3z8w5416sir9bfi", + "version": "6.12.65", + "hash": "sha256:1h9rl62lffwxan5ggz1vi9wmyzzsclg330gwdk80wp7kg9k55s2l", "lts": true }, "6.18": { From b8df508a977e027dea03ebfcb830e9cf08ba0473 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 12 Jan 2026 14:59:48 +1000 Subject: [PATCH 08/10] linux_6_6: 6.6.119 -> 6.6.120 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 37b047786c24..6d34903b4146 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,8 +20,8 @@ "lts": true }, "6.6": { - "version": "6.6.119", - "hash": "sha256:1s75ad95g4y80idadzqmj9kj4rb3dhnvny9lg4lcq15l1fc9p81x", + "version": "6.6.120", + "hash": "sha256:08fwwi9wjnhaj4ig0n0ycppzw384djh0gzv3i3blzp7fb4nk6p20", "lts": true }, "6.12": { From b7673c7b5f8a7f50893a129b6a552a8a03cc9256 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 12 Jan 2026 15:00:35 +1000 Subject: [PATCH 09/10] linux_6_1: 6.1.159 -> 6.1.160 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 6d34903b4146..e36e8df15968 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -5,8 +5,8 @@ "lts": false }, "6.1": { - "version": "6.1.159", - "hash": "sha256:17ib6ila2s8rclqpfxlkk1g72azj2r46k2x1q3n2j24qjfz7w80z", + "version": "6.1.160", + "hash": "sha256:15l4s87vyv4rnf5yagl6x7kz4yrlalh191ssxwbvwn3m8fl4d18f", "lts": true }, "5.15": { From 710c7c3c6fc54971f360c04dedeefeac1b97c73a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 12 Jan 2026 17:21:18 +1000 Subject: [PATCH 10/10] linux_testing: 6.19-rc4 -> 6.19-rc5 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index e36e8df15968..9d8494c2be6d 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.19-rc4", - "hash": "sha256:1ivkpgmmpy7my1vcly82pnnz3ynmdjz62n4q251j970zk8m42r9s", + "version": "6.19-rc5", + "hash": "sha256:1kwyxmykzy7z7kp80c85b17wrgqn7jjjvbpic9jgk5ps27zbzvdk", "lts": false }, "6.1": {