Merge staging-next into staging

2026-07-06 17:13:24 -05:00 · 2026-05-15 16:42:57 +00:00 · 2026-05-15 16:42:57 +00:00 · cf485ae973
commit cf485ae973
parent 92473b6b22 2bf9083cd3
83 changed files with 889 additions and 502 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -11952,6 +11952,11 @@
    github = "j0xaf";
    githubId = 932697;
  };
+  j10ccc = {
+    name = "popWheat";
+    github = "j10ccc";
+    githubId = 49830650;
+  };
  j1nxie = {
    email = "rylie@rylie.moe";
    name = "Nguyen Pham Quoc An";
@ -29849,6 +29854,12 @@
      { fingerprint = "34DB 8D31 F782 2B61 FF06  9503 8B5C 43DC 9105 2999"; }
    ];
  };
+  wrench-exile-legacy = {
+    email = "user@wrench-exile-legacy.site";
+    github = "wrench-exile-legacy";
+    githubId = 280737824;
+    name = "wrench";
+  };
  wrmilling = {
    name = "Winston R. Milling";
    email = "Winston@Milli.ng";
--- a/nixos/lib/test-driver/src/test_driver/machine/init.py
+++ b/nixos/lib/test-driver/src/test_driver/machine/init.py
@ -1495,6 +1495,17 @@ class NspawnMachine(BaseMachine):
        self.logger.info(f"kill NspawnMachine (pid {self.pid})")
        assert self.process is not None
        self.process.terminate()
+        # Wait for the wrapper to finish its context-manager cleanups
+        # (veth/bridge/netns teardown) before returning, so the driver's
+        # subsequent vlan teardown does not race against it.
+        try:
+            self.process.wait(timeout=30)
+        except subprocess.TimeoutExpired:
+            self.logger.error(
+                f"NspawnMachine {self.name} (pid {self.pid}) did not exit after SIGTERM; sending SIGKILL"
+            )
+            self.process.kill()
+            self.process.wait()
        self.process = None

    def is_up(self) -> bool:
--- a/nixos/modules/services/security/oauth2-proxy.nix
+++ b/nixos/modules/services/security/oauth2-proxy.nix
@ -55,6 +55,7 @@ let
      pass-basic-auth = passBasicAuth;
      pass-host-header = passHostHeader;
      reverse-proxy = reverseProxy;
+      trusted-proxy-ip = trustedProxyIP;
      proxy-prefix = proxyPrefix;
      profile-url = profileURL;
      oidc-issuer-url = oidcIssuerUrl;
@ -495,6 +496,16 @@ in
      '';
    };

+    trustedProxyIP = lib.mkOption {
+      type = with lib.types; listOf str;
+      default = [ ];
+      description = ''
+        List of IPs or CIDR ranges allowed to supply X-Forwarded-* headers when reverseProxy is enabled.
+        If not set, OAuth2 Proxy preserves backwards compatibility by trusting all source IPs (0.0.0.0/0, ::/0) and logs a warning at startup.
+        Configure this to your reverse proxy addresses to prevent forwarded header spoofing.
+      '';
+    };
+
    proxyPrefix = lib.mkOption {
      type = lib.types.str;
      default = "/oauth2";
@ -618,6 +629,13 @@ in
      }
    ];

+    warnings = lib.mkIf (cfg.reverseProxy -> cfg.trustedProxyIP == [ ]) [
+      ''
+        When config.services.oauth2-proxy.reverseProxy is enabled, configure config.services.oauth2-proxy.trustedProxyIP to the IPs or CIDR range(s) of the reverse proxies that are allowed to send X-Forwarded-* headers.
+        If you leave it unset, OAuth2 Proxy currently trusts all source IPs for backwards compatibility, which means a client that can reach OAuth2 Proxy directly may be able to spoof forwarded headers.
+      ''
+    ];
+
    users.users.oauth2-proxy = {
      description = "OAuth2 Proxy";
      isSystemUser = true;
--- a/nixos/modules/virtualisation/nspawn-container/run-nspawn/src/run_nspawn/init.py
+++ b/nixos/modules/virtualisation/nspawn-container/run-nspawn/src/run_nspawn/init.py
@ -101,8 +101,17 @@ def ensure_vlan_bridge(vlan: int) -> typing.Generator[str, None, None]:
        # releasing this vlan, grab an exclusive lock.
        with vlan_lock(vlan):
            if bridge_path.exists():
-                child_intf_count = len(list((bridge_path / "brif").iterdir()))
-                if child_intf_count == 0:
+                # The VDE tap is owned by the test driver's vde_plug2tap
+                # and shares its lifetime with the vlan, not with any
+                # container. Don't count it when deciding whether the
+                # bridge is still in use, otherwise the bridge would
+                # never be deleted as long as vde_plug2tap is alive.
+                child_intfs = [
+                    p.name
+                    for p in (bridge_path / "brif").iterdir()
+                    if p.name != tap_name
+                ]
+                if not child_intfs:
                    logger.info("deleting bridge %s", bridge_name)
                    run_ip("link", "delete", bridge_name)

--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@ -21,26 +21,26 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
      sources = {
        "x86_64-linux" = {
          arch = "linux-x64";
-          hash = "sha256-av844ENiMjenpHu5HOFHotAZ2OcZETpuxhfrKW/GYRk=";
+          hash = "sha256-pGJ1coic0kdjXUI6HCEkQsyQC5YU0jnA1hmN6MaPfwg=";
        };
        "aarch64-linux" = {
          arch = "linux-arm64";
-          hash = "sha256-LKGZ2TWJWVhn2D6NmQFszB3B/kf3FJd6+PR6ZZ2r1Hc=";
+          hash = "sha256-NppbZ/gCZYGZna8bs/nUASxyqd6Bv0AOYTEbfaqJWyI=";
        };
        "x86_64-darwin" = {
          arch = "darwin-x64";
-          hash = "sha256-n/wWN6SeRPUTX2X/0eXDRUy4UM0nYT3Yk8gVxy4wyXc=";
+          hash = "sha256-oM2H7CJBS0G8ieiI6twqpA257QWWytdbpkV2Q2D7R6o=";
        };
        "aarch64-darwin" = {
          arch = "darwin-arm64";
-          hash = "sha256-oW16SY7D7q6/3PyWSBz04/JU1T8x6DnIkTe3+T/RSzY=";
+          hash = "sha256-lRChL8hGIc4zJ/CBwPkLYY1U5YhfM0DrW//C1dNi//A=";
        };
      };
    in
    {
      name = "claude-code";
      publisher = "anthropic";
-      version = "2.1.140";
+      version = "2.1.141";
    }
    // sources.${stdenvNoCC.hostPlatform.system}
      or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@ -1145,8 +1145,8 @@ let
        mktplcRef = {
          name = "vscode-database-client2";
          publisher = "cweijan";
-          version = "8.4.5";
-          hash = "sha256-CViXcQ8k4eTd5adFvSK4cCFJDRov09wK80QBveziom4=";
+          version = "8.4.6";
+          hash = "sha256-GBz0hS75VgfuGuHY/K/VHxp5sFptUCJaz/CXrm6wFPc=";
        };
        meta = {
          description = "Database Client For Visual Studio Code";
@ -5108,8 +5108,8 @@ let
        mktplcRef = {
          publisher = "vscjava";
          name = "vscode-java-dependency";
-          version = "0.27.2";
-          hash = "sha256-1ix/MtZ801uX0Q1/t+S6AG3sSkILDugouecOq9BO1IQ=";
+          version = "0.27.3";
+          hash = "sha256-8ZkdAZLplf9RI5sFGqsjVMlsletck/qXJ6D1Dxz9AuI=";
        };
        meta = {
          license = lib.licenses.mit;
--- a/pkgs/applications/editors/vscode/extensions/oliver-ni.scheme-fmt/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/oliver-ni.scheme-fmt/default.nix
@ -1,9 +1,8 @@
 {
  lib,
  vscode-utils,
-  jq,
+  buildPackages,
  python3,
-  moreutils,
 }:

 vscode-utils.buildVscodeMarketplaceExtension {
@ -16,7 +15,7 @@ vscode-utils.buildVscodeMarketplaceExtension {

  postInstall = ''
    cd "$out/$installPrefix"
-    ${lib.getExe jq} '.contributes.configuration.properties."scheme-fmt.pythonPath".default = "${lib.getExe python3}"' package.json | ${lib.getExe' moreutils "sponge"} package.json
+    ${lib.getExe buildPackages.jq} '.contributes.configuration.properties."scheme-fmt.pythonPath".default = "${lib.getExe python3}"' package.json | ${lib.getExe' buildPackages.moreutils "sponge"} package.json
  '';

  meta = {
--- a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix
+++ b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix
@ -5,6 +5,7 @@
  writeShellScriptBin,
  fetchurl,
  vscode,
+  buildPackages,
  unzip,
  makeSetupHook,
  writeScript,
@ -15,7 +16,7 @@ let
  unpackVsixSetupHook = makeSetupHook {
    name = "unpack-vsix-setup-hook";
    substitutions = {
-      unzip = "${unzip}/bin/unzip";
+      unzip = "${buildPackages.unzip}/bin/unzip";
    };
  } ./unpack-vsix-setup-hook.sh;
  buildVscodeExtension = lib.extendMkDerivation {
--- a/pkgs/applications/emulators/libretro/cores/mupen64plus.nix
+++ b/pkgs/applications/emulators/libretro/cores/mupen64plus.nix
@ -12,13 +12,13 @@
 }:
 mkLibretroCore {
  core = "mupen64plus-next";
-  version = "0-unstable-2026-04-02";
+  version = "0-unstable-2026-05-12";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "mupen64plus-libretro-nx";
-    rev = "58b9daf940fb43f09c3984c6a7c730f4b4c24861";
-    hash = "sha256-9d1gbDDK2rOt/a9NNRQVJJmiE+UdohM/yPI5WstNmtA=";
+    rev = "8cdfadf266a784cd1849f7fef8adae2912240b18";
+    hash = "sha256-37A9ScN8jRX1i2aocyNr3VAJsJ7xoMsmzVgPILpoqmQ=";
  };

  # Fix for GCC 14
--- a/pkgs/applications/emulators/libretro/cores/tgbdual.nix
+++ b/pkgs/applications/emulators/libretro/cores/tgbdual.nix
@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
  core = "tgbdual";
-  version = "0-unstable-2026-04-20";
+  version = "0-unstable-2026-05-11";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "tgbdual-libretro";
-    rev = "12540f0b2d3783259a0dce34ac8aa7a86beeaa11";
-    hash = "sha256-l+WiFC5GxbdY9ulmtdqd2iKU7qKoVWqcf4YR/waSVhQ=";
+    rev = "bf816b096f1dca55ea805337d7c9e78d6b98d839";
+    hash = "sha256-HpvgFN37lPZpJqwUdM8qFSGcqUkYsqSCKCLMFHD6ggM=";
  };

  makefile = "Makefile";
--- a/pkgs/by-name/bc/bchoppr/package.nix
+++ b/pkgs/by-name/bc/bchoppr/package.nix
@ -6,17 +6,19 @@
  cairo,
  libx11,
  lv2,
+  libsndfile,
+  cpio,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "bchoppr";
-  version = "1.12.6";
+  version = "1.12.8";

  src = fetchFromGitHub {
    owner = "sjaehn";
    repo = "bchoppr";
    tag = finalAttrs.version;
-    hash = "sha256-/aLoLUpWu66VKd9lwjli+FZZctblrZUPSEsdYH85HwQ=";
+    hash = "sha256-zbRriQ5pcoQ1Hi1gux2kM260kGxFzng251og/niUiLQ=";
    fetchSubmodules = true;
  };

@ -25,6 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
    cairo
    libx11
    lv2
+    libsndfile
+    cpio
  ];

  installFlags = [ "PREFIX=$(out)" ];
--- a/pkgs/by-name/bl/bliss/package.nix
+++ b/pkgs/by-name/bl/bliss/package.nix
@ -3,49 +3,50 @@
  stdenv,
  fetchurl,
  unzip,
+  cmake,
  doxygen,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "bliss";
-  version = "0.73";
+  version = "0.77";
+
+  __structuredAttrs = true;

  src = fetchurl {
-    url = "http://www.tcs.hut.fi/Software/bliss/bliss-${finalAttrs.version}.zip";
-    sha256 = "f57bf32804140cad58b1240b804e0dbd68f7e6bf67eba8e0c0fa3a62fd7f0f84";
+    url = "https://users.aalto.fi/~tjunttil/bliss/downloads/bliss-${finalAttrs.version}.zip";
+    hash = "sha256-rMi5gDTzD60kyJfzZavYZsE9nxuyB+OY0MrxNodZcqQ=";
  };

-  patches = fetchurl {
-    url = "http://scip.zib.de/download/bugfixes/scip-5.0.1/bliss-0.73.patch";
-    sha256 = "815868d6586bcd49ff3c28e14ccb536d38b2661151088fe08187c13909c5dab0";
-  };
+  patches = [
+    (fetchurl {
+      url = "https://github.com/sagemath/sage/raw/0fc563cc566ac4e9d0b713195d0a4fb138abca06/build/pkgs/bliss/patches/bliss-0.77-install.patch";
+      hash = "sha256-x2xTfR98eipLxskqHEwFBT9xciwFOFpeJWfg4IcepKQ=";
+    })
+  ];
+
+  strictDeps = true;

  nativeBuildInputs = [
    unzip
+    cmake
    doxygen
  ];

-  preBuild = ''
-    doxygen Doxyfile
+  postBuild = ''
+    doxygen ../Doxyfile
  '';

-  installPhase = ''
-    mkdir -p $out/bin $out/share/doc/bliss $out/lib $out/include/bliss
-    mv bliss $out/bin
-    mv html/* COPYING* $out/share/doc/bliss
-    mv *.a $out/lib
-    mv *.h *.hh $out/include/bliss
+  postInstall = ''
+    mkdir -p $out/share/doc/bliss
+    mv html/* ../COPYING* $out/share/doc/bliss
  '';

  meta = {
-    description = "Open source tool for computing automorphism groups and canonical forms of graphs. It has both a command line user interface as well as C++ and C programming language APIs";
+    description = "Open source tool for computing automorphism groups and canonical forms of graphs";
    mainProgram = "bliss";
-    homepage = "http://www.tcs.hut.fi/Software/bliss/";
-    license = lib.licenses.lgpl3;
-    platforms = [
-      "i686-linux"
-      "x86_64-linux"
-      "aarch64-linux"
-    ];
+    homepage = "https://users.aalto.fi/~tjunttil/bliss/";
+    license = lib.licenses.lgpl3Only;
+    platforms = lib.platforms.all;
  };
 })
--- a/pkgs/by-name/br/brave/package.nix
+++ b/pkgs/by-name/br/brave/package.nix
@ -3,24 +3,24 @@

 let
  pname = "brave";
-  version = "1.90.121";
+  version = "1.90.122";

  allArchives = {
    aarch64-linux = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-y4wAvJdghCfKF61EQoZHaZ28qmX2/DTmBhISRj+m8EM=";
+      hash = "sha256-RjmldIesTEVkIlLM9+nHGb4sPjLGKhJTOtLLBsJLYN8=";
    };
    x86_64-linux = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-XOTxy6+P6abDZtE9UlxSVX/eEDfNFrudC/q+9+gE3s4=";
+      hash = "sha256-jeEFsbXmPykkzOBIdB4Oe9towuwSHjApa485w2NO6A8=";
    };
    aarch64-darwin = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-WI5QIym3rMC8z+CcsLG+K4qgEaRiNzIOO7a7Vf45r1M=";
+      hash = "sha256-0QH9hJGCXRjSRANLPp3ivLvKfbH3qIfFs8i/p5BduKE=";
    };
    x86_64-darwin = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-a3GJeQ6InfTz3a4jtdOcNfP37MqLsjnuIJo3M451NKc=";
+      hash = "sha256-CZhfmjMbXwDizEk6xNzIZfGhiCUwHrJ/V1mqoCMV7TM=";
    };
  };

--- a/pkgs/by-name/br/brutus/package.nix
+++ b/pkgs/by-name/br/brutus/package.nix
@ -7,16 +7,16 @@

 buildGoModule (finalAttrs: {
  pname = "brutus";
-  version = "1.3.0";
+  version = "1.4.0";

  src = fetchFromGitHub {
    owner = "praetorian-inc";
    repo = "brutus";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-mLp9jnwg7z1KjYpjtnHHIClYelFacyWDvqftXb8toj0=";
+    hash = "sha256-1UuxEYhMNyzBTqRzObwsq4Kb4hQG/yU/V8AxA3jrqAw=";
  };

-  vendorHash = "sha256-1hP4gitbpm3wFhLu7OJ3gQMVkZKZJEZAKvhfejSOYMI=";
+  vendorHash = "sha256-vG4Ld0OTxVk/qnEiACgNXTGq4kt1yjaLIneZ2KbEGpg=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/cl/claude-code/manifest.json
+++ b/pkgs/by-name/cl/claude-code/manifest.json
@ -1,47 +1,47 @@
 {
-  "version": "2.1.140",
-  "commit": "89b4b3854fac52fdb8f9970133c4afe00174b6b9",
-  "buildDate": "2026-05-12T18:36:21Z",
+  "version": "2.1.141",
+  "commit": "4f4623ddd339e1c1b87d659b7c9eb3b66397e7a3",
+  "buildDate": "2026-05-13T21:34:55Z",
  "platforms": {
    "darwin-arm64": {
      "binary": "claude",
-      "checksum": "087ce732fb79658cd3e828cc377291dc56835fc5318cd519123b0880a09149c0",
-      "size": 206069664
+      "checksum": "31ac95bb19a33b1d0cddd3f3ff594bf8bfd2be5051cd2af7867109641cab705e",
+      "size": 207076896
    },
    "darwin-x64": {
      "binary": "claude",
-      "checksum": "2616b1e775ec0520228cd99135d07ef99e4b93b4532a03ef019e0a8e81cc7729",
-      "size": 208583824
+      "checksum": "fa9000fdf4a522fcaf30ea283555aca2ba5d0e76cdb8842154b7735b558c7c25",
+      "size": 209591056
    },
    "linux-arm64": {
      "binary": "claude",
-      "checksum": "0ec6fc062e99aa95a6edbb5308a563262d27a0772b107d01d4fa61110fb44472",
-      "size": 231454344
+      "checksum": "dc931e24f62afbadc8dc68115278b08493825a3ed1ea753d587077181a6cc63b",
+      "size": 232437384
    },
    "linux-x64": {
      "binary": "claude",
-      "checksum": "807a5d6ca063f5e03e4b7283934036a3122723b28c28e1a6978e98cf2d43d0b5",
-      "size": 231577296
+      "checksum": "832be26e8f15b2ae99e520a22b034fc4bfad1cb5b84de6b706487072c56bb42e",
+      "size": 232572624
    },
    "linux-arm64-musl": {
      "binary": "claude",
-      "checksum": "b840a07551c3e1baecff728eb6b9a849483be87bf1fdaed5da22d0b3427a88cf",
-      "size": 224309080
+      "checksum": "e6e6a481c0aab084198b3529c6d96774e14d18da999aba7d22e207952ed8faf0",
+      "size": 225292120
    },
    "linux-x64-musl": {
      "binary": "claude",
-      "checksum": "7db8946293de9ec11d2b02472f715f18ea9a346238d472605b5d9a4dc7bfd3f1",
-      "size": 225971248
+      "checksum": "8af1f6e19d3786cac74dcf369ff58f79df08be429813b29ae076247cc8d1ddae",
+      "size": 226966576
    },
    "win32-x64": {
      "binary": "claude.exe",
-      "checksum": "fcfe90297861b1bcfa581d7db645ec8a71984baed3b1c44d28032650baa2617c",
-      "size": 227456160
+      "checksum": "3ab326c39d195dbe394c173f31126d880a80270f98ade74ef555429e2dadb19f",
+      "size": 228410016
    },
    "win32-arm64": {
      "binary": "claude.exe",
-      "checksum": "3f782467ec6e593a5e23522b678cf4268965e4ec6fe904e41729a12d64232c40",
-      "size": 223420576
+      "checksum": "f622af48157bce7a24905fa6121191f5a472800ed9f77fa41c59bd5ecd161285",
+      "size": 224374432
    }
  }
 }
--- a/pkgs/by-name/cl/cloudcompare/package.nix
+++ b/pkgs/by-name/cl/cloudcompare/package.nix
@ -2,6 +2,7 @@
  lib,
  stdenv,
  fetchFromGitHub,
+  fetchpatch2,
  makeDesktopItem,
  copyDesktopItems,
  cmake,
@ -32,6 +33,14 @@ stdenv.mkDerivation (finalAttrs: {
    fetchSubmodules = true;
  };

+  patches = [
+    # https://github.com/CloudCompare/CloudCompare/pull/2208
+    (fetchpatch2 {
+      url = "https://github.com/CloudCompare/CloudCompare/commit/8e1c0562a7c19fd26ccd0c23bb05fb7c36980e0c.patch?full_index=1";
+      hash = "sha256-DARxLiRjcBJEo63o92ujjxBU42Y8CY2c7px8Y9UD5A4=";
+    })
+  ];
+
  nativeBuildInputs = [
    cmake
    eigen # header-only
@ -71,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
    "-DPLUGIN_IO_QE57=ON"
    "-DPLUGIN_IO_QFBX=OFF" # Autodesk FBX SDK is gratis+proprietary; not packaged in nixpkgs
    "-DPLUGIN_IO_QLAS=ON" # required for .las/.laz support
+    "-DLASZIP_INCLUDE_DIR=${lib.getInclude laszip}/include/laszip"
    "-DPLUGIN_IO_QPHOTOSCAN=ON"
    "-DPLUGIN_IO_QRDB=OFF" # Riegl rdblib is proprietary; not packaged in nixpkgs

--- a/pkgs/by-name/gr/grav/package.nix
+++ b/pkgs/by-name/gr/grav/package.nix
@ -6,7 +6,7 @@
 }:

 let
-  version = "1.7.50.3";
+  version = "1.7.52";
 in
 stdenvNoCC.mkDerivation {
  pname = "grav";
@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation {

  src = fetchzip {
    url = "https://github.com/getgrav/grav/releases/download/${version}/grav-admin-v${version}.zip";
-    hash = "sha256-W4JuW5NEko38AbLrLOGWYsRvehPV7+tX2Hq1tTZ22EY=";
+    hash = "sha256-xAXUS4qGOSExniggPWwIooalHjHhpk4YK5tQvkRLp0g=";
  };

  patches = [
--- a/pkgs/by-name/hi/hidapitester/package.nix
+++ b/pkgs/by-name/hi/hidapitester/package.nix
@ -11,13 +11,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "hidapitester";
-  version = "0.5";
+  version = "0.6";

  src = fetchFromGitHub {
    owner = "todbot";
    repo = "hidapitester";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-OpLeKTouCB3efsXWJO0lZxUHxtDKeBY7OYk0HwC2NF4=";
+    hash = "sha256-WqyAaoiiuHbLAgfGpl4M3AHyWFl8KPGA/OaO2E/uix0=";
  };

  postUnpack = ''
--- a/pkgs/by-name/je/jenkins/package.nix
+++ b/pkgs/by-name/je/jenkins/package.nix
@ -18,11 +18,11 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "jenkins";
-  version = "2.555.1";
+  version = "2.555.2";

  src = fetchurl {
    url = "https://get.jenkins.io/war-stable/${finalAttrs.version}/jenkins.war";
-    hash = "sha256-Jgi6WMalbGU/Cr9axidxlJohdDffKZ3/OQg743y3vQM=";
+    hash = "sha256-39oJV4xcGxjyjVDsNihoMF9XLDt674uQ0A96lDamKGc=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/by-name/js/json-sort-cli/package.nix
+++ b/pkgs/by-name/js/json-sort-cli/package.nix
@ -8,16 +8,16 @@

 buildNpmPackage rec {
  pname = "json-sort-cli";
-  version = "3.0.0";
+  version = "3.0.1";

  src = fetchFromGitHub {
    owner = "tillig";
    repo = "json-sort-cli";
    tag = "v${version}";
-    hash = "sha256-KJCT1QwjXAmAlsLxAgNV7XXtpSytlCEbPTZYFoEZgww=";
+    hash = "sha256-wUuVQmmcevGfcoYq5tPzEFRyPMMtbW/CeE5vNoCKFXQ=";
  };

-  npmDepsHash = "sha256-V+uKK3y3ImTHT6HSCmzlQUB+BqGYHyQyIB35uiIRNmg=";
+  npmDepsHash = "sha256-4sjP3ri52CunwLcbIJF6+qGgciiPmZKsrLnm50HX0PQ=";
  dontNpmBuild = true;

  doCheck = true;
--- a/pkgs/by-name/la/labwc-tweaks-gtk/package.nix
+++ b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix
@ -14,13 +14,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "labwc-tweaks-gtk";
-  version = "0-unstable-2026-03-02";
+  version = "0-unstable-2026-05-09";

  src = fetchFromGitHub {
    owner = "labwc";
    repo = "labwc-tweaks-gtk";
-    rev = "ebdabbb818703bcd7906e95682855fd63539b8cf";
-    hash = "sha256-R9f4Wupy6WHB6Tl4ep+wHuyRjO0zJLAc4ScYQinzwe0=";
+    rev = "c84d78c601e9f9a6e863766e35f736635cfa52d0";
+    hash = "sha256-qyMgo9QB8wLzZiUlbz/NjTssYy8FB28A5RX7Hd05ays=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/li/libzim/package.nix
+++ b/pkgs/by-name/li/libzim/package.nix
@ -16,13 +16,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "libzim";
-  version = "9.6.0";
+  version = "9.7.0";

  src = fetchFromGitHub {
    owner = "openzim";
    repo = "libzim";
    tag = finalAttrs.version;
-    hash = "sha256-/Jpn/zPXcTeOg4Q6TFqRd0csSk3O5Gl37MMNK5sxj5U=";
+    hash = "sha256-W7s+RFC9g/IeZkbM/YJCwSfTjBQ8urYKZzyMJDFpAAM=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ly/ly/deps.nix
+++ b/pkgs/by-name/ly/ly/deps.nix
@ -1,32 +1,47 @@
-# generated by zon2nix (https://github.com/Cloudef/zig2nix)
-
+# generated by zon2nix (https://github.com/jcollie/zon2nix)
 {
  lib,
  linkFarm,
+  fetchzip,
  fetchurl,
  fetchgit,
  runCommandLocal,
-  zig,
+  zig_0_15,
+  zstd,
  name ? "zig-packages",
 }:
-
 let
  unpackZigArtifact =
-    { name, artifact }:
-    runCommandLocal name { nativeBuildInputs = [ zig ]; } ''
-      hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})"
-      mv "$TMPDIR/p/$hash" "$out"
-      chmod 755 "$out"
-    '';
+    {
+      name,
+      artifact,
+    }:
+    runCommandLocal name
+      {
+        nativeBuildInputs = [ zig_0_15 ];
+      }
+      ''
+        hash="$(cd "$TMPDIR" && zig fetch --global-cache-dir "$TMPDIR" ${artifact})"
+        mv "$TMPDIR/p/$hash" "$out"
+        chmod 755 "$out"
+      '';

  fetchZig =
    {
      name,
      url,
      hash,
+      unpack,
    }:
    let
-      artifact = fetchurl { inherit url hash; };
+      artifact =
+        if unpack then
+          fetchzip {
+            inherit url hash;
+            nativeBuildInputs = [ zstd ];
+          }
+        else
+          fetchurl { inherit url hash; };
    in
    unpackZigArtifact { inherit name artifact; };

@ -35,17 +50,20 @@ let
      name,
      url,
      hash,
-      rev ? throw "rev is required, remove and regenerate the zon2json-lock file",
    }:
    let
      parts = lib.splitString "#" url;
-      url_base = lib.elemAt parts 0;
-      url_without_query = lib.elemAt (lib.splitString "?" url_base) 0;
+      url_base = builtins.elemAt parts 0;
+      url_without_query = builtins.elemAt (lib.splitString "?" url_base) 0;
+      rev_base = builtins.elemAt parts 1;
+      rev =
+        if builtins.match "^[a-fA-F0-9]{40}$" rev_base != null then rev_base else "refs/heads/${rev_base}";
    in
    fetchgit {
      inherit name rev hash;
      url = url_without_query;
      deepClone = false;
+      fetchSubmodules = false;
    };

  fetchZigArtifact =
@ -53,69 +71,86 @@ let
      name,
      url,
      hash,
-      ...
-    }@args:
+      unpack,
+    }:
    let
      parts = lib.splitString "://" url;
-      proto = lib.elemAt parts 0;
-      path = lib.elemAt parts 1;
+      proto = builtins.elemAt parts 0;
+      path = builtins.elemAt parts 1;
      fetcher = {
-        "git+http" = fetchGitZig (
-          args
-          // {
-            url = "http://${path}";
-          }
-        );
-        "git+https" = fetchGitZig (
-          args
-          // {
-            url = "https://${path}";
-          }
-        );
-        http = fetchZig {
+        "git+http" = fetchGitZig {
          inherit name hash;
          url = "http://${path}";
        };
-        https = fetchZig {
+        "git+https" = fetchGitZig {
          inherit name hash;
          url = "https://${path}";
        };
+        http = fetchZig {
+          inherit name hash unpack;
+          url = "http://${path}";
+        };
+        https = fetchZig {
+          inherit name hash unpack;
+          url = "https://${path}";
+        };
      };
    in
    fetcher.${proto};
 in
 linkFarm name [
  {
-    name = "clap-0.11.0-oBajB-HnAQDPCKYzwF7rO3qDFwRcD39Q0DALlTSz5H7e";
+    name = "aro-0.0.0-JSD1Qi7QNgDnfcrdEJf82v3o6MhZySjYVrtdfEf3E4Se";
+    path = fetchZigArtifact {
+      name = "aro";
+      url = "git+https://github.com/Vexu/arocc#5f5a050569a95ecc40a426f0c3666ae7ef987ede";
+      hash = "sha256-f8Z0SXWx5Uia2TCMB5SUpcO8+xUnaWk32Oknva7xcxw=";
+      unpack = true;
+    };
+  }
+  {
+    name = "clap-0.11.0-oBajB7foAQC3Iyn4IVCkUdYaOVVng5IZkSncySTjNig1";
    path = fetchZigArtifact {
      name = "clap";
-      url = "https://github.com/Hejsil/zig-clap/archive/refs/tags/0.11.0.tar.gz";
-      hash = "sha256-fDWd7EQYZuAlBlrpynBuznK89OiiX74xcZsekv84lkg=";
+      url = "git+https://github.com/Hejsil/zig-clap#fc1e5cc3f6d9d3001112385ee6256d694e959d2f";
+      hash = "sha256-sIDCZW4q9BQwy4AJjJ6r+mSkJ3usbnMmY9zkE4EVAy8=";
+      unpack = true;
    };
  }
  {
-    name = "zigini-0.3.3-36M0FRJJAADZVq5HPm-hYKMpFFTr0OgjbEYcK2ijKZ5n";
-    path = fetchZigArtifact {
-      name = "zigini";
-      url = "https://github.com/AnErrupTion/zigini/archive/9281f47702b57779e831d7618e158abb8eb4d4a2.tar.gz";
-      hash = "sha256-/g0az0MRQOmww0DhZQo/1YH2qkJcscoCpaoW4pWGVIk=";
-    };
-  }
-  {
-    name = "ini-0.1.0-YCQ9Ys0pAABixEvvQvhVXAdqRE3wrZk_wiL9TPNHhB8d";
+    name = "ini-0.1.0-YCQ9YiwsAACghqF8LZyjAF2H_NnL6n29QLuCe0fsmPTo";
    path = fetchZigArtifact {
      name = "ini";
-      url = "https://github.com/AnErrupTion/ini/archive/918f16d0dcf893d0c1cdffe204faa08bb3584e04.tar.gz";
-      hash = "sha256-z2IMS0grfnf33h6tz1ERv2i6gfnS6p8oMWFz+AmGoA8=";
+      url = "git+https://github.com/AshAmetrine/ziglibs-ini?ref=zig-0.16.0#3b733e10adc6c4c48050709b97a22258bc2e6156";
+      hash = "sha256-t+6zFMwpPgMrUygBcQCM0s10zK320D46xAgr2FSw3tU=";
+      unpack = true;
    };
  }
  {
-    name = "N-V-__8AAOEWBQDt5tNdIzIFY6n8DdZsCP-6MyLoNS20wgpA";
+    name = "N-V-__8AAAUXBQD6Fwpi9m0MBqWXFFaqW5l1lVrJC2Ynj7a-";
    path = fetchZigArtifact {
      name = "termbox2";
-      url = "git+https://github.com/AnErrupTion/termbox2?ref=master#496730697c662893eec43192f48ff616c2539da6";
-      hash = "sha256-8XAPH1f1qQuOROBw/duF3Q7HNRgHbEDsKOgeEpG9ScY=";
-      rev = "496730697c662893eec43192f48ff616c2539da6";
+      url = "git+https://github.com/AnErrupTion/termbox2?ref=master#c7f241e8888ce243e1748b05c26a42fcfaaad936";
+      hash = "sha256-7lA75r4sbKDHknZKK9jSbN/RNmTj56HQOvyYdazIEbA=";
+      unpack = true;
+    };
+  }
+  {
+    name = "translate_c-0.0.0-Q_BUWvP1BgCjAk6PWv5286tOlvzD9-X-NkuTzh0KxY0Q";
+    path = fetchZigArtifact {
+      name = "translate_c";
+      url = "git+https://codeberg.org/ziglang/translate-c#7a1a9fdc4ab00835748a6657ecbb835e3d5d45f7";
+      hash = "sha256-zdZ/it+/yNGfszHLqpXpi20Gkwm8fduMMs1/l9oaje8=";
+      unpack = true;
+    };
+  }
+  {
+    name = "zigini-0.5.0-BSkB7e9WAACfyCBABNZiWL3gFMw18GKn3qBcPs8L1Ec1";
+    path = fetchZigArtifact {
+      name = "zigini";
+      url = "git+https://github.com/AshAmetrine/zigini?ref=master#a665d081dda42664a96da2840ea09c5ccf9d0692";
+      hash = "sha256-8zwniFOQFTrFNOrfudhtoCXQBTBKSmc3XF1bNSb3Av8=";
+      unpack = true;
    };
  }
 ]
--- a/pkgs/by-name/ly/ly/package.nix
+++ b/pkgs/by-name/ly/ly/package.nix
@ -9,21 +9,21 @@
  stdenv,
  versionCheckHook,
  x11Support ? true,
-  zig_0_15,
+  zig_0_16,
 }:

 let
-  zig = zig_0_15;
+  zig = zig_0_16;
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "ly";
-  version = "1.3.2";
+  version = "1.4.1";

  src = fetchFromCodeberg {
    owner = "fairyglade";
    repo = "ly";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-P0yLiRIA0bDMiYfL6Kz2/OXh+nmnbHZnsCbcYGIGnbc=";
+    hash = "sha256-FiHSUqAxJurlQuXEkpglWrd2tCqKZuucB4mipFGI4II=";
  };

  nativeBuildInputs = [
@ -34,17 +34,11 @@ stdenv.mkDerivation (finalAttrs: {
  buildInputs = [
    linux-pam
  ]
-  ++ (lib.optionals x11Support [ libxcb ]);
-
-  postConfigure = ''
-    ln -s ${
-      callPackage ./deps.nix {
-        inherit zig;
-      }
-    } $ZIG_GLOBAL_CACHE_DIR/p
-  '';
+  ++ lib.optionals x11Support [ libxcb ];

  zigBuildFlags = [
+    "--system"
+    "${callPackage ./deps.nix { }}"
    "-Denable_x11_support=${lib.boolToString x11Support}"
  ];

--- a/pkgs/by-name/ma/macaulay2/package.nix
+++ b/pkgs/by-name/ma/macaulay2/package.nix
@ -145,6 +145,8 @@ stdenv.mkDerivation (finalAttrs: {

  postPatch = ''
    sed -i 's/AC_SUBST(REL,.*uname -r.*)/AC_SUBST(REL,"")/' configure.ac
+    substituteInPlace Macaulay2/packages/DeterminantalRepresentations.m2 \
+      --replace-fail "eps = 1e-15" "eps = 1e-14"
  '';

  preConfigure = ''
--- a/pkgs/by-name/ma/mailspring/darwin.nix
+++ b/pkgs/by-name/ma/mailspring/darwin.nix
@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {

  src = fetchurl {
    url = "https://github.com/Foundry376/Mailspring/releases/download/${finalAttrs.version}/Mailspring-AppleSilicon.zip";
-    hash = "sha256-xG6v78sFOjuHjdYu/GKhdFNLpeYf48S3Bjp09ZIxs+M=";
+    hash = "sha256-P4VP/EHQKb8WFhZhJZyaaJ1KLpPl0fZwBzozZynn62w=";
  };
  dontUnpack = true;

--- a/pkgs/by-name/ma/mailspring/linux.nix
+++ b/pkgs/by-name/ma/mailspring/linux.nix
@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {

  src = fetchurl {
    url = "https://github.com/Foundry376/Mailspring/releases/download/${finalAttrs.version}/mailspring-${finalAttrs.version}-amd64.deb";
-    hash = "sha256-a27lLrGNjaWMeWboA0AtZ5bC0a/aGuyErNv98J8HBRM=";
+    hash = "sha256-xla2M3k6KXSyn2Ta4PQfWC+0AVkstwbjviaq1ie+awM=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ma/mailspring/package.nix
+++ b/pkgs/by-name/ma/mailspring/package.nix
@ -5,7 +5,7 @@
 }:
 let
  pname = "mailspring";
-  version = "1.19.0";
+  version = "1.21.0";

  meta = {
    description = "Beautiful, fast and maintained fork of Nylas Mail by one of the original authors";
@ -17,7 +17,10 @@ let
      Mailspring's sync engine runs locally, but its source is not open.
    '';
    mainProgram = "mailspring";
-    maintainers = with lib.maintainers; [ toschmidt ];
+    maintainers = with lib.maintainers; [
+      toschmidt
+      wrench-exile-legacy
+    ];
    platforms = [
      "x86_64-linux"
      "aarch64-darwin"
--- a/pkgs/by-name/ni/nixtamal/package.nix
+++ b/pkgs/by-name/ni/nixtamal/package.nix
@ -20,7 +20,7 @@

 ocamlPackages.buildDunePackage (finalAttrs: {
  pname = "nixtamal";
-  version = "1.5.3";
+  version = "1.5.4";
  release_year = 2026;

  minimalOCamlVersion = "5.3";
@ -29,7 +29,7 @@ ocamlPackages.buildDunePackage (finalAttrs: {
    url = "https://darcs.toastal.in.th/nixtamal/stable/";
    mirrors = [ "https://smeder.ee/~toastal/nixtamal.darcs" ];
    rev = finalAttrs.version;
-    hash = "sha256-/0JRG8BAuNaT9KpotDxXlbdSYMTWiOgzIABT+MGPPU0=";
+    hash = "sha256-ST90m0SF3dyGOV3Q43bJ9bGuznP0WIkQsIJXUNFNPOs=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/of/officecli/deps.json
+++ b/pkgs/by-name/of/officecli/deps.json
@ -0,0 +1,27 @@
+[
+  {
+    "pname": "DocumentFormat.OpenXml",
+    "version": "3.4.1",
+    "hash": "sha256-kCsDhby6ZgVZKV43UHVZbiR1d/g6rD50C2IR4lnJPDk="
+  },
+  {
+    "pname": "DocumentFormat.OpenXml.Framework",
+    "version": "3.4.1",
+    "hash": "sha256-Qi4wz7WocNUpGqZIE6RIA0wgfbc981r6fHyz19Pn+5g="
+  },
+  {
+    "pname": "OpenMcdf",
+    "version": "3.1.3",
+    "hash": "sha256-pZvVso9+En4OjtTeb+GH+nWgjW4Kx7y1WddvWpDhSaM="
+  },
+  {
+    "pname": "System.CommandLine",
+    "version": "3.0.0-preview.2.26159.112",
+    "hash": "sha256-Al+rUmQ8/OAY1VszXMEqRpAKiTgspQjDwfaPmSI1ss4="
+  },
+  {
+    "pname": "System.IO.Packaging",
+    "version": "8.0.1",
+    "hash": "sha256-xf0BAfqQvITompBsvfpxiLts/6sRQEzdjNA3f/q/vY4="
+  }
+]
--- a/pkgs/by-name/of/officecli/package.nix
+++ b/pkgs/by-name/of/officecli/package.nix
@ -0,0 +1,54 @@
+{
+  lib,
+  buildDotnetModule,
+  dotnetCorePackages,
+  fetchFromGitHub,
+  versionCheckHook,
+}:
+
+buildDotnetModule (finalAttrs: {
+  pname = "officecli";
+  version = "1.0.92";
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "iOfficeAI";
+    repo = "OfficeCLI";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-g4eCgVqlW3N+pwATIsZbmjWNQ4IScUv9e40eUH9rfQw=";
+  };
+
+  projectFile = "src/officecli/officecli.csproj";
+  nugetDeps = ./deps.json;
+
+  dotnet-sdk = dotnetCorePackages.sdk_10_0;
+  dotnet-runtime = dotnetCorePackages.runtime_10_0;
+
+  selfContainedBuild = true;
+  executables = [ "officecli" ];
+
+  makeWrapperArgs = [
+    "--set"
+    "OFFICECLI_SKIP_UPDATE"
+    "1"
+  ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  meta = {
+    description = "Command-line tool for creating, reading and editing Office documents";
+    homepage = "https://github.com/iOfficeAI/OfficeCLI";
+    changelog = "https://github.com/iOfficeAI/OfficeCLI/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.asl20;
+    mainProgram = "officecli";
+    maintainers = with lib.maintainers; [ qrzbing ];
+    platforms = finalAttrs.dotnet-sdk.meta.platforms;
+    sourceProvenance = with lib.sourceTypes; [
+      fromSource
+      binaryBytecode
+    ];
+  };
+})
--- a/pkgs/by-name/op/opencloud/idp-web.nix
+++ b/pkgs/by-name/op/opencloud/idp-web.nix
@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    pnpm = pnpm_9;
    sourceRoot = "${finalAttrs.src.name}/${finalAttrs.pnpmRoot}";
    fetcherVersion = 3;
-    hash = "sha256-p1hsRGSp/IwfxqwniqJc4c5pz5khYPW1g9WpfysEFnA=";
+    hash = "sha256-6quh9A2PWI5zd+y6yyyDCgGjWQCav4NIhQpDJeU/Ul8=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/op/opencloud/package.nix
+++ b/pkgs/by-name/op/opencloud/package.nix
@ -28,13 +28,13 @@ let
 in
 buildGoModule (finalAttrs: {
  pname = "opencloud";
-  version = "6.1.0";
+  version = "6.2.0";

  src = fetchFromGitHub {
    owner = "opencloud-eu";
    repo = "opencloud";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-vQ7p+2AbLTcHvHn2RSYAMmCa9RxPfRXn2eRVp+QLWFI=";
+    hash = "sha256-gWz6L0/lBJvhQ/6+j3g2ENPRyQYZ2jGz+i+nUZa+5zQ=";
  };

  postPatch = ''
--- a/pkgs/by-name/op/opencloud/web.nix
+++ b/pkgs/by-name/op/opencloud/web.nix
@ -10,20 +10,20 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "opencloud-web";
-  version = "6.2.0";
+  version = "7.0.0";

  src = fetchFromGitHub {
    owner = "opencloud-eu";
    repo = "web";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-vou5J3n94Zn6WJIkLzZSMb4c1pnNn0YM4zC5qpIkfBA=";
+    hash = "sha256-5UYdw/j4mie4g7j+8mxAAv612vhkB6WxC6jzexsvctc=";
  };

  pnpmDeps = fetchPnpmDeps {
    inherit (finalAttrs) pname version src;
    pnpm = pnpm_10;
    fetcherVersion = 3;
-    hash = "sha256-NFlADq48pA/k9X0OeswbkQNieVaiDE7GqXEs6LgsraA=";
+    hash = "sha256-Amo08Q01XLkPK4U0ynMWKYCfaKIghNRyPFZOV1GhMVs=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/op/opentelemetry-cpp/0001-Disable-tests-requiring-network-access.patch
+++ b/pkgs/by-name/op/opentelemetry-cpp/0001-Disable-tests-requiring-network-access.patch
@ -1,8 +1,8 @@
 diff --git a/ext/test/http/curl_http_test.cc b/ext/test/http/curl_http_test.cc
-index e8299202..19dbd7b1 100644
+index 2e2cf3d41..d436f25c2 100644
 --- a/ext/test/http/curl_http_test.cc
 +++ b/ext/test/http/curl_http_test.cc
-@@ -270,7 +270,7 @@ TEST_F(BasicCurlHttpTests, HttpResponse)
+@@ -273,7 +273,7 @@ TEST_F(BasicCurlHttpTests, HttpResponse)
   ASSERT_EQ(count, 4);
 }
 
@ -11,7 +11,7 @@ index e8299202..19dbd7b1 100644
 {
   received_requests_.clear();
   auto session_manager = http_client::HttpClientFactory::Create();
-@@ -287,7 +287,7 @@ TEST_F(BasicCurlHttpTests, SendGetRequest)
+@@ -290,7 +290,7 @@ TEST_F(BasicCurlHttpTests, SendGetRequest)
   ASSERT_TRUE(handler->got_response_.load(std::memory_order_acquire));
 }
 
@ -20,7 +20,7 @@ index e8299202..19dbd7b1 100644
 {
   received_requests_.clear();
   auto session_manager = http_client::HttpClientFactory::Create();
-@@ -313,7 +313,7 @@ TEST_F(BasicCurlHttpTests, SendPostRequest)
+@@ -316,7 +316,7 @@ TEST_F(BasicCurlHttpTests, SendPostRequest)
   session_manager->FinishAllSessions();
 }
 
@ -29,7 +29,34 @@ index e8299202..19dbd7b1 100644
 {
   received_requests_.clear();
   auto session_manager = http_client::HttpClientFactory::Create();
-@@ -442,7 +442,7 @@ TEST_F(BasicCurlHttpTests, ExponentialBackoffRetry)
+@@ -361,7 +361,7 @@ TEST_F(BasicCurlHttpTests, CurlHttpOperations)
+ }
+ 
+ #ifdef ENABLE_OTLP_RETRY_PREVIEW
+-TEST_F(BasicCurlHttpTests, RetryPolicyEnabled)
+TEST_F(BasicCurlHttpTests, DISABLED_RetryPolicyEnabled)
+ {
+   RetryEventHandler handler;
+   http_client::HttpSslOptions no_ssl;
+@@ -379,7 +379,7 @@ TEST_F(BasicCurlHttpTests, RetryPolicyEnabled)
+   ASSERT_TRUE(operation.IsRetryable());
+ }
+ 
+-TEST_F(BasicCurlHttpTests, RetryPolicyDisabled)
+TEST_F(BasicCurlHttpTests, DISABLED_RetryPolicyDisabled)
+ {
+   RetryEventHandler handler;
+   http_client::HttpSslOptions no_ssl;
+@@ -397,7 +397,7 @@ TEST_F(BasicCurlHttpTests, RetryPolicyDisabled)
+   ASSERT_FALSE(operation.IsRetryable());
+ }
+ 
+-TEST_F(BasicCurlHttpTests, ExponentialBackoffRetry)
+TEST_F(BasicCurlHttpTests, DISABLED_ExponentialBackoffRetry)
+ {
+   using ::testing::AllOf;
+   using ::testing::Gt;
+@@ -445,7 +445,7 @@ TEST_F(BasicCurlHttpTests, ExponentialBackoffRetry)
 }
 #endif  // ENABLE_OTLP_RETRY_PREVIEW
 
@ -38,7 +65,7 @@ index e8299202..19dbd7b1 100644
 {
   received_requests_.clear();
   curl::HttpClientSync http_client;
-@@ -467,7 +467,7 @@ TEST_F(BasicCurlHttpTests, SendGetRequestSyncTimeout)
+@@ -470,7 +470,7 @@ TEST_F(BasicCurlHttpTests, SendGetRequestSyncTimeout)
               result.GetSessionState() == http_client::SessionState::SendFailed);
 }
 
@ -47,7 +74,7 @@ index e8299202..19dbd7b1 100644
 {
   received_requests_.clear();
   curl::HttpClientSync http_client;
-@@ -570,7 +570,7 @@ TEST_F(BasicCurlHttpTests, SendGetRequestAsyncTimeout)
+@@ -576,7 +576,7 @@ TEST_F(BasicCurlHttpTests, SendGetRequestAsyncTimeout)
   }
 }
 
@ -56,7 +83,7 @@ index e8299202..19dbd7b1 100644
 {
   curl::HttpClient http_client;
 
-@@ -609,7 +609,7 @@ TEST_F(BasicCurlHttpTests, SendPostRequestAsync)
+@@ -615,7 +615,7 @@ TEST_F(BasicCurlHttpTests, SendPostRequestAsync)
   }
 }
 
@ -65,7 +92,7 @@ index e8299202..19dbd7b1 100644
 {
   curl::HttpClient http_client;
 
-@@ -647,7 +647,7 @@ TEST_F(BasicCurlHttpTests, FinishInAsyncCallback)
+@@ -653,7 +653,7 @@ TEST_F(BasicCurlHttpTests, FinishInAsyncCallback)
   }
 }
 
--- a/pkgs/by-name/op/opentelemetry-cpp/package.nix
+++ b/pkgs/by-name/op/opentelemetry-cpp/package.nix
@ -16,24 +16,26 @@
  enablePrometheus ? false,
  enableElasticSearch ? false,
  enableZipkin ? false,
+  # for passthru.tests
+  opentelemetry-cpp,
 }:
 let
  opentelemetry-proto = fetchFromGitHub {
    owner = "open-telemetry";
    repo = "opentelemetry-proto";
-    rev = "v1.8.0";
-    hash = "sha256-5rNJDMjRFIOY/3j+PkAujbippBmxtAudU9busK0q8p0=";
+    rev = "v1.10.0";
+    hash = "sha256-RJrS0C4GZfUdETff+ZlbJr67Z+JObrLsDvyGqobf4UI=";
  };
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "opentelemetry-cpp";
-  version = "1.26.0";
+  version = "1.27.0";

  src = fetchFromGitHub {
    owner = "open-telemetry";
    repo = "opentelemetry-cpp";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-jYYTPcTFIrgMn1NUjwacZC1J26TZRKdGlq+5yw7NNsU=";
+    hash = "sha256-7G9uHMlV7/rHvD/g+ktxT6RTfDRSfsXQO7QHk26XVKs=";
  };

  patches = [
@ -99,6 +101,18 @@ stdenv.mkDerivation (finalAttrs: {

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

+  passthru.tests = {
+    # Unfortunately there is no such thing as finalAttrs.finalPackage.override,
+    # so we have to resort to this.
+    full = opentelemetry-cpp.override {
+      enableHttp = true;
+      enableGrpc = true;
+      enablePrometheus = true;
+      enableElasticSearch = true;
+      enableZipkin = true;
+    };
+  };
+
  meta = {
    description = "OpenTelemetry C++ Client Library";
    homepage = "https://github.com/open-telemetry/opentelemetry-cpp";
--- a/pkgs/by-name/ov/ovito/package.nix
+++ b/pkgs/by-name/ov/ovito/package.nix
@ -23,13 +23,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "ovito";
-  version = "3.15.2";
+  version = "3.15.4";

  src = fetchFromGitLab {
    owner = "stuko";
    repo = "ovito";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-A7TE84B63JG2X4iBUxQiahLSYTlu7y+x92NTii26pmg=";
+    hash = "sha256-9/aps/phWkWflEdC46QWK/psA5DpdwxBK+2NSMaB4I0=";
    fetchSubmodules = true;
  };

--- a/pkgs/by-name/pi/pixieditor/deps.json
+++ b/pkgs/by-name/pi/pixieditor/deps.json
@ -6,43 +6,64 @@
  },
  {
    "pname": "Avalonia",
-    "version": "11.3.6",
-    "hash": "sha256-dSq6RshqnvbHBPkSvp4rTOgtWmVUPVvaGZadPI2TK9g="
+    "version": "11.2.0",
+    "hash": "sha256-kG3tnsLdodlvIjYd5feBZ0quGd2FsvV8FIy7uD5UZ5Q="
+  },
+  {
+    "pname": "Avalonia",
+    "version": "11.3.12-cibuild0004211-alpha",
+    "hash": "sha256-c3PMzYmkTfIPjRohR/6HgqGfbyFbr7qcpz9CXcyRSPU=",
+    "url": "https://pkgs.dev.azure.com/flabbet/d6ae99b3-29fc-4f5a-b0fd-0ccb7045f05f/_packaging/be90c259-648b-4d35-bfaf-b798986b6c9a/nuget/v3/flat2/avalonia/11.3.12-cibuild0004211-alpha/avalonia.11.3.12-cibuild0004211-alpha.nupkg"
  },
  {
    "pname": "Avalonia.Angle.Windows.Natives",
    "version": "2.1.25547.20250602",
    "hash": "sha256-LE/lENAHptmz6t3T/AoJwnhpda+xs7PqriNGzdcfg8M="
  },
+  {
+    "pname": "Avalonia.AvaloniaEdit",
+    "version": "11.3.0",
+    "hash": "sha256-avrZ9um57Y3wTslyeBAXeCQrcb7a3kODFc0SSvthHF4="
+  },
  {
    "pname": "Avalonia.BuildServices",
-    "version": "0.0.31",
-    "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA="
+    "version": "0.0.29",
+    "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="
+  },
+  {
+    "pname": "Avalonia.BuildServices",
+    "version": "11.3.2",
+    "hash": "sha256-6wx06tjSKWQOlX2czdp6Wh0nuwVapx5qf/s8Qj5we40="
  },
  {
    "pname": "Avalonia.Controls.ColorPicker",
-    "version": "11.3.6",
-    "hash": "sha256-oiaEB3gLyafsRyY8YZ/f//Wne4vAhd73jCF5XOZDIkw="
+    "version": "11.3.12-cibuild0004211-alpha",
+    "hash": "sha256-pLHP7fGv0Km62PxrR5J3OzTqtGfnDXohIkrCJ/E9k00=",
+    "url": "https://pkgs.dev.azure.com/flabbet/d6ae99b3-29fc-4f5a-b0fd-0ccb7045f05f/_packaging/be90c259-648b-4d35-bfaf-b798986b6c9a/nuget/v3/flat2/avalonia.controls.colorpicker/11.3.12-cibuild0004211-alpha/avalonia.controls.colorpicker.11.3.12-cibuild0004211-alpha.nupkg"
  },
  {
    "pname": "Avalonia.Desktop",
-    "version": "11.3.6",
-    "hash": "sha256-n54YrP1SviFQH9VEXfw0O3o6K86rhGBbVw4vXhWUFOE="
+    "version": "11.3.12-cibuild0004211-alpha",
+    "hash": "sha256-5cMmFL3bkZdYgNP85REmTyitb4FIBTeTDZkd3DN6HCU=",
+    "url": "https://pkgs.dev.azure.com/flabbet/d6ae99b3-29fc-4f5a-b0fd-0ccb7045f05f/_packaging/be90c259-648b-4d35-bfaf-b798986b6c9a/nuget/v3/flat2/avalonia.desktop/11.3.12-cibuild0004211-alpha/avalonia.desktop.11.3.12-cibuild0004211-alpha.nupkg"
  },
  {
    "pname": "Avalonia.Diagnostics",
-    "version": "11.3.6",
-    "hash": "sha256-uFKSZLA5qvta/ZSVr+vvKT8l9asBT56iF6Lgxcawsgk="
+    "version": "11.3.12-cibuild0004211-alpha",
+    "hash": "sha256-CRCUnZ6z18zg5pS2L1f76BisST8vB4efGbNqbGR+fOo=",
+    "url": "https://pkgs.dev.azure.com/flabbet/d6ae99b3-29fc-4f5a-b0fd-0ccb7045f05f/_packaging/be90c259-648b-4d35-bfaf-b798986b6c9a/nuget/v3/flat2/avalonia.diagnostics/11.3.12-cibuild0004211-alpha/avalonia.diagnostics.11.3.12-cibuild0004211-alpha.nupkg"
  },
  {
    "pname": "Avalonia.FreeDesktop",
-    "version": "11.3.6",
-    "hash": "sha256-KnnXq7iFyS94PbHfbk3ks/DHEQVKxkHD+Nhe0pTPZnc="
+    "version": "11.3.12-cibuild0004211-alpha",
+    "hash": "sha256-hdfLSpLk3zFlSyasdQXFpymkzWjg5jCx3+SEdI9//48=",
+    "url": "https://pkgs.dev.azure.com/flabbet/d6ae99b3-29fc-4f5a-b0fd-0ccb7045f05f/_packaging/be90c259-648b-4d35-bfaf-b798986b6c9a/nuget/v3/flat2/avalonia.freedesktop/11.3.12-cibuild0004211-alpha/avalonia.freedesktop.11.3.12-cibuild0004211-alpha.nupkg"
  },
  {
    "pname": "Avalonia.Headless",
-    "version": "11.3.6",
-    "hash": "sha256-Y1iSVzKIQmgH2zAZZlrK+u0uqBnhYpcLArqxoKbI0bA="
+    "version": "11.3.12-cibuild0004211-alpha",
+    "hash": "sha256-X8G/6A7zPNIKP5SIdID3Brfjxa88Ivgk+z2tfksvu2Y=",
+    "url": "https://pkgs.dev.azure.com/flabbet/d6ae99b3-29fc-4f5a-b0fd-0ccb7045f05f/_packaging/be90c259-648b-4d35-bfaf-b798986b6c9a/nuget/v3/flat2/avalonia.headless/11.3.12-cibuild0004211-alpha/avalonia.headless.11.3.12-cibuild0004211-alpha.nupkg"
  },
  {
    "pname": "Avalonia.Labs.Lottie",
@ -51,13 +72,20 @@
  },
  {
    "pname": "Avalonia.Native",
-    "version": "11.3.6",
-    "hash": "sha256-uVFziTCL3J2DvrjNl7O3aIKCChsm4tO7INDh+3hrlJw="
+    "version": "11.3.12-cibuild0004211-alpha",
+    "hash": "sha256-yYgQdJ2xnShZ2oRFf14jn/nMFqs+Ppi+z/ArHixUsBc=",
+    "url": "https://pkgs.dev.azure.com/flabbet/d6ae99b3-29fc-4f5a-b0fd-0ccb7045f05f/_packaging/be90c259-648b-4d35-bfaf-b798986b6c9a/nuget/v3/flat2/avalonia.native/11.3.12-cibuild0004211-alpha/avalonia.native.11.3.12-cibuild0004211-alpha.nupkg"
  },
  {
    "pname": "Avalonia.Remote.Protocol",
-    "version": "11.3.6",
-    "hash": "sha256-Nxg+jt3Eit9amUZPPicmXy+5/2nqEu6rTLRk7ccH+qE="
+    "version": "11.2.0",
+    "hash": "sha256-QwYY3bpShJ1ayHUx+mjnwaEhCPDzTk+YeasCifAtGzM="
+  },
+  {
+    "pname": "Avalonia.Remote.Protocol",
+    "version": "11.3.12-cibuild0004211-alpha",
+    "hash": "sha256-Nh+B5NcxvMnwFjrzK6lVP/s5Nb39JgYJ/zqs89MTFCU=",
+    "url": "https://pkgs.dev.azure.com/flabbet/d6ae99b3-29fc-4f5a-b0fd-0ccb7045f05f/_packaging/be90c259-648b-4d35-bfaf-b798986b6c9a/nuget/v3/flat2/avalonia.remote.protocol/11.3.12-cibuild0004211-alpha/avalonia.remote.protocol.11.3.12-cibuild0004211-alpha.nupkg"
  },
  {
    "pname": "Avalonia.Skia",
@ -66,153 +94,43 @@
  },
  {
    "pname": "Avalonia.Skia",
-    "version": "11.3.6",
-    "hash": "sha256-PqoGzraRMb4SAl0FAeROcTmPXUm5SHn6KCCdexIBgLM="
+    "version": "11.3.12-cibuild0004211-alpha",
+    "hash": "sha256-mlGMw0hN+KuIQjd2O2QJYXHuMvVAxBTQEzWTTKl53Y4=",
+    "url": "https://pkgs.dev.azure.com/flabbet/d6ae99b3-29fc-4f5a-b0fd-0ccb7045f05f/_packaging/be90c259-648b-4d35-bfaf-b798986b6c9a/nuget/v3/flat2/avalonia.skia/11.3.12-cibuild0004211-alpha/avalonia.skia.11.3.12-cibuild0004211-alpha.nupkg"
  },
  {
    "pname": "Avalonia.Themes.Fluent",
-    "version": "11.3.6",
-    "hash": "sha256-bHMqliKPxh2WZiUmuv+mQej3cpKNs0KbyNOEVx69fCg="
+    "version": "11.3.12-cibuild0004211-alpha",
+    "hash": "sha256-0pPLw9gBwq/8XpSmCspNeO+W4B8HTbHURaGvKXKdPUA=",
+    "url": "https://pkgs.dev.azure.com/flabbet/d6ae99b3-29fc-4f5a-b0fd-0ccb7045f05f/_packaging/be90c259-648b-4d35-bfaf-b798986b6c9a/nuget/v3/flat2/avalonia.themes.fluent/11.3.12-cibuild0004211-alpha/avalonia.themes.fluent.11.3.12-cibuild0004211-alpha.nupkg"
  },
  {
    "pname": "Avalonia.Themes.Simple",
-    "version": "11.3.6",
-    "hash": "sha256-omvYccZgdrkD5KnPKQlafz7lMFL46KMQrTJVxF9AV0E="
+    "version": "11.3.12-cibuild0004211-alpha",
+    "hash": "sha256-jOSH2xJHThsfdO83DU5Olc4fE02WY2/i67fpw0Jmacg=",
+    "url": "https://pkgs.dev.azure.com/flabbet/d6ae99b3-29fc-4f5a-b0fd-0ccb7045f05f/_packaging/be90c259-648b-4d35-bfaf-b798986b6c9a/nuget/v3/flat2/avalonia.themes.simple/11.3.12-cibuild0004211-alpha/avalonia.themes.simple.11.3.12-cibuild0004211-alpha.nupkg"
  },
  {
    "pname": "Avalonia.Win32",
-    "version": "11.3.6",
-    "hash": "sha256-zlYoHQMyvirc73hEnpjZbhz5BUss/jAlq6Jwb+8Fucc="
+    "version": "11.3.12-cibuild0004211-alpha",
+    "hash": "sha256-hBXsMCcye/acF55MSVx2yjxRQ5cPqVq+q3NZ2Q7/1zw=",
+    "url": "https://pkgs.dev.azure.com/flabbet/d6ae99b3-29fc-4f5a-b0fd-0ccb7045f05f/_packaging/be90c259-648b-4d35-bfaf-b798986b6c9a/nuget/v3/flat2/avalonia.win32/11.3.12-cibuild0004211-alpha/avalonia.win32.11.3.12-cibuild0004211-alpha.nupkg"
  },
  {
    "pname": "Avalonia.X11",
-    "version": "11.3.6",
-    "hash": "sha256-nXHgvgp2cOjwchgkN1E0N47JWyYEkYTZ69FyEtCATf8="
+    "version": "11.3.12-cibuild0004211-alpha",
+    "hash": "sha256-nyo/RP4u7w7dK7L2Sd5cy8/ptF3dNpP9ZQhZ3F71Olo=",
+    "url": "https://pkgs.dev.azure.com/flabbet/d6ae99b3-29fc-4f5a-b0fd-0ccb7045f05f/_packaging/be90c259-648b-4d35-bfaf-b798986b6c9a/nuget/v3/flat2/avalonia.x11/11.3.12-cibuild0004211-alpha/avalonia.x11.11.3.12-cibuild0004211-alpha.nupkg"
  },
  {
-    "pname": "Avalonia.Xaml.Behaviors",
-    "version": "11.0.5",
-    "hash": "sha256-wS0clXNKAG4uy539dUjbrRdzHrdHsloivpY5SEBCNtY="
+    "pname": "AvaloniaEdit.TextMate",
+    "version": "11.3.0",
+    "hash": "sha256-VyXRytKE0aaWirvfr5Hm5uJm8Ckbu/+4wnTjmomgM5s="
  },
  {
-    "pname": "Avalonia.Xaml.Behaviors",
-    "version": "11.2.0",
-    "hash": "sha256-I9aELyXkzLGX6T4HUFbCQxn+eWqLLPK0xqEiF+6hi5k="
-  },
-  {
-    "pname": "Avalonia.Xaml.Behaviors",
-    "version": "11.2.0.14",
-    "hash": "sha256-Ep/IOiZyLDoIKrymqXtFPw2hrXQBpu8Dn+4YZ3/3Z4I="
-  },
-  {
-    "pname": "Avalonia.Xaml.Interactions",
-    "version": "11.0.5",
-    "hash": "sha256-s/o0416K/nZkVWcNPuKbqmwLKhWsMeEds/dT85QOp4c="
-  },
-  {
-    "pname": "Avalonia.Xaml.Interactions",
-    "version": "11.2.0",
-    "hash": "sha256-Wnt4xra+TPRiAJ5TIyefwkRxxA999THBstm8QuLXZlU="
-  },
-  {
-    "pname": "Avalonia.Xaml.Interactions",
-    "version": "11.2.0.14",
-    "hash": "sha256-7bk1zc2hZdTg+Y7LaDSb1CmL6yv0GeZAWKh3gf9bVm8="
-  },
-  {
-    "pname": "Avalonia.Xaml.Interactions.Custom",
-    "version": "11.0.5",
-    "hash": "sha256-0HVVQTHD+D4q4IYjMJ6H90mMefBLr5pSKDy7JMq10cE="
-  },
-  {
-    "pname": "Avalonia.Xaml.Interactions.Custom",
-    "version": "11.2.0",
-    "hash": "sha256-vLOTOHwy7RRrgrYFUetAIWSC+Pm6yxzb3Ko2BPtXGUo="
-  },
-  {
-    "pname": "Avalonia.Xaml.Interactions.Custom",
-    "version": "11.2.0.14",
-    "hash": "sha256-RSIczkm9V/fKoOavXJQd931b9r/GBvuz0hR4HD6Wgd4="
-  },
-  {
-    "pname": "Avalonia.Xaml.Interactions.DragAndDrop",
-    "version": "11.0.5",
-    "hash": "sha256-iwchyONRjTbSSNxaGROeM62RL964KCs0fWz6VIO4O/k="
-  },
-  {
-    "pname": "Avalonia.Xaml.Interactions.DragAndDrop",
-    "version": "11.2.0",
-    "hash": "sha256-rAHnjsMnaZCf+dMWe3fZAsnwY2LKFJuTVzsyNzWnh2Q="
-  },
-  {
-    "pname": "Avalonia.Xaml.Interactions.DragAndDrop",
-    "version": "11.2.0.14",
-    "hash": "sha256-kRx4GMzoHZULJoUUptt9Xa7+UFYoiirI+wE6JuBBklc="
-  },
-  {
-    "pname": "Avalonia.Xaml.Interactions.Draggable",
-    "version": "11.0.5",
-    "hash": "sha256-C8acIjqy8Akf1ZFVLBq+wKuGaP8YOlKEa+e2RaowKak="
-  },
-  {
-    "pname": "Avalonia.Xaml.Interactions.Draggable",
-    "version": "11.2.0",
-    "hash": "sha256-WI3JZm+IuKpdlhw1XpgPXJs+e9P97l0odSHPM8SSrqw="
-  },
-  {
-    "pname": "Avalonia.Xaml.Interactions.Draggable",
-    "version": "11.2.0.14",
-    "hash": "sha256-ywaaUhDqj+yHJjnRPCu3HXYr/sSPrrlwiqN30vYqRLk="
-  },
-  {
-    "pname": "Avalonia.Xaml.Interactions.Events",
-    "version": "11.0.5",
-    "hash": "sha256-NbG4wOT5d4z6OkGMLdB7pZrRcu0BOK5PBGZ098iE3IU="
-  },
-  {
-    "pname": "Avalonia.Xaml.Interactions.Events",
-    "version": "11.2.0",
-    "hash": "sha256-z1DGsetBjrzTP1pLWSqP748bl6tDWWOUlvuPc7WHb1k="
-  },
-  {
-    "pname": "Avalonia.Xaml.Interactions.Events",
-    "version": "11.2.0.14",
-    "hash": "sha256-CE7nh1ld747CGoPYiu4KlQxwP9yiG9/OMHwq8GpL0so="
-  },
-  {
-    "pname": "Avalonia.Xaml.Interactions.Reactive",
-    "version": "11.0.5",
-    "hash": "sha256-zrbr7MW+3LOyhIMi5VB8YRfr19vyWtcaxwqXjbkTDAA="
-  },
-  {
-    "pname": "Avalonia.Xaml.Interactions.Responsive",
-    "version": "11.0.5",
-    "hash": "sha256-TfcYEdLMxYffBcBzcyoKWESrQltozigJKx+CLNCMz08="
-  },
-  {
-    "pname": "Avalonia.Xaml.Interactions.Responsive",
-    "version": "11.2.0",
-    "hash": "sha256-V1YHBrPEKBgHYmEdhWmzz7NOSwExYMaz3J0N0s53Gl0="
-  },
-  {
-    "pname": "Avalonia.Xaml.Interactions.Responsive",
-    "version": "11.2.0.14",
-    "hash": "sha256-vyc/HXfDAEi1AbAwkphrlVpckrM5ykptXYp/l5ul8VQ="
-  },
-  {
-    "pname": "Avalonia.Xaml.Interactivity",
-    "version": "11.0.5",
-    "hash": "sha256-nNoI2rxJBFuYs1lg3O3rXeigJWoGjzGWdU8jsWGz7+4="
-  },
-  {
-    "pname": "Avalonia.Xaml.Interactivity",
-    "version": "11.2.0",
-    "hash": "sha256-N3maAwWG//4uHAEvux0/BwanQLviMm7uo6jxIj4kB8s="
-  },
-  {
-    "pname": "Avalonia.Xaml.Interactivity",
-    "version": "11.2.0.14",
-    "hash": "sha256-SZIVuXdT1PN3zBCpVv3F6Y5vaOp8CTsq0/HVHXrbc6Y="
+    "pname": "AvaloniaUI.DiagnosticsSupport",
+    "version": "2.1.1",
+    "hash": "sha256-+d6zxAtY30joje0RL+Cyu0+tYxWNVk9KmPx+3+dAimw="
  },
  {
    "pname": "BmpSharp",
@ -249,11 +167,6 @@
    "version": "6.9.0",
    "hash": "sha256-MwPAPFD/gs9WZ8gB5BQMEwYswd3EEIpLlvMN5vmz1Wc="
  },
-  {
-    "pname": "DeviceId.Mac",
-    "version": "6.9.0",
-    "hash": "sha256-bQ59eaeDGRgk4ow7bk7U9yEnJgiV2Ok9U3fbBIOdRVw="
-  },
  {
    "pname": "DiscordRichPresence",
    "version": "1.3.0.28",
@ -354,6 +267,16 @@
    "version": "3.0.0",
    "hash": "sha256-tqIbgABsgi8JgT5h+WkCehANUmCzK5/p0UZH5xjOy2Y="
  },
+  {
+    "pname": "LiveMarkdown.Avalonia",
+    "version": "1.9.1",
+    "hash": "sha256-kHyuQrW6G6CXKuihVbN8RcpY0iafhwSTVlXeSvFsd2I="
+  },
+  {
+    "pname": "Markdig",
+    "version": "0.43.0",
+    "hash": "sha256-lUdjtLzSxAI0BEMdIgEc3fZ/VR8NO0gKSs1k6mgy6zU="
+  },
  {
    "pname": "MessagePack",
    "version": "2.5.192",
@ -474,6 +397,11 @@
    "version": "9.0.0",
    "hash": "sha256-dAH52PPlTLn7X+1aI/7npdrDzMEFPMXRv4isV1a+14k="
  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "8.0.0",
+    "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="
+  },
  {
    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
    "version": "9.0.0",
@ -484,6 +412,16 @@
    "version": "8.0.0",
    "hash": "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo="
  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "8.0.0",
+    "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="
+  },
+  {
+    "pname": "Microsoft.IO.RecyclableMemoryStream",
+    "version": "3.0.1",
+    "hash": "sha256-unFg/5EcU/XKJbob4GtQC43Ydgi5VjeBGs7hfhj4EYo="
+  },
  {
    "pname": "Microsoft.NET.StringTools",
    "version": "17.6.3",
@ -521,14 +459,24 @@
  },
  {
    "pname": "Newtonsoft.Json",
-    "version": "13.0.3",
-    "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
+    "version": "13.0.1",
+    "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="
  },
  {
    "pname": "OneOf",
    "version": "3.0.271",
    "hash": "sha256-tFWy8Jg/XVJfVOddjXeCAizq/AUljJrq6J8PF6ArYSU="
  },
+  {
+    "pname": "Onigwrap",
+    "version": "1.0.6",
+    "hash": "sha256-p+dhMfIH4C6xLKRUREnUpC0DZwFazjvI+30KRT8TWnU="
+  },
+  {
+    "pname": "Onigwrap",
+    "version": "1.0.8",
+    "hash": "sha256-lH9nH74cPMQnWKO8mwgg+nX4iMUXuh7McfeRL9asQIY="
+  },
  {
    "pname": "protobuf-net",
    "version": "3.2.52",
@ -606,8 +554,8 @@
  },
  {
    "pname": "SkiaSharp",
-    "version": "3.119.0",
-    "hash": "sha256-G6T0E4Wl9NW9m/9HW1Rppuxs5icp04uvqkY+Ju/vvzM="
+    "version": "3.119.2",
+    "hash": "sha256-A9F397K5FfLeOsNZacKmUh4IU/WMK60B4Z6TEtS/oqo="
  },
  {
    "pname": "SkiaSharp.HarfBuzz",
@ -621,8 +569,8 @@
  },
  {
    "pname": "SkiaSharp.NativeAssets.Linux",
-    "version": "3.119.0",
-    "hash": "sha256-ysHXGJeui4uji6bSBIzpqMRfKJXqj/08Zd0MIBeQH3s="
+    "version": "3.119.2",
+    "hash": "sha256-NVC1VsrlG6lyqc2mFgYzl+NjewYZ4+xEo72EUWDncGo="
  },
  {
    "pname": "SkiaSharp.NativeAssets.macOS",
@ -646,8 +594,8 @@
  },
  {
    "pname": "SkiaSharp.NativeAssets.macOS",
-    "version": "3.119.0",
-    "hash": "sha256-BPkQ5hSDK4Nal36+31AAApEbDH+FdwZik5W22vYmVDI="
+    "version": "3.119.2",
+    "hash": "sha256-KEeGqSiyAiMbzLgH/0JkwUz/pWcL49gYB1T1YLkMPaI="
  },
  {
    "pname": "SkiaSharp.NativeAssets.WebAssembly",
@ -656,8 +604,8 @@
  },
  {
    "pname": "SkiaSharp.NativeAssets.WebAssembly",
-    "version": "3.119.0",
-    "hash": "sha256-bEWnEJJZ9E0MD688vOvEusJJRJbgpMCiG9u5Tj/BIkQ="
+    "version": "3.119.2",
+    "hash": "sha256-OOjZzoat+8ZEUPJRR0acouxt+5FaiIdaqt3C9rawpVY="
  },
  {
    "pname": "SkiaSharp.NativeAssets.Win32",
@ -681,8 +629,8 @@
  },
  {
    "pname": "SkiaSharp.NativeAssets.Win32",
-    "version": "3.119.0",
-    "hash": "sha256-YltsBRADV7b3qL3/YrgG2GTwJr8PL1STeaimQagSADo="
+    "version": "3.119.2",
+    "hash": "sha256-CI6dg+MlxX8t+vbnkxtd5QE3xalMKkA8LUSudxg7TNU="
  },
  {
    "pname": "SkiaSharp.Skottie",
@ -799,6 +747,11 @@
    "version": "4.5.0",
    "hash": "sha256-qppO0L8BpI7cgaStqBhn6YJYFjFdSwpXlRih0XFsaT4="
  },
+  {
+    "pname": "System.Diagnostics.DiagnosticSource",
+    "version": "8.0.1",
+    "hash": "sha256-zmwHjcJgKcbkkwepH038QhcnsWMJcHys+PEbFGC0Jgo="
+  },
  {
    "pname": "System.Diagnostics.EventLog",
    "version": "8.0.0",
@ -839,21 +792,11 @@
    "version": "4.5.0",
    "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="
  },
-  {
-    "pname": "System.Reactive",
-    "version": "5.0.0",
-    "hash": "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE="
-  },
  {
    "pname": "System.Reactive",
    "version": "6.0.0",
    "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y="
  },
-  {
-    "pname": "System.Reactive",
-    "version": "6.0.1",
-    "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q="
-  },
  {
    "pname": "System.Reflection.Emit",
    "version": "4.7.0",
@ -944,6 +887,11 @@
    "version": "8.0.0",
    "hash": "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="
  },
+  {
+    "pname": "System.Text.Json",
+    "version": "8.0.5",
+    "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68="
+  },
  {
    "pname": "System.Text.Json",
    "version": "9.0.3",
@ -959,6 +907,21 @@
    "version": "4.5.4",
    "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="
  },
+  {
+    "pname": "TextMateSharp",
+    "version": "1.0.65",
+    "hash": "sha256-kZx3CBDzu7qUSnihs9Q4Ck78ih1aJ+0g8cN8Hke+E5w="
+  },
+  {
+    "pname": "TextMateSharp",
+    "version": "1.0.70",
+    "hash": "sha256-fzmSGU8fT/J6W+Yx/qgUqPEiC1Og9ctUyQGDleOggrM="
+  },
+  {
+    "pname": "TextMateSharp.Grammars",
+    "version": "1.0.70",
+    "hash": "sha256-AAH3SXLyIUIfJgdPhwIRPZhdcxdNhis2ODLd9mh1PuE="
+  },
  {
    "pname": "Tmds.DBus.Protocol",
    "version": "0.21.2",
@ -968,5 +931,10 @@
    "pname": "Wasmtime",
    "version": "22.0.0",
    "hash": "sha256-Q6NWraxWlVz5p/2rY6d9XZBv/VM6tRG2eCNRpMLAp6A="
+  },
+  {
+    "pname": "Xaml.Behaviors",
+    "version": "11.3.6.5",
+    "hash": "sha256-5eIgM3n/zj023VGlxl6ALO3/Qho64/JmiQINyMcK/3o="
  }
 ]
--- a/pkgs/by-name/pi/pixieditor/package.nix
+++ b/pkgs/by-name/pi/pixieditor/package.nix
@ -42,16 +42,17 @@ let
      AnalyticsUrl = "https://api.pixieditor.net/analytics/";
    }
  );
+
 in
 buildDotnetModule (finalAttrs: {
  pname = "pixieditor";
-  version = "2.0.1.19";
+  version = "2.1.1.4";

  src = fetchFromGitHub {
    owner = "PixiEditor";
    repo = "PixiEditor";
    tag = finalAttrs.version;
-    hash = "sha256-gtbgcgTyPmx8wI0XaZ4pC0s7vR7qZBAQonUObQXAQpk=";
+    hash = "sha256-veTW5JkjGIgviYpnwSJca8uTATf/bq7hTgj7OrNL8m4=";
    fetchSubmodules = true;
  };

@ -67,6 +68,8 @@ buildDotnetModule (finalAttrs: {
    substituteInPlace ./src/PixiEditor.AnimationRenderer.FFmpeg/FFMpegRenderer.cs \
      --replace-fail 'new FFOptions() { BinaryFolder = binaryPath }' 'new FFOptions() { BinaryFolder = "${ffmpeg-headless}/bin" }' \
      --replace-fail 'MakeExecutableIfNeeded(binaryPath);' ' ';
+
+    cp src/nuget.config .
  '';

  nativeBuildInputs = [
@ -76,14 +79,6 @@ buildDotnetModule (finalAttrs: {
    desktopToDarwinBundle
  ];

-  buildInputs = [
-    (fetchNupkg {
-      pname = "protobuf-net.protogen";
-      version = "3.2.52";
-      hash = "sha256-sKVCXtd5qD86D2FOgjMXh37P6IrcmqmaoJregAhLFGY=";
-    })
-  ];
-
  nugetDeps = ./deps.json;
  linkNugetPackages = true;

@ -154,11 +149,6 @@ buildDotnetModule (finalAttrs: {
    })
  ];

-  postConfigure = ''
-    dotnet build -t:InstallProtogen \
-      src/PixiEditor.Extensions.CommonApi/PixiEditor.Extensions.CommonApi.csproj
-  '';
-
  postInstall = ''
    install -Dm644 ${appSettings} $out/lib/pixieditor/appsettings.json;

--- a/pkgs/by-name/pu/pulseeffects-legacy/package.nix
+++ b/pkgs/by-name/pu/pulseeffects-legacy/package.nix
@ -26,7 +26,7 @@
  libsndfile,
  libebur128,
  rnnoise,
-  boost,
+  boost187,
  dbus,
  fftwFloat,
  calf,
@ -88,7 +88,7 @@ stdenv.mkDerivation {
    libsamplerate
    libsndfile
    rnnoise
-    boost
+    boost187
    dbus
    fftwFloat
    zita-convolver
--- a/pkgs/by-name/qo/qovery-cli/package.nix
+++ b/pkgs/by-name/qo/qovery-cli/package.nix
@ -10,16 +10,16 @@

 buildGoModule (finalAttrs: {
  pname = "qovery-cli";
-  version = "1.158.1";
+  version = "1.160.2";

  src = fetchFromGitHub {
    owner = "Qovery";
    repo = "qovery-cli";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-49xy6lH/diMpE8ZY7vuHevLuVL/hTukBSQjkHpPGbd4=";
+    hash = "sha256-/tfHvuMqvTD/eiGGdOUHhMS/KRJWhFvi4kEpHnQMD9I=";
  };

-  vendorHash = "sha256-kENqEnk5RxN8kJ/dnXtG6ypnb8CPcOsHKid1z6uuKAc=";
+  vendorHash = "sha256-nzfYBfXwV7jxh+oklicj2qptY6S8vrtXGVGbLAr75Gk=";

  env.CGO_ENABLED = 0;

--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@ -16,7 +16,7 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "ruff";
-  version = "0.15.12";
+  version = "0.15.13";

  __structuredAttrs = true;

@ -24,12 +24,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
    owner = "astral-sh";
    repo = "ruff";
    tag = finalAttrs.version;
-    hash = "sha256-BbWOmr1/QsexDZzXPvkAstRBBcFmO0ZRrpkpXJpEXWk=";
+    hash = "sha256-Sr5eD5aZP+1/wbRHQjampWbWea+rXshcwOfCr4JCvxA=";
  };

  cargoBuildFlags = [ "--package=ruff" ];

-  cargoHash = "sha256-vv1D3bu0zLuLLxNiRESScs7fQKvx1CNfMKrseRzzxtw=";
+  cargoHash = "sha256-3y7kqhAUXZ+Ui6quGEDSRXrh3ii9NJLoFWnGX/Mp0l4=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/by-name/ru/ruqola/package.nix
+++ b/pkgs/by-name/ru/ruqola/package.nix
@ -10,14 +10,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "ruqola";
-  version = "2.7.1";
+  version = "2.7.2";

  src = fetchFromGitLab {
    domain = "invent.kde.org";
    owner = "network";
    repo = "ruqola";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-qw69To9NuT4pnp3OfQHcny1FSEmLXTZpeo21h5dWdSo=";
+    hash = "sha256-6ModByNU47fWsUUp7TTqgStFViTZy5ZXPYcrj0Rwrpc=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/si/singular/package.nix
+++ b/pkgs/by-name/si/singular/package.nix
@ -26,7 +26,8 @@
  latex2html,
  texinfo,
  texliveSmall,
-  enableDocs ? true,
+  # Error: while running example drawTropicalCurve from d2t_singular/tropical_lib.doc:610
+  enableDocs ? !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64),
 }:

 stdenv.mkDerivation rec {
@ -54,6 +55,11 @@ stdenv.mkDerivation rec {
    "--with-ntl=${ntl}"
    "--with-flint=${flint}"
  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    # omalloc does not support pagesizes >= 16K
+    # https://github.com/Singular/Singular/blob/spielwiese/omalloc/configure.ac
+    "--disable-omalloc"
+  ]
  ++ lib.optionals enableDocs [
    "--enable-doc-build"
  ];
--- a/pkgs/by-name/so/sonoscli/package.nix
+++ b/pkgs/by-name/so/sonoscli/package.nix
@ -0,0 +1,50 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
+  stdenv,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "sonoscli";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "steipete";
+    repo = "sonoscli";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-9ouRJ0Rr+W5Kx9BltgW29Jo1Jq7Hb/un4XBkq+0in9o=";
+  };
+
+  vendorHash = "sha256-hocnLCzWN8srQcO3BMNkd2lt0m54Qe7sqAhUxVZlz1k=";
+
+  subPackages = [ "cmd/sonos" ];
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd sonos \
+      --bash <($out/bin/sonos completion bash) \
+      --fish <($out/bin/sonos completion fish) \
+      --zsh  <($out/bin/sonos completion zsh)
+  '';
+
+  __structuredAttrs = true;
+
+  meta = {
+    description = "Control Sonos speakers from your terminal over LAN (UPnP/SOAP)";
+    longDescription = ''
+      sonoscli is a modern Go CLI to control Sonos speakers over your local
+      network using UPnP/SOAP. Features include reliable SSDP discovery,
+      coordinator-aware playback controls, grouping, queue management,
+      favorites, scenes, Spotify integration via SMAPI, and live event watching.
+    '';
+    homepage = "https://github.com/steipete/sonoscli";
+    changelog = "https://github.com/steipete/sonoscli/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    mainProgram = "sonos";
+    maintainers = with lib.maintainers; [ j10ccc ];
+    platforms = lib.platforms.unix;
+  };
+})
--- a/pkgs/by-name/t3/t3code/package.nix
+++ b/pkgs/by-name/t3/t3code/package.nix
@ -70,13 +70,13 @@ stdenv.mkDerivation (
        runHook postInstall
      '';

-      outputHash = "sha256-63Vx05VLHiZpY1K8ZS1GyoupU4i3sEPEAnWMWyMelbg=";
+      outputHash = "sha256-0wA39cSxybKPbZ1xXf+mcI4QSXJhLcNQ6x+o2xvLuq8=";
      outputHashMode = "recursive";
    };
  in
  {
    pname = "t3code";
-    version = "0.0.23";
+    version = "0.0.24";
    strictDeps = true;
    __structuredAttrs = true;

@ -84,7 +84,7 @@ stdenv.mkDerivation (
      owner = "pingdotgg";
      repo = "t3code";
      tag = "v${finalAttrs.version}";
-      hash = "sha256-gsDHogGnzKVwypGwK1PzYBXpBYBFQHIbXMpWVUGzKU8=";
+      hash = "sha256-7mqRuWft9h9MAEVzuwC6K1aj2UUAcjheWrwncXhpbro=";
    };

    postPatch = ''
@ -118,6 +118,10 @@ stdenv.mkDerivation (
      chmod --recursive u+rwX node_modules
      patchShebangs node_modules

+      # Upstream bumps package.json versions after tagging releases, then applies
+      # the same bump in the release workflow before building artifacts.
+      bun scripts/update-release-package-versions.ts ${finalAttrs.version}
+
      # Compile node-pty's native addon (hoisted into node_modules).
      export npm_config_nodedir=${nodejs}
      cd node_modules/node-pty
--- a/pkgs/by-name/ty/ty/package.nix
+++ b/pkgs/by-name/ty/ty/package.nix
@ -17,14 +17,15 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "ty";
-  version = "0.0.35";
+  version = "0.0.36";
+  __structuredAttrs = true;

  src = fetchFromGitHub {
    owner = "astral-sh";
    repo = "ty";
    tag = finalAttrs.version;
    fetchSubmodules = true;
-    hash = "sha256-ce3v/ZUlMNMGlikWSriGybScUrRharFswq5Z47dTtKY=";
+    hash = "sha256-lUM2ewf8svvxyq8YNIw0fIseiA7kN7HViwBKDw6LDas=";
  };

  # For Darwin platforms, remove the integration test for file notifications,
@ -38,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: {

  cargoBuildFlags = [ "--package=ty" ];

-  cargoHash = "sha256-9/4+cK7BdJbXQKK7xC9MMfqARlivbuyYZ8j02srakxU=";
+  cargoHash = "sha256-3y7kqhAUXZ+Ui6quGEDSRXrh3ii9NJLoFWnGX/Mp0l4=";

  nativeBuildInputs = [ installShellFiles ];
  buildInputs = [ rust-jemalloc-sys ];
@ -67,6 +68,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    "--skip=python_environment::ty_environment_and_discovered_venv"
    "--skip=python_environment::ty_environment_is_only_environment"
    "--skip=python_environment::ty_environment_is_system_not_virtual"
+    "--skip=python_environment::ty_system_environment_and_local_venv"

    # flaky: unmatched assertion: revealed: Literal[1]
    "--skip=mdtest::generics/pep695/functions.md"
--- a/pkgs/by-name/wa/wasm-pack/package.nix
+++ b/pkgs/by-name/wa/wasm-pack/package.nix
@ -9,16 +9,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "wasm-pack";
-  version = "0.14.0";
+  version = "0.15.0";

  src = fetchFromGitHub {
    owner = "wasm-bindgen";
    repo = "wasm-pack";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-ik6AJUKuT3GCDTZbHWcplcB7cS0CIcZwFNa6SvGzsIQ=";
+    hash = "sha256-+M59AC/dz8WwK9+854QZjSPuikTW+x6Nx2FKnr7qiXs=";
  };

-  cargoHash = "sha256-n9xuwlj8+3fDTHMS2XobqWFc6mNHQcmmvebRDc82oSo=";
+  cargoHash = "sha256-u8LFx2D9LDa9W/ghRWZ9N/vOBr0bAkTdnZt9YaKrD30=";

  nativeBuildInputs = [
    cmake
--- a/pkgs/by-name/za/zam-plugins/package.nix
+++ b/pkgs/by-name/za/zam-plugins/package.nix
@ -18,13 +18,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "zam-plugins";
-  version = "4.4";
+  version = "4.5";

  src = fetchFromGitHub {
    owner = "zamaudio";
    repo = "zam-plugins";
    tag = finalAttrs.version;
-    hash = "sha256-pjnhDavKnyQjPF4nUO+j1J+Qtw8yIYMY9A5zBMb4zFU=";
+    hash = "sha256-org2/YQooJoP/vQKaT0r7Kkpw+bGCfk2vKjl8HIYsag=";
    fetchSubmodules = true;
  };

--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@ -97,7 +97,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "zed-editor";
-  version = "1.2.3";
+  version = "1.2.5";

  outputs = [
    "out"
@ -110,7 +110,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    owner = "zed-industries";
    repo = "zed";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-ACoHKgc7kazCSpWkCgbGxqt6mWgpFflkeCUbglELMXs=";
+    hash = "sha256-IyUY3Hx0Ie0JQewRgQQVWa7IF+GBGGVD+7xV4LfWnxk=";
  };

  postPatch = ''
@ -139,7 +139,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    rm -r $out/git/*/candle-book/
  '';

-  cargoHash = "sha256-VTNElK6+g2hPJUvI12qbWnCe3TJDWMfsgkCuTnygVTY=";
+  cargoHash = "sha256-cm9j2ECF9Lf9w7gIIY85ZgjPELOPjXfVz0IxqOe1cR4=";

  __structuredAttrs = true;

--- a/pkgs/by-name/zi/zizmor/package.nix
+++ b/pkgs/by-name/zi/zizmor/package.nix
@ -11,16 +11,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "zizmor";
-  version = "1.24.1";
+  version = "1.25.0";

  src = fetchFromGitHub {
    owner = "zizmorcore";
    repo = "zizmor";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-JPh6xw8kWWR3GfneOK0MytOgYnZI0dFxXp15g1Pkve8=";
+    hash = "sha256-zstTa03aakVWCWGkMQZesz1b6p7S+XWgnJTf/DrWHVI=";
  };

-  cargoHash = "sha256-K0547EuCK3NfASP2sDr7qSAv9zyWY6XZL8YCxbLu+5I=";
+  cargoHash = "sha256-eNgq6B7aI90/hfBqieDbO7zV53PugyAUADxpqH4t4ek=";

  buildInputs = [
    rust-jemalloc-sys
--- a/pkgs/development/compilers/ghc/common-hadrian.nix
+++ b/pkgs/development/compilers/ghc/common-hadrian.nix
@ -686,6 +686,11 @@ stdenv.mkDerivation (
    configureFlags = [
      "--datadir=$doc/share/doc/ghc"
    ]
+    # ghc 9.10 and later use c17 by default. we use gnu17 on darwin for older
+    # ghc versions to match this and fix build issues with newer clang.
+    ++ lib.optionals (hostPlatform.isDarwin && lib.versionOlder version "9.10") [
+      "CFLAGS=-std=gnu17"
+    ]
    ++ lib.optionals enableTerminfo [
      "--with-curses-includes=${lib.getDev targetLibs.ncurses}/include"
      "--with-curses-libraries=${lib.getLib targetLibs.ncurses}/lib"
--- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix
+++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix
@ -501,6 +501,11 @@ stdenv.mkDerivation (
    configureFlags = [
      "--datadir=$doc/share/doc/ghc"
    ]
+    # ghc 9.10 and later use c17 by default. we use gnu17 on darwin for older
+    # ghc versions to match this and fix build issues with newer clang.
+    ++ lib.optionals (hostPlatform.isDarwin && lib.versionOlder version "9.10") [
+      "CFLAGS=-std=gnu17"
+    ]
    ++ lib.optionals enableTerminfo [
      "--with-curses-includes=${lib.getDev targetLibs.ncurses}/include"
      "--with-curses-libraries=${lib.getLib targetLibs.ncurses}/lib"
--- a/pkgs/development/python-modules/aiomultiprocess/default.nix
+++ b/pkgs/development/python-modules/aiomultiprocess/default.nix
@ -18,6 +18,11 @@ buildPythonPackage rec {
    hash = "sha256-LWrAr3i2CgOMZFxWi9B3kiou0UtaHdDbpkr6f9pReRA=";
  };

+  patches = [
+    # https://github.com/omnilib/aiomultiprocess/issues/220
+    ./python314-compat.patch
+  ];
+
  build-system = [ flit-core ];

  nativeCheckInputs = [ pytestCheckHook ];
--- a/pkgs/development/python-modules/aiomultiprocess/python314-compat.patch
+++ b/pkgs/development/python-modules/aiomultiprocess/python314-compat.patch
@ -0,0 +1,21 @@
+diff --git a/aiomultiprocess/tests/base.py b/aiomultiprocess/tests/base.py
+--- a/aiomultiprocess/tests/base.py
+++ b/aiomultiprocess/tests/base.py
+@@ -56,7 +56,7 @@ async def terminate(process):
+ def async_test(fn):
+     @wraps(fn)
+     def wrapper(*args, **kwargs):
+-        loop = asyncio.get_event_loop()
+        loop = asyncio.new_event_loop()
+         return loop.run_until_complete(fn(*args, **kwargs))
+
+     return wrapper
+@@ -66,7 +66,7 @@ def perf_test(fn):
+     @wraps(fn)
+     @skipUnless(RUN_PERF_TESTS, "Performance test")
+     def wrapper(*args, **kwargs):
+-        loop = asyncio.get_event_loop()
+        loop = asyncio.new_event_loop()
+         return loop.run_until_complete(fn(*args, **kwargs))
+
+     return wrapper
--- a/pkgs/development/python-modules/aiotankerkoenig/default.nix
+++ b/pkgs/development/python-modules/aiotankerkoenig/default.nix
@ -16,14 +16,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "aiotankerkoenig";
-  version = "0.5.2";
+  version = "0.5.3";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "jpbede";
    repo = "aiotankerkoenig";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-LpaJyx5w0htbvWJ8kL8BlyMdlLOKlR6p+XW7qWMhXZo=";
+    hash = "sha256-0s0wapqMb0R/0aa7jlJLHgs7cXhLrqUjMiwZj2kUGEw=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/bleak-esphome/default.nix
+++ b/pkgs/development/python-modules/bleak-esphome/default.nix
@ -19,14 +19,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "bleak-esphome";
-  version = "3.7.3";
+  version = "3.7.4";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "bluetooth-devices";
    repo = "bleak-esphome";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-zEa8l3ob05BoT/GHhwClzOreZyC3uPaG05VIJV7ZZ00=";
+    hash = "sha256-f26E+/JTas2ugs7HYD9KYKX1qy7nrWd1+Osgz7fhl0c=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/cf-xarray/default.nix
+++ b/pkgs/development/python-modules/cf-xarray/default.nix
@ -18,14 +18,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "cf-xarray";
-  version = "0.11.0";
+  version = "0.11.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "xarray-contrib";
    repo = "cf-xarray";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-EUavqGATUZ5w3XzDiPKCveJfaTQwikS4wFIbcAAwH7k=";
+    hash = "sha256-UB/aMXnfX2dOprjQp51QHYOGq9Acn030oLqjLt/avS4=";
  };

  build-system = [
--- a/pkgs/development/python-modules/checkdmarc/default.nix
+++ b/pkgs/development/python-modules/checkdmarc/default.nix
@ -19,14 +19,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "checkdmarc";
-  version = "5.13.4";
+  version = "5.15.4";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "domainaware";
    repo = "checkdmarc";
    tag = finalAttrs.version;
-    hash = "sha256-Ve7kGCD/4NMAOGTULvCYt1NTicD8+gSgy5eu0dAu5RA=";
+    hash = "sha256-MafEl+5uZS490ZZqi74alOnbLfDyMGb5RK5CtyHUS60=";
  };

  pythonRelaxDeps = [
@ -65,6 +65,11 @@ buildPythonPackage (finalAttrs: {
    "testSplitSPFRecord"
    "testTooManySPFDNSLookups"
    "testTooManySPFVoidDNSLookups"
+    "testDNSSEC"
+    "testDnssecFalseWhenNoKey"
+    "testGetDnskeyCache"
+    "testIncludeMissingSPF"
+    "testKnownGood"
  ];

  meta = {
--- a/pkgs/development/python-modules/easyenergy/default.nix
+++ b/pkgs/development/python-modules/easyenergy/default.nix
@ -17,14 +17,14 @@

 buildPythonPackage rec {
  pname = "easyenergy";
-  version = "3.0.0";
+  version = "3.0.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "klaasnicolaas";
    repo = "python-easyenergy";
    tag = "v${version}";
-    hash = "sha256-aCRXL//hGJyG1eIonz/HJqFyG9eGKOoFhd6yD5zAR3s=";
+    hash = "sha256-GzsTAm5D0DVQ7OHfsCwn7Jdv1K1rEhz3KGuERRlTEmI=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/frigidaire/default.nix
+++ b/pkgs/development/python-modules/frigidaire/default.nix
@ -12,14 +12,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "frigidaire";
-  version = "0.18.29";
+  version = "0.18.43";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "bm1549";
    repo = "frigidaire";
    tag = finalAttrs.version;
-    hash = "sha256-OVaXo1UFB0deCHfDXR+uUnIsPsW6RhE/OJLG1WD4Ykg=";
+    hash = "sha256-ZlfzJVWxIEJ1NgVQwB74fZgW0RJ5lHEO3aavNNs3jLE=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/fyta-cli/default.nix
+++ b/pkgs/development/python-modules/fyta-cli/default.nix
@ -11,16 +11,16 @@
  syrupy,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "fyta-cli";
-  version = "0.7.2";
+  version = "0.7.3";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "dontinelli";
    repo = "fyta_cli";
-    tag = "v${version}";
-    hash = "sha256-YYH15ZuRZirSFC7No1goY/afk2BGtCCykcZAnCDdq7U=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-+gPPECRMhhx7H+K3//PRH3ALyY2k6eQ/o9qAVHyyoes=";
  };

  build-system = [ hatchling ];
@ -46,8 +46,8 @@ buildPythonPackage rec {
  meta = {
    description = "Module to access the FYTA API";
    homepage = "https://github.com/dontinelli/fyta_cli";
-    changelog = "https://github.com/dontinelli/fyta_cli/releases/tag/v${version}";
+    changelog = "https://github.com/dontinelli/fyta_cli/releases/tag/${finalAttrs.src.tag}";
    license = lib.licenses.gpl3Only;
    maintainers = with lib.maintainers; [ fab ];
  };
-}
+})
--- a/pkgs/development/python-modules/google-cloud-workflows/default.nix
+++ b/pkgs/development/python-modules/google-cloud-workflows/default.nix
@ -13,13 +13,13 @@

 buildPythonPackage (finalAttrs: {
  pname = "google-cloud-workflows";
-  version = "1.21.0";
+  version = "1.22.0";
  pyproject = true;

  src = fetchPypi {
    pname = "google_cloud_workflows";
    inherit (finalAttrs) version;
-    hash = "sha256-GaM/fyIJSHJ0r/8cz2aDYGGdIWw+LXgmnlRFKuv7e2I=";
+    hash = "sha256-9+uHMI2CPzwNWcn9Kci7ze+Oi5E4MhgHTIMf2Sfr4y0=";
  };

  build-system = [ setuptools ];
--- 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.202605131";
+  version = "0.1.202605141";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "cloud-copilot";
    repo = "iam-data-python";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-l0mqCMqSvVEG38stMYiJEPz2IPL8CqheQdvo/yN2aBU=";
+    hash = "sha256-B0G+xXpu869GcTGWPTofODf3WHdiGTFXAq/fk1uMkS8=";
  };

  __darwinAllowLocalNetworking = true;
--- a/pkgs/development/python-modules/lcn-frontend/default.nix
+++ b/pkgs/development/python-modules/lcn-frontend/default.nix
@ -7,13 +7,13 @@

 buildPythonPackage rec {
  pname = "lcn-frontend";
-  version = "0.2.8";
+  version = "0.2.9";
  pyproject = true;

  src = fetchPypi {
    pname = "lcn_frontend";
    inherit version;
-    hash = "sha256-1NOZGV2sLlJABBa3pzfOcBanSgqQ4DQGb61nkRgNVzw=";
+    hash = "sha256-JQcnfBqwlDp31XRg2yBG9HZ8j4avxp57Qa3gBqT+67I=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/lxmf/default.nix
+++ b/pkgs/development/python-modules/lxmf/default.nix
@ -8,14 +8,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "lxmf";
-  version = "0.9.6";
+  version = "0.9.8";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "markqvist";
    repo = "lxmf";
    tag = finalAttrs.version;
-    hash = "sha256-Q84v1CkyEYpW4QdtOD6zp7bn4UzMDeS9Q8fO91BnuPA=";
+    hash = "sha256-26T8f4WCf5q5/2RKA2Dh5xxqUOR3XXRFOzezCuDRA6c=";
  };

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

 buildPythonPackage (finalAttrs: {
  pname = "publicsuffixlist";
-  version = "1.0.2.20260508";
+  version = "1.0.2.20260514";
  pyproject = true;

  src = fetchPypi {
    inherit (finalAttrs) pname version;
-    hash = "sha256-rLIVQUjoynd20AvKRxBPNMgLXb3zBZtRNEcYrZur1Ds=";
+    hash = "sha256-sJhxWYOXtV4oYm4njrVAFxOA8BbPxHUjB4oeExSxCCM=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/pyportainer/default.nix
+++ b/pkgs/development/python-modules/pyportainer/default.nix
@ -17,14 +17,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "pyportainer";
-  version = "1.0.39";
+  version = "1.0.40";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "erwindouna";
    repo = "pyportainer";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-vFyeCSv7dP51wdkcviGfjzbKsMNUx4n+7NZJuqg7dVA=";
+    hash = "sha256-pwyGy2pVwY4vfjEpEYLK+9kh+HxLjfQE+JfvPzsLt5k=";
  };

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

 buildPythonPackage rec {
  pname = "pysrdaligateway";
-  version = "0.20.4";
+  version = "0.21.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "maginawin";
    repo = "PySrDaliGateway";
    tag = "v${version}";
-    hash = "sha256-VHNrlvtSDG66beeKule8OqJ03itmdnu+d2qSqSqd6SE=";
+    hash = "sha256-X9XLwlS4WAkNMghrs0AtHl2vwt/R2BEWPsqPY8gZNUs=";
  };

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

 buildPythonPackage (finalAttrs: {
  pname = "pytibber";
-  version = "0.37.5";
+  version = "0.37.6";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "Danielhiversen";
    repo = "pyTibber";
    tag = finalAttrs.version;
-    hash = "sha256-6b4f2IR/jkIwhdlrG8HZjIktmKLFs6iB6RZbQAOo7Yc=";
+    hash = "sha256-pyU8ju1T+AI4UvWq4/gtS8wV0a/cZfoRzlWpoK9eTtM=";
  };

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

 buildPythonPackage rec {
  pname = "robotframework-pythonlibcore";
-  version = "4.5.0";
+  version = "4.6.0";

  pyproject = true;

@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "robotframework";
    repo = "PythonLibCore";
    tag = "v${version}";
-    hash = "sha256-tkPESNRO34q5yH5Y2iHMQe/z18QiAvvzhjhMafxxUWI=";
+    hash = "sha256-H13b25M4vEymXZzhAm/EXMx7v5u/9rgkBXv7nBaxAvo=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/simple-pid/default.nix
+++ b/pkgs/development/python-modules/simple-pid/default.nix
@ -0,0 +1,40 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "simple-pid";
+  version = "2.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "m-lundberg";
+    repo = "simple-pid";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-DKi0ODnhoY/Pqzd6Zlvd1gMlFtzivigO0xThz35TBf8=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  pythonImportsCheck = [
+    "simple_pid"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "A simple and easy to use PID controller in Python";
+    homepage = "https://github.com/m-lundberg/simple-pid";
+    changelog = "https://github.com/m-lundberg/simple-pid/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ hexa ];
+  };
+})
--- 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.95";
+  version = "3.1.97";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "TencentCloud";
    repo = "tencentcloud-sdk-python";
    tag = finalAttrs.version;
-    hash = "sha256-CjQGcAAdUAbo0FK8rCbv261nUisdr6DBhNPOSuhsfX0=";
+    hash = "sha256-wBDCzuk/YS1n8aW9FxtzfgupPOfJ2VOpXrrjTa/izbE=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/thermopro-ble/default.nix
+++ b/pkgs/development/python-modules/thermopro-ble/default.nix
@ -11,16 +11,16 @@
  sensor-state-data,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "thermopro-ble";
-  version = "1.1.3";
+  version = "1.1.4";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "bluetooth-devices";
    repo = "thermopro-ble";
-    tag = "v${version}";
-    hash = "sha256-LyFA/O7nsmbg8KxT07Z0l+GEnTWF/IG0ykIN/8FK8Es=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-goTJwTMaWBm5gc0/LOkjpKeRTkLStHkKJYsbE5Wj/X4=";
  };

  build-system = [ poetry-core ];
@ -42,8 +42,8 @@ buildPythonPackage rec {
  meta = {
    description = "Library for Thermopro BLE devices";
    homepage = "https://github.com/bluetooth-devices/thermopro-ble";
-    changelog = "https://github.com/Bluetooth-Devices/thermopro-ble/releases/tag/${src.tag}";
+    changelog = "https://github.com/Bluetooth-Devices/thermopro-ble/releases/tag/${finalAttrs.src.tag}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ fab ];
  };
-}
+})
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@ -44,6 +44,7 @@ let
            pname = namePrefix + pluginName;

            strictDeps = true;
+            __structuredAttrs = true;

            inherit
              pluginName
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@ -791,6 +791,23 @@ in
    filesToInstall = [ "u-boot.bin" ];
  };

+  ubootRock3C = buildUBoot {
+    defconfig = "rock-3c-rk3566_defconfig";
+    extraMeta.platforms = [ "aarch64-linux" ];
+    strictDeps = true;
+    env = {
+      BL31 = "${armTrustedFirmwareRK3568}/bl31.elf";
+      ROCKCHIP_TPL = rkbin.TPL_RK3566;
+    };
+    filesToInstall = [
+      "idbloader.img"
+      "idbloader-spi.img"
+      "u-boot.itb"
+      "u-boot-rockchip.bin"
+      "u-boot-rockchip-spi.bin"
+    ];
+  };
+
  ubootRock4CPlus = buildUBoot {
    defconfig = "rock-4c-plus-rk3399_defconfig";
    extraMeta.platforms = [ "aarch64-linux" ];
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@ -5,38 +5,38 @@
        "lts": false
    },
    "6.1": {
-        "version": "6.1.172",
-        "hash": "sha256:16dlfdzjcsc21m5sfbhamg8y3ay54rz8a0qqvqrmxq691mhjwrzi",
+        "version": "6.1.173",
+        "hash": "sha256:163dhycch5pw1vc87mm13djghwwyz182ljway5w19hz8zdn2rwy4",
        "lts": true
    },
    "5.15": {
-        "version": "5.15.206",
-        "hash": "sha256:07z6lla7xpnn4sn3l4zw3x7m8ih8w6h54k71qrxrf5zv9i7wxijz",
+        "version": "5.15.207",
+        "hash": "sha256:13hlwrfi7hp3lxg5v4kx5ykycb64iwc7xhg4rbjk0pvl0yipzssh",
        "lts": true
    },
    "5.10": {
-        "version": "5.10.255",
-        "hash": "sha256:19v6g2fq4nqv38irlcd9x14s6d398c56mxzpyc03q4xmpy3v6mir",
+        "version": "5.10.256",
+        "hash": "sha256:0pwf9nsr7clqm0bxvyrp3k79d5i6f9xqq58i31xvvra1xk4dmsgi",
        "lts": true
    },
    "6.6": {
-        "version": "6.6.138",
-        "hash": "sha256:03x8ald0sjzdb6kpzrw8adnc78r3mdxrx8mzbxbpwp35vdgnpl5d",
+        "version": "6.6.139",
+        "hash": "sha256:0h6pygw7fwmkl4p0w0jq64bzx0qv74bgwcn3qsaaqf5f3lvp3kd7",
        "lts": true
    },
    "6.12": {
-        "version": "6.12.88",
-        "hash": "sha256:1s2x66j46gxw17j8hh5iws0l00aivmphp3mn8vgwbn8sj44gacjb",
+        "version": "6.12.89",
+        "hash": "sha256:184r0wji02qw2n7ncx0jrf382yk20nnf79fvafim6a4x9a0gsnjq",
        "lts": true
    },
    "6.18": {
-        "version": "6.18.30",
-        "hash": "sha256:1m5kvzky4g2jc8b09np8can0lasg1lwjfgdj41s3ymxgqdp8icx8",
+        "version": "6.18.31",
+        "hash": "sha256:1djqya5jlgg0q0ra5mvqdfcsbf13vxffhgxyqvy9qh2x91nvi850",
        "lts": true
    },
    "7.0": {
-        "version": "7.0.7",
-        "hash": "sha256:1x2xnb7gpj0inxdc317zi71i0d98b7wq64s0yzk2vzxalf3gxqf8",
+        "version": "7.0.8",
+        "hash": "sha256:08nbdmgy4bbpmjzkh6n4v3shksvxpcxhy8biv5w7qkwz5jrayi8r",
        "lts": false
    }
 }
--- a/pkgs/servers/home-assistant/build-custom-component/default.nix
+++ b/pkgs/servers/home-assistant/build-custom-component/default.nix
@ -1,15 +1,9 @@
 {
+  lib,
  home-assistant,
  makeSetupHook,
-}:
-
-{
-  owner,
-  domain,
-  version,
-  format ? "other",
  ...
-}@args:
+}:

 let
  manifestRequirementsCheckHook = import ./manifest-requirements-check-hook.nix {
@ -17,52 +11,63 @@ let
    inherit (home-assistant) python;
  };
 in
-home-assistant.python.pkgs.buildPythonPackage (
-  {
-    pname = "${owner}/${domain}";
-    inherit version format;

-    installPhase = ''
-      runHook preInstall
-
-      mkdir $out
-      if [[ -f ./manifest.json ]]; then
-        mkdir $out/custom_components
-        cp -R "$(realpath .)" "$out/custom_components/${domain}"
-      else
-        cp -r ./custom_components/ $out/
-      fi
-
-      # optionally copy sentences, if they exist
-      if [[ -d ./custom_sentences ]]; then
-        cp -r ./custom_sentences/ $out/
-      fi
-
-      runHook postInstall
-    '';
-
-    nativeBuildInputs =
-      with home-assistant.python.pkgs;
-      [
-        manifestRequirementsCheckHook
-        packaging
-      ]
-      ++ (args.nativeBuildInputs or [ ]);
-
-    passthru = {
-      isHomeAssistantComponent = true;
-    }
-    // args.passthru or { };
-
-    meta = {
-      inherit (home-assistant.meta) platforms;
-    }
-    // args.meta or { };
-
-  }
-  // removeAttrs args [
+lib.extendMkDerivation {
+  constructDrv = home-assistant.python.pkgs.buildPythonPackage;
+  excludeDrvArgNames = [
    "meta"
    "nativeBuildInputs"
    "passthru"
-  ]
-)
+  ];
+  extendDrvArgs =
+    finalAttrs:
+    {
+      owner,
+      domain,
+      version,
+      format ? "other",
+      ...
+    }@args:
+    {
+      pname = "${owner}/${domain}";
+      inherit version format;
+
+      installPhase = ''
+        runHook preInstall
+
+        mkdir $out
+        if [[ -f ./manifest.json ]]; then
+          mkdir $out/custom_components
+          cp -R "$(realpath .)" "$out/custom_components/${domain}"
+        else
+          cp -r ./custom_components/ $out/
+        fi
+
+        # optionally copy sentences, if they exist
+        if [[ -d ./custom_sentences ]]; then
+          cp -r ./custom_sentences/ $out/
+        fi
+
+        runHook postInstall
+      '';
+
+      nativeBuildInputs =
+        with home-assistant.python.pkgs;
+        [
+          manifestRequirementsCheckHook
+          packaging
+        ]
+        ++ (args.nativeBuildInputs or [ ]);
+
+      passthru = {
+        isHomeAssistantComponent = true;
+      }
+      // args.passthru or { };
+
+      meta = {
+        inherit (home-assistant.meta) platforms;
+      }
+      // args.meta or { };
+
+    };
+}
--- a/pkgs/servers/home-assistant/custom-components/README.md
+++ b/pkgs/servers/home-assistant/custom-components/README.md
@ -25,7 +25,7 @@ versions into the Python environment.
  fetchFromGitHub,
 }:

-buildHomeAssistantComponent {
+buildHomeAssistantComponent (finalAttrs: {
  # owner, domain, version

  src = fetchFromGitHub {
@ -39,7 +39,7 @@ buildHomeAssistantComponent {
  meta = {
    # changelog, description, homepage, license, maintainers
  };
-}
+})
 ```

 ## Package attribute
--- a/pkgs/servers/home-assistant/custom-components/alphaess/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/alphaess/package.nix
--- a/pkgs/servers/home-assistant/custom-components/simple_pid_controller/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/simple_pid_controller/package.nix
@ -0,0 +1,40 @@
+{
+  buildHomeAssistantComponent,
+  lib,
+  fetchFromGitHub,
+  simple-pid,
+  pytestCheckHook,
+  pytest-cov-stub,
+  pytest-homeassistant-custom-component,
+  syrupy,
+}:
+
+buildHomeAssistantComponent (finalAttrs: {
+  owner = "bvweerd";
+  domain = "simple_pid_controller";
+  version = "1.6.0";
+
+  src = fetchFromGitHub {
+    owner = "bvweerd";
+    repo = "simple_pid_controller";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-k/JT3sdGNYETWMat5hoiGv81N77Qz7Ks354vtk5PnvQ=";
+  };
+
+  dependencies = [ simple-pid ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-cov-stub
+    pytest-homeassistant-custom-component
+    syrupy
+  ];
+
+  meta = {
+    changelog = "https://github.com/bvweerd/simple_pid_controller/releases/tag/${finalAttrs.src.tag}";
+    description = "PID Controller integration for Home Assistant";
+    homepage = "https://github.com/bvweerd/simple_pid_controller";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ hexa ];
+  };
+})
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -8698,6 +8698,7 @@ with pkgs;
    ubootRaspberryPi4_32bit
    ubootRaspberryPi4_64bit
    ubootRaspberryPiZero
+    ubootRock3C
    ubootRock4CPlus
    ubootRock5ModelB
    ubootRock64
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -17875,6 +17875,8 @@ self: super: with self; {

  simple-parsing = callPackage ../development/python-modules/simple-parsing { };

+  simple-pid = callPackage ../development/python-modules/simple-pid { };
+
  simple-rest-client = callPackage ../development/python-modules/simple-rest-client { };

  simple-rlp = callPackage ../development/python-modules/simple-rlp { };