Merge staging-next into staging

2026-07-19 07:01:12 +00:00 · 2026-07-13 18:16:40 +00:00
parent 96f8f609c4 8f148d93f6
commit 83a0bb7cea
82 changed files with 3301 additions and 1234 deletions
--- a/doc/release-notes/rl-2611.section.md
+++ b/doc/release-notes/rl-2611.section.md
@@ -47,6 +47,8 @@

 - `libgdata` has been removed, as it was archived upstream and relied on the insecure libsoup 2.4.

+- `mcphost` has been removed, as it was archived upstream and declared unmaintained.
+
 - `services.mysql` now sets `root@localhost` authentication to `auth_socket` when used with `mysql` or `percona-server`.
  Existing deployments will also be adjusted if possible. See the [security advisory GHSA-6qxx-6rg8-c4p8](https://github.com/NixOS/nixpkgs/security/advisories/GHSA-6qxx-6rg8-c4p8) for more information.

--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4645,6 +4645,13 @@
    githubId = 53847249;
    name = "Casey Avila";
  };
+  cassandracomar = {
+    name = "Cassandra Comar";
+    github = "cassandracomar";
+    githubId = 320772;
+    email = "cass@mountclare.net";
+    keys = [ { fingerprint = "104E E74E 24A0 372B EAF5  5533 B019 18F7 7E04 AC99"; } ];
+  };
  castorNova2 = {
    email = "solemnsquire@gmail.com";
    github = "castorNova2";
@@ -14123,6 +14130,14 @@
    name = "Kenichi Kamiya";
    keys = [ { fingerprint = "9121 5D87 20CA B405 C63F  24D2 EF6E 574D 040A E2A5"; } ];
  };
+  kacper-uminski = {
+    name = "Kacper Uminski";
+    email = "kacper+nixpkgs@lysator.liu.se";
+    github = "kacper-uminski";
+    githubId = 57466578;
+    matrix = "@kacper.uminski:matrix.org";
+    keys = [ { fingerprint = "3DF9 3DEB CAA9 81FA B3E2  A7F0 87DA 201D E02F 14B1"; } ];
+  };
  kaction = {
    name = "Dmitry Bogatov";
    email = "KAction@disroot.org";
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -358,6 +358,7 @@
  ./programs/wayland/mangowc.nix
  ./programs/wayland/miracle-wm.nix
  ./programs/wayland/niri.nix
+  ./programs/wayland/pinnacle.nix
  ./programs/wayland/river.nix
  ./programs/wayland/sway.nix
  ./programs/wayland/uwsm.nix
--- a/nixos/modules/programs/wayland/pinnacle.nix
+++ b/nixos/modules/programs/wayland/pinnacle.nix
@@ -0,0 +1,70 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+let
+  cfg = config.programs.pinnacle;
+  inherit (lib.options) mkEnableOption mkPackageOption;
+in
+{
+  options.programs.pinnacle = {
+    enable = mkEnableOption "pinnacle";
+    package = mkPackageOption pkgs "pinnacle" {
+      default = "pinnacle";
+      example = "pkgs.pinnacle";
+      extraDescription = "package containing the pinnacle server binary";
+    };
+    xdg-portals.enable = mkEnableOption "enable xdg-portals for pinnacle";
+    withUWSM = mkEnableOption ''
+      manage the pinnacle session with [UWSM](https://github.com/Vladimir-csp/uwsm) instead
+      of independent systemd services and targets.
+    '';
+  };
+
+  config = lib.mkIf cfg.enable (
+    lib.mkMerge [
+      {
+        environment.systemPackages = [
+          cfg.package
+          pkgs.protobuf
+          cfg.package.lua-client-api
+        ];
+        environment.pathsToLink = [
+          # For /run/current-system/sw/share/pinnacle protobuf files - for
+          # pinnacle to be able to launch with a non-default config out of the
+          # box.
+          "/share/pinnacle"
+        ];
+        xdg.portal = lib.mkIf cfg.xdg-portals.enable {
+          enable = true;
+          wlr.enable = true;
+          configPackages = [ cfg.package ];
+          extraPortals = [
+            pkgs.xdg-desktop-portal-wlr
+            pkgs.xdg-desktop-portal-gtk
+            pkgs.gnome-keyring
+          ];
+        };
+      }
+      (lib.mkIf (cfg.withUWSM) {
+        programs.uwsm.enable = true;
+        # Configure UWSM to launch Pinnacle from a display manager like SDDM
+        programs.uwsm.waylandCompositors = {
+          pinnacle = {
+            prettyName = "Pinnacle";
+            comment = "Pinnacle compositor managed by UWSM";
+            binPath = "/run/current-system/sw/bin/pinnacle";
+            extraArgs = [ "--session" ];
+          };
+        };
+      })
+      (lib.mkIf (!cfg.withUWSM) {
+        services.displayManager.sessionPackages = [ cfg.package ];
+      })
+    ]
+  );
+
+  meta.maintainers = with lib.maintainers; [ cassandracomar ];
+}
--- a/nixos/modules/system/boot/loader/limine/limine-install.py
+++ b/nixos/modules/system/boot/loader/limine/limine-install.py
@@ -347,7 +347,7 @@ def config_entry(levels: int, bootspec: BootSpec, label: str, time: str) -> str:
            os.path.basename(bootspec.toplevel) + "-secrets"
        )

-        if os.system(bootspec.initrdSecrets + " " + initrd_secrets_path_temp) != 0:
+        if subprocess.run([bootspec.initrdSecrets, initrd_secrets_path_temp]).returncode != 0:
            print(
                f'warning: failed to create initrd secrets for "{label}"',
                file=sys.stderr,
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -63,7 +63,7 @@ let
      - `config.node.pkgs.<name>` or `config.nodes.foo.nixpkgs.pkgs.<name>` to refer
        to the Nixpkgs used on the VM guest(s).
      - `hostPkgs.<name>` when invoking commands on the VM host (e.g. in Python
-        `os.system("foo")`)
+        `subprocess.run(["foo"])`)
    - Since the runTest argument is a module instead of a function, arguments
      must be passed as option definitions.
      You may declare explicit `options` for the test parameter(s), or use the
--- a/nixos/tests/boot.nix
+++ b/nixos/tests/boot.nix
@@ -203,11 +203,26 @@ in
    makeTest {
      name = "boot-uboot-extlinux";
      nodes = { };
-      testScript = ''
-        import os
+      testScript = /* py */ ''
+        import subprocess

        # Create a mutable linked image backed by the read-only SD image
-        if os.system("${pkgs.qemu}/bin/qemu-img create -f qcow2 -F raw -b ${sdImage} ${mutableImage}") != 0:
+        if (
+            subprocess.run(
+                [
+                    "${pkgs.qemu}/bin/qemu-img",
+                    "create",
+                    "-f",
+                    "qcow2",
+                    "-F",
+                    "raw",
+                    "-b",
+                    "${sdImage}",
+                    "${mutableImage}",
+                ]
+            ).returncode
+            != 0
+        ):
            raise RuntimeError("Could not create mutable linked image")

        machine = create_machine("${startCommand}")
--- a/nixos/tests/ec2-image.nix
+++ b/nixos/tests/ec2-image.nix
@@ -135,7 +135,17 @@ in
              public_key = os.path.join(key_dir, "id_ed25519.pub")

              # Generate key pair using host SSH tools
-              ret = os.system(f"${hostPkgs.openssh}/bin/ssh-keygen -t ed25519 -f {private_key} -N \"\"")
+              ret = subprocess.run(
+                  [
+                      "${hostPkgs.openssh}/bin/ssh-keygen",
+                      "-t",
+                      "ed25519",
+                      "-f",
+                      private_key,
+                      "-N",
+                      ""
+                  ]
+              ).returncode
              if ret != 0:
                  raise Exception("Failed to generate SSH key pair")

--- a/nixos/tests/ghostunnel-modular.nix
+++ b/nixos/tests/ghostunnel-modular.nix
@@ -54,13 +54,13 @@
  };

  testScript = ''
-    import os
+    import subprocess

    # prepare certificates

    def cmd(command):
      print(f"+{command}")
-      r = os.system(command)
+      r = subprocess.run(command, shell=True).returncode
      if r != 0:
        raise Exception(f"Command {command} failed with exit code {r}")

--- a/nixos/tests/ghostunnel.nix
+++ b/nixos/tests/ghostunnel.nix
@@ -48,13 +48,13 @@
  };

  testScript = ''
-    import os
+    import subprocess

    # prepare certificates

    def cmd(command):
      print(f"+{command}")
-      r = os.system(command)
+      r = subprocess.run(command, shell=True).returncode
      if r != 0:
        raise Exception(f"Command {command} failed with exit code {r}")

--- a/nixos/tests/haproxy.nix
+++ b/nixos/tests/haproxy.nix
@@ -69,12 +69,12 @@
      };
  };
  testScript = ''
-    import os
+    import subprocess

    # Helpers
    def cmd(command):
      print(f"+{command}")
-      r = os.system(command)
+      r = subprocess.run(command, shell=True).returncode
      if r != 0:
        raise Exception(f"Command {command} failed with exit code {r}")

--- a/pkgs/by-name/ac/ace-of-penguins/fix-wayland-segfault.patch
+++ b/pkgs/by-name/ac/ace-of-penguins/fix-wayland-segfault.patch
@@ -0,0 +1,16 @@
+diff --git a/lib/help.c b/lib/help.c
+--- a/lib/help.c
+++ b/lib/help.c
+@@ -177,8 +177,12 @@
+   for (i=0; i<17; i++)
+   {
+     if (!fonts[i])
+       fonts[i] = XLoadQueryFont(display, i & STYLE_TT ? "fixed" : "variable");
+    if (!fonts[i])
+      fonts[i] = XLoadQueryFont(display, "fixed");
+    if (!fonts[i])
+      return;
+     thin_space[i] = XTextWidth(fonts[i], " ", 1);
+   }
+   for (i=0; i<NTAGS; i++)
+     tags[i].taglen = strlen(tags[i].tag);
--- a/pkgs/by-name/ac/ace-of-penguins/package.nix
+++ b/pkgs/by-name/ac/ace-of-penguins/package.nix
@@ -27,6 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
    ./fix-gcc-14.patch
    # error: initialization of 'void (*)(int,  int,  int)' from incompatible pointer type 'void (*)(void)' [-Wincompatible-pointer-types]
    ./fix-gcc-15.patch
+    # fixes Wayland segfault from missing X11 fonts by providing a fallback
+    ./fix-wayland-segfault.patch
  ];

  nativeBuildInputs = [
--- a/pkgs/by-name/bl/bluetuith/package.nix
+++ b/pkgs/by-name/bl/bluetuith/package.nix
@@ -7,16 +7,16 @@

 buildGoModule (finalAttrs: {
  pname = "bluetuith";
-  version = "0.2.6";
+  version = "0.2.7";

  src = fetchFromGitHub {
    owner = "bluetuith-org";
    repo = "bluetuith";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-jxN4FLefv+edlpBnwDN/pBxZ7sHkv2w+R2tUeNCI6Tw=";
+    hash = "sha256-FoFmkc6/sPxssEkWHgwM+jtvwJzpDsTJ4T3dzYcxcVc=";
  };

-  vendorHash = "sha256-baSiOHiB02hfqDt95ldeKwz+tJgunXheTvREznxPUSc=";
+  vendorHash = "sha256-38yPy0dhZ99smFQK0tvQLHah+Sn6DsXvNrh8nQaR5qk=";

  subPackages = [ "." ];

--- a/pkgs/by-name/ca/cargo-release/package.nix
+++ b/pkgs/by-name/ca/cargo-release/package.nix
@@ -13,16 +13,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cargo-release";
-  version = "1.1.2";
+  version = "1.1.3";

  src = fetchFromGitHub {
    owner = "crate-ci";
    repo = "cargo-release";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-xil5k+AyJHpDLVvSbtPJOuADRXvdLrHLlC7GRSE4z4s=";
+    hash = "sha256-5fe+iIPZAKi8aQW2PfanO7U2d70Oc3KvL/RZTV9/ZU8=";
  };

-  cargoHash = "sha256-WLDRJQvzkL1FxD0eXsJmH5wh9QkReaQBBxe7ZFQMWUM=";
+  cargoHash = "sha256-abTQuKpVcjorr6RQ1t9sAzqvS39XT6lg4fALAqO68YI=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/by-name/ca/cargo-tarpaulin/package.nix
+++ b/pkgs/by-name/ca/cargo-tarpaulin/package.nix
@@ -12,16 +12,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cargo-tarpaulin";
-  version = "0.36.0";
+  version = "0.37.0";

  src = fetchFromGitHub {
    owner = "xd009642";
    repo = "tarpaulin";
    tag = finalAttrs.version;
-    hash = "sha256-qd0PmCCUmd9Y4kUei+hZoc+rIYYZMf0s2ml9IoHtXX8=";
+    hash = "sha256-8LD4huR6xcksxkxF3Axoh5tx3FQgzE8nYVSpeSdY7us=";
  };

-  cargoHash = "sha256-EJTzITwwLEMVWdLdSE+A9D3Deh501561rxrlsqzmRKs=";
+  cargoHash = "sha256-FH0skHQ0eR9qgoCqDqO+NZZLzBw8U/ijNUupTYexIGI=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/by-name/ce/cell/package.nix
+++ b/pkgs/by-name/ce/cell/package.nix
@@ -8,17 +8,17 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cell";
-  version = "0.5.0";
+  version = "0.5.1";
  __structuredAttrs = true;

  src = fetchFromGitHub {
    owner = "garritfra";
    repo = "cell";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-J13D46ttG7KlePyFZYxqjaMF7ZR5m3nTJ8/GLm4VH5o=";
+    hash = "sha256-43E2EW3SS35VyJpOE7KdDz7XcOsn3V9aVglIW1vPgIE=";
  };

-  cargoHash = "sha256-ZQXyt/hL6wamGrFvmrShoUCTSGAo8V5CuejAzO5oCuU=";
+  cargoHash = "sha256-4qWI1dKv84Ga6A2ImkI3rRypqm+UkDNzD94Gxl43wj0=";

  doInstallCheck = true;
  nativeInstallCheckInputs = [ versionCheckHook ];
--- a/pkgs/by-name/cl/claude-agent-acp/package.nix
+++ b/pkgs/by-name/cl/claude-agent-acp/package.nix
@@ -8,16 +8,16 @@

 buildNpmPackage (finalAttrs: {
  pname = "claude-agent-acp";
-  version = "0.52.0";
+  version = "0.58.1";

  src = fetchFromGitHub {
    owner = "agentclientprotocol";
    repo = "claude-agent-acp";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-w8lrc/4cW7QZNDMvq663eas7Dl4tnya4JCM9xkLF8S8=";
+    hash = "sha256-9bnUVYfE3iMOcHFg9PK25MoMla978/YbkZLzWgVkd84=";
  };

-  npmDepsHash = "sha256-czNQInLxK/DMFViJWa15PGOU61qnqm0wNwFqjTH3Z+k=";
+  npmDepsHash = "sha256-cqglQ/XW+E1U0CzhUBltKduwKdgvjH3hrPRb5MZJovM=";

  nativeBuildInputs = [ makeWrapper ];

--- a/pkgs/by-name/cl/cloud-hypervisor/package.nix
+++ b/pkgs/by-name/cl/cloud-hypervisor/package.nix
@@ -6,29 +6,34 @@
  pkg-config,
  dtc,
  openssl,
+  zstd,
  versionCheckHook,
 }:

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cloud-hypervisor";
-  version = "52.0";
+  version = "53.0";

  src = fetchFromGitHub {
    owner = "cloud-hypervisor";
    repo = "cloud-hypervisor";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-OGyvmedSaWPsyH6mdHhgXN7MvTnK1HzdfTKUhJRlq8I=";
+    hash = "sha256-fPTGf8bAITDA8QwllWbbGXA7tJ6p/SxRDfcBQVRvCTI=";
  };

-  cargoHash = "sha256-ZNj1H3Iq+IUSe0McHJjrwPOoR+YRB+rsSmZHMhXsHy0=";
+  cargoHash = "sha256-+RbW/9ap/69MyODUk/bHBlH6ZuqYYIyKaarYSMQ2G7w=";

  separateDebugInfo = true;

  nativeBuildInputs = [ pkg-config ];
-  buildInputs = lib.optional stdenv.hostPlatform.isAarch64 dtc;
-  checkInputs = [ openssl ];
+  buildInputs = [
+    openssl
+    zstd
+  ]
+  ++ lib.optional stdenv.hostPlatform.isAarch64 dtc;

  env.OPENSSL_NO_VENDOR = true;
+  env.ZSTD_SYS_USE_PKG_CONFIG = true;

  cargoTestFlags = [
    "--workspace"
@@ -40,10 +45,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
    "vmm" # /dev/kvm
    "--"
    # io_uring syscalls are blocked by the Lix sandbox
-    "--skip=io_uring"
-    "--skip=qcow_async::unit_tests::"
-    # fallocate(PUNCH_HOLE) reported size depends on the host filesystem
-    "--skip=test_query_device_size_sparse_file_punch_hole"
+    "--skip=formats"
+    "--skip=io_impl::async_io::uring_data_io"
  ];

  nativeInstallCheckInputs = [
--- a/pkgs/by-name/co/codechecker/package.nix
+++ b/pkgs/by-name/co/codechecker/package.nix
@@ -1,65 +1,30 @@
 {
  lib,
-  python3,
  fetchPypi,
-  fetchFromGitHub,
-  clang,
+  makeWrapper,
+  python3Packages,
+  libclang,
  clang-tools,
  cppcheck,
  gcc,
-  makeWrapper,
+  infer,
  withClang ? false,
  withClangTools ? false,
  withCppcheck ? false,
  withGcc ? false,
+  withInfer ? false,
 }:
-let
-  python = python3.override {
-    packageOverrides = self: super: rec {
-      # codechecker is incompatible with SQLAlchemy greater than 1.3
-      sqlalchemy = super.sqlalchemy_1_4.overridePythonAttrs (oldAttrs: rec {
-        version = "1.3.23";
-        pname = oldAttrs.pname;
-        src = fetchFromGitHub {
-          owner = "sqlalchemy";
-          repo = "sqlalchemy";
-          rev = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}";
-          hash = "sha256-hWA0/f7rQpEfYTg10i0rBK3qeJbw3p6HW7S59rLnD0Q=";
-        };
-        doCheck = false;
-        # That test does not exist in the 1.3 branch so we get an error for disabling it
-        disabledTestPaths = builtins.filter (
-          testPath: testPath != "test/ext/mypy"
-        ) oldAttrs.disabledTestPaths;
-      });
-      sqlalchemy_1_4 = sqlalchemy;
-
-      # The current alembic version is not compatible with SQLAlchemy 1.3 so we need to downgrade it
-      alembic = super.alembic.overridePythonAttrs (oldAttrs: rec {
-        pname = "alembic";
-        version = "1.5.5";
-        src = fetchPypi {
-          inherit pname version;
-          hash = "sha256-3wAowZJ1os/xN+OWF6Oc3NvRFzczuHtr+iV7fAhgITs=";
-        };
-        doCheck = false;
-        dependencies = oldAttrs.dependencies ++ [
-          super.python-dateutil
-          super.python-editor
-        ];
-      });
-    };
-  };
-  python3Packages = python.pkgs;
-in
 python3Packages.buildPythonApplication rec {
  pname = "codechecker";
-  version = "6.24.0";
+  version = "6.28.0";
  pyproject = true;

+  strictDeps = true;
+  __structuredAttrs = true;
+
  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-ftZACUf2lAHokcUXj45LRA7/3goOcIy521cGl6qhR98=";
+    hash = "sha256-wxV+/hzsk7RrzWTXNz5HyweYdFFI1upNS508QRPCefo=";
  };

  build-system = with python3Packages; [
@@ -67,40 +32,39 @@ python3Packages.buildPythonApplication rec {
  ];

  dependencies = with python3Packages; [
+    alembic
+    argcomplete
+    authlib
    distutils # required in python312 to call subcommands (see https://github.com/Ericsson/codechecker/issues/4350)
    lxml
-    sqlalchemy
-    alembic
+    multiprocess
    portalocker
    psutil
-    multiprocess
+    semver
+    sqlalchemy
    thrift
    gitpython
    pyyaml
+    requests
    types-pyyaml
    sarif-tools
+    types-psutil
  ];

-  pythonRelaxDeps = [
-    "thrift"
-    "portalocker"
-    "types-pyyaml"
-    "lxml"
-    "psutil"
-    "multiprocess"
-    "gitpython"
-    "sarif-tools"
-    "pyyaml"
+  pythonRelaxDeps = true;
+  nativeBuildInputs = with python3Packages; [
+    makeWrapper
+    pythonRelaxDepsHook
  ];

  postInstall = ''
    wrapProgram "$out/bin/CodeChecker" --prefix PATH : ${
      lib.makeBinPath (
-        [ ]
-        ++ lib.optional withClang clang
+        lib.optional withClang libclang
        ++ lib.optional withClangTools clang-tools
        ++ lib.optional withCppcheck cppcheck
        ++ lib.optional withGcc gcc
+        ++ lib.optional withInfer infer
      )
    }
  '';
@@ -116,6 +80,7 @@ python3Packages.buildPythonApplication rec {
    maintainers = with lib.maintainers; [
      zebreus
      felixsinger
+      kacper-uminski
    ];
    mainProgram = "CodeChecker";
    platforms = lib.platforms.darwin ++ lib.platforms.linux;
--- a/pkgs/by-name/cu/cursor-cli/package.nix
+++ b/pkgs/by-name/cu/cursor-cli/package.nix
@@ -10,26 +10,26 @@ let
  inherit (stdenv) hostPlatform;
  sources = {
    x86_64-linux = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.06.19-20-24-33-653a7fb/linux/x64/agent-cli-package.tar.gz";
-      hash = "sha256-3xHrn1JaG2Leok/CiWtZezERrYqVcpZggXSD/zuWyy4=";
+      url = "https://downloads.cursor.com/lab/2026.06.26-7079533/linux/x64/agent-cli-package.tar.gz";
+      hash = "sha256-fZNlWkdPQsK12SfmKmG+VrxWA4Df7sAFQJ5DSToq+Eg=";
    };
    aarch64-linux = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.06.19-20-24-33-653a7fb/linux/arm64/agent-cli-package.tar.gz";
-      hash = "sha256-6iiinIexiEKqXDXOHzKut1d0Mtg89A8zel0zeXna4Qc=";
+      url = "https://downloads.cursor.com/lab/2026.06.26-7079533/linux/arm64/agent-cli-package.tar.gz";
+      hash = "sha256-WcMurHV8Pm/2Y1HvNJGZYqjgt3OzHwn5oW5W27egueE=";
    };
    x86_64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.06.19-20-24-33-653a7fb/darwin/x64/agent-cli-package.tar.gz";
-      hash = "sha256-HgxyZ1TPLnyJJJuvi8VrQhm33/rzD9kCwxy4Mp0D9C0=";
+      url = "https://downloads.cursor.com/lab/2026.06.26-7079533/darwin/x64/agent-cli-package.tar.gz";
+      hash = "sha256-5J2SA5AoyOxT9Ng58MnyCFtNllQCYhbO5MQZaONwgsk=";
    };
    aarch64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.06.19-20-24-33-653a7fb/darwin/arm64/agent-cli-package.tar.gz";
-      hash = "sha256-Qa22+f5+x5+4sHesqp24d9GlKqPp6xBJG7BFxz6LUVU=";
+      url = "https://downloads.cursor.com/lab/2026.06.26-7079533/darwin/arm64/agent-cli-package.tar.gz";
+      hash = "sha256-UO8SRA6depwO9SNhvYl9uOy9Dp625vHVNiyfxtmq3c4=";
    };
  };
 in
 stdenv.mkDerivation {
  pname = "cursor-cli";
-  version = "2026.06.19-20-24-33-653a7fb";
+  version = "0-unstable-2026-06-26";

  src = sources.${hostPlatform.system};

--- a/pkgs/by-name/de/devin-cli/package.nix
+++ b/pkgs/by-name/de/devin-cli/package.nix
@@ -7,24 +7,24 @@
 }:

 let
-  version = "3000.1.23";
+  version = "3000.1.27";

  throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}";

  srcs = {
    x86_64-linux = fetchurl {
      url = "https://static.devin.ai/cli/${version}/devin-${version}-x86_64-unknown-linux.tar.gz";
-      hash = "sha256-m7DOI/PY0ldm4kRmAxeEQXTiH/R2oT3R8igmtXYA40g=";
+      hash = "sha256-y0kHpKT2wZvquR0EOIpFN2EMC84BpOOOKLXWwE0nygo=";
    };

    aarch64-linux = fetchurl {
      url = "https://static.devin.ai/cli/${version}/devin-${version}-aarch64-unknown-linux.tar.gz";
-      hash = "sha256-oOZjPyr3sgaH54KBWQhODFwxrEnuhkTW/rVPwXUAeUY=";
+      hash = "sha256-gyWbCpfLNphBjoSGVIhi7hgGToBKceavEKn//yDA1uw=";
    };

    aarch64-darwin = fetchurl {
      url = "https://static.devin.ai/cli/${version}/devin-${version}-aarch64-apple-darwin.tar.gz";
-      hash = "sha256-x+g7kILZuWG2JX4tc+GdIE7XqpHIzWt6+xPQU/gzyeA=";
+      hash = "sha256-OnpANdMh9ws9FHwfwWR63OSaC/P3MB+eAV33JxQNUaQ=";
    };
  };
 in
--- a/pkgs/by-name/dn/dnsproxy/package.nix
+++ b/pkgs/by-name/dn/dnsproxy/package.nix
@@ -6,16 +6,16 @@

 buildGoModule (finalAttrs: {
  pname = "dnsproxy";
-  version = "0.82.1";
+  version = "0.83.0";

  src = fetchFromGitHub {
    owner = "AdguardTeam";
    repo = "dnsproxy";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-d/PZrfH8jR4kcBX5Ze/06vDcDTlKWxHZ2gvi7eJF2j8=";
+    hash = "sha256-ceeNS1Z2xQgZrouRTh48in+Z71dBj/dtnOYTPY/0az8=";
  };

-  vendorHash = "sha256-QsNhCfqhqPv01xM/ojO3K4ktyTrUgdR79cQICtP2y1g=";
+  vendorHash = "sha256-6skcvkErUm/0u7yk8p70tYnT4d1XLySw6arMgPnOzq8=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/dr/dropbear/package.nix
+++ b/pkgs/by-name/dr/dropbear/package.nix
@@ -1,7 +1,7 @@
 {
  lib,
  stdenv,
-  fetchurl,
+  fetchFromGitHub,
  zlib,
  libxcrypt,
  enableSCP ? false,
@@ -15,18 +15,24 @@ let
    SFTPSERVER_PATH = sftpPath;
    DROPBEAR_PATH_SSH_PROGRAM = "${placeholder "out"}/bin/dbclient";
  };
-
 in
-
 stdenv.mkDerivation (finalAttrs: {
  pname = "dropbear";
-  version = "2026.91";
+  version = "2026.92";

-  src = fetchurl {
-    url = "https://matt.ucc.asn.au/dropbear/releases/dropbear-${finalAttrs.version}.tar.bz2";
-    sha256 = "sha256-3vqSRHWr9rwedKvAAXPka/3IBL1Hyq+hT1pO8Mx22jQ=";
+  src = fetchFromGitHub {
+    owner = "mkj";
+    repo = "dropbear";
+    tag = "DROPBEAR_${finalAttrs.version}";
+    hash = "sha256-xXjKWj6tMW/Qlq4DttxKAqOwsER2QEeb1Qw3Gllu2QQ=";
  };

+  patches = [
+    # Allow sessions to inherit the PATH from the parent dropbear.
+    # Otherwise they only get the usual /bin:/usr/bin kind of PATH
+    ./pass-path.patch
+  ];
+
  env.CFLAGS = lib.pipe (lib.attrNames dflags) [
    (map (name: "-D${name}=\\\"${dflags.${name}}\\\""))
    (lib.concatStringsSep " ")
@@ -55,27 +61,38 @@ stdenv.mkDerivation (finalAttrs: {
    )
  '';

-  postInstall = lib.optionalString enableSCP ''
-    ln -rs $out/bin/scp $out/bin/dbscp
-  '';
-
-  patches = [
-    # Allow sessions to inherit the PATH from the parent dropbear.
-    # Otherwise they only get the usual /bin:/usr/bin kind of PATH
-    ./pass-path.patch
-  ];
-
  buildInputs = [
    zlib
    libxcrypt
  ];

+  postInstall = lib.optionalString enableSCP ''
+    ln -rs $out/bin/scp $out/bin/dbscp
+  '';
+
  meta = {
-    description = "Small footprint implementation of the SSH 2 protocol";
+    description = "Small memory footprint ssh server/client suitable for memory-constrained environments";
+    longDescription = ''
+      Dropbear is particularly useful for "embedded"-type Linux (or other Unix) systems, such as wireless routers.
+
+      ## Features
+
+      * Implements X11 forwarding, and authentication-agent forwarding for OpenSSH clients
+      * Can run from inetd or standalone
+      * Compatible with OpenSSH ~/.ssh/authorized_keys public key authentication
+      * Multi-hop mode uses SSH TCP forwarding to tunnel through multiple SSH hosts in a single command:
+
+      ```shell
+      dbclient user1@hop1,user2@hop2,destination
+      ```
+    '';
    homepage = "https://matt.ucc.asn.au/dropbear/dropbear.html";
-    changelog = "https://github.com/mkj/dropbear/raw/DROPBEAR_${finalAttrs.version}/CHANGES";
+    changelog = "https://github.com/mkj/dropbear/releases/tag/DROPBEAR_${finalAttrs.version}";
+    downloadPage = "https://matt.ucc.asn.au/dropbear/releases";
    license = lib.licenses.mit;
-    maintainers = [ ];
    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      debtquity
+    ];
  };
 })
--- a/pkgs/by-name/fe/fex/package.nix
+++ b/pkgs/by-name/fe/fex/package.nix
@@ -185,7 +185,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
    llvmPackages.bintools
    (python3.withPackages (
      pythonPackages: with pythonPackages; [
-        setuptools
+        packaging
        libclang
      ]
    ))
--- a/pkgs/by-name/fr/freedv/package.nix
+++ b/pkgs/by-name/fr/freedv/package.nix
@@ -8,7 +8,6 @@
  libtool,
  cmake,
  pkg-config,
-  python3,
  macdylibbundler,
  makeWrapper,
  darwin,
@@ -24,6 +23,7 @@
  dbus,
  apple-sdk_15,
  nix-update-script,
+  wget,
 }:

 let
@@ -49,52 +49,54 @@ let
    hash = "sha256-P84gjnuiQQBVBExJBY3sUbwo00lXY6HB+AMpx/oovRg=";
  };
  radaeSrc = fetchFromGitHub {
-    owner = "drowe67";
-    repo = "radae";
-    rev = "5d640a028ab2b8e4ff23ed7136caee396cdcb844";
-    # upstream repository archive fetching is broken
-    forceFetchGit = true;
-    hash = "sha256-+Sd+FWycEJabT3RN/zyKXS2Xzr060/ekYdzg6s1gQcM=";
+    owner = "peterbmarks";
+    repo = "radae_nopy";
+    rev = "d72ec84e795493249db44d5939eb9b05438f956a";
+    hash = "sha256-ziEhYZarzQtQ1akAxF54kcX6o38gJeUJ08jipSWXnxQ=";
  };
-  radeInteg = fetchFromGitHub {
-    owner = "drowe67";
-    repo = "radae";
-    rev = "7bd3ae2401fcba58e314755576a2940085835312";
-    hash = "sha256-WVYKvttiNh6uEzw0b27winyDfzzGkEEhYq7DIwfZW74=";
+  rnnoiseSrc = fetchFromGitHub {
+    owner = "xiph";
+    repo = "rnnoise";
+    rev = "70f1d256acd4b34a572f999a05c87bf00b67730d";
+    nativeBuildInputs = [ wget ];
+    postFetch = ''
+      cd $out
+      export NIX_SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
+      export SSL_CERT_FILE=$NIX_SSL_CERT_FILE
+      ./download_model.sh
+      substituteInPlace autogen.sh \
+        --replace-fail "./download_model.sh" ""
+    '';
+    hash = "sha256-t/AwOCuHb5Oahy1fDI3Sc9M08Xz3dSAavhYatRC1OIk=";
  };
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "freedv";
-  version = "2.2.1";
+  version = "2.3.1";

  src = fetchFromGitHub {
    owner = "drowe67";
    repo = "freedv-gui";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-7SOGz2+MzAkXd5JDKasSJcKVXcnuYk+C0S9N/NPRfOM=";
+    hash = "sha256-TjE/iYg+VFvbZH7/1q1V4t0SgcS44pLVet4Pgt6L5HA=";
  };

-  patches = [
-    ./no-framework.patch
-  ];
-
  postPatch = ''
    cp -R ${ebur128Src} ebur128
    cp -R ${radaeSrc} radae
-    cp -R ${radeInteg} rade_integ
-    chmod -R u+w ebur128 radae rade_integ
+    cp -R ${rnnoiseSrc} rnnoise
+    chmod -R u+w ebur128 radae rnnoise
    substituteInPlace cmake/BuildEbur128.cmake \
      --replace-fail "GIT_REPOSITORY https://github.com/jiixyj/libebur128.git" "URL $(realpath ebur128)" \
      --replace-fail 'GIT_TAG "v''${EBUR128_VERSION}"' "" \
      --replace-fail "git apply" "patch -p1 <"
    substituteInPlace cmake/BuildRADE.cmake \
      --replace-fail "https://github.com/xiph/opus/archive/940d4e5af64351ca8ba8390df3f555484c567fbb.zip" "${opusSrc}" \
-      --replace-fail "GIT_REPOSITORY https://github.com/drowe67/radae.git" "URL $(realpath radae)" \
+      --replace-fail "GIT_REPOSITORY https://github.com/peterbmarks/radae_nopy/" "URL $(realpath radae)" \
+      --replace-fail "GIT_TAG main" ""
+    substituteInPlace cmake/BuildRNNoise.cmake \
+      --replace-fail "GIT_REPOSITORY \''${RNNOISE_REPO}" "URL $(realpath rnnoise)" \
      --replace-fail "GIT_TAG main" ""
-    substituteInPlace cmake/BuildRADEForIntegrations.cmake \
-      --replace-fail "https://github.com/xiph/opus/archive/940d4e5af64351ca8ba8390df3f555484c567fbb.zip" "${opusSrc}" \
-      --replace-fail "GIT_REPOSITORY https://github.com/drowe67/radae.git" "URL $(realpath rade_integ)" \
-      --replace-fail "GIT_TAG ms-disable-python-gc" ""
    patchShebangs test/test_*.sh
    substituteInPlace cmake/CheckGit.cmake \
      --replace-fail "git describe --abbrev=4 --always HEAD" "echo v${finalAttrs.version}"
@@ -113,7 +115,6 @@ stdenv.mkDerivation (finalAttrs: {
    libtool
    cmake
    pkg-config
-    python3
  ]
  ++ lib.optionals stdenv.hostPlatform.isDarwin [
    (macdylibbundler.overrideAttrs {
@@ -136,7 +137,6 @@ stdenv.mkDerivation (finalAttrs: {
    speexdsp
    hamlib_4
    wxwidgets_3_2
-    python3.pkgs.numpy
  ]
  ++ (
    if stdenv.hostPlatform.isLinux then
--- a/pkgs/by-name/gd/gdal/package.nix
+++ b/pkgs/by-name/gd/gdal/package.nix
@@ -309,6 +309,11 @@ stdenv.mkDerivation (finalAttrs: {
  ]
  ++ lib.optionals (!usePoppler) [
    "test_pdf_jpx_compression"
+  ]
+  ++ lib.optionals (!useNetCDF) [
+    # writes the Zarr tile-presence cache (.gmac) via the netCDF driver, which
+    # is absent in the minimal build
+    "test_zarr_read_simple_sharding"
  ];
  postCheck = ''
    popd # autotest
--- a/pkgs/by-name/go/goldendict-ng/package.nix
+++ b/pkgs/by-name/go/goldendict-ng/package.nix
@@ -23,13 +23,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "goldendict-ng";
-  version = "26.6.1";
+  version = "26.6.2";

  src = fetchFromGitHub {
    owner = "xiaoyifang";
    repo = "goldendict-ng";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-iWKgOgTTkvrnphPhoWxY8ij+ClVVy3G84V+e+XcsoME=";
+    hash = "sha256-2K0I6uYJtqRw0JbvNbbmIjzxzn6l7tzDU1d9Lo49cYs=";
  };

  strictDeps = true;
--- a/pkgs/by-name/he/heptabase/package.nix
+++ b/pkgs/by-name/he/heptabase/package.nix
@@ -1,39 +0,0 @@
-{
-  lib,
-  appimageTools,
-  fetchurl,
-}:
-let
-  pname = "heptabase";
-  version = "1.87.2";
-  src = fetchurl {
-    url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage";
-    hash = "sha256-6O6ksa0mCUoAfXW8jzh1n7zAfLZTA45va9o6J2ghKgU=";
-  };
-
-  appimageContents = appimageTools.extractType2 { inherit pname version src; };
-in
-appimageTools.wrapType2 {
-  inherit pname version src;
-
-  extraInstallCommands = ''
-    install -Dm444 ${appimageContents}/project-meta.desktop -T $out/share/applications/heptabase.desktop
-    install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/0x0/apps/project-meta.png $out/share/icons/hicolor/512x512/apps/${pname}.png
-
-    substituteInPlace $out/share/applications/heptabase.desktop \
-      --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=heptabase %U' \
-      --replace-fail 'Icon=project-meta' 'Icon=${pname}'
-
-  '';
-
-  meta = {
-    changelog = "https://github.com/heptameta/project-meta/releases/tag/v${version}";
-    description = "Visual note-taking tool for learning complex topics";
-    homepage = "https://heptabase.com/";
-    license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ luftmensch-luftmensch ];
-    mainProgram = "heptabase";
-    platforms = [ "x86_64-linux" ];
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-  };
-}
--- a/pkgs/by-name/hy/hyprlax/package.nix
+++ b/pkgs/by-name/hy/hyprlax/package.nix
@@ -11,13 +11,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "hyprlax";
-  version = "2.2.4";
+  version = "2.2.5";

  src = fetchFromGitHub {
    owner = "sandwichfarm";
    repo = "hyprlax";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-dWWpnJtjis4S+PBKpUrWxkrRETUG42fuyuUaWKFwOao=";
+    hash = "sha256-pI+JEuUOuUh4ZBT4YhIxc6FU3rMwau6qacypDrQG+dg=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ia/iamb/package.nix
+++ b/pkgs/by-name/ia/iamb/package.nix
@@ -6,6 +6,8 @@
  writableTmpDirAsHomeHook,
  versionCheckHook,
  nix-update-script,
+  llvmPackages,
+  stdenv,
 }:

 rustPlatform.buildRustPackage (finalAttrs: {
@@ -27,8 +29,17 @@ rustPlatform.buildRustPackage (finalAttrs: {

  nativeBuildInputs = [
    installShellFiles
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # TODO: Remove once #536365 reaches this branch
+    llvmPackages.lld
  ];

+  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    # TODO: Remove once #536365 reaches this branch
+    NIX_CFLAGS_LINK = "-fuse-ld=lld";
+  };
+
  postInstall = ''
    installManPage $src/docs/iamb.{1,5}
    install -D $src/docs/iamb.svg -t $out/share/icons/hicolor/scalable/apps
--- a/pkgs/by-name/ig/igir/package.nix
+++ b/pkgs/by-name/ig/igir/package.nix
@@ -18,16 +18,16 @@

 buildNpmPackage rec {
  pname = "igir";
-  version = "5.2.1";
+  version = "5.3.0";

  src = fetchFromGitHub {
    owner = "emmercm";
    repo = "igir";
    rev = "v${version}";
-    hash = "sha256-LWdJPweZ0BFIjdXHUZvJuk8oZb8JtuGo3LIJtdwdG70=";
+    hash = "sha256-qs6CVmBLn23BOjr+d4WZeROFxqKy9vWx8iUVKBicKdk=";
  };

-  npmDepsHash = "sha256-bRZlaRnPY8k2Xahb994GUYlROmR9ZQj2neEPVKDwv4g=";
+  npmDepsHash = "sha256-ruFssMRX7fzEI7lwEb/a+0lYso9I3CufLK9uVZiuhoU=";

  # I have no clue why I have to do this
  postPatch = ''
--- a/pkgs/by-name/in/infer/package.nix
+++ b/pkgs/by-name/in/infer/package.nix
@@ -0,0 +1,249 @@
+{
+  fetchFromGitHub,
+  lib,
+  stdenv,
+
+  # nativeBuildInputs
+  autoconf,
+  automake,
+  cmake,
+  dune_3,
+  git,
+  makeWrapper,
+  ninja,
+  opam,
+  pkg-config,
+  perl,
+  which,
+
+  # buildInputs
+  gmp,
+  mpfr,
+  ocaml-ng,
+  sqlite,
+  zlib,
+
+  # Erlang
+  beamPackages,
+
+  # Java
+  jdk,
+
+  # LLVM
+  python3,
+
+  # Options
+  withErlang ? true,
+  withJava ? true,
+  withLLVM ? true,
+  withRust ? false,
+}:
+let
+  pname = "infer";
+  version = "1.3.0";
+  src = fetchFromGitHub {
+    owner = "facebook";
+    repo = pname;
+    tag = "v${version}";
+    hash = "sha256-Kq7sJVBqe4ei1HbZz8R+P4V6yxisxEmPVHjyVlpL1aw=";
+  };
+
+  # Pre-fetched LLVM source that facebook-clang-plugins would normally download
+  # They specify the version in `facebook-clang-plugins/clang/src/prepare_clang_src.sh`
+  # Please check that file and update the version as appropriate when updating
+  llvmSrc = fetchFromGitHub {
+    owner = "llvm";
+    repo = "llvm-project";
+    tag = "llvmorg-21.1.6";
+    hash = "sha256-mqZLJYDEs6FXAjbSOruR2ATZZxemNMagNG9SMjSWBFE=";
+  };
+
+  # We need to use 5.3 because stdcompat (a transitive ocaml dependency) is
+  # broken on 5.4
+  ocamlPackages = ocaml-ng.ocamlPackages_5_3.overrideScope (
+    self: super: {
+      # Newer ppxlib removed a function needed by 0.36
+      ppxlib = super.ppxlib.override { version = "0.34.0"; };
+      # Infer bundles charon 0.1.177; nixpkgs unstable has a newer incompatible
+      # version
+      charon = super.buildDunePackage {
+        pname = "charon";
+        version = "0.1";
+        src = "${src}/dependencies/charon";
+        propagatedBuildInputs = with self; [
+          easy_logging
+          name_matcher_parser
+          ppx_deriving
+          unionFind
+          visitors
+          yojson
+        ];
+      };
+    }
+  );
+
+  erlangDeps = with beamPackages; [
+    erlang
+    rebar3
+  ];
+  javaDeps = [ jdk ];
+in
+stdenv.mkDerivation {
+  inherit pname src version;
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+    cmake
+    dune_3
+    git
+    makeWrapper
+    ninja
+    opam
+    pkg-config
+    perl
+    which
+  ]
+  ++ (with ocamlPackages; [
+    atd
+    atdgen
+    ocaml
+    findlib
+    menhir
+    ocamlbuild
+  ])
+  ++ lib.optionals withErlang erlangDeps
+  ++ lib.optionals withJava javaDeps
+  ++ lib.optional withLLVM python3;
+
+  buildInputs = [
+    gmp
+    mpfr
+    sqlite
+    zlib
+  ]
+  ++ (with ocamlPackages; [
+    ansiterminal
+    atd
+    atdgen
+    base64
+    bheap
+    charon
+    cmdliner
+    containers
+    containers-data
+    core
+    ctypes
+    fmt
+    fpath
+    iter
+    javalib
+    memtrace
+    menhirLib
+    mtime
+    ocamlgraph
+    ounit
+    ounit2
+    parmap
+    ppx_blob
+    ppx_compare
+    ppx_enumerate
+    ppx_expect
+    ppx_fields_conv
+    ppx_show
+    ppx_yojson_conv
+    ppxlib
+    pyml
+    sawja
+    saturn
+    sedlex
+    spawn
+    ocaml_sqlite3
+    tdigest
+    xmlm
+    zarith
+  ])
+  ++ lib.optionals withErlang erlangDeps
+  ++ lib.optionals withJava javaDeps;
+
+  preConfigure = ''
+    patchShebangs .
+
+    ${lib.optionalString withLLVM
+      # sh
+      ''
+        # Link in the prefetched llvm source
+        mkdir -p facebook-clang-plugins/clang/src/download
+        ln -s ${llvmSrc} facebook-clang-plugins/clang/src/download/llvm-project
+        # Skip the download step in prepare_clang_src.sh
+        substituteInPlace facebook-clang-plugins/clang/src/prepare_clang_src.sh \
+          --replace-fail 'curl -L' 'echo "SKIPPED: curl"  #' \
+          --replace-fail 'tar xf' 'echo "SKIPPED: tar"  #'
+
+        # Runtimes and bindings fail to build, as it tries to build them using its
+        # newly built clang, but infer seems to work with them disabled.
+        # Tools are needed because the build requires llvm-config.
+        substituteInPlace facebook-clang-plugins/clang/setup.sh \
+          --replace-fail '-DLLVM_ENABLE_RUNTIMES="compiler-rt;libcxx;libcxxabi;libunwind"' '-DLLVM_ENABLE_RUNTIMES=""'\
+          --replace-fail '-DLLVM_BUILD_DOCS=Off' '-DLLVM_BUILD_DOCS=Off -DLLVM_ENABLE_BINDINGS=Off' \
+          --replace-fail '-DLLVM_BUILD_TOOLS=Off' '-DLLVM_BUILD_TOOLS=On'
+      ''
+    }
+
+    # Remove deprecated -j-std atdgen flag, which is removed in current atdgen
+    find . -name "dune" -exec sed -i 's/-j-std//g' {} + 2>/dev/null || true
+
+    # Use nix-provided context.
+    substituteInPlace infer/dune-workspace.in \
+      --replace-fail '(context (opam (switch @OPAMSWITCH@) (name default) (merlin)))' '(context default)'
+
+    ./autogen.sh
+  '';
+
+  dontUseCmakeConfigure = true;
+
+  configureFlags = [
+    "--prefix=${placeholder "out"}"
+  ]
+  ++ [
+    "--disable-hack-analyzers" # No support on nixpkgs as of writing
+    "--disable-python-analyzers" # Needs python 3.10, which is not in nixpkgs
+    "--disable-swift-analyzers" # Does not want to build with the current package
+  ]
+  ++ lib.optional (!withErlang) "--disable-erlang-analyzers"
+  ++ lib.optional (!withJava) "--disable-java-analyzers"
+  ++ lib.optional (!withLLVM) "--disable-c-analyzers"
+  ++ lib.optional withRust "--enable-rust-analyzers";
+
+  buildFlags = [
+    # This cuts the build time in half
+    "CFLAGS=-O2"
+    "CXXFLAGS=-O2"
+    # Prevent ocaml warnings 11 and 55 from crashing the build
+    "OCAMLPARAM=_,w=-11-55"
+  ];
+
+  dontUseNinjaBuild = true;
+  dontUseNinjaInstall = true;
+
+  postInstall =
+    let
+      runtimeDeps = lib.optionals withErlang erlangDeps ++ lib.optionals withJava javaDeps;
+    in
+    lib.optionalString (runtimeDeps != [ ]) ''
+      wrapProgram "$out/bin/infer" \
+        --prefix PATH : "${lib.makeBinPath runtimeDeps}"
+    '';
+
+  meta = {
+    description = "Facebook's static analysis tool for Java, C++, Objective-C, and C.";
+    homepage = "https://fbinfer.com/";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.kacper-uminski ];
+    platforms = lib.platforms.darwin ++ lib.platforms.linux;
+    mainProgram = "infer";
+  };
+}
--- a/pkgs/by-name/in/insomnia/package.nix
+++ b/pkgs/by-name/in/insomnia/package.nix
@@ -7,22 +7,22 @@
 }:
 let
  pname = "insomnia";
-  version = "12.2.0";
+  version = "13.0.0";

  src =
    fetchurl
      {
        aarch64-darwin = {
          url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.dmg";
-          hash = "sha256-ISQVIhR5TWY/Xk6sXeL89/srxppqBS7wdoRINwuoQqg=";
+          hash = "sha256-sPl7KXC8Z13LFZvxuKg02iDbtrCxn//Yrr8AOOf3VD4=";
        };
        x86_64-darwin = {
          url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.dmg";
-          hash = "sha256-ISQVIhR5TWY/Xk6sXeL89/srxppqBS7wdoRINwuoQqg=";
+          hash = "sha256-sPl7KXC8Z13LFZvxuKg02iDbtrCxn//Yrr8AOOf3VD4=";
        };
        x86_64-linux = {
          url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.AppImage";
-          hash = "sha256-/0fJmbXhjrcVVSFvxd847mSKrzrZRK3Sqi6rjyaBOUw=";
+          hash = "sha256-PlcKBQnkmgU/SsLRKX7ohrGHm7B4hK9FMkplwlbFolI=";
        };
      }
      .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
--- a/pkgs/by-name/li/liblouis/package.nix
+++ b/pkgs/by-name/li/liblouis/package.nix
@@ -14,7 +14,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "liblouis";
-  version = "3.33.0";
+  version = "3.38.0";

  outputs = [
    "out"
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "liblouis";
    repo = "liblouis";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-+p/2eLbQ5aYtxQIkoHaVE1xDqstveedf+56aRNX9C7M=";
+    hash = "sha256-OmYMldo2id2HKAM0Hxi6r86khSUnzu22CkJhGBhaaL8=";
  };

  strictDeps = true;
@@ -63,7 +63,8 @@ stdenv.mkDerivation (finalAttrs: {

  postPatch = ''
    patchShebangs tests
-    substituteInPlace python/louis/__init__.py.in --replace "###LIBLOUIS_SONAME###" "$out/lib/liblouis.so"
+    substituteInPlace python/louis/__init__.py.in \
+      --replace-fail "###LIBLOUIS_SONAME###" "$out/lib/liblouis.so"
  '';

  postInstall = ''
@@ -71,6 +72,12 @@ stdenv.mkDerivation (finalAttrs: {
    python -m build --no-isolation --outdir dist/ --wheel
    python -m installer --prefix $out dist/*.whl
    popd
+
+    make install-html MAKEINFOFLAGS="--no-headers --no-split"
+    pushd doc
+    make liblouis.txt
+    popd
+    install -D -t "$doc/share/doc/liblouis" doc/liblouis.txt
  '';

  doCheck = true;
--- a/pkgs/by-name/li/libqalculate/package.nix
+++ b/pkgs/by-name/li/libqalculate/package.nix
@@ -26,13 +26,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "libqalculate";
-  version = "5.11.0";
+  version = "5.12.0";

  src = fetchFromGitHub {
    owner = "qalculate";
    repo = "libqalculate";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-lwA2faLYUb02FL9lOX+vuv/8pfKbkHWRlS1VnrV+sk4=";
+    hash = "sha256-f9FzFcu2LtBM6B6apYo7uobeR5uZVb02FxX7Kng/rRI=";
  };

  outputs = [
--- a/pkgs/by-name/lm/lmstudio/darwin.nix
+++ b/pkgs/by-name/lm/lmstudio/darwin.nix
@@ -1,7 +1,6 @@
 {
  stdenv,
  fetchurl,
-  undmg,
  darwin,
  meta,
  pname,
@@ -9,6 +8,7 @@
  url,
  hash,
  passthru,
+  _7zz,
 }:
 stdenv.mkDerivation {
  inherit meta pname version;
@@ -18,8 +18,8 @@ stdenv.mkDerivation {
  };

  nativeBuildInputs = [
-    undmg
    darwin.sigtool
+    _7zz
  ];

  sourceRoot = ".";
@@ -50,22 +50,10 @@ stdenv.mkDerivation {
  dontFixup = true;

  # undmg doesn't support APFS and 7zz does break the xattr. Took that approach from https://github.com/NixOS/nixpkgs/blob/a3c6ed7ad2649c1a55ffd94f7747e3176053b833/pkgs/by-name/in/insomnia/package.nix#L52
-  unpackCmd = ''
-    echo "Creating temp directory"
-    mnt=$(TMPDIR=/tmp mktemp -d -t nix-XXXXXXXXXX)
-    function finish {
-      echo "Ejecting temp directory"
-      /usr/bin/hdiutil detach $mnt -force
-      rm -rf $mnt
-    }
-    # Detach volume when receiving SIG "0"
-    trap finish EXIT
-    # Mount DMG file
-    echo "Mounting DMG file into \"$mnt\""
-    /usr/bin/hdiutil attach -nobrowse -mountpoint $mnt $curSrc
-    # Copy content to local dir for later use
-    echo 'Copying extracted content into "sourceRoot"'
-    cp -a $mnt/LM\ Studio.app $PWD/
+  # NOTE (djmaxus): even with hdiutil, a check `xattr -lr LM\ Studio.app` returns nothing,
+  # meaning that xattrs are lost anyway? So, I brought back simple 7zip unpacking
+  unpackPhase = ''
+    7zz x -snld $src
  '';

  inherit passthru;
--- a/pkgs/by-name/mc/mcphost/package.nix
+++ b/pkgs/by-name/mc/mcphost/package.nix
@@ -1,29 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-}:
-
-buildGoModule (finalAttrs: {
-  pname = "mcphost";
-  version = "0.34.0";
-
-  src = fetchFromGitHub {
-    owner = "mark3labs";
-    repo = "mcphost";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-xqz6K0e/LSX77qpkmwmqgStPAfkkJdqKKDZOeYWnrRo=";
-  };
-
-  vendorHash = "sha256-mzrCIDMr1INzwqktZIc9m0SgynQC0FpyVlSlAba//sY=";
-
-  doCheck = false;
-
-  meta = {
-    description = "CLI host application that enables Large Language Models (LLMs) to interact with external tools through the Model Context Protocol (MCP)";
-    homepage = "https://github.com/mark3labs/mcphost";
-    license = lib.licenses.mit;
-    maintainers = [ ];
-    mainProgram = "mcphost";
-  };
-})
--- a/pkgs/by-name/mi/microsoft-edge/update.py
+++ b/pkgs/by-name/mi/microsoft-edge/update.py
@@ -1,7 +1,7 @@
 #! /usr/bin/env nix-shell
 #! nix-shell -i python3 -p python3Packages.packaging python3Packages.python-debian common-updater-scripts

-import os
+import subprocess
 from collections import OrderedDict
 from os.path import abspath, dirname
 from urllib import request
@@ -39,8 +39,8 @@ def write_expression():
    version = Version.re_valid_version.match(latest["stable"]["Version"]).group(
        "upstream_version"
    )
-    os.system(f'update-source-version microsoft-edge "{version}"')
-    os.system(f'update-source-version msedgedriver "{version}"')
+    subprocess.run(["update-source-version", "microsoft-edge", version])
+    subprocess.run(["update-source-version", "msedgedriver", version])


 write_expression()
--- a/pkgs/by-name/ni/ni/package.nix
+++ b/pkgs/by-name/ni/ni/package.nix
@@ -15,20 +15,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "ni";
-  version = "30.1.0";
+  version = "30.2.0";

  src = fetchFromGitHub {
    owner = "antfu-collective";
    repo = "ni";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-mBKSnnmvlZOwU+6MQrg8S8iCea2PGAsHa+A4lseLYyw=";
+    hash = "sha256-H+gmiy+sHdiK5rRpOvkUe54kc/66J9eI9kIMfFcjTrg=";
  };

  pnpmDeps = fetchPnpmDeps {
    inherit (finalAttrs) pname version src;
    inherit pnpm;
    fetcherVersion = 3;
-    hash = "sha256-I/jf6nlsKQFrYLO15f+CWdPPdEpVDDMBQodLsbG4sqw=";
+    hash = "sha256-OxGdTKzGliGshBWlx+5rxVSN1QWTsQKHzJXynnlCUg0=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/op/opentxl/package.nix
+++ b/pkgs/by-name/op/opentxl/package.nix
@@ -4,6 +4,7 @@
  makeWrapper,
  opentxl-unwrapped,
  targetPackages,
+  withCompiler ? true,
 }:
 let
  inherit (targetPackages.stdenv.cc) targetPrefix;
@@ -29,19 +30,21 @@ stdenv.mkDerivation (finalAttrs: {
    mkdir -p $out/bin

    # Wrap compiler
-    makeWrapper ${opentxl-unwrapped}/bin/txlc \
-      $out/bin/${targetPrefix}txlc \
-      --set TXLLIB ${opentxl-unwrapped}/lib \
-      --set BUILD_TXLLIB ${opentxl-unwrapped}/lib \
-      --set TARGET_TXLLIB ${targetOpentxl}/lib \
-      --set CC ${targetPackages.stdenv.cc}/bin/${targetPrefix}cc \
-      --set OS ${opentxl-unwrapped.osOption stdenv.targetPlatform}
-    ${
-      # For convenience, if there is a target prefix, create a symlink named txlc
-      lib.optionalString (targetPrefix != "") ''
-        ln -s $out/bin/${targetPrefix}txlc $out/bin/txlc
-      ''
-    }
+    ${lib.optionalString withCompiler ''
+      makeWrapper ${opentxl-unwrapped}/bin/txlc \
+        $out/bin/${targetPrefix}txlc \
+        --set TXLLIB ${opentxl-unwrapped}/lib \
+        --set BUILD_TXLLIB ${opentxl-unwrapped}/lib \
+        --set TARGET_TXLLIB ${targetOpentxl}/lib \
+        --set CC ${targetPackages.stdenv.cc}/bin/${targetPrefix}cc \
+        --set OS ${opentxl-unwrapped.osOption stdenv.targetPlatform}
+      ${
+        # For convenience, if there is a target prefix, create a symlink named txlc
+        lib.optionalString (targetPrefix != "") ''
+          ln -s $out/bin/${targetPrefix}txlc $out/bin/txlc
+        ''
+      }
+    ''}

    # Wrap other scripts
    for name in txl2c txlp; do
--- a/pkgs/by-name/pa/packetry/package.nix
+++ b/pkgs/by-name/pa/packetry/package.nix
@@ -11,16 +11,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "packetry";
-  version = "0.4.0";
+  version = "0.5.0";

  src = fetchFromGitHub {
    owner = "greatscottgadgets";
    repo = "packetry";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-eDVom0kAL1QwO8BtrJS76VTvxtKs7CP6Ob5BWlE6wOM=";
+    hash = "sha256-mgQmorh/MSSufVyOspVtZhBn4nS1vITAiiDXv+/dc/o=";
  };

-  cargoHash = "sha256-he+Y2vBCw5lmYe5x6myIxMKRIohBCLDQ/B1EV+4pKGs=";
+  cargoHash = "sha256-qku45EAnsZetQ3Q0Y5Pr1OL/St0j6DGIjnlohA8+pDs=";

  nativeBuildInputs = [
    pkg-config
@@ -34,7 +34,8 @@ rustPlatform.buildRustPackage (finalAttrs: {

  # Disable test_replay tests as they need a gui
  preCheck = ''
-    sed -i 's:#\[test\]:#[test] #[ignore]:' src/test_replay.rs
+    substituteInPlace src/ui/test_replay.rs \
+      --replace-fail '#[test]' '#[test] #[ignore]'
  '';

  nativeInstallCheckInputs = [ versionCheckHook ];
--- a/pkgs/by-name/pg/pgdog/package.nix
+++ b/pkgs/by-name/pg/pgdog/package.nix
@@ -14,16 +14,16 @@ let
 in
 rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: {
  pname = "pgdog";
-  version = "0.1.47";
+  version = "0.1.48";

  src = fetchFromGitHub {
    owner = "pgdogdev";
    repo = "pgdog";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-+YHn3gkKqrZuOZreItSXBjbn4A78wmf8r+dSRUD2at8=";
+    hash = "sha256-0lun9HmJvpSWguckUtudDcNlBc/KgpHk/fBJnj4HSuo=";
  };

-  cargoHash = "sha256-W4XbcsFUk8g86zpPgYb/WztVoeCklIQmEhylQSE2a8E=";
+  cargoHash = "sha256-cNIjTNuxHPofkTYpEb3+8Jhqz5AMAeXj7avNAAOG5D8=";

  # Hardcoded paths for C compiler and linker
  postPatch = ''
--- a/pkgs/by-name/pi/pinnacle/package.nix
+++ b/pkgs/by-name/pi/pinnacle/package.nix
@@ -0,0 +1,170 @@
+{
+  rustPlatform,
+  lib,
+  pkg-config,
+  wayland,
+  lua54Packages,
+  lua5_4,
+  extraLuaPackages ? (ps: [ ]),
+  protobuf,
+  seatd,
+  systemdLibs,
+  libxkbcommon,
+  mesa,
+  xwayland,
+  libinput,
+  libdisplay-info,
+  git,
+  libgbm,
+  rustc,
+  cargo,
+  makeWrapper,
+  callPackage,
+  libglvnd,
+  autoPatchelfHook,
+  libxcursor,
+  libxi,
+  libxrandr,
+  libx11,
+  fetchFromGitHub,
+}:
+let
+  version = "0.2.4";
+  pinnacle-src = fetchFromGitHub {
+    owner = "pinnacle-comp";
+    repo = "pinnacle";
+    tag = "v${version}";
+    sha256 = "sha256-T8wZjgOTzYKfYUV1ShLBIi2xoCdVn9I7sux/pDH+8ic=";
+  };
+  buildRustConfig = callPackage ./pinnacle-config.nix { inherit pinnacle-src; };
+
+  meta = {
+    description = "A WIP Smithay-based Wayland compositor, inspired by AwesomeWM and configured in Lua or Rust";
+    homepage = "https://pinnacle-comp.github.io/pinnacle/";
+    license = lib.licenses.gpl3;
+    mainProgram = "pinnacle";
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ cassandracomar ];
+  };
+
+  lua-client-api = lua54Packages.buildLuarocksPackage rec {
+    inherit meta version;
+    pname = "pinnacle-client-api";
+    src = pinnacle-src;
+    sourceRoot = "${src.name}/api/lua";
+    knownRockspec = "${pinnacle-src}/api/lua/rockspecs/pinnacle-api-0.2.4-1.rockspec";
+    propagatedBuildInputs = with lua54Packages; [
+      cqueues
+      http
+      lua-protobuf
+      compat53
+      luaposix
+    ];
+
+    postInstall = ''
+      mkdir -p $out/share/pinnacle/protobuf/pinnacle
+      cp -rL --no-preserve ownership,mode ../../api/protobuf/pinnacle $out/share/pinnacle/protobuf
+      mkdir -p $out/share/pinnacle/snowcap/protobuf/snowcap
+      cp -rL --no-preserve ownership,mode ../../snowcap/api/protobuf/snowcap $out/share/pinnacle/snowcap/protobuf
+      mkdir -p $out/share/pinnacle/protobuf/google
+      cp -rL --no-preserve ownership,mode ../../api/protobuf/google $out/share/pinnacle/protobuf
+      mkdir -p $out/share/pinnacle/snowcap/protobuf/google
+      cp -rL --no-preserve ownership,mode ../../snowcap/api/protobuf/google $out/share/pinnacle/snowcap/protobuf
+    '';
+  };
+in
+rustPlatform.buildRustPackage (finalAttrs: {
+  inherit meta version;
+
+  pname = "pinnacle-server";
+  src = pinnacle-src;
+  cargoHash = "sha256-hM19RB2+ejC+OFU4keH+PKWYf5NRUXJ1W33eSUhKR/g=";
+
+  buildInputs = [
+    wayland
+
+    # libs
+    seatd.dev
+    systemdLibs.dev
+    libxkbcommon
+    libinput
+    mesa
+    xwayland
+    libdisplay-info
+    libgbm
+    lua5_4
+
+    # winit on x11
+    libxcursor
+    libxrandr
+    libxi
+    libx11
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+    protobuf
+    lua54Packages.luarocks
+    lua5_4
+    lua-client-api
+    git
+    wayland
+    makeWrapper
+    autoPatchelfHook
+  ];
+
+  checkFeatures = [ "testing" ];
+  checkNoDefaultFeatures = true;
+  cargoTestFlags = [
+    "--exclude"
+    "wlcs_pinnacle"
+    "--all"
+    "--"
+    "--skip"
+    "process_spawn"
+  ];
+
+  preCheck = ''
+    export LD_LIBRARY_PATH="${lib.makeLibraryPath [ wayland ]}";
+    export XDG_RUNTIME_DIR=$(mktemp -d)
+  '';
+
+  postInstall = ''
+    wrapProgram $out/bin/pinnacle --prefix PATH ":" ${
+      lib.makeBinPath [
+        rustc
+        cargo
+        finalAttrs.passthru.luaEnv
+        xwayland
+      ]
+    }
+    install -m755 ./resources/pinnacle-session $out/bin/pinnacle-session
+    mkdir -p $out/share/wayland-sessions
+    install -m644 ./resources/pinnacle.desktop $out/share/wayland-sessions/pinnacle.desktop
+    patchShebangs $out/bin/pinnacle-session
+    mkdir -p $out/share/xdg-desktop-portal
+    install -m644 ./resources/pinnacle-portals.conf $out/share/xdg-desktop-portal/pinnacle-portals.conf
+    install -m644 ./resources/pinnacle-portals.conf $out/share/xdg-desktop-portal/pinnacle-uwsm-portals.conf
+  '';
+
+  runtimeDependencies = [
+    wayland
+    mesa
+    libglvnd # libEGL
+  ];
+
+  passthru = {
+    luaEnv = lua5_4.withPackages (
+      ps:
+      [
+        finalAttrs.passthru.lua-client-api
+        ps.cjson
+      ]
+      ++ (extraLuaPackages ps)
+    );
+    inherit buildRustConfig;
+    providedSessions = [ "pinnacle" ];
+    lua-client-api = lua-client-api;
+  };
+  __structuredAttrs = true;
+})
--- a/pkgs/by-name/pi/pinnacle/pinnacle-config.nix
+++ b/pkgs/by-name/pi/pinnacle/pinnacle-config.nix
@@ -0,0 +1,36 @@
+{
+  rustPlatform,
+  protobuf,
+  pkg-config,
+  seatd,
+  libxkbcommon,
+  libinput,
+  lua5_4,
+  libdisplay-info,
+  libgbm,
+  pinnacle-src,
+}:
+args:
+rustPlatform.buildRustPackage (
+  (removeAttrs args [
+    "nativeBuildInputs"
+    "buildInputs"
+  ])
+  // {
+    PINNACLE_PROTOBUF_API_DEFS = "${pinnacle-src}/api/protobuf";
+    PINNACLE_PROTOBUF_SNOWCAP_API_DEFS = "${pinnacle-src}/snowcap/api/protobuf";
+
+    nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [
+      protobuf
+      pkg-config
+    ];
+    buildInputs = (args.buildInputs or [ ]) ++ [
+      seatd.dev
+      libxkbcommon
+      libinput
+      lua5_4
+      libdisplay-info
+      libgbm
+    ];
+  }
+)
--- a/pkgs/by-name/pk/pkl-lsp/deps.json
+++ b/pkgs/by-name/pk/pkl-lsp/deps.json
@@ -19,23 +19,23 @@
   "module": "sha256-IFNqlfL+sr9DBRKMaq7Lb9idxFeYqchfJgK4qAnXUNs=",
   "pom": "sha256-Q1z/VXiZht7arXF/aPuo1UgklHhWLc2EsirU1lZvRAs="
  },
-  "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/8.4.0": {
-   "pom": "sha256-qJGqi+ZCZ2IVBb6uY6jeAqGACX3PO/wnBZ38b510pEA="
+  "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/8.7.0": {
+   "pom": "sha256-8B/rrWkBEaw5YLuUL0/j+kt1SxVAFCjWjF9DHmQMH6w="
  },
-  "com/diffplug/spotless#spotless-lib-extra/4.5.0": {
-   "jar": "sha256-dU+ATAnfouuNU5YzEdK+aPG0pWIQEdy1UNcC6tKGUdk=",
-   "module": "sha256-Bf7t0gVQynxXCeUc7zgpPFADpcx/qrdU6dusW3Vd4KU=",
-   "pom": "sha256-UPJN+KOGtZ48rS2ylhjHOYgEgZAQYENCsX5jxubdPGU="
+  "com/diffplug/spotless#spotless-lib-extra/4.7.0": {
+   "jar": "sha256-vciax56nfFUzRzZDf6MuhsUW1aCbayIXgORXl2Pe6mw=",
+   "module": "sha256-AFuJ+A/N+YczpVVnUO23+fLPkMBMHMu7+A5RML0W478=",
+   "pom": "sha256-laJic+i5Lo37eI16VItXUsmhRLDZAzJnSwCmv1R+0zE="
  },
-  "com/diffplug/spotless#spotless-lib/4.5.0": {
-   "jar": "sha256-mM2f5ktjmNp6kPL9kG7wq8Gg5tZvUZ/mrwilhde7bak=",
-   "module": "sha256-AlNtIagrdaWmOaPNQWCgg5oanDXy3EwP9FJBtHafXTU=",
-   "pom": "sha256-SvSliKd1rChPrVC/EUkkZwAE9rgKCSkT9QSOb9Gj2fI="
+  "com/diffplug/spotless#spotless-lib/4.7.0": {
+   "jar": "sha256-jF4uWKFEj1pjFvAb7cnQ9N3aOOiEwFYyTn28RDMVRns=",
+   "module": "sha256-49pdAIRCM2IzAulHWNjzEJE8/fmDXiFmEcG/Rhj0ECo=",
+   "pom": "sha256-ngcUx2+Ybr5vFPHHoAMfw94G0IHv6ml7JHSe/hHGTBc="
  },
-  "com/diffplug/spotless#spotless-plugin-gradle/8.4.0": {
-   "jar": "sha256-oHy1L8S4IhcWeW63AyMQakSjMZ7Itk5ugFb+gn+UOLo=",
-   "module": "sha256-lQhXXODePA1p+l+xrTWo2/iQKuoQVe/E0328FjyHMmc=",
-   "pom": "sha256-d0glMskp8EZGF/iXUT/CJNeuMlFeNIKaPO3F5WlH59s="
+  "com/diffplug/spotless#spotless-plugin-gradle/8.7.0": {
+   "jar": "sha256-t2RIUI5I74DVOsiaEDicHfyecL7tgSHNaFVfpsuzLtM=",
+   "module": "sha256-cYKaVUWLRCHqEM18dHuYJVHrhJpNOwL3GkYEidxizA8=",
+   "pom": "sha256-fvGO4r+vYaYWhp3Ifyiyw7roBGXfkbcWhPZheHU2kMI="
  },
  "com/fasterxml#oss-parent/55": {
   "pom": "sha256-D14Y8rNev22Dn3/VSZcog/aWwhD5rjIwr9LCC6iGwE0="
@@ -75,13 +75,13 @@
   "jar": "sha256-1lImlJcTxMYaeE9BxRFn57Axb5N2Q5jrup5DNrPZVMI=",
   "pom": "sha256-5O1sZpYgNm+ZOSBln+CsfLyD11PbwNwOseUplzr5byM="
  },
-  "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/9.4.1": {
-   "pom": "sha256-AdDekM9QXN9PKgCkLFJCe9JtIN+VrPCMnrvRnWyug0c="
+  "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/9.4.2": {
+   "pom": "sha256-qu9dz6fW7rPI6/NKwngGsguf9Wze3uAQ8yVRr16JUc4="
  },
-  "com/gradleup/shadow#shadow-gradle-plugin/9.4.1": {
+  "com/gradleup/shadow#shadow-gradle-plugin/9.4.2": {
   "jar": "sha256-QiPAjWXkx+HxILSpbnMZ34/j36ZV3fJmH2C7VtrPkaw=",
-   "module": "sha256-HqvAJjuZ/SRTCqADRTyLH7AoZt4QzYni8VLwAsOrBXg=",
-   "pom": "sha256-W15e5HPddlrSOzAbdIhbRzsrI32zHkFu6/VXSpU6JNQ="
+   "module": "sha256-QLLd0qhM9ov7ur/ED8XLlNQvDTzrglMb8/eQ/xdeu9A=",
+   "pom": "sha256-TPRHwc6WyuND5uDnRPnOnD5jz+e9GQ9j/qbSdPFeKrU="
  },
  "com/squareup/okhttp3#okhttp/4.12.0": {
   "jar": "sha256-sQUAgbFLt6On5VpNPvAbXc+rxFO0VzpPwBl2cZHV9OA=",
@@ -98,17 +98,20 @@
   "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU="
  },
  "commons-codec#commons-codec/1.21.0": {
-   "jar": "sha256-TahRy2q/uYv+nrd8Xl/Ef1QU+ii5TiG3/ZpkZwXcFn8=",
   "pom": "sha256-sjBBa6b1v534/Lbn9KbCa4+w/oXONx0T1YRu03aDCbc="
  },
+  "commons-codec#commons-codec/1.22.0": {
+   "jar": "sha256-0WT+efJiwy2bGKC1stMX0cJ2U9Xpj9K5mMJL+QHHLOQ=",
+   "pom": "sha256-2aVl2Xj6pp0rEZX7HsJ+YPKef+sJr7ha2sePKABo+P4="
+  },
  "commons-io#commons-io/2.21.0": {
   "jar": "sha256-fWQ6Kv6osFi3YqpvuQ5bJW9scpc5+LN4TDNw3cYJ6I0=",
   "pom": "sha256-rkd5XnIYA+yP8d7tdL4oqBGgJxO9WjqwrGfCtYy2Nas="
  },
-  "dev/equo/ide#solstice/1.8.1": {
-   "jar": "sha256-bluizOgTvh1xzNwuzz5JJxsU5pG/u7GhFM86MOdzsQ0=",
-   "module": "sha256-pnYDnqavCPJXtG4Hwr8VcaRqTUtbnMuGw/yY0H+v6hs=",
-   "pom": "sha256-arSo7K4qu9NrkZ0Lm5+yTBdxSPE+U2TJegxu4Ro/xCY="
+  "dev/equo/ide#solstice/1.8.2": {
+   "jar": "sha256-nslXwJZgBSDcmfN6EEp/TJkNQMLdN17pYOt8bNUMEvM=",
+   "module": "sha256-SrIVTJ83agthp6/i0djQJ+pvOQ08hyzkcKbZgqR+Wv4=",
+   "pom": "sha256-70jsrBwclJAdj/ML8J16CClTQCNnLdXiVyek6Vh+oFM="
  },
  "io/github/gradle-nexus#publish-plugin/2.0.0": {
   "jar": "sha256-lCwaFtFh9kYxkBtOLa1UHS/L/lHPAyOVXavgLiqe8qo=",
@@ -147,6 +150,9 @@
  "org/apache/commons#commons-parent/96": {
   "pom": "sha256-LNMom0TvpTBS2c2vPwVUSDOlIKaC+cf/1AOgC7sVf5o="
  },
+  "org/apache/commons#commons-parent/98": {
+   "pom": "sha256-1AMYUn9WAz4P8HiZccw4yFaqmaaF7qEScIFOfx7an7o="
+  },
  "org/apache/groovy#groovy-bom/4.0.27": {
   "module": "sha256-1sIlTINHuEzahMr3SRShh8Lzd+QoTo2Ls/kBUhgQqos=",
   "pom": "sha256-qkTrUr/f5h0ns+RQ0rNI2I3qo0N6tNnUmoQJU0j59vs="
@@ -209,16 +215,16 @@
  "org/eclipse/ee4j#project/1.0.7": {
   "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU="
  },
-  "org/eclipse/jgit#org.eclipse.jgit-parent/7.5.0.202512021534-r": {
-   "pom": "sha256-fjiAaoU2kaSdsW6sg2/mtiYnaUOxCLZ3VKPVx0D7vA4="
+  "org/eclipse/jgit#org.eclipse.jgit-parent/7.7.0.202606012155-r": {
+   "pom": "sha256-S4qHPLaFhEH/MSUDTbVU0leSL7cIIEeVtyAZDW+05iE="
  },
-  "org/eclipse/jgit#org.eclipse.jgit/7.5.0.202512021534-r": {
-   "jar": "sha256-FZe8eKjYwBFpdtRqlIcqLMKGVnDrpNsLn1GBGzSTbXI=",
-   "pom": "sha256-bJVN/BDxwwG9uiXT1jCfd0eYBDY891VuUei7NxRVXGQ="
+  "org/eclipse/jgit#org.eclipse.jgit/7.7.0.202606012155-r": {
+   "jar": "sha256-onxHjV94vD2VRh8VOmDv3xYjknUCxopFetmplaNcWnw=",
+   "pom": "sha256-owH00aR2nxrSVstU54V6Uq8n59A+UMo8UPTLZDw98SY="
  },
-  "org/eclipse/platform#org.eclipse.osgi/3.24.100": {
-   "jar": "sha256-0g+JIDBZb7wsJdoArNvSdQ93zv1oE2wzo+J5uJSYZ6g=",
-   "pom": "sha256-+U4i9QNmKcxz7AM41+C5wFx2g70TZ4wWa8p/fIfm+oE="
+  "org/eclipse/platform#org.eclipse.osgi/3.24.200": {
+   "jar": "sha256-v+g/zR+gNOuamGs8tuXisY27rLZ+q9qtLaMoBOzYxlo=",
+   "pom": "sha256-sMVs+qxqcAh+RUJXzABLfTb7uYk9vu5N64fGISWGERY="
  },
  "org/gradle/kotlin#gradle-kotlin-dsl-plugins/6.5.7": {
   "jar": "sha256-zIyqQQGjXQzwQzpj6K04kRpMhIBz/MlPQ64CUfM+Ta8=",
@@ -413,15 +419,15 @@
  "org/mockito#mockito-bom/5.20.0": {
   "pom": "sha256-YmvA9584nSxBVD0W2NnbC1OtCEjMN6bgtM53Gk/gvEk="
  },
-  "org/slf4j#slf4j-api/2.0.17": {
-   "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=",
-   "pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8="
+  "org/slf4j#slf4j-api/2.0.18": {
+   "jar": "sha256-RFCP0VdlAGiMeQsZCs3Rb+xPjHmj4LkAr9cFA88FX1U=",
+   "pom": "sha256-bCx/LAJ3TMK3thn70t94c82tKXGJJuRHVLh/cNHrQ8s="
  },
-  "org/slf4j#slf4j-bom/2.0.17": {
-   "pom": "sha256-940ntkK0uIbrg5/BArXNn+fzDzdZn/5oGFvk4WCQMek="
+  "org/slf4j#slf4j-bom/2.0.18": {
+   "pom": "sha256-khmqtgFXUSbE5m4TMesrDGwXozCsTVoH480R1YCgwS0="
  },
-  "org/slf4j#slf4j-parent/2.0.17": {
-   "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs="
+  "org/slf4j#slf4j-parent/2.0.18": {
+   "pom": "sha256-CziWvtrSye2Wl+3L6h2gxUzSOKcjWDqBNYqDv7eC6fo="
  },
  "org/sonatype/oss#oss-parent/5": {
   "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0="
@@ -437,9 +443,9 @@
   "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=",
   "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo="
  },
-  "org/vafer#jdependency/2.15": {
-   "jar": "sha256-8oND1aDWjpYYeI42bfWgRDgGGVU5Fy7R0yBcYr5OQZM=",
-   "pom": "sha256-27DNFL99Z65IZrkSTINMWVCZ8aT8k7f0YRp/64yLlaM="
+  "org/vafer#jdependency/2.16": {
+   "jar": "sha256-hpgdL1CrFe6+GpD4Q6GV8o8L0e5SJV12pz7AtLfsec0=",
+   "pom": "sha256-+jUpmw0MRzE9cDZKddILmsOoh0Q8Yyx+z1C6ffiHG+U="
  }
 },
 "https://repo.maven.apache.org/maven2": {
@@ -555,9 +561,9 @@
   "jar": "sha256-mZCiA5d49rTMlHkBQcKGiGTqzuBiDGxFlFESGpAc1bU=",
   "pom": "sha256-wm4JftyOxoBdExmBfSPU5JbMEBXMVdxSAhEtj2qRZfw="
  },
-  "io/github/tree-sitter#jtreesitter/0.25.6": {
-   "jar": "sha256-8ABQJa5DDSStzYhGuwXMQ40fwccS1f7NtOBtzRcOC8Q=",
-   "pom": "sha256-IqAc23/XMgCg2sGm2QynVzqMU4kQhZTGxOllcZbo5Uw="
+  "io/github/tree-sitter#jtreesitter/0.26.1": {
+   "jar": "sha256-FVulpLS1mAa4NddFpmxKsfnfxBK+ZiBl1jUdOLVyPjE=",
+   "pom": "sha256-5/hz9xOmKAF7j8KOcDBk1GN8CQidYSRQEFvvlUbzmsg="
  },
  "net/bytebuddy#byte-buddy-parent/1.18.3": {
   "pom": "sha256-kOpTFzFQjup1/5KVFBxQjX+aU9GgX0W4D49JmVIUJu8="
@@ -827,14 +833,6 @@
   "jar": "sha256-VCo2/lrlw1t7tMwpcQDzY007X5fHtfeM5ENiGDC7vvQ=",
   "pom": "sha256-xARZ8GJeuKt2KJcbQvqint7UvIdcJe+7owkmlLD/vpE="
  },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.2.20": {
-   "jar": "sha256-O9Juy20Sl4xcTgtB92yf9VH6wqXmJoQnqdKgzfilrZE=",
-   "pom": "sha256-Cukeav/wZg79os8CjFvbnnoehn4Z3CyOuuiaglcUOOI="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.2.20": {
-   "jar": "sha256-wxQXeTXY3C7ah5UHEX8l1t5W9sV+3plBaxTNYiu54J0=",
-   "pom": "sha256-NditbBnaV6t00h7YHdxYSZt8GwAlEbXoUgANuwxYq64="
-  },
  "org/jetbrains/kotlin#kotlin-stdlib/2.3.20": {
   "jar": "sha256-CuElBKUEDrrzdwOQhINCDRpWJN0dk/NXZl+Md8hIoB4=",
   "module": "sha256-9Os0T8TR46KK4WwIbsPkL1I3O0ZtQwgYL7OG45LA76M=",
@@ -899,93 +897,93 @@
   "module": "sha256-0wfKd6VOGKwe8artTlu+AUvS9J8p4dL4E+R8J4KDGVs=",
   "pom": "sha256-zauSmjuVIR9D0gkMXi0N/oRllg43i8MrNYQdqzJEM6Y="
  },
-  "org/junit#junit-bom/5.13.4": {
-   "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=",
-   "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI="
+  "org/junit#junit-bom/6.1.0": {
+   "module": "sha256-SCB/lc3sO/tc5sy/GNUqzlHoFfIRBp3BbgKDslWmTZo=",
+   "pom": "sha256-97Zl5dVzsBr21DTT0kUKpbdBtoPz8QFy8etEo9DQrAw="
  },
-  "org/junit#junit-bom/6.0.3": {
-   "module": "sha256-KA48NIVfKhPeJBIZN+TPl+S565IG5g+JHk8KHPDnq6E=",
-   "pom": "sha256-plW2pdwA0b68kfsrFcDH6K6snWvc+HlZVQU3DidTAoc="
+  "org/junit#junit-bom/6.1.1": {
+   "module": "sha256-QLwON45eR3J0jqqc5ZM0dNSI0lq8TpJQsEVT1hb7mug=",
+   "pom": "sha256-EKrIAzxbuWlykvg3Zdo6yRdSJL6ttrnXVfOLW0ymozU="
  },
-  "org/junit/jupiter#junit-jupiter-api/6.0.3": {
-   "jar": "sha256-1lXX5vDHrgfxCi87uq67bTDpsmIEoGitnps5UKooeSw=",
-   "module": "sha256-6k1/evmsFrsuF34miQeJb6PG+a5QcmBNRoLXrv/inKg=",
-   "pom": "sha256-dmyA+zGOFgDr9smpId6AGIexVIqigtataRiLdgjVbUc="
+  "org/junit/jupiter#junit-jupiter-api/6.1.0": {
+   "jar": "sha256-UPl+uADC6Ij6ojegb1oO9EX67VVn+ZTawMK50niprSA=",
+   "module": "sha256-HQFsKC2GuCGvWz2zd7cJrZI4tUyJSzMjzRsj6lMSl9Y=",
+   "pom": "sha256-000J8MyNqqQOMC26REEyf8BF+gvV39qC0ho3IBj3i4c="
  },
-  "org/junit/jupiter#junit-jupiter-engine/6.0.3": {
-   "jar": "sha256-Hi+rYa0n6gj8fHDdlnfPjG0a5UNNQtz91jOxLH58BNA=",
-   "module": "sha256-03TlhvHApdyh+00ZNJ4KgEqRc7lh+EHijPxYgeLmUV0=",
-   "pom": "sha256-uvvAmTJsGIPw7hywVtMbQiLiYWX5+aqbiW89P3ijFTg="
+  "org/junit/jupiter#junit-jupiter-engine/6.1.0": {
+   "jar": "sha256-6nB7lkcIRhmg/JEc77JQN1QNWLKAD46tH8aiuvWLHaU=",
+   "module": "sha256-qxcPpDeU24cKcgzDt6LWdi3MRXcyjv2vizCOaNLH79E=",
+   "pom": "sha256-h+13EyLIt6c55oZct+WGTqwoj9IL1qP8Vjtiov8sSVo="
  },
-  "org/junit/jupiter#junit-jupiter-params/6.0.3": {
-   "jar": "sha256-zylH4jArn4yKBZJZoneIHBytro+8JRTBapJc/re+suU=",
-   "module": "sha256-1LBksP8UD1Vd0GdEscxr//wQ9SSbLdWqRprl9NTv7Cg=",
-   "pom": "sha256-mVtk7KoiJ8S1Xz6453c19URDSi7Cz+7QYF6LrxCCY94="
+  "org/junit/jupiter#junit-jupiter-params/6.1.0": {
+   "jar": "sha256-uYfuoyBRhadvNlmjnmdQPLe2gti3vgO+S5+StxDw7sA=",
+   "module": "sha256-evPVYvC8fWUmA2HlcT5vzVVQuZcqGA1vxM2itoJM4pc=",
+   "pom": "sha256-ZOXfB1ZYuUmh2lSyEp6jHOY87fodJTEHWgBxlJnOwEY="
  },
-  "org/junit/jupiter#junit-jupiter/6.0.3": {
-   "jar": "sha256-eEtlgV9HmgyZqdOlc7FC4qUl77YCXZf3UbGecvkK7aM=",
-   "module": "sha256-gaZM8ir7jnaHVSE+nIDr06sDMc5ACm/WOeQ6VJWtj+A=",
-   "pom": "sha256-vO0g6RqqVnfxupb6b3GBAKuD6JSlLplhtgBMBWoYRew="
+  "org/junit/jupiter#junit-jupiter/6.1.0": {
+   "jar": "sha256-pOQgtcboFwMjtMXJeuNbyg1iC+n5z+NwBoIPU5MfJ6M=",
+   "module": "sha256-Kl2tWs4texVUiGguY6LrDxS7YA+fbx+75B3QGylMZ0g=",
+   "pom": "sha256-Rme8comEZvz6eQGJJmuiXGtmrV4WpOVgJgM5euWn4q0="
  },
-  "org/junit/platform#junit-platform-commons/6.0.3": {
-   "jar": "sha256-OfJi0Jw9UnGf4Ld/CA6Qo2leKF13mkGyMuF5Y65dogA=",
-   "module": "sha256-nfLma22VBAClGKmt00M9CjBxzhwzpvgPnPIlYtUpRbc=",
-   "pom": "sha256-vbjiS+l+Dll2nyFktTYfVSJ5WN9BA9aGgvh3mtLKjX0="
+  "org/junit/platform#junit-platform-commons/6.1.0": {
+   "jar": "sha256-HZBGqxfsftr7C8eUXS5Z1xgP/08oxzS4I7UQAedp9xs=",
+   "module": "sha256-eVv++8OD8DMoadK4AUJSK65GKjkFu6ntSbe8NcQf64A=",
+   "pom": "sha256-yRmWB2BYBu8YXQT9RpVRsrShUQos6twHTbRBvXf23TY="
  },
-  "org/junit/platform#junit-platform-engine/6.0.3": {
-   "jar": "sha256-SR6eT3RfFhuKjkGGoafGpFDqEscJMMmu2uQnIVMB2Uc=",
-   "module": "sha256-U1qGeP2rxB2/DEHMW3Vh7xINdWUMPcOTAqfWCTdmE5M=",
-   "pom": "sha256-eofYxqCn2wJgsAzjAxgPb0HQQFYoldaARhnV227iMr4="
+  "org/junit/platform#junit-platform-engine/6.1.0": {
+   "jar": "sha256-P7a+dsJqsPlP4ITj/Qo54dJeIhKZKaYbKb2AoFK5PqU=",
+   "module": "sha256-OnbyFfpzfJbOlycTqva0UYePpzOVX/IbDNao+I3LIhI=",
+   "pom": "sha256-NgVWdVmFVdSVuvtVezXukYzbF2pnUxALABtO7thfJsU="
  },
-  "org/junit/platform#junit-platform-launcher/6.0.3": {
-   "jar": "sha256-MVYINy5NxEvKDMs66KB+zCBrM2cDP6BXSKA8zVY/EwE=",
-   "module": "sha256-glZnrWqEsMW6dTdSvpqZ4wFL/lKRQ7xmtGdNkbA/pbg=",
-   "pom": "sha256-TTngPyCTd29BkwccjN8ZgTa5YWbHtDteN+fWFWudmO0="
+  "org/junit/platform#junit-platform-launcher/6.1.0": {
+   "jar": "sha256-CZXm7SRNZhlsvaAZ4vh5UE0LSJce2unMPepGobMcA3c=",
+   "module": "sha256-f4PRJdcb5Z4JVD1LUGn6h9jKchyqQ9FKq+gm+x2xuME=",
+   "pom": "sha256-on93QpSA4V22Cwlf21lfULa6VylfIqXCZEuo1BitM54="
  },
  "org/opentest4j#opentest4j/1.3.0": {
   "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=",
   "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=",
   "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U="
  },
-  "org/pkl-lang#pkl-cli-linux-aarch64/0.31.1": {
-   "pom": "sha256-tv7vH7HdGoKPx1efn30GvJsQFAiP+EAQbiq7NpcHhyU="
+  "org/pkl-lang#pkl-cli-linux-aarch64/0.32.0": {
+   "pom": "sha256-QMn9OmCYOs+w92fOU5sUUKDgXGrxPtaO3q/3b5vhAi4="
  },
-  "org/pkl-lang#pkl-cli-linux-amd64/0.31.1": {
-   "pom": "sha256-a9qNeO4to3bldosuR8juWBfIVYOfcu8+dH9zAHjbF3o="
+  "org/pkl-lang#pkl-cli-linux-amd64/0.32.0": {
+   "pom": "sha256-ZgO0eVrDBiiadEaKCpu7Q0WJzqz/T5P0SvKLrLi+4bU="
  },
-  "org/pkl-lang#pkl-cli-macos-aarch64/0.31.1": {
-   "pom": "sha256-uBe6WLi8MwEWoEkMzx1TbhCpiTS2iuodLJduU+NjVb4="
+  "org/pkl-lang#pkl-cli-macos-aarch64/0.32.0": {
+   "pom": "sha256-iAp09TW8GSxc3H4xKkzmUr6ovoVauTdn8AV07ygt5Iw="
  },
-  "org/pkl-lang#pkl-cli-macos-amd64/0.31.1": {
-   "pom": "sha256-R8jTjWZ//52ce8HmvV0ITUhv2X3jJPR5zvnLjufrunc="
+  "org/pkl-lang#pkl-cli-macos-amd64/0.32.0": {
+   "pom": "sha256-VLr95sI5DIJIh9XszhrbbouWxh8BU95PTHS2RA6fb7A="
  },
-  "org/pkl-lang#pkl-formatter/0.31.1": {
-   "jar": "sha256-DiIZhJM4k9Ye94nQBWgpFStjgnLOFetnjHQ60FJ34Hc=",
-   "module": "sha256-dHvc/WhBDsWDiMKrY7UNFmEto5ynPyjvlEpiExCS/jw=",
-   "pom": "sha256-1r8vTKsqkz6FdaiLts4bMB+t5yrMScAxoyUN961XNQ4="
+  "org/pkl-lang#pkl-formatter/0.32.0": {
+   "jar": "sha256-0pxUqhFimSCp6Y2VJZon8L3Y/B2GhQQirIrPmsR9r00=",
+   "module": "sha256-y34eyvwJFrCzQbB9j2pwzXWqRyt0FrUsUJBwwxk+FYQ=",
+   "pom": "sha256-BCW+dONIUNupXm9fBV2onQHt85e8hDpYDaBBHQKxruw="
  },
-  "org/pkl-lang#pkl-parser/0.31.1": {
-   "jar": "sha256-sjYkK4BB7nUO3+uB1wXcu9VVO4C8z5Pj1ANp3caSsB4=",
-   "module": "sha256-Ea1S0QB8EtMrwJAfvP/8s9eZ0IxwsmarfvgK/BhY38M=",
-   "pom": "sha256-f26/+TtpflBa1SHiVDkL3UrP4FatBpZxr9yioXWJego="
+  "org/pkl-lang#pkl-parser/0.32.0": {
+   "jar": "sha256-vDorzk78PtqMJRip6aq8EXvE+yMoNKtnIxK+2aY3yQQ=",
+   "module": "sha256-Gpfwb/OQOmTyukkUqpWxJ7BzDxNi00v3S/2pAu+/vhU=",
+   "pom": "sha256-o8Ww7Ms3CEPyxmeFNEsdV4nzzlIF7/UxyczcJlOrPcI="
  },
-  "org/pkl-lang#pkl-stdlib/0.31.1": {
-   "pom": "sha256-p7y/Np1Ei4ZAR+Ow3q315TxRKs/yLbl7ioCN3mtxLQg="
+  "org/pkl-lang#pkl-stdlib/0.32.0": {
+   "pom": "sha256-23dU8W98yW4Na8MiDiU4Ou/F3jFgXF20gyiZAKmKYJc="
  },
-  "org/pkl-lang/pkl-cli-linux-aarch64/0.31.1/pkl-cli-linux-aarch64-0.31.1": {
-   "bin": "sha256-fvEOdD2qkh+5Sue9uexphvNivyUMVYFLnqKusT8tCD4="
+  "org/pkl-lang/pkl-cli-linux-aarch64/0.32.0/pkl-cli-linux-aarch64-0.32.0": {
+   "bin": "sha256-sbp+9d7JKH+PhDzlY5EeuoIv7VeJpbqrjMcSYVqduvA="
  },
-  "org/pkl-lang/pkl-cli-linux-amd64/0.31.1/pkl-cli-linux-amd64-0.31.1": {
-   "bin": "sha256-YY8TlV11XK+/6MnLodJ2NYSM1J28ar/9OY0nUdsSMb8="
+  "org/pkl-lang/pkl-cli-linux-amd64/0.32.0/pkl-cli-linux-amd64-0.32.0": {
+   "bin": "sha256-FefnN1wouFQrPRP+NbzK63uVQhFACJmHCDhUiYhfQec="
  },
-  "org/pkl-lang/pkl-cli-macos-aarch64/0.31.1/pkl-cli-macos-aarch64-0.31.1": {
-   "bin": "sha256-G2pUONliTNJ5inUwchu7+ifvcu/lyHihtsVGxufKDo8="
+  "org/pkl-lang/pkl-cli-macos-aarch64/0.32.0/pkl-cli-macos-aarch64-0.32.0": {
+   "bin": "sha256-+4kYVnBfPcuFicdJmeAd7T7ra3etXGqVwCV5qEjBOSg="
  },
-  "org/pkl-lang/pkl-cli-macos-amd64/0.31.1/pkl-cli-macos-amd64-0.31.1": {
-   "bin": "sha256-IhI+1K5MA6+oxUxp938L7Dmw+g9nsJ1tFI4KN2oqRx0="
+  "org/pkl-lang/pkl-cli-macos-amd64/0.32.0/pkl-cli-macos-amd64-0.32.0": {
+   "bin": "sha256-GQrWP+xPgfQOdduo1jCQM90w5Rs+BC2zuEb2fHq0bj0="
  },
-  "org/pkl-lang/pkl-stdlib/0.31.1/pkl-stdlib-0.31.1": {
-   "zip": "sha256-H2Z2H61I5kngygIOvRdDPQe4ZraiN3hGgOkStMjkyWY="
+  "org/pkl-lang/pkl-stdlib/0.32.0/pkl-stdlib-0.32.0": {
+   "zip": "sha256-pCgSvCT71HG4r9ftY3zuwHtwesDXUbIegh0Usor4qWI="
  }
 }
 }
--- a/pkgs/by-name/pk/pkl-lsp/package.nix
+++ b/pkgs/by-name/pk/pkl-lsp/package.nix
@@ -18,13 +18,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "pkl-lsp";
-  version = "0.7.1";
+  version = "0.8.0";

  src = fetchFromGitHub {
    owner = "apple";
    repo = "pkl-lsp";
    tag = finalAttrs.version;
-    hash = "sha256-r/wNI319BPbU48Mrteq0LdS4YKnyyhPcYxTAS0Mlrp8=";
+    hash = "sha256-kXBEZU6WBMHV3Nidu3kJEI+4MWFIrqT/Qmm+Cuki844=";
    leaveDotGit = true;
    postFetch = ''
      pushd $out
--- a/pkgs/by-name/pr/proj/package.nix
+++ b/pkgs/by-name/pr/proj/package.nix
@@ -13,11 +13,14 @@
  nlohmann_json,
  python3,
  cacert,
+  writableTmpDirAsHomeHook,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "proj";
  version = "9.8.1";
+  __structuredAttrs = true;
+  strictDeps = true;

  src = fetchFromGitHub {
    owner = "OSGeo";
@@ -50,6 +53,10 @@ stdenv.mkDerivation (finalAttrs: {

  nativeCheckInputs = [
    cacert
+    sqlite
+    writableTmpDirAsHomeHook
+  ];
+  checkInputs = [
    gtest
  ];

@@ -57,13 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
    "-DUSE_EXTERNAL_GTEST=ON"
    "-DRUN_NETWORK_DEPENDENT_TESTS=OFF"
    "-DNLOHMANN_JSON_ORIGIN=external"
-    "-DEXE_SQLITE3=${buildPackages.sqlite}/bin/sqlite3"
-  ];
-
-  env.CXXFLAGS = toString [
-    # GCC 13: error: 'int64_t' in namespace 'std' does not name a type
-    "-include"
-    "cstdint"
+    "-DEXE_SQLITE3=${lib.getExe buildPackages.sqlite}"
  ];

  preCheck =
@@ -71,7 +72,6 @@ stdenv.mkDerivation (finalAttrs: {
      libPathEnvVar = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH";
    in
    ''
-      export HOME=$TMPDIR
      export TMP=$TMPDIR
      export ${libPathEnvVar}=$PWD/lib
    '';
--- a/pkgs/by-name/pr/prometheus-alertmanager/package.nix
+++ b/pkgs/by-name/pr/prometheus-alertmanager/package.nix
@@ -20,13 +20,13 @@ let
 in
 buildGoModule (finalAttrs: {
  pname = "alertmanager";
-  version = "0.33.0";
+  version = "0.33.1";

  src = fetchFromGitHub {
    owner = "prometheus";
    repo = "alertmanager";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-VXhu50KERPb4FDdcNDMftBqZVk2ipIphhejAE1wMSOk=";
+    hash = "sha256-LGjBuZ7kbtABunEk2YyCKILsPS/0FlS/6Mf/2qVpseI=";
  };

  postPatch = ''
--- a/pkgs/by-name/pr/prometheus-node-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-node-exporter/package.nix
@@ -8,16 +8,16 @@

 buildGoModule (finalAttrs: {
  pname = "node_exporter";
-  version = "1.11.1";
+  version = "1.12.0";

  src = fetchFromGitHub {
    owner = "prometheus";
    repo = "node_exporter";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-AoW4JO9V/sZDjonNT+Ar8saX/rlb1lB/+Vmu5qGtTlA=";
+    hash = "sha256-pjgxx7Xz0q2SctTEwDiwqmZAOTxrHt1XEl1pSMP7Ids=";
  };

-  vendorHash = "sha256-qTuzF4xeF0riOedwaUR4x/U6Jb0j+GIwUfUfstp2Cao=";
+  vendorHash = "sha256-WFRxkwMM9D612tLJjij+kwpcwhcl3KhR8xXxx43SC9o=";

  # FIXME: tests fail due to read-only nix store
  doCheck = false;
--- a/pkgs/by-name/pv/pvetui/package.nix
+++ b/pkgs/by-name/pv/pvetui/package.nix
@@ -7,7 +7,7 @@

 buildGoModule (finalAttrs: {
  pname = "pvetui";
-  version = "1.4.1";
+  version = "1.4.2";

  __structuredAttrs = true;

@@ -15,7 +15,7 @@ buildGoModule (finalAttrs: {
    owner = "devnullvoid";
    repo = "pvetui";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-RxQ5zI+JUI0QCMeHKgIyQQqbKSX2vt44IxFMNzB6KfM=";
+    hash = "sha256-yYYGXb+CriDRZcV8e/7MN4Pq8GKP35JdMrcxozWVBpE=";
  };

  vendorHash = "sha256-JOo/7/3J9LqefIYuRl9efSlSfzLvQ/B8Jpy2e5cdEio=";
--- a/pkgs/by-name/pw/pwru/package.nix
+++ b/pkgs/by-name/pw/pwru/package.nix
@@ -8,13 +8,13 @@

 buildGoModule (finalAttrs: {
  pname = "pwru";
-  version = "1.0.11";
+  version = "1.0.12";

  src = fetchFromGitHub {
    owner = "cilium";
    repo = "pwru";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-P4CKQOSpRujrgBVVNj1DD1jHoN7DEZ18PrfSOKSd31Y=";
+    hash = "sha256-U7xDjurLVX46cLjjKiWBtx1rKZ3CarWXaSXvuJpnejg=";
  };

  vendorHash = null;
--- a/pkgs/by-name/pw/pwvucontrol/package.nix
+++ b/pkgs/by-name/pw/pwvucontrol/package.nix
@@ -2,8 +2,6 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  fetchFromGitLab,
-  fetchpatch,
  blueprint-compiler,
  cargo,
  desktop-file-utils,
@@ -21,22 +19,23 @@
  pango,
  pipewire,
  wireplumber,
+  nix-update-script,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "pwvucontrol";
-  version = "0.5.2";
+  version = "0.5.3";

  src = fetchFromGitHub {
    owner = "saivert";
    repo = "pwvucontrol";
    tag = finalAttrs.version;
-    hash = "sha256-3H0qLhnhD/CVjKcx8UISFD4tSgH9O3V2uyNcgYug6Ug=";
+    hash = "sha256-Y5O/KkYYNDysZ3H0vk0qj2DOkmx/Z4vJELr9oydxpt8=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-k3a1I+M+rxXvABlgpsw6tFhTIgaxpsCUDwhuFQj6Nhc=";
+    hash = "sha256-pw7UrD4EFd04mxy8Cz3tif+lzlnemIjFkB7VVOnAA1E=";
  };

  postPatch = ''
@@ -72,13 +71,17 @@ stdenv.mkDerivation (finalAttrs: {
  # For https://github.com/saivert/pwvucontrol/blob/7bf43c746cd49fffbfb244ac4474742c6b3737a9/src/meson.build#L45-L46
  env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec;

+  passthru.updateScript = nix-update-script { };
+
  meta = {
    description = "Pipewire Volume Control";
    homepage = "https://github.com/saivert/pwvucontrol";
+    changelog = "https://github.com/saivert/pwvucontrol/releases/tag/${finalAttrs.version}";
    license = lib.licenses.gpl3Plus;
    maintainers = with lib.maintainers; [
      Guanran928
      johnrtitor
+      ilkecan
    ];
    mainProgram = "pwvucontrol";
    platforms = lib.platforms.linux;
--- a/pkgs/by-name/qa/qalculate-gtk/package.nix
+++ b/pkgs/by-name/qa/qalculate-gtk/package.nix
@@ -14,13 +14,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "qalculate-gtk";
-  version = "5.11.0";
+  version = "5.12.0";

  src = fetchFromGitHub {
    owner = "qalculate";
    repo = "qalculate-gtk";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-EVDbpE/T5EvKK/fTNSDbMFMQR+uamiXo7yjv9Se09w4=";
+    hash = "sha256-c0n0iu8KB0sK7dnvMcwQAFQvtOmaBpET4oRRufliN4k=";
  };

  hardeningDisable = [ "format" ];
--- a/pkgs/by-name/ra/rattler-build/package.nix
+++ b/pkgs/by-name/ra/rattler-build/package.nix
@@ -14,16 +14,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "rattler-build";
-  version = "0.67.0";
+  version = "0.68.0";

  src = fetchFromGitHub {
    owner = "prefix-dev";
    repo = "rattler-build";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-xEqwi19PTNnfJkGiMfGTYpgs/xrir/7neb0FKq7ZrYY=";
+    hash = "sha256-dS+PLxG5HfORy3hCEipS1rCoqCttHcqwsvIXwE5lQ/w=";
  };

-  cargoHash = "sha256-a7qkVeVWKX/v7FapuDaJ58FKhEpHVwSieDs67ORzG3o=";
+  cargoHash = "sha256-uJjS0dE89XRy1irTZv1piH2Mm9/CqeNuUJl8Ntc4V8c=";

  doCheck = false; # test requires network access

--- a/pkgs/by-name/ra/rauthy/package.nix
+++ b/pkgs/by-name/ra/rauthy/package.nix
@@ -8,20 +8,20 @@
  nix-update-script,
  perl,
  wasm-pack,
-  wasm-bindgen-cli_0_2_121,
+  wasm-bindgen-cli_0_2_126,
  binaryen,
  lld,
  rust-jemalloc-sys-unprefixed,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "rauthy";
-  version = "0.35.2";
+  version = "0.36.0";

  src = fetchFromGitHub {
    owner = "sebadob";
    repo = "rauthy";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-onwNtlz2FP01aYr/T3Y3KK3CJHKsBBOF6vCfWKrdyRE=";
+    hash = "sha256-ctc80gG36O4viHrFcG3RSrr8wnwD3YZD0eyauS9JCPA=";
  };

  nativeBuildInputs = [
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    nodejs
    npmHooks.npmConfigHook
    perl
-    wasm-bindgen-cli_0_2_121
+    wasm-bindgen-cli_0_2_126
    wasm-pack
  ];

@@ -40,10 +40,10 @@ rustPlatform.buildRustPackage (finalAttrs: {

  npmDeps = fetchNpmDeps {
    src = "${finalAttrs.src}/frontend";
-    hash = "sha256-w3x+dUfmJ4H82wX87C3UHEJ5Ls4v6lsn7kKOxvRJY8g=";
+    hash = "sha256-3bLzlGbC1i8TOYNi/SAVqIb8bsK0IhDTGr65rVWU5XY=";
  };

-  cargoHash = "sha256-oUc8aMsI3i0WM5/tP/ro93GgkjaDjBdYcgpxiKDvtJ4=";
+  cargoHash = "sha256-lkD2Yd15VuQT+OmMttea0KBWOnhwvRBN6aS1DVR0Heg=";

  preBuild = ''
    pushd src/wasm-modules
--- a/pkgs/by-name/rh/rhttp/package.nix
+++ b/pkgs/by-name/rh/rhttp/package.nix
@@ -4,9 +4,12 @@
  fetchFromGitHub,
 }:
 buildGoModule {
-  pname = "rHttp";
+  pname = "rhttp";
  version = "0-unstable-2024-04-28";

+  __structuredAttrs = true;
+  strictDeps = true;
+
  src = fetchFromGitHub {
    owner = "1buran";
    repo = "rHttp";
--- a/pkgs/by-name/rk/rkbin/package.nix
+++ b/pkgs/by-name/rk/rkbin/package.nix
@@ -7,13 +7,13 @@

 stdenvNoCC.mkDerivation {
  pname = "rkbin";
-  version = "0-unstable-2025-06-13";
+  version = "0-unstable-2025-12-30";

  src = fetchFromGitHub {
    owner = "rockchip-linux";
    repo = "rkbin";
-    rev = "74213af1e952c4683d2e35952507133b61394862";
-    hash = "sha256-gNCZwJd9pjisk6vmvtRNyGSBFfAYOADTa5Nd6Zk+qEk=";
+    rev = "ecb4fcbe954edf38b3ae037d5de6d9f5bccf81f4";
+    hash = "sha256-U8d2cH6/TSXfBnLhh141A9wP/t6prFgwYMvwgXBf4vc=";
  };

  installPhase = ''
@@ -23,11 +23,11 @@ stdenvNoCC.mkDerivation {
  '';

  passthru = {
-    BL31_RK3568 = "${rkbin}/bin/rk35/rk3568_bl31_v1.45.elf";
-    BL31_RK3588 = "${rkbin}/bin/rk35/rk3588_bl31_v1.51.elf";
-    TPL_RK3566 = "${rkbin}/bin/rk35/rk3566_ddr_1056MHz_v1.23.bin";
-    TPL_RK3568 = "${rkbin}/bin/rk35/rk3568_ddr_1056MHz_v1.23.bin";
-    TPL_RK3588 = "${rkbin}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.19.bin";
+    BL31_RK3568 = "${rkbin}/bin/rk35/rk3568_bl31_v1.46.elf";
+    BL31_RK3588 = "${rkbin}/bin/rk35/rk3588_bl31_v1.54.elf";
+    TPL_RK3566 = "${rkbin}/bin/rk35/rk3566_ddr_1056MHz_v1.25.bin";
+    TPL_RK3568 = "${rkbin}/bin/rk35/rk3568_ddr_1056MHz_v1.25.bin";
+    TPL_RK3588 = "${rkbin}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.21.bin";
  };

  meta = {
--- a/pkgs/by-name/rn/rnsapi/package.nix
+++ b/pkgs/by-name/rn/rnsapi/package.nix
@@ -7,15 +7,15 @@

 python3Packages.buildPythonApplication (finalAttrs: {
  pname = "rnsapi";
-  version = "0-unstable-2026-07-06";
+  version = "0-unstable-2026-07-09";
  pyproject = true;
  __structuredAttrs = true;

  src = fetchFromGitHub {
    owner = "attermann";
    repo = "ReticulumAPI";
-    rev = "9dc2a562c7e8695fb08c5204a403052a19af03d2";
-    hash = "sha256-8WsQyJtxkXVaObBHQCQ2VrqJUApSyePL1IVUoTE4XPk=";
+    rev = "1f20cf5d2f00894389c864d1e018d771191a9809";
+    hash = "sha256-IB67sLjOlaiAI8089ODAUNZRahvhLuiOxdGZ+4B24IE=";
  };

  build-system = [
@@ -48,6 +48,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
    homepage = "https://github.com/attermann/ReticulumAPI";
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ drupol ];
-    mainProgram = "reticulum-api";
+    mainProgram = "rnsapid";
  };
 })
--- a/pkgs/by-name/ru/rumdl/package.nix
+++ b/pkgs/by-name/ru/rumdl/package.nix
@@ -11,16 +11,18 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "rumdl";
-  version = "0.2.30";
+  version = "0.2.31";
+
+  __structuredAttrs = true;

  src = fetchFromGitHub {
    owner = "rvben";
    repo = "rumdl";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-P+mqXeafWRtaaNKPAlAP5zjmzP51PazMAvWL0FZK7jk=";
+    hash = "sha256-sKL1Sn7ipv/5fGwblSTwwLnMEmmNqapBv4phS7sELFY=";
  };

-  cargoHash = "sha256-SAmjBtRokZ9Qkz1DMXy1MZ2MCidXgWaMfhdTYXbLBQU=";
+  cargoHash = "sha256-Q9SQq5oyimRgxB+5FuRn73c00pqjeDDxuJ/klcvKck8=";

  cargoBuildFlags = [
    "--bin=rumdl"
@@ -74,6 +76,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    maintainers = with lib.maintainers; [
      kachick
      hasnep
+      faukah
    ];
    mainProgram = "rumdl";
    platforms = with lib.platforms; unix ++ windows;
--- a/pkgs/by-name/ru/rust-petname/package.nix
+++ b/pkgs/by-name/ru/rust-petname/package.nix
@@ -8,15 +8,15 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "rust-petname";
-  version = "3.0.0";
+  version = "3.1.0";

  src = fetchCrate {
    inherit (finalAttrs) version;
    crateName = "petname";
-    hash = "sha256-RKOW0SDRlMRPlsmWvk+teB14Tdf3tgrP35Glvn/wJBE=";
+    hash = "sha256-p5sGxGYzvc1b8Ch8MBwluMVFyu2Z8IIqhJzt68o90HQ=";
  };

-  cargoHash = "sha256-LMlfYVL6Hk+b7v6qvz0Y1y2awxvcH35+vCvBMvCUEv4=";
+  cargoHash = "sha256-7+LATYCokoh27sZkIWZ5eW4n1HZSB5fDvQKBeyObCgE=";

  doInstallCheck = true;
  nativeInstallCheckInputs = [ versionCheckHook ];
--- a/pkgs/by-name/sa/satysfi/package.nix
+++ b/pkgs/by-name/sa/satysfi/package.nix
@@ -79,7 +79,7 @@ ocamlPackages.buildDunePackage {
    mkdir -p $out/share/satysfi/dist/fonts
    cp -r lib-satysfi/dist/ $out/share/satysfi/
    cp -r \
-      ${ipaexfont}/share/fonts/opentype/* \
+      ${ipaexfont}/share/fonts/truetype/* \
      ${lmodern}/share/fonts/opentype/public/lm/* \
      ${lmmath}/share/fonts/opentype/latinmodern-math.otf \
      ${junicode}/share/fonts/truetype/Junicode-{Bold,BoldItalic,Italic}.ttf \
--- a/pkgs/by-name/th/thunderbird-mcp/package-lock.json
+++ b/pkgs/by-name/th/thunderbird-mcp/package-lock.json
--- a/pkgs/by-name/th/thunderbird-mcp/package.nix
+++ b/pkgs/by-name/th/thunderbird-mcp/package.nix
@@ -7,24 +7,30 @@

 buildNpmPackage (finalAttrs: {
  pname = "thunderbird-mcp";
-  version = "0.6.0";
+  version = "0.7.3";

  src = fetchFromGitHub {
    owner = "TKasperczyk";
    repo = "thunderbird-mcp";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-wewuXZV6tjSJ3gjmUkIoRFWwGbqVUc7xxEt1kp9dWSM=";
+    hash = "sha256-VIJUMMiJ2NCdMfxK4E/FAQ4P2ryS6KlxhPj749JH6sE=";
  };

  postPatch = ''
    cp ${./package-lock.json} package-lock.json
  '';

-  preInstall = "mkdir node_modules/";
  forceEmptyCache = true;
  dontNpmBuild = true;

-  npmDepsHash = "sha256-LbEnmABmAoTCTPNNbocl+n2TtFC3FOFwwTnyATxvM3k=";
+  npmDepsHash = "sha256-6irpujYRk/OvoTA43CvtoaOmHvK4coMFXRfXhGrjFNk=";
+
+  doCheck = true;
+
+  # Tests use local mock servers.
+  __darwinAllowLocalNetworking = true;
+
+  checkPhase = "npm test";

  passthru.updateScript = nix-update-script { };

--- a/pkgs/by-name/vp/vpnc-scripts/package.nix
+++ b/pkgs/by-name/vp/vpnc-scripts/package.nix
@@ -15,12 +15,12 @@

 stdenv.mkDerivation {
  pname = "vpnc-scripts";
-  version = "unstable-2023-01-03";
+  version = "unstable-2026-06-29";

  src = fetchgit {
    url = "https://gitlab.com/openconnect/vpnc-scripts.git";
-    rev = "22756827315bc875303190abb3756b5b1dd147ce";
-    hash = "sha256-EWrDyXg47Ur9mFutaG8+oYOCAW9AZowzwwJp3YbogIY=";
+    rev = "ce9e961bd0f6b867e1c7c35f78f6fb973f6ff101";
+    hash = "sha256-Gbu+UCw6uSXH5pGpzLx9mc8D1/tpRNwfF5h5QdEBbYE=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/by-name/we/webcord-vencord/package.nix
+++ b/pkgs/by-name/we/webcord-vencord/package.nix
@@ -1,6 +1,6 @@
 {
  # allow overriding electron
-  electron_41,
+  electron_42,
  webcord,
  replaceVars,
  lib,
@@ -8,7 +8,7 @@
 }:

 # nixpkgs-update: no auto update
-(webcord.override { inherit electron_41; }).overrideAttrs (old: {
+(webcord.override { inherit electron_42; }).overrideAttrs (old: {
  pname = "webcord-vencord";

  patches = (old.patches or [ ]) ++ [
--- a/pkgs/by-name/we/webcord/package.nix
+++ b/pkgs/by-name/we/webcord/package.nix
@@ -5,23 +5,23 @@
  copyDesktopItems,
  python3,
  xdg-utils,
-  electron_41,
+  electron_42,
  makeDesktopItem,
  nodejs_22,
 }:

 buildNpmPackage.override { nodejs = nodejs_22; } rec {
  pname = "webcord";
-  version = "4.13.0";
+  version = "4.13.2";

  src = fetchFromGitHub {
    owner = "SpacingBat3";
    repo = "WebCord";
    tag = "v${version}";
-    hash = "sha256-XUhaGZkHTLZlOuzh7aN9tIk7uBayiEID4MbmADhwvLs=";
+    hash = "sha256-td04ayA1AVDy6WCPQH3Y8zmZ6VfObqzFvm+cD8WZum4=";
  };

-  npmDepsHash = "sha256-KJMHQlCW/2AYG2Z0oshyMEvFiKsZgG4NKmsHMYrnyUE=";
+  npmDepsHash = "sha256-LLxDJOLLBnjHRHTH/q1o3szu+armmwx9ZIKYKHUO+Z0=";

  makeCacheWritable = true;

@@ -56,7 +56,7 @@ buildNpmPackage.override { nodejs = nodejs_22; } rec {
      install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png

      # Add xdg-utils to path via suffix, per PR #181171
-      makeWrapper '${lib.getExe electron_41}' $out/bin/webcord \
+      makeWrapper '${lib.getExe electron_42}' $out/bin/webcord \
        --suffix PATH : "${binPath}" \
        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
        --add-flags $out/lib/node_modules/webcord/
--- a/pkgs/by-name/we/webull-desktop/package.nix
+++ b/pkgs/by-name/we/webull-desktop/package.nix
@@ -60,7 +60,9 @@ stdenv.mkDerivation (finalAttrs: {
      };

      # Keep the "CURL_GNUTLS_3" symbol which is sought by libwbhttpsclient.so
-      patches = (previousAttrs.patches or [ ]) ++ [
+      # "fix-wakeup-consumption.patch" that is applied to newer versions of curl
+      #                                is not needed and will not apply to curl-8.10.0
+      patches = [
        (builtins.toFile "curl-gnutls-keep-symbols-compatible.patch" ''
          --- a/lib/libcurl.vers.in
          +++ b/lib/libcurl.vers.in
--- a/pkgs/by-name/xf/xfstests/package.nix
+++ b/pkgs/by-name/xf/xfstests/package.nix
@@ -29,8 +29,10 @@
  util-linux,
  which,
  writeScript,
+  writeShellScript,
  xfsprogs,
-  nix-update-script,
+  gitMinimal,
+  nix-update,
  runtimeShell,
 }:

@@ -157,7 +159,24 @@ stdenv.mkDerivation (finalAttrs: {
    }:$PATH
    exec ./check "$@"
  '';
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = writeShellScript "update-xfstests" ''
+    set -euo pipefail
+    export PATH=${
+      lib.makeBinPath [
+        coreutils
+        gitMinimal
+        gawk
+        nix-update
+      ]
+    }:$PATH
+    VERSION="$(git ls-remote --tags --refs https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git \
+      | awk '{ print $2 }' \
+      | grep '^refs/tags/v' \
+      | sed 's|^refs/tags/v||' \
+      | sort -V \
+      | tail -n1)"
+    exec nix-update --version "$VERSION" xfstests "$@"
+  '';

  meta = {
    description = "Torture test suite for filesystems";
--- a/pkgs/by-name/yu/yubioath-flutter/package.nix
+++ b/pkgs/by-name/yu/yubioath-flutter/package.nix
@@ -1,6 +1,6 @@
 {
  lib,
-  flutter341,
+  flutter344,
  python3Packages,
  fetchFromGitHub,
  pcre2,
@@ -14,15 +14,15 @@
  nix-update-script,
 }:

-flutter341.buildFlutterApplication rec {
+flutter344.buildFlutterApplication rec {
  pname = "yubioath-flutter";
-  version = "7.3.3";
+  version = "7.4.1";

  src = fetchFromGitHub {
    owner = "Yubico";
    repo = "yubioath-flutter";
    tag = version;
-    hash = "sha256-PB16QOD84i564LufF++tSdutuqUfKms6mTZW1knXTJk=";
+    hash = "sha256-7863P463ZOtYcrCN9KLQIj2YOTmKH62PFap5Ja7m5Ig=";
  };

  pubspecLock = lib.importJSON ./pubspec.lock.json;
--- a/pkgs/by-name/yu/yubioath-flutter/pubspec.lock.json
+++ b/pkgs/by-name/yu/yubioath-flutter/pubspec.lock.json
@@ -34,11 +34,11 @@
      "dependency": "direct main",
      "description": {
        "name": "archive",
-        "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
+        "sha256": "a96e8b390886ee8abb49b7bd3ac8df6f451c621619f52a26e815fdcf568959ff",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "4.0.7"
+      "version": "4.0.9"
    },
    "args": {
      "dependency": "direct main",
@@ -54,11 +54,11 @@
      "dependency": "direct main",
      "description": {
        "name": "async",
-        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
+        "sha256": "e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.13.0"
+      "version": "2.13.1"
    },
    "base32": {
      "dependency": "direct main",
@@ -84,21 +84,21 @@
      "dependency": "transitive",
      "description": {
        "name": "build",
-        "sha256": "275bf6bb2a00a9852c28d4e0b410da1d833a734d57d39d44f94bfc895a484ec3",
+        "sha256": "a156715e7cd728130c592f30552575908aae5b100005fbc1f0fb16b3c03a3d10",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "4.0.4"
+      "version": "4.0.6"
    },
    "build_config": {
      "dependency": "transitive",
      "description": {
        "name": "build_config",
-        "sha256": "4f64382b97504dc2fcdf487d5aae33418e08b4703fc21249e4db6d804a4d0187",
+        "sha256": "4070d2a59f8eec34c97c86ceb44403834899075f66e8a9d59706f8e7834f6f71",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.2.0"
+      "version": "1.3.0"
    },
    "build_daemon": {
      "dependency": "transitive",
@@ -114,11 +114,11 @@
      "dependency": "direct dev",
      "description": {
        "name": "build_runner",
-        "sha256": "ac78098de97893812b7aff1154f29008fa2464cad9e8e7044d39bc905dad4fbc",
+        "sha256": "1523ce62448ebac2c15a8ba5fbad8acac169788658a7dd2a1c2d9c2a9318b9a6",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.11.0"
+      "version": "2.15.0"
    },
    "built_collection": {
      "dependency": "transitive",
@@ -134,11 +134,11 @@
      "dependency": "transitive",
      "description": {
        "name": "built_value",
-        "sha256": "7931c90b84bc573fef103548e354258ae4c9d28d140e41961df6843c5d60d4d8",
+        "sha256": "34e4067d30ce212937df995f03b69992eea683539ceeac7f679a1f1eba055b56",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "8.12.3"
+      "version": "8.12.6"
    },
    "characters": {
      "dependency": "transitive",
@@ -204,21 +204,11 @@
      "dependency": "transitive",
      "description": {
        "name": "code_assets",
-        "sha256": "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687",
+        "sha256": "bf394f466ba9205f1812a0433b392d6af280f155f56651eda7c18cc32ed493b8",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.0.0"
-    },
-    "code_builder": {
-      "dependency": "transitive",
-      "description": {
-        "name": "code_builder",
-        "sha256": "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.11.1"
+      "version": "1.2.1"
    },
    "collection": {
      "dependency": "direct main",
@@ -244,21 +234,21 @@
      "dependency": "transitive",
      "description": {
        "name": "coverage",
-        "sha256": "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d",
+        "sha256": "956a3de0725ca232ad353565a8290d3357592bf4250f6f298a185e2d949c5d3d",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.15.0"
+      "version": "1.15.1"
    },
    "cross_file": {
      "dependency": "transitive",
      "description": {
        "name": "cross_file",
-        "sha256": "28bb3ae56f117b5aec029d702a90f57d285cd975c3c5c281eaca38dbc47c5937",
+        "sha256": "92c9c43c383bfa1c32079d3bc492d55d6d4318044b7b47edaff8971cbb555c51",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.3.5+2"
+      "version": "0.3.5+4"
    },
    "crypto": {
      "dependency": "direct main",
@@ -324,21 +314,21 @@
      "dependency": "transitive",
      "description": {
        "name": "dbus",
-        "sha256": "d0c98dcd4f5169878b6cf8f6e0a52403a9dff371a3e2f019697accbf6f44a270",
+        "sha256": "0ce9b0a839e6dee59a37a623d2fc26a35bbbe6404213e419b0d6411023d62645",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.7.12"
+      "version": "0.7.14"
    },
    "desktop_drop": {
      "dependency": "direct main",
      "description": {
        "name": "desktop_drop",
-        "sha256": "e70b46b2d61f1af7a81a40d1f79b43c28a879e30a4ef31e87e9c27bea4d784e8",
+        "sha256": "aa1e797255bfbc76f9eb5aa4f61e5b68dbf69962ab1be6495816d2f251bc0d1f",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.7.0"
+      "version": "0.7.1"
    },
    "dispose_scope": {
      "dependency": "transitive",
@@ -354,11 +344,11 @@
      "dependency": "transitive",
      "description": {
        "name": "equatable",
-        "sha256": "3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b",
+        "sha256": "3bce007a596ff8b3119c45d68aaef631272537c03d30e5d4534dd24bf4c5eaa2",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.0.8"
+      "version": "2.1.0"
    },
    "fake_async": {
      "dependency": "transitive",
@@ -374,11 +364,11 @@
      "dependency": "transitive",
      "description": {
        "name": "ffi",
-        "sha256": "d07d37192dbf97461359c1518788f203b0c9102cfd2c35a716b823741219542c",
+        "sha256": "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.1.5"
+      "version": "2.2.0"
    },
    "file": {
      "dependency": "transitive",
@@ -442,21 +432,21 @@
      "dependency": "transitive",
      "description": {
        "name": "flutter_plugin_android_lifecycle",
-        "sha256": "ee8068e0e1cd16c4a82714119918efdeed33b3ba7772c54b5d094ab53f9b7fd1",
+        "sha256": "3854fe5e3bff0b113c658f260b90c95dea17c92db0f2addeac2e343dd9969785",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.0.33"
+      "version": "2.0.35"
    },
    "flutter_riverpod": {
      "dependency": "direct main",
      "description": {
        "name": "flutter_riverpod",
-        "sha256": "e2026c72738a925a60db30258ff1f29974e40716749f3c9850aabf34ffc1a14c",
+        "sha256": "9255e1e3ad6e38906a1b4f8287678f95f378744c5b46b1985588543f3f19046e",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.2.1"
+      "version": "3.3.2"
    },
    "flutter_test": {
      "dependency": "direct dev",
@@ -530,21 +520,21 @@
      "dependency": "transitive",
      "description": {
        "name": "hooks",
-        "sha256": "7a08a0d684cb3b8fb604b78455d5d352f502b68079f7b80b831c62220ab0a4f6",
+        "sha256": "9a62a50b50b769a737bc0a8ff381f333529df3ab746b2f6b02e83760231455ba",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.0.1"
+      "version": "2.0.2"
    },
    "hotreloader": {
      "dependency": "transitive",
      "description": {
        "name": "hotreloader",
-        "sha256": "bc167a1163807b03bada490bfe2df25b0d744df359227880220a5cbd04e5734b",
+        "sha256": "66871df468fc24eee81f1a0a7cb98acc104716f9b7376d355437b48d633c4ebf",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "4.3.0"
+      "version": "4.4.0"
    },
    "http": {
      "dependency": "transitive",
@@ -602,6 +592,26 @@
      "source": "hosted",
      "version": "1.0.5"
    },
+    "jni": {
+      "dependency": "transitive",
+      "description": {
+        "name": "jni",
+        "sha256": "c2230682d5bc2362c1c9e8d3c7f406d9cbba23ab3f2e203a025dd47e0fb2e68f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
+    },
+    "jni_flutter": {
+      "dependency": "transitive",
+      "description": {
+        "name": "jni_flutter",
+        "sha256": "8b59e590786050b1cd866677dddaf76b1ade5e7bc751abe04b86e84d379d3ba6",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.1"
+    },
    "json_annotation": {
      "dependency": "direct main",
      "description": {
@@ -715,11 +725,11 @@
      "dependency": "direct main",
      "description": {
        "name": "material_symbols_icons",
-        "sha256": "c62b15f2b3de98d72cbff0148812f5ef5159f05e61fc9f9a089ec2bb234df082",
+        "sha256": "49c532dd0b74544e9d8d93ec0f821d52ec532e7c9263c889ebe71b1be4f34ba7",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "4.2906.0"
+      "version": "4.2951.0"
    },
    "menu_base": {
      "dependency": "transitive",
@@ -735,11 +745,11 @@
      "dependency": "direct dev",
      "description": {
        "name": "meta",
-        "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394",
+        "sha256": "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.17.0"
+      "version": "1.18.0"
    },
    "mime": {
      "dependency": "transitive",
@@ -751,16 +761,6 @@
      "source": "hosted",
      "version": "2.0.0"
    },
-    "native_toolchain_c": {
-      "dependency": "transitive",
-      "description": {
-        "name": "native_toolchain_c",
-        "sha256": "89e83885ba09da5fdf2cdacc8002a712ca238c28b7f717910b34bcd27b0d03ac",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.17.4"
-    },
    "node_preamble": {
      "dependency": "transitive",
      "description": {
@@ -775,11 +775,11 @@
      "dependency": "transitive",
      "description": {
        "name": "objective_c",
-        "sha256": "983c7fa1501f6dcc0cb7af4e42072e9993cb28d73604d25ebf4dab08165d997e",
+        "sha256": "6cb691c686fa2838c6deb34980d426145c2a5d537491cb83d463c33cdbc726ed",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "9.2.5"
+      "version": "9.4.1"
    },
    "package_config": {
      "dependency": "transitive",
@@ -815,21 +815,21 @@
      "dependency": "direct main",
      "description": {
        "name": "path_provider",
-        "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd",
+        "sha256": "a7f4874f987173da295a61c181b8ee71dab59b332a486b391babf26a1b884825",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.1.5"
+      "version": "2.1.6"
    },
    "path_provider_android": {
      "dependency": "transitive",
      "description": {
        "name": "path_provider_android",
-        "sha256": "f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e",
+        "sha256": "69cbd515a62b94d32a7944f086b2f82b4ac40a1d45bebfc00813a430ab2dabcd",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.2.22"
+      "version": "2.3.1"
    },
    "path_provider_foundation": {
      "dependency": "transitive",
@@ -845,21 +845,21 @@
      "dependency": "transitive",
      "description": {
        "name": "path_provider_linux",
-        "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279",
+        "sha256": "58c2005f147315b11e9b4a7bc889cd5203e250cba8e3f012dae259b4972b5c16",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.2.1"
+      "version": "2.2.2"
    },
    "path_provider_platform_interface": {
      "dependency": "transitive",
      "description": {
        "name": "path_provider_platform_interface",
-        "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334",
+        "sha256": "484838772624c3a4b94f1e44a3e19897fee738f2d5c4ce448443b0417f7c9dda",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.3"
    },
    "path_provider_windows": {
      "dependency": "transitive",
@@ -875,31 +875,31 @@
      "dependency": "direct dev",
      "description": {
        "name": "patrol_finders",
-        "sha256": "2b46426a89498414ee5c24d2fbf34ba1796cc9dff4e49ce4322544bace03be6b",
+        "sha256": "34e75a59df653dc9e6fc6c0caa469b950b18aaa538aaf859f756b52f937f0da8",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.0.0"
+      "version": "3.5.0"
    },
    "patrol_log": {
      "dependency": "transitive",
      "description": {
        "name": "patrol_log",
-        "sha256": "017fe7ea3ab662e78673a8acbbb7c96b71f38def59b70d44d0169887620e9fbf",
+        "sha256": "080608c3402480e18f7dce5a7ee17bf2e23fc191eedffb73a8a635506ce6d4bf",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.6.0"
+      "version": "0.9.1"
    },
    "petitparser": {
      "dependency": "transitive",
      "description": {
        "name": "petitparser",
-        "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1",
+        "sha256": "91bd59303e9f769f108f8df05e371341b15d59e995e6806aefab827b58336675",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "7.0.1"
+      "version": "7.0.2"
    },
    "platform": {
      "dependency": "transitive",
@@ -935,11 +935,11 @@
      "dependency": "transitive",
      "description": {
        "name": "posix",
-        "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61",
+        "sha256": "185ef7606574f789b40f289c233efa52e96dead518aed988e040a10737febb07",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "6.0.3"
+      "version": "6.5.0"
    },
    "process": {
      "dependency": "transitive",
@@ -980,15 +980,25 @@
      "source": "path",
      "version": "1.0.0"
    },
+    "record_use": {
+      "dependency": "transitive",
+      "description": {
+        "name": "record_use",
+        "sha256": "2551bd8eecfe95d14ae75f6021ad0248be5c27f138c2ec12fcb52b500b3ba1ed",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.6.0"
+    },
    "riverpod": {
      "dependency": "transitive",
      "description": {
        "name": "riverpod",
-        "sha256": "8c22216be8ad3ef2b44af3a329693558c98eca7b8bd4ef495c92db0bba279f83",
+        "sha256": "17100416c51db7810c71a7bb2c34d1f881faa0074fd452afb0c4db6f8f126c76",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.2.1"
+      "version": "3.3.2"
    },
    "rxdart": {
      "dependency": "transitive",
@@ -1004,71 +1014,71 @@
      "dependency": "direct main",
      "description": {
        "name": "screen_retriever",
-        "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c",
+        "sha256": "ace919117a7520c13a50a6259e60c4a0d4cbe98809468792a91b5c5adada2aa6",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.2.0"
+      "version": "0.2.2"
    },
    "screen_retriever_linux": {
      "dependency": "transitive",
      "description": {
        "name": "screen_retriever_linux",
-        "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18",
+        "sha256": "7b52006a5ceae1f3d5af7f77188c3290d6e7d8ded16d99809bea84967c65c257",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.2.0"
+      "version": "0.2.2"
    },
    "screen_retriever_macos": {
      "dependency": "transitive",
      "description": {
        "name": "screen_retriever_macos",
-        "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149",
+        "sha256": "a1489b99cce597c45a54b9aae1cd94c8d4705353b7e0bb2457a6e4de44e0ad8a",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.2.0"
+      "version": "0.2.2"
    },
    "screen_retriever_platform_interface": {
      "dependency": "transitive",
      "description": {
        "name": "screen_retriever_platform_interface",
-        "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0",
+        "sha256": "94a5535277510a63184ca178ce12a1449bc0b38618879aa1c18bf57369c5064a",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.2.0"
+      "version": "0.2.2"
    },
    "screen_retriever_windows": {
      "dependency": "transitive",
      "description": {
        "name": "screen_retriever_windows",
-        "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13",
+        "sha256": "dafc6922b0bfbf1d48cf3ccbf519b4fff47bdcb820da1728ea6db675fecc9324",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.2.0"
+      "version": "0.2.2"
    },
    "shared_preferences": {
      "dependency": "direct main",
      "description": {
        "name": "shared_preferences",
-        "sha256": "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64",
+        "sha256": "c3025c5534b01739267eb7d76959bbc25a6d10f6988e1c2a3036940133dd10bf",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.5.4"
+      "version": "2.5.5"
    },
    "shared_preferences_android": {
      "dependency": "transitive",
      "description": {
        "name": "shared_preferences_android",
-        "sha256": "cbc40be9be1c5af4dab4d6e0de4d5d3729e6f3d65b89d21e1815d57705644a6f",
+        "sha256": "93ae5884a9df5d3bb696825bceb3a17590754548b5d740eba51500afc8d088f5",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.4.20"
+      "version": "2.4.26"
    },
    "shared_preferences_foundation": {
      "dependency": "transitive",
@@ -1094,11 +1104,11 @@
      "dependency": "transitive",
      "description": {
        "name": "shared_preferences_platform_interface",
-        "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80",
+        "sha256": "649dc798a33931919ea356c4305c2d1f81619ea6e92244070b520187b5140ef9",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.2"
    },
    "shared_preferences_web": {
      "dependency": "transitive",
@@ -1180,11 +1190,11 @@
      "dependency": "transitive",
      "description": {
        "name": "source_gen",
-        "sha256": "1d562a3c1f713904ebbed50d2760217fd8a51ca170ac4b05b0db490699dbac17",
+        "sha256": "ec37cc0e6694374cbef59ed79685572c870a54ede6fa30a3e420feb3adffea02",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "4.2.0"
+      "version": "4.2.3"
    },
    "source_helper": {
      "dependency": "transitive",
@@ -1300,41 +1310,41 @@
      "dependency": "transitive",
      "description": {
        "name": "test",
-        "sha256": "280d6d890011ca966ad08df7e8a4ddfab0fb3aa49f96ed6de56e3521347a9ae7",
+        "sha256": "8d9ceddbab833f180fbefed08afa76d7c03513dfdba87ffcec2718b02bbcbf20",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.30.0"
+      "version": "1.31.0"
    },
    "test_api": {
      "dependency": "transitive",
      "description": {
        "name": "test_api",
-        "sha256": "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a",
+        "sha256": "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.7.10"
+      "version": "0.7.11"
    },
    "test_core": {
      "dependency": "transitive",
      "description": {
        "name": "test_core",
-        "sha256": "0381bd1585d1a924763c308100f2138205252fb90c9d4eeaf28489ee65ccde51",
+        "sha256": "1991d4cfe85d5043241acac92962c3977c8d2f2add1ee73130c7b286417d1d34",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.6.16"
+      "version": "0.6.17"
    },
    "tray_manager": {
      "dependency": "direct main",
      "description": {
        "name": "tray_manager",
-        "sha256": "c5fd83b0ae4d80be6eaedfad87aaefab8787b333b8ebd064b0e442a81006035b",
+        "sha256": "1a659b08baa6e9b91ef8ce16eda37740de398be1c4cf322b8a1ddfef25c68c5a",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.5.2"
+      "version": "0.5.3"
    },
    "typed_data": {
      "dependency": "transitive",
@@ -1370,21 +1380,21 @@
      "dependency": "transitive",
      "description": {
        "name": "url_launcher_android",
-        "sha256": "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611",
+        "sha256": "b413d49b73867ac08dd2f9890efd3cc11f2a0e577618d50843440a1fb3776c32",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "6.3.28"
+      "version": "6.3.32"
    },
    "url_launcher_ios": {
      "dependency": "transitive",
      "description": {
        "name": "url_launcher_ios",
-        "sha256": "cfde38aa257dae62ffe79c87fab20165dfdf6988c1d31b58ebf59b9106062aad",
+        "sha256": "580fe5dfb51671ae38191d316e027f6b76272b026370708c2d898799750a02b0",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "6.3.6"
+      "version": "6.4.1"
    },
    "url_launcher_linux": {
      "dependency": "transitive",
@@ -1420,11 +1430,11 @@
      "dependency": "transitive",
      "description": {
        "name": "url_launcher_web",
-        "sha256": "d0412fcf4c6b31ecfdb7762359b7206ffba3bbffd396c6d9f9c4616ece476c1f",
+        "sha256": "85c81589622fbc87c1c683aaea164d3604a7777495a79d91e39ffcdec39ddb34",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.4.2"
+      "version": "2.4.3"
    },
    "url_launcher_windows": {
      "dependency": "transitive",
@@ -1440,21 +1450,21 @@
      "dependency": "transitive",
      "description": {
        "name": "uuid",
-        "sha256": "a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8",
+        "sha256": "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "4.5.2"
+      "version": "4.5.3"
    },
    "vector_graphics": {
      "dependency": "direct main",
      "description": {
        "name": "vector_graphics",
-        "sha256": "a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6",
+        "sha256": "2306c03da2ba81724afeb589c351ebbc0aa7d86005925be8f8735856dbe5e42d",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.1.19"
+      "version": "1.2.2"
    },
    "vector_graphics_codec": {
      "dependency": "transitive",
@@ -1470,11 +1480,11 @@
      "dependency": "direct main",
      "description": {
        "name": "vector_graphics_compiler",
-        "sha256": "201e876b5d52753626af64b6359cd13ac6011b80728731428fd34bc840f71c9b",
+        "sha256": "142a9146f447d15b10bdc00e21d5f4d83e5b32bb5f8f8f5a04c75311344923a3",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.1.20"
+      "version": "1.2.6"
    },
    "vector_math": {
      "dependency": "transitive",
@@ -1490,11 +1500,11 @@
      "dependency": "transitive",
      "description": {
        "name": "vm_service",
-        "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
+        "sha256": "0016aef94fc66495ac78af5859181e3f3bf2026bd8eecc72b9565601e19ab360",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "15.0.2"
+      "version": "15.2.0"
    },
    "watcher": {
      "dependency": "transitive",
@@ -1609,7 +1619,7 @@
    }
  },
  "sdks": {
-    "dart": ">=3.10.3 <4.0.0",
-    "flutter": ">=3.38.4"
+    "dart": ">=3.12.0 <4.0.0",
+    "flutter": ">=3.44.0"
  }
 }
--- a/pkgs/by-name/zs/zsync/package.nix
+++ b/pkgs/by-name/zs/zsync/package.nix
@@ -3,17 +3,18 @@
  stdenv,
  fetchFromGitHub,
  autoreconfHook,
+  perl,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "zsync";
-  version = "0.6.3-unstable-2025-05-29";
+  version = "0.6.4";

  src = fetchFromGitHub {
    owner = "cph6";
    repo = "zsync";
-    rev = "a5cb28f923dd3cfdeb65e2930dd1faa727c2abf8";
-    hash = "sha256-gJs1P83AKWGipspeoFCSibZH+X6mmj3aL4+yjGO2YJo=";
+    tag = finalAttrs.version;
+    hash = "sha256-qZSjh23snJHWmrIUxRvpu5pZ1G3rJcnl08WGEEM+0Jw=";
  };

  sourceRoot = "${finalAttrs.src.name}/c";
@@ -41,9 +42,14 @@ stdenv.mkDerivation (finalAttrs: {
    autoreconfHook
  ];

+  doCheck = true;
+
+  nativeCheckInputs = [ perl ];
+
  meta = {
-    homepage = "https://github.com/cph6/zsync";
    description = "File distribution system using the rsync algorithm";
+    homepage = "https://github.com/cph6/zsync";
+    changelog = "https://github.com/cph6/zsync/raw/refs/tags/${finalAttrs.src.tag}/c/NEWS";
    license = lib.licenses.artistic2;
    maintainers = with lib.maintainers; [
      viric
--- a/pkgs/development/mobile/androidenv/repo.json
+++ b/pkgs/development/mobile/androidenv/repo.json
--- a/pkgs/development/ocaml-modules/pyml/default.nix
+++ b/pkgs/development/ocaml-modules/pyml/default.nix
@@ -9,19 +9,15 @@

 buildDunePackage (finalAttrs: {
  pname = "pyml";
-  version = "20231101";
+  version = "20250807";

  src = fetchFromGitHub {
    owner = "ocamllibs";
    repo = "pyml";
    tag = finalAttrs.version;
-    hash = "sha256-0Yy5T/S3Npwt0XJmEsdXGg5AXYi9vV9UG9nMSzz/CEc=";
+    hash = "sha256-WPtmj9EEs7P72OXWJg1syIrbLuh7u4V4W4nyozXmSa0=";
  };

-  patches = [
-    ./remove-stdcompat.patch
-  ];
-
  buildInputs = [
    utop
  ];
@@ -37,6 +33,7 @@ buildDunePackage (finalAttrs: {
  ];

  strictDeps = true;
+  __structuredAttrs = true;

  doCheck = true;

--- a/pkgs/development/ocaml-modules/pyml/remove-stdcompat.patch
+++ b/pkgs/development/ocaml-modules/pyml/remove-stdcompat.patch
@@ -1,11 +0,0 @@
-diff --git a/pyml_stubs.c b/pyml_stubs.c
-index 40e3481..e7826f1 100644
--- a/pyml_stubs.c
-+++ b/pyml_stubs.c
-@@ -11,7 +11,6 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <errno.h>
-#include <stdcompat.h>
- #include <assert.h>
- #include "pyml_stubs.h"
--- a/pkgs/development/python-modules/cleanit/default.nix
+++ b/pkgs/development/python-modules/cleanit/default.nix
@@ -43,10 +43,7 @@ buildPythonPackage rec {
    pyyaml
  ];

-  pythonRelaxDeps = [
-    "click"
-    "jsonschema"
-  ];
+  pythonRelaxDeps = [ "chardet" ];

  nativeCheckInputs = [ pytestCheckHook ];

--- a/pkgs/development/python-modules/courlan/default.nix
+++ b/pkgs/development/python-modules/courlan/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage (finalAttrs: {
      substituteInPlace tests/unit_tests.py \
        --replace-fail \
          'assert os.system("courlan --help") == 0' \
-          'assert os.system("${courlanBinPath} --help") == 0' \
+          'assert subprocess.run(["${courlanBinPath}", "--help"]).returncode == 0' \
        --replace-fail \
          'courlan_bin = "courlan"' \
          'courlan_bin = "${courlanBinPath}"'
--- a/pkgs/development/python-modules/cssbeautifier/default.nix
+++ b/pkgs/development/python-modules/cssbeautifier/default.nix
@@ -5,17 +5,16 @@
  fetchPypi,
  jsbeautifier,
  setuptools,
-  six,
 }:

 buildPythonPackage rec {
  pname = "cssbeautifier";
-  version = "1.15.4";
+  version = "2.0.1";
  pyproject = true;

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-m7CNw/ZMEBoBZ38Sis8BkFkUz0Brr4dDTc3gW3TArPU=";
+    hash = "sha256-9hAsBYnIW+PBoBbO527jZh7kvV2ojUil+HCL+vZjriY=";
  };

  nativeBuildInputs = [ setuptools ];
@@ -23,7 +22,6 @@ buildPythonPackage rec {
  propagatedBuildInputs = [
    editorconfig
    jsbeautifier
-    six
  ];

  # Module has no tests
--- a/pkgs/development/python-modules/redisvl/default.nix
+++ b/pkgs/development/python-modules/redisvl/default.nix
@@ -27,6 +27,8 @@ buildPythonPackage (finalAttrs: {

  build-system = [ hatchling ];

+  pythonRelaxDeps = [ "redis" ];
+
  dependencies = [
    numpy
    pyyaml
--- a/pkgs/development/python-modules/riscof/make_writeable.patch
+++ b/pkgs/development/python-modules/riscof/make_writeable.patch
@@ -1,25 +1,33 @@
 diff --git a/riscof/cli.py b/riscof/cli.py
-index 26af62e..9d0ddbf 100644
+index 26af62e..94051ae 100644
 --- a/riscof/cli.py
 +++ b/riscof/cli.py
-@@ -502,6 +502,7 @@ def setup(dutname,refname,work_dir):
+@@ -7,6 +7,7 @@ import os
+ import sys
+ import pytz
+ import shutil
+import subprocess
+ import configparser
+ import distutils.dir_util
+
+@@ -502,6 +503,7 @@ def setup(dutname,refname,work_dir):
         src = os.path.join(constants.root, "Templates/setup/model/")
         dest = os.path.join(cwd, dutname)
         distutils.dir_util.copy_tree(src, dest)
-+        os.system(f"chmod +w -R '{dest}'")
+        subprcess.run(["chmod", "+w", "-R", dest])
 
         os.rename(cwd+'/'+dutname+'/model_isa.yaml',
                 cwd+'/'+dutname+'/'+dutname+'_isa.yaml')
-@@ -525,10 +526,12 @@ def setup(dutname,refname,work_dir):
+@@ -525,10 +527,12 @@ def setup(dutname,refname,work_dir):
             src = os.path.join(constants.root, "Templates/setup/sail_cSim/")
             dest = os.path.join(cwd, refname)
             distutils.dir_util.copy_tree(src, dest)
-+            os.system(f"chmod +w -R '{dest}'")
+            subprcess.run(["chmod", "+w", "-R", dest])
         else:
             src = os.path.join(constants.root, "Templates/setup/reference/")
             dest = os.path.join(cwd, refname)
             distutils.dir_util.copy_tree(src, dest)
-+            os.system(f"chmod +w -R '{dest}'")
+            subprcess.run(["chmod", "+w", "-R", dest])
             os.rename(cwd+'/'+refname+'/riscof_model.py',
                 cwd+'/'+refname+'/riscof_'+refname+'.py')
             with open(cwd+'/'+refname+'/riscof_'+refname+'.py', 'r') as file :
--- a/pkgs/os-specific/linux/usbrelay/test.nix
+++ b/pkgs/os-specific/linux/usbrelay/test.nix
@@ -45,9 +45,11 @@ import ../../../../nixos/tests/make-test-python.nix (
      documentation.nixos.enable = false; # building nixos manual takes long time
    };

-    testScript = ''
+    testScript = /* py */ ''
      import os
-      if os.waitstatus_to_exitcode(os.system("lsusb -d 16c0:05df")) != 0:
+      import subprocess
+
+      if os.waitstatus_to_exitcode(subprocess.run(["lsusb", "-d", "16c0:05df"]).returncode) != 0:
          print("No USB relay detected, skipping test")
          import sys
          sys.exit(2)
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1021,6 +1021,7 @@ mapAliases {
  haxor-news = throw "'haxor-news' has been removed as it is unmaintained"; # Added 2026-06-16
  helix-gpt = throw "helix-gpt was deprecated in January 2026 and has been since removed"; # Added 2026-02-05
  HentaiAtHome = throw "'HentaiAtHome' has been renamed to/replaced by 'hentai-at-home'"; # Converted to throw 2025-10-27
+  heptabase = throw "'heptabase' bas been removed due to lack of maintenance."; # Added 2026-05-31
  hiawatha = throw "hiawatha has been removed, since it is no longer actively supported upstream, nor well maintained in nixpkgs"; # Added 2025-09-10
  hibernate = throw "hibernate has been removed due to lack of maintenance"; # Added 2025-09-10
  hiddify-app = throw "hiddify-app has been removed, since it is unmaintained"; # Added 2025-08-20
@@ -1500,6 +1501,7 @@ mapAliases {
  matrix-synapse-tools.synadm = throw "'matrix-synapse-tools.synadm' has been renamed to/replaced by 'synadm'"; # Converted to throw 2025-10-27
  mbedtls_2 = throw "'mbedtls_2' has been removed as it reached its end of life. Migrate to 'mbedtls'.";
  mcomix3 = throw "'mcomix3' has been renamed to/replaced by 'mcomix'"; # Converted to throw 2025-10-27
+  mcphost = throw "'mcphost' has been removed as it was marked discontinued upstream"; # Added 2026-07-08
  mdbook-alerts = throw "'mdbook-alerts' has been removed because it is deprecated and natively supported by mdbook since version 0.5.0"; # Added 2026-01-07
  mdbook-linkcheck = throw "'mdbook-linkcheck' has been removed and replaced by 'mdbook-linkcheck2' due to incompatibility with mdbook version 0.5.0+"; # Added 2026-03-03
  mdt = throw "'mdt' has been renamed to/replaced by 'md-tui'"; # Converted to throw 2025-10-27
@@ -1994,6 +1996,7 @@ mapAliases {
  retroarchFull = throw "'retroarchFull' has been renamed to/replaced by 'retroarch-full'"; # Converted to throw 2025-10-27
  retroshare06 = throw "'retroshare06' has been renamed to/replaced by 'retroshare'"; # Converted to throw 2025-10-27
  rewind-ai = throw "'rewind-ai' has been removed due to lack of of maintenance upstream"; # Added 2025-08-03
+  rHttp = rhttp; # Added 2026-07-05
  rigsofrods = throw "'rigsofrods' has been renamed to/replaced by 'rigsofrods-bin'"; # Converted to throw 2025-10-27
  rili = throw "'rili' has been dropped in favor of its maintained fork 'li-ri'"; # Added 2026-01-03
  rke2_1_29 = throw "'rke2_1_29' has been removed from nixpkgs as it has reached end of life"; # Added 2025-05-05