staging-nixos merge for 2026-01-12 (#479285)

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")
 
 

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
+      );
 }

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")
 

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;

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 ];
 

pkgs/os-specific/linux/kernel/kernels-org.json

@@ -1,12 +1,12 @@
 {
     "testing": {
-        "version": "6.19-rc4",
-        "hash": "sha256:1ivkpgmmpy7my1vcly82pnnz3ynmdjz62n4q251j970zk8m42r9s",
+        "version": "6.19-rc5",
+        "hash": "sha256:1kwyxmykzy7z7kp80c85b17wrgqn7jjjvbpic9jgk5ps27zbzvdk",
         "lts": false
     },
     "6.1": {
-        "version": "6.1.159",
-        "hash": "sha256:17ib6ila2s8rclqpfxlkk1g72azj2r46k2x1q3n2j24qjfz7w80z",
+        "version": "6.1.160",
+        "hash": "sha256:15l4s87vyv4rnf5yagl6x7kz4yrlalh191ssxwbvwn3m8fl4d18f",
         "lts": true
     },
     "5.15": {
@@ -20,18 +20,18 @@
         "lts": true
     },
     "6.6": {
-        "version": "6.6.119",
-        "hash": "sha256:1s75ad95g4y80idadzqmj9kj4rb3dhnvny9lg4lcq15l1fc9p81x",
+        "version": "6.6.120",
+        "hash": "sha256:08fwwi9wjnhaj4ig0n0ycppzw384djh0gzv3i3blzp7fb4nk6p20",
         "lts": true
     },
     "6.12": {
-        "version": "6.12.64",
-        "hash": "sha256:18j9ivimvlm1afzfiw03n3r35qv91nbjhh2gi3z8w5416sir9bfi",
+        "version": "6.12.65",
+        "hash": "sha256:1h9rl62lffwxan5ggz1vi9wmyzzsclg330gwdk80wp7kg9k55s2l",
         "lts": true
     },
     "6.18": {
-        "version": "6.18.4",
-        "hash": "sha256:1asza9m4vb7lghxaiy5fpnbwmb9a44pgjclbpgv1p77plnf16l7q",
+        "version": "6.18.5",
+        "hash": "sha256:0h6r5w7755gd8ys18zi9rgw95wrd2yalbq0h88ihv3ggki01z78q",
         "lts": false
     }
 }