Merge staging-next into staging

2025-09-29 12:08:02 +00:00
parent d101284435 3c90917fd5
commit 4c0880e710
90 changed files with 1096 additions and 1135 deletions
@@ -3,6 +3,7 @@
 let
  inherit (builtins)
    intersectAttrs
+    unsafeGetAttrPos
    ;
  inherit (lib)
    functionArgs
@@ -303,7 +304,7 @@ rec {
      errorForArg =
        arg:
        let
-          loc = builtins.unsafeGetAttrPos arg fargs;
+          loc = unsafeGetAttrPos arg fargs;
        in
        "Function called without required argument \"${arg}\" at "
        + "${loc.file}:${toString loc.line}${prettySuggestions (getSuggestions arg)}";
@@ -28058,12 +28058,6 @@
    github = "x123";
    githubId = 5481629;
  };
-  x3ro = {
-    name = "^x3ro";
-    email = "nix@x3ro.dev";
-    github = "x3rAx";
-    githubId = 2268851;
-  };
  x807x = {
    name = "x807x";
    email = "s10855168@gmail.com";
@@ -268,6 +268,7 @@ in
          sw:
          let
            realDevice' = utils.escapeSystemdPath sw.realDevice;
+            btrfsInSystem = config.boot.supportedFilesystems.btrfs or false;
          in
          lib.nameValuePair "mkswap-${sw.deviceName}" {
            description = "Initialisation of swap device ${sw.device}";
@@ -287,6 +288,7 @@ in
              pkgs.util-linux
              pkgs.e2fsprogs
            ]
+            ++ lib.optional btrfsInSystem pkgs.btrfs-progs
            ++ lib.optional sw.randomEncryption.enable pkgs.cryptsetup;

            environment.DEVICE = sw.device;
@@ -295,13 +297,19 @@ in
              ${lib.optionalString (sw.size != null) ''
                currentSize=$(( $(stat -c "%s" "$DEVICE" 2>/dev/null || echo 0) / 1024 / 1024 ))
                if [[ ! -b "$DEVICE" && "${toString sw.size}" != "$currentSize" ]]; then
-                  # Disable CoW for CoW based filesystems like BTRFS.
-                  truncate --size 0 "$DEVICE"
-                  chattr +C "$DEVICE" 2>/dev/null || true
+                  if [[ $(stat -f -c %T $(dirname "$DEVICE")) == "btrfs" ]]; then
+                    # Use btrfs mkswapfile to speed up the creation of swapfile.
+                    rm -f "$DEVICE"
+                    btrfs filesystem mkswapfile --size "${toString sw.size}M" --uuid clear "$DEVICE"
+                  else
+                    # Disable CoW for CoW based filesystems.
+                    truncate --size 0 "$DEVICE"
+                    chattr +C "$DEVICE" 2>/dev/null || true

-                  echo "Creating swap file using dd and mkswap."
-                  dd if=/dev/zero of="$DEVICE" bs=1M count=${toString sw.size} status=progress
-                  ${lib.optionalString (!sw.randomEncryption.enable) "mkswap ${sw.realDevice}"}
+                    echo "Creating swap file using dd and mkswap."
+                    dd if=/dev/zero of="$DEVICE" bs=1M count=${toString sw.size} status=progress
+                    ${lib.optionalString (!sw.randomEncryption.enable) "mkswap ${sw.realDevice}"}
+                  fi
                fi
              ''}
              ${lib.optionalString sw.randomEncryption.enable ''
@@ -42,7 +42,7 @@ in

  config = lib.mkIf cfg.enable {

-    # Note: LIRC executables raises a warning, if lirc_options.conf do not exists
+    # Note: LIRC executables raises a warning, if lirc_options.conf does not exist
    environment.etc."lirc/lirc_options.conf".text = cfg.options;

    passthru.lirc.socket = "/run/lirc/lircd";
@@ -21,7 +21,10 @@ frontend proxy:
    virtualHosts."git.example.com" = {
      enableACME = true;
      forceSSL = true;
-      locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket";
+      locations."/" = {
+        proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket";
+        proxyWebsockets = true;
+      };
    };
  };
 }
@@ -129,7 +129,7 @@ let
    NIX_DISK_IMAGE=$(readlink -f "''${NIX_DISK_IMAGE:-${toString config.virtualisation.diskImage}}") || test -z "$NIX_DISK_IMAGE"

    if test -n "$NIX_DISK_IMAGE" && ! test -e "$NIX_DISK_IMAGE"; then
-        echo "Disk image do not exist, creating the virtualisation disk image..."
+        echo "Disk image does not exist, creating the virtualisation disk image..."

        ${
          if (cfg.useBootLoader && cfg.useDefaultFilesystems) then
@@ -124,7 +124,7 @@ in
        host1.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::2\")) | any'")
        host2.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::1\")) | any'")

-      with subtest("Check fake routes in preCheckConfig do not exists"):
+      with subtest("Check fake routes in preCheckConfig do not exist"):
        host1.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'")
        host2.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'")

@@ -79,7 +79,7 @@
    with subtest(
        "files created in the hosts container dir in a path where a tmpfs "
        + "file system has been mounted are not visible to the container as "
-        + "the do not exist in the tmpfs"
+        + "they do not exist in the tmpfs"
    ):
        machine.succeed(
            "touch /var/lib/nixos-containers/tmpfs/var/test.file",
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = {
    name = "claude-code";
    publisher = "anthropic";
-    version = "1.0.124";
-    hash = "sha256-pqm1A8ckV38fZE6h5HKxoU3k3T4volSbmsmOZ8F6aHQ=";
+    version = "1.0.127";
+    hash = "sha256-wR8iBlHUSb0/vEWDqDSzHpbZPHr2Nfzw/xXGccDi+28=";
  };

  meta = {
@@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
    name = "tinymist";
    publisher = "myriad-dreamin";
    inherit (tinymist) version;
-    hash = "sha256-VSbrKzj+FBK+MtXkBJzHe8pEODQACCYgADKYyyKUHAY=";
+    hash = "sha256-LUJ0e/ndyeeRsC2h7JJL6zymmPDWxW0cPGBceuC7+X0=";
  };

  nativeBuildInputs = [
@@ -23,7 +23,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "palemoon-bin";
-  version = "33.8.2";
+  version = "33.9.0.1";

  src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";

@@ -173,11 +173,11 @@ stdenv.mkDerivation (finalAttrs: {
      {
        gtk3 = fetchzip {
          urls = urlRegionVariants "gtk3";
-          hash = "sha256-W5N2OzHTYhJ7Lha/iduN7JPcczF+VPU9I36BAUiXUmU=";
+          hash = "sha256-QhER20l8GP0wQ0pDVwBZbYb2FImbX0kiUS9RCcR7gvg=";
        };
        gtk2 = fetchzip {
          urls = urlRegionVariants "gtk2";
-          hash = "sha256-RmX/yCWHzZEdkh6TnUQ/guIc7+iEdpK8ANhJxL3MbzI=";
+          hash = "sha256-13lq59H8xGNbZHalZo87xAaoQg61t2v+B/LXnPoEyoU=";
        };
      };

@@ -5,21 +5,21 @@
  zlib,
  curl,
  expat,
+  fuse,
  fuse3,
  openssl,
  autoreconfHook,
  python3,
-  libiconv,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  version = "3.7.22";
  pname = "afflib";

  src = fetchFromGitHub {
    owner = "sshock";
    repo = "AFFLIBv3";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
    sha256 = "sha256-pGInhJQBhFJhft/KfB3J3S9/BVp9D8TZ+uw2CUNVC+Q=";
  };

@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
    openssl
    python3
  ]
-  ++ lib.optionals (with stdenv; isLinux || isDarwin) [ fuse3 ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ fuse3 ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ fuse ];

  meta = {
    homepage = "http://afflib.sourceforge.net/";
@@ -42,4 +42,4 @@ stdenv.mkDerivation rec {
    maintainers = [ lib.maintainers.raskin ];
    downloadPage = "https://github.com/sshock/AFFLIBv3/tags";
  };
-}
+})
@@ -6,12 +6,12 @@

 python3Packages.buildPythonApplication rec {
  pname = "alibuild";
-  version = "1.17.28";
+  version = "1.17.30";
  pyproject = true;

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-x+1sAFJzKBUwVy5uIR/EVKicVGY5q6ghFiN175vN4VE=";
+    hash = "sha256-gLJQnQgFrB/4YTB8rpYicC97avuw0EhO4hUaxYYwvbE=";
  };

  build-system = with python3Packages; [
@@ -11,11 +11,11 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "betterdisplay";
-  version = "3.4.1";
+  version = "4.0.4";

  src = fetchurl {
    url = "https://github.com/waydabber/BetterDisplay/releases/download/v${finalAttrs.version}/BetterDisplay-v${finalAttrs.version}.dmg";
-    hash = "sha256-GTyFtW0qlYjrGl8eFuXFGudlx7304wb4KxqHKFzsH+c=";
+    hash = "sha256-njk1epuekOiBN8Exkxs9J2OHVP4xu4on42F+TPlW75M=";
  };

  dontPatch = true;
@@ -6,13 +6,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "blst";
-  version = "0.3.15";
+  version = "0.3.16";

  src = fetchFromGitHub {
    owner = "supranational";
    repo = "blst";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Q9/zGN93TnJt2c8YvSaURstoxT02ts3nVkO5V08m4TI=";
+    hash = "sha256-wQ5dHFnYqrWC4vl+7OJ/utcuTXdBtN26q0OsNPW0kfs=";
  };

  buildPhase = ''
@@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-about";
-  version = "0.8.1";
+  version = "0.8.2";

  src = fetchFromGitHub {
    owner = "EmbarkStudios";
    repo = "cargo-about";
    rev = version;
-    sha256 = "sha256-2ofyZgznnR7StzBuxva+I/5FVxLtbECb2kY1KsUBWRw=";
+    sha256 = "sha256-cNKZpDlfqEXeOE5lmu79AcKOawkPpk4PQCsBzNtIEbs=";
  };

-  cargoHash = "sha256-oB7v/c2LJICuQFPmw/51qabIClEbVikwm6/v/YM6lhA=";
+  cargoHash = "sha256-NnocSs6UkuF/mCM3lIdFk+r51Iz2bHuYzMT/gEbT/nk=";

  nativeBuildInputs = [ pkg-config ];

@@ -8,13 +8,13 @@
  mpfr,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "cgal";
-  version = "6.0.1";
+  version = "6.0.2";

  src = fetchurl {
-    url = "https://github.com/CGAL/cgal/releases/download/v${version}/CGAL-${version}.tar.xz";
-    sha256 = "0zwvyp096p0vx01jks9yf74nx6zjh0vjbwr6sl6n6mn52zrzpk8a";
+    url = "https://github.com/CGAL/cgal/releases/download/v${finalAttrs.version}/CGAL-${finalAttrs.version}.tar.xz";
+    sha256 = "sha256-8wxb58JaKj6iS8y6q1z2P6/aY8AnnzTX5/izISgh/tY=";
  };

  # note: optional component libCGAL_ImageIO would need zlib and opengl;
@@ -30,18 +30,18 @@ stdenv.mkDerivation rec {

  doCheck = false;

-  meta = with lib; {
+  meta = {
    description = "Computational Geometry Algorithms Library";
    homepage = "http://cgal.org";
-    license = with licenses; [
+    license = with lib.licenses; [
      gpl3Plus
      lgpl3Plus
    ];
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
    maintainers = with lib.maintainers; [
      raskin
      drew-dirac
      ylannl
    ];
  };
-}
+})
@@ -1,18 +1,12 @@
 {
-  "name": "claude-code",
-  "version": "1.0.17",
+  "name": "@anthropic-ai/claude-code",
+  "version": "1.0.128",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
-      "dependencies": {
-        "@anthropic-ai/claude-code": "^1.0.126"
-      }
-    },
-    "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.126",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.126.tgz",
-      "integrity": "sha512-DvzpL0LLB5nXRgJi4h+peDVys8sjfy5/QJMiketpqUd9SebTE673KnZ28lwEY4s944t/ywA80oNaJLXHMbqfcQ==",
+      "name": "@anthropic-ai/claude-code",
+      "version": "1.0.128",
      "license": "SEE LICENSE IN README.md",
      "bin": {
        "claude": "cli.js"
@@ -3,20 +3,22 @@
  buildNpmPackage,
  fetchzip,
  nodejs_20,
+  writableTmpDirAsHomeHook,
+  versionCheckHook,
 }:

-buildNpmPackage rec {
+buildNpmPackage (finalAttrs: {
  pname = "claude-code";
-  version = "1.0.126";
+  version = "1.0.128";

  nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin

  src = fetchzip {
-    url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
-    hash = "sha256-U6uYRkmVqMoJDAAzLHpF9G5OglPhLqPuwe6gWMQPx78=";
+    url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
+    hash = "sha256-dzLGcCgje3FMMS+Ptmxd2JK08y7z9rI0ak5l3Bv1MUk=";
  };

-  npmDepsHash = "sha256-m+GYa3uPfkUDV+p95uQToY3n/k0JG8hbppBn0GUeV+8=";
+  npmDepsHash = "sha256-Ynoj85a/F9Jv4w2vRDnGqn/G6zkaPesNQNEdqAE5zOo=";

  postPatch = ''
    cp ${./package-lock.json} package-lock.json
@@ -24,7 +26,7 @@ buildNpmPackage rec {

  dontNpmBuild = true;

-  AUTHORIZED = "1";
+  env.AUTHORIZED = "1";

  # `claude-code` tries to auto-update by default, this disables that functionality.
  # https://docs.anthropic.com/en/docs/agents-and-tools/claude-code/overview#environment-variables
@@ -35,6 +37,14 @@ buildNpmPackage rec {
      --unset DEV
  '';

+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    writableTmpDirAsHomeHook
+    versionCheckHook
+  ];
+  versionCheckKeepEnvironment = [ "HOME" ];
+  versionCheckProgramArg = "--version";
+
  passthru.updateScript = ./update.sh;

  meta = {
@@ -46,7 +56,8 @@ buildNpmPackage rec {
      malo
      markus1189
      omarjatoi
+      xiaoxiangmoe
    ];
    mainProgram = "claude";
  };
-}
+})
@@ -1,15 +1,10 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p nodePackages.npm nix-update
+#!nix-shell --pure -i bash --packages nodejs nix-update git

 set -euo pipefail

 version=$(npm view @anthropic-ai/claude-code version)

-# Generate updated lock file
-cd "$(dirname "${BASH_SOURCE[0]}")"
-npm i --package-lock-only @anthropic-ai/claude-code@"$version"
-rm -f package.json
-
 # Update version and hashes
-cd -
-nix-update claude-code --version "$version"
+AUTHORIZED=1 NIXPKGS_ALLOW_UNFREE=1 nix-update claude-code --version="$version" --generate-lockfile
+nix-update vscode-extensions.anthropic.claude-code --use-update-script --version "$version"
@@ -7,16 +7,16 @@

 buildGoModule rec {
  pname = "cloud-nuke";
-  version = "0.42.0";
+  version = "0.43.0";

  src = fetchFromGitHub {
    owner = "gruntwork-io";
    repo = "cloud-nuke";
    tag = "v${version}";
-    hash = "sha256-ALeUZs3LHhkWU1ecnzp/rpNhobCw4QLX2Pm6yN0dB40=";
+    hash = "sha256-TDZiX4Ik07Ysz3I7gdEF8SVJnt+EBPlH0RBIaE7+1KQ=";
  };

-  vendorHash = "sha256-TczKygsgAqDzNBJ8MOwCcMShD2Y8/F2awaeqg/OMCxg=";
+  vendorHash = "sha256-Qml8P9m8quUZAarsS7h3TGbcXBCJ2fRD3uyi8Do+lAw=";

  nativeBuildInputs = [
    makeBinaryWrapper
@@ -10,11 +10,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "copilot-language-server";
-  version = "1.373.0";
+  version = "1.377.0";

  src = fetchzip {
    url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip";
-    hash = "sha256-LomewSlAKI38rl7eYpfvBx9Mw9tfxXbrlPb/Ex7czZo=";
+    hash = "sha256-IWahEODv+3MM+9udhgoziP8ptZHHc09sVuBHrFf8msA=";
    stripRoot = false;
  };

@@ -1,32 +0,0 @@
-{
-  buildGoModule,
-  fetchFromGitHub,
-  lib,
-}:
-
-buildGoModule rec {
-  pname = "deepsea";
-  version = "0.9";
-
-  src = fetchFromGitHub {
-    owner = "dsnezhkov";
-    repo = "deepsea";
-    rev = "v${version}";
-    sha256 = "02s03sha8vwp7dsaw3z446pskhb6wmy0hyj0mhpbx58sf147rkig";
-  };
-
-  vendorHash = null;
-
-  meta = with lib; {
-    description = "Phishing tool for red teams and pentesters";
-    longDescription = ''
-      DeepSea phishing gear aims to help RTOs and pentesters with the
-      delivery of opsec-tight, flexible email phishing campaigns carried
-      out on the outside as well as on the inside of a perimeter.
-    '';
-    homepage = "https://github.com/dsnezhkov/deepsea";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ fab ];
-    broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check
-  };
-}
@@ -1,7 +1,12 @@
 {
  lib,
  stdenv,
-  pkgs,
+  fetchFromGitHub,
+  fetchpatch,
+  cmake,
+  pkg-config,
+  doxygen,
+  libuecc,
 }:

 let
@@ -11,19 +16,26 @@ in
 stdenv.mkDerivation {
  inherit pname version;

-  src = pkgs.fetchFromGitHub {
+  src = fetchFromGitHub {
    owner = "freifunk-gluon";
    repo = "ecdsautils";
    rev = "v${version}";
    sha256 = "sha256-vGHLAX/XOtePvdT/rljCOdlILHVO20mCt6p+MUi13dg=";
  };

-  nativeBuildInputs = with pkgs; [
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/freifunk-gluon/ecdsautils/commit/19f096f9c10264f4efe4b926fe83126e85642cba.patch";
+      hash = "sha256-oJv47NckFHFONPcG3WfHwgaHRqrz2eWXzbr5SQr+kX4=";
+    })
+  ];
+
+  nativeBuildInputs = [
    cmake
    pkg-config
    doxygen
  ];
-  buildInputs = with pkgs; [ libuecc ];
+  buildInputs = [ libuecc ];

  meta = with lib; {
    description = "Tiny collection of programs used for ECDSA (keygen, sign, verify)";
@@ -7,11 +7,11 @@

 let
  pname = "electron-mail";
-  version = "5.3.0";
+  version = "5.3.3";

  src = fetchurl {
    url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage";
-    hash = "sha256-QGYsD8Ec6/G4X2dGZfH7LwT6o6X599kP6V34y6WxP64=";
+    hash = "sha256-i1oJ/DNGspE7ELuN7MI0e8/69SZwirqahBa7Jf5kP7s=";
  };

  appimageContents = appimageTools.extract { inherit pname version src; };
@@ -22,7 +22,7 @@ appimageTools.wrapType2 {
  extraInstallCommands = ''
    install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
    substituteInPlace $out/share/applications/${pname}.desktop \
-      --replace 'Exec=AppRun' 'Exec=${pname}'
+      --replace-fail 'Exec=AppRun' 'Exec=${pname}'
    cp -r ${appimageContents}/usr/share/icons $out/share
  '';

@@ -13,13 +13,13 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "firefly-iii-data-importer";
-  version = "1.7.10";
+  version = "1.8.0";

  src = fetchFromGitHub {
    owner = "firefly-iii";
    repo = "data-importer";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-6C9ztbmYONhnNPZtZC0dQzU5qM8fqyigPVDKBhO7x8Y=";
+    hash = "sha256-MCHJ0rvFuUVdcmS0orrI/yvTBP4yZU467wSrUJT9asw=";
  };

  buildInputs = [ php84 ];
@@ -38,12 +38,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
  composerStrictValidation = true;
  strictDeps = true;

-  vendorHash = "sha256-WCh0NeTfunWrh2gur7+2Otcoa3U21ldi4JvualiatG8=";
+  vendorHash = "sha256-FiSnAsqRCWfugbmXEirLBUT6jyjr3OtlewTyv4oUfPc=";

  npmDeps = fetchNpmDeps {
    inherit (finalAttrs) src;
    name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-NELRAxCnvUNC1LTfktufkcNc/R8gkn6S/jt7VlOWRtg=";
+    hash = "sha256-S5fGoXsbsV1aJsZuMV235GJiGrXgExJeZ2Q4K4/2D+g=";
  };

  composerRepository = php84.mkComposerRepository {
@@ -11,16 +11,16 @@

 buildNpmPackage (finalAttrs: {
  pname = "gemini-cli";
-  version = "0.5.5";
+  version = "0.6.1";

  src = fetchFromGitHub {
    owner = "google-gemini";
    repo = "gemini-cli";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-A4O94X0TCc8lgX52+VQ1lSGREmpPIFLpu65Vwxsqso8=";
+    hash = "sha256-1QeVFPl6IH1iQFxrDZ0U8eTeLd+fIgSw1CkAiSGaL/s=";
  };

-  npmDepsHash = "sha256-d33dWwrCND/5veeIQ8iz87nTxu6wd7FskrGgvwBuruk=";
+  npmDepsHash = "sha256-l5AFQH5h6CPNnuSP0jjla3UbBhjPDVEc8fL5NWcT1XQ=";

  nativeBuildInputs = [
    jq
@@ -39,11 +39,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnunet";
-  version = "0.25.0";
+  version = "0.25.1";

  src = fetchurl {
    url = "mirror://gnu/gnunet/gnunet-${finalAttrs.version}.tar.gz";
-    hash = "sha256-LepmLuhgWUaFKvAtKAbKZP2t7cxxju72uG4LJoIsNv8=";
+    hash = "sha256-ITNsFs1X+R+dX9U1lILZFRp83w1jlvi2GCjBfMxmj1w=";
  };

  enableParallelBuilding = true;
@@ -8,16 +8,16 @@

 buildGoModule (finalAttrs: {
  pname = "grafanactl";
-  version = "0.1.4";
+  version = "0.1.5";

  src = fetchFromGitHub {
    owner = "grafana";
    repo = "grafanactl";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-MKP1G2AfLLn4nphZ7aK07EGfORiARrHznEG38KcjJyM=";
+    hash = "sha256-XHcNyPSN01CGkuj9p54yAAWFlwoWLF6cm5Q2f8iZtVM=";
  };

-  vendorHash = "sha256-haVFCR59lnx0FQ2BojIlupYhD0tuvttuD5iBgMF2F6k=";
+  vendorHash = "sha256-fHlktADqw3p377g3vXr2LZdBfWfNZOHxnp9H8/C31Gg=";

  ldflags = [
    "-X main.version=v${finalAttrs.version}"
@@ -1,35 +1,35 @@
 {
  "name": "GridTracker2",
-  "version": "2.250820.0",
+  "version": "2.250914.1",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "GridTracker2",
-      "version": "2.250820.0",
+      "version": "2.250914.1",
      "hasInstallScript": true,
      "dependencies": {
-        "@electron-toolkit/preload": "3.0.1",
-        "@electron-toolkit/utils": "3.0.0",
-        "@electron/remote": "2.1.2",
-        "electron-log": "5.2.0",
+        "@electron-toolkit/preload": "^3.0.1",
+        "@electron-toolkit/utils": "^3.0.0",
+        "@electron/remote": "^2.1.2",
+        "electron-log": "^5.2.0",
        "electron-updater": "6.6.5",
-        "mqtt": "5.10.1"
+        "mqtt": "^5.10.1"
      },
      "devDependencies": {
-        "@electron-toolkit/eslint-config": "1.0.2",
-        "@electron-toolkit/eslint-config-prettier": "2.0.0",
-        "electron": "35.7.0",
+        "@electron-toolkit/eslint-config": "^1.0.2",
+        "@electron-toolkit/eslint-config-prettier": "^2.0.0",
+        "electron": "35.7.5",
        "electron-builder": "26.0.12",
-        "eslint": "8.57.0",
-        "eslint_d": "14.0.4",
-        "prettier": "3.3.2"
+        "eslint": "^8.57.0",
+        "eslint_d": "^14.0.4",
+        "prettier": "^3.3.2"
      }
    },
    "node_modules/@babel/runtime": {
-      "version": "7.28.3",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.3.tgz",
-      "integrity": "sha512-9uIQ10o0WGdpP6GDhXcdOJPJuDgFtIDtN/9+ArJQ2NAfAmiuhTQdzkaTGR33v43GYS2UrSA0eX2pPPHoFVvpxA==",
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz",
+      "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==",
      "license": "MIT",
      "engines": {
        "node": ">=6.9.0"
@@ -79,9 +79,9 @@
      }
    },
    "node_modules/@electron-toolkit/preload": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@electron-toolkit/preload/-/preload-3.0.1.tgz",
-      "integrity": "sha512-EzoQmpK8jqqU8YnM5jRe0GJjGVJPke2KtANqz8QtN2JPT96ViOvProBdK5C6riCm0j1T8jjAGVQCZLQy9OVoIA==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@electron-toolkit/preload/-/preload-3.0.2.tgz",
+      "integrity": "sha512-TWWPToXd8qPRfSXwzf5KVhpXMfONaUuRAZJHsKthKgZR/+LqX1dZVSSClQ8OTAEduvLGdecljCsoT2jSshfoUg==",
      "license": "MIT",
      "peerDependencies": {
        "electron": ">=13.0.0"
@@ -205,7 +205,7 @@
    "node_modules/@electron/node-gyp": {
      "version": "10.2.0-electron.1",
      "resolved": "git+ssh://git@github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2",
-      "integrity": "sha512-lBSgDMQqt7QWMuIjS8zNAq5FI5o5RVBAcJUGWGI6GgoQITJt3msAkUrHp8YHj3RTVE+h70ndqMGqURjp3IfRyQ==",
+      "integrity": "sha512-4MSBTT8y07YUDqf69/vSh80Hh791epYqGtWHO3zSKhYFwQg+gx9wi1PqbqP6YqC4WMsNxZ5l9oDmnWdK5pfCKQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -492,9 +492,9 @@
      }
    },
    "node_modules/@electron/remote": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.1.2.tgz",
-      "integrity": "sha512-EPwNx+nhdrTBxyCqXt/pftoQg/ybtWDW3DUWHafejvnB1ZGGfMpv6e15D8KeempocjXe78T7WreyGGb3mlZxdA==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.1.3.tgz",
+      "integrity": "sha512-XlpxC8S4ttj/v2d+PKp9na/3Ev8bV7YWNL7Cw5b9MAWgTphEml7iYgbc7V0r9D6yDOfOkj06bchZgOZdlWJGNA==",
      "license": "MIT",
      "peerDependencies": {
        "electron": ">= 13.0.0"
@@ -650,9 +650,9 @@
      }
    },
    "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
-      "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==",
+      "version": "4.9.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz",
+      "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -767,9 +767,9 @@
      }
    },
    "node_modules/@eslint/js": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
-      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",
+      "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -818,42 +818,28 @@
      }
    },
    "node_modules/@humanfs/node": {
-      "version": "0.16.6",
-      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
-      "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
+      "version": "0.16.7",
+      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz",
+      "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==",
      "dev": true,
      "license": "Apache-2.0",
      "dependencies": {
        "@humanfs/core": "^0.19.1",
-        "@humanwhocodes/retry": "^0.3.0"
+        "@humanwhocodes/retry": "^0.4.0"
      },
      "engines": {
        "node": ">=18.18.0"
      }
    },
-    "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
-      "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=18.18"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
-      }
-    },
    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.14",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
-      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
+      "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",
      "deprecated": "Use @eslint/config-array instead",
      "dev": true,
      "license": "Apache-2.0",
      "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.2",
+        "@humanwhocodes/object-schema": "^2.0.3",
        "debug": "^4.3.1",
        "minimatch": "^3.0.5"
      },
@@ -952,9 +938,9 @@
      }
    },
    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz",
-      "integrity": "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -965,9 +951,9 @@
      }
    },
    "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -1003,9 +989,9 @@
      }
    },
    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
+      "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -1321,9 +1307,9 @@
      "license": "MIT"
    },
    "node_modules/@types/node": {
-      "version": "22.17.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.17.2.tgz",
-      "integrity": "sha512-gL6z5N9Jm9mhY+U2KXZpteb+09zyffliRkZyZOHODGATyC5B1Jt/7TzuuiLkFsSUMLbS1OLmlj/E+/3KF4Q/4w==",
+      "version": "22.18.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.18.3.tgz",
+      "integrity": "sha512-gTVM8js2twdtqM+AE2PdGEe9zGQY4UvmFjan9rZcVb6FGdStfjWoWejdmy4CfWVO9rh5MiYQGZloKAGkJt8lMw==",
      "license": "MIT",
      "dependencies": {
        "undici-types": "~6.21.0"
@@ -1739,9 +1725,9 @@
      "license": "MIT"
    },
    "node_modules/bl": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-6.1.2.tgz",
-      "integrity": "sha512-6J3oG82fpJ71WF4l0W6XslkwAPMr+Zcp+AmdxJ0L8LsXNzFeO8GYesV2J9AzGArBjrsb2xR50Ocbn/CL1B44TA==",
+      "version": "6.1.3",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-6.1.3.tgz",
+      "integrity": "sha512-nHB8B5roHlGX5TFsWeiQJijdddZIOHuv1eL2cM2kHnG3qR91CYLsysGe+CvxQfEd23EKD0eJf4lto0frTbddKA==",
      "license": "MIT",
      "dependencies": {
        "@types/readable-stream": "^4.0.0",
@@ -1793,6 +1779,18 @@
        "concat-map": "0.0.1"
      }
    },
+    "node_modules/broker-factory": {
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/broker-factory/-/broker-factory-3.1.9.tgz",
+      "integrity": "sha512-MzvndyD6EcbkBtX4NXm/HfdO1+cOR5ONNdMCXEKfHpxGdMtuDz7+o+nJf7HMtyPH1sUVf/lEIP+DMluC5PgaBQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.28.3",
+        "fast-unique-numbers": "^9.0.23",
+        "tslib": "^2.8.1",
+        "worker-factory": "^7.0.45"
+      }
+    },
    "node_modules/buffer": {
      "version": "5.7.1",
      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
@@ -2394,9 +2392,9 @@
      }
    },
    "node_modules/debug": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
      "license": "MIT",
      "dependencies": {
        "ms": "^2.1.3"
@@ -2513,9 +2511,9 @@
      }
    },
    "node_modules/detect-libc": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz",
-      "integrity": "sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.0.tgz",
+      "integrity": "sha512-vEtk+OcP7VBRtQZ1EJ3bdgzSfBjgnEalLTp5zjJrS+2Z1w2KZly4SBdac/WDU3hhsNAZ9E8SC96ME4Ey8MZ7cg==",
      "dev": true,
      "license": "Apache-2.0",
      "engines": {
@@ -2717,9 +2715,9 @@
      }
    },
    "node_modules/electron": {
-      "version": "35.7.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-35.7.0.tgz",
-      "integrity": "sha512-ZnbVqFK40pr83Jzw6IQ9pQT+obCG0DepSMKtOEe8WP2TgZbjvCOO4GzrR+a7Ze62JMRmtNOHsS4hFss6qjtSrQ==",
+      "version": "35.7.5",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-35.7.5.tgz",
+      "integrity": "sha512-dnL+JvLraKZl7iusXTVTGYs10TKfzUi30uEDTqsmTm0guN9V2tbOjTzyIZbh9n3ygUjgEYyo+igAwMRXIi3IPw==",
      "hasInstallScript": true,
      "license": "MIT",
      "dependencies": {
@@ -2812,9 +2810,9 @@
      }
    },
    "node_modules/electron-log": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.2.0.tgz",
-      "integrity": "sha512-VjLkvaLmbP3AOGOh5Fob9M8bFU0mmeSAb5G2EoTBx+kQLf2XA/0byzjsVGBTHhikbT+m1AB27NEQUv9wX9nM8w==",
+      "version": "5.4.3",
+      "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.4.3.tgz",
+      "integrity": "sha512-sOUsM3LjZdugatazSQ/XTyNcw8dfvH1SYhXWiJyfYodAAKOZdHs0txPiLDXFzOZbhXgAgshQkshH2ccq0feyLQ==",
      "license": "MIT",
      "engines": {
        "node": ">= 14"
@@ -3112,9 +3110,9 @@
      }
    },
    "node_modules/eslint": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
-      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
+      "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
      "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
      "dev": true,
      "license": "MIT",
@@ -3122,8 +3120,8 @@
        "@eslint-community/eslint-utils": "^4.2.0",
        "@eslint-community/regexpp": "^4.6.1",
        "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.57.0",
-        "@humanwhocodes/config-array": "^0.11.14",
+        "@eslint/js": "8.57.1",
+        "@humanwhocodes/config-array": "^0.13.0",
        "@humanwhocodes/module-importer": "^1.0.1",
        "@nodelib/fs.walk": "^1.2.8",
        "@ungap/structured-clone": "^1.2.0",
@@ -3169,14 +3167,15 @@
      }
    },
    "node_modules/eslint_d": {
-      "version": "14.0.4",
-      "resolved": "https://registry.npmjs.org/eslint_d/-/eslint_d-14.0.4.tgz",
-      "integrity": "sha512-VZuLiR03gKOCbXptTSrjfhmL4GBfGswyq2gJWUSDqMSc37XR2ryuKUtnLe1Y3+cphI7Rn7S9sHgXAFYDno3RiQ==",
+      "version": "14.3.0",
+      "resolved": "https://registry.npmjs.org/eslint_d/-/eslint_d-14.3.0.tgz",
+      "integrity": "sha512-Y8IRgZsOlYrSipIeaHpmuFu5+TEUDNZcgNKx2ARSUJp3DZCsFW9+V2bBhXCDQmBSolqjn2jZVZ5FBuhy0s3z2w==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
+        "debug": "^4.3.7",
        "eslint": "^9.8.0",
-        "supports-color": "^9.4.0"
+        "supports-color": "^7.2.0"
      },
      "bin": {
        "eslint_d": "bin/eslint_d.js"
@@ -3210,9 +3209,9 @@
      }
    },
    "node_modules/eslint_d/node_modules/@eslint/js": {
-      "version": "9.34.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.34.0.tgz",
-      "integrity": "sha512-EoyvqQnBNsV1CWaEJ559rxXL4c8V92gxirbawSmVUOWXlsRxxQXl6LmCpdUblgxgSkDIqKnhzba2SjRTI/A5Rw==",
+      "version": "9.35.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.35.0.tgz",
+      "integrity": "sha512-30iXE9whjlILfWobBkNerJo+TXYsgVM5ERQwMcMKCHckHflCmf7wXDAHlARoWnh0s1U72WqlbeyE7iAcCzuCPw==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -3223,19 +3222,19 @@
      }
    },
    "node_modules/eslint_d/node_modules/eslint": {
-      "version": "9.34.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.34.0.tgz",
-      "integrity": "sha512-RNCHRX5EwdrESy3Jc9o8ie8Bog+PeYvvSR8sDGoZxNFTvZ4dlxUB3WzQ3bQMztFrSRODGrLLj8g6OFuGY/aiQg==",
+      "version": "9.35.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.35.0.tgz",
+      "integrity": "sha512-QePbBFMJFjgmlE+cXAlbHZbHpdFVS2E/6vzCy7aKlebddvl1vadiC4JFV5u/wqTkNUwEV8WrQi257jf5f06hrg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/eslint-utils": "^4.8.0",
        "@eslint-community/regexpp": "^4.12.1",
        "@eslint/config-array": "^0.21.0",
        "@eslint/config-helpers": "^0.3.1",
        "@eslint/core": "^0.15.2",
        "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.34.0",
+        "@eslint/js": "9.35.0",
        "@eslint/plugin-kit": "^0.3.5",
        "@humanfs/node": "^0.16.6",
        "@humanwhocodes/module-importer": "^1.0.1",
@@ -3384,19 +3383,6 @@
        "node": "*"
      }
    },
-    "node_modules/eslint_d/node_modules/supports-color": {
-      "version": "9.4.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.4.0.tgz",
-      "integrity": "sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
    "node_modules/eslint-config-prettier": {
      "version": "9.1.2",
      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.2.tgz",
@@ -3633,16 +3619,16 @@
      "license": "MIT"
    },
    "node_modules/fast-unique-numbers": {
-      "version": "8.0.13",
-      "resolved": "https://registry.npmjs.org/fast-unique-numbers/-/fast-unique-numbers-8.0.13.tgz",
-      "integrity": "sha512-7OnTFAVPefgw2eBJ1xj2PGGR9FwYzSUso9decayHgCDX4sJkHLdcsYTytTg+tYv+wKF3U8gJuSBz2jJpQV4u/g==",
+      "version": "9.0.23",
+      "resolved": "https://registry.npmjs.org/fast-unique-numbers/-/fast-unique-numbers-9.0.23.tgz",
+      "integrity": "sha512-jcRIaHo46nfvyvKRMaFSKXmez4jALQ3Qw49gxM5F4siz8HqkyKPPEexpCOYwBSJI1HovrDr4fEedM8QAJ7oX3w==",
      "license": "MIT",
      "dependencies": {
-        "@babel/runtime": "^7.23.8",
-        "tslib": "^2.6.2"
+        "@babel/runtime": "^7.28.3",
+        "tslib": "^2.8.1"
      },
      "engines": {
-        "node": ">=16.1.0"
+        "node": ">=18.2.0"
      }
    },
    "node_modules/fastq": {
@@ -4335,7 +4321,6 @@
      "version": "10.0.1",
      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.0.1.tgz",
      "integrity": "sha512-NWv9YLW4PoW2B7xtzaS3NCot75m6nK7Icdv0o3lfMceJVRfSoQwqD4wEH5rLwoKJwUiZ/rfpiVBhnaF0FK4HoA==",
-      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">= 12"
@@ -4428,9 +4413,9 @@
      }
    },
    "node_modules/isbinaryfile": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-5.0.4.tgz",
-      "integrity": "sha512-YKBKVkKhty7s8rxddb40oOkuP0NbaeXrQvLin6QMHL7Ypiy2RW9LwOVrVgZRyOrhQlayMd9t+D8yDy8MKFTSDQ==",
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-5.0.6.tgz",
+      "integrity": "sha512-I+NmIfBHUl+r2wcDd6JwE9yWje/PIVY/R5/CmV8dXLZd5K+L9X2klAOwfAHNnondLXkbHyTAleQAWonpTJBTtw==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -4957,27 +4942,27 @@
      }
    },
    "node_modules/mqtt": {
-      "version": "5.10.1",
-      "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-5.10.1.tgz",
-      "integrity": "sha512-hXCOki8sANoQ7w+2OzJzg6qMBxTtrH9RlnVNV8panLZgnl+Gh0J/t4k6r8Az8+C7y3KAcyXtn0mmLixyUom8Sw==",
+      "version": "5.14.1",
+      "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-5.14.1.tgz",
+      "integrity": "sha512-NxkPxE70Uq3Ph7goefQa7ggSsVzHrayCD0OyxlJgITN/EbzlZN+JEPmaAZdxP1LsIT5FamDyILoQTF72W7Nnbw==",
      "license": "MIT",
      "dependencies": {
-        "@types/readable-stream": "^4.0.5",
-        "@types/ws": "^8.5.9",
+        "@types/readable-stream": "^4.0.21",
+        "@types/ws": "^8.18.1",
        "commist": "^3.2.0",
        "concat-stream": "^2.0.0",
-        "debug": "^4.3.4",
+        "debug": "^4.4.1",
        "help-me": "^5.0.0",
-        "lru-cache": "^10.0.1",
+        "lru-cache": "^10.4.3",
        "minimist": "^1.2.8",
-        "mqtt-packet": "^9.0.0",
+        "mqtt-packet": "^9.0.2",
        "number-allocator": "^1.0.14",
-        "readable-stream": "^4.4.2",
-        "reinterval": "^1.1.0",
-        "rfdc": "^1.3.0",
+        "readable-stream": "^4.7.0",
+        "rfdc": "^1.4.1",
+        "socks": "^2.8.6",
        "split2": "^4.2.0",
-        "worker-timers": "^7.1.4",
-        "ws": "^8.17.1"
+        "worker-timers": "^8.0.23",
+        "ws": "^8.18.3"
      },
      "bin": {
        "mqtt": "build/bin/mqtt.js",
@@ -5029,9 +5014,9 @@
      }
    },
    "node_modules/node-abi": {
-      "version": "3.75.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.75.0.tgz",
-      "integrity": "sha512-OhYaY5sDsIka7H7AtijtI9jwGYLyl29eQn/W623DiN/MIv5sUqc4g7BIDThX+gb7di9f6xK02nkp8sdfFWZLTg==",
+      "version": "3.77.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.77.0.tgz",
+      "integrity": "sha512-DSmt0OEcLoK4i3NuscSbGjOf3bqiDEutejqENSplMSFA/gmB8mkED9G4pKWnPl7MDU4rSHebKPHeitpDfyH0cQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -5452,9 +5437,9 @@
      }
    },
    "node_modules/prettier": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz",
-      "integrity": "sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
+      "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
      "dev": true,
      "license": "MIT",
      "bin": {
@@ -5641,12 +5626,6 @@
        "ieee754": "^1.2.1"
      }
    },
-    "node_modules/reinterval": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/reinterval/-/reinterval-1.1.0.tgz",
-      "integrity": "sha512-QIRet3SYrGp0HUHO88jVskiG6seqUGC5iAG7AwI/BV4ypGcuqk9Du6YQBUOUqm9c8pw1eyLoIaONifRua1lsEQ==",
-      "license": "MIT"
-    },
    "node_modules/require-directory": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -5967,7 +5946,6 @@
      "version": "4.2.0",
      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
-      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">= 6.0.0",
@@ -5978,7 +5956,6 @@
      "version": "2.8.7",
      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz",
      "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "ip-address": "^10.0.1",
@@ -6550,38 +6527,51 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/worker-timers": {
-      "version": "7.1.8",
-      "resolved": "https://registry.npmjs.org/worker-timers/-/worker-timers-7.1.8.tgz",
-      "integrity": "sha512-R54psRKYVLuzff7c1OTFcq/4Hue5Vlz4bFtNEIarpSiCYhpifHU3aIQI29S84o1j87ePCYqbmEJPqwBTf+3sfw==",
+    "node_modules/worker-factory": {
+      "version": "7.0.45",
+      "resolved": "https://registry.npmjs.org/worker-factory/-/worker-factory-7.0.45.tgz",
+      "integrity": "sha512-FFPCiSv7MD6ZDEfiik/ErM8IrIAWajaXhezLyCo3v0FjhUWud6GXnG2BiTE91jLywXGAVCT8IF48Hhr+D/omMw==",
      "license": "MIT",
      "dependencies": {
-        "@babel/runtime": "^7.24.5",
-        "tslib": "^2.6.2",
-        "worker-timers-broker": "^6.1.8",
-        "worker-timers-worker": "^7.0.71"
+        "@babel/runtime": "^7.28.3",
+        "fast-unique-numbers": "^9.0.23",
+        "tslib": "^2.8.1"
+      }
+    },
+    "node_modules/worker-timers": {
+      "version": "8.0.24",
+      "resolved": "https://registry.npmjs.org/worker-timers/-/worker-timers-8.0.24.tgz",
+      "integrity": "sha512-Ydu/7TRHlxIRjYSGDge1F92L7y9kzInpwR4CkocRVObPE0eRqC6d+0GFh52Hm+m520RHVKiytOERtCUu5sQDVQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.28.3",
+        "tslib": "^2.8.1",
+        "worker-timers-broker": "^8.0.10",
+        "worker-timers-worker": "^9.0.10"
      }
    },
    "node_modules/worker-timers-broker": {
-      "version": "6.1.8",
-      "resolved": "https://registry.npmjs.org/worker-timers-broker/-/worker-timers-broker-6.1.8.tgz",
-      "integrity": "sha512-FUCJu9jlK3A8WqLTKXM9E6kAmI/dR1vAJ8dHYLMisLNB/n3GuaFIjJ7pn16ZcD1zCOf7P6H62lWIEBi+yz/zQQ==",
+      "version": "8.0.10",
+      "resolved": "https://registry.npmjs.org/worker-timers-broker/-/worker-timers-broker-8.0.10.tgz",
+      "integrity": "sha512-xvo/9GiuduENbJNdWnvZtkriIkjBKKVbMyw7GXvrBu3n1JHemzZgxqaCcCBNlpfXnRXXF4ekqvXWLh1gb65b8w==",
      "license": "MIT",
      "dependencies": {
-        "@babel/runtime": "^7.24.5",
-        "fast-unique-numbers": "^8.0.13",
-        "tslib": "^2.6.2",
-        "worker-timers-worker": "^7.0.71"
+        "@babel/runtime": "^7.28.3",
+        "broker-factory": "^3.1.9",
+        "fast-unique-numbers": "^9.0.23",
+        "tslib": "^2.8.1",
+        "worker-timers-worker": "^9.0.10"
      }
    },
    "node_modules/worker-timers-worker": {
-      "version": "7.0.71",
-      "resolved": "https://registry.npmjs.org/worker-timers-worker/-/worker-timers-worker-7.0.71.tgz",
-      "integrity": "sha512-ks/5YKwZsto1c2vmljroppOKCivB/ma97g9y77MAAz2TBBjPPgpoOiS1qYQKIgvGTr2QYPT3XhJWIB6Rj2MVPQ==",
+      "version": "9.0.10",
+      "resolved": "https://registry.npmjs.org/worker-timers-worker/-/worker-timers-worker-9.0.10.tgz",
+      "integrity": "sha512-cfCmAkuoN+nGGJShta/g7CQVP3h7rvQA642EQg72fOHCWP5S2P83rLxDiaGv811Hd+19Cgdqt/tpRBIZ5kj/dw==",
      "license": "MIT",
      "dependencies": {
-        "@babel/runtime": "^7.24.5",
-        "tslib": "^2.6.2"
+        "@babel/runtime": "^7.28.3",
+        "tslib": "^2.8.1",
+        "worker-factory": "^7.0.45"
      }
    },
    "node_modules/wrap-ansi": {
@@ -3,23 +3,13 @@
  stdenv,
  copyDesktopItems,
  buildNpmPackage,
-  electron_35,
+  electron,
  fetchFromGitLab,
  makeBinaryWrapper,
  makeDesktopItem,
-  at-spi2-atk,
-  gtk3,
-  libappindicator-gtk3,
-  libnotify,
-  libsecret,
-  libuuid,
-  nss,
-  xdg-utils,
-  xorg,
 }:
 let
-  version = "2.250820.0";
-  electron = electron_35;
+  version = "2.250914.1";
 in
 buildNpmPackage (finalAttrs: {
  pname = "gridtracker2";
@@ -29,10 +19,10 @@ buildNpmPackage (finalAttrs: {
    owner = "gridtracker.org";
    repo = "gridtracker2";
    tag = "v${version}";
-    hash = "sha256-d40oq8UXNFaybjbbhqV8Gfkj8SEdTuF92Y0elW9dksY=";
+    hash = "sha256-ME68kGRlIRPs5tUOGb3g2CXJKC52QuMuTMc1ctAMzlk=";
  };

-  npmDepsHash = "sha256-q9QGNYMmeNCouPW9GFsVHSYK9T8N7H4hg6hkOtjmLAY=";
+  npmDepsHash = "sha256-MUXwJPo/A0gxtUbM3MOWfMcspM1losuDhc5XTc2oqCo=";

  nativeBuildInputs = [
    makeBinaryWrapper
@@ -91,21 +81,6 @@ buildNpmPackage (finalAttrs: {
    runHook postBuild
  '';

-  runtimeInputs = [
-    at-spi2-atk
-    gtk3
-    libnotify
-    libsecret
-    libuuid
-    nss
-    xdg-utils
-    xorg.libXScrnSaver
-    xorg.libXtst
-  ]
-  ++ lib.optionals stdenv.isLinux [
-    libappindicator-gtk3
-  ];
-
  installPhase = ''
    runHook preInstall

@@ -120,8 +95,6 @@ buildNpmPackage (finalAttrs: {

    makeWrapper ${lib.getExe electron} $out/bin/gridtracker2 \
      --add-flags $out/share/gridtracker2/resources/app.asar \
-      --prefix PATH : "${lib.makeBinPath finalAttrs.runtimeInputs}" \
-      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.runtimeInputs}" \
      --add-flags "--no-sandbox --disable-gpu-sandbox" \
      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
      --inherit-argv0
@@ -12,6 +12,7 @@
  libnotify,
  slurp,
  wl-clipboard,
+  unixtools,
  bash,
  nix-update-script,
 }:
@@ -54,6 +55,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
          libnotify
          slurp
          wl-clipboard
+          unixtools.getopt
        ]
      }"
  '';
@@ -11,13 +11,13 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "holo-cli";
-  version = "0.5.0-unstable-2025-08-29";
+  version = "0.5.0-unstable-2025-09-22";

  src = fetchFromGitHub {
    owner = "holo-routing";
    repo = "holo-cli";
-    rev = "31bca792c76e2ecb4d864a96cb20cc770135be74";
-    hash = "sha256-XNVeuAAsSdU9CM/HL/3UkBSgxngPheKuwTMkzm+MQ4Q=";
+    rev = "7d99e7de5eb5226728ee57153c03362c90eb65b2";
+    hash = "sha256-O509LNSpak+MJPQheYLPtJQcNGPyZLMHMasKScoVnls=";
  };

  cargoHash = "sha256-bsoxWjOMzRRtFGEaaqK0/adhGpDcejCIY0Pzw1HjQ5U=";
@@ -77,7 +77,6 @@ stdenv.mkDerivation (finalAttrs: {
      - Many configuration options.
    '';
    license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ x3ro ];
    platforms = lib.platforms.linux;
    mainProgram = "ksnip";
  };
@@ -13,24 +13,24 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "kurve";
-  version = "0.4.0";
+  version = "2.0.0";
  dontWrapQtApps = true;

  src = fetchFromGitHub {
    owner = "luisbocanegra";
    repo = "kurve";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Ra+ySuvBqmVOTD8TlWDJklXYuwXPb/2a3BSY+gQMiiA=";
+    hash = "sha256-qw/6V3TWGZFL8dgyDUxzBr4U6/jaX9uwpyg3Bd3pKdg=";
  };

  installPhase = ''
    runHook preInstall

    # Substitute Qt Websocket paths in QML files to ensure they work with Nix
-    substituteInPlace package/contents/ui/components/ProcessMonitorFallback.qml --replace-fail "import QtWebSockets 1.9" "import \"file:${qt6.qtwebsockets}/lib/qt-6/qml/QtWebSockets\""
+    substituteInPlace package/contents/ui/components/ProcessMonitorFallback.qml --replace-fail "import QtWebSockets" "import \"file:${qt6.qtwebsockets}/lib/qt-6/qml/QtWebSockets\""

    # Set cava path so it gets discovered by nix as runtime dependency
-    substituteInPlace package/contents/ui/Cava.qml --replace-fail "cava" "${cava}/bin/cava"
+    substituteInPlace package/contents/ui/Cava.qml --replace-fail "cava -p" "${cava}/bin/cava -p"
    substituteInPlace package/contents/ui/FullRepresentation.qml --replace-fail "cava -v" "${cava}/bin/cava -v"

    # Set python path so it gets discovered by nix as runtime dependency
@@ -45,6 +45,16 @@ stdenv.mkDerivation {
    mkdir -p data/db
    tar xvf $TMPDIR/db/version_1.tar -C data/db
    date +%s > data/db/timestamp.txt
+  ''
+  # Backport CMake 4 support
+  # This is already on master, but not yet in a stable release:
+  # https://github.com/lensfun/lensfun/issues/2520
+  # https://github.com/lensfun/lensfun/commit/011de2e85813ff496a85404b30891352555de077
+  + ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail \
+        'CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR )' \
+        'CMAKE_MINIMUM_REQUIRED(VERSION 3.12 FATAL_ERROR)'
  '';

  nativeBuildInputs = [
@@ -2,6 +2,7 @@
  lib,
  stdenv,
  fetchgit,
+  fetchpatch,
  cmake,
 }:

@@ -15,6 +16,14 @@ stdenv.mkDerivation rec {
    sha256 = "1sm05aql75sh13ykgsv3ns4x4zzw9lvzid6misd22gfgf6r9n5fs";
  };

+  patches = [
+    # Backport CMake 4 support
+    (fetchpatch {
+      url = "https://github.com/neocturne/libuecc/commit/b3812bf5ab1777193c4b85863311c33997d141f9.patch";
+      hash = "sha256-3h+LC5JlSXNiJlEQxSQzC7+5s+nMp+ll2NQQC5HzTf0=";
+    })
+  ];
+
  nativeBuildInputs = [ cmake ];

  meta = with lib; {
@@ -7,7 +7,7 @@

 stdenv.mkDerivation rec {
  pname = "libupnp";
-  version = "1.14.18";
+  version = "1.14.25";

  outputs = [
    "out"
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "pupnp";
    repo = "pupnp";
-    rev = "release-${version}";
-    sha256 = "sha256-eQKtZioZjI53J1fsoer032pzqebbK5IabOnkAXwBPos=";
+    tag = "release-${version}";
+    hash = "sha256-emMZKskaFYmLnIZLduHlZ5I3praaBgXY2JHLDAGPO28=";
  };

  nativeBuildInputs = [
@@ -33,6 +33,12 @@ stdenv.mkDerivation rec {
      --replace '\''${prefix}/' ""
  '';

+  # Fix broken cmake files
+  # https://gitlab.archlinux.org/archlinux/packaging/packages/libupnp/-/commit/69a99f8ccd4c6f335db9b5842f0facde585721eb
+  postFixup = ''
+    sed -e 's|/COMPONENT||g' -e 's|/UPNP_Development||g' -i ${placeholder "dev"}/lib/cmake/*/*.cmake
+  '';
+
  meta = {
    description = "Open source UPnP development kit for Linux";

@@ -108,7 +108,6 @@ stdenv.mkDerivation rec {
    '';
    changelog = "https://github.com/garywill/linux-router/releases/tag/${version}";
    license = lib.licenses.lgpl21Only;
-    maintainers = with lib.maintainers; [ x3ro ];
    platforms = lib.platforms.linux;
    mainProgram = "lnxrouter";
  };
@@ -31,13 +31,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "miracle-wm";
-  version = "0.7.0";
+  version = "0.7.1";

  src = fetchFromGitHub {
    owner = "miracle-wm-org";
    repo = "miracle-wm";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-SAeQ7nFsr37I8XncV3eMT8JCb74CdM+xPrNBX+qf8Bc=";
+    hash = "sha256-AgzLv6HkmHmWLQuWv2QXWhzB8jxvEKLyznVj67J6Wl8=";
  };

  postPatch = ''
@@ -17,19 +17,19 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "n8n";
-  version = "1.111.0";
+  version = "1.112.6";

  src = fetchFromGitHub {
    owner = "n8n-io";
    repo = "n8n";
    tag = "n8n@${finalAttrs.version}";
-    hash = "sha256-Ot7z6ZGOUeezp4r8mbGIhkvtkyigma1nLfVydZTVoMg=";
+    hash = "sha256-r/MCU/S1kkKQPkhmp9ZHTtgZxMu5TFCl5Yejp73gATw=";
  };

  pnpmDeps = pnpm_10.fetchDeps {
    inherit (finalAttrs) pname version src;
    fetcherVersion = 2;
-    hash = "sha256-uRdCxQENxAsQsYgxSVwVxpG8BhEd/VrYbNLNXCo9cRw=";
+    hash = "sha256-3QYKriP/5KqBD9x0H89MPzoqifVxFDBQfu4wa5aRfiY=";
  };

  nativeBuildInputs = [
@@ -9,13 +9,13 @@
 }:
 let
  pname = "open-webui";
-  version = "0.6.31";
+  version = "0.6.32";

  src = fetchFromGitHub {
    owner = "open-webui";
    repo = "open-webui";
    tag = "v${version}";
-    hash = "sha256-Pv+2+j5S4jokGYHGSewk33Vmf41XJj8CwyKYLMG2EWA=";
+    hash = "sha256-+P/IjELE1G2Fm8OwS5l7k78f78s/o1/Dy945aw+lfQw=";
  };

  frontend = buildNpmPackage rec {
@@ -32,7 +32,7 @@ let
      url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2";
    };

-    npmDepsHash = "sha256-HBmhRzWY7lIl3OScIlwSj/JJUlVcgFvXNHbw4jJRbl8=";
+    npmDepsHash = "sha256-BcSDzLg2voHyUz4cnXQ0KRNSbLCsCwJ1itEJSbfAQhU=";

    # See https://github.com/open-webui/open-webui/issues/15880
    npmFlags = [
@@ -10,6 +10,7 @@
  libtiff,
  opencolorio,
  openexr,
+  openjph,
  robin-map,
  unzip,
  fmt,
@@ -17,13 +18,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "openimageio";
-  version = "3.0.10.0";
+  version = "3.0.10.1";

  src = fetchFromGitHub {
    owner = "AcademySoftwareFoundation";
    repo = "OpenImageIO";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-WbzAYZEPH81FtG6I9jwKI5NJjnFSxIgkMpo3Gt/OIOQ=";
+    hash = "sha256-BBrzmukPfQVYR0CdfiYOxvPfIEXCj/45lQFRxl9Loc0=";
  };

  outputs = [
@@ -46,6 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
    libtiff
    opencolorio
    openexr
+    openjph
    robin-map
  ];

@@ -16,7 +16,7 @@
  nix-update-script,
 }:
 let
-  version = "1.0.5";
+  version = "1.0.8";
 in
 python3Packages.buildPythonApplication {
  pname = "rewaita";
@@ -27,7 +27,7 @@ python3Packages.buildPythonApplication {
    owner = "SwordPuffin";
    repo = "Rewaita";
    tag = "v${version}";
-    hash = "sha256-Q4HUly78liI0OfmD9llR+00qUKE+mioeNE0TIypCB9k=";
+    hash = "sha256-T1MrSg3DO6U/ztX4LYB1Uhpne+7xAfr8+INV5CyS0eE=";
  };

  postPatch = ''
@@ -11,14 +11,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "snagboot";
-  version = "2.2";
+  version = "2.4";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "bootlin";
    repo = "snagboot";
    tag = "v${version}";
-    hash = "sha256-JXhh+Ed/ZwytNrMwvGw7jaDBvwDQiUKe+gBDezOCHO4=";
+    hash = "sha256-ZjN4k5prOoEdAT4z37XiHdnUgLsz3zeR3+0zxY+2420=";
  };

  build-system = with python3Packages; [
@@ -42,8 +42,11 @@ python3Packages.buildPythonApplication rec {
    libfdt
    # swig
    packaging
+    xmodem
  ];

+  pythonRelaxDeps = [ "pylibfdt" ];
+
  optional-dependencies = with python3Packages; {
    gui = [ kivy ];
  };
@@ -7,13 +7,13 @@
  net-tools,
  autoPatchelfHook,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "speedify";
-  version = "15.6.4-12495";
+  version = "15.8.2-12611";

  src = fetchurl {
-    url = "https://apt.connectify.me/pool/main/s/speedify/speedify_${version}_amd64.deb";
-    hash = "sha256-b8J7JqVxuRREC16DeKD7hOBX4IZMbJPLArLmPtnDUB4=";
+    url = "https://apt.connectify.me/pool/main/s/speedify/speedify_${finalAttrs.version}_amd64.deb";
+    hash = "sha256-61GQZkXBe3EQpOUODpL60SCHJO0FGqvpL9xFn+q+kPs=";
  };

  nativeBuildInputs = [
@@ -58,4 +58,4 @@ stdenv.mkDerivation rec {
    platforms = [ "x86_64-linux" ];
    maintainers = with lib.maintainers; [ zahrun ];
  };
-}
+})
@@ -28,6 +28,13 @@ stdenv.mkDerivation (finalAttrs: {
  postPatch = ''
    substituteInPlace CMakeLists.txt \
      --replace-fail '"Unknown"' '"${finalAttrs.src.rev}"'
+  ''
+  # Fix build with CMake 4
+  # Will be part of the Qt6 port
+  # Note: The vendored version of qhexedit is incompatible with our qhexedit2: https://github.com/sqlitebrowser/sqlitebrowser/issues/1808
+  + ''
+    substituteInPlace libs/qhexedit/CMakeLists.txt \
+      --replace-fail 'cmake_minimum_required(VERSION 2.8.12.2)' 'cmake_minimum_required(VERSION 3.16)'
  '';

  buildInputs = [
@@ -19,16 +19,16 @@
 }:
 rustPlatform.buildRustPackage {
  pname = "steel";
-  version = "0-unstable-2025-09-17";
+  version = "0-unstable-2025-09-25";

  src = fetchFromGitHub {
    owner = "mattwparas";
    repo = "steel";
-    rev = "e387a1f2b69edfd213451a6541ece49365da96f0";
-    hash = "sha256-vwz7MfSo2b5beWvB8x333wgDGUB0ZEL3UK+DIfL2idQ=";
+    rev = "27532d855c71a4080f46f69fb9bae0eccfdaea7f";
+    hash = "sha256-GxmpBsL/ktR/Sd4q3/5FXQBV0tpdfsnBfbQcUzPIXHw=";
  };

-  cargoHash = "sha256-MTSVnCXXDVox3CfFEATTYffbKxG8ETp3p1Hp1+Nguiw=";
+  cargoHash = "sha256-CrmQhOfh7SQ5GvBywmYkfU6wMlgZq2x61+T+mIeQ7z4=";

  nativeBuildInputs = [
    curl
@@ -2,6 +2,7 @@
  lib,
  stdenv,
  fetchFromGitHub,
+  fetchpatch2,
  gradle_8,
  makeWrapper,
  jre,
@@ -12,18 +13,24 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "stirling-pdf";
-  version = "1.2.0";
+  version = "1.3.2";

  src = fetchFromGitHub {
    owner = "Stirling-Tools";
    repo = "Stirling-PDF";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-g5ugvnnFUXBfYFN1Z5+m9HTVSZ5KS9HGkIte3lKi/sA=";
+    hash = "sha256-H1nYRUIUVRUGGK+Vonr2v7oM6SfhYEsFk+JJp/4DI4M=";
  };

  patches = [
    # remove timestamp from the header of a generated .properties file
    ./remove-props-file-timestamp.patch
+    # Apply fix for building on macOS. Remove when updating the package next time.
+    (fetchpatch2 {
+      name = "normalize-path-in-ApplicationPropertiesLogicTest.patch";
+      url = "https://github.com/Stirling-Tools/Stirling-PDF/commit/93fb62047a6ab85db63305c23dde5e5118e1ae2e.patch";
+      hash = "sha256-kQNYyRtJ0smuhaoII31k87b7QRBJosK6xlFiQUwobsg=";
+    })
  ];

  mitmCache = gradle.fetchDeps {
@@ -1,11 +1,11 @@
 diff --git a/build.gradle b/build.gradle
-index 2c151d1..4c03638 100644
+index af8962dc9..43d70bc66 100644
 --- a/build.gradle
 +++ b/build.gradle
-@@ -69,7 +69,6 @@ allprojects {
+@@ -76,7 +76,6 @@ allprojects {
 tasks.register('writeVersion', WriteProperties) {
-     outputFile = layout.projectDirectory.file('app/common/src/main/resources/version.properties')
-     println "Writing version.properties to ${outputFile.path}"
+     destinationFile = layout.projectDirectory.file('app/common/src/main/resources/version.properties')
+     println "Writing version.properties to ${destinationFile.get().asFile.path}"
 -    comment = "${new Date()}"
     property 'version', project.provider { project.version.toString() }
 }
@@ -15,16 +15,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
  pname = "tinymist";
  # Please update the corresponding vscode extension when updating
  # this derivation.
-  version = "0.13.26";
+  version = "0.13.28";

  src = fetchFromGitHub {
    owner = "Myriad-Dreamin";
    repo = "tinymist";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-beGi4vyp/+FFTBCbKibqIn+d/4NTrj5gEPhXjKLwdtw=";
+    hash = "sha256-Z2FAlFjFHCzFhlLILcXseynoSdMhRQ30fWC7rW946N4=";
  };

-  cargoHash = "sha256-mtqQFiGE240nUpUspjwfR/EW88Ls0fUyqNvw/ltdGFI=";
+  cargoHash = "sha256-7p+TNZO+uFqXhhMzmHj0r1X2WgDdg8aonMc0jgsrEnk=";

  nativeBuildInputs = [
    installShellFiles
@@ -10,11 +10,11 @@
 }:
 stdenv.mkDerivation rec {
  pname = "worldpainter";
-  version = "2.26.0";
+  version = "2.26.1";

  src = fetchurl {
    url = "https://www.worldpainter.net/files/${pname}_${version}.tar.gz";
-    hash = "sha256-/ppESrYoNbtxSWaCaKgwvtrW8IGLwigYgQuHF5F/26A=";
+    hash = "sha256-YlFiGim9IeurDZ4H1XzxRDn7GM/U/zL9SqTUT4gJdno=";
  };

  nativeBuildInputs = [
@@ -1,34 +1,39 @@
 {
  lib,
  stdenv,
-  fetchurl,
+  fetchFromGitHub,
  perl,
+  unstableGitUpdater,
 }:
-stdenv.mkDerivation rec {
-  pname = "xmlformat";
-  version = "1.04";

-  src = fetchurl {
-    url = "http://www.kitebird.com/software/xmlformat/xmlformat-${version}.tar.gz";
-    sha256 = "1vwgzn4ha0az7dx0cyc6dx5nywwrx9gxhyh08mvdcq27wjbh79vi";
+stdenv.mkDerivation {
+  pname = "xmlformat";
+  version = "1.9-unstable-2021-09-15";
+
+  src = fetchFromGitHub {
+    owner = "someth2say";
+    repo = "xmlformat";
+    rev = "15a22213b341ab2800806f052a32d29898fecaad";
+    hash = "sha256-XCjvGeMerSqyMaVEu6EvLuwgsOxZ/v6ahgFCbzRqC7w=";
  };

  buildInputs = [ perl ];
-  buildPhase = ''
-    patchShebangs ./xmlformat.pl
-  '';

  installPhase = ''
    mkdir -p $out/bin
-    cp ./xmlformat.pl $out/bin/xmlformat
-    cp ./LICENSE $out/
+    cp bin/xmlformat.pl $out/bin/xmlformat
  '';

+  passthru.updateScript = unstableGitUpdater { };
+
  meta = {
    description = "Configurable formatter (or 'pretty-printer') for XML documents";
+    homepage = "https://github.com/someth2say/xmlformat";
+    license = lib.licenses.gpl3Only;
    mainProgram = "xmlformat";
-    homepage = "http://www.kitebird.com/software/xmlformat/";
-    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [
+      gepbird
+    ];
    platforms = lib.platforms.all;
  };
 }
@@ -1,60 +0,0 @@
-{
-  lib,
-  stdenv,
-  buildGoModule,
-  fetchFromGitHub,
-  installShellFiles,
-  buildPackages,
-  versionCheckHook,
-  nix-update-script,
-}:
-buildGoModule rec {
-  pname = "xo";
-  version = "1.0.2";
-
-  src = fetchFromGitHub {
-    owner = "xo";
-    repo = "xo";
-    tag = "v${version}";
-    hash = "sha256-cmSY+Et2rE+hLZ1+d2Vvwp+CX0hfLz08QKivQQd7SIQ=";
-  };
-
-  vendorHash = "sha256-aTjLoP7u2mMF1Ns/Wb9RR0xAqQCZJjjb5UzY2de6yBU=";
-
-  ldflags = [
-    "-X main.version=v${version}"
-  ];
-
-  nativeBuildInputs = [
-    installShellFiles
-  ];
-
-  postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
-    let
-      emulator = stdenv.hostPlatform.emulator buildPackages;
-    in
-    ''
-      installShellCompletion --cmd xo \
-        --bash <(${emulator} $out/bin/xo completion bash) \
-        --fish <(${emulator} $out/bin/xo completion fish) \
-        --zsh <(${emulator} $out/bin/xo completion zsh)
-    ''
-  );
-
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
-  versionCheckProgramArg = "--version";
-  doInstallCheck = true;
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "Command line tool to generate idiomatic Go code for SQL databases supporting PostgreSQL, MySQL, SQLite, Oracle, and Microsoft SQL Server";
-    homepage = "https://github.com/xo/xo";
-    changelog = "https://github.com/xo/xo/releases/tag/v${version}";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ xiaoxiangmoe ];
-    mainProgram = "xo";
-  };
-}
@@ -10,9 +10,9 @@
 }:

 let
-  version_4 = "4.9.4";
+  version_4 = "4.10.3";
  version_3 = "3.8.7";
-  hash_4 = "sha256-7OLCWG4KqgwXT7yJ87vOjjBwGijECkggciCbFrpW0Zs=";
+  hash_4 = "sha256-sPA9XxWuYvxw/eYAsePuHOaaY2jIBRAv5YfDgVUF6YY=";
  hash_3 = "sha256-vRrk+Fs/7dZha3h7yI5NpMfd1xezesnigpFgTRCACZo=";
 in

@@ -27,9 +27,9 @@ let
    "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw=";
    "21.1.1".officialRelease.sha256 = "sha256-IB9Z3bIMwfgw2W2Vxo89CmtCM9DfOyV2Ei64nqgHrgc=";
    "22.0.0-git".gitRelease = {
-      rev = "e396dab01f3da49df16c710d105a409973df5a03";
-      rev-version = "22.0.0-unstable-2025-09-21";
-      sha256 = "sha256-pYu/IVFvptxbtMo5GQePPKFlFnD/7FA13uzSuJWq3dc=";
+      rev = "cac0635ee9e947b5f90130df2f471aa4b722e04b";
+      rev-version = "22.0.0-unstable-2025-09-28";
+      sha256 = "sha256-wOhLGRYbkJOM6uglKXWZ7/94w/Fi3K2tlyPWdOVsCvM=";
    };
  }
  // llvmVersions;
@@ -20,15 +20,15 @@

 buildDunePackage rec {
  pname = "earlybird";
-  version = "1.3.3";
+  version = "1.3.4";

  minimalOCamlVersion = "4.12";

  src = fetchFromGitHub {
    owner = "hackwaly";
    repo = "ocamlearlybird";
-    rev = version;
-    hash = "sha256-TzRJ+0I3VEx4Lvj3lhN9POzlXRgmTTdD5Bg1AX0pf3c=";
+    tag = version;
+    hash = "sha256-uwx8N4GDs7NT2fEmNlvdBe2cIZGVPQpoaiiKROFa+kk=";
  };

  nativeBuildInputs = [ menhir ];
@@ -7,16 +7,16 @@

 php.buildComposerProject2 (finalAttrs: {
  pname = "phpstan";
-  version = "2.1.27";
+  version = "2.1.29";

  src = fetchFromGitHub {
    owner = "phpstan";
    repo = "phpstan-src";
    tag = finalAttrs.version;
-    hash = "sha256-oqqONolgMiqINpW1P6orbQ70xyNjNA7WVS/u2pLiR5o=";
+    hash = "sha256-8HPMXJ64qkV6fXfdr6fZTp2m1EhcWiq0cE51VQHuyro=";
  };

-  vendorHash = "sha256-OQlgrwBI4aDrtQ9Te3Sloq7xnXRQ5SJJfgOWSoQlruI=";
+  vendorHash = "sha256-mSlxWkqhniphYUOjE0zucOqN9gKe3Th0GEikB7DyYVY=";
  composerStrictValidation = false;

  doInstallCheck = true;
@@ -2,7 +2,6 @@
  lib,
  buildPythonPackage,
  approvaltests,
-  pythonOlder,
  setuptools,
  typing-extensions,
 }:
@@ -10,16 +9,15 @@
 buildPythonPackage {
  pname = "approval-utilities";
  inherit (approvaltests) version src;
-  disabled = pythonOlder "3.7";
  pyproject = true;

-  postPatch = ''
+  postPatch = approvaltests.postPatch or "" + ''
    mv setup.approval_utilities.py setup.py
  '';

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

-  propagatedBuildInputs = [
+  dependencies = [
    # used in approval_utilities/utilities/time_utilities.py
    typing-extensions
  ];
@@ -12,6 +12,7 @@
  pytest,
  pytest-asyncio,
  pytestCheckHook,
+  pyyaml,
  setuptools,
  testfixtures,
  typing-extensions,
@@ -19,16 +20,23 @@

 buildPythonPackage rec {
  pname = "approvaltests";
-  version = "15.0.0";
+  version = "15.3.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "approvals";
    repo = "ApprovalTests.Python";
    tag = "v${version}";
-    hash = "sha256-lXc81hQzxHxpg96OSWkkWmdmLOf4nU56dIKYVgLo+s8=";
+    hash = "sha256-cOaL8u5q9kx+yLB0e/ALnGYYGF5v50wsIIF1UUTPe1Y=";
  };

+  postPatch = ''
+    echo 'version_number = "${version}"' > version.py
+    mv .github approvaltests approval_utilities tests setup
+    cd setup
+    rm setup.cfg
+  '';
+
  build-system = [ setuptools ];

  dependencies = [
@@ -47,6 +55,7 @@ buildPythonPackage rec {
    numpy
    pytest-asyncio
    pytestCheckHook
+    pyyaml
  ];

  disabledTests = [
@@ -21,7 +21,7 @@

 buildPythonPackage rec {
  pname = "asyncua";
-  version = "1.1.6";
+  version = "1.1.8";
  pyproject = true;

  disabled = pythonOlder "3.8";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
    owner = "FreeOpcUa";
    repo = "opcua-asyncio";
    tag = "v${version}";
-    hash = "sha256-GxjEbzPvley0EL7xuZWr1jzR9Lpui1fVL2FOWnRL34Q=";
+    hash = "sha256-0eay/NlWn0I2oF0fTln9/d4y31zGfAj9ph3bWkgd8Nk=";
    fetchSubmodules = true;
  };

@@ -1,5 +1,6 @@
 {
  lib,
+  aiofiles,
  buildPythonPackage,
  fetchFromGitHub,
  hatchling,
@@ -10,14 +11,14 @@

 buildPythonPackage rec {
  pname = "benqprojector";
-  version = "0.1.6";
+  version = "0.1.8";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "rrooggiieerr";
    repo = "benqprojector.py";
    tag = version;
-    hash = "sha256-Ys2C44kr5gd6tXO51OFRx4YVKVRGLfFPCYDFGt+gN0c=";
+    hash = "sha256-BttaLpjiybjeoJhOXfo6Qlox4bRqf9auvNg/wtm9gMQ=";
  };

  build-system = [
@@ -26,6 +27,7 @@ buildPythonPackage rec {
  ];

  dependencies = [
+    aiofiles
    pyserial
    pyserial-asyncio-fast
  ];
@@ -38,7 +40,7 @@ buildPythonPackage rec {
  meta = rec {
    description = "Python library to control BenQ projectors";
    homepage = "https://github.com/rrooggiieerr/benqprojector.py";
-    changelog = "${homepage}/releases/tag/${version}";
+    changelog = "${homepage}/releases/tag/${src.tag}";
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ sephalon ];
  };
@@ -1,22 +1,23 @@
 {
  lib,
  stdenv,
-  fetchFromGitHub,
-  buildPythonPackage,
-  setuptools,
  bidict,
+  buildPythonPackage,
+  fetchFromGitHub,
  h5py,
+  joblib,
  matplotlib,
+  mock,
  numpy,
+  opencv-python,
+  peakutils,
+  pywavelets,
  scikit-learn,
  scipy,
+  setuptools,
  shortuuid,
  six,
-  joblib,
-  pywavelets,
-  mock,
  tkinter,
-  opencv-python,
 }:

 buildPythonPackage rec {
@@ -31,23 +32,22 @@ buildPythonPackage rec {
    hash = "sha256-R+3K8r+nzrCiZegxur/rf3/gDGhN9bVNMhlK94SHer0=";
  };

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

  dependencies = [
-    opencv-python
    bidict
    h5py
+    joblib
    matplotlib
+    mock
    numpy
+    opencv-python
+    peakutils
+    pywavelets
    scikit-learn
    scipy
    shortuuid
    six
-    joblib
-    pywavelets
-    mock
  ]
  ++ lib.optionals stdenv.hostPlatform.isDarwin [ tkinter ];

@@ -19,7 +19,7 @@

 buildPythonPackage rec {
  pname = "bx-py-utils";
-  version = "111";
+  version = "113";

  disabled = pythonOlder "3.10";

@@ -29,7 +29,7 @@ buildPythonPackage rec {
    owner = "boxine";
    repo = "bx_py_utils";
    tag = "v${version}";
-    hash = "sha256-B+05yBjqfnBaVvRZo47Akqyap4W5do+Xsumi69Ez4iY=";
+    hash = "sha256-rpDRLiqcbg/aRzdmKwGJAGrhBJTA+7tXsjPUIeeC03I=";
  };

  postPatch = ''
@@ -82,7 +82,11 @@ buildPythonPackage rec {
    "test_code_style"
  ];

-  disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
+  disabledTestPaths = [
+    # depends on cli-base-utilities, which depends on bx-py-utils
+    "bx_py_utils_tests/tests/test_project_setup.py"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
    # processify() doesn't work under darwin
    # https://github.com/boxine/bx_py_utils/issues/80
    "bx_py_utils_tests/tests/test_processify.py"
@@ -8,12 +8,12 @@

 buildPythonPackage rec {
  pname = "dsl2html";
-  version = "0.1.5";
+  version = "0.2.0";
  pyproject = true;

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-LUtTMqQuwahIeMm9QvMe6rdHEw5LEjMQdyZFZvf/HRU=";
+    hash = "sha256-GIJgkUbnU3eRkBgkguAINgMH1YnDSs5I9gIdQWvmVc0=";
  };

  build-system = [ setuptools ];
@@ -1,7 +1,7 @@
 {
  aiohttp,
  buildPythonPackage,
-  fetchFromGitHub,
+  fetchFromGitea,
  hatchling,
  lib,
  yarl,
@@ -9,14 +9,15 @@

 buildPythonPackage rec {
  pname = "eheimdigital";
-  version = "1.3.0";
+  version = "1.3.2";
  pyproject = true;

-  src = fetchFromGitHub {
+  src = fetchFromGitea {
+    domain = "codeberg.org";
    owner = "autinerd";
    repo = "eheimdigital";
    tag = version;
-    hash = "sha256-zpFINbhzh0SuWfapZWPTr+8qh9b0Ux0TiV4cHXQuGRM=";
+    hash = "sha256-wFKkfzZ4LLwWhVYigospWYBxTGAJGZWO6Wrj3bvUsc8=";
  };

  build-system = [ hatchling ];
@@ -32,9 +33,9 @@ buildPythonPackage rec {
  doCheck = false;

  meta = {
-    changelog = "https://github.com/autinerd/eheimdigital/releases/tag/${src.tag}";
+    changelog = "https://codeberg.org/autinerd/eheimdigital/releases/tag/${src.tag}";
    description = "Offers a Python API for the EHEIM Digital smart aquarium devices";
-    homepage = "https://github.com/autinerd/eheimdigital";
+    homepage = "https://codeberg.org/autinerd/eheimdigital";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ dotlambda ];
  };
@@ -4,6 +4,7 @@
  fetchFromGitHub,
  setuptools,
  bleak,
+  bleak-retry-connector,
  construct-typing,
  pytest-asyncio,
  pytestCheckHook,
@@ -11,20 +12,21 @@

 buildPythonPackage rec {
  pname = "eq3btsmart";
-  version = "2.1.1";
+  version = "2.3.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "EuleMitKeule";
    repo = "eq3btsmart";
    tag = version;
-    hash = "sha256-/Z/lSZXJ+c+G5iDF/BGacSpxrgJK4NLU7ShIAV4ipLc=";
+    hash = "sha256-9x2uQUpLl0bSOiEBTvt6IPZCJ3Oj+U4knlvrTXPGs3I=";
  };

  build-system = [ setuptools ];

  dependencies = [
    bleak
+    bleak-retry-connector
    construct-typing
  ];

@@ -1,7 +1,6 @@
 {
  lib,
  buildPythonPackage,
-  pythonOlder,
  fetchFromGitHub,
  setuptools,
  setuptools-scm,
@@ -14,9 +13,7 @@
 buildPythonPackage rec {
  pname = "formulae";
  version = "0.5.4";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.7";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "bambinos";
@@ -25,23 +22,27 @@ buildPythonPackage rec {
    hash = "sha256-SSyQa7soIp+wSXX5wek9LG95q7J7K34mztzx01lPiWo=";
  };

-  nativeBuildInputs = [
+  build-system = [
    setuptools
    setuptools-scm
  ];

-  propagatedBuildInputs = [
+  dependencies = [
    numpy
    pandas
    scipy
  ];

  nativeCheckInputs = [ pytestCheckHook ];
-  # use assertions of form `assert pytest.approx(...)`, which is now disallowed:
+
  disabledTests = [
+    # use assertions of form `assert pytest.approx(...)`, which is now disallowed:
    "test_basic"
    "test_degree"
+    # AssertionError
+    "test_evalenv_equality"
  ];
+
  pythonImportsCheck = [
    "formulae"
    "formulae.matrices"
@@ -50,7 +51,7 @@ buildPythonPackage rec {
  meta = with lib; {
    homepage = "https://bambinos.github.io/formulae";
    description = "Formulas for mixed-effects models in Python";
-    changelog = "https://github.com/bambinos/formulae/releases/tag/${version}";
+    changelog = "https://github.com/bambinos/formulae/releases/tag/${src.tag}";
    license = licenses.mit;
    maintainers = with maintainers; [ bcdarwin ];
  };
@@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "icalevents";
-  version = "0.3.0";
+  version = "0.3.1";
  pyproject = true;

  disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "jazzband";
    repo = "icalevents";
    tag = version;
-    hash = "sha256-PHx83oHhKdKxvO+mBc5tLonAxn1zJUQL3+u+1BRhxvA=";
+    hash = "sha256-QDqmcZY/UANVKRjk1ZFEFHgrjtD+hXE4qd3tX64sE7c=";
  };

  build-system = [
@@ -24,14 +24,14 @@

 buildPythonPackage rec {
  pname = "langchain-mistralai";
-  version = "0.2.11";
+  version = "0.2.12";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "langchain-ai";
    repo = "langchain";
    tag = "langchain-mistralai==${version}";
-    hash = "sha256-14mYvW7j2hxAFZanRhuuo1seX6E4+tAuEPExDbdwHKg=";
+    hash = "sha256-eZyoveKn4S0nkK/2q8+HK0bpFAQEez4PyRETQeZItMo=";
  };

  sourceRoot = "${src.name}/libs/partners/mistralai";
@@ -13,14 +13,14 @@

 buildPythonPackage rec {
  pname = "nuclear";
-  version = "2.4.0";
+  version = "2.5.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "igrek51";
    repo = "nuclear";
    rev = version;
-    hash = "sha256-0jeRoWk1PRyIEoEhWsA/9FtMy7CcN4mZpLpC6FZyM/A=";
+    hash = "sha256-6ZuRFZLhOqS9whkD0WtWD1/xSLhE8czDA3Za7Vcn1Mc=";
  };

  build-system = [ setuptools ];
@@ -0,0 +1,42 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  numpy,
+  pandas,
+  pytestCheckHook,
+  scipy,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "peakutils";
+  version = "1.3.5";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-T/Ln8zMLkwJP6Noe4E4AOJ4mvLLveb0vnPhszUli4RQ=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    numpy
+    scipy
+  ];
+
+  nativeCheckInputs = [
+    pandas
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "peakutils" ];
+
+  meta = {
+    description = "Peak detection utilities for 1D data";
+    homepage = "https://pypi.org/project/PeakUtils/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
@@ -1,7 +1,6 @@
 {
  lib,
  buildPythonPackage,
-  pythonOlder,
  fetchFromGitHub,
  setuptools,
  unasync,
@@ -15,16 +14,14 @@

 buildPythonPackage rec {
  pname = "pyhive-integration";
-  version = "1.0.2";
+  version = "1.0.3";
  pyproject = true;

-  disabled = pythonOlder "3.6";
-
  src = fetchFromGitHub {
    owner = "Pyhass";
    repo = "Pyhiveapi";
    tag = "v${version}";
-    hash = "sha256-lfBr889s6NHcos/kdzQa9HJEcQ4dfCEMjuLYiLzesfE=";
+    hash = "sha256-g3dEB41bYT2XygAIRqXpdCeYuh7IH9O3ZG1zr5Sm7+8=";
  };

  pythonRemoveDeps = [ "pre-commit" ];
@@ -53,11 +50,11 @@ buildPythonPackage rec {

  pythonImportsCheck = [ "pyhiveapi" ];

-  meta = with lib; {
+  meta = {
    description = "Python library to interface with the Hive API";
    homepage = "https://github.com/Pyhass/Pyhiveapi";
    changelog = "https://github.com/Pyhass/Pyhiveapi/releases/tag/${src.tag}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dotlambda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
  };
 }
@@ -8,14 +8,14 @@
 }:
 buildPythonPackage rec {
  pname = "pylint-odoo";
-  version = "9.3.15";
+  version = "9.3.18";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "OCA";
    repo = "pylint-odoo";
    tag = "v${version}";
-    hash = "sha256-N/HbsdkObnEC39dewIpFkRX4rn+7aJHua3gz2Bg0aI8=";
+    hash = "sha256-8nrAwjfz28INoLD4xuQ/R5lYodZjw/PqBdZAF+wBXN0=";
  };

  pythonRelaxDeps = [
@@ -7,9 +7,9 @@
  fetchpatch,
  lxml,
  packaging,
-  py,
  pytestCheckHook,
-  pythonOlder,
+  replaceVars,
+  setuptools,
  termcolor,
  wireshark-cli,
 }:
@@ -17,9 +17,7 @@
 buildPythonPackage rec {
  pname = "pyshark";
  version = "0.6";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "KimiNewt";
@@ -37,24 +35,24 @@ buildPythonPackage rec {
      url = "https://github.com/KimiNewt/pyshark/commit/7142c5bf88abcd4c65c81052a00226d6155dda42.patch";
      hash = "sha256-Ti7cwRyYSbF4a4pEEV9FntNevkV/JVXNqACQWzoma7g=";
    })
+    (replaceVars ./hardcode-tshark-path.patch {
+      tshark = lib.getExe' wireshark-cli "tshark";
+    })
  ];

  sourceRoot = "${src.name}/src";

-  # propagate wireshark, so pyshark can find it when used
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
    appdirs
    lxml
    packaging
-    py
    termcolor
-    wireshark-cli
  ];

  nativeCheckInputs = [
-    py
    pytestCheckHook
-    wireshark-cli
  ];

  preCheck = ''
@@ -0,0 +1,30 @@
+diff --git a/src/pyshark/tshark/tshark.py b/src/pyshark/tshark/tshark.py
+index 73ede9d..17c0488 100644
+--- a/src/pyshark/tshark/tshark.py
+++ b/src/pyshark/tshark/tshark.py
+@@ -47,24 +47,7 @@ def get_process_path(tshark_path=None, process_name="tshark"):
+                                         f"{process_name}.exe" if sys.platform.startswith("win") else process_name)
+         possible_paths.insert(0, user_tshark_path)
+ 
+-    # Windows search order: configuration file"s path, common paths.
+-    if sys.platform.startswith("win"):
+-        for env in ("ProgramFiles(x86)", "ProgramFiles"):
+-            program_files = os.getenv(env)
+-            if program_files is not None:
+-                possible_paths.append(
+-                    os.path.join(program_files, "Wireshark", f"{process_name}.exe")
+-                )
+-    # Linux, etc. search order: configuration file's path, the system's path
+-    else:
+-        os_path = os.getenv(
+-            "PATH",
+-            "/usr/bin:/usr/sbin:/usr/lib/tshark:/usr/local/bin"
+-        )
+-        for path in os_path.split(":"):
+-            possible_paths.append(os.path.join(path, process_name))
+-    if sys.platform.startswith("darwin"):
+-        possible_paths.append(f"/Applications/Wireshark.app/Contents/MacOS/{process_name}")
+    possible_paths.append("@tshark@")
+ 
+     for path in possible_paths:
+         if os.path.exists(path):
@@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "reolink-aio";
-  version = "0.15.2";
+  version = "0.16.0";
  pyproject = true;

  disabled = pythonOlder "3.11";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "starkillerOG";
    repo = "reolink_aio";
    tag = version;
-    hash = "sha256-ySA+OHLY1whrZjWVrbcP3cabEpF02Mjf/AFqy5NXchs=";
+    hash = "sha256-pxU3QuBH/xV77YLp0JqfYTJPVIbLvRKuaWnH5YU6vsE=";
  };

  build-system = [ setuptools ];
@@ -20,15 +20,9 @@ buildPythonPackage rec {
    hash = "sha256-YyiGd3XSIe+4PEL2l9LYDGH3lt1iRAAJflcBGYXaBzY=";
  };

-  postPatch = ''
-    # https://github.com/robotframework/statuschecker/issues/46
-    substituteInPlace test/tests.robot \
-      --replace-fail BuiltIn.Log Log
-  '';
+  build-system = [ setuptools ];

-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [ robotframework ];
+  dependencies = [ robotframework ];

  checkPhase = ''
    runHook preCheck
@@ -23,13 +23,13 @@

 buildPythonPackage rec {
  pname = "scalar-fastapi";
-  version = "1.4.0";
+  version = "1.4.2";
  pyproject = true;

  src = fetchPypi {
    pname = "scalar_fastapi";
    inherit version;
-    hash = "sha256-acR6eTAThDHvUt6Frfslk2W+yuHwMTyI8zvfD3E2uO8=";
+    hash = "sha256-mXeUxDobSdZmxWWiuF2C+oY5Zvh6LljdZQc9/YwdqGI=";
  };

  build-system = [
@@ -9,14 +9,14 @@

 buildPythonPackage rec {
  pname = "tencentcloud-sdk-python";
-  version = "3.0.1467";
+  version = "3.0.1468";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "TencentCloud";
    repo = "tencentcloud-sdk-python";
    tag = version;
-    hash = "sha256-qbmPZ6QSAe46SO3CvjcRBgLYlFxzIj/cy+ffdzclHG0=";
+    hash = "sha256-uFIUtIU6nFitFna9iw34DiQgBrN69WKznijgVNeHNd0=";
  };

  build-system = [ setuptools ];
@@ -33,14 +33,14 @@

 buildPythonPackage rec {
  pname = "ultralytics";
-  version = "8.3.199";
+  version = "8.3.203";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "ultralytics";
    repo = "ultralytics";
    tag = "v${version}";
-    hash = "sha256-15Ktt16pS9ac7g21mWTSLnB7oGtyak6J3wdYN9gVLpk=";
+    hash = "sha256-j19eHxhrkvZ8tyVjO+VSNwXHrH1+c16g9byg69G7miI=";
  };

  build-system = [ setuptools ];
@@ -4,30 +4,36 @@
  fetchFromGitHub,
  setuptools,
  requests,
+  keyring,
  pytestCheckHook,
  responses,
 }:

 buildPythonPackage rec {
  pname = "upcloud-api";
-  version = "2.7.0";
+  version = "2.9.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "UpCloudLtd";
    repo = "upcloud-python-api";
    tag = "v${version}";
-    hash = "sha256-YTccjuoagjS/Gllw8VtJ4NFoVqN1YeqXdgHI7BtP98w=";
+    hash = "sha256-OnHKKSlj6JbqXL1YDkmR7d6ae8eVdXOPx6Los5qPDJE=";
  };

  build-system = [ setuptools ];

  dependencies = [ requests ];

+  optional-dependencies = {
+    keyring = [ keyring ];
+  };
+
  nativeCheckInputs = [
    pytestCheckHook
    responses
-  ];
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);

  pythonImportsCheck = [ "upcloud_api" ];

@@ -18,11 +18,11 @@

 stdenv.mkDerivation rec {
  pname = "sgt-puzzles";
-  version = "20250904.2376227";
+  version = "20250926.e00cb46";

  src = fetchurl {
    url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
-    hash = "sha256-FF+RSJqGMhmV5QSaNOBpVeIgS5jAcQJfkW0MvdVxnPI=";
+    hash = "sha256-CsMrhYpaTRMz364kt5b/bCY67PCoYwS50Fxw8mi2QCY=";
  };

  sgt-puzzles-menu = fetchurl {
@@ -18,6 +18,10 @@ stdenv.mkDerivation rec {
  patches = [
    ./hardening-format.patch
    ./fix-dmevent_tool.patch
+
+    # Fix build with gcc15, based on
+    # https://gitlab.alpinelinux.org/alpine/aports/-/raw/dc5b3135517ede55f5e3530e538ca75048d26565/main/dmraid/008-gcc15.patch
+    ./dmraid-fix-build-with-gcc15.patch
  ]
  ++ lib.optionals stdenv.hostPlatform.isMusl [
    (fetchpatch {
@@ -0,0 +1,33 @@
+diff --git a/1.0.0.rc16/lib/activate/activate.c b/1.0.0.rc16/lib/activate/activate.c
+index 1d71ea8c0a..0a4ec6afa1 100644
+--- a/1.0.0.rc16/lib/activate/activate.c
+++ b/1.0.0.rc16/lib/activate/activate.c
+@@ -866,7 +866,7 @@
+
+ #define LIB_NAME_LENGTH 255
+ static int
+-do_device(struct lib_context *lc, struct raid_set *rs, int (*f) ())
+do_device(struct lib_context *lc, struct raid_set *rs, int (*f)(char *, char *))
+ {
+        int ret = 0;
+        char lib_name[LIB_NAME_LENGTH];
+diff --git a/1.0.0.rc16/lib/misc/file.c b/1.0.0.rc16/lib/misc/file.c
+index fe74d5c9c2..c060b6e712 100644
+--- a/1.0.0.rc16/lib/misc/file.c
+++ b/1.0.0.rc16/lib/misc/file.c
+@@ -59,12 +59,12 @@
+ 	int fd, ret = 0;
+ 	loff_t o;
+ 	struct {
+-		ssize_t(*func) ();
+		ssize_t(*func)(int, void *, size_t);
+ 		const char *what;
+ 	} rw_spec[] = {
+ 		{
+ 		read, "read"}, {
+-	write, "writ"},}, *rw = rw_spec + ((flags & O_WRONLY) ? 1 : 0);
+	(ssize_t(*)(int, void *, size_t))write, "writ"},}, *rw = rw_spec + ((flags & O_WRONLY) ? 1 : 0);
+ 
+ 	if ((fd = open(path, flags, lc->mode)) == -1)
+ 		LOG_ERR(lc, 0, "opening \"%s\"", path);
+
@@ -11,13 +11,13 @@
 buildHomeAssistantComponent rec {
  owner = "christaangoossens";
  domain = "auth_oidc";
-  version = "0.6.2-alpha";
+  version = "0.6.3-alpha";

  src = fetchFromGitHub {
    owner = "christiaangoossens";
    repo = "hass-oidc-auth";
    tag = "v${version}";
-    hash = "sha256-C/Nui0frlcRLaOqsfFH72QNo756karLq/UUcvs2LgE0=";
+    hash = "sha256-+R2IIs9MixR8epVpk4QycN8PjOfRITlZ+oUbdPEk2eA=";
  };

  dependencies = [
@@ -11,13 +11,13 @@

 stdenv.mkDerivation rec {
  pname = "klipper";
-  version = "0.13.0-unstable-2025-09-16";
+  version = "0.13.0-unstable-2025-09-26";

  src = fetchFromGitHub {
    owner = "KevinOConnor";
    repo = "klipper";
-    rev = "8db5d254e077e10583cfaff0d9e70e08263383e5";
-    sha256 = "sha256-5lPPWuQVqtFVGmBvZX5rUwnOw9V1SCKfyLDxZ416tMM=";
+    rev = "af17c8c238ba8cdeaaabb87b25a3ca2375b47c11";
+    sha256 = "sha256-n3t58gsPXxlf2DnrofI28/0ZRC4EwnZvoFKxgxZ9vYA=";
  };

  sourceRoot = "${src.name}/klippy";
@@ -739,6 +739,7 @@ mapAliases {
  deadpixi-sam = deadpixi-sam-unstable;
  debugedit-unstable = throw "'debugedit-unstable' has been renamed to/replaced by 'debugedit'"; # Converted to throw 2024-10-17
  deepin = throw "the Deepin desktop environment and associated tools have been removed from nixpkgs due to lack of maintenance"; # Added 2025-08-21
+  deepsea = throw "deepsea has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
  degit-rs = throw "'degit-rs' has been removed because it is unmaintained upstream and has vulnerable dependencies."; # Added 2025-07-11
  deltachat-cursed = arcanechat-tui; # added 2025-02-25
  deltachat-electron = throw "'deltachat-electron' has been renamed to/replaced by 'deltachat-desktop'"; # Converted to throw 2024-10-17
@@ -2719,6 +2720,7 @@ mapAliases {
  xmlroff = throw "'xmlroff' has been removed as it is unmaintained and broken"; # Added 2025-05-18
  xmr-stak = throw "xmr-stak has been removed from nixpkgs because it was broken"; # Added 2024-07-15
  xmake-core-sv = throw "'xmake-core-sv' has been removed, use 'libsv' instead"; # Added 2024-10-10
+  xo = throw "Use 'dbtpl' instead of 'xo'"; # Added 2025-09-28
  xorg-autoconf = util-macros; # Added 2025-08-18
  xournal = throw "'xournal' has been removed due to lack of activity upstream and depending on gnome2. Consider using 'xournalpp' instead."; # Added 2024-12-06
  xonsh-unwrapped = python3Packages.xonsh; # Added 2024-06-18
@@ -11591,6 +11591,8 @@ self: super: with self; {

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

+  peakutils = callPackage ../development/python-modules/peakutils { };
+
  peaqevcore = callPackage ../development/python-modules/peaqevcore { };

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