Merge master into staging-next

maintainers/maintainer-list.nix

@@ -24536,6 +24536,17 @@
     github = "waynr";
     githubId = 1441126;
   };
+  wbondanza_devoteam = {
+    name = "Wilson Bondanza";
+    email = "wilson.bondanza@devoteam.com";
+    github = "wbondanza-devoteam";
+    githubId = 195292349;
+    keys = [
+      {
+        fingerprint = "61F3 9F46 606D 655F 4E8D  6C82 B623 05E6 1563 8A9E";
+      }
+    ];
+  };
   wchresta = {
     email = "wchresta.nix@chrummibei.ch";
     github = "wchresta";

nixos/modules/services/desktop-managers/lomiri.nix

@@ -100,13 +100,13 @@ in
             lomiri-session # wrappers to properly launch the session
             lomiri-sounds
             lomiri-system-settings
+            lomiri-telephony-service
             lomiri-terminal-app
             lomiri-thumbnailer
             lomiri-url-dispatcher
             mediascanner2 # TODO possibly needs to be kicked off by graphical-session.target
             morph-browser
             qtmir # not having its desktop file for Xwayland available causes any X11 application to crash the session
-            telephony-service
             teleports
           ]);
       };
@@ -152,7 +152,7 @@ in
           )
           ++ (
             with pkgs.lomiri;
-            [ telephony-service ]
+            [ lomiri-telephony-service ]
             ++ lib.optionals config.networking.networkmanager.enable [ lomiri-indicator-network ]
           );
       };

nixos/modules/system/activation/pre-switch-check.nix

@@ -1,21 +1,35 @@
-{ lib, pkgs, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
 let
-  preSwitchCheckScript =
-    set:
-    lib.concatLines (
-      lib.mapAttrsToList (name: text: ''
-        # pre-switch check ${name}
-        (
-          ${text}
-        )
-        if [[ $? != 0 ]]; then
-          echo "Pre-switch check '${name}' failed"
-          exit 1
-        fi
-      '') set
-    );
+  preSwitchCheckScript = lib.concatLines (
+    lib.mapAttrsToList (name: text: ''
+      # pre-switch check ${name}
+      if ! (
+        ${text}
+      ) >&2 ; then
+        echo "Pre-switch check '${name}' failed" >&2
+        exit 1
+      fi
+    '') config.system.preSwitchChecks
+  );
 in
 {
+  options.system.preSwitchChecksScript = lib.mkOption {
+    type = lib.types.pathInStore;
+    internal = true;
+    readOnly = true;
+    default = lib.getExe (
+      pkgs.writeShellApplication {
+        name = "pre-switch-checks";
+        text = preSwitchCheckScript;
+      }
+    );
+  };
+
   options.system.preSwitchChecks = lib.mkOption {
     default = { };
     example = lib.literalExpression ''
@@ -33,12 +47,5 @@ in
     '';
 
     type = lib.types.attrsOf lib.types.str;
-
-    apply =
-      set:
-      set
-      // {
-        script = pkgs.writeShellScript "pre-switch-checks" (preSwitchCheckScript set);
-      };
   };
 }

nixos/modules/system/activation/switchable-system.nix

@@ -61,7 +61,7 @@ in
           --subst-var-by coreutils "${pkgs.coreutils}" \
           --subst-var-by distroId ${lib.escapeShellArg config.system.nixos.distroId} \
           --subst-var-by installBootLoader ${lib.escapeShellArg config.system.build.installBootLoader} \
-          --subst-var-by preSwitchCheck ${lib.escapeShellArg config.system.preSwitchChecks.script} \
+          --subst-var-by preSwitchCheck ${lib.escapeShellArg config.system.preSwitchChecksScript} \
           --subst-var-by localeArchive "${config.i18n.glibcLocales}/lib/locale/locale-archive" \
           --subst-var-by perl "${perlWrapped}" \
           --subst-var-by shell "${pkgs.bash}/bin/sh" \
@@ -94,7 +94,7 @@ in
             --set TOPLEVEL ''${!toplevelVar} \
             --set DISTRO_ID ${lib.escapeShellArg config.system.nixos.distroId} \
             --set INSTALL_BOOTLOADER ${lib.escapeShellArg config.system.build.installBootLoader} \
-            --set PRE_SWITCH_CHECK ${lib.escapeShellArg config.system.preSwitchChecks.script} \
+            --set PRE_SWITCH_CHECK ${lib.escapeShellArg config.system.preSwitchChecksScript} \
             --set LOCALE_ARCHIVE ${config.i18n.glibcLocales}/lib/locale/locale-archive \
             --set SYSTEMD ${config.systemd.package}
         )

nixos/modules/system/activation/top-level.nix

@@ -343,7 +343,7 @@ in
       perl = pkgs.perl.withPackages (p: with p; [ ConfigIniFiles FileSlurp ]);
       # End if legacy environment variables
 
-      preSwitchCheck = config.system.preSwitchChecks.script;
+      preSwitchCheck = config.system.preSwitchChecksScript;
 
       # Not actually used in the builder. `passedChecks` is just here to create
       # the build dependencies. Checks are similar to build dependencies in the

nixos/tests/ayatana-indicators.nix

@@ -43,7 +43,7 @@ in
           ]
           ++ (with pkgs.lomiri; [
             lomiri-indicator-network
-            telephony-service
+            lomiri-telephony-service
           ]);
       };
 

nixos/tests/switch-test.nix

@@ -611,6 +611,10 @@ in {
     other = {
       system.switch.enable = true;
       users.mutableUsers = true;
+      system.preSwitchChecks.succeeds = ''
+        echo this will succeed
+        true
+      '';
       specialisation.failingCheck.configuration.system.preSwitchChecks.failEveryTime = ''
         echo this will fail
         false

pkgs/applications/editors/android-studio/default.nix

@@ -13,12 +13,12 @@ let
     sha256Hash = "sha256-t/4e1KeVm9rKeo/VdGHbv5ogXrI8whjtgo7YjouZjLU=";
   };
   betaVersion = {
-    version = "2024.2.2.12"; # "Android Studio Ladybug Feature Drop | 2024.2.2 RC 2"
-    sha256Hash = "sha256-zfiTjyD2bMIJ+GVQyg7qUT7306roqYsdRkPECZ/Rdnc=";
+    version = "2024.3.1.10"; # "Android Studio Meerkat | 2024.3.1 Beta 1"
+    sha256Hash = "sha256-UxxofUCJGhQTLMwHGaSdNDqWnjkpRVwm2oqLLp3jR8E=";
   };
   latestVersion = {
-    version = "2024.3.1.8"; # "Android Studio Meerkat | 2024.3.1 Canary 8"
-    sha256Hash = "sha256-ujxVxTO7rbCPEjzO2cPwdxipAgPW+urYNFHDGJOfRQg=";
+    version = "2024.3.2.1"; # "Android Studio Meerkat Feature Drop | 2024.3.2 Canary 1"
+    sha256Hash = "sha256-qJKkuB8v4wOqEQwnDyMegLbRLzxVwCq/hS1TQ3lhBKk=";
   };
 in {
   # Attributes are named by their corresponding release channels

pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix

@@ -7,12 +7,12 @@
   vimUtils,
 }:
 let
-  version = "0-unstable-2024-10-27";
+  version = "0-unstable-2025-01-13";
   src = fetchFromGitHub {
     owner = "nvim-pack";
     repo = "nvim-spectre";
-    rev = "08be31c104df3b4b049607694ebb2b6ced4f928b";
-    sha256 = "04v1gypga9fhmkddis5yyppvmpq0b1b7zpvbfjlxfp2z498l5n2v";
+    rev = "ddd7383e856a7c939cb4f5143278fe041bbb8cb9";
+    sha256 = "sha256-pZ7AH1U95IWMmhk/uBO0Lsxx78H5H9ygPxk/HIqFFlY=";
   };
 
   spectre_oxi = rustPlatform.buildRustPackage {
@@ -20,7 +20,7 @@ let
     inherit version src;
     sourceRoot = "${src.name}/spectre_oxi";
 
-    cargoHash = "sha256-jVNeK1BeCzQaS5G561iWB3xEupzjIgnbUpEo1IVr9nQ=";
+    cargoHash = "sha256-UieSVIITsk6iqd68JKFYYBTSDm4kPs+a9V+Y0gB9kFU=";
 
     preCheck = ''
       mkdir tests/tmp/

pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/lockfile.json

@@ -1,7 +1,7 @@
 {
-  "version": "2.55.29",
+  "version": "2.61.28",
   "linux-x64": {
-    "hash": "sha256-3RQk5VNrI2sSUBCBfRTEsxjLqZkpoTELt/v+CIp94QU=",
+    "hash": "sha256-lyP/NCvpaVW8dbZp/8OS9qrBa7yuO4rTo8Wwo/7wD7g=",
     "binaries": [
       ".debugger/createdump",
       ".debugger/vsdbg",
@@ -11,7 +11,7 @@
     ]
   },
   "linux-arm64": {
-    "hash": "sha256-p8VbpeLtGDO3TKpjY9EuqDVyCDvZaQe9+KeAMTMulDc=",
+    "hash": "sha256-bZ5ABDh3MnO33MQEXhLlF4UVGTCrcj5pCYgQDS6AP58=",
     "binaries": [
       ".debugger/createdump",
       ".debugger/vsdbg",
@@ -21,7 +21,7 @@
     ]
   },
   "darwin-x64": {
-    "hash": "sha256-r85BNsxIXuQD20kjgqBvCLzTof4ExYDfbKG0zHaR86o=",
+    "hash": "sha256-5yDTJp3GDb7HYAG9q8wvr4QKwjGJ214ifUjwxZMwIts=",
     "binaries": [
       ".debugger/x86_64/createdump",
       ".debugger/x86_64/vsdbg",
@@ -31,7 +31,7 @@
     ]
   },
   "darwin-arm64": {
-    "hash": "sha256-p56EkUDxsukTx0FCCE2OrUBk3t2zj/kU6cdUVqdpfb8=",
+    "hash": "sha256-58fz7IFzYgvC9Eruz1JgF4/ftHQV4FGdcfOODlCmGBA=",
     "binaries": [
       ".debugger/arm64/createdump",
       ".debugger/arm64/vsdbg",

pkgs/applications/emulators/cdemu/vhba.nix

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     hash = "sha256-zjTLriw2zvjX0Jxfa9QtaHG5tTC7cLTKEA+WSCP+Dpg=";
   };
 
-  makeFlags = kernel.makeFlags ++ [
+  makeFlags = kernel.moduleMakeFlags ++ [
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     "INSTALL_MOD_PATH=$(out)"
   ];

pkgs/applications/networking/mpop/default.nix

@@ -21,11 +21,11 @@ assert lib.assertOneOf "sslLibrary" sslLibrary [
 
 stdenv.mkDerivation rec {
   pname = "mpop";
-  version = "1.4.20";
+  version = "1.4.21";
 
   src = fetchurl {
     url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
-    sha256 = "sha256-Ncx94X492spHQ4Y0ZEiPjIKoOsGzdk/d1/QjiBQ1v0s=";
+    sha256 = "sha256-TKDR4NATZv4+DPSQ2I0VTfURJ4+1lWOHE748pnVmWFU=";
   };
 
   nativeBuildInputs = [

pkgs/applications/virtualization/OVMF/default.nix

@@ -253,6 +253,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: {
       prefix = "${finalAttrs.finalPackage.fd}/FV/${fwPrefix}";
     in
     {
+      mergedFirmware = "${prefix}.fd";
       firmware = "${prefix}_CODE.fd";
       variables = "${prefix}_VARS.fd";
       variablesMs =

pkgs/build-support/xen/default.nix

@@ -171,7 +171,7 @@ stdenv.mkDerivation (finalAttrs: {
     "--disable-qemu-traditional"
     "--with-system-qemu"
     (if withSeaBIOS then "--with-system-seabios=${systemSeaBIOS.firmware}" else "--disable-seabios")
-    (if withOVMF then "--with-system-ovmf=${OVMF.firmware}" else "--disable-ovmf")
+    (if withOVMF then "--with-system-ovmf=${OVMF.mergedFirmware}" else "--disable-ovmf")
     (if withIPXE then "--with-system-ipxe=${ipxe.firmware}" else "--disable-ipxe")
     (enableFeature withFlask "xsmpolicy")
   ];

pkgs/by-name/ar/ares-rs/package.nix

@@ -2,6 +2,8 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  pkg-config,
+  openssl,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -12,10 +14,17 @@ rustPlatform.buildRustPackage rec {
     owner = "bee-san";
     repo = "ares";
     tag = "v${version}";
-    hash = "sha256-F+uBGRL1G8kiNZUCsiPbISBfId5BPwShenusqkcsHug=";
+    hash = "sha256-J+q7KeBthF9Wd08MNv0aHyLHgLUKg3mzQ8ic6+ashto=";
   };
 
-  cargoHash = "sha256-c50HCwWwW4Fyg6hC1JqBfKtwq6kgReSOIBYXvwm04yA=";
+  cargoHash = "sha256-iJ04WPViqtafINkjn3PD8cE55LVdJZQXodAl3KlxweA=";
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ openssl ];
+
+  env = {
+    OPENSSL_NO_VENDOR = true;
+  };
 
   meta = with lib; {
     description = "Automated decoding of encrypted text without knowing the key or ciphers used";

pkgs/by-name/at/atlauncher/package.nix

@@ -24,13 +24,13 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "atlauncher";
-  version = "3.4.38.1";
+  version = "3.4.38.2";
 
   src = fetchFromGitHub {
     owner = "ATLauncher";
     repo = "ATLauncher";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-u9t+0MgmEyDJkdjv+89wJkK74NKBlxNEy2F+3zz7kLI=";
+    hash = "sha256-x8ch8BdUckweuwEvsOxYG2M5UmbW4fRjF/jJ6feIjIA=";
   };
 
   postPatch = ''

pkgs/by-name/az/azure-cli/extensions-manual.nix

@@ -63,9 +63,9 @@
 
   confcom = mkAzExtension rec {
     pname = "confcom";
-    version = "1.0.0";
+    version = "1.2.1";
     url = "https://azcliprod.blob.core.windows.net/cli-extensions/confcom-${version}-py3-none-any.whl";
-    hash = "sha256-c4I+EJWKEUtKyoTDMLTevMZQxGNedMVoZ5tsMsNWQR0=";
+    hash = "sha256-D78WwrOKbc8RNAa9Q3wgZRjVOUy/012+KIlTtk5NeTM=";
     description = "Microsoft Azure Command-Line Tools Confidential Container Security Policy Generator Extension";
     nativeBuildInputs = [ autoPatchelfHook ];
     buildInputs = [ openssl_1_1 ];

pkgs/by-name/az/azure-cli/extensions-tool.py

@@ -6,7 +6,9 @@ import datetime
 import json
 import logging
 import os
+import subprocess
 import sys
+from collections.abc import Callable
 from dataclasses import asdict, dataclass, replace
 from pathlib import Path
 from typing import Any, Dict, Iterable, List, Optional, Set, Tuple
@@ -42,20 +44,20 @@ def _read_cached_index(path: Path) -> Tuple[datetime.datetime, Any]:
     return cache_date, data
 
 
-def _write_index_to_cache(data: Any, path: Path):
+def _write_index_to_cache(data: Any, path: Path) -> None:
     j = json.loads(data)
     j["cache_date"] = datetime.datetime.now().isoformat()
     with open(path, "w") as f:
         json.dump(j, f, indent=2)
 
 
-def _fetch_remote_index():
+def _fetch_remote_index() -> Any:
     r = Request(INDEX_URL)
     with urlopen(r) as resp:
         return resp.read()
 
 
-def get_extension_index(cache_dir: Path) -> Set[Ext]:
+def get_extension_index(cache_dir: Path) -> Any:
     index_file = cache_dir / "index.json"
     os.makedirs(cache_dir, exist_ok=True)
 
@@ -154,7 +156,7 @@ def _filter_invalid(o: Dict[str, Any]) -> bool:
 
 def _filter_compatible(o: Dict[str, Any], cli_version: Version) -> bool:
     minCliVersion = parse(o["metadata"]["azext.minCliCoreVersion"])
-    return cli_version >= minCliVersion
+    return bool(cli_version >= minCliVersion)
 
 
 def _transform_dict_to_obj(o: Dict[str, Any]) -> Ext:
@@ -211,6 +213,93 @@ def _filter_updated(e: Tuple[Ext, Ext]) -> bool:
     return prev != new
 
 
+@dataclass(frozen=True)
+class AttrPos:
+    file: str
+    line: int
+    column: int
+
+
+def nix_get_value(attr_path: str) -> Optional[str]:
+    try:
+        output = (
+            subprocess.run(
+                [
+                    "nix-instantiate",
+                    "--eval",
+                    "--strict",
+                    "--json",
+                    "-E",
+                    f"with import ./. {{ }}; {attr_path}",
+                ],
+                stdout=subprocess.PIPE,
+                text=True,
+                check=True,
+            )
+            .stdout.rstrip()
+            .strip('"')
+        )
+    except subprocess.CalledProcessError as e:
+        logger.error("failed to nix-instantiate: %s", e)
+        return None
+    return output
+
+
+def nix_unsafe_get_attr_pos(attr: str, attr_path: str) -> Optional[AttrPos]:
+    try:
+        output = subprocess.run(
+            [
+                "nix-instantiate",
+                "--eval",
+                "--strict",
+                "--json",
+                "-E",
+                f'with import ./. {{ }}; (builtins.unsafeGetAttrPos "{attr}" {attr_path})',
+            ],
+            stdout=subprocess.PIPE,
+            text=True,
+            check=True,
+        ).stdout.rstrip()
+    except subprocess.CalledProcessError as e:
+        logger.error("failed to unsafeGetAttrPos: %s", e)
+        return None
+    if output == "null":
+        logger.error("failed to unsafeGetAttrPos: nix-instantiate returned 'null'")
+        return None
+    pos = json.loads(output)
+    return AttrPos(pos["file"], pos["line"] - 1, pos["column"])
+
+
+def edit_file(file: str, rewrite: Callable[[str], str]) -> None:
+    with open(file, "r") as f:
+        lines = f.readlines()
+    lines = [rewrite(line) for line in lines]
+    with open(file, "w") as f:
+        f.writelines(lines)
+
+
+def edit_file_at_pos(pos: AttrPos, rewrite: Callable[[str], str]) -> None:
+    with open(pos.file, "r") as f:
+        lines = f.readlines()
+    lines[pos.line] = rewrite(lines[pos.line])
+    with open(pos.file, "w") as f:
+        f.writelines(lines)
+
+
+def read_value_at_pos(pos: AttrPos) -> str:
+    with open(pos.file, "r") as f:
+        lines = f.readlines()
+        return value_from_nix_line(lines[pos.line])
+
+
+def value_from_nix_line(line: str) -> str:
+    return line.split("=")[1].strip().strip(";").strip('"')
+
+
+def replace_value_in_nix_line(new: str) -> Callable[[str], str]:
+    return lambda line: line.replace(value_from_nix_line(line), new)
+
+
 def main() -> None:
     sh = logging.StreamHandler(sys.stderr)
     sh.setFormatter(
@@ -247,6 +336,7 @@ def main() -> None:
         help="whether to commit changes to git",
     )
     args = parser.parse_args()
+    cli_version = parse(args.cli_version)
 
     repo = git.Repo(Path(".").resolve(), search_parent_directories=True)
     # Workaround for https://github.com/gitpython-developers/GitPython/issues/1923
@@ -258,7 +348,57 @@ def main() -> None:
     assert index["formatVersion"] == "1"  # only support formatVersion 1
     extensions_remote = index["extensions"]
 
-    cli_version = parse(args.cli_version)
+    if args.extension:
+        logger.info(f"updating extension: {args.extension}")
+
+        ext = Optional[Ext]
+        for _ext_name, extension in extensions_remote.items():
+            extension = processExtension(
+                extension, cli_version, args.extension, requirements=True
+            )
+            if extension:
+                ext = extension
+                break
+        if not ext:
+            logger.error(f"Extension {args.extension} not found in index")
+            exit(1)
+
+        version_pos = nix_unsafe_get_attr_pos(
+            "version", f"azure-cli-extensions.{ext.pname}"
+        )
+        if not version_pos:
+            logger.error(
+                f"no position for attribute 'version' found on attribute path {ext.pname}"
+            )
+            exit(1)
+        version = read_value_at_pos(version_pos)
+        current_version = parse(version)
+
+        if ext.version == current_version:
+            logger.info(
+                f"no update needed for {ext.pname}, latest version is {ext.version}"
+            )
+            return
+        logger.info("updated extensions:")
+        logger.info(f"  {ext.pname} {current_version} -> {ext.version}")
+        edit_file_at_pos(version_pos, replace_value_in_nix_line(str(ext.version)))
+
+        current_hash = nix_get_value(f"azure-cli-extensions.{ext.pname}.src.outputHash")
+        if not current_hash:
+            logger.error(
+                f"no attribute 'src.outputHash' found on attribute path {ext.pname}"
+            )
+            exit(1)
+        edit_file(version_pos.file, lambda line: line.replace(current_hash, ext.hash))
+
+        if args.commit:
+            commit_msg = (
+                f"azure-cli-extensions.{ext.pname}: {current_version} -> {ext.version}"
+            )
+            _commit(repo, commit_msg, [Path(version_pos.file)], actor)
+        return
+
+    logger.info("updating generated extension set")
 
     extensions_remote_filtered = set()
     for _ext_name, extension in extensions_remote.items():

pkgs/by-name/az/azure-cli/package.nix

@@ -54,6 +54,9 @@ let
       {
         format = "wheel";
         src = fetchurl { inherit url hash; };
+        passthru = {
+          updateScript = extensionUpdateScript { inherit pname; };
+        } // args.passthru or { };
         meta = {
           inherit description;
           inherit (azure-cli.meta) platforms maintainers;
@@ -67,13 +70,24 @@ let
         "url"
         "hash"
         "description"
+        "passthru"
         "meta"
       ])
     );
+  # Update script for azure cli extensions. Currently only works for manual extensions.
+  extensionUpdateScript =
+    { pname }:
+    [
+      "${lib.getExe azure-cli.extensions-tool}"
+      "--cli-version"
+      "${azure-cli.version}"
+      "--extension"
+      "${pname}"
+    ];
 
-  extensions-generated = lib.mapAttrs (name: ext: mkAzExtension ext) (
-    builtins.fromJSON (builtins.readFile ./extensions-generated.json)
-  );
+  extensions-generated = lib.mapAttrs (
+    name: ext: mkAzExtension (ext // { passthru.updateScript = [ ]; })
+  ) (builtins.fromJSON (builtins.readFile ./extensions-generated.json));
   extensions-manual = callPackages ./extensions-manual.nix {
     inherit mkAzExtension;
     python3Packages = python3.pkgs;
@@ -408,7 +422,6 @@ py.pkgs.toPythonApplication (
           }
           ''
             black --check --diff $src
-            # mypy --strict $src
             isort --profile=black --check --diff $src
 
             install -Dm755 $src $out/bin/extensions-tool

pkgs/by-name/bu/butt/package.nix

@@ -16,6 +16,7 @@
   openssl,
   curl,
   portmidi,
+  autoPatchelfHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -36,7 +37,10 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail 'live365_logo, 124, 61, 4,' 'nullptr, 0, 0, 0,'
   '';
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    autoPatchelfHook
+    pkg-config
+  ];
 
   buildInputs = [
     fltk13
@@ -54,6 +58,10 @@ stdenv.mkDerivation (finalAttrs: {
     portmidi
   ];
 
+  runtimeDependencies = [
+    fdk_aac
+  ];
+
   postInstall = ''
     cp -r usr/share $out/
   '';

pkgs/by-name/cn/cnquery/package.nix

@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "cnquery";
-  version = "11.36.0";
+  version = "11.37.1";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnquery";
     tag = "v${version}";
-    hash = "sha256-LISy9xMAv9Wal+iRF9qoCLrQnq0r4HOqCir/w0uTrAA=";
+    hash = "sha256-H8qilsIlXA9NdPrdJYmkX+Ccc5fJHcEZThzPUo6Vi4M=";
   };
 
   subPackages = [ "apps/cnquery" ];
 
-  vendorHash = "sha256-JweIdmjnybaOyL5GOxCmP8TpyMYTG9qD5aFbabAJ4h8=";
+  vendorHash = "sha256-rqWGaENzFoC4+VhH1FRX9veLOXxXEAxdhcvrd2OoZY8=";
 
   ldflags = [
     "-w"

pkgs/by-name/cu/cue/package.nix

@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "cue";
-  version = "0.11.1";
+  version = "0.11.2";
 
   src = fetchFromGitHub {
     owner = "cue-lang";
     repo = "cue";
     rev = "v${version}";
-    hash = "sha256-CLWPRVrfFQUwoLbZttetuq1T/Gb7vVEcrD7dxMzfgjA=";
+    hash = "sha256-OSsDgwjtjQw5YRuXi1K/HQtHyLh1aHtYDlQDAtdYeZM=";
   };
 
   vendorHash = "sha256-jl8TR1kxame30l7DkfOEioWA9wK/ACTNofiTi++vjuI=";

pkgs/by-name/fl/flare-signal/package.nix

@@ -22,19 +22,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flare";
-  version = "0.15.6";
+  version = "0.15.7";
 
   src = fetchFromGitLab {
     domain = "gitlab.com";
     owner = "schmiddi-on-mobile";
     repo = "flare";
     rev = finalAttrs.version;
-    hash = "sha256-xpjxOaCN5UVBBIB6WMLCMspRWkzz4DQEcjiSL8uM2RQ=";
+    hash = "sha256-KFxBdWNN7LYQ5jiDZhAs4pqX2cRLvEGaAhYabaQh1n0=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-iuK68GLU/4wsOLQz+7pGVDZwCuc6cwcUKn6teFuYJco=";
+    hash = "sha256-bZL9/0MYGxXefrj9whG+N7iMaBpaZSeBVAWR0AKKEvo=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/fr/frigate/web.nix

@@ -1,5 +1,6 @@
 {
   buildNpmPackage,
+  frigate,
   src,
   version,
 }:
@@ -28,7 +29,11 @@ buildNpmPackage {
 
   npmDepsHash = "sha256-PLs3oCWQjK38eHgdQt2Qkj7YqkfanC8JnLMpzMjNfxU=";
 
+  env.NODE_OPTIONS = "--no-experimental-require-module";
+
   installPhase = ''
     cp -rv dist/ $out
   '';
+
+  inherit (frigate) meta;
 }

pkgs/by-name/gc/gcli/package.nix

@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gcli";
-  version = "2.6.0";
+  version = "2.6.1";
 
   src = fetchFromGitHub {
     owner = "herrhotzenplotz";
     repo = "gcli";
     rev = "v${version}";
-    hash = "sha256-60B1XRoeSjSEo5nxrCJL9lizq7ELGe8+hdmC4lkMhis=";
+    hash = "sha256-pAnDxcQLRF97OzO7/P7eRXv/BUJwbuEveEVUBQuNJBE=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ge/getmail6/package.nix

@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "getmail6";
-  version = "6.19.05";
+  version = "6.19.06";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "getmail6";
     repo = "getmail6";
     tag = "v${version}";
-    hash = "sha256-GjB53bl2gh3SA+kqC9rrQ9I4rP0z69G/bamInmq8W+I=";
+    hash = "sha256-F4FS6d8XDPlJ7ysShFRb45hZainKljKRg+q4yA18HaI=";
   };
 
   build-system = with python3.pkgs; [

pkgs/by-name/go/google-chrome/package.nix

@@ -171,11 +171,11 @@ let
 
   linux = stdenv.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "132.0.6834.83";
+    version = "132.0.6834.110";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-qufv7m7iQ8yX6WeNajTbPELCmRhr4GGBa8Wzy+iMFhg=";
+      hash = "sha256-4mtVCiKXKnjmHlyYgnDneX9hOmYgafwZ230iFfH48Tc=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -274,11 +274,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "132.0.6834.84";
+    version = "132.0.6834.111";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/acpvuq6jnnfhesngduj6lnfmy3zq_132.0.6834.84/GoogleChrome-132.0.6834.84.dmg";
-      hash = "sha256-SX8IUdTnIJHwfF9ZwIHZwGZUncJ/NLQpuEL/X8p1KJo=";
+      url = "http://dl.google.com/release2/chrome/acuc7atz5smv6q4nvkuutofbz6uq_132.0.6834.111/GoogleChrome-132.0.6834.111.dmg";
+      hash = "sha256-kC4MA57eeapnzCgyBuLNq9NBTFdcECMtoNwMzWd0KEg=";
     };
 
     dontPatch = true;

pkgs/by-name/gr/grype/package.nix

@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "grype";
-  version = "0.86.1";
+  version = "0.87.0";
 
   src = fetchFromGitHub {
     owner = "anchore";
     repo = "grype";
     tag = "v${version}";
-    hash = "sha256-k4Faw7DqN5H2bGxKEqeUA4+sMZOdbW1139GcqbU56Hk=";
+    hash = "sha256-El7cegeHMb6fhO1Vr6FK0E3Mlk/dbU0Dv4lUYNu0Gcc=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -30,7 +30,7 @@ buildGoModule rec {
 
   proxyVendor = true;
 
-  vendorHash = "sha256-qrMgc5/ukuri8Oabgq84SCqy26vVWgzlE2UkTd67ss8=";
+  vendorHash = "sha256-SbKvDAzWq58O0e/+1r5oI3rxfdsnPenMPwqNRTOe7AI=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/by-name/mi/minio-client/package.nix

@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "minio-client";
-  version = "2024-11-21T17-21-54Z";
+  version = "2025-01-17T23-25-50Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "mc";
     rev = "RELEASE.${version}";
-    sha256 = "sha256-z6ixa5nrKcrvaBC1V6/iXCeHFO4xOkFf/yJ8HLQQcaY=";
+    sha256 = "sha256-ezc5SMJfebvaSrpUeA6dIPS5l9rfkvSMVyGLTDPiWxE=";
   };
 
-  vendorHash = "sha256-teG+GrzmUgJ6QhcxDSbWXP32hRuCgoCvH2BoNL8ddUc=";
+  vendorHash = "sha256-Z0dpb6E+wTCmTLBIZzvjRM5RPUsIjAhTj+V+Q3CHwv0=";
 
   subPackages = [ "." ];
 

pkgs/by-name/nu/nuclei-templates/package.nix

@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "nuclei-templates";
-  version = "10.1.1";
+  version = "10.1.2";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "nuclei-templates";
     tag = "v${version}";
-    hash = "sha256-WqGeNT3OLs5oY/b81fJh3R9b84vXYzn2u5hY9yI2kGM=";
+    hash = "sha256-Avg7IKL85skqV2DHgyYa6lt0eE4gZBZkPcVOyoaAJhg=";
   };
 
   installPhase = ''

pkgs/by-name/nw/nwg-dock-hyprland/package.nix

@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "nwg-dock-hyprland";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-dock-hyprland";
     tag = "v${version}";
-    hash = "sha256-MujQMrqyxKl32cIzy7JHDeUIDEqDzFp6mr7pM3y9xng=";
+    hash = "sha256-l2JB+CmdQg/bDXneJ+rjv4z6xjB+BERh0rLZFETCMtE=";
   };
 
-  vendorHash = "sha256-cAfKmcBf2hu3eP6a4ELEeNyPOYXi3chLkbHKFks14I0=";
+  vendorHash = "sha256-3ubDvtl/FvVyoRMRNBhwCoIJkJNFvlrWue+cNNGe5eI=";
 
   ldflags = [
     "-s"

pkgs/by-name/op/openvas-scanner/package.nix

@@ -31,13 +31,13 @@
 
 stdenv.mkDerivation rec {
   pname = "openvas-scanner";
-  version = "23.14.0";
+  version = "23.15.0";
 
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "openvas-scanner";
     tag = "v${version}";
-    hash = "sha256-1IesoAK5Aq/JlM83WT0dodwmUvWv6RDqTyUg6LURle4=";
+    hash = "sha256-LjZZYIA0Qkuheb8ZAPBuiy5GgjOgCfJ0D/YM03zTcW0=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/or/orca-slicer/package.nix

@@ -6,7 +6,7 @@
   cmake,
   pkg-config,
   wrapGAppsHook3,
-  boost,
+  boost186,
   cereal,
   cgal,
   curl,
@@ -56,13 +56,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "orca-slicer";
-  version = "v2.2.0-unstable-2025-01-06";
+  version = "v2.2.0-unstable-2025-01-23";
 
   src = fetchFromGitHub {
     owner = "SoftFever";
     repo = "OrcaSlicer";
-    rev = "99a0facfb3a5c9b4e661e536825c08393053cb53";
-    hash = "sha256-XWM04Vx65q+Vc+s3YLucS63IhGVw8ODhL2m+47nZKs8=";
+    rev = "1b1288c4353afca44edee323061bdd5c87fcafb9";
+    hash = "sha256-IPdKusP2cB5jgr6JjQVu8ZjJ2kiG6mfmfZtDVSlAFNg=";
   };
 
   nativeBuildInputs = [
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [
       binutils
-      (boost.override {
+      (boost186.override {
         enableShared = true;
         enableStatic = false;
         extraFeatures = [
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
           "filesystem"
         ];
       })
-      boost.dev
+      boost186.dev
       cereal
       cgal
       curl
@@ -127,7 +127,6 @@ stdenv.mkDerivation rec {
     # Fix for webkitgtk linking
     ./patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
     ./patches/dont-link-opencv-world-orca.patch
-    ./patches/fix-boost.patch
   ];
 
   doCheck = true;
@@ -163,7 +162,7 @@ stdenv.mkDerivation rec {
     (lib.optionalString withSystemd "-ludev")
     "-L${mesa.osmesa}/lib"
     "-L${mesa.drivers}/lib"
-    "-L${boost}/lib"
+    "-L${boost186}/lib"
     "-lboost_log"
     "-lboost_log_setup"
   ];

pkgs/by-name/or/orca-slicer/patches/fix-boost.patch

@@ -1,60 +0,0 @@
-diff --git a/src/libslic3r/PrintBase.cpp b/src/libslic3r/PrintBase.cpp
-index 25b282c7b..81ee858c2 100644
---- a/src/libslic3r/PrintBase.cpp
-+++ b/src/libslic3r/PrintBase.cpp
-@@ -79,7 +79,7 @@ std::string PrintBase::output_filename(const std::string &format, const std::str
- 			cfg.opt_string("input_filename_base") + default_ext :
- 			this->placeholder_parser().process(format, 0, &cfg);
-         if (filename.extension().empty())
--            filename = boost::filesystem::change_extension(filename, default_ext);
-+            filename.replace_extension(default_ext);
-         return filename.string();
-     } catch (std::runtime_error &err) {
-         throw Slic3r::PlaceholderParserError(L("Failed processing of the filename_format template.") + "\n" + err.what());
-diff --git a/src/slic3r/GUI/AuxiliaryDataViewModel.cpp b/src/slic3r/GUI/AuxiliaryDataViewModel.cpp
-index 50368b854..cad5cf545 100644
---- a/src/slic3r/GUI/AuxiliaryDataViewModel.cpp
-+++ b/src/slic3r/GUI/AuxiliaryDataViewModel.cpp
-@@ -337,7 +337,7 @@ wxDataViewItemArray AuxiliaryModel::ImportFile(AuxiliaryModelNode* sel, wxArrayS
-         dir_path += "\\" + src_bfs_path.filename().generic_wstring();
- 
-         boost::system::error_code ec;
--        if (!fs::copy_file(src_bfs_path, fs::path(dir_path.ToStdWstring()), fs::copy_option::overwrite_if_exists, ec))
-+        if (!fs::copy_file(src_bfs_path, fs::path(dir_path.ToStdWstring()), fs::copy_options::overwrite_existing, ec))
-             continue;
- 
-         // Update model data
-diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
-index f3782be14..e12f0c321 100644
---- a/src/slic3r/GUI/Plater.cpp
-+++ b/src/slic3r/GUI/Plater.cpp
-@@ -10265,7 +10265,7 @@ bool Plater::preview_zip_archive(const boost::filesystem::path& archive_path)
-                             std::replace(name.begin(), name.end(), '\\', '/');
-                             // rename if file exists
-                             std::string filename = path.filename().string();
--                            std::string extension = boost::filesystem::extension(path);
-+                            std::string extension = path.extension().string();
-                             std::string just_filename = filename.substr(0, filename.size() - extension.size());
-                             std::string final_filename = just_filename;
- 
-diff --git a/src/slic3r/GUI/RemovableDriveManager.cpp b/src/slic3r/GUI/RemovableDriveManager.cpp
-index a26e13448..83ec4695c 100644
---- a/src/slic3r/GUI/RemovableDriveManager.cpp
-+++ b/src/slic3r/GUI/RemovableDriveManager.cpp
-@@ -22,7 +22,6 @@
- #include <pwd.h>
- #include <boost/filesystem.hpp>
- #include <boost/system/error_code.hpp>
--#include <boost/filesystem/convenience.hpp>
- #include <boost/process.hpp>
- #endif
- 
-@@ -202,7 +201,7 @@ namespace search_for_drives_internal
- 				stat(path.c_str(), &buf);
- 				uid_t uid = buf.st_uid;
- 				if (getuid() == uid)
--					out.emplace_back(DriveData{ boost::filesystem::basename(boost::filesystem::path(path)), path });
-+					out.emplace_back(DriveData{ boost::filesystem::path(path).stem().string(), path });
- 			}
- 		}
- 	}

pkgs/by-name/po/postprocessd/package.nix

@@ -3,6 +3,7 @@
   fetchFromSourcehut,
   libexif,
   libraw,
+  libtiff,
   meson,
   ninja,
   opencv4,
@@ -36,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libexif
     libraw
+    libtiff
     opencv4
   ];
 

pkgs/by-name/pq/pq-cli/package.nix

@@ -0,0 +1,46 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3Packages,
+  unstableGitUpdater,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "pq-cli";
+  version = "1.0.2-unstable-2024-07-15";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "rr-";
+    repo = "pq-cli";
+    rev = "4122e936c87436552f35ff7972d6e543ba6c837b";
+    hash = "sha256-PvHkTjPjOubhl9gfPTF7yNaFgg2GLk8y+PtF09fpaII=";
+  };
+
+  build-system = with python3Packages; [
+    setuptools
+    poetry-core
+  ];
+
+  dependencies = with python3Packages; [
+    xdg
+    xdg-base-dirs
+    urwid
+    urwid-readline
+  ];
+
+  pythonRelaxDeps = [
+    "urwid-readline"
+  ];
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    description = "Progress Quest: the CLI edition";
+    homepage = "https://github.com/rr-/pq-cli";
+    changelog = "https://github.com/rr-/pq-cli/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ genga898 ];
+    mainProgram = "pqcli";
+  };
+}

pkgs/by-name/pr/prowler/package.nix

@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "prowler";
-  version = "5.1.0";
+  version = "5.1.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "prowler-cloud";
     repo = "prowler";
     tag = version;
-    hash = "sha256-+wMoHzys4iceiQvRvwsl2aSvTYZxeZlKHy7D4xx33aU=";
+    hash = "sha256-yVoVfJGO+96ck8T63O0ubeTtdhpfziZFHYVXGFNENds=";
   };
 
   pythonRelaxDeps = true;

pkgs/by-name/pu/puncia/package.nix

@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "puncia";
-  version = "0.26";
+  version = "0.27";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ARPSyndicate";
     repo = "puncia";
     tag = "v${version}";
-    hash = "sha256-ZvB3X94gjIunerLhtd6a2Eou6AxHxONRJGS2jCiMjbk=";
+    hash = "sha256-P3F3e53H37Wr2qCRiEaQQ6SQBrSNILk+wT3Q9DIh0FU=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];

pkgs/by-name/se/serfdom/package.nix

@@ -6,17 +6,17 @@
 
 buildGoModule rec {
   pname = "serf";
-  version = "0.10.1";
+  version = "0.10.2";
   rev = "a2bba5676d6e37953715ea10e583843793a0c507";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "serf";
     rev = "v${version}";
-    sha256 = "sha256-8cWSWRfge5UjNzgA1Qp4AzbgIfGBum/ghHcB8H8MyCE=";
+    sha256 = "sha256-8kMQu3UYGihlYW7rdh1IkvRR/FgFK/N+iay0y6qOOWE=";
   };
 
-  vendorHash = "sha256-6Kw0Co6vaBNkvVyK64wo9/39YF5UwuJg04EPoYwCP1c=";
+  vendorHash = "sha256-aNAbE8yFp8HUgdRtt/3eVz4VAaqSTPB4XKKLl1o7YRc=";
 
   subPackages = [ "cmd/serf" ];
 

pkgs/by-name/sy/syft/package.nix

@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "syft";
-  version = "1.18.1";
+  version = "1.19.0";
 
   src = fetchFromGitHub {
     owner = "anchore";
     repo = "syft";
     tag = "v${version}";
-    hash = "sha256-ot4qdCxF9Kg657IFzUIxGsmRCDag1a4Ipq1qj2RPW0E=";
+    hash = "sha256-mO4mRMLoYA5WjDsA4FbMd/RLbQOekXKikl1zlZNKYtk=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -28,7 +28,7 @@ buildGoModule rec {
   # hash mismatch with darwin
   proxyVendor = true;
 
-  vendorHash = "sha256-3GvOWu+h1d5qUxUd7yxE/YReeuXteVV/4ZrnMgGRZi0=";
+  vendorHash = "sha256-KmMES19mGgtSeGw31DqZQm9wp0y+nu3P2LTZh9ofCPM=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/by-name/ti/tidb/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "tidb";
-  version = "8.5.0";
+  version = "8.5.1";
 
   src = fetchFromGitHub {
     owner = "pingcap";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-mrR4Rk+p1JaimvBVyEHc+syQwkvRDjQfGCuL5H0GqG8=";
+    sha256 = "sha256-lJrW61FARZO1ll7Ln9mgCTZxGhcMlBaL6AeAVGgExIA=";
   };
 
-  vendorHash = "sha256-yV97PyVkHWQSj+nFuxCvKkAbdwfszM1gslOvi8iihaE=";
+  vendorHash = "sha256-N8wTUPUPOR2Bc5CcPgNktcZpaxGL2WncJc4w0RwqVDk=";
 
   ldflags = [
     "-X github.com/pingcap/tidb/pkg/parser/mysql.TiDBReleaseVersion=${version}"

pkgs/by-name/ti/tideways-daemon/package.nix

@@ -10,7 +10,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tideways-daemon";
-  version = "1.9.30";
+  version = "1.9.32";
 
   src =
     finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}
@@ -28,15 +28,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     sources = {
       "x86_64-linux" = fetchurl {
         url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-pXWGoDnNQPlDQMriUbjD8+Tiv7jGeBf+5NGPMOAfuIo=";
+        hash = "sha256-d7qC6q6ukr2bPEEbgFa8u2N+u/cn0CvWXlrO4CAthl8=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-x9QDaGz7nHEbe3o9awqyBu+0/ArM1QIr9jQ4kcSSnHA=";
+        hash = "sha256-3HXmX2mjM6buzMiVsmTSxReJ7ulphxzSL9hSR6Jwocg=";
       };
       "aarch64-darwin" = fetchurl {
         url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-c5ntOhaJaRjipNd0B9ybzPD7EFkdQgEOSaS3JWGfBpA=";
+        hash = "sha256-3oWU1OjefWGOUmHsAgHIKlUqHiGWbty3WPex7wTfLIg=";
       };
     };
     updateScript = "${

pkgs/by-name/uv/uv/package.nix

@@ -17,17 +17,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "uv";
-  version = "0.5.22";
+  version = "0.5.23";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = version;
-    hash = "sha256-zAGPlzMkoJpvfT8CljCTz/qnWRROf5re4Js9zPgstt4=";
+    hash = "sha256-0uYAokw9hjgI+eU/1GrWdCDtFl1qWqkhvh+1qjeGSCQ=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-hMh0evlR8r01woSFVYWmheG3Di6m/QYHHWsoK95Ia3Q=";
+  cargoHash = "sha256-yv5asWS6XLI22Z1kkGB6xJ6XFFMfOvFYcvvFvjRu8D4=";
 
   nativeBuildInputs = [
     cmake

pkgs/by-name/vu/vue-typescript-plugin/package-lock.json

@@ -0,0 +1,269 @@
+{
+	"name": "@vue/typescript-plugin",
+	"version": "2.2.0",
+	"lockfileVersion": 3,
+	"requires": true,
+	"packages": {
+		"": {
+			"name": "@vue/typescript-plugin",
+			"version": "2.2.0",
+			"license": "MIT",
+			"dependencies": {
+				"@volar/typescript": "~2.4.11",
+				"@vue/language-core": "2.2.0",
+				"@vue/shared": "^3.5.0"
+			},
+			"devDependencies": {
+				"@types/node": "latest"
+			}
+		},
+		"node_modules/@babel/helper-string-parser": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+			"integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-validator-identifier": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+			"integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/parser": {
+			"version": "7.26.5",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.5.tgz",
+			"integrity": "sha512-SRJ4jYmXRqV1/Xc+TIVG84WjHBXKlxO9sHQnA2Pf12QQEAp1LOh6kDzNHXcUnbH1QI0FDoPPVOt+vyUDucxpaw==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/types": "^7.26.5"
+			},
+			"bin": {
+				"parser": "bin/babel-parser.js"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@babel/types": {
+			"version": "7.26.5",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.5.tgz",
+			"integrity": "sha512-L6mZmwFDK6Cjh1nRCLXpa6no13ZIioJDz7mdkzHv399pThrTa/k0nUlNaenOeh2kWu/iaOQYElEpKPUswUa9Vg==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-string-parser": "^7.25.9",
+				"@babel/helper-validator-identifier": "^7.25.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@types/node": {
+			"version": "22.10.6",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.6.tgz",
+			"integrity": "sha512-qNiuwC4ZDAUNcY47xgaSuS92cjf8JbSUoaKS77bmLG1rU7MlATVSiw/IlrjtIyyskXBZ8KkNfjK/P5na7rgXbQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"undici-types": "~6.20.0"
+			}
+		},
+		"node_modules/@volar/language-core": {
+			"version": "2.4.11",
+			"resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.11.tgz",
+			"integrity": "sha512-lN2C1+ByfW9/JRPpqScuZt/4OrUUse57GLI6TbLgTIqBVemdl1wNcZ1qYGEo2+Gw8coYLgCy7SuKqn6IrQcQgg==",
+			"license": "MIT",
+			"dependencies": {
+				"@volar/source-map": "2.4.11"
+			}
+		},
+		"node_modules/@volar/source-map": {
+			"version": "2.4.11",
+			"resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.11.tgz",
+			"integrity": "sha512-ZQpmafIGvaZMn/8iuvCFGrW3smeqkq/IIh9F1SdSx9aUl0J4Iurzd6/FhmjNO5g2ejF3rT45dKskgXWiofqlZQ==",
+			"license": "MIT"
+		},
+		"node_modules/@volar/typescript": {
+			"version": "2.4.11",
+			"resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.11.tgz",
+			"integrity": "sha512-2DT+Tdh88Spp5PyPbqhyoYavYCPDsqbHLFwcUI9K1NlY1YgUJvujGdrqUp0zWxnW7KWNTr3xSpMuv2WnaTKDAw==",
+			"license": "MIT",
+			"dependencies": {
+				"@volar/language-core": "2.4.11",
+				"path-browserify": "^1.0.1",
+				"vscode-uri": "^3.0.8"
+			}
+		},
+		"node_modules/@vue/compiler-core": {
+			"version": "3.5.13",
+			"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.13.tgz",
+			"integrity": "sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/parser": "^7.25.3",
+				"@vue/shared": "3.5.13",
+				"entities": "^4.5.0",
+				"estree-walker": "^2.0.2",
+				"source-map-js": "^1.2.0"
+			}
+		},
+		"node_modules/@vue/compiler-dom": {
+			"version": "3.5.13",
+			"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.13.tgz",
+			"integrity": "sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==",
+			"license": "MIT",
+			"dependencies": {
+				"@vue/compiler-core": "3.5.13",
+				"@vue/shared": "3.5.13"
+			}
+		},
+		"node_modules/@vue/compiler-vue2": {
+			"version": "2.7.16",
+			"resolved": "https://registry.npmjs.org/@vue/compiler-vue2/-/compiler-vue2-2.7.16.tgz",
+			"integrity": "sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==",
+			"license": "MIT",
+			"dependencies": {
+				"de-indent": "^1.0.2",
+				"he": "^1.2.0"
+			}
+		},
+		"node_modules/@vue/language-core": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.2.0.tgz",
+			"integrity": "sha512-O1ZZFaaBGkKbsRfnVH1ifOK1/1BUkyK+3SQsfnh6PmMmD4qJcTU8godCeA96jjDRTL6zgnK7YzCHfaUlH2r0Mw==",
+			"license": "MIT",
+			"dependencies": {
+				"@volar/language-core": "~2.4.11",
+				"@vue/compiler-dom": "^3.5.0",
+				"@vue/compiler-vue2": "^2.7.16",
+				"@vue/shared": "^3.5.0",
+				"alien-signals": "^0.4.9",
+				"minimatch": "^9.0.3",
+				"muggle-string": "^0.4.1",
+				"path-browserify": "^1.0.1"
+			},
+			"peerDependencies": {
+				"typescript": "*"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@vue/shared": {
+			"version": "3.5.13",
+			"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.13.tgz",
+			"integrity": "sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==",
+			"license": "MIT"
+		},
+		"node_modules/alien-signals": {
+			"version": "0.4.14",
+			"resolved": "https://registry.npmjs.org/alien-signals/-/alien-signals-0.4.14.tgz",
+			"integrity": "sha512-itUAVzhczTmP2U5yX67xVpsbbOiquusbWVyA9N+sy6+r6YVbFkahXvNCeEPWEOMhwDYwbVbGHFkVL03N9I5g+Q==",
+			"license": "MIT"
+		},
+		"node_modules/balanced-match": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+			"license": "MIT"
+		},
+		"node_modules/brace-expansion": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+			"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+			"license": "MIT",
+			"dependencies": {
+				"balanced-match": "^1.0.0"
+			}
+		},
+		"node_modules/de-indent": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
+			"integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
+			"license": "MIT"
+		},
+		"node_modules/entities": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+			"integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+			"license": "BSD-2-Clause",
+			"engines": {
+				"node": ">=0.12"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/entities?sponsor=1"
+			}
+		},
+		"node_modules/estree-walker": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+			"integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+			"license": "MIT"
+		},
+		"node_modules/he": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+			"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+			"license": "MIT",
+			"bin": {
+				"he": "bin/he"
+			}
+		},
+		"node_modules/minimatch": {
+			"version": "9.0.5",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+			"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+			"license": "ISC",
+			"dependencies": {
+				"brace-expansion": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=16 || 14 >=14.17"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/muggle-string": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/muggle-string/-/muggle-string-0.4.1.tgz",
+			"integrity": "sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==",
+			"license": "MIT"
+		},
+		"node_modules/path-browserify": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
+			"integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
+			"license": "MIT"
+		},
+		"node_modules/source-map-js": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+			"integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+			"license": "BSD-3-Clause",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/undici-types": {
+			"version": "6.20.0",
+			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
+			"integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/vscode-uri": {
+			"version": "3.0.8",
+			"resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz",
+			"integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==",
+			"license": "MIT"
+		}
+	}
+}

pkgs/by-name/vu/vue-typescript-plugin/package.nix

@@ -0,0 +1,27 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchurl,
+}:
+buildNpmPackage rec {
+  pname = "vue-typescript-plugin";
+  version = "2.2.0";
+  src = fetchurl {
+    url = "https://registry.npmjs.org/@vue/typescript-plugin/-/typescript-plugin-${version}.tgz";
+    hash = "sha256-WzbJ3ERFZ4T22RNSYXAVTWb+6Q3WEPYimFzkugNao+4=";
+  };
+  npmDepsHash = "sha256-yzoeV5ZRvRu1ADdGJ9DdolWOQvGF+FIdn5J5G/KItk4=";
+  postPatch = ''
+    ln -s ${./package-lock.json} package-lock.json
+  '';
+  dontNpmBuild = true;
+  passthru.updateScript = ./update.sh;
+  meta = {
+    description = "Official Vue.js typescript plugin";
+    homepage = "https://github.com/vuejs/language-tools#readme";
+    changelog = "https://github.com/vuejs/language-tools/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ wbondanza_devoteam ];
+    mainProgram = "vue-typescript-plugin";
+  };
+}

pkgs/by-name/vu/vue-typescript-plugin/update.sh

@@ -0,0 +1,30 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p gnused nix nodejs prefetch-npm-deps wget
+
+set -euo pipefail
+pushd "$(dirname "${BASH_SOURCE[0]}")"
+
+version=$(npm view @vue/language-server version)
+tarball="typescript-plugin-$version.tgz"
+url="https://registry.npmjs.org/@vue/typescript-plugin/-/$tarball"
+
+if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then
+    echo "Already up to date!"
+    exit 0
+fi
+
+sed -i 's#version = "[^"]*"#version = "'"$version"'"#' package.nix
+
+sha256=$(nix-prefetch-url "$url")
+src_hash=$(nix-hash --to-sri --type sha256 "$sha256")
+sed -i 's#hash = "[^"]*"#hash = "'"$src_hash"'"#' package.nix
+
+rm -f package-lock.json package.json *.tgz
+wget "$url"
+tar xf "$tarball" --strip-components=1 package/package.json
+npm i --package-lock-only --ignore-scripts
+npm_hash=$(prefetch-npm-deps package-lock.json)
+sed -i 's#npmDepsHash = "[^"]*"#npmDepsHash = "'"$npm_hash"'"#' package.nix
+rm -f package.json *.tgz
+
+popd

pkgs/by-name/wy/wyoming-satellite/package.nix

@@ -21,14 +21,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "wyoming-satellite";
-  version = "1.2.0";
+  version = "1.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rhasspy";
     repo = "wyoming-satellite";
     tag = "v${version}";
-    hash = "sha256-KIWhWE9Qaxs72fJ1LRTkvk6QtpBJOFlmZv2od69O15g=";
+    hash = "sha256-9UgfD0Hs/IgOszd/QBbe6DYY6kBWh7q/e57gghQ1/Bk=";
   };
 
   build-system = with python.pkgs; [

pkgs/desktops/lomiri/applications/lomiri/default.nix

@@ -35,12 +35,13 @@
   lomiri-app-launch,
   lomiri-download-manager,
   lomiri-indicator-network,
-  lomiri-ui-toolkit,
+  lomiri-notifications,
   lomiri-settings-components,
   lomiri-system-settings-unwrapped,
   lomiri-schemas,
-  lomiri-notifications,
+  lomiri-telephony-service,
   lomiri-thumbnailer,
+  lomiri-ui-toolkit,
   maliit-keyboard,
   mir_2_15,
   nixos-icons,
@@ -55,7 +56,6 @@
   qtmir,
   qtmultimedia,
   qtsvg,
-  telephony-service,
   wrapGAppsHook3,
   wrapQtAppsHook,
   xwayland,
@@ -210,9 +210,9 @@ stdenv.mkDerivation (finalAttrs: {
     hfd-service
     lomiri-notifications
     lomiri-settings-components
+    lomiri-telephony-service
     lomiri-thumbnailer
     qtmultimedia
-    telephony-service
   ];
 
   nativeCheckInputs = [ (python3.withPackages (ps: with ps; [ python-dbusmock ])) ];

pkgs/desktops/lomiri/default.nix

@@ -63,10 +63,10 @@ let
       lomiri-history-service = callPackage ./services/lomiri-history-service { };
       lomiri-indicator-network = callPackage ./services/lomiri-indicator-network { };
       lomiri-polkit-agent = callPackage ./services/lomiri-polkit-agent { };
+      lomiri-telephony-service = callPackage ./services/lomiri-telephony-service { };
       lomiri-thumbnailer = callPackage ./services/lomiri-thumbnailer { };
       lomiri-url-dispatcher = callPackage ./services/lomiri-url-dispatcher { };
       mediascanner2 = callPackage ./services/mediascanner2 { };
-      telephony-service = callPackage ./services/telephony-service { };
     };
 in
 lib.makeScope libsForQt5.newScope packages
@@ -74,4 +74,5 @@ lib.makeScope libsForQt5.newScope packages
   content-hub = lib.warnOnInstantiate "`content-hub` was renamed to `lomiri-content-hub`." pkgs.lomiri.lomiri-content-hub; # Added on 2024-09-11
   history-service = lib.warnOnInstantiate "`history-service` was renamed to `lomiri-history-service`." pkgs.lomiri.lomiri-history-service; # Added on 2024-11-11
   lomiri-system-settings-security-privacy = lib.warnOnInstantiate "`lomiri-system-settings-security-privacy` upstream was merged into `lomiri-system-settings`. Please use `pkgs.lomiri.lomiri-system-settings-unwrapped` if you need to directly access the plugins that belonged to this project." pkgs.lomiri.lomiri-system-settings-unwrapped; # Added on 2024-08-08
+  telephony-service = lib.warnOnInstantiate "`telephony-service` was renamed to `lomiri-telephony-service`." pkgs.lomiri.lomiri-telephony-service; # Adder on 2025-01-15
 }

pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix

@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  fetchpatch,
   gitUpdater,
   nixosTests,
   runCommand,
@@ -43,56 +42,16 @@ let
     "--replace-fail \"\\\${DBUS_SERVICES_DIR}/${name}\" \"${pkg}/share/dbus-1/services/${name}\"";
 in
 stdenv.mkDerivation (finalAttrs: {
-  pname = "telephony-service";
-  version = "0.5.3";
+  pname = "lomiri-telephony-service";
+  version = "0.6.0";
 
   src = fetchFromGitLab {
     owner = "ubports";
-    repo = "development/core/telephony-service";
-    rev = finalAttrs.version;
-    hash = "sha256-eLGwAJmBDDvSODQUNr/zcPA/0DdXtVBiS7vg+iIYPDo=";
+    repo = "development/core/lomiri-telephony-service";
+    tag = finalAttrs.version;
+    hash = "sha256-vEMTnflHszgANSZHcVGx1goMWVe7/6eZLYCIxq8aMt4=";
   };
 
-  patches = [
-    # Remove when https://gitlab.com/ubports/development/core/telephony-service/-/merge_requests/90 merged & in release
-    (fetchpatch {
-      name = "0001-lomiri-telephony-service-CMakeLists-Make-tests-optional.patch";
-      url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/9a8297bcf9b34d77ffdae3dfe4ad2636022976fb.patch";
-      hash = "sha256-Za4ZGKnw9iz2RP1LzLhKrEJ1vLUufWk8J07LmWDW40E=";
-    })
-
-    # Remove when version > 0.5.3
-    (fetchpatch {
-      name = "0002-lomiri-telephony-service-Fix-gettext-funcs-in-wrong-namespace.patch";
-      url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/18e0ba8e025b097eef1217d97d98ef4a4940fe84.patch";
-      hash = "sha256-vOIy+B/OQeccsVn4pXsnr8LYyEapqbebW1I6dBg5u2c=";
-    })
-
-    # Remove when version > 0.5.3
-    (fetchpatch {
-      name = "0003-lomiri-telephony-service-Handle-renamed-history-service.patch";
-      url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/3a387670ed13041db069068292b1f41229e79583.patch";
-      hash = "sha256-b7gxzr6Mmtogclq3hR7a/zl+816H2wmJqv3oHjUJggw=";
-    })
-
-    # Remove when version > 0.5.3
-    # Patched to be compatible with pre-rename code
-    (runCommand "0004-lomiri-telephony-service-Fix-NotificationInterface-regeneration-backported.patch"
-      {
-        src = fetchpatch {
-          name = "0004-lomiri-telephony-service-Fix-NotificationInterface-regeneration.patch";
-          url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/9533ce1a9495e5c11e9b78fc0166e903e19519b4.patch";
-          hash = "sha256-3rsZ08bz2CxKpcwYWCCd6f7gJ22v9jl7Lg7JPnWz50A=";
-        };
-      }
-      ''
-        cp $src $out
-        substituteInPlace $out \
-          --replace-fail 'lomiritelephony' 'telephony'
-      ''
-    )
-  ];
-
   postPatch =
     ''
       # Queries qmake for the QML installation path, which returns a reference to Qt5's build directory
@@ -226,8 +185,8 @@ stdenv.mkDerivation (finalAttrs: {
       }
 
     # These SystemD services are referenced by the installed D-Bus services, but not part of the installation. Why?
-    for service in telephony-service-{approver,indicator}; do
-      install -Dm644 ../debian/telephony-service."$service".user.service $out/lib/systemd/user/"$service".service
+    for service in lomiri-telephony-service-approver lomiri-indicator-telephony-service; do
+      install -Dm644 ../debian/lomiri-telephony-service."$service".user.service $out/lib/systemd/user/"$service".service
 
       # ofono-setup.service would be provided by ubuntu-touch-session, we don't plan to package it
       # Doesn't make sense to provide on non-Lomiri
@@ -235,17 +194,17 @@ stdenv.mkDerivation (finalAttrs: {
         --replace-fail '/usr' "$out" \
         --replace-warn 'Requires=ofono-setup.service' "" \
         --replace-warn 'After=ofono-setup.service' "" \
-        --replace-warn 'WantedBy=ayatana-indicators.target' 'WantedBy=lomiri-indicators.target'
+        --replace-warn 'ayatana-indicators.target' 'lomiri-indicators.target'
     done
 
     # Parses the call & SMS indicator desktop files & tries to find its own executable in PATH
-    wrapProgram $out/bin/telephony-service-indicator \
+    wrapProgram $out/bin/lomiri-indicator-telephony-service \
       --prefix PATH : "$out/bin"
   '';
 
   passthru = {
     ayatana-indicators = {
-      telephony-service-indicator = [ "lomiri" ];
+      lomiri-indicator-telephony-service = [ "lomiri" ];
     };
     tests.vm = nixosTests.ayatana-indicators;
     updateScript = gitUpdater { };
@@ -253,8 +212,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Backend dispatcher service for various mobile phone related operations";
-    homepage = "https://gitlab.com/ubports/development/core/telephony-service";
-    changelog = "https://gitlab.com/ubports/development/core/telephony-service/-/blob/${finalAttrs.version}/ChangeLog";
+    homepage = "https://gitlab.com/ubports/development/core/lomiri-telephony-service";
+    changelog = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/blob/${finalAttrs.version}/ChangeLog";
     license = lib.licenses.gpl3Only;
     maintainers = lib.teams.lomiri.members;
     platforms = lib.platforms.linux;

pkgs/development/compilers/polyml/5.6.nix

@@ -14,9 +14,17 @@ stdenv.mkDerivation {
   pname = "polyml";
   inherit version;
 
-  prePatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    substituteInPlace configure.ac --replace stdc++ c++
-  '';
+  postPatch =
+    ''
+      substituteInPlace configure.ac \
+        --replace-fail 'AC_FUNC_ALLOCA' "AC_FUNC_ALLOCA
+      AH_TEMPLATE([_Static_assert])
+      AC_DEFINE([_Static_assert], [static_assert])
+      "
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      substituteInPlace configure.ac --replace-fail stdc++ c++
+    '';
 
   patches = [
     # glibc 2.34 compat
@@ -26,7 +34,7 @@ stdenv.mkDerivation {
     })
   ];
 
-  nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin autoreconfHook;
+  nativeBuildInputs = [ autoreconfHook ];
 
   src = fetchurl {
     url = "mirror://sourceforge/polyml/polyml.${version}.tar.gz";

pkgs/development/compilers/polyml/5.7.nix

@@ -12,9 +12,17 @@ stdenv.mkDerivation rec {
   pname = "polyml";
   version = "5.7.1";
 
-  prePatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    substituteInPlace configure.ac --replace stdc++ c++
-  '';
+  postPatch =
+    ''
+      substituteInPlace configure.ac \
+        --replace-fail 'AC_FUNC_ALLOCA' "AC_FUNC_ALLOCA
+      AH_TEMPLATE([_Static_assert])
+      AC_DEFINE([_Static_assert], [static_assert])
+      "
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      substituteInPlace configure.ac --replace-fail stdc++ c++
+    '';
 
   patches = [
     ./5.7-new-libffi-FFI_SYSV.patch
@@ -31,7 +39,7 @@ stdenv.mkDerivation rec {
     gmp
   ];
 
-  nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin autoreconfHook;
+  nativeBuildInputs = [ autoreconfHook ];
 
   configureFlags = [
     "--enable-shared"

pkgs/development/compilers/polyml/default.nix

@@ -1,9 +1,10 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, autoreconfHook
-, gmp
-, libffi
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  gmp,
+  libffi,
 }:
 
 stdenv.mkDerivation rec {
@@ -17,13 +18,24 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-72wm8dt+Id59A5058mVE5P9TkXW5/LZRthZoxUustVA=";
   };
 
-  prePatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    substituteInPlace configure.ac --replace stdc++ c++
-  '';
+  postPatch =
+    ''
+      substituteInPlace configure.ac \
+        --replace-fail 'AC_FUNC_ALLOCA' "AC_FUNC_ALLOCA
+      AH_TEMPLATE([_Static_assert])
+      AC_DEFINE([_Static_assert], [static_assert])
+      "
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      substituteInPlace configure.ac --replace-fail stdc++ c++
+    '';
 
-  buildInputs = [ libffi gmp ];
+  buildInputs = [
+    libffi
+    gmp
+  ];
 
-  nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin autoreconfHook;
+  nativeBuildInputs = [ autoreconfHook ];
 
   configureFlags = [
     "--enable-shared"
@@ -47,6 +59,9 @@ stdenv.mkDerivation rec {
     homepage = "https://www.polyml.org/";
     license = licenses.lgpl21;
     platforms = with platforms; (linux ++ darwin);
-    maintainers = with maintainers; [ maggesi kovirobi ];
+    maintainers = with maintainers; [
+      maggesi
+      kovirobi
+    ];
   };
 }

pkgs/development/coq-modules/mathcomp/default.nix

@@ -67,7 +67,7 @@ let
 
   mathcomp_ = package: let
       mathcomp-deps = lib.optionals (package != "single") (map mathcomp_ (lib.head (lib.splitList (lib.pred.equal package) packages)));
-      pkgpath = if package == "single" then "mathcomp" else "mathcomp/${package}";
+      pkgpath = if package == "single" then "." else package;
       pname = if package == "single" then "mathcomp" else "mathcomp-${package}";
       pkgallMake = ''
         echo "all.v"  > Make
@@ -92,6 +92,8 @@ let
           then patchShebangs etc/buildlibgraph
           fi
         '' + ''
+          # handle mathcomp < 2.4.0 which had an extra base mathcomp directory
+          test -d mathcomp && cd mathcomp
           cd ${pkgpath}
         '' + lib.optionalString (package == "all") pkgallMake;
 

pkgs/development/haskell-modules/configuration-common.nix

@@ -513,22 +513,22 @@ self: super: {
 
   # Manually maintained
   cachix-api = overrideCabal (drv: {
-    version = "1.7.5";
+    version = "1.7.6";
     src = pkgs.fetchFromGitHub {
       owner = "cachix";
       repo = "cachix";
-      rev = "v1.7.5";
-      sha256 = "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs=";
+      rev = "v1.7.6";
+      hash = "sha256-8HFvG7fvIFbgtaYAY2628Tb89fA55nPm2jSiNs0/Cws=";
     };
     postUnpack = "sourceRoot=$sourceRoot/cachix-api";
   }) super.cachix-api;
   cachix = (overrideCabal (drv: {
-    version = "1.7.5";
+    version = "1.7.6";
     src = pkgs.fetchFromGitHub {
       owner = "cachix";
       repo = "cachix";
-      rev = "v1.7.5";
-      sha256 = "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs=";
+      rev = "v1.7.6";
+      hash = "sha256-8HFvG7fvIFbgtaYAY2628Tb89fA55nPm2jSiNs0/Cws=";
     };
     postUnpack = "sourceRoot=$sourceRoot/cachix";
   }) (lib.pipe

pkgs/development/interpreters/elixir/1.18.nix

@@ -1,7 +1,7 @@
 { mkDerivation }:
 mkDerivation {
-  version = "1.18.1";
-  sha256 = "sha256-zJNAoyqSj/KdJ1Cqau90QCJihjwHA+HO7nnD1Ugd768=";
+  version = "1.18.2";
+  sha256 = "sha256-8FhUKAaEjBBcF0etVPdkxMfrnR5niU40U8cxDRJdEok=";
   # https://hexdocs.pm/elixir/1.18.0/compatibility-and-deprecations.html#between-elixir-and-erlang-otp
   minimumOTPVersion = "25";
   escriptPath = "lib/elixir/scripts/generate_app.escript";

pkgs/development/interpreters/php/8.4.nix

@@ -4,8 +4,8 @@ let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.4.2";
-      hash = "sha256-70/pkhuIXOOwR3kqtgJg6vZX4igSvlEdGdDkXt+YR4M=";
+      version = "8.4.3";
+      hash = "sha256-1rEjedHx3yFtGTKECjGxT+0eD8fo2x6dF5X3Wh516tk=";
     }
   );
 in

pkgs/development/node-packages/aliases.nix

@@ -50,6 +50,7 @@ mapAliases {
   "@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06
   "@tailwindcss/language-server" = pkgs.tailwindcss-language-server; # added 2024-01-22
   "@volar/vue-language-server" = pkgs.vue-language-server; # added 2024-06-15
+  "@volar/vue-typescript-plugin" = pkgs.vue-typescript-plugin; # added 2025-01-16
   "@vue/language-server" = pkgs.vue-language-server; # added 2024-06-15
   "@withgraphite/graphite-cli" = pkgs.graphite-cli; # added 2024-01-25
   "@zwave-js/server" = pkgs.zwave-js-server; # Added 2023-09-09

pkgs/development/python-modules/airportsdata/default.nix

@@ -0,0 +1,32 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  pythonOlder,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "airportsdata";
+  version = "20241001";
+  pyproject = true;
+
+  disabled = pythonOlder "3.9";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-+gvRQ7T0vjVXy4kvoGEu8hD9kakr1yC02CId5Xak+gA=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "airportsdata" ];
+
+  meta = {
+    description = "Extensive database of location and timezone data for nearly every operational airport";
+    homepage = "https://github.com/mborsetti/airportsdata/";
+    changelog = "https://github.com/mborsetti/airportsdata/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ danieldk ];
+  };
+}

pkgs/development/python-modules/bpython/default.nix

@@ -1,63 +1,69 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   curtsies,
   cwcwidth,
   greenlet,
   jedi,
   pygments,
   pytestCheckHook,
-  pythonOlder,
   pyperclip,
   pyxdg,
   requests,
-  typing-extensions,
+  setuptools,
   urwid,
   watchdog,
 }:
 
 buildPythonPackage rec {
   pname = "bpython";
-  version = "0.24";
-  format = "setuptools";
+  version = "0.25";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-mHNv/XqMSP0r+1PYmKR19CQb3gtnISVwavBNnQj9Pb0=";
+  src = fetchFromGitHub {
+    owner = "bpython";
+    repo = "bpython";
+    tag = version;
+    hash = "sha256-p5+IQiHNRRazqr+WRdx3Yw+ImG25tdZGLXvMf7woD9w=";
   };
 
-  propagatedBuildInputs = [
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail 'version = "unknown"' 'version = "${version}"'
+  '';
+
+  build-system = [ setuptools ];
+
+  dependencies = [
     curtsies
     cwcwidth
     greenlet
-    jedi
     pygments
-    pyperclip
     pyxdg
     requests
-    typing-extensions
-    urwid
-    watchdog
   ];
 
+  optional-dependencies = {
+    clipboard = [ pyperclip ];
+    jedi = [ jedi ];
+    urwid = [ urwid ];
+    watch = [ watchdog ];
+  };
+
   postInstall = ''
     substituteInPlace "$out/share/applications/org.bpython-interpreter.bpython.desktop" \
-      --replace "Exec=/usr/bin/bpython" "Exec=$out/bin/bpython"
+      --replace "Exec=/usr/bin/bpython" "Exec=bpython"
   '';
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+  ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "bpython" ];
 
-  disabledTests = [
-    # Check for syntax error ends with an AssertionError
-    "test_syntaxerror"
-  ];
-
   meta = with lib; {
+    changelog = "https://github.com/bpython/bpython/blob/${src.tag}/CHANGELOG.rst";
     description = "Fancy curses interface to the Python interactive interpreter";
     homepage = "https://bpython-interpreter.org/";
     license = licenses.mit;

pkgs/development/python-modules/hahomematic/default.nix

@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "hahomematic";
-  version = "2025.1.10";
+  version = "2025.1.11";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "SukramJ";
     repo = "hahomematic";
     tag = version;
-    hash = "sha256-4aHrQ8EgaQNNT4M8FBEHXxgU+ES3ylegYwFyz3Hf+jQ=";
+    hash = "sha256-XHXQ1A6s5ew5hsivlC83oufYiImpKCRJ7v7NsAn6PJs=";
   };
 
   __darwinAllowLocalNetworking = true;

pkgs/development/python-modules/jaxlib/default.nix

@@ -15,7 +15,7 @@
   cython,
   fetchFromGitHub,
   git,
-  IOKit,
+  darwin,
   jsoncpp,
   nsync,
   openssl,
@@ -242,25 +242,22 @@ let
       which
     ] ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [ cctools ];
 
-    buildInputs =
-      [
-        curl
-        double-conversion
-        giflib
-        jsoncpp
-        libjpeg_turbo
-        numpy
-        openssl
-        pkgs.flatbuffers
-        pkgs.protobuf
-        pybind11
-        scipy
-        six
-        snappy
-        zlib
-      ]
-      ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [ IOKit ]
-      ++ lib.optionals (!effectiveStdenv.hostPlatform.isDarwin) [ nsync ];
+    buildInputs = [
+      curl
+      double-conversion
+      giflib
+      jsoncpp
+      libjpeg_turbo
+      numpy
+      openssl
+      pkgs.flatbuffers
+      pkgs.protobuf
+      pybind11
+      scipy
+      six
+      snappy
+      zlib
+    ] ++ lib.optionals (!effectiveStdenv.hostPlatform.isDarwin) [ nsync ];
 
     # We don't want to be quite so picky regarding bazel version
     postPatch = ''
@@ -393,12 +390,12 @@ let
             }
         ).${effectiveStdenv.system} or (throw "jaxlib: unsupported system: ${effectiveStdenv.system}");
 
-        # Non-reproducible fetch https://github.com/NixOS/nixpkgs/issues/321920#issuecomment-2184940546
-        preInstall = ''
-          cat << \EOF > "$bazelOut/external/go_sdk/versions.json"
-          []
-          EOF
-        '';
+      # Non-reproducible fetch https://github.com/NixOS/nixpkgs/issues/321920#issuecomment-2184940546
+      preInstall = ''
+        cat << \EOF > "$bazelOut/external/go_sdk/versions.json"
+        []
+        EOF
+      '';
     };
 
     buildAttrs = {
@@ -415,7 +412,7 @@ let
       # are not available yet. Framework search paths aren't added by bintools
       # hook. See https://github.com/NixOS/nixpkgs/pull/41914.
       preBuild = lib.optionalString effectiveStdenv.hostPlatform.isDarwin ''
-        export NIX_LDFLAGS+=" -F${IOKit}/Library/Frameworks"
+        export NIX_LDFLAGS+=" -F${darwin.apple_sdk.frameworks.IOKit}/Library/Frameworks"
         substituteInPlace ../output/external/rules_cc/cc/private/toolchain/osx_cc_wrapper.sh.tpl \
           --replace "/usr/bin/install_name_tool" "${cctools}/bin/install_name_tool"
         substituteInPlace ../output/external/rules_cc/cc/private/toolchain/unix_cc_configure.bzl \

pkgs/development/python-modules/led-ble/default.nix

@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "led-ble";
-  version = "1.1.1";
+  version = "1.1.4";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = "led-ble";
     tag = "v${version}";
-    hash = "sha256-FPF/jPsXVk16UDpfglmVy01sOpv/XAwx+dCYCbJnFZQ=";
+    hash = "sha256-+4qzAeFzU1Bdt9kvegBtaENh/dlRA0jbAUFr3WuSFsg=";
   };
 
   build-system = [ poetry-core ];

pkgs/development/python-modules/lxmf/default.nix

@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "lxmf";
-  version = "0.5.8";
+  version = "0.6.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "markqvist";
     repo = "lxmf";
     tag = version;
-    hash = "sha256-68c4KrXudjs6YGi282pa31XwbvjsXgKVQ2e+zPBYHf4=";
+    hash = "sha256-9eq/VoIgHGYLERLqFHGLPmIyv28rD78eZnd6zVfWod8=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/nitrokey/default.nix

@@ -17,12 +17,12 @@
 
 buildPythonPackage rec {
   pname = "nitrokey";
-  version = "0.2.3";
+  version = "0.2.4";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-8Ig2LI7waU/IbUwApyFI2TwtarT5bYolgeq14SgmbEo=";
+    hash = "sha256-XDlcOfOTGgYsg5DLsy1wJd3AzuvWSvqyFSEYrDOp0Ic=";
   };
 
   disabled = pythonOlder "3.9";

pkgs/development/python-modules/nomadnet/default.nix

@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "nomadnet";
-  version = "0.5.6";
+  version = "0.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "markqvist";
     repo = "NomadNet";
     tag = version;
-    hash = "sha256-dwymJIsMDeVsG7eF45CgUPlZf3sEdwnxZ8OxT+gEQCs=";
+    hash = "sha256-3n+CoB8SLSjpmif2qBd9+gyF55JpwtJQuxcJEyXaWtk=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/outlines-core/default.nix

@@ -0,0 +1,95 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  pythonOlder,
+  cargo,
+  pkg-config,
+  rustPlatform,
+  rustc,
+  openssl,
+  setuptools-rust,
+  setuptools-scm,
+  interegular,
+  jsonschema,
+  datasets,
+  numpy,
+  pytestCheckHook,
+  pydantic,
+  scipy,
+  torch,
+  transformers,
+}:
+
+buildPythonPackage rec {
+  pname = "outlines-core";
+  version = "0.1.26";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "outlines_core";
+    hash = "sha256-SBxDATQed8yPGDLWFnhK201GG0/sZYeOfA0sunFjoYk=";
+  };
+
+  cargoDeps = rustPlatform.importCargoLock {
+    lockFile = ./Cargo.lock;
+  };
+
+  postPatch = ''
+    cp --no-preserve=mode ${./Cargo.lock} Cargo.lock
+  '';
+
+  nativeBuildInputs = [
+    cargo
+    pkg-config
+    rustPlatform.cargoSetupHook
+    rustc
+  ];
+
+  buildInputs = [
+    openssl.dev
+  ];
+
+  build-system = [
+    setuptools-rust
+    setuptools-scm
+  ];
+
+  dependencies = [
+    interegular
+    jsonschema
+  ];
+
+  optional-dependencies = {
+    tests = [
+      datasets
+      numpy
+      pydantic
+      scipy
+      torch
+      transformers
+    ];
+  };
+
+  nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies);
+
+  disabledTests = [
+    # Tests that need to download from Hugging Face Hub.
+    "test_complex_serialization"
+    "test_create_fsm_index_tokenizer"
+    "test_reduced_vocabulary_with_rare_tokens"
+  ];
+
+  pythonImportsCheck = [ "outlines_core" ];
+
+  meta = {
+    description = "Structured text generation (core)";
+    homepage = "https://github.com/outlines-dev/outlines-core";
+    changelog = "https://github.com/dottxt-ai/outlines-core/releases/tag/${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ danieldk ];
+  };
+}

pkgs/development/python-modules/outlines/default.nix

@@ -4,56 +4,60 @@
   fetchFromGitHub,
   setuptools,
   setuptools-scm,
+  airportsdata,
   interegular,
   cloudpickle,
   datasets,
   diskcache,
-  joblib,
+  jinja2,
   jsonschema,
-  pyairports,
+  numpy,
+  outlines-core,
   pycountry,
   pydantic,
   lark,
   nest-asyncio,
-  numba,
-  scipy,
+  referencing,
+  requests,
   torch,
   transformers,
 }:
 
 buildPythonPackage rec {
   pname = "outlines";
-  version = "0.0.46";
+  version = "0.1.13";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "outlines-dev";
-    repo = pname;
+    repo = "outlines";
     tag = version;
-    hash = "sha256-6VH9BcMRVRf2xvLcK3GNA1pGgAOs95UOlFQ6KxHXwKo=";
+    hash = "sha256-HuJqLbBHyoyY5ChQQi+9ftvPjLuh63Guk2w6KSZxq6s=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
+    airportsdata
     interegular
     cloudpickle
     datasets
     diskcache
-    joblib
+    jinja2
     jsonschema
+    outlines-core
     pydantic
     lark
     nest-asyncio
-    numba
-    scipy
+    numpy
+    referencing
+    requests
     torch
     transformers
     pycountry
-    pyairports
   ];
 
   checkPhase = ''

pkgs/development/python-modules/playwright/default.nix

@@ -22,7 +22,7 @@ in
 buildPythonPackage rec {
   pname = "playwright";
   # run ./pkgs/development/python-modules/playwright/update.sh to update
-  version = "1.47.0";
+  version = "1.48.0";
   pyproject = true;
   disabled = pythonOlder "3.7";
 
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "microsoft";
     repo = "playwright-python";
     tag = "v${version}";
-    hash = "sha256-C/spH54hhLI0Egs2jjTjQ5BH1pIw1syrfSyUvVQRoKM=";
+    hash = "sha256-ZWVySGehR5r6s0y6qCZuFI8SobYbjWP+A6Rgfug2JEE=";
   };
 
   patches = [

pkgs/development/python-modules/playwright/update.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl gnused common-updater-scripts jq prefetch-npm-deps unzip
+#!nix-shell -i bash -p curl gnused common-updater-scripts jq prefetch-npm-deps unzip nix-prefetch
 set -euo pipefail
 
 root="$(dirname "$(readlink -f "$0")")"
@@ -30,18 +30,38 @@ replace_sha() {
 }
 
 prefetch_browser() {
-    nix store prefetch-file --json --hash-type sha256 --unpack "$1" | jq -r .hash
+  # nix-prefetch is used to obtain sha with `stripRoot = false`
+  # doesn't work on macOS https://github.com/msteen/nix-prefetch/issues/53
+  nix-prefetch -q "{ stdenv, fetchzip }: stdenv.mkDerivation rec { name=\"browser\"; src = fetchzip { url = \"$1\"; stripRoot = $2; }; }"
 }
 
 update_browser() {
     name="$1"
-    suffix="$2"
-    arm64_suffix="${3:-$2-arm64}"
+    platform="$2"
+    stripRoot="false"
+    if [ "$platform" = "darwin" ]; then
+        if [ "$name" = "webkit" ]; then
+            suffix="mac-14"
+        else
+            suffix="mac"
+        fi
+    else
+        if [ "$name" = "ffmpeg" ]; then
+            suffix="linux"
+        elif [ "$name" = "firefox" ]; then
+            stripRoot="true"
+            suffix="ubuntu-22.04"
+        else
+            suffix="ubuntu-22.04"
+        fi
+    fi
+    aarch64_suffix="$suffix-arm64"
+
     revision="$(jq -r ".browsers.$name.revision" "$playwright_dir/browsers.json")"
-    replace_sha "$playwright_dir/$name.nix" "x86_64-linux" \
-        "$(prefetch_browser "https://playwright.azureedge.net/builds/$name/$revision/$name-$suffix.zip")"
-    replace_sha "$playwright_dir/$name.nix" "aarch64-linux" \
-        "$(prefetch_browser "https://playwright.azureedge.net/builds/$name/$revision/$name-$arm64_suffix.zip")"
+    replace_sha "$playwright_dir/$name.nix" "x86_64-$platform" \
+        "$(prefetch_browser "https://playwright.azureedge.net/builds/$name/$revision/$name-$suffix.zip" $stripRoot)"
+    replace_sha "$playwright_dir/$name.nix" "aarch64-$platform" \
+        "$(prefetch_browser "https://playwright.azureedge.net/builds/$name/$revision/$name-$aarch64_suffix.zip" $stripRoot)"
 }
 
 curl -fsSl \
@@ -58,10 +78,14 @@ curl -fsSl \
 
 # We currently use Chromium from nixpkgs, so we don't need to download it here
 # Likewise, darwin can be ignored here atm as we are using an impure install anyway.
-update_browser "firefox" "ubuntu-22.04"
-update_browser "webkit" "ubuntu-22.04"
+update_browser "firefox" "linux"
+update_browser "webkit" "linux"
 update_browser "ffmpeg" "linux"
 
+update_browser "chromium" "darwin"
+update_browser "firefox" "darwin"
+update_browser "webkit" "darwin"
+update_browser "ffmpeg" "darwin"
 
 # Update package-lock.json files for all npm deps that are built in playwright
 

pkgs/development/python-modules/rns/default.nix

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "rns";
-  version = "0.9.0";
+  version = "0.9.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "markqvist";
     repo = "Reticulum";
     tag = version;
-    hash = "sha256-rIIXTrP340lWMjQcT+/JKULwvaWC2gjrWSzu+3tqnK0=";
+    hash = "sha256-AR7JMvx5qWPFtMhotO2MlqKH5d/CcGOrvpaB031vTX8=";
   };
 
   patches = [

pkgs/development/python-modules/strawberry-graphql/default.nix

@@ -44,7 +44,7 @@
 
 buildPythonPackage rec {
   pname = "strawberry-graphql";
-  version = "0.257.0";
+  version = "0.258.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     owner = "strawberry-graphql";
     repo = "strawberry";
     tag = version;
-    hash = "sha256-HU3d3ss9axGMqWGxlCQjbRsia9XiMQvHaVs9YMX01v8=";
+    hash = "sha256-gv/P7pz2wcIKXP5SChTlsM2j2GPuRK+iuLZil8/VvJk=";
   };
 
   postPatch = ''

pkgs/development/python-modules/typst/default.nix

@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "typst";
-  version = "0.12.2";
+  version = "0.12.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -22,13 +22,13 @@ buildPythonPackage rec {
     owner = "messense";
     repo = "typst-py";
     tag = "v${version}";
-    hash = "sha256-vK55LoEc5BaS2tQwuLhXDnv8xiSOgk/ngU/gtbhZR2k=";
+    hash = "sha256-VgQbMeyvXjzE8jSaGLygIy8EhR23MpqjlU68FsBZq6E=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-01kSin3da58rPTHRmjyj62nf6HshmD6ARbhUd3eBfV0=";
+    hash = "sha256-H7lKoSDSx0cGH+VsIX90KaiWJw1h/BokNdKzxmvm6XQ=";
   };
 
   build-system = [

pkgs/development/python-modules/yalexs/default.nix

@@ -25,7 +25,7 @@
 
 buildPythonPackage rec {
   pname = "yalexs";
-  version = "8.10.0";
+  version = "8.11.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     owner = "bdraco";
     repo = "yalexs";
     tag = "v${version}";
-    hash = "sha256-0fC12QsCOgFc6GJk5T7kCjVHe9W4Fhwmtv3dwJVh9mM=";
+    hash = "sha256-ajKe0pIUV2xwFi49MR4NK19G1DZ84e6oSJQIGlXq+Vo=";
   };
 
   build-system = [ poetry-core ];

pkgs/development/web/playwright/browsers.json

@@ -2,15 +2,15 @@
   "comment": "This file is kept up to date via update.sh",
   "browsers": {
     "chromium": {
-      "revision": "1134",
-      "browserVersion": "129.0.6668.29"
+      "revision": "1140",
+      "browserVersion": "130.0.6723.31"
     },
     "firefox": {
-      "revision": "1463",
-      "browserVersion": "130.0"
+      "revision": "1465",
+      "browserVersion": "131.0"
     },
     "webkit": {
-      "revision": "2070",
+      "revision": "2083",
       "revisionOverrides": {
         "mac10.14": "1446",
         "mac10.15": "1616",
@@ -22,7 +22,11 @@
       "browserVersion": "18.0"
     },
     "ffmpeg": {
-      "revision": "1010"
+      "revision": "1010",
+      "revisionOverrides": {
+        "mac12": "1010",
+        "mac12-arm64": "1010"
+      }
     }
   }
 }

pkgs/development/web/playwright/chromium.nix

@@ -3,22 +3,47 @@
   makeWrapper,
   fontconfig_file,
   chromium,
+  fetchzip,
+  revision,
+  suffix,
+  system,
+  throwSystem,
   ...
 }:
-runCommand "playwright-chromium"
-  {
-    nativeBuildInputs = [
-      makeWrapper
-    ];
-  }
-  ''
-    mkdir -p $out/chrome-linux
+let
+  chromium-linux =
+    runCommand "playwright-chromium"
+      {
+        nativeBuildInputs = [
+          makeWrapper
+        ];
+      }
+      ''
+        mkdir -p $out/chrome-linux
 
-    # See here for the Chrome options:
-    # https://github.com/NixOS/nixpkgs/issues/136207#issuecomment-908637738
-    # We add --disable-gpu to be able to run in gpu-less environments such
-    # as headless nixos test vms.
-    makeWrapper ${chromium}/bin/chromium $out/chrome-linux/chrome \
-      --set-default SSL_CERT_FILE /etc/ssl/certs/ca-bundle.crt \
-      --set-default FONTCONFIG_FILE ${fontconfig_file}
-  ''
+        # See here for the Chrome options:
+        # https://github.com/NixOS/nixpkgs/issues/136207#issuecomment-908637738
+        # We add --disable-gpu to be able to run in gpu-less environments such
+        # as headless nixos test vms.
+        makeWrapper ${chromium}/bin/chromium $out/chrome-linux/chrome \
+          --set-default SSL_CERT_FILE /etc/ssl/certs/ca-bundle.crt \
+          --set-default FONTCONFIG_FILE ${fontconfig_file}
+      '';
+  chromium-darwin = fetchzip {
+    url = "https://playwright.azureedge.net/builds/chromium/${revision}/chromium-${suffix}.zip";
+    stripRoot = false;
+    hash =
+      {
+        x86_64-darwin = "sha256-N/uh3Q2ivqeraAqRt80deVz1XEPyLTYI8L3DBfNQGWg=";
+        aarch64-darwin = "sha256-tR9PwGanPcsDQwi1BijeYJd9LhNIWgEoXs5u3gZpghU=";
+      }
+      .${system} or throwSystem;
+  };
+in
+{
+  x86_64-linux = chromium-linux;
+  aarch64-linux = chromium-linux;
+  x86_64-darwin = chromium-darwin;
+  aarch64-darwin = chromium-darwin;
+}
+.${system} or throwSystem

pkgs/development/web/playwright/driver.nix

@@ -27,20 +27,20 @@ let
     }
     .${system} or throwSystem;
 
-  version = "1.47.0";
+  version = "1.48.1";
 
   src = fetchFromGitHub {
     owner = "Microsoft";
     repo = "playwright";
     rev = "v${version}";
-    hash = "sha256-cKjVDy1wFo8NlF8v+8YBuQUF2OUYjCmv27uhEoVUrno=";
+    hash = "sha256-VMp/Tjd5w2v+IHD+CMaR/XdMJHkS/u7wFe0hNxa1TbE=";
   };
 
   babel-bundle = buildNpmPackage {
     pname = "babel-bundle";
     inherit version src;
     sourceRoot = "${src.name}/packages/playwright/bundles/babel";
-    npmDepsHash = "sha256-HrDTkP2lHl2XKD8aGpmnf6YtSe/w9UePH5W9QfbaoMg=";
+    npmDepsHash = "sha256-kHuNFgxmyIoxTmvT+cyzDRfKNy18zzeUH3T+gJopWeA=";
     dontNpmBuild = true;
     installPhase = ''
       cp -r . "$out"
@@ -50,7 +50,7 @@ let
     pname = "expect-bundle";
     inherit version src;
     sourceRoot = "${src.name}/packages/playwright/bundles/expect";
-    npmDepsHash = "sha256-qnFx/AQZtmxNFrrabfOpsWy6I64DFJf3sWrJzL1wfU4=";
+    npmDepsHash = "sha256-KwxNqPefvPPHG4vbco2O4G8WlA7l33toJdfNWHMTDOQ=";
     dontNpmBuild = true;
     installPhase = ''
       cp -r . "$out"
@@ -92,7 +92,7 @@ let
     inherit version src;
 
     sourceRoot = "${src.name}"; # update.sh depends on sourceRoot presence
-    npmDepsHash = "sha256-FaDTJmIiaaOCvq6tARfiWX5IBTTNOJ/iVkRsO4D8aqc=";
+    npmDepsHash = "sha256-cmUmYuUL7zfB7WEBKft43r69f7vaZDEjku8uwR3RZ1A=";
 
     nativeBuildInputs = [ cacert ];
 
@@ -159,15 +159,11 @@ let
 
     passthru = {
       browsersJSON = (lib.importJSON ./browsers.json).browsers;
-      browsers =
-        {
-          x86_64-linux = browsers-linux { };
-          aarch64-linux = browsers-linux { };
-          x86_64-darwin = browsers-mac;
-          aarch64-darwin = browsers-mac;
-        }
-        .${system} or throwSystem;
-      browsers-chromium = browsers-linux { };
+      browsers = browsers { };
+      browsers-chromium = browsers {
+        withFirefox = false;
+        withWebkit = false;
+      };
     };
   });
 
@@ -196,28 +192,7 @@ let
     };
   });
 
-  browsers-mac = stdenv.mkDerivation {
-    pname = "playwright-browsers";
-    inherit (playwright) version;
-
-    dontUnpack = true;
-
-    nativeBuildInputs = [ cacert ];
-
-    installPhase = ''
-      runHook preInstall
-
-      export PLAYWRIGHT_BROWSERS_PATH=$out
-      ${playwright-core}/cli.js install
-      rm -r $out/.links
-
-      runHook postInstall
-    '';
-
-    meta.platforms = lib.platforms.darwin;
-  };
-
-  browsers-linux = lib.makeOverridable (
+  browsers = lib.makeOverridable (
     {
       withChromium ? true,
       withFirefox ? true,

pkgs/development/web/playwright/ffmpeg.nix

@@ -12,6 +12,8 @@ fetchzip {
     {
       x86_64-linux = "sha256-FEm62UvMv0h6Sav93WmbPLw3CW1L1xg4nD26ca5ol38=";
       aarch64-linux = "sha256-jtQ+NS++VHRiKoIV++PIxEnyVnYtVwUyNlSILKSH4A4=";
+      x86_64-darwin = "sha256-ED6noxSDeEUt2DkIQ4gNe/kL+zHVeb2AD5klBk93F88=";
+      aarch64-darwin = "sha256-3Adnvb7zvMXKFOhb8uuj5kx0wEIFicmckYx9WLlNNf0=";
     }
     .${system} or throwSystem;
 }

pkgs/development/web/playwright/firefox.nix

@@ -9,31 +9,48 @@
   throwSystem,
 }:
 let
-  suffix' =
-    if lib.hasPrefix "linux" suffix then "ubuntu-22.04" + (lib.removePrefix "linux" suffix) else suffix;
-in
-stdenv.mkDerivation {
-  name = "playwright-firefox";
-  src = fetchzip {
-    url = "https://playwright.azureedge.net/builds/firefox/${revision}/firefox-${suffix'}.zip";
+  firefox-linux = stdenv.mkDerivation {
+    name = "playwright-firefox";
+    src = fetchzip {
+      url = "https://playwright.azureedge.net/builds/firefox/${revision}/firefox-${
+        "ubuntu-22.04" + (lib.removePrefix "linux" suffix)
+      }.zip";
+      hash =
+        {
+          x86_64-linux = "sha256-L/CJVtj9bVXKuKSLWw0wAdNICiRTg5ek+fw4togBoSI=";
+          aarch64-linux = "sha256-DgCuX+6KSnoHNFoFUli6S20GGHOExARasiJY9fy3CCE=";
+        }
+        .${system} or throwSystem;
+    };
+
+    inherit (firefox-bin.unwrapped)
+      nativeBuildInputs
+      buildInputs
+      runtimeDependencies
+      appendRunpaths
+      patchelfFlags
+      ;
+
+    buildPhase = ''
+      mkdir -p $out/firefox
+      cp -R . $out/firefox
+    '';
+  };
+  firefox-darwin = fetchzip {
+    url = "https://playwright.azureedge.net/builds/firefox/${revision}/firefox-${suffix}.zip";
+    stripRoot = false;
     hash =
       {
-        x86_64-linux = "sha256-Hd9LlSRLW51gDoFyszqvg46Q/sMizLRsVKAN9atbwsw=";
-        aarch64-linux = "sha256-SEXH3gLOfNjOcnNWQjQ5gaaow47veVs0BoTYSgXw+24=";
+        x86_64-darwin = "sha256-HJ0jBmTW/Zz2fkmSo1gEv5P58PGyhXKnJVxJ12Q4IiM=";
+        aarch64-darwin = "sha256-YnnG8BX06vQlJmzZGaCKq1wKGp3yRaUQ4RF+tEWoK6U=";
       }
       .${system} or throwSystem;
   };
-
-  inherit (firefox-bin.unwrapped)
-    nativeBuildInputs
-    buildInputs
-    runtimeDependencies
-    appendRunpaths
-    patchelfFlags
-    ;
-
-  buildPhase = ''
-    mkdir -p $out/firefox
-    cp -R . $out/firefox
-  '';
+in
+{
+  x86_64-linux = firefox-linux;
+  aarch64-linux = firefox-linux;
+  x86_64-darwin = firefox-darwin;
+  aarch64-darwin = firefox-darwin;
 }
+.${system} or throwSystem

pkgs/development/web/playwright/webkit.nix

@@ -50,7 +50,12 @@
 }:
 let
   suffix' =
-    if lib.hasPrefix "linux" suffix then "ubuntu-22.04" + (lib.removePrefix "linux" suffix) else suffix;
+    if lib.hasPrefix "linux" suffix then
+      "ubuntu-22.04" + (lib.removePrefix "linux" suffix)
+    else if lib.hasPrefix "mac" suffix then
+      "mac-14" + (lib.removePrefix "mac" suffix)
+    else
+      suffix;
   libvpx' = libvpx.overrideAttrs (
     finalAttrs: previousAttrs: {
       version = "1.12.0";
@@ -62,74 +67,90 @@ let
       };
     }
   );
+  webkit-linux = stdenv.mkDerivation {
+    name = "playwright-webkit";
+    src = fetchzip {
+      url = "https://playwright.azureedge.net/builds/webkit/${revision}/webkit-${suffix'}.zip";
+      stripRoot = false;
+      hash =
+        {
+          x86_64-linux = "sha256-vz/c2Bzr1NWRZZL5hIRwnor2Wte61gS++8rRfmy9T+0=";
+          aarch64-linux = "sha256-dS4Hsy/lGZWgznviwkslSk5oBYdUIBxeQPfaEyLNXyc=";
+        }
+        .${system} or throwSystem;
+    };
 
-in
-stdenv.mkDerivation {
-  name = "playwright-webkit";
-  src = fetchzip {
+    nativeBuildInputs = [
+      autoPatchelfHook
+      patchelfUnstable
+      makeWrapper
+    ];
+    buildInputs = [
+      at-spi2-atk
+      cairo
+      flite
+      fontconfig.lib
+      freetype
+      glib
+      gst_all_1.gst-plugins-bad
+      gst_all_1.gst-plugins-base
+      gst_all_1.gstreamer
+      harfbuzz
+      harfbuzzFull
+      icu70
+      lcms
+      libdrm
+      libepoxy
+      libevent
+      libgcc.lib
+      libgcrypt
+      libgpg-error
+      libjpeg8
+      libopus
+      libpng
+      libsoup_3
+      libtasn1
+      libwebp
+      libwpe
+      libwpe-fdo
+      libvpx'
+      libxml2
+      libxslt
+      libgbm
+      sqlite
+      systemdLibs
+      wayland-scanner
+      woff2.lib
+      libxkbcommon
+      zlib
+    ];
+
+    patchelfFlags = [ "--no-clobber-old-sections" ];
+    buildPhase = ''
+      cp -R . $out
+
+      # remove unused gtk browser
+      rm -rf $out/minibrowser-gtk
+
+      wrapProgram $out/minibrowser-wpe/bin/MiniBrowser \
+        --prefix GIO_EXTRA_MODULES ":" "${glib-networking}/lib/gio/modules/"
+    '';
+  };
+  webkit-darwin = fetchzip {
     url = "https://playwright.azureedge.net/builds/webkit/${revision}/webkit-${suffix'}.zip";
     stripRoot = false;
     hash =
       {
-        x86_64-linux = "sha256-pHYGQYwu47jdOAD+/mLrP6Dd+2aDMHENddVwAu0uEfI=";
-        aarch64-linux = "sha256-0UeYWjeFnQ8yVa3juWg7Z7VF1GDbP4pJ9OUJRbv1OJw=";
+        x86_64-darwin = "sha256-lOAHJaDXtt80RhqFNaO1JhaJH5WAu6+rpoR+IsfzGeM=";
+        aarch64-darwin = "sha256-GrjTnMGTPBdRI3xE5t9HbXLrvgOjCdqbJGElTKhUoA4=";
       }
       .${system} or throwSystem;
   };
-
-  nativeBuildInputs = [
-    autoPatchelfHook
-    patchelfUnstable
-    makeWrapper
-  ];
-  buildInputs = [
-    at-spi2-atk
-    cairo
-    flite
-    fontconfig.lib
-    freetype
-    glib
-    gst_all_1.gst-plugins-bad
-    gst_all_1.gst-plugins-base
-    gst_all_1.gstreamer
-    harfbuzz
-    harfbuzzFull
-    icu70
-    lcms
-    libdrm
-    libepoxy
-    libevent
-    libgcc.lib
-    libgcrypt
-    libgpg-error
-    libjpeg8
-    libopus
-    libpng
-    libsoup_3
-    libtasn1
-    libwebp
-    libwpe
-    libwpe-fdo
-    libvpx'
-    libxml2
-    libxslt
-    libgbm
-    sqlite
-    systemdLibs
-    wayland-scanner
-    woff2.lib
-    libxkbcommon
-    zlib
-  ];
-
-  patchelfFlags = [ "--no-clobber-old-sections" ];
-  buildPhase = ''
-    cp -R . $out
-
-    # remove unused gtk browser
-    rm -rf $out/minibrowser-gtk
-
-    wrapProgram $out/minibrowser-wpe/bin/MiniBrowser \
-      --prefix GIO_EXTRA_MODULES ":" "${glib-networking}/lib/gio/modules/"
-  '';
+in
+{
+  x86_64-linux = webkit-linux;
+  aarch64-linux = webkit-linux;
+  x86_64-darwin = webkit-darwin;
+  aarch64-darwin = webkit-darwin;
 }
+.${system} or throwSystem

pkgs/os-specific/linux/acpi-call/default.nix

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
-  makeFlags = kernel.makeFlags ++ [
+  makeFlags = kernel.moduleMakeFlags ++ [
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];
 

pkgs/os-specific/linux/akvcam/default.nix

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   sourceRoot = "${src.name}/src";
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
-  makeFlags = kernel.makeFlags ++ [
+  makeFlags = kernel.moduleMakeFlags ++ [
     "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];
 

pkgs/os-specific/linux/amneziawg/default.nix

@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   makeFlags =
-    kernel.makeFlags
+    kernel.moduleMakeFlags
     ++ [ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]
     ++ lib.optional (lib.versionAtLeast kernel.version "5.6") "KERNEL_SOURCE_DIR=${srcOnly kernel}";
 

pkgs/os-specific/linux/apfs/default.nix

@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   hardeningDisable = [ "pic" ];
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
-  makeFlags = kernel.makeFlags ++ [
+  makeFlags = kernel.moduleMakeFlags ++ [
     "KERNELRELEASE=${kernel.modDirVersion}"
     "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     "INSTALL_MOD_PATH=$(out)"

pkgs/os-specific/linux/batman-adv/default.nix

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
-  makeFlags = kernel.makeFlags ++ [
+  makeFlags = kernel.moduleMakeFlags ++ [
     "KERNELPATH=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];
 

pkgs/os-specific/linux/bbswitch/default.nix

@@ -41,7 +41,7 @@ stdenv.mkDerivation {
       --replace "/lib/modules" "${kernel.dev}/lib/modules"
   '';
 
-  makeFlags = kernel.makeFlags;
+  makeFlags = kernel.moduleMakeFlags;
 
   installPhase = ''
     mkdir -p $out/lib/modules/${kernel.modDirVersion}/misc

pkgs/os-specific/linux/can-isotp/default.nix

@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     sha256 = "1laax93czalclg7cy9iq1r7hfh9jigh7igj06y9lski75ap2vhfq";
   };
 
-  makeFlags = kernel.makeFlags ++ [
+  makeFlags = kernel.moduleMakeFlags ++ [
     "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     "INSTALL_MOD_PATH=${placeholder "out"}"
   ];

pkgs/os-specific/linux/cryptodev/default.nix

@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = kernel.moduleBuildDependencies;
   hardeningDisable = [ "pic" ];
 
-  makeFlags = kernel.makeFlags ++ [
+  makeFlags = kernel.moduleMakeFlags ++ [
     "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     "INSTALL_MOD_PATH=$(out)"
     "prefix=$(out)"

pkgs/os-specific/linux/ddcci/default.nix

@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
       --replace depmod \#
   '';
 
-  makeFlags = kernel.makeFlags ++ [
+  makeFlags = kernel.moduleMakeFlags ++ [
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     "KVER=${kernel.modDirVersion}"
     "KERNEL_MODLIB=$(out)/lib/modules/${kernel.modDirVersion}"

pkgs/os-specific/linux/digimend/default.nix

@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     rm -r $out/lib/udev
   '';
 
-  makeFlags = kernel.makeFlags ++ [
+  makeFlags = kernel.moduleMakeFlags ++ [
     "KVERSION=${kernel.modDirVersion}"
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     "DESTDIR=${placeholder "out"}"

pkgs/os-specific/linux/dpdk-kmods/default.nix

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "pic" ];
 
-  makeFlags = kernel.makeFlags ++ [
+  makeFlags = kernel.moduleMakeFlags ++ [
     "INSTALL_MOD_PATH=${placeholder "out"}"
   ];
   KSRC = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";

pkgs/os-specific/linux/drbd/driver.nix

@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  makeFlags = kernel.makeFlags ++ [
+  makeFlags = kernel.moduleMakeFlags ++ [
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     "KVER=${kernel.version}"
     "INSTALL_MOD_PATH=${placeholder "out"}"

pkgs/os-specific/linux/ena/default.nix

@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   hardeningDisable = [ "pic" ];
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
-  makeFlags = kernel.makeFlags;
+  makeFlags = kernel.moduleMakeFlags;
 
   env.KERNEL_BUILD_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
 

pkgs/os-specific/linux/evdi/default.nix

@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
     python3WithLibs
   ];
 
-  makeFlags = kernel.makeFlags ++ [
+  makeFlags = kernel.moduleMakeFlags ++ [
     "KVER=${kernel.modDirVersion}"
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];

pkgs/os-specific/linux/fanout/default.nix

@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies;
 
-  makeFlags = kernel.makeFlags ++ [
+  makeFlags = kernel.moduleMakeFlags ++ [
     "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];
 

pkgs/os-specific/linux/framework-laptop-kmod/default.nix

@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
-  makeFlags = kernel.makeFlags ++ [
+  makeFlags = kernel.moduleMakeFlags ++ [
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];
 

pkgs/os-specific/linux/fwts/module.nix

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "pic" ];
 
-  makeFlags = kernel.makeFlags ++ [
+  makeFlags = kernel.moduleMakeFlags ++ [
     "INSTALL_MOD_PATH=${placeholder "out"}"
   ];
 

pkgs/os-specific/linux/gasket/default.nix

@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     cd src
   '';
 
-  makeFlags = kernel.makeFlags ++ [
+  makeFlags = kernel.moduleMakeFlags ++ [
     "-C"
     "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     "M=$(PWD)"

pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
-  makeFlags = kernel.makeFlags ++ [
+  makeFlags = kernel.moduleMakeFlags ++ [
     "KERNEL_SOURCE_DIR=${kernel.dev}/${kerneldir}/build"
     "INSTALL_MOD_PATH=$(out)"
   ];