Merge pull request 'Update nixpkgs' (#4821) from update-nixpkgs into main

pkgs/clan-cli/clan_lib/flash/list.py

@@ -32,7 +32,7 @@ def get_machine_flash_options() -> FlashOptions:
 
 
 def list_languages() -> list[str]:
-    cmd = nix_build([f"{nixpkgs_source()}#legacyPackages.x86_64-linux.glibcLocales"])
+    cmd = nix_build([f"{nixpkgs_source()}#glibcLocales"])
     result = run(cmd, RunOpts(log=Log.STDERR, error_msg="Failed to find glibc locales"))
     locale_file = Path(result.stdout.strip()) / "share" / "i18n" / "SUPPORTED"
 
@@ -57,7 +57,7 @@ def list_languages() -> list[str]:
 
 
 def list_keymaps() -> list[str]:
-    cmd = nix_build([f"{nixpkgs_source()}#legacyPackages.x86_64-linux.kbd"])
+    cmd = nix_build([f"{nixpkgs_source()}#kbd.out"])
     result = run(cmd, RunOpts(log=Log.STDERR, error_msg="Failed to find kbdinfo"))
     keymaps_dir = Path(result.stdout.strip()) / "share" / "keymaps"
 

pkgs/clan-cli/clan_lib/persist/util.py

@@ -249,7 +249,7 @@ def calc_patches(
     data_dyn = flatten_data(persisted)
 
     all_keys = set(data_all) | set(data_all_updated)
-    patchset = {}
+    patchset: dict[str, Any] = {}
 
     delete_set = find_deleted_paths(all_values, update, parent_key="")
 

pkgs/clan-cli/clan_lib/templates/__init__.py

@@ -2,6 +2,7 @@ import logging
 from dataclasses import dataclass
 
 from clan_lib.dirs import clan_templates
+from clan_lib.errors import ClanError
 from clan_lib.flake import Flake
 from clan_lib.nix_models.clan import ClanTemplatesType
 
@@ -35,8 +36,7 @@ def list_templates(flake: Flake | None) -> TemplateList:
         builtin_templates = flake.select("clanInternals.templates")
 
         return TemplateList(builtin_templates, custom_templates)
-
-    except (AttributeError, KeyError, Exception):
+    except ClanError:
         log.debug(
             "Failed to get templates from clan inputs, "
             "falling back to clan-core builtin templates",

pkgs/clan-cli/default.nix

@@ -227,8 +227,8 @@ pythonRuntime.pkgs.buildPythonApplication {
               ../../nixosModules/clanCore/zerotier/generate.py
 
               # needed by flash list tests
-              nixpkgs.legacyPackages.x86_64-linux.kbd
-              nixpkgs.legacyPackages.x86_64-linux.glibcLocales
+              pkgs.kbd
+              pkgs.glibcLocales
 
               # Pre-built VMs for impure tests
               pkgs.stdenv.drvPath