Merge staging-next into staging

2025-09-03 12:31:44 +00:00
parent f3ba934626 9ae07d7c4c
commit f01c31373a
96 changed files with 6071 additions and 879 deletions
@@ -112,6 +112,8 @@

 - `rocmPackages.triton` has been removed in favor of `python3Packages.triton`.

+- `linpinyin`, which is used for Chinese character input, has migrated from the unmaintained BDB database format to the newer KyotoCabinet database format. If you want to migrate your user input statistics you can consider using [bdbtokyotodb](https://codeberg.org/raboof/bdbtokyotodb).
+
 - `go-mockery` has been updated to v3. For migration instructions see the [upstream documentation](https://vektra.github.io/mockery/latest/v3/). If v2 is still required `go-mockery_v2` has been added but will be removed on or before 2029-12-31 in-line with its [upstream support lifecycle](https://vektra.github.io/mockery/)

 - [private-gpt](https://github.com/zylon-ai/private-gpt) service has been removed by lack of maintenance upstream.
@@ -3707,6 +3707,12 @@
    githubId = 86652;
    name = "Bram Duvigneau";
  };
+  brancz = {
+    email = "frederic.branczyk@polarsignals.com";
+    name = "Frederic Branczyk";
+    github = "brancz";
+    githubId = 4546722;
+  };
  braydenjw = {
    email = "nixpkgs@willenborg.ca";
    github = "braydenjw";
@@ -16431,6 +16437,12 @@
    github = "merrkry";
    githubId = 124278440;
  };
+  metalmatze = {
+    email = "matthias.loibl@polarsignals.com";
+    name = "Matthias Loibl";
+    github = "metalmatze";
+    githubId = 872251;
+  };
  mevatron = {
    email = "mevatron@gmail.com";
    name = "mevatron";
@@ -150,6 +150,8 @@

 - The `services.siproxd` module has been removed as `siproxd` is unmaintained and broken with libosip 5.x.

+- `services.tor.torsocks.enable` no longer defaults to true if Tor and Tor client functionality is enabled.
+
 - `netbox-manage` script created by the `netbox` module no longer uses `sudo -u netbox` internally. It can be run as root and will change it's user to `netbox` using `runuser`

 - `services.gateone` has been removed as the package was removed such that it does not work.
@@ -7,6 +7,7 @@
 }:
 let
  cfg = config.services.paperless;
+  opt = options.services.paperless;

  defaultUser = "paperless";
  defaultFont = "${pkgs.liberation_ttf}/share/fonts/truetype/LiberationSerif-Regular.ttf";
@@ -328,7 +329,8 @@ in
    };

    domain = lib.mkOption {
-      type = lib.types.str;
+      type = with lib.types; nullOr str;
+      default = null;
      example = "paperless.example.com";
      description = "Domain under which paperless will be available.";
    };
@@ -387,6 +389,13 @@ in
  config = lib.mkIf cfg.enable (
    lib.mkMerge [
      {
+        assertions = [
+          {
+            assertion = cfg.configureNginx -> cfg.domain != null;
+            message = "${opt.configureNginx} requires ${opt.domain} to be configured.";
+          }
+        ];
+
        services.paperless.manage = manage;
        environment.systemPackages = [ manage ];

@@ -425,7 +434,7 @@ in
        };

        services.paperless.settings = lib.mkMerge [
-          (lib.mkIf (cfg.domain != "") {
+          (lib.mkIf (cfg.domain != null) {
            PAPERLESS_URL = "https://${cfg.domain}";
          })
          (lib.mkIf cfg.database.createLocally {
@@ -38,8 +38,7 @@ in
    services.tor.torsocks = {
      enable = lib.mkOption {
        type = lib.types.bool;
-        default = config.services.tor.enable && config.services.tor.client.enable;
-        defaultText = lib.literalExpression "config.services.tor.enable && config.services.tor.client.enable";
+        default = false;
        description = ''
          Whether to build `/etc/tor/torsocks.conf`
          containing the specified global torsocks configuration.
@@ -262,7 +262,7 @@ in
        viewPath = lib.mkDefault "${cfg.package}/share/hedgedoc/public/views";
      };

-      nginx = lib.mkIf cfg.configureNginx.enable {
+      nginx = lib.mkIf cfg.configureNginx {
        enable = true;
        upstreams.hedgedoc.servers."unix:${config.services.hedgedoc.settings.path}" = { };
        virtualHosts."${cfg.settings.domain}" = {
@@ -36,9 +36,14 @@

    with subtest("Manage script works"):
        # "shell" sucommand should succeed, needs python in PATH.
-        assert "foo\n" == machine.succeed("echo 'print(\"foo\")' | sudo -u healthchecks healthchecks-manage shell")
-
+        t.assertIn(
+          "\nfoo\n",
+          machine.succeed("echo 'print(\"foo\")' | sudo -u healthchecks healthchecks-manage shell")
+        )
        # Shouldn't fail if not called by healthchecks user
-        assert "foo\n" == machine.succeed("echo 'print(\"foo\")' | healthchecks-manage shell")
+        t.assertIn(
+          "\nfoo\n",
+          machine.succeed("echo 'print(\"foo\")' | healthchecks-manage shell")
+        )
  '';
 }
@@ -2912,14 +2912,6 @@ assertNoAdditions {
    ];
  });

-  perfanno-nvim = super.perfanno-nvim.overrideAttrs (old: {
-    dependencies = [ gperf ];
-
-    meta = old.meta // {
-      maintainers = with lib.maintainers; [ fredeb ];
-    };
-  });
-
  persisted-nvim = super.persisted-nvim.overrideAttrs {
    nvimSkipModules = [
      # /lua/persisted/init.lua:44: attempt to index upvalue 'config' (a nil value)
@@ -0,0 +1,45 @@
+{
+  lib,
+  vscode-utils,
+  gemini-cli,
+  vsce,
+}:
+vscode-utils.buildVscodeExtension (finalAttrs: {
+  pname = "gemini-cli-vscode-ide-companion";
+  inherit (gemini-cli) version;
+
+  vscodeExtPublisher = "Google";
+  vscodeExtName = "gemini-cli-vscode-ide-companion";
+  vscodeExtUniqueId = "${finalAttrs.vscodeExtPublisher}.${finalAttrs.vscodeExtName}";
+
+  src = gemini-cli.overrideAttrs (oldAttrs: {
+    pname = "gemini-cli-vscode-ide-companion-vsix";
+
+    nativeBuildInputs = gemini-cli.nativeBuildInputs ++ [ vsce ];
+
+    installPhase = ''
+      runHook preInstall
+
+      npm --workspace=gemini-cli-vscode-ide-companion run package -- --out $out
+
+      runHook postInstall
+    '';
+  });
+
+  unpackPhase = ''
+    runHook preUnpack
+
+    unzip $src
+
+    runHook postUnpack
+  '';
+
+  meta = {
+    description = "Enable Gemini CLI with direct access to your IDE workspace";
+    homepage = "https://github.com/google-gemini/gemini-cli";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=Google.gemini-cli-vscode-ide-companion";
+    license = lib.licenses.asl20;
+    sourceProvenance = with lib.sourceTypes; [ fromSource ];
+    maintainers = with lib.maintainers; [ xiaoxiangmoe ];
+  };
+})
@@ -2091,6 +2091,8 @@ let
        };
      };

+      Google.gemini-cli-vscode-ide-companion = callPackage ./Google.gemini-cli-vscode-ide-companion { };
+
      grapecity.gc-excelviewer = buildVscodeMarketplaceExtension {
        mktplcRef = {
          name = "gc-excelviewer";
@@ -477,10 +477,17 @@ let
      # Rebased variant of patch to build M126+ with LLVM 17.
      # staging-next will bump LLVM to 18, so we will be able to drop this soon.
      ./patches/chromium-126-llvm-17.patch
+    ]
+    ++ lib.optionals (!chromiumVersionAtLeast "140") [
      # Partial revert of https://github.com/chromium/chromium/commit/3687976b0c6d36cf4157419a24a39f6770098d61
      # allowing us to use our rustc and our clang.
      ./patches/chromium-129-rust.patch
    ]
+    ++ lib.optionals (chromiumVersionAtLeast "140") [
+      # Rebased variant of the patch above due to
+      # https://chromium-review.googlesource.com/c/chromium/src/+/6665907
+      ./patches/chromium-140-rust.patch
+    ]
    ++ lib.optionals (!ungoogled && !chromiumVersionAtLeast "136") [
      # Note: We since use LLVM v19.1+ on unstable *and* release-24.11 for all version and as such
      # no longer need this patch. We opt to arbitrarily limit it to versions prior to M136 just
@@ -547,21 +554,17 @@ let
    ];

    postPatch =
-      lib.optionalString (!isElectron)
-        # TODO: reuse mkGnFlags for this
-        (
-          if (chromiumVersionAtLeast "136") then
-            ''
-              cp ${./files/gclient_args.gni} build/config/gclient_args.gni
-              chmod u+w build/config/gclient_args.gni
-              echo 'checkout_mutter = false' >> build/config/gclient_args.gni
-              echo 'checkout_glic_e2e_tests = false' >> build/config/gclient_args.gni
-            ''
-          else
-            ''
-              ln -s ${./files/gclient_args.gni} build/config/gclient_args.gni
-            ''
-        )
+      # TODO: reuse mkGnFlags for this
+      # TODO: reflow
+      lib.optionalString (!isElectron) ''
+        cp ${./files/gclient_args.gni} build/config/gclient_args.gni
+        chmod u+w build/config/gclient_args.gni
+        echo 'checkout_mutter = false' >> build/config/gclient_args.gni
+        echo 'checkout_glic_e2e_tests = false' >> build/config/gclient_args.gni
+      ''
+      + lib.optionalString (!isElectron && chromiumVersionAtLeast "140") ''
+        echo 'checkout_clusterfuzz_data = false' >> build/config/gclient_args.gni
+      ''
      + lib.optionalString (!isElectron) ''

        echo 'LASTCHANGE=${upstream-info.DEPS."src".rev}-refs/tags/${version}@{#0}' > build/util/LASTCHANGE
@@ -1,28 +1,28 @@
 {
  "chromium": {
-    "version": "139.0.7258.154",
+    "version": "140.0.7339.80",
    "chromedriver": {
-      "version": "139.0.7258.155",
-      "hash_darwin": "sha256-9tHj/QSFz9fJTQ+xivOKbssqXsE53BHViy7uCZ4OMhc=",
-      "hash_darwin_aarch64": "sha256-fmflqWTiruKD/VtmNWllCA71tqaB0OIOUiXsmJOTJFI="
+      "version": "140.0.7339.81",
+      "hash_darwin": "sha256-T5VUbwBMWhZLMNp2KYzG6CxApgVXAWphxpG5Uexrz3s=",
+      "hash_darwin_aarch64": "sha256-44c01JbXgl55VpQDy9Ke+p9yj3FJ5MwTdYgDcBI20Ms="
    },
    "deps": {
      "depot_tools": {
-        "rev": "ea7a0baff0d8554cf6d38f525b4e7882c2b4ec18",
-        "hash": "sha256-UouvzNFStYScnyfIJcz1Om7cDhC7EyShZQ/Icu73BPo="
+        "rev": "7d1e2bdb9168718566caba63a170a67cdab2356b",
+        "hash": "sha256-ZOzKQpo7Z/h1eeWQj20ghDq7pFZ9nch8lt60aoK/g2k="
      },
      "gn": {
-        "version": "0-unstable-2025-06-19",
-        "rev": "97b68a0bb62b7528bc3491c7949d6804223c2b82",
-        "hash": "sha256-gwptzuirIdPAV9XCaAT09aM/fY7d6xgBU7oSu9C4tmE="
+        "version": "0-unstable-2025-07-29",
+        "rev": "3a4f5cea73eca32e9586e8145f97b04cbd4a1aee",
+        "hash": "sha256-Z7bTto8BHnJzjvmKmcVAZ0/BrXimcAETV6YGKNTorQw="
      },
      "npmHash": "sha256-R2gOpfPOUAmnsnUTIvzDPHuHNzL/b2fwlyyfTrywEcI="
    },
    "DEPS": {
      "src": {
        "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "9e0d6b2b47ffb17007b713429c9a302f9e43847f",
-        "hash": "sha256-L3cq3kx7hOv8bzwkQ+nyDM9VDzsvHaRzrSwrqwyCdHA=",
+        "rev": "670b6f192f4668d2ac2c06bd77ec3e4eeda7d648",
+        "hash": "sha256-tAiE11g/zymsOOjb64ZIA0GCGDV+6X5qlXUiU9vED/c=",
        "recompress": true
      },
      "src/third_party/clang-format/script": {
@@ -32,28 +32,28 @@
      },
      "src/third_party/compiler-rt/src": {
        "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git",
-        "rev": "2a4f69a118bdc5d03c415de1b9b166b2f1d4084f",
-        "hash": "sha256-RHh2WjV65ROxGPboxztrMUbxzVuPfAkLQkoooEOs7k0="
+        "rev": "dc425afb37a69b60c8c02fef815af29e91b61773",
+        "hash": "sha256-TANkUmIqP+MirWFmegENuJEFK+Ve/o0A0azuxTzeAo8="
      },
      "src/third_party/libc++/src": {
        "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
-        "rev": "2c359c239b138a20a03f798e47889448ef131c22",
-        "hash": "sha256-WbEMS4wowBw1j7UT/5G5DSmgy5ldmdjxMszYtobr9UI="
+        "rev": "adbb4a5210ae2a8a4e27fa6199221156c02a9b1a",
+        "hash": "sha256-34+xTZqWpm+1aks2b4nPD3WRJTkTxNj6ZjTuMveiQ+M="
      },
      "src/third_party/libc++abi/src": {
        "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
-        "rev": "e44c3c4560f1742744ef3f9fb4217a5f26ebca1b",
-        "hash": "sha256-WIJAAHO+n6C5N7nyw8m8xGXr/OXvRGfsScBBdUyjxyg="
+        "rev": "a6c815c69d55ec59d020abde636754d120b402ad",
+        "hash": "sha256-wO64dyP1O3mCBh/iiRkSzaWMkiDkb7B98Avd4SpnY70="
      },
      "src/third_party/libunwind/src": {
        "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
-        "rev": "5bbf35ae6801f579c523893176789774c0726e22",
-        "hash": "sha256-hpOxKXZkZEWNptp31B1DZ8V9E7LsRbbYdPdUD7EYA+8="
+        "rev": "84c5262b57147e9934c0a8f2302d989b44ec7093",
+        "hash": "sha256-GmLreEtoyHMXr6mZgZ7NS1ZaS9leB9eMbISeN7qmfqw="
      },
      "src/third_party/llvm-libc/src": {
        "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
-        "rev": "79a5aa1b7fcbdf3397bc2a08cbd6ef5c302dfb5a",
-        "hash": "sha256-lddA/+ol5crXlEmRa/JqWvnLTGmyKDUMTlTHC1pFLwc="
+        "rev": "6adc0aa946a413c124758a3a0ac12e5a536c7dd3",
+        "hash": "sha256-C5ZmMzhGdRAd9tpad8hnqM6RoXsunKSuYUoUQdsYclI="
      },
      "src/chrome/test/data/perf/canvas_bench": {
        "url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
@@ -72,8 +72,8 @@
      },
      "src/docs/website": {
        "url": "https://chromium.googlesource.com/website.git",
-        "rev": "a812d22617824ad2cd291e110378ccec5ae7735f",
-        "hash": "sha256-LNLHuhVKulsp0w+rXNqwC9Kh2QdouUvMX3ZNFJKv6t0="
+        "rev": "a89f6810f6a5b0e11e4ec00387e9f97e8f6c23ae",
+        "hash": "sha256-LH4TlXPBULUamqTDitDEXiB37705BzEAqX1Lan87eoM="
      },
      "src/media/cdm/api": {
        "url": "https://chromium.googlesource.com/chromium/cdm.git",
@@ -82,23 +82,18 @@
      },
      "src/net/third_party/quiche/src": {
        "url": "https://quiche.googlesource.com/quiche.git",
-        "rev": "823662119bac4eb4a2771a1d45a8c00b5c6737ce",
-        "hash": "sha256-YyNQ7RLkNzV2fbjKuwTT3BSL70Qntb2TY633sbKFD/I="
+        "rev": "42832178b3b6ae20f0d1c9634c040c528614f45f",
+        "hash": "sha256-ImjvS826eyo82TIDw6M/7h3lrwbCwxQ+oKJr8RaqDTc="
      },
      "src/testing/libfuzzer/fuzzers/wasm_corpus": {
        "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
        "rev": "1df5e50a45db9518a56ebb42cb020a94a090258b",
        "hash": "sha256-gItDOfNqm1tHlmelz3l2GGdiKi9adu1EpPP6U7+8EQY="
      },
-      "src/third_party/accessibility_test_framework/src": {
-        "url": "https://chromium.googlesource.com/external/github.com/google/Accessibility-Test-Framework-for-Android.git",
-        "rev": "4a764c690353ea136c82f1a696a70bf38d1ef5fe",
-        "hash": "sha256-mzVgoxxBWebesG6okyMxxmO6oH+TITA4o9ucHHMMzkQ="
-      },
      "src/third_party/angle": {
        "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "d9fc4a372074b1079c193c422fc4a180e79b6636",
-        "hash": "sha256-owMOjZEXhjXkEwzKdNVUk6Uzqdfp8UQq4JLDSvbvyeA="
+        "rev": "cbc4153da8d5796b0fbb3cf288e97bee19436191",
+        "hash": "sha256-lexJRf3EZexLgSuk8ziA+OUW+jTYlkXUPKHU/E6aUcY="
      },
      "src/third_party/angle/third_party/glmark2/src": {
        "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -112,13 +107,13 @@
      },
      "src/third_party/angle/third_party/VK-GL-CTS/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
-        "rev": "4c617fa74b67a177c7bde5f48c73f5a5509121ed",
-        "hash": "sha256-fl3yXkdi1KqrrmHB9k+l/eaINuFHgruUL6MB/9QXvhE="
+        "rev": "ad59a18f2ce08e60c9f4ab0aaf9b62679ab8c626",
+        "hash": "sha256-42ShMIXq9CnOlmwXcUvupPpQSNggdlXEkR3mdthsGzg="
      },
      "src/third_party/anonymous_tokens/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
-        "rev": "d708a2602a5947ee068f784daa1594a673d47c4a",
-        "hash": "sha256-GaRtZmYqajLUpt7ToRfMLBlyMiJB5yT9BaaT9pHH7OM="
+        "rev": "50b2ee441f1c3bad73ab7430c41fd1ea5a7a06a6",
+        "hash": "sha256-NiqQy4CEK8qWb2khi4zTSb3fAf3n9LvBsmceSeyQ+Q0="
      },
      "src/third_party/readability/src": {
        "url": "https://chromium.googlesource.com/external/github.com/mozilla/readability.git",
@@ -132,13 +127,13 @@
      },
      "src/third_party/dav1d/libdav1d": {
        "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git",
-        "rev": "63bf075aada99afa112f84c61ddc9cead8ce04d3",
-        "hash": "sha256-TD4RZSNOmlNFJQReViaNxMEgWhdXGccLazBzmd+MNs8="
+        "rev": "716164239ad6e6b11c5dcdaa3fb540309d499833",
+        "hash": "sha256-2J4M6EkfVtPLUpRWwzXdLkvJio4gskC0ihZnM5H3qYc="
      },
      "src/third_party/dawn": {
        "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "46b4670bc67cb4f6d34f6ce6a46ba7e1d6059abf",
-        "hash": "sha256-fLyP1ww4gtxOnT7FPWfjYS1+DIex+jfufCz7nZS6L10="
+        "rev": "8550f9c1ff8859d25cc49bdfacef083cff2c5121",
+        "hash": "sha256-gDtFhalOMFWR25XLVbYB/GE1lSQd1ClZ8h175qkC6PU="
      },
      "src/third_party/dawn/third_party/glfw": {
        "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -147,8 +142,8 @@
      },
      "src/third_party/dawn/third_party/dxc": {
        "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
-        "rev": "d1d0a31a7a6a039a35d3b8bc9586b23c57bea2a5",
-        "hash": "sha256-DCQVRuAEYOne4x2OJMr62HLx7kyan3Uj6UwXnxuDNpg="
+        "rev": "50764bac3d4048144e9ada5f5a742c82cc97cc9a",
+        "hash": "sha256-rs5cw/kpRq0Bcr2ov5kKsupwqkIQDvuvUMbZbAdOmGI="
      },
      "src/third_party/dawn/third_party/dxheaders": {
        "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
@@ -167,13 +162,13 @@
      },
      "src/third_party/dawn/third_party/webgpu-cts": {
        "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
-        "rev": "2a8d4a83f751286302ce34573409ad75cc318508",
-        "hash": "sha256-VUSsDgNHMiSCLDDicscMwskFu/qOzuz04mqYoFtnJF8="
+        "rev": "5b477670f53e5fefcf4bd829a2952013ef9d1953",
+        "hash": "sha256-os0yeQb6snDvUjYghrIYAy9nUi1j8Y2YoTfsiQ7SlpA="
      },
      "src/third_party/dawn/third_party/webgpu-headers/src": {
        "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers",
-        "rev": "4f617851dfa20bd240436d9255bcb7e4dbbb1e3f",
-        "hash": "sha256-ugbed1toiw7aY/v9E6akjFGARBe0/mhRZI9MSHG/JnI="
+        "rev": "c8b371dd2ff8a2b028fdc0206af5958521181ba8",
+        "hash": "sha256-rHDN4ln5kTMzabW427Xktl93E+8EVhWa2i8n4Mh2BgQ="
      },
      "src/third_party/highway/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/highway.git",
@@ -187,13 +182,13 @@
      },
      "src/third_party/boringssl/src": {
        "url": "https://boringssl.googlesource.com/boringssl.git",
-        "rev": "81be8eb2ca225281bb263ac09ece5370d6462a7d",
-        "hash": "sha256-/GYjjNmbj+bAYy5V15rRkZo54nUx0w0iAujBmTrc1/s="
+        "rev": "0a0009998fa180695f3e2071805dc03c9a5f3124",
+        "hash": "sha256-hYUbfUo00gHqYKac0vOpmBHtb5/FBsgXL+UQtrHxGaM="
      },
      "src/third_party/breakpad/breakpad": {
        "url": "https://chromium.googlesource.com/breakpad/breakpad.git",
-        "rev": "9d1f417714a6883f8d4e345c07802eb79edd2e90",
-        "hash": "sha256-yxeNERobO7TxJWUfppbBTysPMTifC2xzjUrN6Yzud+U="
+        "rev": "ff252ff6faf5e3a52dc4955aab0d84831697dc94",
+        "hash": "sha256-8OfbSe+ly/5FFYk8NubAV39ACMr5S4wbLBVdiQHWeok="
      },
      "src/third_party/cast_core/public/src": {
        "url": "https://chromium.googlesource.com/cast_core/public",
@@ -202,8 +197,8 @@
      },
      "src/third_party/catapult": {
        "url": "https://chromium.googlesource.com/catapult.git",
-        "rev": "c4f7831fe85d210ed50572e54d0cb1a26ccc401a",
-        "hash": "sha256-EKObRlHf5Cu7VyntXR2DC62KaBTciAyvSywyAt5gWy8="
+        "rev": "0fd1415f0cf3219ba097d37336141897fab7c5e9",
+        "hash": "sha256-khxdFV6fxbTazz195MlxktLlihXytpNYCykLrI8nftM="
      },
      "src/third_party/ced/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
@@ -227,8 +222,8 @@
      },
      "src/third_party/cpuinfo/src": {
        "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git",
-        "rev": "d7427551d6531037da216d20cd36feb19ed4905f",
-        "hash": "sha256-gJgvE3823NyVOIL0Grkldde3U/N9NNqlLAA0btj3TSg="
+        "rev": "33ed0be77d7767d0e2010e2c3cf972ef36c7c307",
+        "hash": "sha256-0rZzbZkOo6DAt1YnH4rtx0FvmCuYH8M6X3DNJ0gURpU="
      },
      "src/third_party/crc32c/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git",
@@ -237,23 +232,28 @@
      },
      "src/third_party/cros_system_api": {
        "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
-        "rev": "349c5cb547162b967df40a336fc08bb18819a5e1",
-        "hash": "sha256-nSU/Od8TupR6dOVr6XC9btwUkjbQ6m3Oh3tChYo5i4g="
+        "rev": "07b9fafa3fff468afa2960789d2b28444c38db3e",
+        "hash": "sha256-JpimNp8PmsROMiQLy8H39n8l+KDwaivZiIOgSjLF3U4="
      },
      "src/third_party/crossbench": {
        "url": "https://chromium.googlesource.com/crossbench.git",
-        "rev": "77308ff3c8445656fd104cd80e3bd933b23cb05d",
-        "hash": "sha256-ONQSTRjrleGERU2ioaCKBcpYT1vhad4hYj/x0MIOh1Q="
+        "rev": "69b7e2bb8e1d8d92d4efbb92bcddba3af2716577",
+        "hash": "sha256-1cyXu5fSHWLWt3qdafWQu1WyeZ+fT/be7seiv/MDPdQ="
+      },
+      "src/third_party/crossbench-web-tests": {
+        "url": "https://chromium.googlesource.com/chromium/web-tests.git",
+        "rev": "3c76c8201f0732fe9781742229ab8ac43bf90cbf",
+        "hash": "sha256-yJmi1IpUiKhdoHAXyazkpm+Ezuc4Hp8pOIBntG5hN+U="
      },
      "src/third_party/depot_tools": {
        "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
-        "rev": "ea7a0baff0d8554cf6d38f525b4e7882c2b4ec18",
-        "hash": "sha256-UouvzNFStYScnyfIJcz1Om7cDhC7EyShZQ/Icu73BPo="
+        "rev": "7d1e2bdb9168718566caba63a170a67cdab2356b",
+        "hash": "sha256-ZOzKQpo7Z/h1eeWQj20ghDq7pFZ9nch8lt60aoK/g2k="
      },
      "src/third_party/devtools-frontend/src": {
        "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "bc417052ebef6175721d690a4910e717d92181be",
-        "hash": "sha256-XoI3HbIV52VWbw15Lsk/gwmy09EtenD7iwXVQse5uVs="
+        "rev": "ab96665ae2cfcc054e0243461cfcb56bb016f71a",
+        "hash": "sha256-8G9OCH5xapLf83bXrKwygCrzwF8C9H2NfnIrDbL+uCc="
      },
      "src/third_party/dom_distiller_js/dist": {
        "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -267,8 +267,8 @@
      },
      "src/third_party/eigen3/src": {
        "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
-        "rev": "d0b490ee091629068e0c11953419eb089f9e6bb2",
-        "hash": "sha256-EmpuOQxshAFa0d6Ddzz6dy21nxHhSn+6Aiz18/o8VUU="
+        "rev": "81044ec13df7608d0d9d86aff2ef9805fc69bed1",
+        "hash": "sha256-W0uonGzjDaN2RbY2U+Kl1a5/nrEZ9T9W426f+a7NUzY="
      },
      "src/third_party/farmhash/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git",
@@ -282,8 +282,8 @@
      },
      "src/third_party/ffmpeg": {
        "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git",
-        "rev": "dcdd0fa51b65a0b1688ff6b8f0cc81908f09ded2",
-        "hash": "sha256-noc3iZ1yCEgkwWyznx48rXC8JuKxla9QgC/CIjRL/y8="
+        "rev": "d2d06b12c22d27af58114e779270521074ff1f85",
+        "hash": "sha256-c5w8CuyE1J0g79lrNq1stdqc1JaAkMbtscdcywmAEMY="
      },
      "src/third_party/flac": {
        "url": "https://chromium.googlesource.com/chromium/deps/flac.git",
@@ -297,8 +297,8 @@
      },
      "src/third_party/fontconfig/src": {
        "url": "https://chromium.googlesource.com/external/fontconfig.git",
-        "rev": "c527fe1452d469e5fa1a211180dd40bcdb79fb2a",
-        "hash": "sha256-dmzY7TcNpZA9SxHn5nN0IaTzBbwCqd1PV5Sg4RuY7aI="
+        "rev": "86b48ec01ece451d5270d0c5181a43151e45a042",
+        "hash": "sha256-6HLV0U/MA1XprKJ70TKvwUBdkGQPwgqP4Oj5dINsKp0="
      },
      "src/third_party/fp16/src": {
        "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git",
@@ -312,8 +312,8 @@
      },
      "src/third_party/freetype/src": {
        "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
-        "rev": "43940e4cb8fa6fec96cd52669544629c5eef58fa",
-        "hash": "sha256-1fnH0Qm9qtzjwBNlyHVQrVvvFelKIdhFMhA0zDxQVUY="
+        "rev": "27c1cb10a52420515ce66729dfca897be21691b8",
+        "hash": "sha256-2ialoA/hqlTwnbBkBlgz5CT2nzpUVXVMtEOxSxifiXQ="
      },
      "src/third_party/fxdiv/src": {
        "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git",
@@ -357,8 +357,8 @@
      },
      "src/third_party/googletest/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git",
-        "rev": "35b75a2cba6ef72b7ce2b6b94b05c54ca07df866",
-        "hash": "sha256-wB33XoxaMQuBls7tNIJ1u61ocKaMw4PyHXBXf/bMNTM="
+        "rev": "373af2e3df71599b87a40ce0e37164523849166b",
+        "hash": "sha256-07pEo2gj3n/IOipqz7UpZkBOywZt7FkfZFCnVyp3xYw="
      },
      "src/third_party/hunspell_dictionaries": {
        "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git",
@@ -367,8 +367,8 @@
      },
      "src/third_party/icu": {
        "url": "https://chromium.googlesource.com/chromium/deps/icu.git",
-        "rev": "b929596baebf0ab4ac7ec07f38365db4c50a559d",
-        "hash": "sha256-/T7uyzwTCDaamLwSvutvbn6BJuoG1RqeR+xhXI5jmJw="
+        "rev": "1b2e3e8a421efae36141a7b932b41e315b089af8",
+        "hash": "sha256-k3z31DhDPoqjcZdUL4vjyUMVpUiNk44+7rCMTDVPH8Q="
      },
      "src/third_party/jsoncpp/source": {
        "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git",
@@ -382,13 +382,13 @@
      },
      "src/third_party/libFuzzer/src": {
        "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git",
-        "rev": "e31b99917861f891308269c36a32363b120126bb",
-        "hash": "sha256-Lb+HczYax0T7qvC0/Nwhc5l2szQTUYDouWRMD/Qz7sA="
+        "rev": "bea408a6e01f0f7e6c82a43121fe3af4506c932e",
+        "hash": "sha256-TDi1OvYClJKmEDikanKVTmy8uxUXJ95nuVKo5u+uFPM="
      },
      "src/third_party/fuzztest/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
-        "rev": "45a1c3ad5ac3de58c8e9a3f89036e3f954820d4c",
-        "hash": "sha256-qNGviVNU5VKCVQ1KkGmjGAaXF+ijL3s/u2yN+Ee5rmo="
+        "rev": "7bab06ff5fbbf8b8cce05a8661369dc2e11cde66",
+        "hash": "sha256-uWPhInzuidI4smFRjRF95aaVNTsehKd/1y4uRzr12mk="
      },
      "src/third_party/domato/src": {
        "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git",
@@ -402,18 +402,18 @@
      },
      "src/third_party/libaom/source/libaom": {
        "url": "https://aomedia.googlesource.com/aom.git",
-        "rev": "90c632fc6c01cd8637186c783ca8012bab3c3260",
-        "hash": "sha256-e+rUkNOakv6WQrgx1ozoJTynk/GZy1zdsnYX4oz+6ks="
+        "rev": "e91b7aa26d6d0979bba2bee5e1c27a7a695e0226",
+        "hash": "sha256-cER77Q9cM5rh+oeh1LDyKDZyQK5VbtE/ANNTN2cYzMo="
      },
      "src/third_party/crabbyavif/src": {
        "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
-        "rev": "eb883022a5886739f07f0241f918e2be97d65ff0",
-        "hash": "sha256-IxtMAqN3O/s1GrVKzcge9cQ+DVtJtFvHYvsfjmflwVQ="
+        "rev": "644c9d84c123ac811a611760a9adc807e3eb5be5",
+        "hash": "sha256-snogXm3EMmDJoL2ikoaxeODYfmTaVEsAb5cMcRU7uC4="
      },
      "src/third_party/nearby/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
-        "rev": "fff5c22e3178a633f57e4ad1fb5ad96a6116240a",
-        "hash": "sha256-2mXmDWn292dNA85EUN5sxarOle5HEW5t526SM1UPeKg="
+        "rev": "a8889d12a27ef7006d1a47dfefc272e0815f5c41",
+        "hash": "sha256-pFcusmbij3OsSAmaKhuI8/bo3AlfP7DuTo/W/6mAZs8="
      },
      "src/third_party/securemessage/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git",
@@ -422,8 +422,8 @@
      },
      "src/third_party/jetstream/main": {
        "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
-        "rev": "6947a460f6b55ef5613c36263049ecf74c5ec1cd",
-        "hash": "sha256-lbsSiSRY3IikAKg30/gK3ncPxzOMhOUSQxvUIUCtJB0="
+        "rev": "fe1f348226d4b7c3447e606577960a606cc058e4",
+        "hash": "sha256-kznek87yenGR9Ft3D06LGDOy7+VPRhSUFru340mvES4="
      },
      "src/third_party/jetstream/v2.2": {
        "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
@@ -432,8 +432,8 @@
      },
      "src/third_party/speedometer/main": {
        "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
-        "rev": "ba41f91e480cfd79c97a9d1d70a4c3d42d16c72b",
-        "hash": "sha256-DIXGY1wVj2W5A91X3A2eL6Tr+CVdKhHaGHtSqBRjtPQ="
+        "rev": "87f9ed88c8f8abe3a3bb19b9ec5ea49623d803ad",
+        "hash": "sha256-eIrkM7UxuaZox3A8pqEgvgpQCkcBO3zJWFwK45fgWm0="
      },
      "src/third_party/speedometer/v3.1": {
        "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
@@ -462,8 +462,8 @@
      },
      "src/third_party/cros-components/src": {
        "url": "https://chromium.googlesource.com/external/google3/cros_components.git",
-        "rev": "97dc8c7a1df880206cc54d9913a7e9d73677072a",
-        "hash": "sha256-CT9c4LqTwhldsxoEny8MesULwQC4k95F4tfCtRZErGM="
+        "rev": "7ccdbf60606671c2c057628125908fbfef9bd0c8",
+        "hash": "sha256-g7LzBd2V21AaLdSdCw65WGYvKfrbtpRXsYc+3ILdiKs="
      },
      "src/third_party/libdrm/src": {
        "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git",
@@ -517,23 +517,23 @@
      },
      "src/third_party/libvpx/source/libvpx": {
        "url": "https://chromium.googlesource.com/webm/libvpx.git",
-        "rev": "686bf6f1cde888898498f89ba9aefa66b683566a",
-        "hash": "sha256-rdeALLoqK1bth/EQY86fZC++QgMFCYyn7qMxsh9CMj0="
+        "rev": "a985e5e847a2fe69bef3e547cf25088132194e39",
+        "hash": "sha256-BbXiBbnGwdsbZCZIpurfTzYvDUCysdt+ocRh6xvuUI8="
      },
      "src/third_party/libwebm/source": {
        "url": "https://chromium.googlesource.com/webm/libwebm.git",
-        "rev": "c4522d6cd68582d66f1adfd24debfa9bee202afa",
-        "hash": "sha256-tfji0yPV7v/DETViEp2T7AO6P5xCjPYScTlV3eWFV0w="
+        "rev": "f2a982d748b80586ae53b89a2e6ebbc305848b8c",
+        "hash": "sha256-SxDGt7nPVkSxwRF/lMmcch1h+C2Dyh6GZUXoZjnXWb4="
      },
      "src/third_party/libwebp/src": {
        "url": "https://chromium.googlesource.com/webm/libwebp.git",
-        "rev": "2af6c034ac871c967e04c8c9f8bf2dbc2e271b18",
-        "hash": "sha256-0sKGhXr6Rrpq0eoitAdLQ4l4fgNOzMWIEICrPyzwNz4="
+        "rev": "4fa21912338357f89e4fd51cf2368325b59e9bd9",
+        "hash": "sha256-eaGWMpF6ENrKxGxqXccQ0P1G0X+nQI0EoL0Y0R2VVZ0="
      },
      "src/third_party/libyuv": {
        "url": "https://chromium.googlesource.com/libyuv/libyuv.git",
-        "rev": "88798bcd636a93e92d69242da914deb4cec1dfb6",
-        "hash": "sha256-HPhxj3iK1YjWcfKT4o5CXhmvMBoGaA4JKco2HDf0Nec="
+        "rev": "cdd3bae84818e78466fec1ce954eead8f403d10c",
+        "hash": "sha256-ievGlutmOuuEEhWS82vMqxwqXCq8PF3508N0MCMPQus="
      },
      "src/third_party/lss": {
        "url": "https://chromium.googlesource.com/linux-syscall-support.git",
@@ -567,8 +567,8 @@
      },
      "src/third_party/openscreen/src": {
        "url": "https://chromium.googlesource.com/openscreen",
-        "rev": "dd421dc540e75bd4e52388dcb0656d4d96137a73",
-        "hash": "sha256-Bk9pD6fKdHBgnJOgqv8frA7+4WFBh837h9fXFgEebK8="
+        "rev": "f51be2dd676c855bc588a439f002bc941b87db6b",
+        "hash": "sha256-7AmfZjugPKty0lpinOR/Q22M7F34p57tl+gs6s2BJhY="
      },
      "src/third_party/openscreen/src/buildtools": {
        "url": "https://chromium.googlesource.com/chromium/src/buildtools",
@@ -582,13 +582,13 @@
      },
      "src/third_party/pdfium": {
        "url": "https://pdfium.googlesource.com/pdfium.git",
-        "rev": "bbdc38bc2d1693f56154f78eb5d4ff296d8ca3da",
-        "hash": "sha256-LYo73KuSVBEcRN1PqG0EBFeKaLy66UPtZ3DMHP5YVXM="
+        "rev": "1afaa1a380fcd06cec420f3e5b6ec1d2ccb920dc",
+        "hash": "sha256-kx2jF4kHeGECdf6WzcRKTmwhvmoKl+rIVQ2Ep8Y9rs8="
      },
      "src/third_party/perfetto": {
        "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
-        "rev": "18d4fdc15d027a989db705592585b924f93f1d42",
-        "hash": "sha256-ZmP/EFuFo9/xax8f+NEdGthfdAR/8+cTWoM9XPrkpcQ="
+        "rev": "4ab725613a8ee64e9acd7930eceb8995e24df562",
+        "hash": "sha256-V16Fm389yRNn0b13n70828c8xTdwxoQ6GW8iKLyy0qE="
      },
      "src/third_party/protobuf-javascript/src": {
        "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
@@ -597,8 +597,8 @@
      },
      "src/third_party/pthreadpool/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git",
-        "rev": "dcc9f28589066af0dbd4555579281230abbf74dd",
-        "hash": "sha256-qogacGPNy6SKQaK8CZvGC8YZbVjhDTXuhDqGopB0Eps="
+        "rev": "149f0a86f5ad215e9f0441684385ce09f345dbe4",
+        "hash": "sha256-3/FnJ2FL6fQSlymqJS/UoXTB4ZiW9d7xpvK3Ur8Ynp4="
      },
      "src/third_party/pyelftools": {
        "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git",
@@ -617,23 +617,23 @@
      },
      "src/third_party/re2/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/re2.git",
-        "rev": "c84a140c93352cdabbfb547c531be34515b12228",
-        "hash": "sha256-f/k2rloV2Nwb0KuJGUX4SijFxAx69EXcsXOG4vo+Kis="
+        "rev": "8451125897dd7816a5c118925e8e42309d598ecc",
+        "hash": "sha256-vjh4HI4JKCMAf5SZeqstb0M01w8ssaTwwrLAUsrFkkQ="
      },
      "src/third_party/ruy/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git",
-        "rev": "83fd40d730feb0804fafbc2d8814bcc19a17b2e5",
-        "hash": "sha256-O3JEtXchCdIHdGvjD6kGMJzj7TWVczQCW2YUHK3cABA="
+        "rev": "9940fbf1e0c0863907e77e0600b99bb3e2bc2b9f",
+        "hash": "sha256-fV0El2ZgjxLqstKVN35SL72+diHNK0FkBmG5UwVZFrk="
      },
      "src/third_party/search_engines_data/resources": {
        "url": "https://chromium.googlesource.com/external/search_engines_data.git",
-        "rev": "273082bef7b1bc05eddb5079b83702938e40c677",
-        "hash": "sha256-FrEUhG9G7EMiOvih0/FSlpWIuA3/wyBaQZLapYcutz4="
+        "rev": "5c5db51f8c13cb42379d8b333890971f1a1a1797",
+        "hash": "sha256-Z4ykCZkUVatvkH3ytIdGOp0zEYLKIqr8fta0MnovZKw="
      },
      "src/third_party/skia": {
        "url": "https://skia.googlesource.com/skia.git",
-        "rev": "4abe0638e35d34b6fdb70f1f5ce0f0e1879a021e",
-        "hash": "sha256-hy06/Sy+rEzNyFv9R2Kg9kX7XIpCbQwCr5VjEH9CtKM="
+        "rev": "1fdbea293a53b270e3f5e74c92cc6670d68412ff",
+        "hash": "sha256-YiGzqaht1r8/dDz0C4fpKsPEIplm33dPce2UpLkYTZ0="
      },
      "src/third_party/smhasher/src": {
        "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -652,8 +652,8 @@
      },
      "src/third_party/swiftshader": {
        "url": "https://swiftshader.googlesource.com/SwiftShader.git",
-        "rev": "ed01d9931de34d3a6fb4d615050db5080d9cea16",
-        "hash": "sha256-is6sl3vRLyBjiHg97rI7WvxIiKg6eelqNfrZGTWPBtM="
+        "rev": "fdb6700ecb04103b658d2e4623d6bc663ba80ea8",
+        "hash": "sha256-jJT0hF1k5a6na+9aH1yHuUo6go/PzgKibP/k60m6+xM="
      },
      "src/third_party/text-fragments-polyfill/src": {
        "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
@@ -662,18 +662,18 @@
      },
      "src/third_party/tflite/src": {
        "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
-        "rev": "e6c5574b82d7950f978447704a70971c478f0f50",
-        "hash": "sha256-zdd0y0OILYoRhZ3O64g9MFdWLnAVJiM+CJUIN2RfmKo="
+        "rev": "fe38b1b8c23d86ed93c13ef367b19496e398462d",
+        "hash": "sha256-51tpID94hoxm0I2Mf3WFQBf5MsuzIzlkS9lOto/8tC4="
      },
      "src/third_party/vulkan-deps": {
        "url": "https://chromium.googlesource.com/vulkan-deps",
-        "rev": "f227ce323fb5a2fee1a98b6feea54b0e42b2f30d",
-        "hash": "sha256-8GHLg9S6f/k2XPgqeeZ6UCBQBoHuABdPYhpGecyqo+E="
+        "rev": "c466059b72815c7fbce8bb3ab4832407aabc5dc5",
+        "hash": "sha256-MEMOJBBMBeA0kBlU5ZhkPbfRpn1PSL1950IsU1rWaJ8="
      },
      "src/third_party/glslang/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
-        "rev": "d176fb41992d5c091fb1c401e4e70306382e67fc",
-        "hash": "sha256-27C9ZokeehkoFdIpiYkQ6PBgcNUq0kVLl4tvcgFrYLg="
+        "rev": "38f6708b6b6f213010c51ffa8f577a7751e12ce7",
+        "hash": "sha256-HeH7j7IsjeP2vFPhX9cKzZ2O54eIGSCoSnPT4pumA00="
      },
      "src/third_party/spirv-cross/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
@@ -682,48 +682,43 @@
      },
      "src/third_party/spirv-headers/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
-        "rev": "2a611a970fdbc41ac2e3e328802aed9985352dca",
-        "hash": "sha256-LRjMy9xtOErbJbMh+g2IKXfmo/hWpegZM72F8E122oY="
+        "rev": "97e96f9e9defeb4bba3cfbd034dec516671dd7a3",
+        "hash": "sha256-/OT6//yu8VmQMXs3DSgwEx2lMDTPlUuXJDjboNdLjrI="
      },
      "src/third_party/spirv-tools/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
-        "rev": "33e02568181e3312f49a3cf33df470bf96ef293a",
-        "hash": "sha256-yAdd/mXY8EJnE0vCu0n/aVxMH9059T/7cAdB9nP1vQQ="
+        "rev": "3aeaaa088d37b86cff036eee1a9bf452abad7d9d",
+        "hash": "sha256-bkoD3/4o/CjNBAp49vnRq4ZtY7TNgYkVPI5gESM8CUI="
      },
      "src/third_party/vulkan-headers/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
-        "rev": "10739e8e00a7b6f74d22dd0a547f1406ff1f5eb9",
-        "hash": "sha256-OorBl9vIN4DqVgT8ae+05yCLon7m0ixQczEzDlpwFRI="
+        "rev": "a01329f307fa6067da824de9f587f292d761680b",
+        "hash": "sha256-LCRK6UzqvcRoa3sr6nsfkDf3aILXj8zjb48lirsLTIw="
      },
      "src/third_party/vulkan-loader/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
-        "rev": "342da33fdec78d269657194c9082835d647d2e68",
-        "hash": "sha256-G+sTBXuBodkXi7njI0foXTqaxchsWD9XtF9UBsknE30="
+        "rev": "f2389e27734347c1d9f40e03be53f69f969976b1",
+        "hash": "sha256-NIBn5HkAKzNaSruw742QBWPgCkrxQdmITvTASagYlKM="
      },
      "src/third_party/vulkan-tools/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
-        "rev": "e3fc64396755191b3c51e5c57d0454872e7fa487",
-        "hash": "sha256-EqLG8kMQx6nHX9iZMrsu0fn1z4nY6TEQ/feTINNbUzQ="
+        "rev": "f766b30b2de3ffe2cf6b656d943720882617ec58",
+        "hash": "sha256-9sF9syF7d28J5yzGsIHUcJ1QB2JmJZpAVqDt92ZZOY4="
      },
      "src/third_party/vulkan-utility-libraries/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
-        "rev": "72665ee1e50db3d949080df8d727dffa8067f5f8",
-        "hash": "sha256-FSk/LeYCt/XeF8XJZtr+DoNbvMmfFIKUaYvmeq5xK+w="
+        "rev": "b0a40d2e50310e9f84327061290a390a061125a3",
+        "hash": "sha256-bj9YCZfIFeaQ9TVpyyztRs3LOIaJkKpkGKbU5g9hEzg="
      },
      "src/third_party/vulkan-validation-layers/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
-        "rev": "e086a717059f54c94d090998628250ae8f238fd6",
-        "hash": "sha256-KF06qgduM4rAVs4MHvdS+QZs+3srB+p1NadQYTzc0OM="
+        "rev": "6b1b8e3d259241a68c0944ca0a7bb5320d086191",
+        "hash": "sha256-Do+6/v8Ysp1Wnnmdi5I+UKHpBcEG4xMeRROCWgLmJbY="
      },
      "src/third_party/vulkan_memory_allocator": {
        "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
-        "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21",
-        "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ="
-      },
-      "src/third_party/wasm_tts_engine/src": {
-        "url": "https://chromium.googlesource.com/chromium/wasm-tts-engine",
-        "rev": "352880bb49e2410707543c252ef6b94a21b0f47f",
-        "hash": "sha256-TFkniS4XvP0RlPnI1lv4RxxSY44RUuwCMKmmybENEBw="
+        "rev": "cb0597213b0fcb999caa9ed08c2f88dc45eb7d50",
+        "hash": "sha256-yBCs3zfqs/60htsZAOscjcyKhVbAWE6znweuXcs1oKo="
      },
      "src/third_party/wayland/src": {
        "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git",
@@ -732,8 +727,8 @@
      },
      "src/third_party/wayland-protocols/src": {
        "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git",
-        "rev": "7d5a3a8b494ae44cd9651f9505e88a250082765e",
-        "hash": "sha256-o/adWEXYSqWib6KoK7XMCWbojapcS4O/CEPxv7iFCw8="
+        "rev": "efbc060534be948b63e1f395d69b583eebba3235",
+        "hash": "sha256-tdpEK7soY0aKSk6VD4nulH7ORubX8RfjXYmNAd/cWKY="
      },
      "src/third_party/wayland-protocols/kde": {
        "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git",
@@ -757,18 +752,18 @@
      },
      "src/third_party/webgpu-cts/src": {
        "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
-        "rev": "2a8d4a83f751286302ce34573409ad75cc318508",
-        "hash": "sha256-VUSsDgNHMiSCLDDicscMwskFu/qOzuz04mqYoFtnJF8="
+        "rev": "07f4412e935c988d60fad2e373287d6450bcd231",
+        "hash": "sha256-yb7NqciuvXi7crCqpN+7hgJ+JXfDF9x48gkYI2uSTtA="
      },
      "src/third_party/webpagereplay": {
        "url": "https://chromium.googlesource.com/webpagereplay.git",
-        "rev": "f3397454e39a7c0b35af192e6d8a1896af7bd9ec",
-        "hash": "sha256-saa07zzzbehOm4gIMoGVB0AZ2nLqmjnT5IfYBSsnZIw="
+        "rev": "eebd5c62cb5c6a5afbb36eccdcc3b3e01f28adc9",
+        "hash": "sha256-WXiWUVTX4JBuavc3qxPpWeM2qZsyMr64iqF/fu9fzRI="
      },
      "src/third_party/webrtc": {
        "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "23d8e44f84822170bee4425760b44237959423e5",
-        "hash": "sha256-8IETxHh2Lcgc2N0pV0kTEsbOAchsgwj6VZVDAcVssxw="
+        "rev": "847fe7905954f3ae883de2936415ff567aa9039b",
+        "hash": "sha256-kcK1kJdPCkXbEFuS+b6wKUBaKLXmkAEwVKp4/YWDv8s="
      },
      "src/third_party/wuffs/src": {
        "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -787,8 +782,8 @@
      },
      "src/third_party/xnnpack/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
-        "rev": "3c99186b3276aa891f94ebba35f6b16e627d57de",
-        "hash": "sha256-CXX0F2H0WjgOxV2iD8bizj1JZOknry7qTmtsv9yAJFU="
+        "rev": "ae40b1a2d93d5c516bc7657c6c3eea1470f917ae",
+        "hash": "sha256-w+8aCRTlBWQcDh4EvAF87eiLmQWsIsxD9adPTnuA12E="
      },
      "src/third_party/zstd/src": {
        "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
@@ -797,8 +792,8 @@
      },
      "src/v8": {
        "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "a0a7886d6b3707be8d4b403e463fa82fdb3f216c",
-        "hash": "sha256-KjIBJw40hiBkcHNn96dD5iZs2n2HMWIkAJ6ND2+5JJQ="
+        "rev": "fdb12b460f148895f6af2ff0e0d870ff8889f154",
+        "hash": "sha256-x8a8VYFrAZ0huj3WRlczrhg0quXx4cztz8nDs9ToWYg="
      }
    }
  },
@@ -0,0 +1,21 @@
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index 77b02f76d2845fdf1a9429f704e59b8f7ab42993..e6ce3abe9872f415a9ef1cfc76f7267e7e44e1c9 100644
+--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
+@@ -1917,16 +1917,6 @@ config("runtime_library") {
+     configs += [ "//build/config/c++:runtime_library" ]
+   }
+ 
+-  # Rust and C++ both provide intrinsics for LLVM to call for math operations. We
+-  # want to use the C++ intrinsics, not the ones in the Rust compiler_builtins
+-  # library. The Rust symbols are marked as weak, so that they can be replaced by
+-  # the C++ symbols. This config ensures the C++ symbols exist and are strong in
+-  # order to cause that replacement to occur by explicitly linking in clang's
+-  # compiler-rt library.
+-  if (is_clang && !is_cronet_build) {
+-    configs += [ "//build/config/clang:compiler_builtins" ]
+-  }
+-
+   # TODO(crbug.com/40570904): Come up with a better name for is POSIX + Fuchsia
+   # configuration.
+   if (is_posix || is_fuchsia) {
@@ -153,7 +153,7 @@ async function get_gitiles_commit_date(base_url, rev) {
  const response = await (await fetch(url)).text()
  const json = JSON.parse(response.replace(`)]}'\n`, ''))

-  const date = new Date(json.commiter.time)
+  const date = new Date(json.committer.time)
  return date.toISOString().split("T")[0]
 }

@@ -98,13 +98,18 @@ stdenv.mkDerivation (finalAttrs: {
    })
  ];

+  postPatch = ''
+    substituteInPlace systemd/anydesk.service --replace-fail "/usr/bin/anydesk" "$out/bin/anydesk"
+  '';
+
  installPhase = ''
    runHook preInstall

-    mkdir -p $out/bin $out/share/{applications,doc/anydesk,icons/hicolor}
+    mkdir -p $out/bin $out/share/{applications,doc/anydesk,icons/hicolor} $out/lib/systemd/system
    install -m755 anydesk $out/bin/anydesk
    cp copyright README $out/share/doc/anydesk
    cp -r icons/hicolor/* $out/share/icons/hicolor/
+    cp systemd/anydesk.service $out/lib/systemd/system/anydesk.service

    runHook postInstall
  '';
@@ -29,6 +29,7 @@ in
 {
  plugins,
  hash ? fakeHash,
+  doInstallCheck ? true,
 }:

 let
@@ -83,43 +84,70 @@ caddy.overrideAttrs (

    # xcaddy built output always uses pseudo-version number
    # we enforce user provided plugins are present and have matching tags here
-    doInstallCheck = true;
+    inherit doInstallCheck;
    installCheckPhase = ''
      runHook preInstallCheck

+      declare -A modules errors
      ${toShellVar "notfound" pluginsSorted}

-      while read kind module version; do
-        [[ "$kind" = "dep" ]] || continue
-        module="''${module}@''${version}"
-        for i in "''${!notfound[@]}"; do
-          if [[ ''${notfound[i]} = ''${module} ]]; then
-            unset 'notfound[i]'
-          fi
-        done
+      # put build info that we care about into `modules` list
+      while read -r kind module version _; do
+        case "$kind" in
+          'dep'|'=>')
+            modules[$module]=$version
+            ;;
+          *)
+            # we only care about 'dep' and '=>' directives for now
+            ;;
+        esac
      done < <($out/bin/caddy build-info)

-      if (( ''${#notfound[@]} )); then
-        for plugin in "''${notfound[@]}"; do
-          base=''${plugin%@*}
-          specified=''${plugin#*@}
-          found=0
+      # compare build-time (Nix side) against runtime (Caddy side)
+      for spec in "''${notfound[@]}"; do
+        if [[ $spec == *=* ]]; then
+            # orig=repl_mod@repl_ver
+            orig=''${spec%%=*}
+            repl=''${spec#*=}
+            repl_mod=''${repl%@*}
+            repl_ver=''${repl#*@}

-          while read kind module expected; do
-            [[ "$kind" = "dep" && "$module" = "$base" ]] || continue
-            echo "Plugin \"$base\" have incorrect tag:"
-            echo "  specified: \"$base@$specified\""
-            echo "  got: \"$base@$expected\""
-            found=1
-          done < <($out/bin/caddy build-info)
+            if [[ -z ''${modules[$orig]} ]]; then
+                errors[$spec]="plugin \"$spec\" with replacement not found in build info:\n  reason: \"$orig\" missing"
+            elif [[ -z ''${modules[$repl_mod]} ]]; then
+                errors[$spec]="plugin \"$spec\" with replacement not found in build info:\n  reason: \"$repl_mod\" missing"
+            elif [[ "''${modules[$repl_mod]}" != "$repl_ver" ]]; then
+                errors[$spec]="plugin \"$spec\" have incorrect tag:\n  specified: \"$spec\"\n  got: \"$orig=$repl_mod@''${modules[$repl_mod]}\""
+            fi
+        else
+          # mod@ver
+          mod=''${spec%@*}
+          ver=''${spec#*@}

-          if (( found == 0 )); then
-            echo "Plugin \"$base\" not found in build:"
-            echo "  specified: \"$base@$specified\""
-            echo "  plugin does not exist in the xcaddy build output, open an issue in nixpkgs or upstream"
+          if [[ -z ''${modules[$mod]} ]]; then
+              errors[$spec]="plugin \"$spec\" not found in build info"
+          elif [[ "''${modules[$mod]}" != "$ver" ]]; then
+              errors[$spec]="plugin \"$spec\" have incorrect tag:\n  specified: \"$spec\"\n  got: \"$mod@''${modules[$mod]}\""
          fi
+        fi
+      done
+
+      # print errors if any
+      if [[ ''${#errors[@]} -gt 0 ]]; then
+        for spec in "''${!errors[@]}"; do
+          printf "Error: ''${errors[$spec]}\n" >&2
        done

+        echo "Tips:"
+        echo "If:"
+        echo "  - you are using module replacement (e.g. \`plugin1=plugin2@version\`)"
+        echo "  - the provided Caddy plugin is under a repository's subdirectory, and \`go.{mod,sum}\` files are not in that subdirectory"
+        echo "  - you have custom build logic or other advanced use cases"
+        echo "Please consider:"
+        echo "  - set \`doInstallCheck = false\`"
+        echo "  - write your own \`installCheckPhase\` and override the default script"
+        echo "If you are sure this error is caused by packaging, or by caddy/xcaddy, raise an issue with upstream or nixpkgs"
+
        exit 1
      fi

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

 stdenv.mkDerivation {
  pname = "cosmic-protocols";
-  version = "0-unstable-2025-08-12";
+  version = "0-unstable-2025-09-01";

  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-protocols";
-    rev = "8e84152fedf350d2756a2c1c90e07313acb9cdf6";
-    hash = "sha256-rFoSSc2wBNiW8wK3AIKxyv28FNTEiGk6UWjp5dQVxe8=";
+    rev = "6254f50abc6dbfccadc6939f80e20081ab5f9d51";
+    hash = "sha256-gOYgz07RGZoBp2RbHn0jUGLGXH/geoch/Y27Qh+jBao=";
  };

  makeFlags = [ "PREFIX=${placeholder "out"}" ];
@@ -14,11 +14,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "crowdin-cli";
-  version = "4.10.0";
+  version = "4.11.0";

  src = fetchurl {
    url = "https://github.com/crowdin/crowdin-cli/releases/download/${finalAttrs.version}/crowdin-cli.zip";
-    hash = "sha256-xvDF9vptkGXkPSHntPrNX0Z4pYmS6Bu4jEswTk/4uhE=";
+    hash = "sha256-5nQq/p6Zd/CC9Qqwwxk3Cu3CoCL2eNgNGHVC3pRGnVI=";
  };

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

 buildGoModule (finalAttrs: {
  pname = "fleet";
-  version = "4.71.1";
+  version = "4.72.1";

  src = fetchFromGitHub {
    owner = "fleetdm";
    repo = "fleet";
    tag = "fleet-v${finalAttrs.version}";
-    hash = "sha256-lEgSgwygLrpkR0Kb6U/+nPRvKD5rMDvl7lxSP9Mf92k=";
+    hash = "sha256-vVBYXn++ZhbgPMDlslTQx+Z1vcOaIMBKtq7Ffmjo6YQ=";
  };
-  vendorHash = "sha256-UOY9W2ULh2eNIfUmyU38nZCVWNTWIDTf7GBBkptrlTQ=";
+  vendorHash = "sha256-DT7hkTpB6yE08SwxsQcqepvJIwQZWvwkqcf2cbQtBRA=";

  subPackages = [
    "cmd/fleet"
@@ -42,11 +42,9 @@ buildNpmPackage (finalAttrs: {
    cp -r packages/core $out/share/gemini-cli/node_modules/@google/gemini-cli-core

    ln -s $out/share/gemini-cli/node_modules/@google/gemini-cli/dist/index.js $out/bin/gemini
-    runHook postInstall
-  '';
-
-  postInstall = ''
    chmod +x "$out/bin/gemini"
+
+    runHook postInstall
  '';

  passthru.updateScript = nix-update-script { };
@@ -55,7 +53,9 @@ buildNpmPackage (finalAttrs: {
    description = "AI agent that brings the power of Gemini directly into your terminal";
    homepage = "https://github.com/google-gemini/gemini-cli";
    license = lib.licenses.asl20;
+    sourceProvenance = with lib.sourceTypes; [ fromSource ];
    maintainers = with lib.maintainers; [
+      xiaoxiangmoe
      FlameFlag
      taranarmo
    ];
@@ -1,22 +0,0 @@
-{
-  lib,
-  buildDotnetGlobalTool,
-}:
-
-buildDotnetGlobalTool rec {
-  pname = "dotnet-gitversion";
-  nugetName = "GitVersion.Tool";
-  version = "6.3.0";
-
-  nugetHash = "sha256-gtkD+egl9zAfJ4ZsOwb7u82IhBabjBFxU+nv9yQ1HHQ=";
-
-  meta = {
-    description = "From git log to SemVer in no time";
-    homepage = "https://gitversion.net/";
-    changelog = "https://github.com/GitTools/GitVersion/releases/tag/${version}";
-    downloadPage = "https://github.com/GitTools/GitVersion";
-    license = lib.licenses.mit;
-    platforms = lib.platforms.linux ++ lib.platforms.windows ++ lib.platforms.darwin;
-    maintainers = with lib.maintainers; [ acesyde ];
-  };
-}
@@ -11,18 +11,18 @@

 buildGoModule rec {
  pname = "go-musicfox";
-  version = "4.6.6";
+  version = "4.7.1";

  src = fetchFromGitHub {
    owner = "go-musicfox";
    repo = "go-musicfox";
    rev = "v${version}";
-    hash = "sha256-BLX43eWM1vMXgUThcLEHb3+OZejfUye1m/SCecfzTiE=";
+    hash = "sha256-jrrxG26OKOUiUzv12Td8Vy12gnj9+mHog/vZSaTwqmw=";
  };

  deleteVendor = true;

-  vendorHash = "sha256-RK0mBnRzh9cbqrdJHQk5eJPREFDKGbjnQyEIF23xrvU=";
+  vendorHash = "sha256-TjPJBP1p2j9K10I87RB7KnwKfO3h2K6WFMZqveMUMkw=";

  subPackages = [ "cmd/musicfox.go" ];

@@ -1,5 +1,10 @@
 {
-  buildGoModule,
+  # golangci-lint has historically required code changes to support new versions of
+  # go so always use the latest specific go version that golangci-lint supports
+  # rather than buildGoLatestModule.
+  # This can be bumped when the release notes of golangci-lint detail support for
+  # new version of go.
+  buildGo125Module,
  buildPackages,
  fetchFromGitHub,
  installShellFiles,
@@ -7,7 +12,7 @@
  stdenv,
 }:

-buildGoModule (finalAttrs: {
+buildGo125Module (finalAttrs: {
  pname = "golangci-lint";
  version = "2.4.0";

@@ -7,18 +7,18 @@

 rustPlatform.buildRustPackage rec {
  pname = "harper";
-  version = "0.60.0";
+  version = "0.61.0";

  src = fetchFromGitHub {
    owner = "Automattic";
    repo = "harper";
    rev = "v${version}";
-    hash = "sha256-79cJq2/0s08e12vN29AST2hQ2IrCmIWWCDVxzg0cFs0=";
+    hash = "sha256-htxW4pam1cihBaz3ko2NBS8BRjBu1ZFdqkHpb9Y2QMc=";
  };

  buildAndTestSubdir = "harper-ls";

-  cargoHash = "sha256-f5i7+Rfsx64UKp91DZEEjcoTDdU6fJEJdUKBph/3zEE=";
+  cargoHash = "sha256-toHAT9QI4rmiiZiRuF3AAcG+xwOscKu18Si9UewIsn4=";

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

@@ -15,14 +15,14 @@ let
 in
 py.pkgs.buildPythonApplication rec {
  pname = "healthchecks";
-  version = "3.9";
+  version = "3.11";
  format = "other";

  src = fetchFromGitHub {
    owner = "healthchecks";
    repo = "healthchecks";
    tag = "v${version}";
-    sha256 = "sha256-78Ku7yYhgIZ+uIMPKkExIXUOKmfiRMjEiBm2SugyD+s=";
+    sha256 = "sha256-s8qhCp+6d2rixgrduWXopiWEpBCLVKkoDjTYT0eLSN8=";
  };

  propagatedBuildInputs = with py.pkgs; [
@@ -38,6 +38,7 @@ py.pkgs.buildPythonApplication rec {
    psycopg2
    pycurl
    pydantic
+    pyjwt
    pyotp
    segno
    statsd
@@ -96,6 +97,6 @@ py.pkgs.buildPythonApplication rec {
    homepage = "https://github.com/healthchecks/healthchecks";
    description = "Cron monitoring tool written in Python & Django";
    license = licenses.bsd3;
-    maintainers = with maintainers; [ phaer ];
+    maintainers = [ ];
  };
 }
@@ -42,13 +42,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "intel-graphics-compiler";
-  version = "2.14.1";
+  version = "2.16.0";

  src = fetchFromGitHub {
    owner = "intel";
    repo = "intel-graphics-compiler";
    tag = "v${version}";
-    hash = "sha256-PBUKLvP9h7AhYbaxjAC749sQqYJLAjNpWfME8t84D0k=";
+    hash = "sha256-vtVktc77OT7OANVXnLvEQx+NEQBPrTE5FFynXhpsK7o=";
  };

  postPatch = ''
@@ -1,46 +0,0 @@
-diff --git a/kclvm/api/build.rs b/kclvm/api/build.rs
-index 7d1c39b7..0104bb6f 100644
--- a/api/build.rs
-+++ b/api/build.rs
-@@ -5,12 +5,12 @@ use prost_wkt_build::{FileDescriptorSet, Message};
- /// According to the file kclvm/spec/gpyrpc/gpyrpc.proto, automatically generate
- /// the corresponding rust source file to the directory src/model
- fn main() {
-    if env::var("PROTOC").is_err() {
-        env::set_var(
-            "PROTOC",
-            protoc_bin_vendored::protoc_bin_path().unwrap().as_os_str(),
-        );
-    }
-+    //if env::var("PROTOC").is_err() {
-+    //    env::set_var(
-+    //        "PROTOC",
-+    //        protoc_bin_vendored::protoc_bin_path().unwrap().as_os_str(),
-+    //    );
-+    //}
- 
-     let out = PathBuf::from(env::var("OUT_DIR").unwrap());
-     let descriptor_file = out.join("kclvm_service_descriptor.bin");
-diff --git a/kclvm/third-party/prost-wkt/wkt-types/build.rs b/kclvm/third-party/prost-wkt/wkt-types/build.rs
-index 620c759a..7f77e1b1 100644
--- a/third-party/prost-wkt/wkt-types/build.rs
-+++ b/third-party/prost-wkt/wkt-types/build.rs
-@@ -13,12 +13,12 @@ use regex::Regex;
- 
- fn main() {
-     //hack: set protoc_bin_vendored::protoc_bin_path() to PROTOC
-    if env::var("PROTOC").is_err() {
-        env::set_var(
-            "PROTOC",
-            protoc_bin_vendored::protoc_bin_path().unwrap().as_os_str(),
-        );
-    }
-+    //if env::var("PROTOC").is_err() {
-+    //    env::set_var(
-+    //         "PROTOC",
-+    //        protoc_bin_vendored::protoc_bin_path().unwrap().as_os_str(),
-+    //    );
-+    //}
-     let dir = PathBuf::from(env::var("OUT_DIR").unwrap());
-     process_prost_pbtime(&dir);
- 
@@ -7,20 +7,29 @@
  pkg-config,
  rustc,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
  pname = "kclvm";
  version = "0.11.2";

  src = fetchFromGitHub {
    owner = "kcl-lang";
    repo = "kcl";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
    hash = "sha256-6XDLxTpgENhP7F51kicAJB7BNMtX4cONKJApAhqgdno=";
  };

-  sourceRoot = "${src.name}/kclvm";
+  env = {
+    PROTOC = "${protobuf}/bin/protoc";
+    PROTOC_INCLUDE = "${protobuf}/include";
+  };

-  cargoHash = "sha256-eJ3Gh2l6T2DxJRQRHamPOr/ILtzsqFB497DdXVJ90RE=";
+  cargoRoot = "kclvm";
+  cargoHash = "sha256-kX+3wyeElKXUOIyD24X9jfvSzdtg3HFilkqlWulq4cc=";
+  cargoPatches = [ ./fix-build.patch ];
+
+  preBuild = ''
+    cd kclvm
+  '';

  buildInputs = [ rustc ];

@@ -33,19 +42,14 @@ rustPlatform.buildRustPackage rec {
    protobuf
  ];

-  patches = [ ./enable_protoc_env.patch ];
-
-  PROTOC = "${protobuf}/bin/protoc";
-  PROTOC_INCLUDE = "${protobuf}/include";
-
-  meta = with lib; {
+  meta = {
    description = "High-performance implementation of KCL written in Rust that uses LLVM as the compiler backend";
    homepage = "https://github.com/kcl-lang/kcl";
-    license = licenses.asl20;
-    platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
      selfuryon
      peefy
    ];
  };
-}
+})
@@ -5,7 +5,7 @@
  fetchFromGitHub,
  autoreconfHook,
  glib,
-  db,
+  kyotocabinet,
  pkg-config,
  nix-update-script,
 }:
@@ -40,7 +40,11 @@ stdenv.mkDerivation (finalAttrs: {

  buildInputs = [
    glib
-    db
+    kyotocabinet
+  ];
+
+  configureFlags = [
+    "--with-dbm=KyotoCabinet"
  ];

  passthru.updateScript = nix-update-script { };
@@ -6,12 +6,12 @@
 }:

 let
-  version = "2.1.5";
+  version = "2.1.6";
  pname = "lunatask";

  src = fetchurl {
    url = "https://github.com/lunatask/lunatask/releases/download/v${version}/Lunatask-${version}.AppImage";
-    hash = "sha256-kuf3NE7or7zCcefShhKzVoCX7WsnHwtleZRafKYhWrM=";
+    hash = "sha256-XgCixgusRsDaO29mqfXGW+hHQDnmw+nIXEXyR6L3y3Y=";
  };

  appimageContents = appimageTools.extract {
@@ -19,13 +19,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "maude";
-  version = "3.5";
+  version = "3.5.1";

  src = fetchFromGitHub {
    owner = "maude-lang";
    repo = "Maude";
    tag = "Maude${finalAttrs.version}";
-    hash = "sha256-1no5K3+0N4MCg2Nr+9FgwWH6G9Inwh2MIYuA/auZhys=";
+    hash = "sha256-NluckH48G4Y79exEQM+hB4oMujA2jcHUFgG3qe+9fGw=";
  };

  # Always enabled in CVC4 1.8: https://github.com/CVC4/CVC4/pull/4519
@@ -176,6 +176,7 @@ stdenv.mkDerivation (finalAttrs: {
        lib.makeLibraryPath [
          # Make sure libGL libvulkan can be found by dlopen()
          libGL
+          libdrm
          vulkan-loader
        ]
      }"
@@ -56,13 +56,13 @@ let
    };
  };

-  version = "15.0.1";
+  version = "15.0.3";
  src = applyPatches {
    src = fetchFromGitHub {
      owner = "intel";
      repo = "opencl-clang";
      tag = "v${version}";
-      hash = "sha256-mUqxe3lZQdhz/CRE1+NU2q5g2Taxlh7nzPwUHOB6I0c=";
+      hash = "sha256-JkYFmnDh7Ot3Br/818aLN33COEG7+xyOf8OhdoJX9Cw=";
    };

    patches = [
@@ -43,7 +43,10 @@ buildGoModule (finalAttrs: {
    homepage = "https://github.com/parca-dev/parca-agent";
    changelog = "https://github.com/parca-dev/parca-agent/releases/tag/v${finalAttrs.version}";
    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ jnsgruk ];
+    maintainers = with lib.maintainers; [
+      brancz
+      metalmatze
+    ];
    platforms = lib.platforms.linux;
    mainProgram = "parca-agent";
  };
@@ -27,7 +27,10 @@ buildGoModule rec {
    changelog = "https://github.com/parca-dev/parca-debuginfo/releases/tag/v${version}";
    homepage = "https://github.com/parca-dev/parca-debuginfo";
    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ jnsgruk ];
+    maintainers = with lib.maintainers; [
+      brancz
+      metalmatze
+    ];
    platforms = lib.platforms.unix;
    mainProgram = "parca-debuginfo";
  };
@@ -81,6 +81,9 @@ buildGoModule rec {
    changelog = "https://github.com/parca-dev/parca/releases/tag/v${version}";
    license = lib.licenses.asl20;
    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ jnsgruk ];
+    maintainers = with lib.maintainers; [
+      brancz
+      metalmatze
+    ];
  };
 }
@@ -16,7 +16,6 @@
  nixosTests,
  python3,
  makeWrapper,
-  runtimeShell,
  symlinkJoin,
  replaceVars,
  extraPackages ? [ ],
@@ -25,7 +24,7 @@
  conmon,
  extraRuntimes ? lib.optionals stdenv.hostPlatform.isLinux [ runc ], # e.g.: runc, gvisor, youki
  fuse-overlayfs,
-  util-linux,
+  util-linuxMinimal,
  iptables,
  iproute2,
  catatonit,
@@ -34,8 +33,7 @@
  netavark,
  passt,
  vfkit,
-  testers,
-  podman,
+  versionCheckHook,
 }:
 let
  # do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed
@@ -43,7 +41,7 @@ let
  binPath = lib.makeBinPath (
    lib.optionals stdenv.hostPlatform.isLinux [
      fuse-overlayfs
-      util-linux
+      util-linuxMinimal
      iptables
      iproute2
    ]
@@ -124,7 +122,6 @@ buildGoModule rec {
  buildPhase = ''
    runHook preBuild
    patchShebangs .
-    substituteInPlace Makefile --replace "/bin/bash" "${runtimeShell}"
    ${
      if stdenv.hostPlatform.isDarwin then
        ''
@@ -164,13 +161,11 @@ buildGoModule rec {
    patchelf --set-rpath "${lib.makeLibraryPath [ systemd ]}":$RPATH $out/bin/.podman-wrapped
  '';

-  passthru.tests = {
-    version = testers.testVersion {
-      package = podman;
-      command = "HOME=$TMPDIR podman --version";
-    };
-  }
-  // lib.optionalAttrs stdenv.hostPlatform.isLinux {
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
+  passthru.tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {
    inherit (nixosTests) podman;
    # related modules
    inherit (nixosTests)
@@ -8,11 +8,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "quarkus-cli";
-  version = "3.25.3";
+  version = "3.25.4";

  src = fetchurl {
    url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz";
-    hash = "sha256-4tOduWY1PaW6FMnwL1jPARxpm4lKg7MJP36bpZavtxY=";
+    hash = "sha256-L7j+yuYjCWUuAuUA6YQjnU/fyppn9HkxPvsNiRDj8I8=";
  };

  nativeBuildInputs = [ makeWrapper ];
@@ -24,23 +24,23 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "libsignal-node";
-  version = "0.76.7";
+  version = "0.78.3";

  src = fetchFromGitHub {
    owner = "signalapp";
    repo = "libsignal";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-7UXOCgjZYOOMMnBk1pvORJVTClQo9vbhSteKBE5RHw8=";
+    hash = "sha256-BRNgNE7BR4mlCKS4sydxx7rrfy+s4bTpQkX9GbEfhTg=";
  };

-  cargoHash = "sha256-beeR/tISks99+o/kdqaq96nznwoiNduyB/BBVvNTEn0=";
+  cargoHash = "sha256-T8kSQFTvwAYZad9rQRK6vY8vEiilEKv1+fd/1EBlxjI=";

  npmRoot = "node";
  npmDeps = fetchNpmDeps {
    name = "${finalAttrs.pname}-npm-deps";
    inherit (finalAttrs) version src;
    sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
-    hash = "sha256-nbGeT0Fyu9T/3EFoIDaAESIl9JOIOq2jC53GWU1Ofeo=";
+    hash = "sha256-e/WyQlea46qTx7x45QuYdlaShezHV5vuB3ptB2DRCVE=";
  };

  nativeBuildInputs = [
@@ -3,7 +3,7 @@
  lib,
  nodejs_22,
  pnpm_10,
-  electron_36,
+  electron_37,
  python3,
  makeWrapper,
  callPackage,
@@ -23,7 +23,7 @@
 let
  nodejs = nodejs_22;
  pnpm = pnpm_10.override { inherit nodejs; };
-  electron = electron_36;
+  electron = electron_37;

  libsignal-node = callPackage ./libsignal-node.nix { inherit nodejs; };
  signal-sqlcipher = callPackage ./signal-sqlcipher.nix { inherit pnpm nodejs; };
@@ -52,13 +52,13 @@ let
    '';
  });

-  version = "7.66.0";
+  version = "7.68.0";

  src = fetchFromGitHub {
    owner = "signalapp";
    repo = "Signal-Desktop";
    tag = "v${version}";
-    hash = "sha256-8IhY7m9beyfbs8Pnm8PeSW7vL+aBIgcN8HVmstgKFe8=";
+    hash = "sha256-jsNSRNgIS0ZroM2vwPSFpCVfC81slQ4mUoRq5jDYi8Y=";
  };

  sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -122,15 +122,15 @@ stdenv.mkDerivation (finalAttrs: {
    fetcherVersion = 1;
    hash =
      if withAppleEmojis then
-        "sha256-XO+lbCndOupUncod2b6w7BdesGX84GgQQ3SYlX1yp0Q="
+        "sha256-iu/ZjIn5c4X0rxWUFqiNLLAjCGKFYihsYxfgWtfmqk4="
      else
-        "sha256-+pq4jGJzy0bg9rkN6jKyuiGiad2BP28mIy+/SgbyNWc=";
+        "sha256-gMtBdlcuiAZRV5eeh2NoyOusFheCmn0/NIQwVPrUH/U=";
  };

  env = {
    ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
    SIGNAL_ENV = "production";
-    SOURCE_DATE_EPOCH = 1755119611;
+    SOURCE_DATE_EPOCH = 1756327041;
  };

  preBuild = ''
@@ -0,0 +1,24 @@
+diff --git i/build.rs w/build.rs
+index 2174a43..cf93c2f 100644
+--- i/build.rs
+++ w/build.rs
+@@ -14,17 +14,8 @@ fn main() {
+     // Print the path to make it available during the build
+     println!("cargo:rustc-env=SUS_HOME={}", home_dir.to_str().unwrap());
+ 
+-    // note: add error checking yourself.
+-    let output = std::process::Command::new("git")
+-        .args(["rev-parse", "HEAD"])
+-        .output()
+-        .unwrap();
+-    let git_hash = String::from_utf8(output.stdout).unwrap();
+-    println!("cargo:rustc-env=GIT_HASH={}", git_hash);
+-    println!(
+-        "cargo:rustc-env=BUILD_DATE={}",
+-        chrono::Local::now().to_rfc3339_opts(chrono::SecondsFormat::Secs, false)
+-    );
+    println!("cargo:rustc-env=GIT_HASH=@GIT_HASH@");
+    println!("cargo:rustc-env=BUILD_DATE=@GIT_DATE@");
+ }
+ 
+ fn get_sus_dir() -> PathBuf {
@@ -1,5 +1,6 @@
 {
  lib,
+  stdenv,
  rustPlatform,
  fetchFromGitHub,
  versionCheckHook,
@@ -8,14 +9,33 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "sus-compiler";
-  version = "0.2.1";
+  version = "0.3.0-unstable-2025-08-28";

  src = fetchFromGitHub {
    owner = "pc2";
    repo = "sus-compiler";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-dQef5TiOV33lnNl7XKl7TlCY0E2sEclehWOmy2uvISY=";
+    rev = "bc46d911a71d0248a88586c10057206ffadc82ca";
+    hash = "sha256-Wnj303B4G09qGOecZfFsicjNcfRkISfo9JDYJeFubVM=";
    fetchSubmodules = true;
+    leaveDotGit = true;
+
+    # Manual patch phase with replacement of Git details just before they're deleted.
+    postFetch = ''
+      cp ${./build.rs.patch} build.rs.patch
+      PATCH="$(realpath build.rs.patch)"
+
+      cd "$out"
+
+      GIT_HASH="$(git rev-parse HEAD)"
+      GIT_DATE="$(git log --pretty=format:'%ad' --date=iso-strict HEAD -1)"
+
+      substituteInPlace "$PATCH" \
+        --replace-fail "@GIT_HASH@" "$GIT_HASH" \
+        --replace-fail "@GIT_DATE@" "$GIT_DATE"
+      patch -p1 < "$PATCH"
+
+      find "$out" -name .git -print0 | xargs -0 rm -rf
+    '';
  };

  # no lockfile upstream
@@ -29,9 +49,19 @@ rustPlatform.buildRustPackage (finalAttrs: {
    ln -s ${./Cargo.lock} Cargo.lock
  '';

-  doInstallCheck = true;
+  # Do the install version check only on stable versions of this compiler, when the build platform
+  # is able to execute the binaries. Unstable versions report a "-devel" string instead of agreeing
+  # with the nixpkgs version scheme.
+  doInstallCheck =
+    let
+      isStable = !lib.elem "unstable" (lib.versions.splitVersion finalAttrs.version);
+      canExecute = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+    in
+    isStable && canExecute;
+
  nativeInstallCheckInputs = [ versionCheckHook ];
  versionCheckProgram = "${placeholder "out"}/bin/sus_compiler";
+  versionCheckProgramArg = "--version";

  updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; };

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

 stdenv.mkDerivation (finalAttrs: {
  pname = "SwayNotificationCenter";
-  version = "0.12.1";
+  version = "0.12.2";

  src = fetchFromGitHub {
    owner = "ErikReider";
    repo = "SwayNotificationCenter";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-4DDlQRHG90ee4Tu9y0lkY6hZxhPFyJmacbWJMErfFlk=";
+    hash = "sha256-BtcT2N08BVxVrzEd1Z/s5MXWHaHFt6PqBH4gdH6TEvs=";
  };

  # build pkg-config is required to locate the native `scdoc` input
@@ -3,20 +3,21 @@
  buildGoModule,
  fetchFromGitLab,
  installShellFiles,
+  stdenv,
 }:

 buildGoModule rec {
  pname = "tuleap-cli";
-  version = "1.1.0";
+  version = "1.2.0";

  src = fetchFromGitLab {
    owner = "csgroup-oss";
    repo = "tuleap-cli";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-hL0mGWXzvHYFc8u4RXCDys3Fe/cgsGljfhSkPAjzt4o=";
+    tag = version;
+    hash = "sha256-qiQnu167BIF+LzwahheBE0KwxFmRcahdU7quTpPtEEk=";
  };

-  vendorHash = "sha256-N9Hmxw/70Cgc790AVRn7lmuhMtDhI94CTUlqHU4VbaY=";
+  vendorHash = "sha256-cO7+wG4uAd9e6n/KWQPYepixNmXBbuBxagT82hcbcIo=";

  nativeBuildInputs = [ installShellFiles ];

@@ -27,7 +28,7 @@ buildGoModule rec {

  subPackages = [ "." ];

-  postInstall = ''
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
    installShellCompletion --cmd tuleap-cli \
      --bash <($out/bin/tuleap-cli -s tuleap.example.com completion bash) \
      --fish <($out/bin/tuleap-cli -s tuleap.example.com completion fish) \
@@ -93,14 +93,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
  pname = "vectorcode";
-  version = "0.7.14";
+  version = "0.7.15";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "Davidyz";
    repo = "VectorCode";
    tag = version;
-    hash = "sha256-jzNeAsL4kMGRhD9MftOL1UrM7GX8AYCab+nosptsqLY=";
+    hash = "sha256-YRvJVdNZLmNongYEy06QPsmJkPvmg7cucjLJY05yD54=";
  };

  build-system = with python.pkgs; [
@@ -1,25 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    bson (4.14.1)
-    ipaddr (1.2.4)
-    json (2.6.1)
-    mongo (2.17.1)
-      bson (>= 4.8.2, < 5.0.0)
-    public_suffix (4.0.6)
-    rchardet (1.8.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  addressable
-  ipaddr
-  json
-  mongo
-  rchardet
-
-BUNDLED WITH
-   2.1.4
@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'ipaddr'
+gem 'addressable'
+gem 'json'
+gem 'getoptlong'
+gem 'resolv-replace'
@@ -0,0 +1,26 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    getoptlong (0.2.1)
+    ipaddr (1.2.7)
+    json (2.13.2)
+    public_suffix (6.0.2)
+    resolv (0.6.2)
+    resolv-replace (0.1.1)
+      resolv
+
+PLATFORMS
+  ruby
+  x86_64-linux
+
+DEPENDENCIES
+  addressable
+  getoptlong
+  ipaddr
+  json
+  resolv-replace
+
+BUNDLED WITH
+   2.7.1
@@ -1,6 +1,9 @@
 source 'https://rubygems.org'
+
 gem 'ipaddr'
 gem 'addressable'
 gem 'json'
+gem 'getoptlong'
+gem 'resolv-replace'
 gem 'mongo'
 gem 'rchardet'
@@ -0,0 +1,34 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    base64 (0.3.0)
+    bson (5.1.1)
+    getoptlong (0.2.1)
+    ipaddr (1.2.7)
+    json (2.13.2)
+    mongo (2.21.3)
+      base64
+      bson (>= 4.14.1, < 6.0.0)
+    public_suffix (6.0.2)
+    rchardet (1.9.0)
+    resolv (0.6.2)
+    resolv-replace (0.1.1)
+      resolv
+
+PLATFORMS
+  ruby
+  x86_64-linux
+
+DEPENDENCIES
+  addressable
+  getoptlong
+  ipaddr
+  json
+  mongo
+  rchardet
+  resolv-replace
+
+BUNDLED WITH
+   2.7.1
@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gem 'ipaddr'
+gem 'addressable'
+gem 'json'
+gem 'getoptlong'
+gem 'resolv-replace'
+gem 'rchardet'
@@ -0,0 +1,28 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    getoptlong (0.2.1)
+    ipaddr (1.2.7)
+    json (2.13.2)
+    public_suffix (6.0.2)
+    rchardet (1.9.0)
+    resolv (0.6.2)
+    resolv-replace (0.1.1)
+      resolv
+
+PLATFORMS
+  ruby
+  x86_64-linux
+
+DEPENDENCIES
+  addressable
+  getoptlong
+  ipaddr
+  json
+  rchardet
+  resolv-replace
+
+BUNDLED WITH
+   2.7.1
@@ -0,0 +1,118 @@
+{
+  addressable = {
+    dependencies = [ "public_suffix" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
+      type = "gem";
+    };
+    version = "2.8.7";
+  };
+  base64 = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0yx9yn47a8lkfcjmigk79fykxvr80r4m1i35q82sxzynpbm7lcr7";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
+  bson = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "02q695963ix1qcdwy205rwd38mv089z54n2i5n3ih1kad864jz55";
+      type = "gem";
+    };
+    version = "5.1.1";
+  };
+  getoptlong = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "198vy9dxyzibqdbw9jg8p2ljj9iknkyiqlyl229vz55rjxrz08zx";
+      type = "gem";
+    };
+    version = "0.2.1";
+  };
+  ipaddr = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0wmgwqv6c1kq8cxbxddllnrlh5jjmjw73i1sqbnvq55zzn3l0zyb";
+      type = "gem";
+    };
+    version = "1.2.7";
+  };
+  json = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0s5vklcy2fgdxa9c6da34jbfrqq7xs6mryjglqqb5iilshcg3q82";
+      type = "gem";
+    };
+    version = "2.13.2";
+  };
+  mongo = {
+    dependencies = [
+      "base64"
+      "bson"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "15f96bg3gr3vahwh9vslgfxl3khma21gaqgdj98jc1447w73xlf1";
+      type = "gem";
+    };
+    version = "2.21.3";
+  };
+  public_suffix = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1543ap9w3ydhx39ljcd675cdz9cr948x9mp00ab8qvq6118wv9xz";
+      type = "gem";
+    };
+    version = "6.0.2";
+  };
+  rchardet = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1455yhd1arccrns3ghhvn4dl6gnrf4zn1xxsaa33ffyqrn399216";
+      type = "gem";
+    };
+    version = "1.9.0";
+  };
+  resolv = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "057vj12w6cnzz9kzbnwg17snm9jwr22izrbp9yqv3pnxrr2ybvv1";
+      type = "gem";
+    };
+    version = "0.6.2";
+  };
+  resolv-replace = {
+    dependencies = [ "resolv" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "13v8xdmsqlr9822xpcvscnr4b9vzmzhg0l7r6hh4b281baq1jda7";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
+}
@@ -5,70 +5,70 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp";
+      sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
      type = "gem";
    };
-    version = "2.8.0";
+    version = "2.8.7";
  };
-  bson = {
+  getoptlong = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "03n3w96vpblaxvk1qk8hq7sbsmg4nv7qdkdr8f7nfvalgpakp5i5";
+      sha256 = "198vy9dxyzibqdbw9jg8p2ljj9iknkyiqlyl229vz55rjxrz08zx";
      type = "gem";
    };
-    version = "4.14.1";
+    version = "0.2.1";
  };
  ipaddr = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "13qd34nzpgp3fxfjbvaqg3dcnfr0cgl5vjvcqy0hfllbvfcklnbq";
+      sha256 = "0wmgwqv6c1kq8cxbxddllnrlh5jjmjw73i1sqbnvq55zzn3l0zyb";
      type = "gem";
    };
-    version = "1.2.4";
+    version = "1.2.7";
  };
  json = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1z9grvjyfz16ag55hg522d3q4dh07hf391sf9s96npc0vfi85xkz";
+      sha256 = "0s5vklcy2fgdxa9c6da34jbfrqq7xs6mryjglqqb5iilshcg3q82";
      type = "gem";
    };
-    version = "2.6.1";
-  };
-  mongo = {
-    dependencies = [ "bson" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "19sihy8ihi3hmdg3gxbf4qvzmjnzx8xygg9534012j9z0wmhs7h1";
-      type = "gem";
-    };
-    version = "2.17.1";
+    version = "2.13.2";
  };
  public_suffix = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
+      sha256 = "1543ap9w3ydhx39ljcd675cdz9cr948x9mp00ab8qvq6118wv9xz";
      type = "gem";
    };
-    version = "4.0.6";
+    version = "6.0.2";
  };
-  rchardet = {
+  resolv = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1isj1b3ywgg2m1vdlnr41lpvpm3dbyarf1lla4dfibfmad9csfk9";
+      sha256 = "057vj12w6cnzz9kzbnwg17snm9jwr22izrbp9yqv3pnxrr2ybvv1";
      type = "gem";
    };
-    version = "1.8.0";
+    version = "0.6.2";
+  };
+  resolv-replace = {
+    dependencies = [ "resolv" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "13v8xdmsqlr9822xpcvscnr4b9vzmzhg0l7r6hh4b281baq1jda7";
+      type = "gem";
+    };
+    version = "0.1.1";
  };
 }
@@ -0,0 +1,84 @@
+{
+  addressable = {
+    dependencies = [ "public_suffix" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
+      type = "gem";
+    };
+    version = "2.8.7";
+  };
+  getoptlong = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "198vy9dxyzibqdbw9jg8p2ljj9iknkyiqlyl229vz55rjxrz08zx";
+      type = "gem";
+    };
+    version = "0.2.1";
+  };
+  ipaddr = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0wmgwqv6c1kq8cxbxddllnrlh5jjmjw73i1sqbnvq55zzn3l0zyb";
+      type = "gem";
+    };
+    version = "1.2.7";
+  };
+  json = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0s5vklcy2fgdxa9c6da34jbfrqq7xs6mryjglqqb5iilshcg3q82";
+      type = "gem";
+    };
+    version = "2.13.2";
+  };
+  public_suffix = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1543ap9w3ydhx39ljcd675cdz9cr948x9mp00ab8qvq6118wv9xz";
+      type = "gem";
+    };
+    version = "6.0.2";
+  };
+  rchardet = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1455yhd1arccrns3ghhvn4dl6gnrf4zn1xxsaa33ffyqrn399216";
+      type = "gem";
+    };
+    version = "1.9.0";
+  };
+  resolv = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "057vj12w6cnzz9kzbnwg17snm9jwr22izrbp9yqv3pnxrr2ybvv1";
+      type = "gem";
+    };
+    version = "0.6.2";
+  };
+  resolv-replace = {
+    dependencies = [ "resolv" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "13v8xdmsqlr9822xpcvscnr4b9vzmzhg0l7r6hh4b281baq1jda7";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
+}
@@ -3,32 +3,69 @@
  stdenv,
  fetchFromGitHub,
  bundlerEnv,
-  ruby,
+  ruby_3_4,
+  withMongo ? false,
+  withRchardet ? false,
 }:

 let
+  gemdir =
+    if withMongo && withRchardet then
+      ./gems
+    else if withMongo then
+      ./gems
+    else if withRchardet then
+      ./gems
+    else
+      ./gems;
+
+  gemfile =
+    if withMongo then
+      gemdir + "/Gemfile.mongo"
+    else if withRchardet then
+      gemdir + "/Gemfile.rchardet"
+    else
+      gemdir + "/Gemfile";
+
+  lockfile =
+    if withMongo then
+      gemdir + "/Gemfile.mongo.lock"
+    else if withRchardet then
+      gemdir + "/Gemfile.rchardet.lock"
+    else
+      gemdir + "/Gemfile.lock";
+
+  gemset =
+    if withMongo then
+      gemdir + "/gemset.mongo.nix"
+    else if withRchardet then
+      gemdir + "/gemset.rchardet.nix"
+    else
+      gemdir + "/gemset.nix";
+
  gems = bundlerEnv {
    name = "whatweb-env";
-    inherit ruby;
-    gemdir = ./.;
+    inherit ruby_3_4;
+    inherit gemdir;
+    inherit gemfile lockfile gemset;
  };
-
 in
 stdenv.mkDerivation rec {
  pname = "whatweb";
-  version = "0.5.5";
+  version = "0.6.2";

  src = fetchFromGitHub {
    owner = "urbanadventurer";
    repo = "whatweb";
    rev = "v${version}";
-    sha256 = "sha256-HLF55x4C8n8aPO4SI0d6Z9wZe80krtUaGUFmMaYRBIE=";
+    sha256 = "sha256-EFQ4RHI1+kmlz/Bm+9KXbmY0iEBJnKfdQL5YGDWCfJQ=";
  };

  prePatch = ''
    substituteInPlace Makefile \
      --replace "/usr/local" "$out" \
-      --replace "/usr" "$out"
+      --replace "/usr" "$out" \
+      --replace "bundle install" "echo 'Skipping bundle install in nix build'"
  '';

  buildInputs = [ gems ];
@@ -40,15 +77,38 @@ stdenv.mkDerivation rec {
    rm $out/bin/whatweb
    cat << EOF >> $out/bin/whatweb
    #!/bin/sh -e
-    exec ${gems}/bin/bundle exec ${ruby}/bin/ruby "$raw" "\$@"
+    export GEM_PATH="${gems}/lib/ruby/gems/3.3.0"
+    export RUBYOPT="-W0"
+    exec ${ruby_3_4}/bin/ruby "$raw" "\$@"
    EOF
    chmod +x $out/bin/whatweb

    runHook postInstall
  '';

+  passthru = {
+    withMongo = withMongo;
+    withRchardet = withRchardet;
+  };
+
  meta = with lib; {
    description = "Next generation web scanner";
+    longDescription = ''
+      WhatWeb is a website fingerprinting tool that identifies web technologies such as CMSs, blogging platforms,
+      analytics packages, JavaScript libraries, web servers, and embedded devices. With over 1800 plugins, it detects software
+      versions, email addresses, account IDs, web framework modules, SQL errors, and more. WhatWeb offers adjustable scan
+      modes, balancing speed and thoroughness, making it suitable for both quick reconnaissance and detailed penetration
+      testing. Its plugins use multiple detection methods to reliably identify technologies, even when sites attempt to
+      obscure their software.
+    ''
+    + lib.optionalString withMongo ''
+
+      This build includes MongoDB support and character set detection capabilities, which may impact performance.
+    ''
+    + lib.optionalString (withRchardet && !withMongo) ''
+
+      This build includes character set detection capabilities, which may impact performance.
+    '';
    mainProgram = "whatweb";
    homepage = "https://github.com/urbanadventurer/whatweb";
    license = licenses.gpl2Only;
@@ -99,7 +99,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "zed-editor";
-  version = "0.201.8";
+  version = "0.202.5";

  outputs = [
    "out"
@@ -112,7 +112,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    owner = "zed-industries";
    repo = "zed";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-y7pWGdq7r675JnBFQwcB4QLn/0aFxpkwK7CjX0Ox+lk=";
+    hash = "sha256-4cP6cohUZdhvr6mvIOozhg1ahEZEypCCjvAz0fjAtec=";
  };

  patches = [
@@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
        --replace-fail "inner.redirect(policy)" "inner.redirect_policy(policy)"
    '';

-  cargoHash = "sha256-20pOYcodc2jflxibY0I0+SSC1FTxB8Jw03kcihCnBOY=";
+  cargoHash = "sha256-13ChlJU2IGwftYXkWEmUhp4w+VeNPZA2fp1qTY1fOW0=";

  nativeBuildInputs = [
    cmake
@@ -64,4 +64,8 @@ in
    version = "6.7.2";
    hash = "sha256-MaJG96kYj8ukJVyqOTDpkHH/eWr/ZlbVKk9AvJM7ub4=";
  };
+  v7 = font-awesome {
+    version = "7.0.1";
+    hash = "sha256-ucKE4euZf7teosY+6X0W1wDOdnlW1SRcZhQdBvvOY1s=";
+  };
 }
@@ -514,7 +514,7 @@ stdenv.mkDerivation (finalAttrs: {
        ''
      else
        ''
-          rm $out/lib/openjdk/jre/lib/${architecture}/{libjsound,libjsoundalsa,libsplashscreen,libawt*,libfontmanager}.so
+          rm $out/lib/openjdk/jre/lib/${architecture}/{libjsound,libjsoundalsa,libsplashscreen,libfontmanager}.so
          rm $out/lib/openjdk/jre/bin/policytool
          rm $out/lib/openjdk/bin/{policytool,appletviewer}
        ''
@@ -10,9 +10,8 @@ let
  hasWarning = lib.versionAtLeast coq.ocamlPackages.ocaml.version "4.08";
 in

-mkCoqDerivation {
+(mkCoqDerivation {
  pname = "dpdgraph";
-  owner = "Karmaki";
  repo = "coq-dpdgraph";
  inherit version;
  defaultVersion =
@@ -20,6 +19,7 @@ mkCoqDerivation {
      case = case: out: { inherit case out; };
    in
    lib.switch coq.coq-version [
+      (case "9.0" "1.0+9.0")
      (case "8.20" "1.0+8.20")
      (case "8.19" "1.0+8.19")
      (case "8.18" "1.0+8.18")
@@ -36,6 +36,7 @@ mkCoqDerivation {
      (case "8.7" "0.6.2")
    ] null;

+  release."1.0+9.0".sha256 = "sha256-gXy70fj2bAkE0did4gI0wTyWp9AIvOo4xTTihaFIpZ0=";
  release."1.0+8.20".sha256 = "sha256-szfH/OksCH3SCbcFjwEvLwHE5avmHp1vYiJM6KAXFqs=";
  release."1.0+8.19".sha256 = "sha256-L1vjEydYiwDFTXES3sgfdaO/D50AbTJKBXUKUCgbpto=";
  release."1.0+8.18".sha256 = "sha256-z14MI1VSYzPqmF1PqDXzymXWRMYoTlQAfR/P3Pdf7fI=";
@@ -58,15 +59,12 @@ mkCoqDerivation {
  release."0.6".sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n";
  releaseRev = v: "v${v}";

-  nativeBuildInputs = [ autoreconfHook ];
  mlPlugin = true;
-  buildInputs = [ coq.ocamlPackages.ocamlgraph ];
-
-  # dpd_compute.ml uses deprecated Pervasives.compare
-  # Versions prior to 0.6.5 do not have the WARN_ERR build flag
-  preConfigure = lib.optionalString hasWarning ''
-    substituteInPlace Makefile.in --replace "-warn-error +a " ""
-  '';
+  buildInputs = with coq.ocamlPackages; [
+    ocaml
+    findlib
+    ocamlgraph
+  ];

  buildFlags = lib.optional hasWarning "WARN_ERR=";

@@ -81,4 +79,16 @@ mkCoqDerivation {
    license = licenses.lgpl21;
    maintainers = with maintainers; [ vbgl ];
  };
-}
+}).overrideAttrs
+  (
+    o:
+    lib.optionalAttrs (o.version != "dev" && lib.versions.isLe "1.0+9.0" o.version) {
+      nativeBuildInputs = [ autoreconfHook ];
+
+      # dpd_compute.ml uses deprecated Pervasives.compare
+      # Versions prior to 0.6.5 do not have the WARN_ERR build flag
+      preConfigure = lib.optionalString hasWarning ''
+        substituteInPlace Makefile.in --replace "-warn-error +a " ""
+      '';
+    }
+  )
@@ -777,6 +777,15 @@ builtins.intersectAttrs super {
  colour = dontCheck super.colour;
  spatial-rotations = dontCheck super.spatial-rotations;

+  # This package is marked broken, but it causes some evail failures for nixpkgs-review.
+  # cabal2nix still adds opencv3, which has been removed. It makes no sense to add opencv4,
+  # because the haskell package is only targeting opencv 3.x specifically.
+  # TODO: Remove this package entirely from hackage-packages.nix. It's broken and has been last
+  # updated in 2018.
+  opencv = overrideCabal (drv: {
+    libraryPkgconfigDepends = [ ];
+  }) super.opencv;
+
  LDAP = dontCheck (
    overrideCabal (drv: {
      librarySystemDepends = drv.librarySystemDepends or [ ] ++ [ pkgs.cyrus_sasl.dev ];
@@ -54,7 +54,7 @@
  openvdb,
  c-blosc,
  unixODBC,
-  postgresql,
+  libpq,
  libmysqlclient,
  ffmpeg,
  libjpeg,
@@ -174,7 +174,7 @@ stdenv.mkDerivation (finalAttrs: {
    imath
    c-blosc
    unixODBC
-    postgresql
+    libpq
    libmysqlclient
    ffmpeg
    opencascade-occt
@@ -13,10 +13,12 @@
  ncurses,
  ppx_deriving,
  ppx_deriving_0_15,
+  ppx_deriving_0_33,
+  ppx_optcomp,
  coqPackages,
  version ?
    if lib.versionAtLeast ocaml.version "4.13" then
-      "3.0.1"
+      "3.3.0"
    else if lib.versionAtLeast ocaml.version "4.08" then
      "1.20.0"
    else
@@ -32,6 +34,7 @@ in

 let
  fetched = coqPackages.metaFetch ({
+    release."3.3.0".sha256 = "sha256:963f95eea48b8f853cca9cbe4db49f22343c58e88dc961bc1da303356ef50dcd";
    release."3.0.1".sha256 = "sha256-r4B0xn6UCVslVW4dHiqq8NBMGfNz44kZy48KDWeGquc=";
    release."2.0.7".sha256 = "sha256-gCM+vZK6vWlhSO1VMjiWHse23mvxVwRarhxwkIQK7e0=";
    release."2.0.6".sha256 = "sha256-tRUYXQZ0VXrjIZBZ1skdzieUsww4rSNEe5ik+iKpk3U=";
@@ -76,6 +79,7 @@ buildDunePackage {
  buildInputs = [
    ncurses
  ]
+  ++ lib.optional (lib.versionAtLeast version "3.3.0" || version == "dev") ppx_optcomp
  ++ lib.optional (lib.versionAtLeast version "1.16" || version == "dev") atdgen-runtime;

  propagatedBuildInputs = [
@@ -84,10 +88,14 @@ buildDunePackage {
  ]
  ++ (if lib.versionAtLeast version "1.15" || version == "dev" then [ menhirLib ] else [ camlp5 ])
  ++ (
-    if lib.versionAtLeast version "1.13" || version == "dev" then
+    if lib.versionAtLeast version "3.3.0" || version == "dev" then
      [
        ppx_deriving
      ]
+    else if lib.versionAtLeast version "1.13" then
+      [
+        ppx_deriving_0_33
+      ]
    else
      [
        ppx_deriving_0_15
@@ -64,7 +64,7 @@

 let
  pname = "ray";
-  version = "2.49.0";
+  version = "2.49.1";
 in
 buildPythonPackage rec {
  inherit pname version;
@@ -85,28 +85,28 @@ buildPythonPackage rec {
      # Results are in ./ray-hashes.nix
      hashes = {
        x86_64-linux = {
-          cp310 = "sha256-bFQKbfqOWC4HJQV8E3JFzNP6DWl7R2SFMxdvWoqzCjA=";
-          cp311 = "sha256-Ja5MII3Hi0plPDEcsmuTx0QB5nYqGTztX6uqkQqBfYE=";
-          cp312 = "sha256-lShdI6MDsXTQcKaz6ocj6dq/B6QUegHLkzHV6t+MoLI=";
-          cp313 = "sha256-42mZ1Pgx8vIcqPtWnwWY+4DKjawPiDbErHXM2ltVi/s=";
+          cp310 = "sha256-k4TScFnK+Go4y7y0Iqthto3oczN4S/GyJyLXT9ugHvY=";
+          cp311 = "sha256-yKA5RHwwSeM226+f8WcylDr/i959U3Y5C8W3HrCMuZY=";
+          cp312 = "sha256-SEBk/KAnMuC29KCdrQ0ftqvUykttm/fCareheiiHzQk=";
+          cp313 = "sha256-147zp65IgZ1kD8BQBr8qfKq0ixXFZ6U6ecAV89AFSz0=";
        };
        aarch64-linux = {
-          cp310 = "sha256-jFWnpGKgzese1Y+jYQ9S46KEzk4MVVZjWb0RWKloP0Q=";
-          cp311 = "sha256-KnXS/YvKsahQkeow5ZMsXiiXxxIq4j+SH0+v7sIsOCg=";
-          cp312 = "sha256-NjVn9WES86FRjs2NDjoM5PBTcFzI9NQ+kzyvafs1lxw=";
-          cp313 = "sha256-/Wu+DBhvHWpJ31NTKyGSH9Bf+ZPLVG9mW3GAmGIPY8U=";
+          cp310 = "sha256-jzmr4eTqXk3eJWfn5697QffrU/apw9PRy4APt6NlIQQ=";
+          cp311 = "sha256-y2/eQS5jT5MzPGRrEInk0xhLx/y3/AKBiJGygagCQNI=";
+          cp312 = "sha256-z2O5FuOZwqTUhCSWEals7ig87zLlRBJhFaStPocsNOs=";
+          cp313 = "sha256-lOHFBoiXxjVG0J6iY6iETOFjxtgM4wsa863HU3CL5jw=";
        };
        x86_64-darwin = {
-          cp310 = "sha256-6Qjm97RkKdJvRZRXlFgpiETRpIXCiM/liRT6eilP06Q=";
-          cp311 = "sha256-5CpBh6kOiXr7lVF8uKpPwMJHGL1Ci97AsmCqLRjs5sg=";
-          cp312 = "sha256-FvsQ5YuuSDECZ16Cnq0afQpHjcVfmf8GuDKnicogi6k=";
-          cp313 = "sha256-LhOphUj78ujX8JY8YK/1HZtT01naDO9QoHGpUMT85Uo=";
+          cp310 = "sha256-mQhrS7MgOL1jt1dWZ/3BQly3Ua/gQ07Q0Vjj0+4Mcm8=";
+          cp311 = "sha256-Wx4ACGFWodWJZk0ezOPUWJsInLqwnXuHgDYOWzSukHo=";
+          cp312 = "sha256-+TZd46mmYczwid+qwByLaLoAyYRDMw72eODAJIJyxyI=";
+          cp313 = "sha256-D7LijIDkWZ/+w6NOkmubASrRw1D0nNuNiJLderk7R4k=";
        };
        aarch64-darwin = {
-          cp310 = "sha256-seRUvxTQCGfaXslF4L4IfWhFfyQbqmClDLccBBosTfw=";
-          cp311 = "sha256-VKipsP5qnLFagvNxwufWhCD540/+OKi+PD3UvlQFHGY=";
-          cp312 = "sha256-+UOpwq4EljaxJqGUBH/fkQEGCpmF0dthSxeycGH46fM=";
-          cp313 = "sha256-9CDvy2n6ZDAf8su3YR10rwEguu6OhAhtjzuV6BVTD5M=";
+          cp310 = "sha256-+OEt19uCFahu9xg6LJwiECiA4OzQj5Sx0XrZ5gfko1k=";
+          cp311 = "sha256-lDJtsMg/fzkTUrE1s3qOynN8Gt3xiQKrGQvmuGCKgDk=";
+          cp312 = "sha256-96cVhV0XnB3Wri6LX4kZY4zeN5pbFXljoL100ReLi1o=";
+          cp313 = "sha256-XRnlaKjPvM8Si/NPnOSLy9EenwuU2xkEBPa+tVrkldI=";
        };
      };
    in
@@ -10,7 +10,6 @@
  granian,
  hatchling,
  httpx,
-  jinja2,
  numpy,
  packaging,
  pandas,
@@ -43,14 +42,14 @@

 buildPythonPackage rec {
  pname = "reflex";
-  version = "0.8.7";
+  version = "0.8.9";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "reflex-dev";
    repo = "reflex";
    tag = "v${version}";
-    hash = "sha256-ieR+Wxj1bJp3dQpw6j2Wki1nm4MWtVZ+UOtDl+6ip7M=";
+    hash = "sha256-foyMNW1ffBowEyCSD4SKPLGxWifQGQqKDRfqVFFX8Yw=";
  };

  # 'rich' is also somehow checked when building the wheel,
@@ -73,7 +72,6 @@ buildPythonPackage rec {
    granian
    granian.optional-dependencies.reload
    httpx
-    jinja2
    packaging # used in utils/prerequisites.py
    platformdirs
    psutil
@@ -40,6 +40,7 @@ let
        (case (range "9.0" "9.1") "2.6.0")
        (case ("9.0") "2.5.2")
      ] null;
+    release."3.1.0".sha256 = "sha256-ytGPGwJv+jmRT6uN0sg6q+xh8ND0PMIZ9ULB0Uwca1w=";
    release."3.0.0".sha256 = "sha256-YMe2is7duGcvAHjM4joUE90EloibjSxqfZThsJhstdU=";
    release."2.6.0".sha256 = "sha256-23BHq1NFUkI3ayXnGUwiGFySLyY3EuH4RyMgAhQqI4g=";
    release."2.5.2".sha256 = "sha256-lLzjPrbVB3rrqox528YiheUb0u89R84Xmrgkn0oplOs=";
@@ -1,12 +1,111 @@
 {
+  callPackage,
  jdk17,
  jdk21,
  jdk23,
 }:

-rec {
-  gen =
+let
+  wrapGradle =
+    {
+      lib,
+      callPackage,
+      mitm-cache,
+      replaceVars,
+      symlinkJoin,
+      concatTextFile,
+      makeSetupHook,
+      nix-update-script,

+      # This is the "current" version of gradle in nixpkgs.
+      # Used to define the update script.
+      gradle-unwrapped,
+
+      runCommand,
+    }:
+    this-gradle-unwrapped:
+    lib.makeOverridable (
+      args:
+      let
+        gradle = this-gradle-unwrapped.override args;
+      in
+      symlinkJoin {
+        pname = "gradle";
+        inherit (gradle) version;
+
+        paths = [
+          (makeSetupHook { name = "gradle-setup-hook"; } (concatTextFile {
+            name = "setup-hook.sh";
+            files = [
+              (mitm-cache.setupHook)
+              (replaceVars ./setup-hook.sh {
+                # jdk used for keytool
+                inherit (gradle) jdk;
+                init_script = "${./init-build.gradle}";
+              })
+            ];
+          }))
+          gradle
+          mitm-cache
+        ];
+
+        passthru = {
+          fetchDeps = callPackage ./fetch-deps.nix { inherit mitm-cache; };
+          inherit (gradle) jdk;
+          unwrapped = gradle;
+          tests = {
+            toolchains =
+              let
+                javaVersion = lib.getVersion jdk23;
+                javaMajorVersion = lib.versions.major javaVersion;
+              in
+              runCommand "detects-toolchains-from-nix-env"
+                {
+                  # Use JDKs that are not the default for any of the gradle versions
+                  nativeBuildInputs = [
+                    (gradle.override {
+                      javaToolchains = [
+                        jdk23
+                      ];
+                    })
+                  ];
+                  src = ./tests/toolchains;
+                }
+                ''
+                  cp -a $src/* .
+                  substituteInPlace ./build.gradle --replace-fail '@JAVA_VERSION@' '${javaMajorVersion}'
+                  env GRADLE_USER_HOME=$TMPDIR/gradle org.gradle.native.dir=$TMPDIR/native \
+                  gradle run --no-daemon --quiet --console plain > $out
+                  actual="$(<$out)"
+                  if [[ "${javaVersion}" != "$actual"* ]]; then
+                    echo "Error: Expected '${javaVersion}', to start with '$actual'" >&2
+                    exit 1
+                  fi
+                '';
+          }
+          // gradle.tests;
+        }
+        // lib.optionalAttrs (this-gradle-unwrapped == gradle-unwrapped) {
+          updateScript = nix-update-script {
+            extraArgs = [
+              "--url=https://github.com/gradle/gradle"
+              # Gradle’s .0 releases are tagged as `vX.Y.0`, but the actual
+              # release version omits the `.0`, so we’ll wanto to only capture
+              # the version up but not including the the trailing `.0`.
+              "--version-regex=^v(\\d+\\.\\d+(?:\\.[1-9]\\d?)?)(\\.0)?$"
+            ];
+          };
+        };
+
+        meta = gradle.meta // {
+          # prefer normal gradle/mitm-cache over this wrapper, this wrapper only provides the setup hook
+          # and passthru
+          priority = (gradle.meta.priority or lib.meta.defaultPriority) + 1;
+        };
+      }
+    ) { };
+
+  gen =
    {
      version,
      hash,
@@ -34,12 +133,13 @@ rec {
      # Extra attributes to be merged into the resulting derivation's
      # meta attribute.
      meta ? { },
-    }:
+    }@genArgs:

    {
      lib,
      stdenv,
      fetchurl,
+      callPackage,
      makeWrapper,
      unzip,
      ncurses5,
@@ -186,6 +286,7 @@ rec {
        };
      };
      passthru.jdk = defaultJava;
+      passthru.wrapped = callPackage wrapGradle { } (gen' genArgs);

      meta =
        with lib;
@@ -219,119 +320,30 @@ rec {
        // meta;
    });

+  # Calls the generated Gradle package with default arguments.
+  gen' = args: callPackage (gen args) { };
+in
+rec {
  # NOTE: Default JDKs that are hardcoded below must be LTS versions
  # and respect the compatibility matrix at
  # https://docs.gradle.org/current/userguide/compatibility.html

-  gradle_9 = gen {
+  gradle_9 = gen' {
    version = "9.0.0";
    hash = "sha256-j609eClspRgRPz0pAWYXx/k2fcAF+TK9nZO/RbpGBys=";
    defaultJava = jdk21;
  };
-  gradle_8 = gen {
+  gradle_8 = gen' {
    version = "8.14.3";
    hash = "sha256-vXEQIhNJMGCVbsIp2Ua+7lcVjb2J0OYrkbyg+ixfNTE=";
    defaultJava = jdk21;
  };
-
-  gradle_7 = gen {
+  gradle_7 = gen' {
    version = "7.6.6";
    hash = "sha256-Zz2XdvMDvHBI/DMp0jLW6/EFGweJO9nRFhb62ahnO+A=";
    defaultJava = jdk17;
  };

-  wrapGradle =
-    {
-      lib,
-      callPackage,
-      mitm-cache,
-      replaceVars,
-      symlinkJoin,
-      concatTextFile,
-      makeSetupHook,
-      nix-update-script,
-      runCommand,
-    }:
-    gradle-unwrapped: updateAttrPath:
-    lib.makeOverridable (
-      args:
-      let
-        gradle = gradle-unwrapped.override args;
-      in
-      symlinkJoin {
-        pname = "gradle";
-        inherit (gradle) version;
-
-        paths = [
-          (makeSetupHook { name = "gradle-setup-hook"; } (concatTextFile {
-            name = "setup-hook.sh";
-            files = [
-              (mitm-cache.setupHook)
-              (replaceVars ./setup-hook.sh {
-                # jdk used for keytool
-                inherit (gradle) jdk;
-                init_script = "${./init-build.gradle}";
-              })
-            ];
-          }))
-          gradle
-          mitm-cache
-        ];
-
-        passthru = {
-          fetchDeps = callPackage ./fetch-deps.nix { inherit mitm-cache; };
-          inherit (gradle) jdk;
-          unwrapped = gradle;
-          tests = {
-            toolchains =
-              let
-                javaVersion = lib.getVersion jdk23;
-                javaMajorVersion = lib.versions.major javaVersion;
-              in
-              runCommand "detects-toolchains-from-nix-env"
-                {
-                  # Use JDKs that are not the default for any of the gradle versions
-                  nativeBuildInputs = [
-                    (gradle.override {
-                      javaToolchains = [
-                        jdk23
-                      ];
-                    })
-                  ];
-                  src = ./tests/toolchains;
-                }
-                ''
-                  cp -a $src/* .
-                  substituteInPlace ./build.gradle --replace-fail '@JAVA_VERSION@' '${javaMajorVersion}'
-                  env GRADLE_USER_HOME=$TMPDIR/gradle org.gradle.native.dir=$TMPDIR/native \
-                  gradle run --no-daemon --quiet --console plain > $out
-                  actual="$(<$out)"
-                  if [[ "${javaVersion}" != "$actual"* ]]; then
-                    echo "Error: Expected '${javaVersion}', to start with '$actual'" >&2
-                    exit 1
-                  fi
-                '';
-          }
-          // gradle.tests;
-        }
-        // lib.optionalAttrs (updateAttrPath != null) {
-          updateScript = nix-update-script {
-            attrPath = updateAttrPath;
-            extraArgs = [
-              "--url=https://github.com/gradle/gradle"
-              # Gradle’s .0 releases are tagged as `vX.Y.0`, but the actual
-              # release version omits the `.0`, so we’ll wanto to only capture
-              # the version up but not including the the trailing `.0`.
-              "--version-regex=^v(\\d+\\.\\d+(?:\\.[1-9]\\d?)?)(\\.0)?$"
-            ];
-          };
-        };
-
-        meta = gradle.meta // {
-          # prefer normal gradle/mitm-cache over this wrapper, this wrapper only provides the setup hook
-          # and passthru
-          priority = (gradle.meta.priority or lib.meta.defaultPriority) + 1;
-        };
-      }
-    ) { };
+  # Default version of Gradle in nixpkgs.
+  gradle = gradle_8;
 }
@@ -3,6 +3,7 @@
  lib,
  fetchFromGitHub,
  kernel,
+  kernelModuleMakeFlags,
 }:

 let
@@ -20,6 +21,8 @@ stdenv.mkDerivation {
    hash = "sha256-mI6Ob9BmNfwqT3nndWf3jkz8f7tV10odkTnfApsNo+A=";
  };

+  makeFlags = kernelModuleMakeFlags;
+
  postPatch = ''
    substituteInPlace Makefile \
      --replace-fail '/lib/modules/$(shell uname -r)/build' ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build
@@ -1,6 +1,7 @@
 {
  stdenv,
  kernel,
+  kernelModuleMakeFlags,
  libajantv2,
 }:
 stdenv.mkDerivation {
@@ -18,6 +19,8 @@ stdenv.mkDerivation {

  nativeBuildInputs = kernel.moduleBuildDependencies;

+  makeFlags = kernelModuleMakeFlags;
+
  preBuild = ''
    chmod -R +w ../../
  '';
@@ -3,6 +3,7 @@
  stdenv,
  fetchFromGitHub,
  kernel,
+  kernelModuleMakeFlags,
 }:

 stdenv.mkDerivation rec {
@@ -20,7 +21,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = kernel.moduleBuildDependencies;

-  makeFlags = [
+  makeFlags = kernelModuleMakeFlags ++ [
    "KERNELRELEASE=${kernel.modDirVersion}"
    "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}"
  ];
@@ -3,6 +3,7 @@
  lib,
  fetchFromGitHub,
  kernel,
+  kernelModuleMakeFlags,
 }:

 stdenv.mkDerivation rec {
@@ -34,7 +35,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = kernel.moduleBuildDependencies;

-  makeFlags = [
+  makeFlags = kernelModuleMakeFlags ++ [
    "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
  ];

@@ -2,6 +2,7 @@
  stdenv,
  fetchzip,
  kernel,
+  kernelModuleMakeFlags,
  lib,
 }:
 stdenv.mkDerivation (finalAttrs: {
@@ -17,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
  nativeBuildInputs = kernel.moduleBuildDependencies;
  strictDeps = true;

-  makeFlags = [
+  makeFlags = kernelModuleMakeFlags ++ [
    "KVERS=${kernel.modDirVersion}"
    "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
    "DESTDIR=$(out)"
@@ -3,6 +3,7 @@
  stdenv,
  fetchFromGitHub,
  kernel,
+  kernelModuleMakeFlags,
 }:

 stdenv.mkDerivation rec {
@@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
    sed -i 's|depmod|#depmod|' Makefile
  '';

-  makeFlags = [
+  makeFlags = kernelModuleMakeFlags ++ [
    "TARGET=${kernel.modDirVersion}"
    "KERNEL_MODULES=${kernel.dev}/lib/modules/${kernel.modDirVersion}"
    "MODDESTDIR=$(out)/lib/modules/${kernel.modDirVersion}/kernel/drivers/hwmon"
@@ -1,7 +1,7 @@
 {
    "testing": {
-        "version": "6.17-rc3",
-        "hash": "sha256:0kmlj35yqki4ibh15j8qx8202dh64fxl0nx737afg6i0k47rk1yd",
+        "version": "6.17-rc4",
+        "hash": "sha256:1vjwy9n3rpxjymyzyz7fbj20z0wf27229aml3qazcmy5kk115v66",
        "lts": false
    },
    "6.1": {
@@ -10,7 +10,7 @@
 }@args:

 let
-  version = "5.10.237-rt131"; # updated by ./update-rt.sh
+  version = "5.10.240-rt134"; # updated by ./update-rt.sh
  branch = lib.versions.majorMinor version;
  kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in
@@ -25,7 +25,7 @@ buildLinux (

    src = fetchurl {
      url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-      sha256 = "098gvqfaahabqqz64m5fwri57drwiz3006pr805sxw74w0vjgj0z";
+      sha256 = "04sdcf4aqsqchii38anzmk9f9x65wv8q1x3m9dandmi6fabw724d";
    };

    kernelPatches =
@@ -34,7 +34,7 @@ buildLinux (
          name = "rt";
          patch = fetchurl {
            url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-            sha256 = "15f4dylrwm9q0dl3jhcy57611w5kzz74rf9aqfvh7cqxi5q4g8fs";
+            sha256 = "0f2wq6w0707qn798a9lk7r31mfmdll6xwnxq8fy86574gl08ah79";
          };
        };
      in
@@ -10,7 +10,7 @@
 }@args:

 let
-  version = "5.15.183-rt85"; # updated by ./update-rt.sh
+  version = "5.15.189-rt87"; # updated by ./update-rt.sh
  branch = lib.versions.majorMinor version;
  kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in
@@ -29,7 +29,7 @@ buildLinux (

    src = fetchurl {
      url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-      sha256 = "1s4fqm83api3xk0b443b4bhgrx7bx6n8bchdpmzahqadk9i7yvyh";
+      sha256 = "1hshd26ahn6dbw6jnqi0v5afpk672w7p09mk7iri93i7hxdh5l73";
    };

    kernelPatches =
@@ -38,7 +38,7 @@ buildLinux (
          name = "rt";
          patch = fetchurl {
            url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-            sha256 = "1jlrnjr2cwlfqxzq27wzz0r57bpissxs0s3nbdaj4bk92cd527c3";
+            sha256 = "151vznvdcdmjsjsz3b4hfxw1v2jyigrh34k2qyxk3fkqg999fx9w";
          };
        };
      in
@@ -10,7 +10,7 @@
 }@args:

 let
-  version = "5.4.293-rt98"; # updated by ./update-rt.sh
+  version = "5.4.296-rt100"; # updated by ./update-rt.sh
  branch = lib.versions.majorMinor version;
  kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in
@@ -22,7 +22,7 @@ buildLinux (

    src = fetchurl {
      url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-      sha256 = "0b9p8l6ndm75751f7s03rnxg7yg9c4pj9rb537lhsv6pqx096n1l";
+      sha256 = "0fm73yqzbzclh2achcj8arpg428d412k2wgmlfmyy6xzb1762qrx";
    };

    kernelPatches =
@@ -31,7 +31,7 @@ buildLinux (
          name = "rt";
          patch = fetchurl {
            url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-            sha256 = "0vsb893cmc1rqrb2jqpc748748py2dc8nz8p5x3rh35ky8p3shss";
+            sha256 = "0ggmgkhmnvx4xxb3smfdcafqr9m3qdyc40xp3h7586p4n3wwpw9d";
          };
        };
      in
@@ -10,7 +10,7 @@
 }@args:

 let
-  version = "6.1.134-rt51"; # updated by ./update-rt.sh
+  version = "6.1.146-rt53"; # updated by ./update-rt.sh
  branch = lib.versions.majorMinor version;
  kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in
@@ -29,7 +29,7 @@ buildLinux (

    src = fetchurl {
      url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
-      sha256 = "08xx0w5gz7w5hqsnpckmizi1zpg38iwfchj20163ivnxf3fhriv0";
+      sha256 = "117gyi8zym09z2qarnv02i7v23v8596nqvllid07aydlcpihl9pv";
    };

    kernelPatches =
@@ -38,7 +38,7 @@ buildLinux (
          name = "rt";
          patch = fetchurl {
            url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-            sha256 = "18nznajrbjx9y76lki6aa10jkh33v60fnmyrbc0ds9x9xsnfahzz";
+            sha256 = "1kz416nc8hd2pi87l9k496r2lig07dbapyh701lq81rilbzx9nmc";
          };
        };
      in
@@ -10,7 +10,7 @@
 }@args:

 let
-  version = "6.6.87-rt54"; # updated by ./update-rt.sh
+  version = "6.6.101-rt59"; # updated by ./update-rt.sh
  branch = lib.versions.majorMinor version;
  kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in
@@ -29,7 +29,7 @@ buildLinux (

    src = fetchurl {
      url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
-      sha256 = "1iks6msk4cajyy0khyhrwsdl123hr81n67xzdnhlgg6dvb1famw9";
+      sha256 = "1h71zbqlsxcafrk218s0rip9rdrj0fzqvsl81ndqnlrnjy3g4kwc";
    };

    kernelPatches =
@@ -38,7 +38,7 @@ buildLinux (
          name = "rt";
          patch = fetchurl {
            url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-            sha256 = "0qxfs10y1ndq346gvcmhv0a02bbd3804yn1hvpx3p7bjp91j2as6";
+            sha256 = "0w71nl8s0npcz6x3qavl5j3vcqwd5wcqx4dj5ck2qs7bzv9kbrwb";
          };
        };
      in
@@ -2,6 +2,7 @@
  lib,
  stdenv,
  kernel,
+  kernelModuleMakeFlags,
  looking-glass-client,
 }:

@@ -17,7 +18,7 @@ stdenv.mkDerivation {
  ];
  nativeBuildInputs = kernel.moduleBuildDependencies;

-  makeFlags = [
+  makeFlags = kernelModuleMakeFlags ++ [
    "KVER=${kernel.modDirVersion}"
    "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
  ];
@@ -3,6 +3,7 @@
  stdenv,
  fetchFromGitHub,
  kernel,
+  kernelModuleMakeFlags,
 }:

 stdenv.mkDerivation rec {
@@ -20,7 +21,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = kernel.moduleBuildDependencies;

-  makeFlags = [
+  makeFlags = kernelModuleMakeFlags ++ [
    "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
  ];

@@ -2,6 +2,7 @@
  lib,
  stdenv,
  kernel,
+  kernelModuleMakeFlags,
  fetchFromGitHub,
 }:

@@ -30,6 +31,7 @@ stdenv.mkDerivation rec {
      KVERSION="${kernel.modDirVersion}"
      KDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
      KCFLAGS="-DCONFIG_LOGIWHEELS_FF -DCONFIG_LEDS_CLASS"
+      ${builtins.concatStringsSep " " kernelModuleMakeFlags}
    )
  '';

@@ -3,6 +3,7 @@
  lib,
  fetchFromGitLab,
  kernel,
+  kernelModuleMakeFlags,
 }:

 stdenv.mkDerivation (finalAttrs: {
@@ -26,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
    substituteInPlace src/Makefile --replace-fail "modules_install" "INSTALL_MOD_PATH=$out modules_install"
  '';

-  makeFlags = [
+  makeFlags = kernelModuleMakeFlags ++ [
    "BASEDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}"
  ];

@@ -3,6 +3,7 @@
  stdenv,
  fetchFromGitHub,
  kernel,
+  kernelModuleMakeFlags,
 }:
 let
  version = "1.0.4";
@@ -24,6 +25,8 @@ stdenv.mkDerivation {

  nativeBuildInputs = kernel.moduleBuildDependencies;

+  makeFlags = kernelModuleMakeFlags;
+
  buildFlags = [
    "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
  ];
@@ -3,6 +3,7 @@
  stdenv,
  fetchFromGitHub,
  kernel,
+  kernelModuleMakeFlags,
 }:
 let
  version = "1.0.17";
@@ -24,6 +25,8 @@ stdenv.mkDerivation {

  nativeBuildInputs = kernel.moduleBuildDependencies;

+  makeFlags = kernelModuleMakeFlags;
+
  buildFlags = [
    "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
  ];
@@ -3,6 +3,7 @@
  stdenv,
  fetchFromGitHub,
  kernel,
+  kernelModuleMakeFlags,
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "tt-kmd";
@@ -17,6 +18,8 @@ stdenv.mkDerivation (finalAttrs: {

  nativeBuildInputs = kernel.moduleBuildDependencies;

+  makeFlags = kernelModuleMakeFlags;
+
  buildFlags = [
    "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
  ];
@@ -3,6 +3,7 @@
  lib,
  fetchFromGitHub,
  kernel,
+  kernelModuleMakeFlags,
 }:

 stdenv.mkDerivation rec {
@@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
  ];
  nativeBuildInputs = kernel.moduleBuildDependencies;

-  makeFlags = [
+  makeFlags = kernelModuleMakeFlags ++ [
    "KVERSION=${kernel.modDirVersion}"
    "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
    "INSTALL_MOD_PATH=$(out)"
@@ -2,6 +2,7 @@
  stdenv,
  fetchFromGitHub,
  kernel,
+  kernelModuleMakeFlags,
  lib,
 }:

@@ -28,7 +29,7 @@ stdenv.mkDerivation {

  hardeningDisable = [ "pic" ];

-  makeFlags = [
+  makeFlags = kernelModuleMakeFlags ++ [
    "KVER=${kernel.modDirVersion}"
    "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
  ];
@@ -3,6 +3,7 @@
  lib,
  fetchFromGitHub,
  kernel,
+  kernelModuleMakeFlags,
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "xone";
@@ -21,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {

  nativeBuildInputs = kernel.moduleBuildDependencies;

-  makeFlags = [
+  makeFlags = kernelModuleMakeFlags ++ [
    "-C"
    "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
    "M=$(sourceRoot)"
@@ -3,6 +3,7 @@
  stdenv,
  fetchFromGitHub,
  kernel,
+  kernelModuleMakeFlags,
 }:

 stdenv.mkDerivation (finalAttr: {
@@ -20,6 +21,8 @@ stdenv.mkDerivation (finalAttr: {

  nativeBuildInputs = kernel.moduleBuildDependencies;

+  makeFlags = kernelModuleMakeFlags;
+
  postPatch = ''
    substituteInPlace Makefile --replace-fail "/lib/modules/\$(shell uname -r)/build" "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
  '';
@@ -12,7 +12,7 @@ generic: {
    hash = "sha256-FLdfMpurJ0xiW73Z1EcR3MlmoxdVWsH5G1vSfE31iAw=";
  };
  v60 = generic {
-    version = "6.0.36";
-    hash = "sha256-Ne0OY6NGzTYOn3sDVd+5tfawBu5VBjxNRtlxasubGCk=";
+    version = "6.0.41";
+    hash = "sha256-E5dtwTdSMV4RIR90eEqh+2keDYmeKWeEDRM0PuA4dxM=";
  };
 }
@@ -1036,6 +1036,7 @@ mapAliases {
    topGit = top-git;
  }; # Added 2021-01-14
  github-copilot-cli = throw "'github-copilot-cli' has been removed because GitHub has replaced it with 'gh-copilot'."; # Added 2025-06-01
+  gitversion = throw "'gitversion' has been removed because it produced a broken build and was unmaintained"; # Added 2025-08-30
  givaro_3 = throw "'givaro_3' has been removed as it is end-of-life. Consider using the up-to-date 'givaro' instead"; # Added 2025-05-07
  givaro_3_7 = throw "'givaro_3_7' has been removed as it is end-of-life. Consider using the up-to-date 'givaro' instead"; # Added 2025-05-07
  gkraken = throw "'gkraken' has been deprecated by upstream. Consider using the replacement 'coolercontrol' instead."; # Added 2024-11-22
@@ -6858,25 +6858,18 @@ with pkgs;
  m4 = gnum4;

  gnumake = callPackage ../development/tools/build-managers/gnumake { };
-  gradle-packages = import ../development/tools/build-managers/gradle {
-    inherit
-      jdk17
-      jdk21
-      jdk23
-      ;
-  };
-  gradleGen = gradle-packages.gen;
-  wrapGradle = callPackage gradle-packages.wrapGradle { };

-  gradle_7-unwrapped = callPackage gradle-packages.gradle_7 { };
-  gradle_8-unwrapped = callPackage gradle-packages.gradle_8 { };
-  gradle_9-unwrapped = callPackage gradle-packages.gradle_9 { };
-  gradle-unwrapped = gradle_8-unwrapped;
+  gradle-packages = callPackage ../development/tools/build-managers/gradle { };

-  gradle_7 = wrapGradle gradle_7-unwrapped null;
-  gradle_8 = wrapGradle gradle_8-unwrapped null;
-  gradle_9 = wrapGradle gradle_9-unwrapped null;
-  gradle = wrapGradle gradle-unwrapped "gradle-unwrapped";
+  gradle_7-unwrapped = gradle-packages.gradle_7;
+  gradle_8-unwrapped = gradle-packages.gradle_8;
+  gradle_9-unwrapped = gradle-packages.gradle_9;
+  gradle-unwrapped = gradle-packages.gradle;
+
+  gradle_7 = gradle-packages.gradle_7.wrapped;
+  gradle_8 = gradle-packages.gradle_8.wrapped;
+  gradle_9 = gradle-packages.gradle_9.wrapped;
+  gradle = gradle-packages.gradle.wrapped;

  griffe = with python3Packages; toPythonApplication griffe;

@@ -10936,7 +10929,8 @@ with pkgs;
  font-awesome_4 = (callPackage ../data/fonts/font-awesome { }).v4;
  font-awesome_5 = (callPackage ../data/fonts/font-awesome { }).v5;
  font-awesome_6 = (callPackage ../data/fonts/font-awesome { }).v6;
-  font-awesome = font-awesome_6;
+  font-awesome_7 = (callPackage ../data/fonts/font-awesome { }).v7;
+  font-awesome = font-awesome_7;

  palenight-theme = callPackage ../data/themes/gtk-theme-framework { theme = "palenight"; };

@@ -548,7 +548,7 @@ let
          in
          {
            ppx_deriving_0_15 = ppx_deriving_ "0.15";
-            ppx_deriving = ppx_deriving_ "0.33.0";
+            ppx_deriving_0_33 = ppx_deriving_ "0.33.0";
          }
        );