Merge master into staging-next

2026-05-08 18:30:44 +00:00
parent b4f955537a 0a275b327b
commit 6bf442b008
76 changed files with 707 additions and 433 deletions
@@ -49,7 +49,7 @@ jobs:

      - name: Create backport PRs
        id: backport
-        uses: korthout/backport-action@7c3f6cd5843cac11bc59a04a1b7699af93261670 # v4.5.0
+        uses: korthout/backport-action@bf97bcfb53d5250af8b9a15fab0f56158a63b224 # v4.5.1
        with:
          # Config README: https://github.com/korthout/backport-action#backport-action
          add_author_as_reviewer: true
@@ -62,7 +62,7 @@ jobs:
          merged-as-untrusted-at: ${{ inputs.mergedSha }}
          target-as-trusted-at: ${{ inputs.targetSha }}

-      - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5
+      - uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6
        with:
          # Sandbox is disabled on MacOS by default.
          extra_nix_config: sandbox = true
@@ -147,7 +147,7 @@ jobs:
          merged-as-untrusted-at: ${{ inputs.mergedSha }}
          target-as-trusted-at: ${{ inputs.targetSha }}

-      - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5
+      - uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6

      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
        continue-on-error: true
@@ -136,7 +136,7 @@ jobs:
            core.info(`Found pinned.json commit: ${ciPinBumpCommit}`)

      - name: Install Nix
-        uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5
+        uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6

      - name: Load supported versions
        id: versions
@@ -184,7 +184,7 @@ jobs:
          target-as-trusted-at: ${{ inputs.targetSha }}

      - name: Install Nix
-        uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5
+        uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6

      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
        continue-on-error: true
@@ -274,7 +274,7 @@ jobs:
          merge-multiple: true

      - name: Install Nix
-        uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5
+        uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6

      - name: Combine all output paths and eval stats
        run: |
@@ -481,7 +481,7 @@ jobs:
          merged-as-untrusted-at: ${{ inputs.mergedSha }}

      - name: Install Nix
-        uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5
+        uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6

      - name: Ensure flake outputs on all systems still evaluate
        run: nix flake check --all-systems --no-build './nixpkgs/untrusted?shallow=1'
@@ -35,7 +35,7 @@ jobs:
        with:
          merged-as-untrusted-at: ${{ inputs.mergedSha }}

-      - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5
+      - uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6

      # TODO: Figure out how to best enable caching for the treefmt job. Cachix won't work well,
      # because the cache would be invalidated on every commit - treefmt checks every file.
@@ -70,7 +70,7 @@ jobs:
        with:
          merged-as-untrusted-at: ${{ inputs.mergedSha }}

-      - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5
+      - uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6

      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
        continue-on-error: true
@@ -100,7 +100,7 @@ jobs:
          merged-as-untrusted-at: ${{ inputs.mergedSha }}
          target-as-trusted-at: ${{ inputs.targetSha }}

-      - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5
+      - uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6

      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
        continue-on-error: true
@@ -7984,12 +7984,6 @@
    github = "EmanuelM153";
    githubId = 134736553;
  };
-  emattiza = {
-    email = "nix@mattiza.dev";
-    github = "emattiza";
-    githubId = 11719476;
-    name = "Evan Mattiza";
-  };
  embr = {
    email = "hi@liclac.eu";
    github = "liclac";
@@ -21,26 +21,26 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
      sources = {
        "x86_64-linux" = {
          arch = "linux-x64";
-          hash = "sha256-cn/GLWORkVa/mJRdpV5jqOm5iFW1QFFrTlGPGCzm1/o=";
+          hash = "sha256-6+fMMB8Vgvmi3JO6YMqMiiHWdlq+PfTD1/zemIqf5sw=";
        };
        "aarch64-linux" = {
          arch = "linux-arm64";
-          hash = "sha256-w7RB1WI5Lyn8LkFarIgwSTbuECuLF0wT5ht3jnGO+9A=";
+          hash = "sha256-HA2I2+4F5NSLWJJpArTDcEHIAJShARjgomM2GcVwj5Q=";
        };
        "x86_64-darwin" = {
          arch = "darwin-x64";
-          hash = "sha256-XTE03L6SrIGZNaz2/XSKGLp3D45EWeh6RUxgBabURz0=";
+          hash = "sha256-MaclGEzgUAHLV2Fe8O3ex6yjfnM73Clory0n+BVNZIs=";
        };
        "aarch64-darwin" = {
          arch = "darwin-arm64";
-          hash = "sha256-Xq2+C9/g9y+K9s6qIMgUZxyyPaMSLQI31uLyR5dAyww=";
+          hash = "sha256-YR/geLezoi+UPa7Eo0M4wQmRGuHiRTK74BdkGGOxPis=";
        };
      };
    in
    {
      name = "claude-code";
      publisher = "anthropic";
-      version = "2.1.131";
+      version = "2.1.133";
    }
    // sources.${stdenvNoCC.hostPlatform.system}
      or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
@@ -27,24 +27,24 @@ let
    ''
      ${acc}
      substituteInPlace pkg/berglas/${goFileName}_test.go \
-        --replace "TestClient_${testName}_storage" "SkipClient_${testName}_storage" \
-        --replace "TestClient_${testName}_secretManager" "SkipClient_${testName}_secretManager"
+        --replace-fail "TestClient_${testName}_storage" "SkipClient_${testName}_storage" \
+        --replace-fail "TestClient_${testName}_secretManager" "SkipClient_${testName}_secretManager"
    ''
  ) "" (builtins.attrNames skipTests);
 in

 buildGoModule (finalAttrs: {
  pname = "berglas";
-  version = "2.0.11";
+  version = "2.0.12";

  src = fetchFromGitHub {
    owner = "GoogleCloudPlatform";
    repo = "berglas";
    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-NIAnVjZZKey+XFxS1jryr4cWEmjtznXaLc1DZJldjxY=";
+    sha256 = "sha256-4Y53psmHpe1JmTKfvOS5f0VHCp/GuC4kDWiHWl5ty3Q=";
  };

-  vendorHash = "sha256-I0Tdjw9cd9eufEwnxC4E0tB7KPE7jQKJPrUQbFgqQVI=";
+  vendorHash = "sha256-Bz+4hlT5ZqpDnquGirooyFMG8FNUU2NO60Ih3Et3Y3o=";

  ldflags = [
    "-s"
@@ -25,11 +25,11 @@ let
    {
      x86_64-linux = {
        name = "BombSquad_Linux_x86_64";
-        hash = "sha256-VHhDRzB7sSvb3Ou/Sg+PjTKFDG9sKsXueu2qLNfC06k=";
+        hash = "sha256-Su7xEVzgFBl+Q2iFWdIRbyO8lRs8Xd4KabFhycZUVjs=";
      };
      aarch64-linux = {
        name = "BombSquad_Linux_Arm64";
-        hash = "sha256-usrhPOsXkJZk0HCSBIGnc4qdIu2SW7STp6Y/e6RmZlM=";
+        hash = "sha256-Q87KbQqwEOaMiJ4uSgZ3eD8AYKQCoJWPzq7rt9Nu9Co=";
      };
    }
    .${stdenv.targetPlatform.system} or (throw "${stdenv.targetPlatform.system} is unsupported.");
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
  # Note: This version trails behind the latest version by one since the latest
  # version sometimes gets replaced for minor updates. The builds in /old/ are
  # stable.
-  version = "1.7.61";
+  version = "1.7.62";

  src = fetchurl {
    url = "https://files.ballistica.net/bombsquad/builds/old/${archive.name}_${finalAttrs.version}.tar.gz";
@@ -89,13 +89,17 @@ stdenv.mkDerivation (finalAttrs: {
    mkdir -p $out/bin $out/libexec $out/share/bombsquad/ba_data

    install -Dm555 -t $out/libexec ${finalAttrs.meta.mainProgram}
+    # x86_64 bundles Discord partner SDK; aarch64 currently does not.
+    if [ -e libdiscord_partner_sdk.so ]; then
+      install -Dm555 -t $out/libexec libdiscord_partner_sdk.so
+    fi
    cp -r ba_data $out/share/bombsquad

    makeWrapper "$out/libexec/${finalAttrs.meta.mainProgram}" "$out/bin/${finalAttrs.meta.mainProgram}" \
      --add-flags ${lib.escapeShellArg commandLineArgs} \
      --add-flags "-d $out/share/bombsquad"

-    install -Dm755 ${bombsquadIcon} $out/share/icons/bombsquad.png
+    install -Dm444 ${bombsquadIcon} $out/share/icons/bombsquad.png

    runHook postInstall
  '';
@@ -31,13 +31,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "cherry-studio";
-  version = "1.9.3";
+  version = "1.9.4";

  src = fetchFromGitHub {
    owner = "CherryHQ";
    repo = "cherry-studio";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-vm1yz0iKErkw/l4cGPedVVaoBGLV0h4O7xA56e3IoqM=";
+    hash = "sha256-+mfetkw5SibvUky/QoUE4+5SL+v8S4JGq9ZlS9q6Uk0=";
  };

  postPatch = ''
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
    inherit (finalAttrs) pname version src;
    inherit pnpm;
    fetcherVersion = 3;
-    hash = "sha256-cBZymB2eI93ui8rdQzBibdf44lXJC/KGwoz0EyeOk2A=";
+    hash = "sha256-6zbnWaeSzvK1NDCXIySS54Pq6siBCuBRJkMa7/NAt1k=";
  };

  nativeBuildInputs = [
@@ -1,47 +1,47 @@
 {
-  "version": "2.1.131",
-  "commit": "c122cd1bd5247f2a4bde8bcaec712fb1dff247e8",
-  "buildDate": "2026-05-06T06:18:01Z",
+  "version": "2.1.133",
+  "commit": "cba57ffec4f5d5c279b5f66ea9d7a2544fa410ec",
+  "buildDate": "2026-05-07T18:34:30Z",
  "platforms": {
    "darwin-arm64": {
      "binary": "claude",
-      "checksum": "cc6066b0db7bb423c75316366542f771a41923999a76a5771afad87dd65dceae",
-      "size": 217349888
+      "checksum": "d38f34444911c86c73f32beb82821008b26be889fa0d0caf7085580cf5737e14",
+      "size": 204170768
    },
    "darwin-x64": {
      "binary": "claude",
-      "checksum": "a1bd2c782c3f961987d7d6456f75b3fa538cc425f1573908850afedcb038ca5f",
-      "size": 218914128
+      "checksum": "b16758680c3bb1e0f8a867e31f9df84e8df2473b0693e811f0b29b465d2e64c3",
+      "size": 206672560
    },
    "linux-arm64": {
      "binary": "claude",
-      "checksum": "0919cdf512ca673b38230882b458801b78e9248eb472383631cfc12d8d0d55cf",
-      "size": 249367104
+      "checksum": "dcc7275f9198317e073c329abe174827604a801e9bfb577a00d86efcf4f8167c",
+      "size": 229619336
    },
    "linux-x64": {
      "binary": "claude",
-      "checksum": "9af15b9302ffde3fa83e3ea4a41cdd00158301cd8badc755567a8e9149f1c36c",
-      "size": 249178752
+      "checksum": "d0ddf0aee6e4426a705719e5d4716e3ce3cb38f9a5fe06eb6d5ffcef6c98832a",
+      "size": 229701328
    },
    "linux-arm64-musl": {
      "binary": "claude",
-      "checksum": "78ffce2cad108ef1ca3301fc34307277b8a98e4095344b091b84be1678bd6ebc",
-      "size": 242092416
+      "checksum": "fd8370f93bb41b4018b7ec26f421368c25630e42129882e9c6ae6b719d595330",
+      "size": 222474072
    },
    "linux-x64-musl": {
      "binary": "claude",
-      "checksum": "f712c043f6df7552b95d30d256ebc4feb9c3a642f04b0e823719b524e3128939",
-      "size": 243444096
+      "checksum": "9dedf83f3e367bcd306e80a47c06f70234e02e38846096f39d84a0131d7a5320",
+      "size": 224095280
    },
    "win32-x64": {
      "binary": "claude.exe",
-      "checksum": "49204d250c5fe1797f74bc68f305016e72b356b06fe7ff1f8a651f7ad6a0df8b",
-      "size": 255085216
+      "checksum": "ba4c41963ed7d6567dfec0e7b252cdbc02f17a4f7c0a9e69ca2d7ccb9e94016e",
+      "size": 225659552
    },
    "win32-arm64": {
      "binary": "claude.exe",
-      "checksum": "d1b1336200468b5e29a0e4cc8c1dfc5c79d01f11118d8594756243bb6102dc40",
-      "size": 251148960
+      "checksum": "389d5e7bc9d4bf3f1909c60be63fccc93cc824d7c691638418a5904ce675afbd",
+      "size": 221617824
    }
  }
 }
@@ -11,9 +11,9 @@
  librusty_v8 ? callPackage ./librusty_v8.nix { },
 }:
 let
-  # codex-acp 0.12.0 pins openai/codex rust-v0.124.0 in Cargo.lock.
-  codexRev = "e9fb49366c93a1478ec71cc41ecee415a197d036";
-  codexHash = "sha256-YFnzzwCm9/b30qLDMbkf/rEizuTjeqdCgoBZeS0wNBo=";
+  # codex-acp 0.13.0 pins openai/codex rust-v0.128.0 in Cargo.lock.
+  codexRev = "e4310be51f617f5e60382038fa9cbf53a2429ca4";
+  codexHash = "sha256-v2W0eslPOPHxHX76+bnkE/f4y+MnQuopeOoAC5X16TA=";
  codexSrc = fetchFromGitHub {
    owner = "openai";
    repo = "codex";
@@ -23,21 +23,23 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "codex-acp";
-  version = "0.12.0";
+  version = "0.13.0";

  src = fetchFromGitHub {
    owner = "zed-industries";
    repo = "codex-acp";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-qPqg95FpXHBtyHBJtrfJUwu9GokfmOJgKgqLKQ48u+8=";
+    hash = "sha256-8Mz3xPhGSjaucZ9c0etGOe4JJC8vJhGFOnAhkwXmhyY=";
  };

-  cargoHash = "sha256-/BZ82qiTy/mPwhf5v5CFrNSB6AxCRFdmHB72L0+KjJw=";
+  cargoHash = "sha256-kneMay6MGXhHA0q/usKsLFs/YKmdSHmrgSthzhaPgbk=";

-  # fetchCargoVendor only keeps the individual git crate subtrees, so restore
-  # the workspace-root file that codex-core includes via ../../../../node-version.txt.
+  # fetchCargoVendor only keeps the individual git crate subtrees. Older Codex
+  # crates included this workspace-root file from codex-core.
  postPatch = ''
-    cp ${codexSrc}/codex-rs/node-version.txt "$cargoDepsCopy/source-git-0/node-version.txt"
+    if [ -e ${codexSrc}/codex-rs/node-version.txt ]; then
+      cp ${codexSrc}/codex-rs/node-version.txt "$cargoDepsCopy/source-git-0/node-version.txt"
+    fi
  '';

  env = {
@@ -88,7 +88,15 @@ update_codex_pins() {
  local tmp
  tmp="$(mktemp)"

-  awk -v codex_rev="$CODEX_REV" -v codex_hash="$CODEX_HASH" '
+  awk \
+    -v latest_version="$latest_version" \
+    -v codex_tag="$CODEX_TAG" \
+    -v codex_rev="$CODEX_REV" \
+    -v codex_hash="$CODEX_HASH" '
+    /# codex-acp [^ ]+ pins openai\/codex rust-v[0-9.]+ in Cargo.lock\./ {
+      comment_count++
+      sub(/# codex-acp [^ ]+ pins openai\/codex rust-v[0-9.]+ in Cargo.lock\./, "# codex-acp " latest_version " pins openai/codex " codex_tag " in Cargo.lock.")
+    }
    /codexRev = "[0-9a-f]+";/ {
      rev_count++
      sub(/codexRev = "[0-9a-f]+";/, "codexRev = \"" codex_rev "\";")
@@ -99,6 +107,10 @@ update_codex_pins() {
    }
    { print }
    END {
+      if (comment_count != 1) {
+        print "Failed to update codex pin comment in package.nix" > "/dev/stderr"
+        exit 1
+      }
      if (rev_count != 1) {
        print "Failed to update codexRev in package.nix" > "/dev/stderr"
        exit 1
@@ -11,19 +11,19 @@

 buildGoModule (finalAttrs: {
  pname = "coroot";
-  version = "1.17.9";
+  version = "1.19.7";

  src = fetchFromGitHub {
    owner = "coroot";
    repo = "coroot";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-hr1t3WaYEOYnj3Cam2NGgiGD49Vr9HBkz4JmOlJxzQQ=";
+    hash = "sha256-eMN0n+kXN49o7oCjWAa3kPDAEksvGroRLrfFEVdPORE=";
  };

  vendorHash = "sha256-DCdrE8UYkuUN+rUuxVSGbAnAeLivZ2Xp8xjM+56ZF+A=";
  npmDeps = fetchNpmDeps {
    src = "${finalAttrs.src}/front";
-    hash = "sha256-6a8eOPgAdpZpdXmrHVw/twfikjjWHSy/BdYdlyRQkjc=";
+    hash = "sha256-5N4dmtKdZgwulqxFHYKhnHOYAg0gnb/rzVVcmzjYFUg=";
  };

  nativeBuildInputs = [
@@ -43,6 +43,9 @@ buildGoModule (finalAttrs: {
    npm --prefix="$npmRoot" run build-prod
  '';

+  # required for tests
+  __darwinAllowLocalNetworking = true;
+
  meta = {
    description = "Open-source APM & Observability tool";
    homepage = "https://coroot.com";
@@ -1,7 +1,7 @@
 {
  lib,
  stdenv,
-  fetchurl,
+  fetchFromGitHub,
  intltool,
  pkg-config,
  glib,
@@ -12,11 +12,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "devilspie2";
-  version = "0.44";
+  version = "0.45";

-  src = fetchurl {
-    url = "mirror://savannah/devilspie2/devilspie2-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Cp8erdKyKjGBY+QYAGXUlSIboaQ60gIepoZs0RgEJkA=";
+  src = fetchFromGitHub {
+    owner = "dsalt";
+    repo = "devilspie2";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-3TLA4vvTY8nt2LupLH8btdGhz7mfWYHnwRf7lQKGq8A=";
  };

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

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "distrobox";
-  version = "1.8.2.4";
+  version = "1.8.2.5";

  src = fetchFromGitHub {
    owner = "89luca89";
    repo = "distrobox";
    tag = finalAttrs.version;
-    hash = "sha256-bttJFHgmZgN0p6eT7vGzz2DsrrUgB+uGnnPz2Ep+eB4=";
+    hash = "sha256-sqMtB5THrspxkapB8eBfb9LNEnghE0UolivOvOEf7cs=";
  };

  dontConfigure = true;
@@ -1,19 +1,19 @@
 {
-  "@rolldown/binding-android-arm64@npm:1.0.0-rc.15": "0c78d6321d2dedc0c6ed4b5541328f6c04e8530a3c294b477cd9741e2af7c8377a51474f0171c85ecf63bff5c8bb31ee586f40f13fa265a869247ec3d6293204",
-  "@rolldown/binding-darwin-arm64@npm:1.0.0-rc.15": "598b8cb87d8ba8df4e880e0d6903f7f4f32b3e7b2804429cb3ccc47a69b8e7b852b2e3115a8c3a882d14979909f9464e8da55c2c52a52cb18a81df7e8a1aa654",
-  "@rolldown/binding-darwin-x64@npm:1.0.0-rc.15": "92fdfa58a8d9edaec4c1766c38c34f657715d2c8faec141590812d11ba6a6ce52530e55a6a2515fcd2ec6287e50187a458f06ca3c6813130cb9869a99c9f6f29",
-  "@rolldown/binding-freebsd-x64@npm:1.0.0-rc.15": "04e8288accf007c82e8bbe75af62d4ed570bddd7b25a178506fcf97daa0907cf6f85ea095be5826095242ac1a4923196059f53a9e8fdd0e3c34d9ed1c00d64ae",
-  "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-rc.15": "4cd7452e4fe4433b730585bcbaf210efc50621bca5906204179ffe80748bea187398d4091dae64079f0c7ebfea1987f0b1c045ff60209ab0f60be9e04eccbef7",
-  "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-rc.15": "fbddea791134b45a94aa5aea640a177d6feacd81a44f9ee3615da3daa824dc2a193ced6e8f2a0bb0676fca7b224525513b451cd8f78b379d7b1983fe6a0360ff",
-  "@rolldown/binding-linux-arm64-musl@npm:1.0.0-rc.15": "b325fa98753bf41100c5d95145f30ce92b5f69f6989973306344b1644fb21633454aa216f28355c74d0e7bd5885bb6d2c80d0f96dcc2b869ca7e63d8b22dbe91",
-  "@rolldown/binding-linux-ppc64-gnu@npm:1.0.0-rc.15": "0bff0d2724912079dcedfbc0a86dbad8e3e376d2d619cf36917964701b9ae5a39afa5ff49d3cb5b2c3e17437c559314cf8e17433ad3bfb4b64229d9c8bf1ebca",
-  "@rolldown/binding-linux-s390x-gnu@npm:1.0.0-rc.15": "6718fd91ead389f3bdefe22fd0344b490d3f9350697e4aa35a0fb55957aa1b127d26aaecf9bc2d49f1dfde62d9d4717cf5dfb7d93ce3b871372ef9c6cb7a1b1a",
-  "@rolldown/binding-linux-x64-gnu@npm:1.0.0-rc.15": "cb7628e1a7398ab5fd07dc79a38c73a27524d45adc989b5d906ea37e23b7692123d607d07fb9fda35485d6caba545ae41c561b9632aefa0bff76997208f83eae",
-  "@rolldown/binding-linux-x64-musl@npm:1.0.0-rc.15": "f59fb354b8cac55d123f6f3fe7bf8210402f97ed4be3f3a883c6c544ce1b825e36154f479d45f6e9f23c1fcd8861e9f3873dc24278631db871d263db3bea5580",
-  "@rolldown/binding-openharmony-arm64@npm:1.0.0-rc.15": "b6c220a48ace9c381d238dce2caaa8453da1d3fe9312bab7babf127a500bdec2bbe30bd381f9945af79c30fe9ca0185108b86ef311fc83ecb83ef24f7a587902",
-  "@rolldown/binding-wasm32-wasi@npm:1.0.0-rc.15": "9cd39e02ad5f43fc45901d074df10c0e3532d9077a6e334e431de60f90555c15e5445d1b5156c10df49d28839f9f15d5d808666bc8e70ab065bb9af3b8567e7a",
-  "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-rc.15": "cfc32a72e8a3900f356b0b359520df3f18ac79379a273a4c53b00b1555123dcfd8204cf9976762664898b0c6c949c0edd4be850ae254d2e84a40fcb8352858eb",
-  "@rolldown/binding-win32-x64-msvc@npm:1.0.0-rc.15": "f0bd2876247f0834f135c1ae150b7d5626d54ff399b4a6193626dc46a0eca22374a43c64afdf3eff8e8e9cf1f20df826bcd9fd4219df3fece03972b8ae080e20",
+  "@rolldown/binding-android-arm64@npm:1.0.0-rc.17": "7c821eb984e2dd03b05979be3116d927326a1752e7d04462f6c78721fc47fb33d1a584e8c739b181dbfb5c28170541d05f775ada38e81bb685e43d03d974abe3",
+  "@rolldown/binding-darwin-arm64@npm:1.0.0-rc.17": "ddedec6840b8e32b7c45a4afe9d797bb24ea74ef222a1b443161045f0b53ec3a5752b108552fe6c99182e2553dd53498d96d3b30551cd3f1e8057559f23b1ed7",
+  "@rolldown/binding-darwin-x64@npm:1.0.0-rc.17": "b66ce82e3162261c045027b3aa061cd735c9b1395e77756e06b973f8d0e4256247ddfdb7ee8134363dfcd9d83e665b647b45b666a65c8454babdee19f6d57b40",
+  "@rolldown/binding-freebsd-x64@npm:1.0.0-rc.17": "87b9045771edda717c7d66df105bba2c22c88214254eae48d54ca641f79b4558c2d1ae3db27d8e36b230728263d539c5f6e03e895dbed6e08afa495f634eb42d",
+  "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-rc.17": "43e60168d359a5edae352d948a6515c40a8e047fef7541693cbf18a09d80076efb9308a804c5ea7f645883f8f6b7b43e0e14ea677df63fb4016a55ba6f63b947",
+  "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-rc.17": "d6bfe49089d598886e8c9c92e45240a2404e9594c4abc25f303c8655b859e0f0b67c18947e23177ccc5fb81c9b22a1bd32f2ed052531cc41491b4261ed728342",
+  "@rolldown/binding-linux-arm64-musl@npm:1.0.0-rc.17": "be5459bf78de0931993158783af8e349a68d03610876eb131f48fa51414a45683047cd9b4ad7631f385fedc9bb89677e8d12e874104a038b63932aaa1d7bceb3",
+  "@rolldown/binding-linux-ppc64-gnu@npm:1.0.0-rc.17": "e36194c8a39afc6522ca71c2ebf4c038792bf2c0141da76e8a385bebdda077a52f95ece9bd0a3818d5c0023e7e8ce708566d42ecd2ff31296a26a41ed6847aa4",
+  "@rolldown/binding-linux-s390x-gnu@npm:1.0.0-rc.17": "288ce91c69b13e37b2106fcfb663a981aba9de65d3bb4d3cd8c17b9e8193f3de44d08d1201c4d3a18fdeec5a89256d5b3b4d5bb913ff023cb577c403f8889917",
+  "@rolldown/binding-linux-x64-gnu@npm:1.0.0-rc.17": "d532e43e02e0a84c71ff9be34791d7b32b71786bac4921f9e4f92da39a7d5daeabeb4188c7cc088a8a80ab0691dcf1cc9d414396ce7ff6a970b1374e033df8f6",
+  "@rolldown/binding-linux-x64-musl@npm:1.0.0-rc.17": "56aecbe0a2aeaedd558c62a5057a7f915ecada0528a27b5edd80478d948c3645104a56c88121c71edefe9a6af7500f053724103099a90764eb8b84c3ee1f9536",
+  "@rolldown/binding-openharmony-arm64@npm:1.0.0-rc.17": "cc7a806e106f4c0d24400af42155b8b396f712e25d76e13b033895b3b635e21edb2246d3c8592c86989c7aaae1ded1708d36516472555bbed3ccaffc939403a4",
+  "@rolldown/binding-wasm32-wasi@npm:1.0.0-rc.17": "e6fb0aff901de475a4874af6b0473b396bf1bddf6cbb9acbdb6d4c9318ab2fa3e09d80435ecaeb7866b03effea79c57db9a271b5c720007341949e06828c8385",
+  "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-rc.17": "d3724ce9f4117d28f903ae1bfc34e3a3efac853691577e511cef91259eb8355dc24f2f27a832bbbd9ad3323dc1b0c3ddbdc4c791ae2a6dd5e5b0c9051384d4d0",
+  "@rolldown/binding-win32-x64-msvc@npm:1.0.0-rc.17": "6f4a348202955f74481ccf1c0ec5fa96671507353b6a7f680b920c773f0dda4ebd46c1561428efcefacb9b4d279cd550c80a79fa261f8db173b527ae9a671eca",
  "lightningcss-android-arm64@npm:1.32.0": "1cb326ad39dcb02cf9f45025c167b6900e3a04b08f5149d3c5ee26054b00d08db3736fb69183a6c3ed1cb32dddd148608c784b6631b4777623f7dd0c032c392d",
  "lightningcss-darwin-arm64@npm:1.32.0": "da954d0c215d0e95f15a92c8717f871017586e1332b98fd40e96196571d2fd3d51a727dc530768afee9f6a04da210510740574dd0c8dbf2ecced79e5996f1a06",
  "lightningcss-darwin-x64@npm:1.32.0": "b1d298c9173f839e8447d1917ed8bc5ab098ed0fc4e4b419d36ac5afe8b27bf21cb47d00a35c3d2edadcac598086e9b4f26c992a809d79f9681d6865a230d79e",
@@ -16,19 +16,19 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "dokieli";
-  version = "0-unstable-2026-04-27";
+  version = "0-unstable-2026-05-08";

  src = fetchFromGitHub {
    owner = "dokieli";
    repo = "dokieli";
-    rev = "4d0ad172bb02245d93abb3290a51e9743a880876";
-    hash = "sha256-Xkj2H5a5uTqGpOuLPo5BLM7vEGx5eaznX1w0CiNQFZA=";
+    rev = "f0372663098582c0310c9e16918a55cf000fbaf1";
+    hash = "sha256-jpIQcE1GdjvEsk6HPxjdFLbrxGWvVCaaG7T08HdMj7Y=";
  };

  missingHashes = ./missing-hashes.json;
  offlineCache = yarn-berry.fetchYarnBerryDeps {
    inherit (finalAttrs) src missingHashes;
-    hash = "sha256-3FyctNQ8pDvJ559SJvAJZjn49wptfB5Q5Takk51oqMQ=";
+    hash = "sha256-SEoYmh7oHmJrVhShOjRyaClyQxW9S96GCI3ggRkW+6U=";
  };

  buildPhase = ''
@@ -26,7 +26,6 @@ buildGoModule (finalAttrs: {

  ldflags = [
    "-s"
-    "-w"
    "-X=github.com/entireio/cli/cmd/entire/cli/versioninfo.Version=${finalAttrs.version}"
    "-X=github.com/entireio/cli/cmd/entire/cli/versioninfo.Commit=${finalAttrs.src.rev}"
  ];
@@ -55,9 +54,10 @@ buildGoModule (finalAttrs: {
      of how code was written in your repo.
    '';
    homepage = "https://github.com/entireio/cli";
-    changelog = "https://github.com/entireio/cli/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/entireio/cli/blob/${finalAttrs.src.tag}/CHANGELOG.md";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [
+      iamanaws
      sheeeng
      squishykid
    ];
@@ -1,12 +1,12 @@
 {
  "name": "eslint",
-  "version": "10.2.1",
+  "version": "10.3.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "eslint",
-      "version": "10.2.1",
+      "version": "10.3.0",
      "license": "MIT",
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.8.0",
@@ -52,7 +52,7 @@
        "@eslint/json": "^1.2.0",
        "@types/esquery": "^1.5.4",
        "@types/node": "^22.13.14",
-        "@typescript-eslint/parser": "^8.56.0",
+        "@typescript-eslint/parser": "^8.58.2",
        "babel-loader": "^8.0.5",
        "c8": "^11.0.0",
        "chai": "^4.0.1",
@@ -91,7 +91,7 @@
        "mocha": "^11.7.1",
        "node-polyfill-webpack-plugin": "^1.0.3",
        "npm-license": "^0.3.3",
-        "prettier": "3.8.2",
+        "prettier": "3.8.3",
        "progress": "^2.0.3",
        "proxyquire": "^2.0.1",
        "recast": "^0.23.0",
@@ -99,7 +99,7 @@
        "semver": "^7.5.3",
        "shelljs": "^0.10.0",
        "sinon": "^11.0.0",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
        "webpack": "^5.23.0",
        "webpack-cli": "^4.5.0",
        "yorkie": "^2.0.0"
@@ -252,9 +252,9 @@
      }
    },
    "node_modules/@babel/compat-data": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.0.tgz",
-      "integrity": "sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==",
+      "version": "7.29.3",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.3.tgz",
+      "integrity": "sha512-LIVqM46zQWZhj17qA8wb4nW/ixr2y1Nw+r1etiAWgRM6U1IqP+LNhL1yg440jYZR72jCWcWbLWzIosH+uP1fqg==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -377,9 +377,9 @@
      "license": "ISC"
    },
    "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.28.6.tgz",
-      "integrity": "sha512-dTOdvsjnG3xNT9Y0AUg1wAl38y+4Rl4sf9caSQZOXdNqVn+H+HbbJ4IyyHaIqNR6SW9oJpA/RuRjsjCw2IdIow==",
+      "version": "7.29.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.29.3.tgz",
+      "integrity": "sha512-RpLYy2sb51oNLjuu1iD3bwBqCBWUzjO0ocp+iaCP/lJtb2CPLcnC2Fftw+4sAzaMELGeWTgExSKADbdo0GFVzA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -388,7 +388,7 @@
        "@babel/helper-optimise-call-expression": "^7.27.1",
        "@babel/helper-replace-supers": "^7.28.6",
        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
-        "@babel/traverse": "^7.28.6",
+        "@babel/traverse": "^7.29.0",
        "semver": "^6.3.1"
      },
      "engines": {
@@ -642,9 +642,9 @@
      }
    },
    "node_modules/@babel/parser": {
-      "version": "7.29.2",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.2.tgz",
-      "integrity": "sha512-4GgRzy/+fsBa72/RZVJmGKPmZu9Byn8o4MoLpmNe1m8ZfYnz5emHLQz3U4gLud6Zwl0RZIcgiLD7Uq7ySFuDLA==",
+      "version": "7.29.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.3.tgz",
+      "integrity": "sha512-b3ctpQwp+PROvU/cttc4OYl4MzfJUWy6FZg+PMXfzmt/+39iHVF0sDfqay8TQM3JA2EUOyKcFZt75jWriQijsA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -706,6 +706,23 @@
        "@babel/core": "^7.0.0"
      }
    },
+    "node_modules/@babel/plugin-bugfix-safari-rest-destructuring-rhs-array": {
+      "version": "7.29.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-rest-destructuring-rhs-array/-/plugin-bugfix-safari-rest-destructuring-rhs-array-7.29.3.tgz",
+      "integrity": "sha512-SRS46DFR4HqzUzCVgi90/xMoL+zeBDBvWdKYXSEzh79kXswNFEglUpMKxR04//dPqwYXWUBJ3mpUd933ru9Kmg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
      "version": "7.27.1",
      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.27.1.tgz",
@@ -1660,19 +1677,20 @@
      }
    },
    "node_modules/@babel/preset-env": {
-      "version": "7.29.2",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.29.2.tgz",
-      "integrity": "sha512-DYD23veRYGvBFhcTY1iUvJnDNpuqNd/BzBwCvzOTKUnJjKg5kpUBh3/u9585Agdkgj+QuygG7jLfOPWMa2KVNw==",
+      "version": "7.29.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.29.3.tgz",
+      "integrity": "sha512-ySZypNLAIH1ClygLDQzVMoGQRViATnkHkYYV6TcNDz+8+jwZCdsguGvsb3EY5d9wyWyhmF1iSuFM0Yh5XPnqSA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@babel/compat-data": "^7.29.0",
+        "@babel/compat-data": "^7.29.3",
        "@babel/helper-compilation-targets": "^7.28.6",
        "@babel/helper-plugin-utils": "^7.28.6",
        "@babel/helper-validator-option": "^7.27.1",
        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.28.5",
        "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.27.1",
        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.27.1",
+        "@babel/plugin-bugfix-safari-rest-destructuring-rhs-array": "^7.29.3",
        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.27.1",
        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.28.6",
        "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
@@ -2679,9 +2697,9 @@
      }
    },
    "node_modules/@loaderkit/resolve": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@loaderkit/resolve/-/resolve-1.0.4.tgz",
-      "integrity": "sha512-rJzYKVcV4dxJv+vW6jlvagF8zvGxHJ2+HTr1e2qOejfmGhAApgJHl8Aog4mMszxceTRiKTTbnpgmTO1bEZHV/A==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@loaderkit/resolve/-/resolve-1.0.5.tgz",
+      "integrity": "sha512-fhkdGM57xhJ7CO91MUgbQlb0ClP0AJ9vB3yoVnBTslYJqrJOCVEbOprZcxZlexdMbmTBPQqVcQYr+j4oRRtIZA==",
      "dev": true,
      "license": "ISC",
      "dependencies": {
@@ -3397,16 +3415,16 @@
      }
    },
    "node_modules/@typescript-eslint/parser": {
-      "version": "8.59.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.59.0.tgz",
-      "integrity": "sha512-TI1XGwKbDpo9tRW8UDIXCOeLk55qe9ZFGs8MTKU6/M08HWTw52DD/IYhfQtOEhEdPhLMT26Ka/x7p70nd3dzDg==",
+      "version": "8.59.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.59.1.tgz",
+      "integrity": "sha512-HDQH9O/47Dxi1ceDhBXdaldtf/WV9yRYMjbjCuNk3qnaTD564qwv61Y7+gTxwxRKzSrgO5uhtw584igXVuuZkA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/scope-manager": "8.59.0",
-        "@typescript-eslint/types": "8.59.0",
-        "@typescript-eslint/typescript-estree": "8.59.0",
-        "@typescript-eslint/visitor-keys": "8.59.0",
+        "@typescript-eslint/scope-manager": "8.59.1",
+        "@typescript-eslint/types": "8.59.1",
+        "@typescript-eslint/typescript-estree": "8.59.1",
+        "@typescript-eslint/visitor-keys": "8.59.1",
        "debug": "^4.4.3"
      },
      "engines": {
@@ -3422,14 +3440,14 @@
      }
    },
    "node_modules/@typescript-eslint/project-service": {
-      "version": "8.59.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.59.0.tgz",
-      "integrity": "sha512-Lw5ITrR5s5TbC19YSvlr63ZfLaJoU6vtKTHyB0GQOpX0W7d5/Ir6vUahWi/8Sps/nOukZQ0IB3SmlxZnjaKVnw==",
+      "version": "8.59.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.59.1.tgz",
+      "integrity": "sha512-+MuHQlHiEr00Of/IQbE/MmEoi44znZHbR/Pz7Opq4HryUOlRi+/44dro9Ycy8Fyo+/024IWtw8m4JUMCGTYxDg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.59.0",
-        "@typescript-eslint/types": "^8.59.0",
+        "@typescript-eslint/tsconfig-utils": "^8.59.1",
+        "@typescript-eslint/types": "^8.59.1",
        "debug": "^4.4.3"
      },
      "engines": {
@@ -3444,14 +3462,14 @@
      }
    },
    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.59.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.59.0.tgz",
-      "integrity": "sha512-UzR16Ut8IpA3Mc4DbgAShlPPkVm8xXMWafXxB0BocaVRHs8ZGakAxGRskF7FId3sdk9lgGD73GSFaWmWFDE4dg==",
+      "version": "8.59.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.59.1.tgz",
+      "integrity": "sha512-LwuHQI4pDOYVKvmH2dkaJo6YZCSgouVgnS/z7yBPKBMvgtBvyLqiLy9Z6b7+m/TRcX1NFYUqZetI5Y+aT4GEfg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/types": "8.59.0",
-        "@typescript-eslint/visitor-keys": "8.59.0"
+        "@typescript-eslint/types": "8.59.1",
+        "@typescript-eslint/visitor-keys": "8.59.1"
      },
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3462,9 +3480,9 @@
      }
    },
    "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.59.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.59.0.tgz",
-      "integrity": "sha512-91Sbl3s4Kb3SybliIY6muFBmHVv+pYXfybC4Oolp3dvk8BvIE3wOPc+403CWIT7mJNkfQRGtdqghzs2+Z91Tqg==",
+      "version": "8.59.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.59.1.tgz",
+      "integrity": "sha512-/0nEyPbX7gRsk0Uwfe4ALwwgxuA66d/l2mhRDNlAvaj4U3juhUtJNq0DsY8M2AYwwb9rEq2hrC3IcIcEt++iJA==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -3479,9 +3497,9 @@
      }
    },
    "node_modules/@typescript-eslint/types": {
-      "version": "8.59.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.59.0.tgz",
-      "integrity": "sha512-nLzdsT1gdOgFxxxwrlNVUBzSNBEEHJ86bblmk4QAS6stfig7rcJzWKqCyxFy3YRRHXDWEkb2NralA1nOYkkm/A==",
+      "version": "8.59.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.59.1.tgz",
+      "integrity": "sha512-ZDCjgccSdYPw5Bxh+my4Z0lJU96ZDN7jbBzvmEn0FZx3RtU1C7VWl6NbDx94bwY3V5YsgwRzJPOgeY2Q/nLG8A==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -3493,16 +3511,16 @@
      }
    },
    "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.59.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.59.0.tgz",
-      "integrity": "sha512-O9Re9P1BmBLFJyikRbQpLku/QA3/AueZNO9WePLBwQrvkixTmDe8u76B6CYUAITRl/rHawggEqUGn5QIkVRLMw==",
+      "version": "8.59.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.59.1.tgz",
+      "integrity": "sha512-OUd+vJS05sSkOip+BkZ/2NS8RMxrAAJemsC6vU3kmfLyeaJT0TftHkV9mcx2107MmsBVXXexhVu4F0TZXyMl4g==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/project-service": "8.59.0",
-        "@typescript-eslint/tsconfig-utils": "8.59.0",
-        "@typescript-eslint/types": "8.59.0",
-        "@typescript-eslint/visitor-keys": "8.59.0",
+        "@typescript-eslint/project-service": "8.59.1",
+        "@typescript-eslint/tsconfig-utils": "8.59.1",
+        "@typescript-eslint/types": "8.59.1",
+        "@typescript-eslint/visitor-keys": "8.59.1",
        "debug": "^4.4.3",
        "minimatch": "^10.2.2",
        "semver": "^7.7.3",
@@ -3521,16 +3539,16 @@
      }
    },
    "node_modules/@typescript-eslint/utils": {
-      "version": "8.59.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.59.0.tgz",
-      "integrity": "sha512-I1R/K7V07XsMJ12Oaxg/O9GfrysGTmCRhvZJBv0RE0NcULMzjqVpR5kRRQjHsz3J/bElU7HwCO7zkqL+MSUz+g==",
+      "version": "8.59.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.59.1.tgz",
+      "integrity": "sha512-3pIeoXhCeYH9FSCBI8P3iNwJlGuzPlYKkTlen2O9T1DSeeg8UG8jstq6BLk+Mda0qup7mgk4z4XL4OzRaxZ8LA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.9.1",
-        "@typescript-eslint/scope-manager": "8.59.0",
-        "@typescript-eslint/types": "8.59.0",
-        "@typescript-eslint/typescript-estree": "8.59.0"
+        "@typescript-eslint/scope-manager": "8.59.1",
+        "@typescript-eslint/types": "8.59.1",
+        "@typescript-eslint/typescript-estree": "8.59.1"
      },
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3545,13 +3563,13 @@
      }
    },
    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.59.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.59.0.tgz",
-      "integrity": "sha512-/uejZt4dSere1bx12WLlPfv8GktzcaDtuJ7s42/HEZ5zGj9oxRaD4bj7qwSunXkf+pbAhFt2zjpHYUiT5lHf0Q==",
+      "version": "8.59.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.59.1.tgz",
+      "integrity": "sha512-LdDNl6C5iJExcM0Yh0PwAIBb9PrSiCsWamF/JyEZawm3kFDnRoaq3LGE4bpyRao/fWeGKKyw7icx0YxrLFC5Cg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/types": "8.59.0",
+        "@typescript-eslint/types": "8.59.1",
        "eslint-visitor-keys": "^5.0.0"
      },
      "engines": {
@@ -3842,9 +3860,9 @@
      }
    },
    "node_modules/ajv": {
-      "version": "6.14.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz",
-      "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==",
+      "version": "6.15.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.15.0.tgz",
+      "integrity": "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==",
      "license": "MIT",
      "dependencies": {
        "fast-deep-equal": "^3.1.1",
@@ -3876,9 +3894,9 @@
      }
    },
    "node_modules/ajv-formats/node_modules/ajv": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
-      "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz",
+      "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -4295,9 +4313,9 @@
      "license": "MIT"
    },
    "node_modules/baseline-browser-mapping": {
-      "version": "2.10.21",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.21.tgz",
-      "integrity": "sha512-Q+rUQ7Uz8AHM7DEaNdwvfFCTq7a43lNTzuS94eiWqwyxfV/wJv+oUivef51T91mmRY4d4A1u9rcSvkeufCVXlA==",
+      "version": "2.10.25",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.25.tgz",
+      "integrity": "sha512-QO/VHsXCQdnzADMfmkeOPvHdIAkoB7i0/rGjINPJEetLx75hNttVWGQ/jycHUDP9zZ9rupbm60WRxcwViB0MiA==",
      "dev": true,
      "license": "Apache-2.0",
      "bin": {
@@ -4787,9 +4805,9 @@
      }
    },
    "node_modules/caniuse-lite": {
-      "version": "1.0.30001790",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001790.tgz",
-      "integrity": "sha512-bOoxfJPyYo+ds6W0YfptaCWbFnJYjh2Y1Eow5lRv+vI2u8ganPZqNm1JwNh0t2ELQCqIWg4B3dWEusgAmsoyOw==",
+      "version": "1.0.30001791",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001791.tgz",
+      "integrity": "sha512-yk0l/YSrOnFZk3UROpDLQD9+kC1l4meK/wed583AXrzoarMGJcbRi2Q4RaUYbKxYAsZ8sWmaSa/DsLmdBeI1vQ==",
      "dev": true,
      "funding": [
        {
@@ -6268,9 +6286,9 @@
      }
    },
    "node_modules/electron-to-chromium": {
-      "version": "1.5.343",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.343.tgz",
-      "integrity": "sha512-YHnQ3MXI08icvL9ZKnEBy05F2EQ8ob01UaMOuMbM8l+4UcAq6MPPbBTJBbsBUg3H8JeZNt+O4fjsoWth3p6IFg==",
+      "version": "1.5.349",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.349.tgz",
+      "integrity": "sha512-QsWVGyRuY07Aqb234QytTfwd5d9AJlfNIQ5wIOl1L+PZDzI9d9+Fn0FRale/QYlFxt/bUnB0/nLd1jFPGxGK1A==",
      "dev": true,
      "license": "ISC"
    },
@@ -6346,14 +6364,14 @@
      }
    },
    "node_modules/enhanced-resolve": {
-      "version": "5.20.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.20.1.tgz",
-      "integrity": "sha512-Qohcme7V1inbAfvjItgw0EaxVX5q2rdVEZHRBrEQdRZTssLDGsL8Lwrznl8oQ/6kuTJONLaDcGjkNP247XEhcA==",
+      "version": "5.21.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.21.0.tgz",
+      "integrity": "sha512-otxSQPw4lkOZWkHpB3zaEQs6gWYEsmX4xQF68ElXC/TWvGxGMSGOvoNbaLXm6/cS/fSfHtsEdw90y20PCd+sCA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "graceful-fs": "^4.2.4",
-        "tapable": "^2.3.0"
+        "tapable": "^2.3.3"
      },
      "engines": {
        "node": ">=10.13.0"
@@ -6447,9 +6465,9 @@
      }
    },
    "node_modules/es-module-lexer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.0.0.tgz",
-      "integrity": "sha512-5POEcUuZybH7IdmGsD8wlf0AI55wMecM9rVBTI/qEAy2c1kTOm3DjFYjrBdI2K3BaJjJYfYFeRtM0t9ssnRuxw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.1.0.tgz",
+      "integrity": "sha512-n27zTYMjYu1aj4MjCWzSP7G9r75utsaoc8m61weK+W8JMBGGQybd43GstCXZ3WNmSFtGT9wi59qQTW6mhTR5LQ==",
      "dev": true,
      "license": "MIT"
    },
@@ -8444,14 +8462,17 @@
      }
    },
    "node_modules/install-artifact-from-github": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/install-artifact-from-github/-/install-artifact-from-github-1.4.0.tgz",
-      "integrity": "sha512-+y6WywKZREw5rq7U2jvr2nmZpT7cbWbQQ0N/qfcseYnzHFz2cZz1Et52oY+XttYuYeTkI8Y+R2JNWj68MpQFSg==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/install-artifact-from-github/-/install-artifact-from-github-1.6.0.tgz",
+      "integrity": "sha512-wKsuzN8fy8QK7iEUqyWTQmvZ1QFGPn1xyl3/1iIIDthDjS7Hn9HoPwHlNakZirWbCsbad0lZMkr6Xfbpe1pUzw==",
      "dev": true,
      "license": "BSD-3-Clause",
      "bin": {
        "install-from-cache": "bin/install-from-cache.js",
        "save-to-github-cache": "bin/save-to-github-cache.js"
+      },
+      "engines": {
+        "node": ">=18"
      }
    },
    "node_modules/interpret": {
@@ -9627,9 +9648,9 @@
      }
    },
    "node_modules/loader-runner": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.1.tgz",
-      "integrity": "sha512-IWqP2SCPhyVFTBtRcgMHdzlf9ul25NwaFx4wCEH/KjAXuuHY4yNjvPXsBokp8jCB936PyWRaPKUNh8NvylLp2Q==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.2.tgz",
+      "integrity": "sha512-DFEqQ3ihfS9blba08cLfYf1NRAIEm+dDjic073DRDc3/JspI/8wYmtDsHwd3+4hwvdxSK7PGaElfTmm0awWJ4w==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -12438,9 +12459,9 @@
      }
    },
    "node_modules/prettier": {
-      "version": "3.8.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.2.tgz",
-      "integrity": "sha512-8c3mgTe0ASwWAJK+78dpviD+A8EqhndQPUBpNUIPt6+xWlIigCwfN01lWr9MAede4uqXGTEKeQWTvzb3vjia0Q==",
+      "version": "3.8.3",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.3.tgz",
+      "integrity": "sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==",
      "dev": true,
      "license": "MIT",
      "bin": {
@@ -14228,9 +14249,9 @@
      }
    },
    "node_modules/terser": {
-      "version": "5.46.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.46.1.tgz",
-      "integrity": "sha512-vzCjQO/rgUuK9sf8VJZvjqiqiHFaZLnOiimmUuOKODxWL8mm/xua7viT7aqX7dgPY60otQjUotzFMmCB4VdmqQ==",
+      "version": "5.46.2",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.46.2.tgz",
+      "integrity": "sha512-uxfo9fPcSgLDYob/w1FuL0c99MWiJDnv+5qXSQc5+Ki5NjVNsYi66INnMFBjf6uFz6OnX12piJQPF4IpjJTNTw==",
      "dev": true,
      "license": "BSD-2-Clause",
      "dependencies": {
@@ -14247,9 +14268,9 @@
      }
    },
    "node_modules/terser-webpack-plugin": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.4.0.tgz",
-      "integrity": "sha512-Bn5vxm48flOIfkdl5CaD2+1CiUVbonWQ3KQPyP7/EuIl9Gbzq/gQFOzaMFUEgVjB1396tcK0SG8XcNJ/2kDH8g==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.5.0.tgz",
+      "integrity": "sha512-UYhptBwhWvfIjKd/UuFo6D8uq9xpGLDK+z8EDsj/zWhrTaH34cKEbrkMKfV5YWqGBvAYA3tlzZbs2R+qYrbQJA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -14281,9 +14302,9 @@
      }
    },
    "node_modules/terser-webpack-plugin/node_modules/ajv": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
-      "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz",
+      "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -14482,22 +14503,22 @@
      }
    },
    "node_modules/tldts": {
-      "version": "7.0.28",
-      "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.28.tgz",
-      "integrity": "sha512-+Zg3vWhRUv8B1maGSTFdev9mjoo8Etn2Ayfs4cnjlD3CsGkxXX4QyW3j2WJ0wdjYcYmy7Lx2RDsZMhgCWafKIw==",
+      "version": "7.0.30",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.30.tgz",
+      "integrity": "sha512-ELrFxuqsDdHUwoh0XxDbxuLD3Wnz49Z57IFvTtvWy1hJdcMZjXLIuonjilCiWHlT2GbE4Wlv1wKVTzDFnXH1aw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "tldts-core": "^7.0.28"
+        "tldts-core": "^7.0.30"
      },
      "bin": {
        "tldts": "bin/cli.js"
      }
    },
    "node_modules/tldts-core": {
-      "version": "7.0.28",
-      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.28.tgz",
-      "integrity": "sha512-7W5Efjhsc3chVdFhqtaU0KtK32J37Zcr9RKtID54nG+tIpcY79CQK/veYPODxtD/LJ4Lue66jvrQzIX2Z2/pUQ==",
+      "version": "7.0.30",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.30.tgz",
+      "integrity": "sha512-uiHN8PIB1VmWyS98eZYja4xzlYqeFZVjb4OuYlJQnZAuJhMw4PbKQOKgHKhBdJR3FE/t5mUQ1Kd80++B+qhD1Q==",
      "dev": true,
      "license": "MIT"
    },
@@ -14739,9 +14760,9 @@
      }
    },
    "node_modules/typescript": {
-      "version": "5.9.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
-      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz",
+      "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==",
      "dev": true,
      "license": "Apache-2.0",
      "bin": {
@@ -15011,6 +15032,7 @@
      "version": "8.3.2",
      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "deprecated": "uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).",
      "dev": true,
      "license": "MIT",
      "bin": {
@@ -15264,9 +15286,9 @@
      }
    },
    "node_modules/webpack-sources": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.3.4.tgz",
-      "integrity": "sha512-7tP1PdV4vF+lYPnkMR0jMY5/la2ub5Fc/8VQrrU+lXkiM6C4TjVfGw7iKfyhnTQOsD+6Q/iKw0eFciziRgD58Q==",
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.4.1.tgz",
+      "integrity": "sha512-eACpxRN02yaawnt+uUNIF7Qje6A9zArxBbcAJjK1PK3S9Ycg5jIuJ8pW4q8EMnwNZCEGltcjkRx1QzOxOkKD8A==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -15274,9 +15296,9 @@
      }
    },
    "node_modules/webpack/node_modules/ajv": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
-      "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz",
+      "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -15640,9 +15662,9 @@
      }
    },
    "node_modules/yaml": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.3.tgz",
-      "integrity": "sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==",
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.4.tgz",
+      "integrity": "sha512-ml/JPOj9fOQK8RNnWojA67GbZ0ApXAUlN2UQclwv2eVgTgn7O9gg9o7paZWKMp4g0H3nTLtS9LVzhkpOFIKzog==",
      "dev": true,
      "license": "ISC",
      "bin": {
@@ -15909,9 +15931,9 @@
      "license": "ISC"
    },
    "node_modules/zod": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-4.3.6.tgz",
-      "integrity": "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==",
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-4.4.2.tgz",
+      "integrity": "sha512-IynmDyxsEsb9RKzO3J9+4SxXnl2FTFSzNBaKKaMV6tsSk0rw9gYw9gs+JFCq/qk2LCZ78KDwyj+Z289TijSkUw==",
      "dev": true,
      "license": "MIT",
      "funding": {
@@ -15933,7 +15955,7 @@
      "devDependencies": {
        "@arethetypeswrong/cli": "^0.18.0",
        "eslint": "^10.0.0",
-        "typescript": "^5.9.3"
+        "typescript": "^6.0.3"
      },
      "engines": {
        "node": "^20.19.0 || ^22.13.0 || >=24"
@@ -6,13 +6,13 @@
 }:
 buildNpmPackage rec {
  pname = "eslint";
-  version = "10.2.1";
+  version = "10.3.0";

  src = fetchFromGitHub {
    owner = "eslint";
    repo = "eslint";
    tag = "v${version}";
-    hash = "sha256-XUVCFubLnht+OZIZRg2NzuX1/zDhqWYtQZzw8FwkTu4=";
+    hash = "sha256-b0Gv7soMPTsbMOZLqMe5vMCPwInk9AFusepf2jJH/Ng=";
  };

  # NOTE: Generating lock-file
@@ -24,7 +24,7 @@ buildNpmPackage rec {
    cp ${./package-lock.json} package-lock.json
  '';

-  npmDepsHash = "sha256-SET3In91HxRdSEVAgZHETF+ahOJg/4+Jb1Jy5msVzZs=";
+  npmDepsHash = "sha256-gi/aiWEzbf91LNTB2kMx9Iq4PoVORLs3mBjSSt2mFiQ=";
  npmInstallFlags = [ "--omit=dev" ];

  dontNpmBuild = true;
@@ -7,18 +7,18 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "flaca";
-  version = "3.5.3";
+  version = "3.6.1";

  lockFile = fetchurl {
    url = "https://github.com/Blobfolio/flaca/releases/download/v${finalAttrs.version}/Cargo.lock";
-    hash = "sha256-NNeq8qr+z0s98mgFYyUu9aNRqaAi2CZfQx0vQzSzOc8=";
+    hash = "sha256-GNpL51rx3na+ECHUl0JAUQJBRQQ12Ubg4RIhNfXxMRQ=";
  };

  src = fetchFromGitHub {
    owner = "Blobfolio";
    repo = "flaca";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Fh+nWnAG87NL3scr/y2jCNqaeJtEwi4nCYTGwnmEsIQ=";
+    hash = "sha256-LVk+2zt7Abku3bR5FnpugztMy0A3LmpO2yBkZO1jjxc=";
  };

  postUnpack = ''
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {

  nativeBuildInputs = [ rustPlatform.bindgenHook ];

-  cargoHash = "sha256-yHkUsxJppHhIpgX7Vtrs8TCy43xaNpqoVkMZ0msr02k=";
+  cargoHash = "sha256-73O/h7Cuh+to9MpQ97daPFKI4ACtT0aer3h0EmKKcoA=";

  meta = {
    description = "CLI tool to losslessly compress JPEG and PNG images";
@@ -0,0 +1,24 @@
+diff --git a/parse.c b/parse.c
+index d4bb28b..90a307d 100644
+--- a/parse.c
+++ b/parse.c
+@@ -43,7 +43,7 @@ static	int	parsehostline (const char *line, host_t *h, ip6_t *hid, ip6_t *sid, c
+ static	int	parseextralines (FILE *fp, int *lnrp, char *extra_rr, size_t len);
+ static	void	dumphostline (FILE *fp, const host_t *host, const ip6_t *hid, const ip6_t *sid, const char *scope);
+ 
+-int	parsefile (const char *fname, FILE *outfp, int (*genfunc)())
+int	parsefile (const char *fname, FILE *outfp, int (*genfunc)(int type, const ip6_t *prfx, const scope_t *scope, const host_t *host, const ip6_t *hid, ip6_t *sid, const char *extra_rr))
+ {
+ 	char	extra_rr[MAXEXTRARR+1];
+ 	char	line[MAXLINE+1];
+diff --git a/parse.h b/parse.h
+index 10e7997..fbb452d 100644
+--- a/parse.h
+++ b/parse.h
+@@ -7,5 +7,5 @@
+ # define	MAXLINE		511
+ # define	MAXEXTRARR	(3*MAXLINE)
+ 
+-extern	int	parsefile (const char *fname, FILE *outfp, int (*genfunc)());
+extern	int	parsefile (const char *fname, FILE *outfp, int (*genfunc)(int type, const ip6_t *prfx, const scope_t *scope, const host_t *host, const ip6_t *hid, ip6_t *sid, const char *extra_rr));
+ #endif
@@ -14,6 +14,10 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-MhYfgzbGPmrhPx89EpObrEkxaII7uz4TbWXeEGF7Xws=";
  };

+  patches = [
+    ./fix-gcc15.patch
+  ];
+
  nativeBuildInputs = [ installShellFiles ];

  preInstall = ''
@@ -2,29 +2,20 @@
  lib,
  buildNpmPackage,
  fetchFromGitHub,
-  jq,
 }:

 buildNpmPackage (finalAttrs: {
  pname = "homebridge";
-  version = "2.0.0";
+  version = "2.0.1";

  src = fetchFromGitHub {
    owner = "homebridge";
    repo = "homebridge";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-KRDeS9qYefdafGpX8RF68ce6uSlS22aIRqJimmhI8Ko=";
+    hash = "sha256-JHeyyPh2ePIrUhqfo1Cb4pNf+lB3ldE6NR0OunbLuKk=";
  };

-  npmDepsHash = "sha256-CkizIWaHzmotAr/64yY2wKAtqFoBdr5ylN5WcgdpMis=";
-
-  # Homebridge's clean phase attempts to install rimraf directly, which fails in nix builds
-  # rimraf is already in the declared dependencies, so we just don't need to do it.
-  # This will replace "npm install rimraf && rimraf lib/" with "rimraf lib/".
-  preBuild = ''
-    cat package.json | ${jq}/bin/jq '.scripts.clean = "rimraf lib/"' > package.json.tmp
-    mv package.json.tmp package.json
-  '';
+  npmDepsHash = "sha256-zJ9WPnhtC0rnyT5dqPfC/eg+TRlKlDDQW3XYx67pl5s=";

  meta = {
    description = "Lightweight emulator of iOS HomeKit API";
@@ -1,19 +1,23 @@
 {
  lib,
  stdenv,
-  fetchurl,
+  fetchFromGitHub,
  zlib,
  openssl,
  libiconv,
 }:

 stdenv.mkDerivation (finalAttrs: {
-  version = "3.49.2";
+  version = "3.49.6";
  pname = "httrack";

-  src = fetchurl {
-    url = "https://mirror.httrack.com/httrack-${finalAttrs.version}.tar.gz";
-    sha256 = "09a0gm67nml86qby1k1gh7rdxamnrnzwr6l9r5iiq94favjs0xrl";
+  src = fetchFromGitHub {
+    owner = "xroche";
+    repo = "httrack";
+    # 3.49.6 is not tagged, but corresponds to this rev.
+    rev = "748c35de7858ead963daf1393ad023d75b7820c2";
+    hash = "sha256-Iaeo6lB84I0amr2C8iZ+kQ6F8AXqyyARV6FiwpBshvA=";
+    fetchSubmodules = true;
  };

  buildInputs = [
@@ -22,12 +26,11 @@ stdenv.mkDerivation (finalAttrs: {
    zlib
  ];

-  enableParallelBuilding = true;
-
  meta = {
    description = "Easy-to-use offline browser / website mirroring utility";
-    homepage = "http://www.httrack.com";
+    homepage = "https://www.httrack.com";
    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ tbutter ];
    platforms = with lib.platforms; unix;
  };
 })
@@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
    cmake
    pkg-config
  ];
+
  buildInputs = [
    libdrm
    libva
@@ -51,15 +52,14 @@ stdenv.mkDerivation rec {
    libxdmcp
    libpthread-stubs
  ];
-  nativeCheckInputs = [ gtest ];

  cmakeFlags = [
    "-DBUILD_SAMPLES=OFF"
-    "-DBUILD_TESTS=${if doCheck then "ON" else "OFF"}"
+    "-DBUILD_TESTS=OFF"
    "-DUSE_SYSTEM_GTEST=ON"
  ];

-  doCheck = true;
+  doCheck = false;

  meta = {
    description = "Intel Media SDK";
@@ -6,20 +6,22 @@
  git,
  writableTmpDirAsHomeHook,
  cacert,
+  versionCheckHook,
+  nix-update-script,
 }:

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "jj-vine";
-  version = "0.3.6";
+  version = "0.5.0";

  src = fetchFromCodeberg {
    owner = "abrenneke";
    repo = "jj-vine";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-vvNbeQvP205snAGiql/i8yFGyMw23YkSU4/uxOSnycY=";
+    hash = "sha256-uvnSv+4ijVdBoHrOklDRY+JDLsVOTRu+laOcFMjkYaA=";
  };

-  cargoHash = "sha256-vcpaKlNeORnDpVqXxu0TrXWaWNfaK9QPVJOrty9WmcQ=";
+  cargoHash = "sha256-TsyFWcvr8ksiC1vStWs+mH88lw1/JGRg8IQ7XFnZ5qg=";

  nativeCheckInputs = [
    jujutsu
@@ -29,6 +31,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
  checkFeatures = [ "no-e2e-tests" ];
  env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";

+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
  meta = {
    description = "Tool for submitting stacked Pull/Merge Requests from Jujutsu bookmarks";
    homepage = "https://codeberg.org/abrenneke/jj-vine";
@@ -22,23 +22,23 @@ let
 in
 clangStdenv.mkDerivation (finalAttrs: {
  pname = "julec";
-  version = "0.2.0";
+  version = "0.2.1";

  src = fetchFromGitHub {
    owner = "julelang";
    repo = "jule";
    tag = "jule${finalAttrs.version}";
    name = "jule-${finalAttrs.version}";
-    hash = "sha256-fwltqCmpCzWkCFGxGrhozW7LQmDwGT8nR9NO5s0nMfI=";
+    hash = "sha256-zfFsWP1nFvyzIqtf/nG4itpKxy6ZZjb3gGC3LwLVGPk=";
  };

  irSrc = fetchFromGitHub {
    owner = "julelang";
    repo = "julec-ir";
    # revision determined by the upstream commit hash
-    rev = "e4134d89f34588e9fb5cc5698f27b0471918e057";
+    rev = "5de197f9041dbc61b1d97ed4e3b84c0f667014f8";
    name = "jule-ir-${finalAttrs.version}";
-    hash = "sha256-hdS/q2/V/N97fM0r6jrj2SEGWdx9pFivGE4K4l8iVag=";
+    hash = "sha256-PMAFXLXa3wS0+TWEU2bjlw5UzOmAx8ittQzuExhrWDM=";
  };

  dontConfigure = true;
@@ -7,13 +7,13 @@

 clangStdenv.mkDerivation (finalAttrs: {
  pname = "juledoc";
-  version = "0.0.0-unstable-2026-02-02";
+  version = "0.0.0-unstable-2026-04-13";

  src = fetchFromGitHub {
    owner = "julelang";
    repo = "juledoc";
-    rev = "e01e200293d134064c674f705c9babf6d23775e8";
-    hash = "sha256-JzIwIEd9kuVrBVo2H5bv3ROqpVUndBqLAZVYmoGbYuQ=";
+    rev = "d6ba549aeb82ea224e2cf07e0f0f3a2448dbd9db";
+    hash = "sha256-3n9VOoXIFEI9V6fzSD75PdwkijXruC7qWClOUlWd52I=";
  };

  nativeBuildInputs = [ julec.hook ];
@@ -7,13 +7,13 @@

 clangStdenv.mkDerivation (finalAttrs: {
  pname = "julefmt";
-  version = "0.0.0-unstable-2026-01-31";
+  version = "0.0.0-unstable-2026-05-02";

  src = fetchFromGitHub {
    owner = "julelang";
    repo = "julefmt";
-    rev = "85b4aaca42e958fb33d6769879ec0a375913206c";
-    hash = "sha256-1UR5hsG5squzb2ADPMmHMKFSL4/fePlYsSlfx70nPSU=";
+    rev = "6bd55e31ebba393c973017332502a548ea0f402c";
+    hash = "sha256-j8V5L4j4qaApJixsEo10Qv58IHcU54hnpL8uD+T0C0M=";
  };

  nativeBuildInputs = [ julec.hook ];
@@ -2,20 +2,25 @@
  lib,
  stdenv,
  fetchFromGitHub,
+  replaceVars,
 }:

-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
  pname = "kati-unstable";
-  version = "2019-09-23";
+  version = "0-unstable-2026-02-12";

  src = fetchFromGitHub {
    owner = "google";
    repo = "kati";
-    rev = "9da3296746a0cd55b38ebebf91e7f57105a4c36f";
-    sha256 = "0s5dfhgpcbx12b1fqmm8p0jpvrhgrnl9qywv1ksbwhw3pfp7j866";
+    rev = "985493689b70e28970952bde44ac2a8433257b5e";
+    sha256 = "sha256-fn+eA/TBmiyQYeUQvviL/zc9qxUYfW1BaeqNCILsk+w=";
  };

-  patches = [ ./version.patch ];
+  patches = [
+    (replaceVars ./version.patch {
+      version = finalAttrs.src.rev;
+    })
+  ];

  installPhase = ''
    install -D ckati $out/bin/ckati
@@ -29,4 +34,4 @@ stdenv.mkDerivation {
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ danielfullmer ];
  };
-}
+})
@@ -1,19 +1,22 @@
 diff --git a/Makefile.ckati b/Makefile.ckati
-index e4067bb..15518f3 100644
+index d585106..7e15d08 100644
 --- a/Makefile.ckati
 +++ b/Makefile.ckati
-@@ -102,14 +102,8 @@ $(KATI_CXX_TEST_EXES): $(KATI_BIN_PATH)/%: $(KATI_INTERMEDIATES_PATH)/%.o
+@@ -101,16 +101,8 @@ $(KATI_CXX_TEST_EXES): $(KATI_BIN_PATH)/%: $(KATI_INTERMEDIATES_PATH)/%.o
 	$(KATI_LD) $^ -o $@ $(KATI_LIBS)
 
 # Rule to generate version.cc
-KATI_GIT_DIR := $(shell git -C $(KATI_SRC_PATH) rev-parse --show-toplevel)
+-KATI_GIT_DIR := $(shell cd $(KATI_SRC_PATH); realpath `git rev-parse --git-dir`)
+ KATI_VERSION_DEPS :=
 -ifneq ($(KATI_GIT_DIR),)
-KATI_VERSION_DEPS := $(KATI_GIT_DIR)/.git/HEAD $(KATI_GIT_DIR)/.git/index
+-KATI_VERSION_DEPS := $(wildcard $(KATI_GIT_DIR)/HEAD $(KATI_GIT_DIR)/index)
+-endif
+-ifneq ($(KATI_VERSION_DEPS),)
 -KATI_VERSION := $(shell git -C $(KATI_GIT_DIR) rev-parse HEAD)
 -else
- KATI_VERSION_DEPS :=
- KATI_VERSION := unknown
+-KATI_VERSION := unknown
 -endif
+KATI_VERSION := @version@
 $(KATI_INTERMEDIATES_PATH)/version.cc: $(KATI_VERSION_DEPS)
 	@mkdir -p $(dir $@)
 	echo '// +build ignore' > $@
@@ -9,16 +9,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "keyscope";
-  version = "1.4.0";
+  version = "1.4.2";

  src = fetchFromGitHub {
    owner = "spectralops";
    repo = "keyscope";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-2DhKiQixhTCQD/SYIQa+o1kzEsslu6wAReuWr0rTrH8=";
+    hash = "sha256-PjuBRxW42DIOyHPqs5sOFBUrPPzVVoYAeKtyIWfA+28=";
  };

-  cargoHash = "sha256-f4r0zZTkVDfycrGqRCaBQrncpAm0NP6XYkj3w7fzQeY=";
+  cargoHash = "sha256-Oi/F89uRuwqWTa7E/PDVdj/VAnYYeG0BSs+pM41AXCU=";

  nativeBuildInputs = [ pkg-config ];

@@ -1,7 +1,11 @@
 {
  lib,
-  buildNpmPackage,
+  stdenv,
  fetchFromGitHub,
+  fetchPnpmDeps,
+  nodejs,
+  pnpm_9,
+  pnpmConfigHook,
  callPackage,
  testers,
  runCommand,
@@ -10,27 +14,59 @@
  lessc,
 }:

-buildNpmPackage rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "lessc";
-  version = "4.2.2";
+  version = "4.6.3";

  src = fetchFromGitHub {
    owner = "less";
    repo = "less.js";
-    rev = "v${version}";
-    hash = "sha256-vO/1laFb1yC+OESXTx9KuGdwSNC9Iv49F3V7kfXnyJU=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-udfqfjdIhQ6UGAeXCT5FbI+iXNqfkbQMqZnnIDUrQaQ=";
  };
-  sourceRoot = "${src.name}/packages/less";

-  npmDepsHash = "sha256-3GlngmaxcUGXSv+ZwN2aovwEqcek6FJ1ZaL5KpjwNn4=";
+  pnpmDeps = fetchPnpmDeps {
+    inherit (finalAttrs)
+      pname
+      version
+      src
+      pnpmWorkspaces
+      ;
+    pnpm = pnpm_9;
+    fetcherVersion = 3;
+    hash = "sha256-ZdADm6WKPP48DK+ezk/jdzXVEBX161SqgYgU5fsCW2k=";
+  };

-  postPatch = ''
-    sed -i ./package.json \
-      -e '/@less\/test-data/d' \
-      -e '/@less\/test-import-module/d'
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pnpmConfigHook
+    pnpm_9
+    nodejs
+  ];
+
+  buildInputs = [ nodejs ];
+
+  pnpmWorkspaces = [ "less..." ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    pnpm --filter "less" run build
+
+    runHook postBuild
  '';

-  env.PUPPETEER_SKIP_DOWNLOAD = 1;
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/{bin,lib/lessc}
+    cp -r {packages,node_modules} $out/lib/lessc
+    chmod +x $out/lib/lessc/packages/less/bin/lessc
+    ln -s $out/lib/lessc/packages/less/bin/lessc $out/bin/lessc
+
+    runHook postInstall
+  '';

  passthru = {
    updateScript = nix-update-script { };
@@ -69,9 +105,10 @@ buildNpmPackage rec {

  meta = {
    homepage = "https://github.com/less/less.js";
+    changelog = "https://github.com/less/less.js/blob/${finalAttrs.src.tag}/CHANGELOG.md";
    description = "Dynamic stylesheet language";
    mainProgram = "lessc";
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ lelgenio ];
  };
-}
+})
@@ -18,35 +18,15 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "lib3mf";
-  version = "2.4.1";
+  version = "2.5.0";

  src = fetchFromGitHub {
    owner = "3MFConsortium";
    repo = "lib3mf";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-wq/dT/8m+em/qFoNNj6s5lyx/MgNeEBGSMBpuJiORqA=";
+    hash = "sha256-8S892kvea6c9RynfVHo7epBjT9cWCV4VchGZ8G1hvHc=";
  };

-  patches = [
-    # some patches are required for the gcc 14 source build
-    # remove next release
-    # https://github.com/3MFConsortium/lib3mf/pull/413
-    (fetchpatch {
-      url = "https://github.com/3MFConsortium/lib3mf/pull/413/commits/96b2f5ec9714088907fe8a6f05633e2bbd82053f.patch?full_index=1";
-      hash = "sha256-cJRc+SW1/6Ypf2r34yroVTxu4NMJWuoSmzsmoXogrUk=";
-    })
-    # https://github.com/3MFConsortium/lib3mf/pull/421
-    (fetchpatch {
-      url = "https://github.com/3MFConsortium/lib3mf/pull/421/commits/6d7b5709a4a1cf9bd55ae8b4ae999c9ca014f62c.patch?full_index=1";
-      hash = "sha256-rGOyXZUZglRNMu1/oVhgSpRdi0pUa/wn5SFHCS9jVOY=";
-    })
-    (fetchpatch {
-      name = "lib3mf-fix-cmake-4.patch";
-      url = "https://github.com/3MFConsortium/lib3mf/commit/01325a73de25d2ad49e992b5b6294beb32298c92.patch";
-      hash = "sha256-8vv2ydnDgvSKkGjpmk5ng1BGKK0okTMOeAoGwlKcziY=";
-    })
-  ];
-
  nativeBuildInputs = [
    cmake
    ninja
@@ -67,13 +47,16 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  buildInputs = [
-    libzip
    gtest
    openssl
    zlib
  ]
  ++ lib.optional (!stdenv.hostPlatform.isDarwin) libuuid;

+  propagatedBuildInputs = [
+    libzip
+  ];
+
  postPatch = ''
    # fix libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
    sed -i 's,libdir=''${\(exec_\)\?prefix}/,libdir=,' lib3mf.pc.in
@@ -91,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
    EOF

    mkdir Libraries/fast_float
-    ln -s ${lib.getInclude fast-float}/include/fast_float Libraries/fast_float/Include
+    ln -s ${lib.getInclude fast-float}/include/ Libraries/fast_float/Include

    # functions are no longer in openssl, remove them from test cleanup function
    substituteInPlace Tests/CPP_Bindings/Source/UnitTest_EncryptionUtils.cpp \
@@ -0,0 +1,15 @@
+diff --git a/xxd/xxd.c b/xxd/xxd.c
+index 20f06ab..55e64fe 100644
+--- a/xxd/xxd.c
+++ b/xxd/xxd.c
+@@ -132,8 +132,8 @@ extern void perror __P((char *));
+ # endif
+ #endif
+ 
+-extern long int strtol();
+-extern long int ftell();
+extern long int strtol(const char *restrict, char **restrict, int);
+extern long int ftell(FILE *);
+ 
+ char version[] = "xxd V1.10 27oct98 by Juergen Weigert";
+ #ifdef WIN32
@@ -19,6 +19,10 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-XGjP+7i3mYCEzPYwVY+75DARdXJFY4vUWHFpPeoNqAE=";
  };

+  patches = [
+    ./fix-gcc15.patch
+  ];
+
  buildInputs = [
    gtkmm3
  ];
@@ -7,7 +7,7 @@
  cmake,
 }:
 let
-  version = "0.8.0";
+  version = "0.9.0";
 in
 rustPlatform.buildRustPackage {
  pname = "lovely-injector";
@@ -16,11 +16,11 @@ rustPlatform.buildRustPackage {
    owner = "ethangreen-dev";
    repo = "lovely-injector";
    tag = "v${version}";
-    hash = "sha256-leTe7j4RTqc6BkiS7W5e0viK8FEwJpPLNoyf4GLOI3E=";
+    hash = "sha256-TzBxyIf7MjzsdFaJLBp2dXWNj5sOXyoMifaaztNIOog=";
    fetchSubmodules = true;
  };

-  cargoHash = "sha256-MnXB2ho48VPYtFSnGHGkuSv1eprOhmj4wMG2YmFSGec=";
+  cargoHash = "sha256-4ECH8E/GuV2NYvvjSkanmj4gPIahY40HlCrhR2aFJ5M=";
  cargoBuildFlags = [
    "--package"
    "lovely-unix"
@@ -0,0 +1,48 @@
+diff --git a/src/defines.h b/src/defines.h
+index 9533476..1999826 100644
+--- a/src/defines.h
+++ b/src/defines.h
+@@ -164,7 +164,7 @@
+ #endif
+ 
+ /*extern char *getpass();*/
+-extern char *crypt(); /* libufc */
+extern char *crypt(const char *key, const char *salt); /* libufc */
+ 
+ #if HAVE_TERMIOS_H
+ # include <termios.h>
+diff --git a/src/extra.h b/src/extra.h
+index b655291..bae372e 100644
+--- a/src/extra.h
+++ b/src/extra.h
+@@ -14,7 +14,7 @@ char *get_cfile(int uid, char*);
+ void Bzero(void *s, size_t n);
+ void mcrypt_tolow(char *str, int size);
+ 
+-char *my_getpass();
+char *my_getpass(char *prt);
+ int check_file_head(FILE *fstream, char *algorithm, char* mode, char* keymode, int *keysize, void* salt, int* salt_size);
+ void* read_iv(FILE *fstream, int ivsize);
+ int write_file_head(FILE * filedes, char* algorithm, char* mode, char* keymode, int* keysize, void *salt, int salt_size);
+diff --git a/src/ufc_crypt.c b/src/ufc_crypt.c
+index 8c452d7..7f3a68f 100644
+--- a/src/ufc_crypt.c
+++ b/src/ufc_crypt.c
+@@ -28,7 +28,7 @@
+ 
+ /* UFC optimized for 32 bit machines */
+ 
+-extern word32 *_ufc_dofinalperm();
+extern word32 *_ufc_dofinalperm(word32 l1, word32 l2, word32 r1, word32 r2);
+ 
+ 
+ /*
+@@ -668,7 +668,7 @@ char *salt;
+ 	return outbuf;
+ }
+ 
+-word32 *_ufc_doit();
+word32 *_ufc_doit(word32 l1, word32 l2, word32 r1, word32 r2, word32 itr);
+ 
+ /* 
+  * UNIX crypt function
@@ -21,6 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
    ./segv.patch
    ./sprintf_CVE-2012-4527.patch
    ./malloc_to_stdlib.patch
+    ./gcc15.patch
  ];

  buildInputs = [
@@ -12,18 +12,21 @@
 }:
 buildGoModule (finalAttrs: {
  pname = "mgmt";
-  version = "1.0.1";
+  version = "1.0.2";

  src = fetchFromGitHub {
    owner = "purpleidea";
    repo = "mgmt";
    tag = finalAttrs.version;
-    hash = "sha256-Qi9KkWzFOqmUp5CSHxzQabQ8bVnBbxxKS/W6aLBTv6k=";
+    hash = "sha256-nLk497gGrZ664VG9/yV6tqTtwAsN8EmuAEh5Vmq95hQ=";
  };

-  vendorHash = "sha256-XZTDqN5nQqze41Y/jOhT3mFHXeR2oPjXpz7CJuPOi8k=";
+  vendorHash = "sha256-w4j9cJwW2tnjXSnd3w3v81TwHI8tGYiImjG3LZ+Pjuc=";
+
+  proxyVendor = true;

  postPatch = ''
+    rm -rf vendor
    patchShebangs misc/header.sh
  '';
  preBuild = ''
@@ -60,5 +63,6 @@ buildGoModule (finalAttrs: {
      karpfediem
    ];
    mainProgram = "mgmt";
+    platforms = lib.platforms.linux;
  };
 })
@@ -7,16 +7,16 @@
 }:
 buildGoModule (finalAttrs: {
  pname = "mpls";
-  version = "0.21.0";
+  version = "0.21.1";

  src = fetchFromGitHub {
    owner = "mhersson";
    repo = "mpls";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-mhQuycz+8UfZwsc2/gRuK6X26PxedcqlFyUM0IxqQJs=";
+    hash = "sha256-MMFwWHgdSkUgwx+XxBCIL4dElY1HIM5h2XNFTZBKNkQ=";
  };

-  vendorHash = "sha256-w0YBeIaARC16BFp4uxJO8X8b1ozTbWFNUg7VQQa5iFw=";
+  vendorHash = "sha256-fE6GFfrDS3k9BmsL2+UbefG/EQngI/WGRZA3U10VBP4=";

  ldflags = [
    "-s"
@@ -14,11 +14,12 @@ stdenv.mkDerivation (finalAttrs: {
  };

  prePatch = ''
-    substituteInPlace nbench1.h --replace '"NNET.DAT"' "\"$out/NNET.DAT\""
-    substituteInPlace sysspec.h --replace "malloc.h" "stdlib.h"
+    substituteInPlace nbench1.h --replace-fail '"NNET.DAT"' "\"$out/NNET.DAT\"" \
+      --replace-fail 'static void adjust_mid_wts();' 'static void adjust_mid_wts(int);'
+    substituteInPlace sysspec.h --replace-fail "malloc.h" "stdlib.h"
  ''
  + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    substituteInPlace Makefile --replace "-static" ""
+    substituteInPlace Makefile --replace-fail "-static" ""
  '';

  buildInputs = lib.optionals stdenv.hostPlatform.isGnu [
@@ -40,6 +40,9 @@ stdenv.mkDerivation (finalAttrs: {
    libxt
  ];

+  # K&R-style declarations break under gcc 15's C23 default.
+  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
+
  meta = {
    description = "Visual browser for netCDF format files";
    homepage = "http://meteora.ucsd.edu/~pierce/ncview_home_page.html";
@@ -2,6 +2,7 @@
  lib,
  stdenv,
  fetchFromGitHub,
+  fetchpatch,
  doxygen,
  pkg-config,
  python3,
@@ -23,6 +24,14 @@ stdenv.mkDerivation (finalAttrs: {
    sha256 = "sha256-u9+QxqdCET1f5B54HF+Jk/YuQvhcYWsPNIVHi5l0XTM=";
  };

+  patches = [
+    (fetchpatch {
+      name = "fix-gcc15.patch";
+      url = "https://github.com/named-data/ndn-cxx/commit/0ba3d3a9d9701be4baa3969fe50e97e89d11249b.patch";
+      hash = "sha256-ikVIJ8Jza17k/sa/wtu2EUGLEhUMloMOkBrMN9W9BPY=";
+    })
+  ];
+
  nativeBuildInputs = [
    doxygen
    pkg-config
@@ -6,28 +6,28 @@

 python3.pkgs.buildPythonApplication (finalAttrs: {
  pname = "nextinspace";
-  version = "2.0.5";
+  version = "3.0.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "not-stirred";
    repo = "nextinspace";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-CrhzCvIA3YAFsWvdemvK1RLMacsM5RtgMjLeiqz5MwY=";
+    hash = "sha256-oEvRxaxx1pIco2+jm/3HUN0a0nqdo2VosCisM0MWTjU=";
  };

-  nativeBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
    poetry-core
  ];

-  pythonPath = with python3.pkgs; [
+  dependencies = with python3.pkgs; [
    requests
    tzlocal
    colorama
  ];

  nativeCheckInputs = with python3.pkgs; [
-    pytest-lazy-fixture
+    pytest-lazy-fixtures
    pytestCheckHook
    requests-mock
  ];
@@ -20,7 +20,7 @@

 ocamlPackages.buildDunePackage (finalAttrs: {
  pname = "nixtamal";
-  version = "1.5.0";
+  version = "1.5.3";
  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-noQU480HoxVjnHvEY/rso9jANNA8EIKbYeYpnhkkx74=";
+    hash = "sha256-/0JRG8BAuNaT9KpotDxXlbdSYMTWiOgzIABT+MGPPU0=";
  };

  nativeBuildInputs = [
@@ -8,13 +8,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "ols";
-  version = "dev-2026-03";
+  version = "dev-2026-05";

  src = fetchFromGitHub {
    owner = "DanielGavin";
    repo = "ols";
    tag = finalAttrs.version;
-    hash = "sha256-QjkzR9Wnc+Poq7dxDlik9k1maEs8xiFuNbwRdv8nqyo=";
+    hash = "sha256-9tQVyauvXGTkKnQUSYKAhjL5ZZbhglqdcxdcs27P2k4=";
  };

  postPatch = ''
@@ -43,9 +43,7 @@ buildGoModule (finalAttrs: {
    description = "Command-line tool for sending OpenTelemetry traces";
    changelog = "https://github.com/equinix-labs/otel-cli/releases/tag/v${finalAttrs.version}";
    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [
-      emattiza
-    ];
+    maintainers = [ ];
    mainProgram = "otel-cli";
  };
 })
@@ -70,7 +70,7 @@ maven.buildMavenPackage rec {
  meta = {
    description = "Conlang construction toolkit";
    homepage = "https://draquet.github.io/PolyGlot/readme.html";
-    changelog = "https://github.com/DraqueT/PolyGlot/releases/tag/${version}";
+    changelog = "https://github.com/DraqueT/PolyGlot/releases/tag/v${version}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ noodlez1232 ];
    platforms = lib.platforms.linux;
@@ -1,20 +1,23 @@
 {
  lib,
  borgmatic,
+  nixosTests,
  fetchFromGitHub,
  python3Packages,
 }:

-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication (finallAttrs: {
  pname = "prometheus-borgmatic-exporter";
-  version = "0.4.0";
+  version = "0.5.0";
  pyproject = true;

+  __structuredAttrs = true;
+
  src = fetchFromGitHub {
    owner = "maxim-mityutko";
    repo = "borgmatic-exporter";
-    tag = "v${version}";
-    hash = "sha256-fhsGpQolZxX5VAAEV3hiLF7bo4pbVt9GWyertf2oeO0=";
+    tag = "v${finallAttrs.version}";
+    hash = "sha256-pa1f31jrfDzUB3+xexJUwG0byiFszj/zEt+dIwlEv0o=";
  };

  pythonRelaxDeps = [ "prometheus-client" ];
@@ -33,6 +36,7 @@ python3Packages.buildPythonApplication rec {
    prometheus-client
    timy
    waitress
+    flask-caching
  ]);

  nativeCheckInputs = with python3Packages; [
@@ -40,13 +44,17 @@ python3Packages.buildPythonApplication rec {
    pytest-mock
  ];

+  __darwinAllowLocalNetworking = true;
+
+  passthru.tests.borgmatic = nixosTests.prometheus-exporters.borgmatic;
+
  meta = {
    description = "Prometheus exporter for Borgmatic";
    homepage = "https://github.com/maxim-mityutko/borgmatic-exporter";
-    changelog = "https://github.com/maxim-mityutko/borgmatic-exporter/releases/tag/${src.tag}";
+    changelog = "https://github.com/maxim-mityutko/borgmatic-exporter/releases/tag/${finallAttrs.src.tag}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ flandweber ];
    mainProgram = "borgmatic-exporter";
    platforms = lib.platforms.unix;
  };
-}
+})
@@ -22,6 +22,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
  };

  pythonRelaxDeps = [
+    "parsimonious"
    "prometheus-client"
    "python-daemon"
  ];
@@ -87,7 +87,6 @@ stdenv.mkDerivation (finalAttrs: {

  patches = [
    ./no-dl-googletest.patch
-    ./tests-c++17.patch
  ];

  postPatch = ''
@@ -96,6 +95,10 @@ stdenv.mkDerivation (finalAttrs: {
    done
    substituteInPlace package/CMakeLists.txt --replace /etc/xdg/autostart $out/etc/xdg/autostart

+    # jsoncpp 1.9.7 only exports std::string_view overloads under C++17
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "set(CMAKE_CXX_STANDARD 14)" "set(CMAKE_CXX_STANDARD 17)"
+
    # We don't find the radiotray-ng-notification icon otherwise
    substituteInPlace data/radiotray-ng.desktop \
      --replace radiotray-ng-notification radiotray-ng-on
@@ -1,12 +0,0 @@
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 58ab5c2..4f56a25 100644
--- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -1,5 +1,7 @@
- include(GoogleTest)
- 
-+set(CMAKE_CXX_STANDARD 17)
-+
- function(add_gmock_test target)
-     add_executable(${target} ${ARGN})
-     target_link_libraries(${target} config playlist bookmarks event_bus ${GMOCK_BOTH_LIBRARIES} ${XDG_BASEDIR_LIBRARIES} ${Boost_LIBRARIES} ${CURL_LIBRARIES} ${JSONCPP_LIBRARIES} pthread)
@@ -4,6 +4,8 @@
  fetchFromGitHub,
  pkg-config,
  wrapGAppsHook4,
+  accountsservice,
+  dbus,
  glib,
  gtk4,
  pango,
@@ -13,16 +15,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "regreet";
-  version = "0.2.0";
+  version = "0.3.0";

  src = fetchFromGitHub {
    owner = "rharish101";
    repo = "ReGreet";
    rev = finalAttrs.version;
-    hash = "sha256-f8Xvno5QqmWz4SUiFYDvs8lFU1ZaqQ8gpTaVzWxW4T8=";
+    hash = "sha256-2yA+LJmF99PJZbOVib3XCjsU95ZwKlXC2PofODFxbf8=";
  };

-  cargoHash = "sha256-abCQ3RsnZ/a1DbjQFOiA7Xs7bbqSJxwNps8yV6Q4FIw=";
+  cargoHash = "sha256-BlN63s09uSqYtQdV10VVTngqybfUEdgvsPlplM9PlD0=";

  buildFeatures = [ "gtk4_8" ];

@@ -31,6 +33,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
    wrapGAppsHook4
  ];
  buildInputs = [
+    accountsservice
+    dbus
    glib
    gtk4
    pango
@@ -5,6 +5,7 @@
  fetchFromGitHub,
  fetchzip,
  makeBinaryWrapper,
+  nix-update-script,

  makeDesktopItem,
  copyDesktopItems,
@@ -16,13 +17,13 @@
 }:
 let
  pname = "rimsort";
-  version = "1.0.73";
+  version = "1.0.76";

  src = fetchFromGitHub {
    owner = "RimSort";
    repo = "RimSort";
-    rev = "v${version}";
-    hash = "sha256-xNmJ1XvnLTKhicVchzG9CQtRVoZjRkBEvfn/WWesDRU=";
+    tag = "v${version}";
+    hash = "sha256-EO1j4GPRQSB+QEF4tB87x4nCUKpdWU9aGlDFghwxar0=";
    fetchSubmodules = true;
  };

@@ -49,14 +50,15 @@ let
    }).run;
 in

-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
  inherit pname;
  inherit version;
+  inherit src;

  unpackPhase = ''
    runHook preUnpack

-    cp -r ${src} source
+    cp -r ${finalAttrs.src} source
    chmod -R 755 source
    cp ${steamworksSrc}/redistributable_bin/linux64/libsteam_api.so source/

@@ -168,6 +170,14 @@ stdenv.mkDerivation {
    runHook postInstall
  '';

+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      # To skip checking the pre-release 'Edge' release as 'vEdge'.
+      "--version-regex"
+      "v([0-9.]+)"
+    ];
+  };
+
  meta = {
    description = "Open source mod manager for the video game RimWorld";
    homepage = "https://github.com/RimSort/RimSort";
@@ -186,4 +196,4 @@ stdenv.mkDerivation {
    # steamworksSrc is x86_64-linux only
    platforms = [ "x86_64-linux" ];
  };
-}
+})
@@ -3,6 +3,7 @@
  stdenv,
  fetchFromSourcehut,
  fetchpatch,
+  fetchpatch2,
  wayland,
  pixman,
  pkg-config,
@@ -26,6 +27,11 @@ stdenv.mkDerivation (finalAttrs: {
      url = "https://git.sr.ht/~leon_plickat/river-tag-overlay/commit/791eaadf46482121a4c811ffba13d03168d74d8f.patch";
      sha256 = "CxSDcweHGup1EF3oD/2vhP6RFoeYorj0BwmlgA3tbPE=";
    })
+    # Specify argument types for C23 compatibility (gcc 15).
+    (fetchpatch2 {
+      url = "https://git.sr.ht/~leon_plickat/river-tag-overlay/commit/b7d9232f9106c6d2c3ecce802495f14069ce3406.patch";
+      hash = "sha256-/fNpVPY09zwwymS/VNaonqX7jtdflC3Iot5R26VsTTw=";
+    })
  ];

  buildInputs = [
@@ -1,39 +1,36 @@
 {
-  bash,
-  fetchFromGitHub,
  lib,
  rustPlatform,
+  fetchFromGitHub,
  versionCheckHook,
  nix-update-script,
+  bashNonInteractive,
 }:

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "rust-parallel";
-  version = "1.21.0";
+  version = "1.22.0";
+
+  __structuredAttrs = true;

  src = fetchFromGitHub {
    owner = "aaronriekenberg";
    repo = "rust-parallel";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-86CUFtq6XpTYL7zpDBBfbSXlPYhWofwMjJSK698lclI=";
+    hash = "sha256-6SDWYIJDoDKANYZvYM2hdFzXTyqbfRA2uKQDFn+6erg=";
  };

-  cargoHash = "sha256-g2R3dEvDv3uzZVXBFvsCoX/M0XuHhoE/mMHni6qEN1g=";
+  cargoHash = "sha256-uFx0Sli6uwmhHKQoT1aX0S5NwuWLu3M6g5pQYYpAsEI=";

-  postPatch = ''
-    substituteInPlace tests/dummy_shell.sh \
-      --replace-fail "/bin/bash" "${bash}/bin/bash"
+  checkInputs = [ bashNonInteractive ];
+
+  # Some test require the output of tracing which for some reason hides info if RUST_LOG is set to "" which it is by default
+  logLevel = "info";
+
+  preCheck = ''
+    patchShebangs ./tests/dummy_shell.sh
  '';

-  checkFlags = [
-    "--skip=runs_echo_commands_dry_run"
-    "--skip=test_keep_order_with_sleep"
-
-    "--skip=runs_regex_command_with_dollar_signs"
-    "--skip=runs_regex_from_command_line_args_nomatch_1"
-    "--skip=runs_regex_from_input_file_badline_j1"
-  ];
-
  nativeInstallCheckInputs = [ versionCheckHook ];
  doInstallCheck = true;

@@ -1,38 +1,32 @@
 {
  lib,
-  stdenv,
+  rustPlatform,
  fetchFromGitHub,
-  diffutils,
-  gd,
-  pkg-config,
 }:

-stdenv.mkDerivation (finalAttrs: {
+rustPlatform.buildRustPackage (finalAttrs: {
  pname = "s2png";
-  version = "0.7.2";
+  version = "1.0.0";
+
+  __structuredAttrs = true;

  src = fetchFromGitHub {
    owner = "dbohdan";
    repo = "s2png";
    rev = "v${finalAttrs.version}";
-    sha256 = "0y3crfm0jqprgxamlly713cka2x1bp6z63p1lw9wh4wc37kpira6";
+    sha256 = "sha256-BRVubGy5GpP0zhJ26DXBwlqflfZTnLVfhQk5qFj29x4=";
  };

-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
-    diffutils
-    gd
-  ];
-  installFlags = [
-    "prefix="
-    "DESTDIR=$(out)"
-  ];
+  cargoHash = "sha256-aka4q3Wh0s1iaIUJkPuL/2FnJH5KdbpOOWLIAWirBFk=";

  meta = {
    homepage = "https://github.com/dbohdan/s2png/";
    description = "Store any data in PNG images";
    license = lib.licenses.gpl2Plus;
-    maintainers = [ lib.maintainers.dbohdan ];
+    maintainers = with lib.maintainers; [
+      dbohdan
+      kybe236
+    ];
    platforms = lib.platforms.unix;
    mainProgram = "s2png";
  };
@@ -0,0 +1,9 @@
+--- a/sos/policies/distros/__init__.py
+++ b/sos/policies/distros/__init__.py
+@@ -128,6 +128,8 @@
+             return True
+         # next check os-release for a NAME or ID value we expect
+        if not os.path.exists(OS_RELEASE):
+            return False
+         with open(OS_RELEASE, "r", encoding='utf-8') as f:
+             return _check_release(f.read())
@@ -7,18 +7,22 @@

 python3Packages.buildPythonPackage rec {
  pname = "sosreport";
-  version = "4.9.1";
+  version = "4.11.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "sosreport";
    repo = "sos";
    tag = version;
-    hash = "sha256-97S8b4PfjUN8uzvp01PGCLs4J3CbwpJsgBKtY8kI0HE=";
+    hash = "sha256-HKGGA9SHCJjAaCPduPx1plUJ10nt3JYAr10J/69Sm/0=";
  };

  build-system = [ python3Packages.setuptools ];

+  patches = [
+    ./os-release.patch
+  ];
+
  nativeBuildInputs = [
    gettext
  ];
@@ -26,6 +30,7 @@ python3Packages.buildPythonPackage rec {
  dependencies = with python3Packages; [
    packaging
    pexpect
+    python-magic
    pyyaml
  ];

@@ -43,5 +48,6 @@ python3Packages.buildPythonPackage rec {
    homepage = "https://github.com/sosreport/sos";
    license = lib.licenses.gpl2Plus;
    maintainers = [ ];
+    platforms = lib.platforms.linux;
  };
 }
@@ -2,22 +2,25 @@
  buildNpmPackage,
  fetchFromGitHub,
  lib,
+  nix-update-script,
 }:
 buildNpmPackage rec {
  pname = "stylelint";
-  version = "17.0.0";
+  version = "17.11.0";

  src = fetchFromGitHub {
    owner = "stylelint";
    repo = "stylelint";
    tag = version;
-    hash = "sha256-LQqKAKVdFJkIZQDwv2X6dxGDFPZ3xdTQIx+8kAlijDU=";
+    hash = "sha256-mJGZ7zZ9Fi1VEVHWKu9CmKJsCLdmiHe3mqoGM0OGTRw=";
  };

-  npmDepsHash = "sha256-FdFM1Mo/P7jw+0nY8kR4ThTLJDxG8fp/tZiYSFzRSac=";
+  npmDepsHash = "sha256-RgXZgNEfx76XLrB4E8r/+a0Pi+82PVb/TOeUa0gFhTY=";

  dontNpmBuild = true;

+  passthru.updateScript = nix-update-script { };
+
  meta = {
    description = "Mighty CSS linter that helps you avoid errors and enforce conventions";
    mainProgram = "stylelint";
@@ -26,6 +26,11 @@ rustPlatform.buildRustPackage (finalAttrs: {

  cargoBuildFlags = [ "-p substudy" ];

+  checkFlags = [
+    # flaky: relies on sqlite ms timestamps differing across 3 quick inserts
+    "--skip=cache::tests::test_cache"
+  ];
+
  preCheck = ''
    # That's to make sure the `test_ai_request_static`
    # test has access to the cache at `$HOME/.cache`
@@ -2,31 +2,21 @@
  lib,
  python3,
  fetchFromGitHub,
-  fetchpatch,
  glibcLocales,
 }:

 python3.pkgs.buildPythonApplication (finalAttrs: {
  pname = "topydo";
-  version = "0.14";
+  version = "0.16";
  format = "setuptools";

  src = fetchFromGitHub {
    owner = "topydo";
    repo = "topydo";
-    rev = finalAttrs.version;
-    sha256 = "1lpfdai0pf90ffrzgmmkadbd86rb7250i3mglpkc82aj6prjm6yb";
+    tag = finalAttrs.version;
+    hash = "sha256-f31tp4VBMv1usViYN50IaGeyQpo3oRSf/WDz99UEpss=";
  };

-  patches = [
-    # fixes a failing test
-    (fetchpatch {
-      name = "update-a-test-reference-ics-file.patch";
-      url = "https://github.com/topydo/topydo/commit/9373bb4702b512b10f0357df3576c129901e3ac6.patch";
-      hash = "sha256-JpyQfryWSoJDdyzbrESWY+RmRbDw1myvTlsFK7+39iw=";
-    })
-  ];
-
  propagatedBuildInputs = with python3.pkgs; [
    arrow
    glibcLocales
@@ -44,7 +34,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
  # Skip test that has been reported multiple times upstream without result:
  # bram85/topydo#271, bram85/topydo#274.
  preCheck = ''
-    substituteInPlace test/test_revert_command.py --replace 'test_revert_ls' 'dont_test_revert_ls'
+    substituteInPlace test/test_revert_command.py --replace-fail 'test_revert_ls' 'dont_test_revert_ls'
  '';

  env.LC_ALL = "en_US.UTF-8";
@@ -18,6 +18,9 @@ stdenv.mkDerivation (finalAttrs: {

  buildInputs = [ ghostscript_headless ];

+  # gcc 15 defaults to C23 where bool is a keyword; u2ps does `typedef unsigned char bool;`
+  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
+
  meta = {
    description = "Unicode text to postscript converter";
    homepage = "https://github.com/arsv/u2ps";
@@ -1,20 +1,20 @@
 {
  lib,
-  buildGo125Module,
+  buildGo126Module,
  fetchFromGitHub,
  makeWrapper,
  nix-update-script,
 }:

-buildGo125Module (finalAttrs: {
+buildGo126Module (finalAttrs: {
  pname = "ugm";
-  version = "1.8.0";
+  version = "1.9.0";

  src = fetchFromGitHub {
    owner = "ariasmn";
    repo = "ugm";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-AkiAF9zLgyzXRC6efjQ+eeAL3mOSQM94B8nr09pcY5M=";
+    hash = "sha256-W4oHJAEppb17t1kxKxDF5fVZkqhOtvm7gCtlmSg7YFA=";
  };

  vendorHash = "sha256-W9v52cxhXdNyW5RGk+SoA1u7Yid+63YYdd9YaGKEWDs=";
@@ -8,14 +8,14 @@
 }:

 stdenv.mkDerivation (finalAttrs: {
-  version = "2.2";
+  version = "2.2.1";
  pname = "visualvm";

  src = fetchzip {
    url = "https://github.com/visualvm/visualvm.src/releases/download/${finalAttrs.version}/visualvm_${
      builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version
    }.zip";
-    sha256 = "sha256-xEqzSNM5Mkt9SQ+23Edb2NMN/o8koBjhQWTGuyZ/0m4=";
+    sha256 = "sha256-4Ub14FKOp2toMMuIaWJZ2pvE34UJ4m++Psoh8KdCe2M=";
  };

  desktopItem = makeDesktopItem {
@@ -0,0 +1,10 @@
+diff --git a/src/lib.rs b/src/lib.rs
+index 2f1090a..205d90d 100644
+--- a/src/lib.rs
+++ b/src/lib.rs
+@@ -1,3 +1,5 @@
+#![recursion_limit = "256"]
+
+ mod bar_items;
+ mod commands;
+ mod completions;
@@ -13,26 +13,34 @@
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "weechat-matrix-rs";
  version = "0-unstable-2025-10-09";
+
  src = fetchFromGitHub {
    owner = "poljar";
    repo = "weechat-matrix-rs";
    rev = "4cc5777b630ba4d6a9c964248531f283178a4717";
    hash = "sha256-CF4xDoRYey9F8/XSW/euNb8IjZXyP6k0Nj61shsmyEo=";
  };
+
+  patches = [ ./increase-recursion-limit.patch ];
+
  cargoHash = "sha256-jAlBCmLJfWWAUHd3ySB930iqAVXMh6ueba7xS///Rt0=";
+
  nativeBuildInputs = [
    pkg-config
    rustPlatform.bindgenHook
  ];
+
  buildInputs = [
    weechat
    openssl
    sqlite
  ];
+
  postInstall = ''
    mkdir -p $out/lib/weechat/plugins
    mv $out/lib/libmatrix${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/weechat/plugins/matrix${stdenv.hostPlatform.extensions.sharedLibrary}
  '';
+
  passthru.tests.load-plugin =
    runCommand "${finalAttrs.pname}-test-load"
      {
@@ -50,6 +58,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
          exit 1
        fi
      '';
+
  meta = {
    description = "Rust plugin for WeeChat to communicate over Matrix";
    homepage = "https://github.com/poljar/weechat-matrix-rs";
@@ -8,13 +8,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "z-lua";
-  version = "1.8.24";
+  version = "1.8.25";

  src = fetchFromGitHub {
    owner = "skywind3000";
    repo = "z.lua";
-    rev = finalAttrs.version;
-    sha256 = "sha256-1wsBXJd6QXgK4BCg+VTVDY95DP4+xFp0vAbKmztoREI=";
+    tag = "v${finalAttrs.version}";
+    sha256 = "sha256-S07YFyh6jKKQn8tpeTNReKLmpVxXzIF3jXCmst6B3+I=";
  };

  dontBuild = true;
@@ -15,8 +15,8 @@

  # https://www.aquamaniac.de/rdm/projects/aqbanking/files
  aqbanking = {
-    version = "6.8.2";
-    hash = "sha256-ELFMktdv8TZS4AtcSWABYB8NlGXFrLGxtoLUUQIkBuw=";
-    releaseId = "634";
+    version = "6.9.1";
+    hash = "sha256-/JSivr+7T8JrmNyTyPo2qAJimM15lfeYIcSA2zVYf2s=";
+    releaseId = "652";
  };
 }
@@ -0,0 +1,45 @@
+{
+  lib,
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytest-asyncio,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "autoskope-client";
+  version = "1.4.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "mcisk";
+    repo = "autoskope_client";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ThrI5BzjxVg4K1fvRZvPfDycAh4A9rm226FSpk3a/zs=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ aiohttp ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  disabledTestMarks = [
+    "integration"
+  ];
+
+  pythonImportsCheck = [ "autoskope_client" ];
+
+  meta = {
+    description = "Python client library for the Autoskope API";
+    homepage = "https://github.com/mcisk/autoskope_client";
+    changelog = "https://github.com/mcisk/autoskope_client/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ jamiemagee ];
+  };
+})
@@ -35,6 +35,6 @@ buildPythonPackage rec {
    homepage = "https://github.com/rustedpy/result";
    changelog = "https://github.com/rustedpy/result/blob/v${version}/CHANGELOG.md";
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ emattiza ];
+    maintainers = [ ];
  };
 }
@@ -508,7 +508,8 @@
      ];
    "autoskope" =
      ps: with ps; [
-      ]; # missing inputs: autoskope_client
+        autoskope-client
+      ];
    "avea" =
      ps: with ps; [
        avea
@@ -7519,6 +7520,7 @@
    "autarco"
    "auth"
    "automation"
+    "autoskope"
    "awair"
    "aws"
    "aws_s3"
@@ -1304,6 +1304,8 @@ self: super: with self; {

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

+  autoskope-client = callPackage ../development/python-modules/autoskope-client { };
+
  autoslot = callPackage ../development/python-modules/autoslot { };

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