Merge master into staging-next

2026-06-05 21:03:40 +00:00 · 2026-06-05 13:01:44 +00:00
parent 280c4a0775 5da2ffddbc
commit eb0a874834
81 changed files with 504 additions and 326 deletions
--- a/nixos/tests/web-apps/pdfding/basic.nix
+++ b/nixos/tests/web-apps/pdfding/basic.nix
@@ -34,6 +34,10 @@

        # enable mailpit
        services.mailpit.instances.default = { };
+
+        # allows running nixos test on qemu without kvm, eg. github actions on aarch64-linux
+        systemd.settings.Manager.DefaultDeviceTimeoutSec = lib.mkForce 1800;
+        boot.initrd.kernelModules = [ "virtio_console" ];
      };
  };

--- a/nixos/tests/web-apps/pdfding/e2e.nix
+++ b/nixos/tests/web-apps/pdfding/e2e.nix
@@ -42,6 +42,10 @@
            # it only cares about files in static/
          ))
        ];
+
+        # allows running nixos test on qemu without kvm, eg. github actions on aarch64-linux
+        systemd.settings.Manager.DefaultDeviceTimeoutSec = lib.mkForce 1800;
+        boot.initrd.kernelModules = [ "virtio_console" ];
      };
  };

--- a/nixos/tests/web-apps/pdfding/postgres.nix
+++ b/nixos/tests/web-apps/pdfding/postgres.nix
@@ -25,6 +25,10 @@
        environment.systemPackages = [
          config.services.postgresql.finalPackage
        ];
+
+        # allows running nixos test on qemu without kvm, eg. github actions on aarch64-linux
+        systemd.settings.Manager.DefaultDeviceTimeoutSec = lib.mkForce 1800;
+        boot.initrd.kernelModules = [ "virtio_console" ];
      };
  };

--- a/nixos/tests/web-apps/pdfding/s3-backups.nix
+++ b/nixos/tests/web-apps/pdfding/s3-backups.nix
@@ -92,6 +92,10 @@ in
          minio-client
          sqlite
        ];
+
+        # allows running nixos test on qemu without kvm, eg. github actions on aarch64-linux
+        systemd.settings.Manager.DefaultDeviceTimeoutSec = lib.mkForce 1800;
+        boot.initrd.kernelModules = [ "virtio_console" ];
      };
  };

--- a/nixos/tests/web-apps/pixelfed/default.nix
+++ b/nixos/tests/web-apps/pixelfed/default.nix
@@ -4,6 +4,7 @@
 let
  supportedSystems = [
    "x86_64-linux"
+    "aarch64-linux"
    "i686-linux"
  ];
 in
--- a/nixos/tests/web-apps/pixelfed/standard.nix
+++ b/nixos/tests/web-apps/pixelfed/standard.nix
@@ -4,7 +4,7 @@

  nodes = {
    server =
-      { pkgs, ... }:
+      { pkgs, lib, ... }:
      {
        services.pixelfed = {
          enable = true;
@@ -19,16 +19,25 @@
          );
          settings."FORCE_HTTPS_URLS" = false;
        };
+
+        # to prevent getting killed by oom
+        virtualisation.memorySize = 2048;
+        virtualisation.emptyDiskImages = [ 4096 ];
+        swapDevices = [ { device = "/dev/vdb"; } ];
+
+        # allows running nixos test on qemu without kvm, eg. github actions on aarch64-linux
+        systemd.settings.Manager.DefaultDeviceTimeoutSec = lib.mkForce 1800;
+        boot.initrd.kernelModules = [ "virtio_console" ];
      };
  };

  testScript = ''
    # Wait for Pixelfed PHP pool
-    server.wait_for_unit("phpfpm-pixelfed.service")
+    server.wait_for_unit("phpfpm-pixelfed.service", timeout=1800)
    # Wait for NGINX
-    server.wait_for_unit("nginx.service")
+    server.wait_for_unit("nginx.service", timeout=1800)
    # Wait for HTTP port
-    server.wait_for_open_port(80)
+    server.wait_for_open_port(80, timeout=1800)
    # Access the homepage.
    server.succeed("curl -H 'Host: pixelfed.local' http://localhost")
    # Create an account
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -7309,6 +7309,19 @@ final: prev: {
    meta.hydraPlatforms = [ ];
  };

+  heirline-components-nvim = buildVimPlugin {
+    pname = "heirline-components.nvim";
+    version = "2026-02-25";
+    src = fetchFromGitHub {
+      owner = "Zeioth";
+      repo = "heirline-components.nvim";
+      rev = "5ea9a16286c01b7c36d58c91903d1f8ff0b7ddeb";
+      sha256 = "0gij9c9qgmqc99fnqnvp6icxp32q0wkz536ric2x5vpbqlzsdkik";
+    };
+    meta.homepage = "https://github.com/Zeioth/heirline-components.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
  heirline-nvim = buildVimPlugin {
    pname = "heirline.nvim";
    version = "1.0.8";
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1753,6 +1753,10 @@ assertNoAdditions {
    checkInputs = [ self.telescope-nvim ];
  };

+  heirline-components-nvim = super.heirline-components-nvim.overrideAttrs {
+    nvimRequireCheck = "heirline-components.all";
+  };
+
  helm-ls-nvim = super.helm-ls-nvim.overrideAttrs {
    runtimeDeps = [
      helm-ls
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -521,6 +521,7 @@ https://github.com/travitch/hasksyn/,,
 https://github.com/StackInTheWild/headhunter.nvim/,,
 https://github.com/lukas-reineke/headlines.nvim/,,
 https://github.com/rebelot/heirline.nvim/,,
+https://github.com/Zeioth/heirline-components.nvim/,,
 https://github.com/qvalentin/helm-ls.nvim/,,
 https://github.com/OXY2DEV/helpview.nvim/,,
 https://github.com/RaafatTurki/hex.nvim/,,
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1292,13 +1292,13 @@
    "vendorHash": "sha256-HjrB7C0KaLJz9NVLfZdq5EZbNbF9lJPxSkQwnWUF978="
  },
  "tailscale_tailscale": {
-    "hash": "sha256-h+VKIhmx3wa+kImQaHeqXYM8oxeH3Ic75bG7FHBKJ1g=",
+    "hash": "sha256-1cQq2nM4EJFFRtsnE7mXKJv4ILfJDtZSTX4hG/jNdwM=",
    "homepage": "https://registry.terraform.io/providers/tailscale/tailscale",
    "owner": "tailscale",
    "repo": "terraform-provider-tailscale",
-    "rev": "v0.29.1",
+    "rev": "v0.29.2",
    "spdx": "MIT",
-    "vendorHash": "sha256-hl9govsnEXMd4VbOPqoSGLgSnImDA55enYTaDz2wKH0="
+    "vendorHash": "sha256-rD4W2PkRrIQfACm8UWdF0yfZ+Qc5hTjH1lA6U7GJxpE="
  },
  "telmate_proxmox": {
    "hash": "sha256-1aKKlOIk1mH4yx66eD635d1IaUWXIiBGHEt4A2F2mGM=",
--- a/pkgs/by-name/an/android-cli/package.nix
+++ b/pkgs/by-name/an/android-cli/package.nix
@@ -8,18 +8,19 @@
 }:

 let
+  version = "1.0.15498356";
  platformData = {
    x86_64-linux = {
-      url = "https://dl.google.com/android/cli/latest/linux_x86_64/android-cli";
-      hash = "sha256-1F9RVDPqiy60zs2CfWytKSPKeRC9KDTogw4Ml59HaeY=";
+      url = "https://dl.google.com/android/cli/${version}/linux_x86_64/android-cli";
+      hash = "sha256-TmwLwLKqnMCxWwtX8m50KflmisfeG3PjZsBs7z9vccU=";
    };
    x86_64-darwin = {
-      url = "https://dl.google.com/android/cli/latest/darwin_x86_64/android-cli";
-      hash = "sha256-bXP9rRMSqQa3+kfUJnIeDb1LZXh2P2A6ytwunzjyfGs=";
+      url = "https://dl.google.com/android/cli/${version}/darwin_x86_64/android-cli";
+      hash = "sha256-ThBobULyevoKlp/22tdUqnBBccX6FbPDNrSwwuK4wnw=";
    };
    aarch64-darwin = {
-      url = "https://dl.google.com/android/cli/latest/darwin_arm64/android-cli";
-      hash = "sha256-r47LXmilevW0td4N+SRTR7EFnCrPBdG7G/oTUAea90Q=";
+      url = "https://dl.google.com/android/cli/${version}/darwin_arm64/android-cli";
+      hash = "sha256-E3PC0Ivf6MoYRQu56dSD/49LI8DJZhXL27/o6daH0Sg=";
    };
  };

@@ -30,7 +31,7 @@ let
 in
 stdenv.mkDerivation {
  pname = "android-cli";
-  version = "1.0.15433482";
+  inherit version;

  strictDeps = true;
  __structuredAttrs = true;
--- a/pkgs/by-name/be/betterleaks/package.nix
+++ b/pkgs/by-name/be/betterleaks/package.nix
@@ -10,13 +10,13 @@

 buildGoModule (finalAttrs: {
  pname = "betterleaks";
-  version = "1.3.1";
+  version = "1.4.0";

  src = fetchFromGitHub {
    owner = "betterleaks";
    repo = "betterleaks";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-bPrOp5PP5BxkSOA7wUmq/bbVPg+bwymGQ0rl8PvPSAE=";
+    hash = "sha256-bDyWTye+OEzgqzJukWCEjl4NsD1udHr+tSP3e1ahj/4=";
  };

  vendorHash = "sha256-RStdC7M0+bPNXwaATxkMOBGf1OrT0pqlNPTJ7TCelfk=";
--- a/pkgs/by-name/bo/boinc/package.nix
+++ b/pkgs/by-name/bo/boinc/package.nix
@@ -28,14 +28,14 @@

 stdenv.mkDerivation rec {
  pname = "boinc";
-  version = "8.2.11";
+  version = "8.2.13";

  src = fetchFromGitHub {
    name = "${pname}-${version}-src";
    owner = "BOINC";
    repo = "boinc";
    rev = "client_release/${lib.versions.majorMinor version}/${version}";
-    hash = "sha256-xWEAjTWEUCTTtxfCFFMcrJD0DRVmUAgi2vE0GifTX2Q=";
+    hash = "sha256-BzP3yDGAhJ1DtrxLEc3s27EwJilMVi6A1NoTv0NwH9c=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ch/checkstyle/package.nix
+++ b/pkgs/by-name/ch/checkstyle/package.nix
@@ -8,17 +8,17 @@
 }:

 maven.buildMavenPackage (finalAttrs: {
-  version = "13.4.2";
+  version = "13.5.0";
  pname = "checkstyle";

  src = fetchFromGitHub {
    owner = "checkstyle";
    repo = "checkstyle";
    tag = "checkstyle-${finalAttrs.version}";
-    hash = "sha256-0ENLO/hP/MXVU358Ys83cH1Adl8CTbT/zcG9/tOBIC8=";
+    hash = "sha256-2v6ccNG4t8cXObMdztX+Y+PVuiqt4Fd5IR7j5bk5IaA=";
  };

-  mvnHash = "sha256-eRNJOrSP9GcuF226kZi5ef3shm1PdTEsGvjpi46cfSw=";
+  mvnHash = "sha256-M830+mpd7fAbzZGUQiTJZUKPe64zYUKp6QRqTrSOy7w=";

  nativeBuildInputs = [
    maven
--- a/pkgs/by-name/di/dix/package.nix
+++ b/pkgs/by-name/di/dix/package.nix
@@ -7,18 +7,26 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "dix";
-  version = "1.4.2";
+  version = "2.0.0";

  __structuredAttrs = true;

  src = fetchFromGitHub {
-    owner = "faukah";
+    owner = "manic-systems";
    repo = "dix";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-5mn79jtV9gct4LdU5tdz7Q7GHTM2v0Cb2cso0A0dZX0=";
+    hash = "sha256-5aH8zX/Wm+KHzd1fjmjlxjDB+psDG42JAY5U8lrjGDU=";
  };

-  cargoHash = "sha256-1DtxGaahPFGZcQMX8GHZ0jSpMqSRIGKE3pZSdCVoKnU=";
+  cargoHash = "sha256-llStz2BaHBH9iHhfbptAE+Td5HPsvzAlPtXohrCxY4w=";
+
+  env.TMPDIR = "/tmp/";
+  checkFlags = [
+    "--skip=store::nix_command::tests::test_query_closure_path_info"
+    "--skip=store::nix_command::tests::test_query_closure_size"
+    "--skip=store::nix_command::tests::test_query_dependents"
+    "--skip=store::nix_command::tests::test_query_system_derivations"
+  ];

  nativeInstallCheckInputs = [ versionCheckHook ];
  doInstallCheck = true;
@@ -26,9 +34,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
  passthru.updateScript = nix-update-script { };

  meta = {
-    homepage = "https://github.com/faukah/dix";
+    homepage = "https://github.com/manic-systems/dix";
    description = "Blazingly fast tool to diff Nix related things";
+    changelog = "https://github.com/manic-systems/dix/releases/tag/v${finalAttrs.version}";
    license = lib.licenses.gpl3Only;
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+      "aarch64-darwin"
+    ];
    maintainers = with lib.maintainers; [
      faukah
      NotAShelf
--- a/pkgs/by-name/ei/eid-mw/package.nix
+++ b/pkgs/by-name/ei/eid-mw/package.nix
@@ -23,13 +23,13 @@
 stdenv.mkDerivation (finalAttrs: {
  pname = "eid-mw";
  # NOTE: Don't just blindly update to the latest version/tag. Releases are always for a specific OS.
-  version = "5.1.28";
+  version = "5.1.31";

  src = fetchFromGitHub {
    owner = "Fedict";
    repo = "eid-mw";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-xXzrJWQEZ5mxnv6lG+rkG1P6TSzUDELccSwUizzhEek=";
+    hash = "sha256-pKSe+G1OcdcCf5IvTC7hbk3FRosarf09wyXXNJU4a8o=";
  };

  postPatch = ''
--- a/pkgs/by-name/es/esphome/package.nix
+++ b/pkgs/by-name/es/esphome/package.nix
@@ -33,14 +33,14 @@ let
 in
 python.pkgs.buildPythonApplication (finalAttrs: {
  pname = "esphome";
-  version = "2026.5.2";
+  version = "2026.5.3";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "esphome";
    repo = "esphome";
    tag = finalAttrs.version;
-    hash = "sha256-DLM4hzbEWaJURtCIpKdL9Igy53puEGW+qRiBpDdFZ4o=";
+    hash = "sha256-laz+XNszkayfmEyrtFr3BHUWVV9eFhj130o4l99XElY=";
  };

  patches = [
--- a/pkgs/by-name/fi/firefoxpwa-unwrapped/package.nix
+++ b/pkgs/by-name/fi/firefoxpwa-unwrapped/package.nix
@@ -83,6 +83,11 @@ rustPlatform.buildRustPackage rec {

    wrapProgram $out/bin/firefoxpwa-connector \
      --prefix FFPWA_SYSDATA : "$out/share/firefoxpwa"
+
+    # Create empty `lib/firefoxpwa` directory so the Firefox wrapper won't fail
+    # trying to disable the update checks. It will try to write to
+    # `$out/lib/firefoxpwa/is-packaged-app`, which doesn't exist by default.
+    # mkdir $out/lib/firefoxpwa
  '';

  passthru = {
--- a/pkgs/by-name/gi/gitleaks/package.nix
+++ b/pkgs/by-name/gi/gitleaks/package.nix
@@ -28,6 +28,10 @@ buildGoModule rec {
    "-X=github.com/zricethezav/gitleaks/v${lib.versions.major version}/version.Version=${version}"
  ];

+  subPackages = [
+    "."
+  ];
+
  nativeBuildInputs = [
    installShellFiles
    versionCheckHook
--- a/pkgs/by-name/go/go-csp-collector/package.nix
+++ b/pkgs/by-name/go/go-csp-collector/package.nix
@@ -1,6 +1,5 @@
 {
  lib,
-  go_1_26,
  buildGoModule,
  fetchFromGitHub,
  versionCheckHook,
@@ -8,18 +7,18 @@
  nixosTests,
 }:

-buildGoModule.override { go = go_1_26; } (finalAttrs: {
+buildGoModule (finalAttrs: {
  pname = "go-csp-collector";
-  version = "0.0.17";
+  version = "0.0.22";

  src = fetchFromGitHub {
    owner = "jacobbednarz";
    repo = "go-csp-collector";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-NuJM7MneCptlmX0NV7c/7T1E5xhzM8Z59xNwEEGVuHM=";
+    hash = "sha256-30+rLt0VonbwP3I09OrAxiCqrUuIvGivE3+6sQ/hnRo=";
  };

-  vendorHash = "sha256-YbpBZhXTlSEKkCRDzFeDWRT8HEsCG2905WVGjxvW6oY=";
+  vendorHash = "sha256-gto2lD3atZTy5QMECarLBWQR7Z1bBlFAoJtJYrzg7bY=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/ja/jackett/deps.json
+++ b/pkgs/by-name/ja/jackett/deps.json
@@ -61,18 +61,18 @@
  },
  {
    "pname": "Microsoft.AspNetCore.Cryptography.Internal",
-    "version": "9.0.14",
-    "hash": "sha256-Q+hF4swlFzafwMDnVSH/GwFBdwO3e+l3VYPcD/NStYw="
+    "version": "9.0.16",
+    "hash": "sha256-UwBbUhfCxg5B3llggin1UtoaGYdy9ifoYs1MT3WiIJw="
  },
  {
    "pname": "Microsoft.AspNetCore.DataProtection",
-    "version": "9.0.14",
-    "hash": "sha256-o854THp3eNnY+sJssLxNQtDbDrp21QX1TJurYWu04g4="
+    "version": "9.0.16",
+    "hash": "sha256-8bK7MDVhISTXmEFdcFcnJUleDaPAZkA8fWPAHV6XFeg="
  },
  {
    "pname": "Microsoft.AspNetCore.DataProtection.Abstractions",
-    "version": "9.0.14",
-    "hash": "sha256-7muJ67Xvw4PynXKRDQZnLKwFdbGutkx/p3bJfxph2KM="
+    "version": "9.0.16",
+    "hash": "sha256-YSVo0oww1xoG7Hef+roLwGNX6dQs7ZG10f3Ij7w6z1w="
  },
  {
    "pname": "Microsoft.AspNetCore.Http",
@@ -91,13 +91,13 @@
  },
  {
    "pname": "Microsoft.AspNetCore.JsonPatch",
-    "version": "9.0.14",
-    "hash": "sha256-X7/fHaxXSbZCg5EKFLfX6tjDtOXpgiPNirF/ifaIy1E="
+    "version": "9.0.16",
+    "hash": "sha256-+AxAcxXNHLrELpW0KZd54TGMqPwe2bYaxUwNS64F8oQ="
  },
  {
    "pname": "Microsoft.AspNetCore.Mvc.NewtonsoftJson",
-    "version": "9.0.14",
-    "hash": "sha256-kNNf6RnVm7SgT0eEBSPDE3nXRwxL3qYln6gGzIszKTc="
+    "version": "9.0.16",
+    "hash": "sha256-ephL6fJDFR+0rrebEH92IDpoMadJLef98L7mNKHTAUo="
  },
  {
    "pname": "Microsoft.AspNetCore.WebUtilities",
@@ -126,8 +126,8 @@
  },
  {
    "pname": "Microsoft.Bcl.AsyncInterfaces",
-    "version": "9.0.14",
-    "hash": "sha256-I2sbQ4JwlDU/ocYsfgq6XLd7FDTIqxqsl7Bq8k10m5U="
+    "version": "9.0.16",
+    "hash": "sha256-kCHVu7LDlMXlvDvFo9C3zbISV2t52s+iZMpp0/JX3iw="
  },
  {
    "pname": "Microsoft.Bcl.TimeProvider",
@@ -146,8 +146,8 @@
  },
  {
    "pname": "Microsoft.Extensions.Configuration",
-    "version": "9.0.14",
-    "hash": "sha256-WDOS1x9YpEsJ9z6xI4h6R+HGGck3l/5kHbQxzjMSfgk="
+    "version": "9.0.16",
+    "hash": "sha256-wfj9Vp3innwgJGToOyGqhW2lyFe4vG3KW51vMJjGGoU="
  },
  {
    "pname": "Microsoft.Extensions.Configuration.Abstractions",
@@ -156,8 +156,8 @@
  },
  {
    "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "9.0.14",
-    "hash": "sha256-Ihhg9vZC4vWDQhZNSCSXF9Cdhd+IVCCy53WSVJk4Iaw="
+    "version": "9.0.16",
+    "hash": "sha256-1968fW24KGyvpNU8gYIPEhXJVVusgCCBz4PkK9Rww0s="
  },
  {
    "pname": "Microsoft.Extensions.DependencyInjection",
@@ -171,23 +171,23 @@
  },
  {
    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "9.0.14",
-    "hash": "sha256-LF0CXHppSdguJ/zL14BuCxsJmOXgpC4sVcNlc+nME/A="
+    "version": "9.0.16",
+    "hash": "sha256-jTzy4tazMmC7magGRhm86yd2a7+2vRYWrC0QoOoDMSQ="
  },
  {
    "pname": "Microsoft.Extensions.Diagnostics.Abstractions",
-    "version": "9.0.14",
-    "hash": "sha256-g8hikT/FfhWM5uzACl6n8AVb6BqVDAaSddZ/GoshUu8="
+    "version": "9.0.16",
+    "hash": "sha256-U6ij4cMOc94qLfVxuPINg4/vqqbFcZgTuIC/c0RznTQ="
  },
  {
    "pname": "Microsoft.Extensions.FileProviders.Abstractions",
-    "version": "9.0.14",
-    "hash": "sha256-TjaYFKyoWJaf8XztRPp6pM+iAXE3tcA+EC2rdctWCH4="
+    "version": "9.0.16",
+    "hash": "sha256-T5LCT9yTrHvMaVP/4spQqCj27hXCbchTUdPMKKGBp3E="
  },
  {
    "pname": "Microsoft.Extensions.Hosting.Abstractions",
-    "version": "9.0.14",
-    "hash": "sha256-S/InBEcgCmsWTVMFWTs6cYLYotMANuklDFD8psj8LWE="
+    "version": "9.0.16",
+    "hash": "sha256-u62QeQqAhJ0Pa5JnxXQIyOGkuQZnYYmo3ADTB9f6L9o="
  },
  {
    "pname": "Microsoft.Extensions.Logging",
@@ -201,8 +201,8 @@
  },
  {
    "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "9.0.14",
-    "hash": "sha256-q24UO57BWHF0AED054nTAhNj6Sk1AaCVSMlvxl+kFo0="
+    "version": "9.0.16",
+    "hash": "sha256-B5aTywrWdDbuAC5JBaueFtsA8VQAsejdMW9PSacELMM="
  },
  {
    "pname": "Microsoft.Extensions.ObjectPool",
@@ -221,8 +221,8 @@
  },
  {
    "pname": "Microsoft.Extensions.Options",
-    "version": "9.0.14",
-    "hash": "sha256-EyDTvLfZmQOhJvvl6Um4fqHsF1+IxA4MXm13tw0kqgY="
+    "version": "9.0.16",
+    "hash": "sha256-GkwkNAO87zn4tzOX7Z0oSpBhjIgkhAx5ApnY/PP5q/0="
  },
  {
    "pname": "Microsoft.Extensions.Primitives",
@@ -231,8 +231,8 @@
  },
  {
    "pname": "Microsoft.Extensions.Primitives",
-    "version": "9.0.14",
-    "hash": "sha256-FU5zzgkyZd4Js0lXUxKahID8M1u3Hty24IfN52tLT6M="
+    "version": "9.0.16",
+    "hash": "sha256-UqBlK5n0ZV8PlvwbholkIB6OU8mkT8bLDUv74a8pq5Y="
  },
  {
    "pname": "Microsoft.Net.Http.Headers",
@@ -716,8 +716,8 @@
  },
  {
    "pname": "System.Diagnostics.EventLog",
-    "version": "9.0.14",
-    "hash": "sha256-jnBBxxlKnFEC1K5oV0SIfb2xOY5tfRJg7dg+URYrYsA="
+    "version": "9.0.16",
+    "hash": "sha256-5+BaoVjBFX0MoVDsUGqNs+Pu3oIrqksrnT9W7Eqgrww="
  },
  {
    "pname": "System.Diagnostics.Tools",
@@ -786,8 +786,8 @@
  },
  {
    "pname": "System.IO.Pipelines",
-    "version": "9.0.14",
-    "hash": "sha256-GWAPzaq4LYwmebixpiTn3TntDt3SjE04/DiFzd5P0Vc="
+    "version": "9.0.16",
+    "hash": "sha256-ySSAdeOwjapOB53Fb3EU0QwLHw1pLCoP2NZ07E8rj7Q="
  },
  {
    "pname": "System.Linq",
@@ -971,8 +971,8 @@
  },
  {
    "pname": "System.Security.Cryptography.Pkcs",
-    "version": "9.0.14",
-    "hash": "sha256-jQoOzArEHhUzbJI9GrEKn/EIUYj2KNRt0waZZDC5XaU="
+    "version": "9.0.16",
+    "hash": "sha256-4IJgqiBVvHqLXr2LEC/m2sz4Z1ugU3YECsJHN2jvXqU="
  },
  {
    "pname": "System.Security.Cryptography.Primitives",
@@ -986,8 +986,8 @@
  },
  {
    "pname": "System.Security.Cryptography.ProtectedData",
-    "version": "9.0.14",
-    "hash": "sha256-oSzz/P2MujRav0fAEtJ4ahIi8Jc1i0SAXWNPMN2K1Ps="
+    "version": "9.0.16",
+    "hash": "sha256-dzULuNU8/MMI0iZ9k1vS9pU5tgiwn6e7vvzGyxNHZHA="
  },
  {
    "pname": "System.Security.Cryptography.X509Certificates",
@@ -996,8 +996,8 @@
  },
  {
    "pname": "System.Security.Cryptography.Xml",
-    "version": "9.0.14",
-    "hash": "sha256-wa2dV3WvK+Bgqk4bRTOL9q4VtGHtoMr1nBuP3qVTpxE="
+    "version": "9.0.16",
+    "hash": "sha256-1KFc+NUWOLCVj+KzrWVcrcL9Ph1roZ5qJuCfetHvQ8Q="
  },
  {
    "pname": "System.Security.Principal.Windows",
@@ -1011,8 +1011,8 @@
  },
  {
    "pname": "System.ServiceProcess.ServiceController",
-    "version": "9.0.14",
-    "hash": "sha256-QBGEjsIV+VfL51qGaYo1PlsPHKZ6b71VinvF+2yK1oM="
+    "version": "9.0.16",
+    "hash": "sha256-s7mpGEfvvgw5PzpcQJpMtrPzezPUaeJ81vc0KBM9+/k="
  },
  {
    "pname": "System.Text.Encoding",
@@ -1021,8 +1021,8 @@
  },
  {
    "pname": "System.Text.Encoding.CodePages",
-    "version": "9.0.14",
-    "hash": "sha256-N5XNml7+QGIw61HcnntmtyILGWRxGNfJOhsuDFcxL0Q="
+    "version": "9.0.16",
+    "hash": "sha256-llRnK9hMkLkFYP1OLNAfsr7GuIRP2OmbzfrIfCz2xv8="
  },
  {
    "pname": "System.Text.Encoding.Extensions",
@@ -1036,13 +1036,13 @@
  },
  {
    "pname": "System.Text.Encodings.Web",
-    "version": "9.0.14",
-    "hash": "sha256-snL0tLOiaom9pNPcbJ25xhq4Kqh66qwZH5s7Zyp32ZY="
+    "version": "9.0.16",
+    "hash": "sha256-Vo9mC4wgTNXc2DGUjhykVuuIJO8gpPTpYQJBsY0X5Rw="
  },
  {
    "pname": "System.Text.Json",
-    "version": "9.0.14",
-    "hash": "sha256-/y4PuhczVyM4GyC5mfv6NOsUCdfOMQNzr+4Ozch/Jw0="
+    "version": "9.0.16",
+    "hash": "sha256-GF3aOmsHlEjeWg/pkj1yFQktfd4PMNb2jKpMvUADOcQ="
  },
  {
    "pname": "System.Text.RegularExpressions",
--- a/pkgs/by-name/ja/jackett/package.nix
+++ b/pkgs/by-name/ja/jackett/package.nix
@@ -12,13 +12,13 @@

 buildDotnetModule (finalAttrs: {
  pname = "jackett";
-  version = "0.24.1954";
+  version = "0.24.2021";

  src = fetchFromGitHub {
    owner = "jackett";
    repo = "jackett";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-HuMK8nW0PRBmRYUYAr3h/hDkVhUGgQIj+7v60ChuKRw=";
+    hash = "sha256-/9NDFedtjMholM3Doqt/5hJ+Zw68DJheWNxZ0X+Kvuk=";
  };

  projectFile = "src/Jackett.Server/Jackett.Server.csproj";
--- a/pkgs/by-name/ju/jujutsu/package.nix
+++ b/pkgs/by-name/ju/jujutsu/package.nix
@@ -14,16 +14,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "jujutsu";
-  version = "0.41.0";
+  version = "0.42.0";

  src = fetchFromGitHub {
    owner = "jj-vcs";
    repo = "jj";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-id35e2kzyHyXCRy0aomkd1l0K7qzD0RnzdAzxKUGiso=";
+    hash = "sha256-wAefhpNP4ErCTTjZADpvTDk2of/XKP/MoXl6fpG7/fA=";
  };

-  cargoHash = "sha256-zWfdIac+SsNdfXAfD4NVTl7YfXzAlrK82KNduFgG1EA=";
+  cargoHash = "sha256-b7/5vkO6GNX8qzJr4NcxtLZVLDc6NOMrOU4dE6LOFoE=";

  nativeBuildInputs = [
    installShellFiles
--- a/pkgs/by-name/la/labymod-launcher/package.nix
+++ b/pkgs/by-name/la/labymod-launcher/package.nix
@@ -6,12 +6,12 @@

 let
  pname = "labymod-launcher";
-  version = "2.1.13";
+  version = "3.0.1";

  src = fetchurl {
    name = "labymod-launcher";
    url = "https://releases.r2.labymod.net/launcher/linux/x64/LabyMod%20Launcher-${version}.AppImage";
-    hash = "sha256-MntANnDKN4JZwQdixqxR7SbXd5pxQzC5R+RzJYel2oM=";
+    hash = "sha256-E4yTsurnomuF72zye06Ycd0qXg4uTHj7Y+EW6lmanoA=";
  };

  appimageContents = appimageTools.extract { inherit pname version src; };
--- a/pkgs/by-name/la/ladybugdb/package.nix
+++ b/pkgs/by-name/la/ladybugdb/package.nix
@@ -10,13 +10,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "ladybugdb";
-  version = "0.15.3";
+  version = "0.17.0";

  src = fetchFromGitHub {
    owner = "LadybugDB";
    repo = "ladybug";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Hf0oLaAQzvYQ6CrSzvsD7V1SA2oGGiIqIhrcjpRevAc=";
+    hash = "sha256-58Wx3QtDS1PSLjuyZ36u3Tq7kiQj+zFxfsMiCJyDUU4=";
  };

  outputs = [
--- a/pkgs/by-name/la/lazytrivy/package.nix
+++ b/pkgs/by-name/la/lazytrivy/package.nix
@@ -9,7 +9,7 @@

 buildGoModule (finalAttrs: {
  pname = "lazytrivy";
-  version = "1.3.3";
+  version = "1.4.0";

  env.GOEXPERIMENT = "jsonv2";

@@ -17,10 +17,10 @@ buildGoModule (finalAttrs: {
    owner = "owenrumney";
    repo = "lazytrivy";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-M7qhkHuyI6cpmRzvn8AJun3tyzTbU8QtUlK7Qo0xxU4=";
+    hash = "sha256-mZg8hXTZhgIkPNrzP7hQ7fwMDUL9MP5kUVdg8Smq5l4=";
  };

-  vendorHash = "sha256-vzdGWlyk4Eqhh+r4RH4eVVA4YPnADCGYnh0tmeD8S8M=";
+  vendorHash = "sha256-2t6PckucJTr/2anqG8zarQOAlmGpOVvDxHkhhHfVaOo=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/le/lean4/package.nix
+++ b/pkgs/by-name/le/lean4/package.nix
@@ -2,6 +2,7 @@
  lib,
  stdenv,
  cmake,
+  cctools,
  fetchFromGitHub,
  git,
  gmp,
@@ -67,7 +68,8 @@ stdenv.mkDerivation (finalAttrs: {
    pkg-config
    makeWrapper
    leangz # Provides leantar
-  ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools.libtool ];

  buildInputs = [
    gmp
--- a/pkgs/by-name/li/libmbd/package.nix
+++ b/pkgs/by-name/li/libmbd/package.nix
@@ -15,13 +15,13 @@ assert !lapack.isILP64;

 stdenv.mkDerivation (finalAttrs: {
  pname = "libMBD";
-  version = "0.13.0";
+  version = "0.14.0";

  src = fetchFromGitHub {
    owner = "libmbd";
    repo = "libMBD";
    rev = finalAttrs.version;
-    hash = "sha256-mSKD/pNluumKP3SCubD68uak2Vya/1tyIh42UxRgSXY=";
+    hash = "sha256-ra5nPH7wTlATHWM1QiMZ43P9q9wDfV9CUhm7T0nj3kk=";
  };

  preConfigure = ''
--- a/pkgs/by-name/mo/motrix-next/package.nix
+++ b/pkgs/by-name/mo/motrix-next/package.nix
@@ -25,16 +25,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "motrix-next";
-  version = "3.9.0";
+  version = "3.9.3";

  src = fetchFromGitHub {
    owner = "AnInsomniacy";
    repo = "motrix-next";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-qeI9lXykd1LxX/x7Ls5I7wxJGwsd5X/XOryin6V9zsc=";
+    hash = "sha256-TK3M9fL+g1F9vFibZL4TXYCBeID1uz6+gRPtOxAAmLs=";
  };

-  cargoHash = "sha256-nRBDVxHGm5PzfV1GycsIPaUg+A0igKwr6MS9LMZjaOE=";
+  cargoHash = "sha256-IUAoV6PAW4ae0BMBYfdfdezJXyOzaqKtPlqkSVCaqJk=";

  pnpmDeps = fetchPnpmDeps {
    inherit (finalAttrs)
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
      src
      ;
    inherit pnpm;
-    hash = "sha256-6+any7Ptq0KTPoXS4V+wOt+7hyxtOMi4P6xZzj4cAaI=";
+    hash = "sha256-lpb98qIA6DZLLfUoiv0gAvMWS6QYvbL6zW0z75tcDCM=";
    fetcherVersion = 3;
  };

--- a/pkgs/by-name/ni/nikto/nix-wrapper-fix.patch
+++ b/pkgs/by-name/ni/nikto/nix-wrapper-fix.patch
@@ -2,25 +2,21 @@ diff --git a/program/nikto.pl b/program/nikto.pl
 index 2cb07f9..323e666 100755
 --- a/program/nikto.pl
 +++ b/program/nikto.pl
-@@ -243,7 +243,7 @@ sub config_init {
-     # Guess Nikto current directory
-     my $NIKTODIR = abs_path($0);
-     chomp($NIKTODIR);
-    $NIKTODIR =~ s#[\\/]nikto.pl$##;
-+    $NIKTODIR =~ s#[\\/]bin[\\/]\.nikto-wrapped$##;
+@@ -269,6 +269,7 @@
+     # Use RealBin to get absolute path even if script was invoked via symlink
+     my $NIKTODIR = $FindBin::RealBin || $FindBin::Bin;
+     $NIKTODIR = File::Spec->rel2abs($NIKTODIR) if defined $NIKTODIR;
+    $NIKTODIR =~ s#[\\/]bin$##;
 
     # Guess user's home directory -- to support Windows
     foreach my $var (split(/ /, "HOME USERPROFILE")) {
-@@ -251,10 +251,10 @@ sub config_init {
-     }
- 
-     # Read the conf files in order (previous values are over-written with each, if multiple found)
-    push(@CF, "$NIKTODIR/nikto.conf.default");
-+    push(@CF,"$NIKTODIR/etc/nikto.conf.default");
-     push(@CF, "/etc/nikto.conf");
-     push(@CF, "$home/nikto.conf");
-    push(@CF, "$NIKTODIR/nikto.conf");
-+    push(@CF,"$NIKTODIR/etc/nikto.conf");
+@@ -280,8 +281,8 @@
+     # Priority: --config option > local configs > user home > system-wide
+     push(@CF, "$VARIABLES{'configfile'}")
+       if defined $VARIABLES{'configfile'} && $VARIABLES{'configfile'} ne "";
+-    push(@CF, File::Spec->catfile($NIKTODIR, "nikto.conf"))         if defined $NIKTODIR;
+-    push(@CF, File::Spec->catfile($NIKTODIR, "nikto.conf.default")) if defined $NIKTODIR;
+    push(@CF, File::Spec->catfile($NIKTODIR, "etc", "nikto.conf"))         if defined $NIKTODIR;
+    push(@CF, File::Spec->catfile($NIKTODIR, "etc", "nikto.conf.default")) if defined $NIKTODIR;
     push(@CF, "nikto.conf");
-     push(@CF, "$VARIABLES{'configfile'}");
- 
+     push(@CF, File::Spec->catfile($home, "nikto.conf")) if defined $home;
--- a/pkgs/by-name/ni/nikto/package.nix
+++ b/pkgs/by-name/ni/nikto/package.nix
@@ -8,7 +8,7 @@
 }:

 let
-  version = "2.5.0";
+  version = "2.6.0";
 in
 stdenv.mkDerivation rec {
  pname = "nikto";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
    owner = "sullo";
    repo = "nikto";
    rev = version;
-    sha256 = "sha256-lWiDbWc2BWAUgyaIm0tvZytja02WogYRoc7na4sHiNM=";
+    sha256 = "sha256-iHOdMlfcKhvQCsCjWge6K+0h8kkgXa0Uii9o3YRQP5w=";
  };

  # Nikto searches its configuration file based on its current path
@@ -29,8 +29,11 @@ stdenv.mkDerivation rec {
    # EXECDIR needs to be changed to the path where we copy the programs stuff
    # Forcing SSLeay is needed for SSL support (the auto mode doesn't seem to work otherwise)
    substituteInPlace program/nikto.conf.default \
-      --replace "# EXECDIR=/opt/nikto" "EXECDIR=$out/share" \
-      --replace "LW_SSL_ENGINE=auto" "LW_SSL_ENGINE=SSLeay"
+      --replace-fail "# EXECDIR=/opt/nikto" "EXECDIR=$out/share" \
+      --replace-fail "LW_SSL_ENGINE=auto" "LW_SSL_ENGINE=SSLeay"
+    # Disable update check which prompts you to do a git pull and is not applicable for nixpkg
+    substituteInPlace program/nikto.pl \
+      --replace-fail "check_updates()" ""
  '';

  nativeBuildInputs = [
@@ -41,6 +44,8 @@ stdenv.mkDerivation rec {
  buildInputs = [
    perlPackages.perl
    perlPackages.NetSSLeay
+    perlPackages.JSON
+    perlPackages.XMLWriter
  ];

  installPhase = ''
@@ -65,6 +70,7 @@ stdenv.mkDerivation rec {
    license = lib.licenses.gpl2Plus;
    homepage = "https://cirt.net/Nikto2";
    changelog = "https://github.com/sullo/nikto/releases/tag/${version}";
+    maintainers = with lib.maintainers; [ tbutter ];
    platforms = lib.platforms.unix;
  };
 }
--- a/pkgs/by-name/no/nom/package.nix
+++ b/pkgs/by-name/no/nom/package.nix
@@ -7,16 +7,16 @@
 }:
 buildGoModule (finalAttrs: {
  pname = "nom";
-  version = "3.3.0";
+  version = "3.3.1";

  src = fetchFromGitHub {
    owner = "guyfedwards";
    repo = "nom";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-q2vnReYAxU8UcTPIy1dIVO9jQwC+9dYfO9cDls0Voyo=";
+    hash = "sha256-Uxsq6tbWAPNvOz9fQ8820b2E2Xo/a1Pfzq8p/2mAVoc=";
  };

-  vendorHash = "sha256-pPd7wpZ55thW0Xq2c/0qSAlGQ71tE8GptsEBJD839Bg=";
+  vendorHash = "sha256-otrK4mTqgRr9Ntf2D1f0/deQcObejRWN7BaScV4q+FY=";

  ldflags = [
    "-X 'main.version=${finalAttrs.version}'"
--- a/pkgs/by-name/no/noto-fonts/package.nix
+++ b/pkgs/by-name/no/noto-fonts/package.nix
@@ -23,13 +23,13 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "noto-fonts${suffix}";
-  version = "2026.05.01";
+  version = "2026.06.01";

  src = fetchFromGitHub {
    owner = "notofonts";
    repo = "notofonts.github.io";
    tag = "noto-monthly-release-${finalAttrs.version}";
-    hash = "sha256-Zph+4YJGSQ5hubzQjKV6YruGciQEle28YMaYyVh8/Ro=";
+    hash = "sha256-M23KadEl3Wf8GkT3cz63zDaJFOjHbYE+gRX/F5mS1Q8=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/nt/ntfy-sh/package.nix
+++ b/pkgs/by-name/nt/ntfy-sh/package.nix
@@ -18,7 +18,7 @@ buildGoModule (
    ui = buildNpmPackage {
      inherit (finalAttrs) src version;
      pname = "ntfy-sh-ui";
-      npmDepsHash = "sha256-Zrukg48eo3+GfeOU690vVrbMUc6sVjIAdB5LpRtOn1M=";
+      npmDepsHash = "sha256-ASh88vfDrR+uf4IFOjj/SK2Hb+gwSNuKQwTGYBTogXo=";

      prePatch = ''
        cd web/
@@ -38,16 +38,16 @@ buildGoModule (
  in
  {
    pname = "ntfy-sh";
-    version = "2.23.0";
+    version = "2.24.0";

    src = fetchFromGitHub {
      owner = "binwiederhier";
      repo = "ntfy";
      tag = "v${finalAttrs.version}";
-      hash = "sha256-mNQERjVzkwrbFbgiUwZijJMoWQ30UMTgagOPFyLoISo=";
+      hash = "sha256-ca04r8kMSAqWiEN6F36n75hy46Alb21UUtQ1/mwpQcY=";
    };

-    vendorHash = "sha256-1rFx7HCrF3JiNUCOdlvsUKDn8ugT1Ltl0JsnaP0eisE=";
+    vendorHash = "sha256-9xrqa/eDpyzeLBMM31Q8CsRhdATB2DYkOoE/CxycgzY=";

    doCheck = false;

--- a/pkgs/by-name/oe/oelint-adv/package.nix
+++ b/pkgs/by-name/oe/oelint-adv/package.nix
@@ -7,14 +7,14 @@

 python3Packages.buildPythonApplication (finalAttrs: {
  pname = "oelint-adv";
-  version = "9.8.0";
+  version = "9.8.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "priv-kweihmann";
    repo = "oelint-adv";
    tag = finalAttrs.version;
-    hash = "sha256-N7S3pmxoOcntCnMuM78H9wYZR5MczJBPhv9v0wSZIuY=";
+    hash = "sha256-mZleG+NAVqjeJ66SlYYvF90XwJ4H1wlsMOQRBdH1qhM=";
  };

  postPatch = ''
--- a/pkgs/by-name/of/officecli/package.nix
+++ b/pkgs/by-name/of/officecli/package.nix
@@ -8,7 +8,7 @@

 buildDotnetModule (finalAttrs: {
  pname = "officecli";
-  version = "1.0.97";
+  version = "1.0.102";

  strictDeps = true;
  __structuredAttrs = true;
@@ -17,7 +17,7 @@ buildDotnetModule (finalAttrs: {
    owner = "iOfficeAI";
    repo = "OfficeCLI";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-JQQbMQhuT2S808Z64RQSkGcarmPaF1T8oypnUUTmV7Y=";
+    hash = "sha256-qGWDku9G1QUjn+0wrhKlPC93Xugkc2YSE3PrSLCesJ0=";
  };

  projectFile = "src/officecli/officecli.csproj";
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -110,13 +110,13 @@ let

  # Since v0.30, llama.cpp is consumed via CMake FetchContent rather than
  # vendored in-tree. Pre-stage the pinned commit (read from upstream's
-  # `LLAMA_CPP_VERSION` file — currently `b9493`) so the FetchContent step
+  # `LLAMA_CPP_VERSION` file — currently `b9509`) so the FetchContent step
  # uses our copy instead of trying to clone over the network in the sandbox.
  llamaCppSrc = fetchFromGitHub {
    owner = "ggml-org";
    repo = "llama.cpp";
-    rev = "a731805cedc83c0514cbd808a2e38ec46c759cc2"; # tag b9493
-    hash = "sha256-DO9J1mx9Jlp6qtCiJp2ZEi6R7H2YX1/sD7DGgBCtt0U=";
+    rev = "6f3a9f3dee3c27545371044a3a38005721ac8a8e"; # tag b9509
+    hash = "sha256-bO1ucb/+vidj/EYzNCssotjte9NlVLdjC794jToNNeM=";
  };

  wrapperOptions = [
@@ -152,13 +152,13 @@ let
 in
 goBuild (finalAttrs: {
  pname = "ollama";
-  version = "0.30.4";
+  version = "0.30.5";

  src = fetchFromGitHub {
    owner = "ollama";
    repo = "ollama";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-IHX8o1Ty4Sdht5YeUYLnNPjOV7O95WeNng/coO+MHS8=";
+    hash = "sha256-jh/B/FkmAliCVzqc8DGCPYa5+XejE3cFZTzSuRxjPvw=";
  };

  vendorHash = "sha256-lZdGzGb9xRjTm1Rm7/wHjqM490gLznLEndmb4mNbCX0=";
@@ -230,12 +230,6 @@ goBuild (finalAttrs: {
    ( cd $TMPDIR/llama-cpp-src && \
      cmake -DPATCH_DIR=$NIX_BUILD_TOP/source/llama/compat \
        -P $NIX_BUILD_TOP/source/llama/compat/apply-patch.cmake )
-  ''
-  # disable tests that fail in sandbox due to Metal init failure
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    rm ml/backend/ggml/ggml_test.go
-    rm ml/nn/pooling/pooling_test.go
-    rm model/models/nemotronh/model_omni_test.go
  '';

  overrideModAttrs = _: _: {
@@ -319,7 +313,9 @@ goBuild (finalAttrs: {
  # `.so` payloads end up with build-dir entries in RPATH. Drop them
  # before the forbidden-references check. $ORIGIN is preserved
  # unconditionally; only absolute /nix/store entries are kept.
-  preFixup = ''
+  # ELF-only (patchelf doesn't know Mach-O); darwin builds Mach-O dylibs
+  # that don't carry the build-dir RPATH problem in the first place.
+  preFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
    find $out/lib/ollama -type f \( -name '*.so' -o -name '*.so.*' \) \
      -exec patchelf --shrink-rpath --allowed-rpath-prefixes /nix/store {} +
  '';
--- a/pkgs/by-name/pd/pdfding/frontend.nix
+++ b/pkgs/by-name/pd/pdfding/frontend.nix
@@ -28,13 +28,13 @@ let
  };
 in
 stdenv.mkDerivation (finalAttrs: {
-  pname = "${pdfding.pname}-frontend";
+  pname = "pdfding-frontend";
  inherit (pdfding) src version;

  npmDeps = fetchNpmDeps {
    inherit (finalAttrs) src;
-    name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
-    hash = "sha256-HOGnzDKg1ca/27u1oQEtOkOl6Cg/7k+aLJEJhbypUhE=";
+    name = "pdfding-${finalAttrs.version}-npm-deps";
+    hash = "sha256-fxhDP/kyDfL1uiZCUNr2Cd6vDnyb9V+gTSNPyjSIm18=";
  };

  nativeBuildInputs = [
@@ -44,6 +44,9 @@ stdenv.mkDerivation (finalAttrs: {
    tailwindcss_4
  ];

+  strictDeps = true;
+  __structuredAttrs = true;
+
  # keeping the file structure same as upstream to minimise confusion
  buildPhase = ''
    runHook preBuild
--- a/pkgs/by-name/pd/pdfding/package.nix
+++ b/pkgs/by-name/pd/pdfding/package.nix
@@ -12,15 +12,18 @@ let
 in
 python.pkgs.buildPythonPackage (finalAttrs: {
  pname = "pdfding";
-  version = "1.7.2";
+  version = "1.8.0";
  src = fetchFromGitHub {
    owner = "mrmn2";
    repo = "PdfDing";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-a12Rq4fd3XEW6ZTsm8ISklpMu0ZKpeBrZXNh9My3vUQ=";
+    hash = "sha256-ITOsKABToGMJDdCiWH3+nTuuTW5ZuMXcQYv0QyMb19I=";
  };
  pyproject = true;

+  strictDeps = true;
+  __structuredAttrs = true;
+
  # remove supervisor from dependencies
  postPatch = ''
    sed -i 's/supervisor.*$//' pyproject.toml
@@ -107,9 +110,13 @@ python.pkgs.buildPythonPackage (finalAttrs: {
  env.PDFDING_OUT_DIR = "${placeholder "out"}/${python.sitePackages}/pdfding";

  makeWrapperArgs = [
-    "--set-default DATA_DIR /var/lib/pdfding"
+    "--set-default"
+    "DATA_DIR"
+    "/var/lib/pdfding"
    # allow for gunicorn processes to have access to Python packages
-    "--prefix PYTHONPATH : "
+    "--prefix"
+    "PYTHONPATH"
+    ":"
    "${python.pkgs.makePythonPath finalAttrs.passthru.dependencies}:${finalAttrs.env.PDFDING_OUT_DIR}"
  ];

@@ -117,21 +124,21 @@ python.pkgs.buildPythonPackage (finalAttrs: {
    mkdir -p $out/bin

    makeWrapper "$PDFDING_OUT_DIR/manage.py" $out/bin/pdfding-manage \
-      $makeWrapperArgs
+      "''${makeWrapperArgs[@]}"

    makeWrapper ${lib.getExe python.pkgs.gunicorn} $out/bin/pdfding-start \
      --add-flags '--bind ''${HOST_IP:-127.0.0.1}:''${HOST_PORT:-8080} core.wsgi:application' \
-      $makeWrapperArgs
+      "''${makeWrapperArgs[@]}"
  '';

  pythonRelaxDeps = [
-    "rapidfuzz"
-    "django"
+    "django-allauth"
    "gunicorn"
+    "huey"
    "nh3"
+    "psycopg2-binary"
    "pypdf"
    "pypdfium2"
-    "whitenoise"
  ];

  checkInputs = with python.pkgs; [
--- a/pkgs/by-name/pi/pixelfed/package.nix
+++ b/pkgs/by-name/pi/pixelfed/package.nix
@@ -7,19 +7,21 @@
  dataDir ? "/var/lib/pixelfed",
  runtimeDir ? "/run/pixelfed",
 }:
-
-php.buildComposerProject2 (finalAttrs: {
+let
+  php' = php.withExtensions ({ enabled, all }: enabled ++ (with all; [ ffi ]));
+in
+php'.buildComposerProject2 (finalAttrs: {
  pname = "pixelfed";
-  version = "0.12.6";
+  version = "0.12.7";

  src = fetchFromGitHub {
    owner = "pixelfed";
    repo = "pixelfed";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-FxJWoFNyIGQ6o9g2Q0/jaBMyeH8UnbTgha2goHAurvY=";
+    hash = "sha256-Ay1WJWEPwzeTtScaj+g72lsoWODeHWtjnQT5aa6epbU=";
  };

-  vendorHash = "sha256-4x+vvkQUhqxBwm+9Lx7n6Ww6qvfLwqd8IXXCuCSAijE=";
+  vendorHash = "sha256-RNJzvWrKfxr2uBFtc05N1pUfBmvy01JiJHMWgtJ01pA=";

  postInstall = ''
    chmod -R u+w $out/share
--- a/pkgs/by-name/pr/pragtical/package.nix
+++ b/pkgs/by-name/pr/pragtical/package.nix
@@ -23,8 +23,8 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "pragtical";
-  version = "3.8.3";
-  pluginManagerVersion = "1.4.7.1";
+  version = "3.9.0";
+  pluginManagerRev = "ae9bd107783b1b8cbe7f0dec53b1b0b401f6ac91";
  linenoiseRev = "e78e236c8d85c078fdd9fc4e1f08716058aa1a42";

  src = fetchFromGitHub {
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
      export NIX_SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt

      substituteInPlace subprojects/ppm.wrap \
-        --replace-fail 'revision = head' 'revision = v${finalAttrs.pluginManagerVersion}'
+        --replace-fail 'revision = head' 'revision = ${finalAttrs.pluginManagerRev}'
      substituteInPlace subprojects/linenoise.wrap \
        --replace-fail 'revision = master' 'revision = ${finalAttrs.linenoiseRev}'

@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
      find subprojects -type d -name .git -prune -execdir rm -r {} +
    '';

-    hash = "sha256-/rCDtUSBQaNsmzcIwWy+VBuMJHEbVXpn+a1Gz3bC6DU=";
+    hash = "sha256-hs4WFBqR9G+YsHw9/qaO0BCeIMqPEWOvFaeuN2W9hSQ=";
  };

  strictDeps = true;
--- a/pkgs/by-name/pr/protonplus/package.nix
+++ b/pkgs/by-name/pr/protonplus/package.nix
@@ -20,13 +20,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "protonplus";
-  version = "0.5.19";
+  version = "0.5.20";

  src = fetchFromGitHub {
    owner = "Vysp3r";
    repo = "protonplus";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-tE5qOga63dvbs9J9EX8XahzTZQVT+7T6+TsGPAiLbio=";
+    hash = "sha256-XLA5dEG3gshvklk1te3VF1lqJmeeclNCWn2R/35pq/E=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/te/telemt/package.nix
+++ b/pkgs/by-name/te/telemt/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "telemt";
-  version = "3.4.12";
+  version = "3.4.13";

  src = fetchFromGitHub {
    owner = "telemt";
    repo = "telemt";
    tag = version;
-    hash = "sha256-o/C9qKMv5szZCfcncHScEjkyUTwXcCT9bx84cWnzLWA=";
+    hash = "sha256-ChzvbbWS/h7bZXqG4h3Iftslzsv2Rad+hXx+SyY2p30=";
  };

-  cargoHash = "sha256-lJ+4gYvESKRAtxoTeHuXWi1tOblc6GeGIDYicDxEHuU=";
+  cargoHash = "sha256-UicmtNQvGUZJtj3I8zztyGiy+oU66LWwNV+MNpZ3omc=";

  checkFlags = [
    # flaky: races between MiddleClientWriterCancelled and TrafficBudgetWaitCancelled observation paths
--- a/pkgs/by-name/th/therion/package.nix
+++ b/pkgs/by-name/th/therion/package.nix
@@ -30,13 +30,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "therion";
-  version = "6.3.4";
+  version = "6.4.0";

  src = fetchFromGitHub {
    owner = "therion";
    repo = "therion";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-kus5MoiUrLadpzq0wPB+J85F0RVva7NAYM6E6HX4eJ8=";
+    hash = "sha256-TiyoNYk+wWXyNytQwr5EfRSWzNc42LX3qjMV9M+dsx0=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/tr/trezor-suite/package.nix
+++ b/pkgs/by-name/tr/trezor-suite/package.nix
@@ -10,7 +10,7 @@

 let
  pname = "trezor-suite";
-  version = "26.5.1";
+  version = "26.5.2";

  suffix =
    {
@@ -24,8 +24,8 @@ let
    hash =
      {
        # curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
-        aarch64-linux = "sha512-3IPLiRyjNPN7Mw/De5SI1ez9xheNVBFuWn98bKg3rDdkLg7Bl94TgznzNBkU3wP8WtOdw3qLfOdv7ioIBu1Aqg==";
-        x86_64-linux = "sha512-TG7vRqz34LzxdzvD4e4N14DnwyuCi1eQsQrPMLkk5d60ThHXh/JN8PT53JMFIjVcp/0pTjLmshEsuQzZRhPJGg==";
+        aarch64-linux = "sha512-miO4eoar5u4Lgx4ixFVJa9fxqbIThMhk8ibPAO4EKWYAEAJ9RcNw2HTtVHgNlGDM9BTZZcfL4N1BUD+XdEcSAw==";
+        x86_64-linux = "sha512-Wd6H010Wd5chjjwURQkKIKK70UPqUKl+Wb6LRcoXW1wbFAY5gLVnrTtuS4EqBy7/pvVPS2ImdS/Err0fSrqNPg==";
      }
      .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
  };
--- a/pkgs/by-name/tr/trufflehog/package.nix
+++ b/pkgs/by-name/tr/trufflehog/package.nix
@@ -8,7 +8,7 @@

 buildGoModule (finalAttrs: {
  pname = "trufflehog";
-  version = "3.95.4";
+  version = "3.95.5";

  src = fetchFromGitHub {
    owner = "trufflesecurity";
--- a/pkgs/by-name/xr/xrootd/package.nix
+++ b/pkgs/by-name/xr/xrootd/package.nix
@@ -3,7 +3,6 @@
  stdenv,
  callPackage,
  fetchFromGitHub,
-  davix,
  cmake,
  gtest,
  makeWrapper,
@@ -15,6 +14,7 @@
  libuuid,
  libxcrypt,
  libxml2,
+  libzip,
  openssl,
  readline,
  scitokens-cpp,
@@ -30,14 +30,17 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "xrootd";
-  version = "5.9.1";
+  version = "6.0.2";
+
+  __structuredAttrs = true;
+  strictDeps = true;

  src = fetchFromGitHub {
    owner = "xrootd";
    repo = "xrootd";
    tag = "v${finalAttrs.version}";
    fetchSubmodules = true;
-    hash = "sha256-XClMtQfCGWpLtILGQyYCsKMcOlhLHC5i7UabzXH/imc=";
+    hash = "sha256-RSODctDfDkdY1YnxFINGwbpNxEkNCYjW1QEDk9VAYFw=";
  };

  postPatch = ''
@@ -65,12 +68,12 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  buildInputs = [
-    davix
    curl
    libkrb5
    libuuid
    libxcrypt
    libxml2
+    libzip
    openssl
    readline
    scitokens-cpp
@@ -86,17 +89,15 @@ stdenv.mkDerivation (finalAttrs: {
    voms # only available on Linux due to gsoap failing to build on Darwin
  ];

-  # https://github.com/xrootd/xrootd/blob/master/packaging/rhel/xrootd.spec.in#L665-L675=
+  # https://github.com/xrootd/xrootd/blob/v6.0.2/config/
  postInstall = ''
-    mkdir -p "$out/lib/tmpfiles.d"
-    install -m 644 -T ../packaging/rhel/xrootd.tmpfiles "$out/lib/tmpfiles.d/xrootd.conf"
    mkdir -p "$out/etc/xrootd"
-    install -m 644 -t "$out/etc/xrootd" ../packaging/common/*.cfg
-    install -m 644 -t "$out/etc/xrootd" ../packaging/common/client.conf
+    install -m 644 -t "$out/etc/xrootd" ../config/*.cfg
+    install -m 644 -t "$out/etc/xrootd" ../config/client.conf
    mkdir -p "$out/etc/xrootd/client.plugins.d"
-    install -m 644 -t "$out/etc/xrootd/client.plugins.d" ../packaging/common/client-plugin.conf.example
+    install -m 644 -t "$out/etc/xrootd/client.plugins.d" ../config/client-plugin.conf.example
    mkdir -p "$out/etc/logrotate.d"
-    install -m 644 -T ../packaging/common/xrootd.logrotate "$out/etc/logrotate.d/xrootd"
+    install -m 644 -T ../config/xrootd.logrotate "$out/etc/logrotate.d/xrootd"
  ''
  # Leaving those in bin/ leads to a cyclic reference between $dev and $bin
  # This happens since https://github.com/xrootd/xrootd/commit/fe268eb622e2192d54a4230cea54c41660bd5788
@@ -107,13 +108,19 @@ stdenv.mkDerivation (finalAttrs: {
  ''
  + lib.optionalString stdenv.hostPlatform.isLinux ''
    mkdir -p "$out/lib/systemd/system"
-    install -m 644 -t "$out/lib/systemd/system" ../packaging/common/*.service ../packaging/common/*.socket
+    install -m 644 -t "$out/lib/systemd/system" ../systemd/*.service ../systemd/*.socket
+  ''
+  # Install missing private headers needed by Python bindings
+  + ''
+    mkdir -p $dev/include/xrootd/private/XrdCks
+    cp ../src/XrdCks/XrdCksXAttr.hh $dev/include/xrootd/private/XrdCks/
+    mkdir -p $dev/include/xrootd/private/XrdOuc
+    cp ../src/XrdOuc/XrdOucXAttr.hh $dev/include/xrootd/private/XrdOuc/
  '';

  cmakeFlags = [
    (lib.cmakeFeature "XRootD_VERSION_STRING" finalAttrs.version)
    (lib.cmakeBool "FORCE_ENABLED" true)
-    (lib.cmakeBool "ENABLE_DAVIX" true)
    (lib.cmakeBool "ENABLE_FUSE" (!stdenv.hostPlatform.isDarwin)) # XRootD doesn't support MacFUSE
    (lib.cmakeBool "ENABLE_MACAROONS" false)
    (lib.cmakeBool "ENABLE_PYTHON" false) # built separately
--- a/pkgs/development/lean-modules/lean4/default.nix
+++ b/pkgs/development/lean-modules/lean4/default.nix
@@ -4,6 +4,7 @@
  stdenv,
  symlinkJoin,
  cmake,
+  cctools,
  fetchFromGitHub,
  git,
  gmp,
@@ -75,7 +76,8 @@ let
      cmake
      leangz
      pkg-config
-    ];
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools.libtool ];

    buildInputs = [
      gmp
--- a/pkgs/development/python-modules/aioaquarite/default.nix
+++ b/pkgs/development/python-modules/aioaquarite/default.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  aiohttp,
+  google-auth,
+  google-cloud-firestore,
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "aioaquarite";
+  version = "0.6.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "fdebrus";
+    repo = "aioaquarite";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-pf/a0W1Ix/3Cd6dMUvHqb6DwT56PvtSf/GpicrL8y1A=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiohttp
+    google-auth
+    google-cloud-firestore
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "aioaquarite" ];
+
+  meta = {
+    description = "Async Python client for the Hayward Aquarite pool API";
+    homepage = "https://github.com/fdebrus/aioaquarite";
+    changelog = "https://github.com/fdebrus/aioaquarite/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
--- a/pkgs/development/python-modules/aioautomower/default.nix
+++ b/pkgs/development/python-modules/aioautomower/default.nix
@@ -22,14 +22,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "aioautomower";
-  version = "2.7.5";
+  version = "2.7.6";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "Thomas55555";
    repo = "aioautomower";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-6McuzSo3CanhafN8ooB/fQkD+BAVpaPqPDNHSSsVLgA=";
+    hash = "sha256-oQyKIwcVMNW9ez7T0jNGUbPOJoJL6idP9ZgRVwDPX3A=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/aiohomeconnect/default.nix
+++ b/pkgs/development/python-modules/aiohomeconnect/default.nix
@@ -12,20 +12,21 @@
  pytest-httpx,
  pytestCheckHook,
  setuptools,
+  sybil,
  typer,
  uvicorn,
 }:

 buildPythonPackage (finalAttrs: {
  pname = "aiohomeconnect";
-  version = "0.36.0";
+  version = "0.36.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "MartinHjelmare";
    repo = "aiohomeconnect";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-tm8CEIv2QfawDs26oCnwXZ4cX/9785h7IX/kuCzjCWc=";
+    hash = "sha256-dzDNwqAYS1Sqhcd9koNTtSkXZ/t78WC/YIKOaA4uqzI=";
  };

  build-system = [ setuptools ];
@@ -50,13 +51,14 @@ buildPythonPackage (finalAttrs: {
    pytest-cov-stub
    pytest-httpx
    pytestCheckHook
+    sybil
  ]
  ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;

  pythonImportsCheck = [ "aiohomeconnect" ];

  meta = {
-    description = "asyncio client for the Home Connect API";
+    description = "Client for the Home Connect API";
    homepage = "https://github.com/MartinHjelmare/aiohomeconnect";
    changelog = "https://github.com/MartinHjelmare/aiohomeconnect/blob/${finalAttrs.src.tag}/CHANGELOG.md";
    license = lib.licenses.asl20;
--- a/pkgs/development/python-modules/aiosmtplib/default.nix
+++ b/pkgs/development/python-modules/aiosmtplib/default.nix
@@ -12,14 +12,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "aiosmtplib";
-  version = "5.1.0";
+  version = "5.1.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "cole";
    repo = "aiosmtplib";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-+aMtU8ea8yy1jxPPQGSu4kW3PX9N9qYQ90CSduPPgYc=";
+    hash = "sha256-noVyN9toeOAGQeu0AwSBeEmU/y2MpDlVn8naN0I3zfM=";
  };

  build-system = [ hatchling ];
--- a/pkgs/development/python-modules/aqualogic/default.nix
+++ b/pkgs/development/python-modules/aqualogic/default.nix
@@ -5,22 +5,25 @@
  fetchFromGitHub,
  pyserial,
  pytestCheckHook,
+  setuptools,
  websockets,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "aqualogic";
  version = "3.4";
-  format = "setuptools";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "swilson";
    repo = "aqualogic";
-    rev = version;
+    tag = finalAttrs.version;
    hash = "sha256-hBg02Wypd+MyqM2SUD53djhm5OMP2QAmsp8Stf+UT2c=";
  };

-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
    aiohttp
    pyserial
    websockets
@@ -37,7 +40,8 @@ buildPythonPackage rec {
  meta = {
    description = "Python library to interface with Hayward/Goldline AquaLogic/ProLogic pool controllers";
    homepage = "https://github.com/swilson/aqualogic";
+    changelog = "https://github.com/swilson/aqualogic/releases/tag/${finalAttrs.version}";
    license = with lib.licenses; [ mit ];
    maintainers = with lib.maintainers; [ fab ];
  };
-}
+})
--- a/pkgs/development/python-modules/area/default.nix
+++ b/pkgs/development/python-modules/area/default.nix
@@ -2,24 +2,31 @@
  lib,
  buildPythonPackage,
  fetchPypi,
+  setuptools,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "area";
  version = "1.1.1";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;

  src = fetchPypi {
-    inherit pname version;
-    sha256 = "18k5hwmlxhajlq306zxndsglb11vv8vd4vpmwx8dpvfxd1kbksya";
+    inherit (finalAttrs) pname version;
+    hash = "sha256-yuu5Zmjd7dtQ5/Vu0jbaO4RFn262fwMGplLBTiuHZaI=";
  };

+  build-system = [ setuptools ];
+
  # tests not working on the package from pypi
  doCheck = false;

+  pythonImportsCheck = [ "area" ];
+
  meta = {
    description = "Calculate the area inside of any GeoJSON geometry. This is a port of Mapbox’s geojson-area for Python";
    homepage = "https://github.com/scisco/area";
    license = lib.licenses.bsd2;
  };
-}
+})
--- a/pkgs/development/python-modules/azure-containerregistry/default.nix
+++ b/pkgs/development/python-modules/azure-containerregistry/default.nix
@@ -6,20 +6,23 @@
  msrest,
  msrestazure,
  isodate,
+  setuptools,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "azure-containerregistry";
  version = "1.2.0";
-  format = "setuptools";
+  pyproject = true;

  src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
    hash = "sha256-Ss0ygh0IZVPqvV3f7Lsh+5FbXRPvg3XRWvyyyAvclqM=";
    extension = "zip";
  };

-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
    azure-core
    msrest
    msrestazure
@@ -40,4 +43,4 @@ buildPythonPackage rec {
    homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/containerregistry/azure-containerregistry";
    license = lib.licenses.mit;
  };
-}
+})
--- a/pkgs/development/python-modules/azure-keyvault-nspkg/default.nix
+++ b/pkgs/development/python-modules/azure-keyvault-nspkg/default.nix
@@ -2,23 +2,28 @@
  buildPythonPackage,
  fetchPypi,
  lib,
+  setuptools,

  # pythonPackages
  azure-nspkg,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "azure-keyvault-nspkg";
  version = "1.0.0";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;

  src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
    extension = "zip";
-    sha256 = "0hdnd6124hx7s16z1pssmq5m5mqqqz8s38ixl9aayv4wmf5bhs5c";
+    hash = "sha256-rGi4iqucbK9Uoj2iodHHGNdSC65a3/BN0KdDIoJptkE=";
  };

-  propagatedBuildInputs = [ azure-nspkg ];
+  build-system = [ setuptools ];
+
+  dependencies = [ azure-nspkg ];

  # Just a namespace package, no tests exist:
  #   https://github.com/Azure/azure-sdk-for-python/blob/master/sdk/keyvault/tests.yml
@@ -30,4 +35,4 @@ buildPythonPackage rec {
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ kamadorueda ];
  };
-}
+})
--- a/pkgs/development/python-modules/azure-keyvault/default.nix
+++ b/pkgs/development/python-modules/azure-keyvault/default.nix
@@ -2,23 +2,28 @@
  lib,
  buildPythonPackage,
  fetchPypi,
+  setuptools,
  azure-keyvault-certificates,
  azure-keyvault-keys,
  azure-keyvault-secrets,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "azure-keyvault";
  version = "4.2.0";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;

  src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
    extension = "zip";
    hash = "sha256-cxrdEIo+KatP1QGjxHclbChsNNCZazg/tqOUVGKTN2E=";
  };

-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
    azure-keyvault-certificates
    azure-keyvault-keys
    azure-keyvault-secrets
@@ -39,4 +44,4 @@ buildPythonPackage rec {
    license = lib.licenses.mit;
    maintainers = [ ];
  };
-}
+})
--- a/pkgs/development/python-modules/azure-loganalytics/default.nix
+++ b/pkgs/development/python-modules/azure-loganalytics/default.nix
@@ -2,22 +2,27 @@
  lib,
  buildPythonPackage,
  fetchPypi,
+  setuptools,
  msrest,
  azure-common,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  version = "0.1.1";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;
  pname = "azure-loganalytics";

  src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
    extension = "zip";
-    sha256 = "68ffb9a2206e06b9672100a8e6351cc04f75bb81867f30d416c68b55d624d793";
+    hash = "sha256-aP+5oiBuBrlnIQCo5jUcwE91u4GGfzDUFsaLVdYk15M=";
  };

-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
    msrest
    azure-common
  ];
@@ -27,6 +32,8 @@ buildPythonPackage rec {
  # has no tests
  doCheck = false;

+  pythonImportsCheck = [ "azure.loganalytics" ];
+
  meta = {
    description = "This is the Microsoft Azure Log Analytics Client Library";
    homepage = "https://github.com/Azure/azure-sdk-for-python";
@@ -35,4 +42,4 @@ buildPythonPackage rec {
      maxwilson
    ];
  };
-}
+})
--- a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix
@@ -5,20 +5,25 @@
  azure-common,
  azure-mgmt-core,
  isodate,
+  setuptools,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "azure-mgmt-batchai";
  version = "7.0.0";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;

  src = fetchPypi {
-    inherit version;
+    inherit (finalAttrs) version;
    pname = "azure_mgmt_batchai";
    hash = "sha256-XfAE/QyST8ZVlJR6nP9Pdgh97hfIhFM6G7sLINsn06M=";
  };

-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
    isodate
    azure-common
    azure-mgmt-core
@@ -32,8 +37,8 @@ buildPythonPackage rec {
  meta = {
    description = "This is the Microsoft Azure Batch AI Management Client Library";
    homepage = "https://github.com/Azure/azure-sdk-for-python";
-    changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-batchai_${version}/sdk/batchai/azure-mgmt-batchai/CHANGELOG.md";
+    changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-batchai_${finalAttrs.version}/sdk/batchai/azure-mgmt-batchai/CHANGELOG.md";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ maxwilson ];
  };
-}
+})
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -358,13 +358,13 @@

 buildPythonPackage (finalAttrs: {
  pname = "boto3-stubs";
-  version = "1.43.22";
+  version = "1.43.23";
  pyproject = true;

  src = fetchPypi {
    pname = "boto3_stubs";
    inherit (finalAttrs) version;
-    hash = "sha256-eDiZ0br4cPabtd0o3rgBiqkUOM9sQHaRzFl6f2dTu6w=";
+    hash = "sha256-LFAeGxELocL2mFVofNOMqvNDIauRB2eN84A+x4NRBac=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/claude-agent-sdk/default.nix
+++ b/pkgs/development/python-modules/claude-agent-sdk/default.nix
@@ -13,14 +13,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "claude-agent-sdk";
-  version = "0.2.87";
+  version = "0.2.91";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "anthropics";
    repo = "claude-agent-sdk-python";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-dHmiWCGMb0lrP9yCMXpm7/LrM3VVNiSd+W/mmrrYVfc=";
+    hash = "sha256-rnVFerHFU7GoaTfkea28Cib8m1iLgs70eDhx+g/04Xs=";
  };

  build-system = [ hatchling ];
--- a/pkgs/development/python-modules/cwl-utils/default.nix
+++ b/pkgs/development/python-modules/cwl-utils/default.nix
@@ -18,14 +18,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "cwl-utils";
-  version = "0.41";
+  version = "0.42";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "common-workflow-language";
    repo = "cwl-utils";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-78Kx+LCEcPE7qsV6MFtfSY6tVj5KZhifFOib7beCU2c=";
+    hash = "sha256-4RmKVhYfyB7idO6euo0jJuHjW19Ybt9MIbNTM0WSAb4=";
  };

  build-system = [ hatchling ];
--- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
+++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
@@ -22,14 +22,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "cyclonedx-python-lib";
-  version = "11.7.0";
+  version = "11.8.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "CycloneDX";
    repo = "cyclonedx-python-lib";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-35JTr2he7sHOqG3Nd0UM9CZ4Q/HFv3UQsF6hxOKR/+k=";
+    hash = "sha256-eICBnjJm+UIi5cj+25G/j0uhzSK8P+783w0q7LiP4sc=";
  };

  pythonRelaxDeps = [ "py-serializable" ];
--- a/pkgs/development/python-modules/google-cloud-automl/default.nix
+++ b/pkgs/development/python-modules/google-cloud-automl/default.nix
@@ -15,22 +15,20 @@
  setuptools,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "google-cloud-automl";
-  version = "2.19.0";
+  version = "2.20.0";
  pyproject = true;

  src = fetchPypi {
    pname = "google_cloud_automl";
-    inherit version;
-    hash = "sha256-xyZ7Wafv97FSB/5oaJ67P7kian4nL/E78nUL9ocUWM4=";
+    inherit (finalAttrs) version;
+    hash = "sha256-3BaZODxm3KaDecL6iM0JQz9mOwaOvOTnb1HJ8sCOzEA=";
  };

  build-system = [ setuptools ];

-  pythonRelaxDeps = [
-    "protobuf"
-  ];
+  pythonRelaxDeps = [ "protobuf" ];

  dependencies = [
    google-api-core
@@ -75,8 +73,8 @@ buildPythonPackage rec {
  meta = {
    description = "Cloud AutoML API client library";
    homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-automl";
-    changelog = "https://github.com/googleapis/google-cloud-python/tree/google-cloud-automl-v${version}/packages/google-cloud-automl";
+    changelog = "https://github.com/googleapis/google-cloud-python/tree/google-cloud-automl-v${finalAttrs.version}/packages/google-cloud-automl";
    license = lib.licenses.asl20;
    maintainers = [ ];
  };
-}
+})
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "iamdata";
-  version = "0.1.202606031";
+  version = "0.1.202606051";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "cloud-copilot";
    repo = "iam-data-python";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-fJ0fKvg5wVeHBPKvTemYp44JOoxmdqaAigzbRlS7xD8=";
+    hash = "sha256-B3yKeS7lKU98oilFWHBfx24A7bbnZwqZ7oBU0kTppGE=";
  };

  __darwinAllowLocalNetworking = true;
--- a/pkgs/development/python-modules/llm-ollama/default.nix
+++ b/pkgs/development/python-modules/llm-ollama/default.nix
@@ -22,14 +22,14 @@

 buildPythonPackage rec {
  pname = "llm-ollama";
-  version = "0.16.0";
+  version = "0.16.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "taketwo";
    repo = "llm-ollama";
    tag = version;
-    hash = "sha256-EzZHkFuqkpd/rtQI1dV/wl8KZWblgWnwUl4vP3y9D8M=";
+    hash = "sha256-PoFn/nl7CU9I3ssBMpkUMp0akQxQDz1bbht9ko+Tpc0=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/md-toc/default.nix
+++ b/pkgs/development/python-modules/md-toc/default.nix
@@ -29,7 +29,10 @@ buildPythonPackage rec {
    pytestCheckHook
  ];

-  enabledTestPaths = [ "md_toc/tests/*.py" ];
+  # Only run the real unit-test module; the over-broad glob also collected
+  # md_toc/tests/fuzzer.py, which imports the unpackaged `atheris` engine.
+  # https://github.com/frnmst/md-toc/blob/9.0.0/md_toc/tests/fuzzer.py#L22
+  enabledTestPaths = [ "md_toc/tests/tests.py" ];

  pythonImportsCheck = [ "md_toc" ];

--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -99,12 +99,12 @@ in
      "sha256-orCWB6FeVF4iJiIja5hNW14PZ/QUGaaRUktPr7dPgpE=";

  mypy-boto3-appflow =
-    buildMypyBoto3Package "appflow" "1.43.0"
-      "sha256-AaezdFSoG0JtWQBOAd1f3gUhtppML68j9NvePYbjsdI=";
+    buildMypyBoto3Package "appflow" "1.43.23"
+      "sha256-7QYZuOxO32+VYpWBoDlOBYhRHP3bVBLChVmor7tuyuA=";

  mypy-boto3-appintegrations =
-    buildMypyBoto3Package "appintegrations" "1.43.0"
-      "sha256-8nS9kfOsFIRMoiF9Iy8czuGCBV1JNF3AHyMjIjcvp3U=";
+    buildMypyBoto3Package "appintegrations" "1.43.23"
+      "sha256-ddcr8HAgFnhGDYPGx8WrNi16Rg++W1A7ccpBXn86hbc=";

  mypy-boto3-application-autoscaling =
    buildMypyBoto3Package "application-autoscaling" "1.43.0"
@@ -143,8 +143,8 @@ in
      "sha256-0+/67dkC+suDivd53hHJ+d1D8Kg2ZxRJvUS0EUaZjXE=";

  mypy-boto3-auditmanager =
-    buildMypyBoto3Package "auditmanager" "1.43.0"
-      "sha256-23zuWICJ49no8T4AlgZV0kDkz0j5pe1xE7uKKmszm9U=";
+    buildMypyBoto3Package "auditmanager" "1.43.23"
+      "sha256-0QMHGUpHVdAUf8hw4RtgU3wManp26riDDbx49a9929U=";

  mypy-boto3-autoscaling =
    buildMypyBoto3Package "autoscaling" "1.43.0"
@@ -203,8 +203,8 @@ in
      "sha256-tzV4iGq77gV+G8V29kn3qq9Riqa5TqDObBi2uVAXpx8=";

  mypy-boto3-chime-sdk-voice =
-    buildMypyBoto3Package "chime-sdk-voice" "1.43.0"
-      "sha256-Vtu56EDQljvG3JZbiqt3CJzhquUIbYY2/Kn7QXw4Poc=";
+    buildMypyBoto3Package "chime-sdk-voice" "1.43.23"
+      "sha256-51MoyiVhP371RZ8pD0N38qenWpsW3HTn4PL/6Hd8Ki8=";

  mypy-boto3-cleanrooms =
    buildMypyBoto3Package "cleanrooms" "1.43.13"
@@ -223,8 +223,8 @@ in
      "sha256-Ula0Hx4jZ6JVlT9v4P88bmtQSYyFtofeZiN9vAILqxw=";

  mypy-boto3-cloudformation =
-    buildMypyBoto3Package "cloudformation" "1.43.0"
-      "sha256-W+hFvD3Buc29i2sHH618QtAiHUCHrAzHxbndIZsyRgY=";
+    buildMypyBoto3Package "cloudformation" "1.43.23"
+      "sha256-5uR0CjqWzTHzthGWM/IkolEZ4i2CSGGb0joju66Mp6g=";

  mypy-boto3-cloudfront =
    buildMypyBoto3Package "cloudfront" "1.43.8"
@@ -331,8 +331,8 @@ in
      "sha256-TYrnhgzhH6+o+cTpBBpiEO6MPkz4xbLOqiOJf/IAvto=";

  mypy-boto3-config =
-    buildMypyBoto3Package "config" "1.43.0"
-      "sha256-kPG0jzeHlRm8dNKCrxJY2Jw/N06PL+C/34gB9qhz2BY=";
+    buildMypyBoto3Package "config" "1.43.23"
+      "sha256-6FyB/VCGsMYDBFUu0VzWpge94lASfg6CVewhkmpxycQ=";

  mypy-boto3-connect =
    buildMypyBoto3Package "connect" "1.43.22"
@@ -351,8 +351,8 @@ in
      "sha256-lGdrTkjAWbH6kBppKKLFrMyL/UiUwzpkClbWwTkl32E=";

  mypy-boto3-connectparticipant =
-    buildMypyBoto3Package "connectparticipant" "1.43.0"
-      "sha256-q+pbs4ZSKslCsusngqG7Z1ubXLs+SLIrwywLR/fkGM8=";
+    buildMypyBoto3Package "connectparticipant" "1.43.23"
+      "sha256-bPHo+9k+bZeVrx6ytHiat8ienlPMqmmtei3waof4m4E=";

  mypy-boto3-controltower =
    buildMypyBoto3Package "controltower" "1.43.0"
@@ -463,8 +463,8 @@ in
      "sha256-0YWDS6MW3UhdLKzLaaZfrOZjZTrO15t5SDJoHM3MtSo=";

  mypy-boto3-efs =
-    buildMypyBoto3Package "efs" "1.43.0"
-      "sha256-R5CFa1FuJ/b361hpJx0c83RI0ZI2Vk3oflTP2CP6WsI=";
+    buildMypyBoto3Package "efs" "1.43.23"
+      "sha256-11KpPRxGId76g/I4jXwMQ55kwGEQVsasgvMUXsiLbM4=";

  mypy-boto3-eks =
    buildMypyBoto3Package "eks" "1.43.1"
@@ -495,8 +495,8 @@ in
      "sha256-duh/9/eUhdVkmkEgdf5EB5nbp/TlXQQLMMAorlYPRu8=";

  mypy-boto3-emr =
-    buildMypyBoto3Package "emr" "1.43.0"
-      "sha256-xp3QbOVif4Z9QbnKUHlPbIWHxuXzecUk2bb1Y1/ekH4=";
+    buildMypyBoto3Package "emr" "1.43.23"
+      "sha256-eaShKsX1+JR8ZOm70f1bMkUeJB/NEhq1xVOpCu4AGGA=";

  mypy-boto3-emr-containers =
    buildMypyBoto3Package "emr-containers" "1.43.0"
@@ -571,8 +571,8 @@ in
      "sha256-vMz4YKm78XMavlPUNiSVAYmAbyUBrJhUXbFrhxIvUJA=";

  mypy-boto3-glue =
-    buildMypyBoto3Package "glue" "1.43.8"
-      "sha256-CJJviequ3qlGqjvK0p4Z1/MPG0XK6k7LM0CkOfh4LCc=";
+    buildMypyBoto3Package "glue" "1.43.23"
+      "sha256-ED9eubovJzwvZIRr5P1CS9UmEgFf+rRMI6LoYqENPeM=";
  mypy-boto3-grafana =
    buildMypyBoto3Package "grafana" "1.43.11"
      "sha256-XJOSLyL1+uEweZ9zER7IhH3DFLaLtpJKvuRIn8Ri+P4=";
@@ -590,8 +590,8 @@ in
      "sha256-+DDeD9YWo98meLZU2Mzu5AE0S7HFg6kfxeUWUh9XcQA=";

  mypy-boto3-guardduty =
-    buildMypyBoto3Package "guardduty" "1.43.20"
-      "sha256-wTB+ajpXaGLWpM5vbMibB1q/PVejn3eK+v5Lfh57wqo=";
+    buildMypyBoto3Package "guardduty" "1.43.23"
+      "sha256-8lpdVOn5hPKmOTTCtEJiCv4bsWhX6NtEtx4cgsKMDp0=";

  mypy-boto3-health =
    buildMypyBoto3Package "health" "1.43.0"
@@ -694,8 +694,8 @@ in
      "sha256-CAn84uzip9Cd8Xr33gxAx6+iQ9hRYPO0u718BtYCr84=";

  mypy-boto3-ivs =
-    buildMypyBoto3Package "ivs" "1.43.10"
-      "sha256-2Q3yLbuHE/x96RtF1ZW8fBTvQfmujLC9ZxXGmc5lJCg=";
+    buildMypyBoto3Package "ivs" "1.43.23"
+      "sha256-GDrOFtAVGeiZKnHUs6Jyy0Rw+4qX7vujzlmw6YorfN4=";

  mypy-boto3-ivs-realtime =
    buildMypyBoto3Package "ivs-realtime" "1.43.0"
@@ -714,8 +714,8 @@ in
      "sha256-FM/OFQLL6E/ikP6PIFF7sMwNjBoVfufLWH99tL/B7xA=";

  mypy-boto3-kendra =
-    buildMypyBoto3Package "kendra" "1.43.0"
-      "sha256-7zx7u3kh6NiBuL7O1nlbg0oxBnPSh1HMRnyTrf/AyV8=";
+    buildMypyBoto3Package "kendra" "1.43.23"
+      "sha256-zrQQQNejq/o1IQTpwQO2roa5RYTegdkRxPsmEEZKCFc=";

  mypy-boto3-kendra-ranking =
    buildMypyBoto3Package "kendra-ranking" "1.43.0"
@@ -1170,8 +1170,8 @@ in
      "sha256-T+JIJpHxD7IzAwq8yxgq6zbVMj/btpbhKnylMyfFvvU=";

  mypy-boto3-sagemaker =
-    buildMypyBoto3Package "sagemaker" "1.43.20"
-      "sha256-EAuXDoQfGv/Fk/nQfcWNt4WSHir9y0cF8vRr0yPcNqM=";
+    buildMypyBoto3Package "sagemaker" "1.43.23"
+      "sha256-1UBh6FC9qhhzBL4ede41SlHGigrKcbdexAnnMWW9XOM=";

  mypy-boto3-sagemaker-a2i-runtime =
    buildMypyBoto3Package "sagemaker-a2i-runtime" "1.43.0"
@@ -1282,8 +1282,8 @@ in
      "sha256-wXdXItgB+AgAXYF1KWJvn6XfFwdWXQR4RG6LknRlobM=";

  mypy-boto3-sns =
-    buildMypyBoto3Package "sns" "1.43.0"
-      "sha256-KtYPjmxmLpG0xvRUOcvrU/BO0qdk8KYR115PoP3+TEE=";
+    buildMypyBoto3Package "sns" "1.43.23"
+      "sha256-b4oZtkxqvxvWI62Rvn52zifyOW2h8QgwWJIdDeQXatE=";

  mypy-boto3-sqs =
    buildMypyBoto3Package "sqs" "1.43.0"
@@ -1406,8 +1406,8 @@ in
      "sha256-Yyltlus+qxQqAzzi6P5yXElnn2tXaEUtB9lvobTGFBc=";

  mypy-boto3-workdocs =
-    buildMypyBoto3Package "workdocs" "1.43.0"
-      "sha256-Swmj8MryTKviSMT8kvA+Lr1YOxEpStPhDCRoSKc0iT4=";
+    buildMypyBoto3Package "workdocs" "1.43.23"
+      "sha256-muQgj+irB5ZQw+tIsWVUlUljC6uWT5D2BOXcXPf/Yeo=";

  mypy-boto3-worklink =
    buildMypyBoto3Package "worklink" "1.35.0"
@@ -1422,8 +1422,8 @@ in
      "sha256-2glzIKBlui8YPvzI74bT4ADqEZ0lH9CuZqHtwz64Z3k=";

  mypy-boto3-workspaces =
-    buildMypyBoto3Package "workspaces" "1.43.0"
-      "sha256-0ESAx26RITxxE4/mwDSC7TxlfKObjU1Q0vTJ3pgK+7k=";
+    buildMypyBoto3Package "workspaces" "1.43.23"
+      "sha256-0BG0twdq8/ghYauhcpGvUSs4FeQidWuIFbYqNG0di7E=";

  mypy-boto3-workspaces-web =
    buildMypyBoto3Package "workspaces-web" "1.43.0"
--- a/pkgs/development/python-modules/pyexploitdb/default.nix
+++ b/pkgs/development/python-modules/pyexploitdb/default.nix
@@ -9,12 +9,12 @@

 buildPythonPackage (finalAttrs: {
  pname = "pyexploitdb";
-  version = "0.3.28";
+  version = "0.3.29";
  pyproject = true;

  src = fetchPypi {
    inherit (finalAttrs) pname version;
-    hash = "sha256-09qyrlqoXPOBi7ZfapJM8sZm4s2F2MAoKKr3b39NNKs=";
+    hash = "sha256-gp66cqD9q61ICZQJ/wkrF17sOix6jwjSlu/EM1g3mvg=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/pyspark/default.nix
+++ b/pkgs/development/python-modules/pyspark/default.nix
@@ -22,12 +22,12 @@

 buildPythonPackage (finalAttrs: {
  pname = "pyspark";
-  version = "4.1.1";
+  version = "4.1.2";
  pyproject = true;

  src = fetchPypi {
    inherit (finalAttrs) pname version;
-    hash = "sha256-d/eJhKqE++hlxxfdN7SZE7TlyX1272gk+TLxrvpmIew=";
+    hash = "sha256-+l1hWfcA0JkKB/T2LfG3RJQB3M7pzX1dbfiVdTCEFgI=";
  };

  # pypandoc is broken with pandoc2, so we just lose docs.
--- a/pkgs/development/python-modules/pytransportnswv2/default.nix
+++ b/pkgs/development/python-modules/pytransportnswv2/default.nix
@@ -3,22 +3,22 @@
  buildPythonPackage,
  fetchPypi,
  gtfs-realtime-bindings,
+  hatchling,
  httpx,
  requests,
-  setuptools,
 }:

 buildPythonPackage (finalAttrs: {
  pname = "pytransportnswv2";
-  version = "2.2.6";
+  version = "3.0.2";
  pyproject = true;

  src = fetchPypi {
    inherit (finalAttrs) pname version;
-    hash = "sha256-Aw6Um1TPcXlADndSAls0TS4/2QvNi9az5ceBv7wnBck=";
+    hash = "sha256-mAVrt0Ui/mXDKAq0sf2A9E3zM3P5Eq9NXSQdw68B4hY=";
  };

-  build-system = [ setuptools ];
+  build-system = [ hatchling ];

  dependencies = [
    gtfs-realtime-bindings
--- a/pkgs/development/python-modules/pytrydan/default.nix
+++ b/pkgs/development/python-modules/pytrydan/default.nix
@@ -15,16 +15,16 @@
  typer,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "pytrydan";
-  version = "1.0.0";
+  version = "1.0.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "dgomes";
    repo = "pytrydan";
-    tag = "v${version}";
-    hash = "sha256-ivLNP5lconJ0G8MuY8xgcJ9MTx91yUjeY1NA4U7OwMo=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-oXnTDwCY2Z/K7YwWNTwbbB0W47bZD+W6uFxZQRF3KgQ=";
  };

  pythonRelaxDeps = [ "tenacity" ];
@@ -52,9 +52,9 @@ buildPythonPackage rec {
  meta = {
    description = "Library to interface with V2C EVSE Trydan";
    homepage = "https://github.com/dgomes/pytrydan";
-    changelog = "https://github.com/dgomes/pytrydan/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/dgomes/pytrydan/blob/${finalAttrs.src.tag}/CHANGELOG.md";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ fab ];
    mainProgram = "pytrydan";
  };
-}
+})
--- a/pkgs/development/python-modules/pyworxcloud/default.nix
+++ b/pkgs/development/python-modules/pyworxcloud/default.nix
@@ -13,14 +13,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "pyworxcloud";
-  version = "6.3.6";
+  version = "6.4.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "MTrab";
    repo = "pyworxcloud";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-9UBtzSo+CKbY8KXERdN+Cxu+D03qf33oTrXp288Qgik=";
+    hash = "sha256-r3v9cGr3ko/ALkM56mKsPUoUv+r5hmX5hflNdyKol58=";
  };

  pythonRelaxDeps = [ "awsiotsdk" ];
--- a/pkgs/development/python-modules/redisvl/default.nix
+++ b/pkgs/development/python-modules/redisvl/default.nix
@@ -15,14 +15,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "redisvl";
-  version = "0.19.0";
+  version = "0.20.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "redis";
    repo = "redis-vl-python";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-x8HotooGv1u5uGls1Y9HiioVzpF+MT6oYspdmZUpgh0=";
+    hash = "sha256-qzGK/M2KXVR9FEutA8xQU9bMYWerOFS2BzNtuAW9n0Q=";
  };

  build-system = [ hatchling ];
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -9,14 +9,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "tencentcloud-sdk-python";
-  version = "3.1.109";
+  version = "3.1.110";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "TencentCloud";
    repo = "tencentcloud-sdk-python";
    tag = finalAttrs.version;
-    hash = "sha256-UG4ZPNrqjSy9IQEPZa7hqN63TnrsJy/GDr9A3CP5ah4=";
+    hash = "sha256-o080VQfCRI9m3jjEj/x3RiJCBxGToY1ulUOauGOM+v8=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/xrootd/default.nix
+++ b/pkgs/development/python-modules/xrootd/default.nix
@@ -12,7 +12,11 @@ buildPythonPackage rec {

  inherit (xrootd) version src;

-  sourceRoot = "${src.name}/bindings/python";
+  sourceRoot = "${src.name}/python";
+
+  env.CMAKE_ARGS = lib.toString [
+    (lib.cmakeFeature "XRootD_INCLUDE_DIR" "${lib.getDev xrootd}/include/xrootd;${src}/src")
+  ];

  build-system = [
    cmake
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -7188,7 +7188,8 @@
      ];
    "vistapool" =
      ps: with ps; [
-      ]; # missing inputs: aioaquarite
+        aioaquarite
+      ];
    "vivotek" =
      ps: with ps; [
        libpyvivotek
@@ -8756,6 +8757,7 @@
    "victron_gx"
    "victron_remote_monitoring"
    "vilfo"
+    "vistapool"
    "vivotek"
    "vizio"
    "vlc_telnet"
--- a/pkgs/servers/home-assistant/custom-components/plant/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/plant/package.nix
@@ -11,13 +11,13 @@
 buildHomeAssistantComponent rec {
  owner = "olen";
  domain = "plant";
-  version = "2026.5.1";
+  version = "2026.6.0";

  src = fetchFromGitHub {
    inherit owner;
    repo = "homeassistant-plant";
    tag = "v${version}";
-    hash = "sha256-b5KhO1TvU4RI4tD0UQtJgwJHjjTTG2il2woLMoBclc0=";
+    hash = "sha256-WdUL4ne/sewIbdXpCbrpFMglIQA3qdvwSVuaww4lQYM=";
  };

  dependencies = [
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/auto-entities/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/auto-entities/package.nix
@@ -6,16 +6,16 @@

 buildNpmPackage rec {
  pname = "auto-entities";
-  version = "2.2.0";
+  version = "2.3.0";

  src = fetchFromGitHub {
    owner = "Lint-Free-Technology";
    repo = "lovelace-auto-entities";
    tag = "v${version}";
-    hash = "sha256-z+WrkLPuyzfYiKqfCmVyj1o7z/WjByr7gYoJblyQS3I=";
+    hash = "sha256-BHiTg2HLOQB+jXzvyQMwTTX8smQhbZ2/AsBQyFCquhU=";
  };

-  npmDepsHash = "sha256-09JWRjHhGHQ2NtLgY5x/dH/B+l/Sy4OfbEckHY3ezZI=";
+  npmDepsHash = "sha256-5DZlAhYY/Cf7/AfPa3+sIFy75nDopPLIFDe3FjRPevA=";

  installPhase = ''
    runHook preInstall
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/flower-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/flower-card/package.nix
@@ -6,16 +6,16 @@

 buildNpmPackage (finalAttrs: {
  pname = "flower-card";
-  version = "2026.4.1";
+  version = "2026.6.0";

  src = fetchFromGitHub {
    owner = "olen";
    repo = "lovelace-flower-card";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-5v5xd2DSTg1meRr4ORAmZbtfBSNM1z/3Y5Y/vI20R4s=";
+    hash = "sha256-iR1uxpkhLFPDBUUE0gwRlT9kwinAyI7SdWBiYD1UlXw=";
  };

-  npmDepsHash = "sha256-XGKGoFdbeUIx12ZGP8o2oSTJHVa+PZ6jwYSWiqjtSuM=";
+  npmDepsHash = "sha256-vP5ShzHQdBa+TY11P4QadyGBjXSw68/rGODiiJKBbnQ=";

  installPhase = ''
    runHook preInstall
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -216,6 +216,8 @@ self: super: with self; {

  aioaquacell = callPackage ../development/python-modules/aioaquacell { };

+  aioaquarite = callPackage ../development/python-modules/aioaquarite { };
+
  aioaseko = callPackage ../development/python-modules/aioaseko { };

  aioasuswrt = callPackage ../development/python-modules/aioasuswrt { };