Merge staging-next into staging

2025-03-10 00:13:48 +00:00
parent 903a7876dc 996f219f1e
commit c815a0e1eb
116 changed files with 2807 additions and 9143 deletions
@@ -9101,6 +9101,12 @@
    github = "gytis-ivaskevicius";
    githubId = 23264966;
  };
+  h3cth0r = {
+    name = "Hector Miranda";
+    email = "hector.miranda@tec.mx";
+    github = "h3cth0r";
+    githubId = 43997408;
+  };
  h7x4 = {
    name = "h7x4";
    email = "h7x4@nani.wtf";
@@ -13365,6 +13371,12 @@
    githubId = 54590679;
    name = "Liam Murphy";
  };
+  Liamolucko = {
+    name = "Liam Murphy";
+    email = "liampm32@gmail.com";
+    github = "Liamolucko";
+    githubId = 43807659;
+  };
  liarokapisv = {
    email = "liarokapis.v@gmail.com";
    github = "liarokapisv";
@@ -64,15 +64,14 @@ enables OpenCL support:

 ### Intel {#sec-gpu-accel-opencl-intel}

-[Intel Gen8 and later
-GPUs](https://en.wikipedia.org/wiki/List_of_Intel_graphics_processing_units#Gen8)
-are supported by the Intel NEO OpenCL runtime that is provided by the
-intel-compute-runtime package. The proprietary Intel OpenCL runtime, in
-the intel-ocl package, is an alternative for Gen7 GPUs.
+[Intel Gen12 and later GPUs](https://en.wikipedia.org/wiki/List_of_Intel_graphics_processing_units#Gen12)
+are supported by the Intel NEO OpenCL runtime that is provided by the `intel-compute-runtime` package.
+The previous generations (8,9 and 11), have been moved to the `intel-compute-runtime-legacy1` package.
+The proprietary Intel OpenCL runtime, in the `intel-ocl` package, is an alternative for Gen7 GPUs.

-The intel-compute-runtime or intel-ocl package can be added to
+Both `intel-compute-runtime` packages, as well as the `intel-ocl` package can be added to
 [](#opt-hardware.graphics.extraPackages)
-to enable OpenCL support. For example, for Gen8 and later GPUs, the following
+to enable OpenCL support. For example, for Gen12 and later GPUs, the following
 configuration can be used:

 ```nix
@@ -236,6 +236,9 @@
 - The `intel` driver for the X server (`services.xserver.videoDrives = [ "intel" ]`) is no longer functional due to incompatibilities with the latest Mesa version.
  All users are strongly encouraged to switch to the generic `modesetting` driver (the default one) whenever possible, for more information see the manual chapter on [Intel Graphics](#sec-x11--graphics-cards-intel) and issue [#342763](https://github.com/NixOS/nixpkgs/issues/342763).

+- The `intel-compute-runtime` package dropped support for older GPUs, and only supports 12th Gen and newer from now on.
+  Intel GPUs from Gen 8,9 and 11 need to use the `intel-compute-runtime-legacy1` package in `hardware.graphics.extraPackages`.
+
 - The `(buildPythonPackage { ... }).override` and `(buildPythonPackage { ... }).overrideDerivation` attributes is now deprecated and removed in favour of `overridePythonAttrs` and `lib.overrideDerivation`.
  This change does not affect the override interface of most Python packages, as [`<pkg>.override`](https://nixos.org/manual/nixpkgs/unstable/#sec-pkg-override) provided by `callPackage` shadows such a locally-defined `override` attribute.
  The `<pkg>.overrideDerivation` attribute of Python packages called with `callPackage` will also remain available after this change.
@@ -58,6 +58,15 @@ in
      serviceConfig = {
        ExecStart = (
          lib.concatStringsSep " " [
+            # `python-matter-server` writes to /data even when a storage-path
+            # is specified. This symlinks /data at the systemd-managed
+            # /var/lib/matter-server, so all files get dropped into the state
+            # directory.
+            "${pkgs.bash}/bin/sh"
+            "-c"
+            "'"
+            "${pkgs.coreutils}/bin/ln -s %S/matter-server/ %t/matter-server/root/data"
+            "&&"
            "${cfg.package}/bin/matter-server"
            "--port"
            (toString cfg.port)
@@ -68,22 +77,21 @@ in
            "--log-level"
            "${cfg.logLevel}"
            "${lib.escapeShellArgs cfg.extraArgs}"
+            "'"
          ]
        );
        # Start with a clean root filesystem, and allowlist what the container
        # is permitted to access.
-        TemporaryFileSystem = "/";
+        # See https://discourse.nixos.org/t/hardening-systemd-services/17147/14.
+        RuntimeDirectory = [ "matter-server/root" ];
+        RootDirectory = "%t/matter-server/root";
+
        # Allowlist /nix/store (to allow the binary to find its dependencies)
        # and dbus.
-        ReadOnlyPaths = "/nix/store /run/dbus";
+        BindReadOnlyPaths = "/nix/store /run/dbus";
        # Let systemd manage `/var/lib/matter-server` for us inside the
        # ephemeral TemporaryFileSystem.
        StateDirectory = storageDir;
-        # `python-matter-server` writes to /data even when a storage-path is
-        # specified. This bind-mount points /data at the systemd-managed
-        # /var/lib/matter-server, so all files get dropped into the state
-        # directory.
-        BindPaths = "${storagePath}:/data";

        # Hardening bits
        AmbientCapabilities = "";
@@ -8,6 +8,7 @@ import ./make-test-python.nix (
  {
    name = "matter-server";
    meta.maintainers = with lib.maintainers; [ leonm1 ];
+    meta.timeout = 120; # Timeout after two minutes

    nodes = {
      machine =
@@ -22,29 +23,30 @@ import ./make-test-python.nix (

    testScript = # python
      ''
+        @polling_condition
+        def matter_server_running():
+          machine.succeed("systemctl status matter-server")
+
        start_all()

-        machine.wait_for_unit("matter-server.service")
-        machine.wait_for_open_port(1234)
+        machine.wait_for_unit("matter-server.service", timeout=20)
+        machine.wait_for_open_port(1234, timeout=20)

-        with subtest("Check websocket server initialized"):
-            output = machine.succeed("echo \"\" | ${pkgs.websocat}/bin/websocat ws://localhost:1234/ws")
-            machine.log(output)
+        with matter_server_running: # type: ignore[union-attr]
+          with subtest("Check websocket server initialized"):
+              output = machine.succeed("echo \"\" | ${pkgs.websocat}/bin/websocat ws://localhost:1234/ws")
+              machine.log(output)

-        assert '"sdk_version": "${chipVersion}"' in output, (
-          'CHIP version \"${chipVersion}\" not present in websocket message'
-        )
+          assert '"fabric_id": 1' in output, (
+            "fabric_id not propagated to server"
+          )

-        assert '"fabric_id": 1' in output, (
-          "fabric_id not propagated to server"
-        )
+          with subtest("Check storage directory is created"):
+              machine.succeed("ls /var/lib/matter-server/chip.json")

-        with subtest("Check storage directory is created"):
-            machine.succeed("ls /var/lib/matter-server/chip.json")
-
-        with subtest("Check systemd hardening"):
-            _, output = machine.execute("systemd-analyze security matter-server.service | grep -v '✓'")
-            machine.log(output)
+          with subtest("Check systemd hardening"):
+              _, output = machine.execute("systemd-analyze security matter-server.service | grep -v '✓'")
+              machine.log(output)
      '';
  }
 )
@@ -626,7 +626,7 @@ let
      ''
      + ''
        # Link to our own Node.js and Java (required during the build):
-        mkdir -p third_party/node/linux/node-linux-x64/bin
+        mkdir -p third_party/node/linux/node-linux-x64/bin${lib.optionalString ungoogled " third_party/jdk/current/bin/"}
        ln -sf "${pkgsBuildHost.nodejs}/bin/node" third_party/node/linux/node-linux-x64/bin/node
        ln -s "${pkgsBuildHost.jdk17_headless}/bin/java" third_party/jdk/current/bin/

@@ -786,27 +786,27 @@
    }
  },
  "ungoogled-chromium": {
-    "version": "133.0.6943.141",
+    "version": "134.0.6998.35",
    "deps": {
      "depot_tools": {
-        "rev": "423f1e1914ab4aa7b2bdf804e216d4c097853ba2",
-        "hash": "sha256-R7cGQLM6yJgFL43UO+zAGbq+9XEbKbtJVFRwdIUB1F8="
+        "rev": "e42fac3e9c1726ab14a61a25e6291d9ccc49e688",
+        "hash": "sha256-BvEkk15Rm4nSoV/uWiwmQW/+gg2vpLQ187TbBAHl9Rk="
      },
      "gn": {
-        "rev": "c97a86a72105f3328a540f5a5ab17d11989ab7dd",
-        "hash": "sha256-T2dcISln9WCODoI/LsE2ldkRfFdMwVOmqqjQinAmZss="
+        "rev": "ed1abc107815210dc66ec439542bee2f6cbabc00",
+        "hash": "sha256-EqbwCLkseND1v3UqM+49N7GuoXJ3PlJjWOes4OijQ3U="
      },
      "ungoogled-patches": {
-        "rev": "133.0.6943.141-1",
-        "hash": "sha256-FqpRx73axclW8bXmsRO845c3NB3ZBxE4fL4n7gU1P5A="
+        "rev": "134.0.6998.35-1",
+        "hash": "sha256-gwU3fNDrBGql5NSzkf+TBsQKxmk6zhQnFJ1Es2sHgl8="
      },
      "npmHash": "sha256-oVoTruhxTymYiGkELd2Oa1wOfjGLtChQZozP4GzOO1A="
    },
    "DEPS": {
      "src": {
        "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "2a5d6da0d6165d7b107502095a937fe7704fcef6",
-        "hash": "sha256-MJlCEe1WBh+7Pl3H4jnkMuSykTBSgh5x/ZPnNwYM4DE=",
+        "rev": "ea6ef4c2ac15ae95d2cfd65682da62c093415099",
+        "hash": "sha256-Y/3V1cmna7nSJkS05SYsDxtPTz8bF7Q8fWYxVhVSy/g=",
        "recompress": true
      },
      "src/third_party/clang-format/script": {
@@ -816,23 +816,23 @@
      },
      "src/third_party/libc++/src": {
        "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
-        "rev": "1f7db7501cf902d5d3ad5fd9b31bea33bb8bf9da",
-        "hash": "sha256-d1Am+7O7KYKEfs9HpAHlw6n6nWpd219gw2Cr5RaBl7w="
+        "rev": "2e25154d49c29fa9aa42c30ad4a027bd30123434",
+        "hash": "sha256-QxEbtsEKCs2Xgulq7nVWtAeOGkIYFOy/L1ROfXa5u8U="
      },
      "src/third_party/libc++abi/src": {
        "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
-        "rev": "83dfa1f5bfce32d5f75695542468e37ead8163b8",
-        "hash": "sha256-SUpg+lGtjchvh2CejKEIADAo6ozvHYj2BxzMcMZODCw="
+        "rev": "634228a732a1d9ae1a6d459556e8fc58707cf961",
+        "hash": "sha256-ln/DCNYJXVksbwdDBnxCfc4VwtjQlJXF7ktl/NxLupg="
      },
      "src/third_party/libunwind/src": {
        "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
-        "rev": "d1e95b102f113ded38974cf06a65fe0457b6004b",
-        "hash": "sha256-cRqctLgtiqODZf3B8ZIA2wJWCiEsuYTH24ppFtzDh3M="
+        "rev": "e55d8cf51c6db1fdd4bb56c158945ec59772c8ee",
+        "hash": "sha256-JazjgI+ch9RgnsDgu6p4cT4UmCBor4x4sRi1ClLISAY="
      },
      "src/third_party/llvm-libc/src": {
        "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
-        "rev": "039fea2058d14b408637a931b36a717169617227",
-        "hash": "sha256-Uf9DfH62xWzcOsvaekeqXiwsIaIJMFK7kXK82ReY66Y="
+        "rev": "6d0c8ee02e2fd44e69ac30e721e13be463035ee5",
+        "hash": "sha256-bF4hV9fY0GLYAHUnxSXkCxdZLMKR3wYWaqYJaM9aQiE="
      },
      "src/chrome/test/data/perf/canvas_bench": {
        "url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
@@ -851,18 +851,18 @@
      },
      "src/docs/website": {
        "url": "https://chromium.googlesource.com/website.git",
-        "rev": "4d214097ba7305ec2b3f2dfcf0aa4fd2104c960a",
-        "hash": "sha256-QvwWHVdLnDqJ6hz0Eli5AnM5gaXDya0En7BIm4vlm6c="
+        "rev": "600fc3a0b121d5007b4bb97b001e756625e6d418",
+        "hash": "sha256-f3Tdz0ykxQ2FHbNweJwPdAZHA8eVpjPuxqRpxwhYtRM="
      },
      "src/media/cdm/api": {
        "url": "https://chromium.googlesource.com/chromium/cdm.git",
-        "rev": "06395a2863cb1ebdb47617a995b73f95c14fe120",
-        "hash": "sha256-bx0zCgqgGPjm3wjo8Y3T5kWp14WW9uoDtvn5+QOAPw0="
+        "rev": "5a1675c86821a48f8983842d07f774df28dfb43c",
+        "hash": "sha256-FgeuOsxToA4qx3H76czCPeO/WVtprRkllDMPancw3Ik="
      },
      "src/net/third_party/quiche/src": {
        "url": "https://quiche.googlesource.com/quiche.git",
-        "rev": "981c424462d9e5210dc843e92b325c93d3bee4e9",
-        "hash": "sha256-O/3qN0pCHSzTURuqzk4schY+aRgRCHHbaTVzbQl3ur4="
+        "rev": "e7d001c82ee5bead5140481671828d5e156a525a",
+        "hash": "sha256-5YFqWgkyQ/PUKTkk1j3mAFD8JMbI+E4XRdSq34HFMWA="
      },
      "src/testing/libfuzzer/fuzzers/wasm_corpus": {
        "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
@@ -876,13 +876,13 @@
      },
      "src/third_party/angle": {
        "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "8304737811a7851e2bfdcf6f667b68dbac4e962a",
-        "hash": "sha256-kjBkeTaZ0aCpMVyHOJLK5mbGBMB5xG1bnx7pr6d92jc="
+        "rev": "914c97c116e09ef01a99fbbbe9cd28cda56552c7",
+        "hash": "sha256-Y4eX8YHwVXiXW4U8KGbFd4fTU/v/EAUpfwv6lB127Y4="
      },
      "src/third_party/angle/third_party/glmark2/src": {
        "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
-        "rev": "ca8de51fedb70bace5351c6b002eb952c747e889",
-        "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk="
+        "rev": "cb550a25c75a99ae0def91a02e16ae29d73e6d1e",
+        "hash": "sha256-kqBpWHCxUl1ekmrbdPn6cL2y75nK4FxECJ5mo83Zgf4="
      },
      "src/third_party/angle/third_party/rapidjson/src": {
        "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson",
@@ -891,13 +891,13 @@
      },
      "src/third_party/angle/third_party/VK-GL-CTS/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
-        "rev": "9509eb274dfec320e970d4c85e17ecf15f27ebe3",
-        "hash": "sha256-EZBAJP6puSn1vIO+JRPzZkp+uftneyga0zOXpf0W2os="
+        "rev": "48e7f3020f52ef9adc31aa0f5db01dc42cc487cd",
+        "hash": "sha256-g59uC7feByGR1Ema8LqUCr5XWKpDMeXXvlS2thOo5Ks="
      },
      "src/third_party/anonymous_tokens/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
-        "rev": "6ea6ec78f9e4998d0a7a5677b2aec08f0ac858f8",
-        "hash": "sha256-PMB49+zW9ewlS9ym+xi0xYQYLN0j5Urx6yBXWd8FjjI="
+        "rev": "2e328dd4eace9648adcc943cac6a1792b5dcdec5",
+        "hash": "sha256-mh4s57NonFQzWNaPiKfe9kW4Ow7XAN+hW6Xpvgjvb0w="
      },
      "src/third_party/content_analysis_sdk/src": {
        "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git",
@@ -906,13 +906,13 @@
      },
      "src/third_party/dav1d/libdav1d": {
        "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git",
-        "rev": "b129d9f2cb897cedba77a60bd5e3621c14ee5484",
-        "hash": "sha256-79NsUzY9fxOXlzwutAF80salew+uVHsadj2BgtEQbfo="
+        "rev": "42b2b24fb8819f1ed3643aa9cf2a62f03868e3aa",
+        "hash": "sha256-qcs9QoZ/uWEQ8l1ChZ8nYctZnnWJ0VvCw1q2rEktC9g="
      },
      "src/third_party/dawn": {
        "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "d4321eef8c5c94107783d903355c1cbbbb8a3776",
-        "hash": "sha256-28I6Q/Ip6FhlZa2uFuMrW5YJFaDJrv/bc/wztpfO42g="
+        "rev": "7056f50fdefc6bc46aa442e720d0336e2855b570",
+        "hash": "sha256-aYlcplXSGjFov9dqql6d+a1PxJWtZJNQaaezof0u9QQ="
      },
      "src/third_party/dawn/third_party/glfw": {
        "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -921,19 +921,14 @@
      },
      "src/third_party/dawn/third_party/dxc": {
        "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
-        "rev": "a8a4e98a2367080af683c48feedd7f7481a31a96",
-        "hash": "sha256-kc3s0LLYi3rNVTPzKQiX46JqnPkqV98tbVQr7OHuRvs="
+        "rev": "c2ed9ad4ee775f3de903ce757c994aecc59a5306",
+        "hash": "sha256-jecGwARtdSr2OEC68749mpFUAHuYP/IzYUZyj23CwJE="
      },
      "src/third_party/dawn/third_party/dxheaders": {
        "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
        "rev": "980971e835876dc0cde415e8f9bc646e64667bf7",
        "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA="
      },
-      "src/third_party/dawn/third_party/webgpu-headers": {
-        "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers",
-        "rev": "8049c324dc7b3c09dc96ea04cb02860f272c8686",
-        "hash": "sha256-J3PcwYoO79HqrACFgk77BZLTCi7oi5k2J6v3wlcFVD4="
-      },
      "src/third_party/dawn/third_party/khronos/OpenGL-Registry": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry",
        "rev": "5bae8738b23d06968e7c3a41308568120943ae77",
@@ -946,8 +941,8 @@
      },
      "src/third_party/dawn/third_party/webgpu-cts": {
        "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
-        "rev": "ba2bd8ab91d41b60b879b134d850d326eb86ef12",
-        "hash": "sha256-FOHgZOI7w7LzZZ14O72b7B/D/Gkvv/2KCf8+bZEPXNM="
+        "rev": "24d5dfa7725d6ece31941c3f3343ba6362986d6b",
+        "hash": "sha256-AEGYE2rSsPcRzJSm97DGsrPVbhCH+lyVI61Z4qavKc8="
      },
      "src/third_party/highway/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/highway.git",
@@ -961,13 +956,13 @@
      },
      "src/third_party/boringssl/src": {
        "url": "https://boringssl.googlesource.com/boringssl.git",
-        "rev": "d777ea2a7004ff7ef40ef983b41a5125f316f898",
-        "hash": "sha256-GOzeQ6BOXSqpDtgYOIyQae+jCKkqzMsU5N2WE95UR6Q="
+        "rev": "ea42fe28775844ec8fe0444fc421398be42d51fe",
+        "hash": "sha256-g9i5v11uZy/3Smn8zSCFmC27Gdp5VP2b0ROrj+VmP1k="
      },
      "src/third_party/breakpad/breakpad": {
        "url": "https://chromium.googlesource.com/breakpad/breakpad.git",
-        "rev": "02dd5c3ffbfed2bcbc93b553ed0e90a1ac951cb4",
-        "hash": "sha256-1JL9QLMycOXvSrwuvqHxYjSxru6qOmrsJIKMAzPId2s="
+        "rev": "0dfd77492fdb0dcd06027c5842095e2e908adc90",
+        "hash": "sha256-jOTRgF2WxsX5P0LgUI9zdCc0+NcqSnO310aq15msThY="
      },
      "src/third_party/cast_core/public/src": {
        "url": "https://chromium.googlesource.com/cast_core/public",
@@ -976,8 +971,8 @@
      },
      "src/third_party/catapult": {
        "url": "https://chromium.googlesource.com/catapult.git",
-        "rev": "8e5d239c953a309d4bf8aa70481bafa921834cc3",
-        "hash": "sha256-2sBXPPb9o/YKE9v9W+IxJ7o/6yOzP0q5GZWcWvohUM4="
+        "rev": "d5166861902b565df446e15181eba270fe168275",
+        "hash": "sha256-xkvz743+w0xsI0w4reAo2rfC4J7opl1biA3eNYuRn+o="
      },
      "src/third_party/ced/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
@@ -986,8 +981,8 @@
      },
      "src/third_party/chromium-variations": {
        "url": "https://chromium.googlesource.com/chromium-variations.git",
-        "rev": "0fcd7c5b11aca584c5c03b2af870c9f3af6c631c",
-        "hash": "sha256-K9saSXK6fCRuRBdX2PPmotO2K3tatiDwuciCDK6O1MU="
+        "rev": "84c18c7a0205fbd0a27b0214b16ded7fc44dc062",
+        "hash": "sha256-zXAmoKyj104BaIe4Rug18WbVKkyAsyWPCTPPEerinVo="
      },
      "src/third_party/cld_3/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git",
@@ -1006,8 +1001,8 @@
      },
      "src/third_party/cpuinfo/src": {
        "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git",
-        "rev": "ca156f7bc9109c552973414a63d310f76ef0cbf8",
-        "hash": "sha256-hIGizsl1NSGySXPI9Xx69xCfQLAMpYviYhBXX201N4o="
+        "rev": "8a1772a0c5c447df2d18edf33ec4603a8c9c04a6",
+        "hash": "sha256-dKmZ5YXLhvVdxaJ4PefR+SWlh+MTFHNxOMeM6Vj7Gvo="
      },
      "src/third_party/crc32c/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git",
@@ -1016,23 +1011,23 @@
      },
      "src/third_party/cros_system_api": {
        "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
-        "rev": "497b90c6e283745f976d783ed2beaafeef42b1bf",
-        "hash": "sha256-s8ot4NvZfpUbLz/AMNX4F9e78AquKWk/YjguErBZCYE="
+        "rev": "ea21b22629965105426f3df5e58190513e95a17e",
+        "hash": "sha256-xUaGf4MaEXg2RHgrGS1Uuz97vq5Vbt4HFV/AXYB4lCA="
      },
      "src/third_party/crossbench": {
        "url": "https://chromium.googlesource.com/crossbench.git",
-        "rev": "1b41ed2574ef931f2d1157ebb153c9d552f69670",
-        "hash": "sha256-FgI0D1neQ/jrNaQxMsj2hOM6nF14ZYfGHuqUznRK4Rc="
+        "rev": "0391f0d11cbf3cf3c5bcf82e19e9d9839b1936ed",
+        "hash": "sha256-EL+lOTe1Vzg4JW2q7t3UoXzHHiEmLjf7khH9fXdplbo="
      },
      "src/third_party/depot_tools": {
        "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
-        "rev": "423f1e1914ab4aa7b2bdf804e216d4c097853ba2",
-        "hash": "sha256-R7cGQLM6yJgFL43UO+zAGbq+9XEbKbtJVFRwdIUB1F8="
+        "rev": "e42fac3e9c1726ab14a61a25e6291d9ccc49e688",
+        "hash": "sha256-BvEkk15Rm4nSoV/uWiwmQW/+gg2vpLQ187TbBAHl9Rk="
      },
      "src/third_party/devtools-frontend/src": {
        "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "41deafc3d1ae776a97d8fd1cfb457a06908e3a6d",
-        "hash": "sha256-8ev0h+/R1L8VXQqpKJ3zVIQ+kYHKWyNJYcGhPdVhSa4="
+        "rev": "044764a564924c9aa0897ba8c50149acc7ddf364",
+        "hash": "sha256-T8BlvYNMF77BubiR4tMvW8iAhqS0ppPAESO48/mNX3w="
      },
      "src/third_party/dom_distiller_js/dist": {
        "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -1041,8 +1036,8 @@
      },
      "src/third_party/eigen3/src": {
        "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
-        "rev": "24e0c2a125d2b37b35719124d1f758777c150ca8",
-        "hash": "sha256-c0QHya0eDKQc5YvvxIoL722fPm3XD3PagJb+pEwSAGQ="
+        "rev": "2a35a917be47766a895be610bedd66006980b7e6",
+        "hash": "sha256-WG7uiduuMnXrvEpXJNGksrYkBsim+l7eiu5N+mx0Yr0="
      },
      "src/third_party/farmhash/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git",
@@ -1051,8 +1046,8 @@
      },
      "src/third_party/fast_float/src": {
        "url": "https://chromium.googlesource.com/external/github.com/fastfloat/fast_float.git",
-        "rev": "3e57d8dcfb0a04b5a8a26b486b54490a2e9b310f",
-        "hash": "sha256-0eVovauN7SnO3nSIWBRWAJ4dR7q5beZrIGUZ18M2pao="
+        "rev": "cb1d42aaa1e14b09e1452cfdef373d051b8c02a4",
+        "hash": "sha256-CG5je117WYyemTe5PTqznDP0bvY5TeXn8Vu1Xh5yUzQ="
      },
      "src/third_party/ffmpeg": {
        "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git",
@@ -1086,18 +1081,18 @@
      },
      "src/third_party/grpc/src": {
        "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git",
-        "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737",
-        "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8="
+        "rev": "a363b6c001139b9c8ffb7cd63f60a72f15349c3b",
+        "hash": "sha256-RKGZWtH2JmP2mXN+4ln/nCJvOyzynrYcfrxSY8k1vVg="
      },
      "src/third_party/freetype/src": {
        "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
-        "rev": "afc7000cacb8cc90ae61036858c5306defa1236a",
-        "hash": "sha256-ZaAoUxqr3GZ05Zux2jDS4YCbFaeJ4Z+dc3gZCRL09NE="
+        "rev": "b1f47850878d232eea372ab167e760ccac4c4e32",
+        "hash": "sha256-YxWz3O9see1dktqZnC551V12yU5jcOERTB1Hn1lwUNM="
      },
      "src/third_party/freetype-testing/src": {
        "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git",
-        "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f",
-        "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A="
+        "rev": "04fa94191645af39750f5eff0a66c49c5cb2c2cc",
+        "hash": "sha256-cpzz5QDeAT3UgAZzwW7c0SgLDQsBwy/1Q+5hz2XW4lE="
      },
      "src/third_party/fxdiv/src": {
        "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git",
@@ -1106,13 +1101,13 @@
      },
      "src/third_party/harfbuzz-ng/src": {
        "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
-        "rev": "1c249be96e27eafd15eb86d832b67fbc3751634b",
-        "hash": "sha256-TStJvz3Txn4cvU1tCPPZn6RLslvM+VNUqt8l8g67JN4="
+        "rev": "6d8035a99c279e32183ad063f0de201ef1b2f05c",
+        "hash": "sha256-isQvwaVdL4cM465A8Gs06VioAu8RvZFrwXDsXhfOoFo="
      },
      "src/third_party/ink/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/ink.git",
-        "rev": "e5673a4ff2d82f29b22f7bec114161cbc1ff8cf8",
-        "hash": "sha256-/F4p2VRDWJ0bZRtSoWtgK8gnQDaOrHwoKwGvuSRq3a0="
+        "rev": "bf387a71d7def4b48bf24c8e09d412dfb9962746",
+        "hash": "sha256-OcGUJxKEjeiYJgknpyb/KvDu76GMaddxWO0Lj7l9Eu8="
      },
      "src/third_party/ink_stroke_modeler/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git",
@@ -1136,13 +1131,13 @@
      },
      "src/third_party/libgav1/src": {
        "url": "https://chromium.googlesource.com/codecs/libgav1.git",
-        "rev": "a2f139e9123bdb5edf7707ac6f1b73b3aa5038dd",
-        "hash": "sha256-+ss9S5t+yoHzqbtX68+5OyyUbJVecYLwp+C3EXfAziE="
+        "rev": "c05bf9be660cf170d7c26bd06bb42b3322180e58",
+        "hash": "sha256-BgTfWmbcMvJB1KewJpRcMtbOd2FVuJ+fi1zAXBXfkrg="
      },
      "src/third_party/googletest/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git",
-        "rev": "7d76a231b0e29caf86e68d1df858308cd53b2a66",
-        "hash": "sha256-ssYxqE/NZJGTAbuWTXg150qlvMS3QNaonEk9dK8jJWI="
+        "rev": "e235eb34c6c4fed790ccdad4b16394301360dcd4",
+        "hash": "sha256-jpXIcz5Uy6fDEvxTq8rTFx/M+0+SQ6TCDaqnp7nMtng="
      },
      "src/third_party/hunspell_dictionaries": {
        "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git",
@@ -1161,8 +1156,8 @@
      },
      "src/third_party/leveldatabase/src": {
        "url": "https://chromium.googlesource.com/external/leveldb.git",
-        "rev": "578eeb702ec0fbb6b9780f3d4147b1076630d633",
-        "hash": "sha256-tOSl9w9hEUnuQR+DxfZlHqEXXcpeyDlZrw2NWDUyXoY="
+        "rev": "4ee78d7ea98330f7d7599c42576ca99e3c6ff9c5",
+        "hash": "sha256-ANtMVRZmW6iOjDVn2y15ak2fTagFTTaz1Se6flUHL8w="
      },
      "src/third_party/libFuzzer/src": {
        "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git",
@@ -1171,8 +1166,8 @@
      },
      "src/third_party/fuzztest/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
-        "rev": "3b4a590f7fc75a77823580c4c4e19d1c7bd6da52",
-        "hash": "sha256-+m6F1rqfIQcxKZbAJgQfKbokYPZSR+PrEHxMiE9IVKA="
+        "rev": "44ac6c2594a880edbb9cb1e4e197c2b53d078130",
+        "hash": "sha256-AKXKxXqOMUb3APf5r15NmIMyhJ4ZmW5+t7y5XdgdZkw="
      },
      "src/third_party/domato/src": {
        "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git",
@@ -1181,28 +1176,23 @@
      },
      "src/third_party/libaddressinput/src": {
        "url": "https://chromium.googlesource.com/external/libaddressinput.git",
-        "rev": "e8712e415627f22d0b00ebee8db99547077f39bd",
-        "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ="
+        "rev": "2610f7b1043d6784ada41392fc9392d1ea09ea07",
+        "hash": "sha256-6h4/DQUBoBtuGfbaTL5Te1Z+24qjTaBuIydcTV18j80="
      },
      "src/third_party/libaom/source/libaom": {
        "url": "https://aomedia.googlesource.com/aom.git",
-        "rev": "0c13a5d54053f82bf8500b421b5cdefb1cc1b3ed",
-        "hash": "sha256-uGvdLJNzvd7WxRAjTxYVaX5Y7Oc54f8fLEtpErAdCdg="
-      },
-      "src/third_party/libavif/src": {
-        "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git",
-        "rev": "e9a27bc6a84f01b6670c05c301c445f33a464992",
-        "hash": "sha256-4slyN5V7UCDbGHK/xZfC5MuOGhctVF6r/1lSnOHJB5Y="
+        "rev": "3990233fc06a35944d6d33797e63931802122a95",
+        "hash": "sha256-4NOQug0MlWZ18527V3IDuGcxGEJ4b+mZZbdzugWoBgQ="
      },
      "src/third_party/crabbyavif/src": {
        "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
-        "rev": "879ca873d6648a01de65e4cb0b86336b581aa513",
-        "hash": "sha256-JF1s3rDH0u5srtzyGQt/LU8iVlx1qPqE4RBE1AR8KPQ="
+        "rev": "c5938b119ef52f9ff628436c1e66c9a5322ece83",
+        "hash": "sha256-+6339vcd0KJj5V11dvJvs0YpQpTxsLmDuBoYVzyn9Ec="
      },
      "src/third_party/nearby/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
-        "rev": "1864b0b55506bfc1eafc3785502f085f41aa0921",
-        "hash": "sha256-tTJ9tJBiWbAurKvb8aPn0KLHd724CYk5wlVIVZPWB0o="
+        "rev": "97690c6996f683a6f3e07d75fc4557958c55ac7b",
+        "hash": "sha256-d1D9/6d7a1+27nD8VijhzRMglE2PqvAMK8+GbMeesSQ="
      },
      "src/third_party/beto-core/src": {
        "url": "https://beto-core.googlesource.com/beto-core.git",
@@ -1216,8 +1206,8 @@
      },
      "src/third_party/speedometer/main": {
        "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
-        "rev": "67bc21f1f44567a3ba41d7a3d8d0bec0e74f4a9e",
-        "hash": "sha256-mx4Z/co1mZcu//nlGIg5yH+XiTWB0sdiEK8Jvbi4THU="
+        "rev": "d6b5ffea959ad31e231c203d7446bf8b39e987ce",
+        "hash": "sha256-lCwGk4Q+OXwO8vOlOQrkgygYqLrwpku/PkR03oEdX3Y="
      },
      "src/third_party/speedometer/v3.0": {
        "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
@@ -1241,8 +1231,8 @@
      },
      "src/third_party/cros-components/src": {
        "url": "https://chromium.googlesource.com/external/google3/cros_components.git",
-        "rev": "59dd6e3d06e111c6a3d323a92e6478b9bbf15915",
-        "hash": "sha256-x9udwohR5jKPL6x2Hxu2FdS2aW3T8VIGZ4mLtgNQ5io="
+        "rev": "1f1c782f06956a2deb5d33f09c466e4852099c71",
+        "hash": "sha256-80WqSMP5Vlc4OY+gfpU3SRGavs7fJbTQVW1AIhq6jmE="
      },
      "src/third_party/libdrm/src": {
        "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git",
@@ -1296,13 +1286,13 @@
      },
      "src/third_party/libvpx/source/libvpx": {
        "url": "https://chromium.googlesource.com/webm/libvpx.git",
-        "rev": "8058a0b54991257a0e1a2fcf08d993a8b70c1d3a",
-        "hash": "sha256-iwUQ7WI9ThluB2+a4T7FlE7gPyBxTt9PZJnG6k5PYew="
+        "rev": "7b3fa8114cf8ef23cbf91e50c368c1ca768d95d5",
+        "hash": "sha256-2FgBb0HzgMihGsWbEtQqyN2EXZs/y5+ToWL1ZXG35W0="
      },
      "src/third_party/libwebm/source": {
        "url": "https://chromium.googlesource.com/webm/libwebm.git",
-        "rev": "26d9f667170dc75e8d759a997bb61c64dec42dda",
-        "hash": "sha256-Mn3snC2g4BDKBJsS6cxT3BZL7LZknOWg77+60Nr4Hy0="
+        "rev": "b4f01ea3ed6fd00923caa383bb2cf6f7a0b7f633",
+        "hash": "sha256-yQ5MIUKtuWQM5SfD74vPeqGEdLJNss2/RBUZfq5701A="
      },
      "src/third_party/libwebp/src": {
        "url": "https://chromium.googlesource.com/webm/libwebp.git",
@@ -1311,8 +1301,8 @@
      },
      "src/third_party/libyuv": {
        "url": "https://chromium.googlesource.com/libyuv/libyuv.git",
-        "rev": "47ddac2996378c34aab9318f0d218303b1d282e7",
-        "hash": "sha256-sB5iCuc3+Dp9uVm2mUt4XhQ3zazsueEVNNw6uTMGTuQ="
+        "rev": "5a9a6ea936085310f3b9fbd4a774868e6a984ec4",
+        "hash": "sha256-E5ePVHrEXMM8mS1qaUwPTqYO0BdP7TYuUhfX+BCiq/0="
      },
      "src/third_party/lss": {
        "url": "https://chromium.googlesource.com/linux-syscall-support.git",
@@ -1341,18 +1331,18 @@
      },
      "src/third_party/openh264/src": {
        "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264",
-        "rev": "478e5ab3eca30e600006d5a0a08b176fd34d3bd1",
-        "hash": "sha256-S7dS2IZwt4p4ZrF6K7E5HnwKuI3owU2I7vwtu95uTkE="
+        "rev": "33f7f48613258446decb33b3575fc0a3c9ed14e3",
+        "hash": "sha256-lZlZjX8GCJOc77VJ9i1fSWn63pfVOEcwwlzh0UpIgy4="
      },
      "src/third_party/openscreen/src": {
        "url": "https://chromium.googlesource.com/openscreen",
-        "rev": "991678c7c3b66807cb40619e46ebb7de1bc45a18",
-        "hash": "sha256-ULAd+neG99IXGMOT4Ur4tDdV+jxMucwQFid2xhHqcMY="
+        "rev": "38d1445b41d1eb597fcd100688dbaff98aa072ed",
+        "hash": "sha256-KGVFyGp7ItKeapub3Bd+htXH/gMaaBd+k8iC7hLtvl0="
      },
      "src/third_party/openscreen/src/buildtools": {
        "url": "https://chromium.googlesource.com/chromium/src/buildtools",
-        "rev": "4e0e9c73a0f26735f034f09a9cab2a5c0178536b",
-        "hash": "sha256-suuxUL//BfAMmG8os8ChI7ic9EjGTi7y5kjxiAyrEQc="
+        "rev": "56013b77b6c0a650d00bde40e750e7c3b7c6bc3d",
+        "hash": "sha256-Dz7wMYQHVR7sjCGaQe2nxIxZsAxsK6GGDNpDvypPefo="
      },
      "src/third_party/openscreen/src/third_party/tinycbor/src": {
        "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git",
@@ -1361,13 +1351,13 @@
      },
      "src/third_party/pdfium": {
        "url": "https://pdfium.googlesource.com/pdfium.git",
-        "rev": "a6637ded97c46aa4879769b1a6b0f2128e6ea257",
-        "hash": "sha256-Y2quVCJS62YFwxBSB42Wg03QQ10M8C1GTrRvhr73IN8="
+        "rev": "12f7715a6390050c5cffb7e4c9b2be1c2f2956d0",
+        "hash": "sha256-/u+HYjmxSIX2GlriEWYZQJ8TDFNfzSufATGq1j9zx9w="
      },
      "src/third_party/perfetto": {
        "url": "https://android.googlesource.com/platform/external/perfetto.git",
-        "rev": "2473cc95bc0d2d0c3c240be49ce4c2d0dc48edd4",
-        "hash": "sha256-OUnQ4XStZ0Olm/IvlaLzcRdHo/EMPlQ6ekVTSrG7HW0="
+        "rev": "0d78d85c2bfb993ab8dd9a85b6fee6caa6a0f357",
+        "hash": "sha256-bjgSwq4LPz9qN9rVqIJUTHetRguCx67Uq5oe1ksPqGE="
      },
      "src/third_party/protobuf-javascript/src": {
        "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
@@ -1375,9 +1365,9 @@
        "hash": "sha256-TmP6xftUVTD7yML7UEM/DB8bcsL5RFlKPyCpcboD86U="
      },
      "src/third_party/pthreadpool/src": {
-        "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git",
-        "rev": "560c60d342a76076f0557a3946924c6478470044",
-        "hash": "sha256-rGg6lgLkmbYo+a9CdaXz9ZUyrqJ1rxLcjLJeBEOPAlE="
+        "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git",
+        "rev": "e1469417238e13eebaa001779fa031ed25c59def",
+        "hash": "sha256-cFRELaRtWspZaqtmdKmVPqM7HVskHlFMAny+Zv/Zflw="
      },
      "src/third_party/pyelftools": {
        "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git",
@@ -1401,18 +1391,23 @@
      },
      "src/third_party/ruy/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git",
-        "rev": "95484c3e02206f73309c08ee5ee23d2304ca092b",
-        "hash": "sha256-BaRyNHZLpXNsJltffV7T19QrMWkTcCq37JZiWjAdSHo="
+        "rev": "83fd40d730feb0804fafbc2d8814bcc19a17b2e5",
+        "hash": "sha256-O3JEtXchCdIHdGvjD6kGMJzj7TWVczQCW2YUHK3cABA="
+      },
+      "src/third_party/search_engines_data/resources": {
+        "url": "https://chromium.googlesource.com/external/search_engines_data.git",
+        "rev": "6dc3b54b420e6e03a34ee7259fcd2b1978fac5f3",
+        "hash": "sha256-8RY3AU2V4iZKEmVwT7Z1Q3QlcTXDIdeyYwnQoyJcAUY="
      },
      "src/third_party/skia": {
        "url": "https://skia.googlesource.com/skia.git",
-        "rev": "ecebe831881cdf52c65df518777210071f7970dd",
-        "hash": "sha256-9pq0MEWRlR6bOamQW+onZkhGH82FUYRn3P1ooDUqnPY="
+        "rev": "fb519f2fe5d4409bc0033a4ae00ab9a7095fe566",
+        "hash": "sha256-Y0KtUKn6DxpxVLRM+jPvUPhPzekTAma1HYs27xlJlkw="
      },
      "src/third_party/smhasher/src": {
        "url": "https://chromium.googlesource.com/external/smhasher.git",
-        "rev": "3e1f0d1d8340cfe136d33fd27c75eb7694148214",
-        "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw="
+        "rev": "0ff96f7835817a27d0487325b6c16033e2992eb5",
+        "hash": "sha256-OgZQwkQcVgRMf62ROGuY+3zQhBoWuUSP4naTmSKdq8s="
      },
      "src/third_party/snappy/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git",
@@ -1426,8 +1421,8 @@
      },
      "src/third_party/swiftshader": {
        "url": "https://swiftshader.googlesource.com/SwiftShader.git",
-        "rev": "52586b554f93e50bc67277c6031673ed23a8d903",
-        "hash": "sha256-WPTpjJK6qFzXJg5eYLpEb6hqGgNzAkQOlSeA5a78Vpk="
+        "rev": "86cf34f50cbe5a9f35da7eedad0f4d4127fb8342",
+        "hash": "sha256-PSkIU8zC+4AVcYu0vaYo6I1SSykrHgcgGVMBJanux8o="
      },
      "src/third_party/text-fragments-polyfill/src": {
        "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
@@ -1436,18 +1431,18 @@
      },
      "src/third_party/tflite/src": {
        "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
-        "rev": "b25df276c8e912c22f57263ffcae6ca8f4c64342",
-        "hash": "sha256-Xl5dgjiKpkwf3Iv15Oj83AR1iJQ5qNzClCk24Y28TVw="
+        "rev": "51c6eed226abcfeeb46864e837d01563cc5b907b",
+        "hash": "sha256-qXHENS/6NwHAr1/16eb079XzmwAnpLtVZuva8uGCf+8="
      },
      "src/third_party/vulkan-deps": {
        "url": "https://chromium.googlesource.com/vulkan-deps",
-        "rev": "915d114daeb26a3dbdad1622f5a72c0aa255acbb",
-        "hash": "sha256-K7HND6c357xoDFAczG77RY4E7lGyEvt0J4NidSkRYTE="
+        "rev": "2e4b45a53a0e2e66bcb6540ae384c53a517218d0",
+        "hash": "sha256-9ebWETg/fsS4MYZg74XHs/Nz3nX6BXBNVRN2PmyWXWM="
      },
      "src/third_party/glslang/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
-        "rev": "10fb91c403b2f5e2142c751884dd12ed3fb13952",
-        "hash": "sha256-MvX2ApY5EF/jVMCkSSLHkPVIyHPe+CIlKJnkURzmxLU="
+        "rev": "0549c7127c2fbab2904892c9d6ff491fa1e93751",
+        "hash": "sha256-LwspMo771iaV5YeEJWgdb8xi37KMa0rsSdvO3uqMOAI="
      },
      "src/third_party/spirv-cross/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
@@ -1456,38 +1451,38 @@
      },
      "src/third_party/spirv-headers/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
-        "rev": "36d5e2ddaa54c70d2f29081510c66f4fc98e5e53",
-        "hash": "sha256-8hx8/1vaY4mRnfNaBsghWqpzyzY4hkVkNFbQEFZif9g="
+        "rev": "e7294a8ebed84f8c5bd3686c68dbe12a4e65b644",
+        "hash": "sha256-/p7kBW7mwpG/Uz0goMM7L3zjpOMBzGiuN+0ZBEOpORo="
      },
      "src/third_party/spirv-tools/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
-        "rev": "f3c4a5053f1bd34056282e56659659873f9d47ad",
-        "hash": "sha256-1qIdXDDRDXT27O8o9gFNEQHQKJVAoqN3BDepL/iu1zQ="
+        "rev": "ce37fd67f83cd1e8793b988d2e4126bbf72b19dd",
+        "hash": "sha256-SJcxmKdzOjg6lOJk/3m8qo7puvtci1YEU6dXKjthx0Q="
      },
      "src/third_party/vulkan-headers/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
-        "rev": "36872f9062b17b1a30b8ed1d81ca5ea6bb608a72",
-        "hash": "sha256-+29yOL4VBAR8QpsK/WcCiJkPQxSoReTXVSoAhzsPPKc="
+        "rev": "39f924b810e561fd86b2558b6711ca68d4363f68",
+        "hash": "sha256-twJJVBfnZbH/8Wn273h45K3BOnlAicqL2zJl6OfLm2E="
      },
      "src/third_party/vulkan-loader/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
-        "rev": "081b529a37f43249225114c4c0dea12a29ce605f",
-        "hash": "sha256-QyWnBxTo5KcbEB1/Kcz2679KCsSTRDini4Ef9YRY+lw="
+        "rev": "0508dee4ff864f5034ae6b7f68d34cb2822b827d",
+        "hash": "sha256-QqFC3Iyhw9Pq6TwBHxa0Ss7SW0bHo0Uz5N18oxl2ROg="
      },
      "src/third_party/vulkan-tools/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
-        "rev": "86d6be76350413def51e96ed98a25cc2c9d048c9",
-        "hash": "sha256-2LQGTmViNb4G19zcHyEpor2E0c1wD9+JDknLfeT1M2Y="
+        "rev": "c52931f012cb7b48e42bbf2050a7fb2183b76406",
+        "hash": "sha256-nIzrishMMxWzOuD3aX8B6Iuq2kPsUF0Uuvz7GijTulY="
      },
      "src/third_party/vulkan-utility-libraries/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
-        "rev": "b538fb5b08513aa78346cd414ad5e576a2a3e920",
-        "hash": "sha256-XoMQ9VhyS4eJ8TLxNKZ1YygeOJp65AsFSk2galRM7BE="
+        "rev": "fe7a09b13899c5c77d956fa310286f7a7eb2c4ed",
+        "hash": "sha256-zI3y5aoP4QcYp677Oxj5Ef7lJyJwOMdGsaRBe+X9vpI="
      },
      "src/third_party/vulkan-validation-layers/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
-        "rev": "24ad452082bfbf3eb749d7894266666a8aae4bbb",
-        "hash": "sha256-OUdlPRua+Ujn2rdzmg62OLqlsgByBNh4yUnL11oM5gE="
+        "rev": "a30aa23cfaff4f28f039c025c159128a6c336a7e",
+        "hash": "sha256-foa5hzqf1hPwOj3k57CloCe/j0qXW3zCQ4mwCT4epF4="
      },
      "src/third_party/vulkan_memory_allocator": {
        "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
@@ -1496,8 +1491,8 @@
      },
      "src/third_party/wasm_tts_engine/src": {
        "url": "https://chromium.googlesource.com/chromium/wasm-tts-engine",
-        "rev": "6d5bc87a28e49361dac2964015957698b04a0df8",
-        "hash": "sha256-uqPCMa95uoLhf+cjmc5iz3m3qGy2BNrr8oipfDbColA="
+        "rev": "7a91dbfddd93afa096a69fb7d292e22d4afecad2",
+        "hash": "sha256-bV+1YFEtCyTeZujsZtZiexT/aUTN3MaVerR2UdkUPBY="
      },
      "src/third_party/wayland/src": {
        "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git",
@@ -1531,8 +1526,8 @@
      },
      "src/third_party/webgpu-cts/src": {
        "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
-        "rev": "e99550b44ea9eedb364beb553d1a48549d0da115",
-        "hash": "sha256-uklVbu4Sgb9FmmKcaep8ncd5FNfdPGwdKMvzVr2qUBI="
+        "rev": "fb2b951ac3c23e453335edf35c9b3bad431d9009",
+        "hash": "sha256-tjY5ADd5tMFsYHk6xT+TXwsDYV5eI2oOywmyTjjAxYc="
      },
      "src/third_party/webpagereplay": {
        "url": "https://chromium.googlesource.com/webpagereplay.git",
@@ -1541,8 +1536,8 @@
      },
      "src/third_party/webrtc": {
        "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "cd3e2951ff0f36fa12bea747862c52533a2b39f3",
-        "hash": "sha256-5tdES3wILTC25Lvos5mWYlfT4ZnM2pBFy5LVACVMXEY="
+        "rev": "8d78f5de6c27b2c793039989ea381f1428fb0100",
+        "hash": "sha256-IsjTrEnxIqINYYjWJmDp7rlubl5dJ2YMpJf/DrG/mRM="
      },
      "src/third_party/wuffs/src": {
        "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -1561,18 +1556,18 @@
      },
      "src/third_party/xnnpack/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
-        "rev": "7440eee88f66c4b81d4e7d31f6ae07af66e059ea",
-        "hash": "sha256-qC4hSubtlNKwRikKNYtiEnvCtV0/IGvQegnhrMCTKKs="
+        "rev": "0824e2965f6edc2297e55c8dff5a8ac4cb12aaad",
+        "hash": "sha256-eb9B9lXPB2GiC4qehB/HOU36W1e9RZ0N2oEbIifyrHE="
      },
      "src/third_party/zstd/src": {
        "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
-        "rev": "b0a179d469680276adbd4007435989a6b7fd8b4f",
-        "hash": "sha256-uFzzxbTxCUl69URMJdb9BL9cHkwwiuSHyXGSVo2xX6w="
+        "rev": "ea0aa030cdf31f7897c5bfc153f0d36e92768095",
+        "hash": "sha256-UJsuaSzR4V8alLdtxzpla1v9WYHPKPp13YrgA4Y6/yA="
      },
      "src/v8": {
        "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "93c6f1082c25ef7fdf60ee2e4a029d65808d9343",
-        "hash": "sha256-OV1WncJaYvx1bB5najkKDNC2iMTU+m2vDAi9S/AjCyw="
+        "rev": "debba63b78f8791411bff379835982cb2e8cabfa",
+        "hash": "sha256-iOpnf4jq4bl0CJlHngJ1BV6b0VY1PigJIIjVXk4rqOE="
      }
    }
  }
@@ -22,13 +22,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "lagrange";
-  version = "1.18.4";
+  version = "1.18.5";

  src = fetchFromGitHub {
    owner = "skyjake";
    repo = "lagrange";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-Bty2TRL5blduhucYmI6x3RZVdgrY0/7Dtm5kgQ2N3ec=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-NlnT8dGh05dDjSMxjaBnW7x/KjLgf2Ma0nbaiR7MpiY=";
  };

  nativeBuildInputs = [
@@ -1255,13 +1255,13 @@
    "vendorHash": "sha256-YdWs2orKhbwAZSQYC73t4e/vvVxk8LrBPG9ZC38VcZE="
  },
  "sysdig": {
-    "hash": "sha256-KoqAx3l03Q6FNu6/9QiDJZqVYumlq4JW1uQHCePuqqM=",
+    "hash": "sha256-TzwrfI4P3C7jIm7LHk00IOrKXSfZ1MOTw/gq9vVtcHw=",
    "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig",
    "owner": "sysdiglabs",
    "repo": "terraform-provider-sysdig",
-    "rev": "v1.46.0",
+    "rev": "v1.47.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-eZl/UKvLG1Yi59oRl70CvrAIyLoyPW0ILWmFMzdUdDQ="
+    "vendorHash": "sha256-L+XwC7c4ph4lM0+BhHB9oi1R/Av8jlDcqHewOmtPU1s="
  },
  "tailscale": {
    "hash": "sha256-b2ZzXvlzlE+zv3Ufu4M5mcuLhyDkBbMznyM7NbiXAQs=",
@@ -10,17 +10,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "lucky-commit";
-  version = "2.2.3";
+  version = "2.2.4";

  src = fetchFromGitHub {
    owner = "not-an-aardvark";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-jxcsTtQcSuL+2vwdxIVxqTpKh8Bfvna+hkGt+Rx21FE=";
+    sha256 = "sha256-57eOhlOkRU1sz0y/sfEyEFXQJx165qehBTP8iWiEGx8=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-e3011CvoxoAeXrJqcjKSWbpkQBncFV5qgFLM8ByZOYI=";
+  cargoHash = "sha256-8Z/bfSDjSrvGbPOVpvIYzOz5wxjkMsuwOWASnOA8ziM=";

  buildInputs = lib.optional withOpenCL (if stdenv.hostPlatform.isDarwin then OpenCL else ocl-icd);

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

 python3.pkgs.buildPythonApplication rec {
  pname = "accerciser";
-  version = "3.44.1";
+  version = "3.46.2";

  format = "other";

  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-tJz7DTIY+/Vf+kPH96N9a4URn+2VahBjCYBO2+mDkAM=";
+    url = "mirror://gnome/sources/accerciser/${lib.versions.majorMinor version}/accerciser-${version}.tar.xz";
+    hash = "sha256-r/RpRR8k5YdpPE9/en+GpQU8ZrIDOndDrZ2DhHSWdw4=";
  };

  nativeBuildInputs = [
@@ -1,8 +1,7 @@
 {
  stdenv,
  lib,
-  fetchFromGitLab,
-  gitUpdater,
+  fetchurl,
  pkg-config,
  itstool,
  gtk3,
@@ -15,18 +14,16 @@
  libcanberra-gtk3,
  ninja,
  yelp-tools,
+  gnome,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "aisleriot";
-  version = "3.22.34";
+  version = "3.22.35";

-  src = fetchFromGitLab {
-    domain = "gitlab.gnome.org";
-    owner = "GNOME";
-    repo = "aisleriot";
-    rev = finalAttrs.version;
-    hash = "sha256-XaEyh1ZXBvW/4tfuQyEFzvnE2Vv7+4lTUfeXoSCMnHM=";
+  src = fetchurl {
+    url = "mirror://gnome/sources/aisleriot/${lib.versions.majorMinor finalAttrs.version}/aisleriot-${finalAttrs.version}.tar.xz";
+    hash = "sha256-AeYEzXAJo2wMXxVCSpBORvg2LDBrpfa8cfrIpedGO/A=";
  };

  nativeBuildInputs = [
@@ -57,7 +54,9 @@ stdenv.mkDerivation (finalAttrs: {
  mesonFlags = [ "-Dtheme_kde=false" ];

  passthru = {
-    updateScript = gitUpdater { };
+    updateScript = gnome.updateScript {
+      packageName = "aisleriot";
+    };
  };

  meta = with lib; {
@@ -8,11 +8,11 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "aldente";
-  version = "1.30";
+  version = "1.31.3";

  src = fetchurl {
    url = "https://github.com/davidwernhart/aldente-charge-limiter/releases/download/${finalAttrs.version}/AlDente.dmg";
-    hash = "sha256-O3t8Vm1y/OcPzz9MgKA5TcaK43HhPrURvPeWeXvjsjo=";
+    hash = "sha256-O1PGjq5W/BSnfHrmbd4FrtZ7+k+Be9l/5mmvOtlMXRo=";
  };

  dontBuild = true;
@@ -5,22 +5,30 @@
  m4,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "beecrypt";
  version = "4.2.1";

  src = fetchurl {
-    url = "mirror://sourceforge/beecrypt/beecrypt-${version}.tar.gz";
-    sha256 = "0pf5k1c4nsj77jfq5ip0ra1gzx2q47xaa0s008fnn6hd11b1yvr8";
+    url = "mirror://sourceforge/beecrypt/beecrypt-${finalAttrs.version}.tar.gz";
+    hash = "sha256-KG8fVggNGmsdAkADpfohWPT/gsrgxoKdPEdqS1iYxV0=";
  };
+
+  postPatch = ''
+    sed -i '33i #include "beecrypt/endianness.h"' blockmode.c
+  '';
+
  buildInputs = [ m4 ];
+
  configureFlags = [
    "--disable-optimized"
    "--enable-static"
  ];

  meta = {
+    description = "Strong and fast cryptography toolkit library";
    platforms = lib.platforms.linux;
    license = lib.licenses.lgpl2;
+    maintainers = [ ];
  };
-}
+})
@@ -0,0 +1,43 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  gitMinimal,
+}:
+let
+  target = stdenv.hostPlatform.rust.cargoShortTarget;
+in
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "bender";
+  version = "0.28.1";
+
+  src = fetchFromGitHub {
+    owner = "pulp-platform";
+    repo = "bender";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-eC4BY3ri73vgEtcXoPQ5NDknjZcPrKOzLo2vXWj4Adg=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-fV4pWSRNlXCdnpeDgg3QW8s1Ixd1LEY8qP/Pb4t5xdc=";
+
+  nativeCheckInputs = [ gitMinimal ];
+  postCheck = ''
+    patchShebangs --build tests
+    BENDER="target/${target}/$cargoBuildType/bender" tests/run_all.sh
+  '';
+
+  meta = {
+    description = "Dependency management tool for hardware projects";
+    homepage = "https://github.com/pulp-platform/bender";
+    changelog = "https://github.com/pulp-platform/bender/releases/tag/${finalAttrs.src.rev}";
+    license = with lib.licenses; [
+      asl20
+      mit
+    ];
+    maintainers = with lib.maintainers; [ Liamolucko ];
+    mainProgram = "bender";
+    platforms = lib.platforms.all;
+  };
+})
@@ -0,0 +1,84 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  makeDesktopItem,
+  imagemagick,
+  glew110,
+  SDL_compat,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "blackvoxel";
+  version = "2.5";
+
+  src = fetchFromGitHub {
+    owner = "Blackvoxel";
+    repo = "Blackvoxel";
+    tag = finalAttrs.version;
+    hash = "sha256-Uj3TfxAsLddsPiWDcLKjpduqvgVjnESZM4YPHT90YYY=";
+  };
+
+  nativeBuildInputs = [ imagemagick ];
+
+  buildInputs = [
+    glew110
+    SDL_compat
+  ];
+
+  enableParallelBuilding = true;
+
+  postPatch = ''
+    substituteInPlace src/sc_Squirrel3/sq/Makefile --replace-fail " -m64" ""
+    substituteInPlace src/sc_Squirrel3/sqstdlib/Makefile --replace-fail " -m64" ""
+    substituteInPlace src/sc_Squirrel3/squirrel/Makefile --replace-fail " -m64" ""
+  '';
+
+  buildFlags = [ "BV_DATA_LOCATION_DIR=${placeholder "out"}/data" ];
+
+  # data/gui/gametype_back.bmp isn't exactly the official icon but since
+  # there is no official icon we use that one
+  postBuild = ''
+    convert gui/gametype_back.bmp blackvoxel.png
+  '';
+
+  installFlags = [
+    "doinstall=true"
+    "BV_DATA_INSTALL_DIR=${placeholder "out"}/data"
+    "BV_BINARY_INSTALL_DIR=${placeholder "out"}/bin"
+  ];
+
+  postInstall = ''
+    install -Dm644 blackvoxel.png $out/share/icons/hicolor/1024x1024/apps/blackvoxel.png
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "blackvoxel";
+      desktopName = "Blackvoxel";
+      exec = "blackvoxel";
+      icon = "blackvoxel";
+      categories = [ "Game" ];
+    })
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "A Sci-Fi game with industry and automation";
+    homepage = "https://www.blackvoxel.com";
+    changelog = "https://github.com/Blackvoxel/Blackvoxel/releases/tag/${finalAttrs.version}";
+    license = with lib.licenses; [
+      # blackvoxel
+      gpl3Plus
+      # Squirrel
+      mit
+    ];
+    maintainers = with lib.maintainers; [
+      ethancedwards8
+      marcin-serwin
+    ];
+    platforms = lib.platforms.linux;
+  };
+})
@@ -14,13 +14,13 @@

 stdenv.mkDerivation rec {
  pname = "bpftune";
-  version = "0-unstable-2025-02-13";
+  version = "0-unstable-2025-03-07";

  src = fetchFromGitHub {
    owner = "oracle";
    repo = "bpftune";
-    rev = "2f73157b0e6f15034d898f3f92a376e89c3e3819";
-    hash = "sha256-0hgTJkGEU1xw2aCvTbhMVOz6EKtICrBqVPwIh5vxCOI=";
+    rev = "744bd48eccb536d6e9c782f635130dbf322e8a32";
+    hash = "sha256-pjFqq5KeG1ptTEo8ENiqC/QkDPqQG4VPR2GDvcBPwH8=";
  };

  postPatch = ''
@@ -6,13 +6,13 @@
  ncurses,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "bviplus";
  version = "1.0";

  src = fetchurl {
-    url = "mirror://sourceforge/project/bviplus/bviplus/${version}/bviplus-${version}.tgz";
-    sha256 = "08q2fdyiirabbsp5qpn3v8jxp4gd85l776w6gqvrbjwqa29a8arg";
+    url = "mirror://sourceforge/project/bviplus/bviplus/${finalAttrs.version}/bviplus-${finalAttrs.version}.tgz";
+    hash = "sha256-LyukklCYy5U3foabc2hB7ZHbJdrDXlyuXkvlGH1zAiM=";
  };

  patches = [
@@ -21,26 +21,24 @@ stdenv.mkDerivation rec {
    (fetchpatch {
      name = "ncurses-6.3.patch";
      url = "https://sourceforge.net/p/bviplus/bugs/7/attachment/bviplus-ncurses-6.2.patch";
-      sha256 = "1g3s2fdly3qliy67f3dlb12a03a21zkjbya6gap4mqxhyyjbp46x";
+      hash = "sha256-3ZC7pPew40quekb5JecPQg2gRFi0DXeMjxQPT5sTerw=";
      # svn patch, rely on prefix added by fetchpatch:
      extraPrefix = "";
    })
  ];

-  buildInputs = [
-    ncurses
-  ];
+  buildInputs = [ ncurses ];

  makeFlags = [ "PREFIX=$(out)" ];

-  buildFlags = [ "CFLAGS=-fgnu89-inline" ];
+  env.NIX_CFLAGS_COMPILE = "-Wno-implicit-int -fgnu89-inline";

-  meta = with lib; {
+  meta = {
    description = "Ncurses based hex editor with a vim-like interface";
    homepage = "https://bviplus.sourceforge.net";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
    maintainers = [ ];
    mainProgram = "bviplus";
  };
-}
+})
@@ -7,12 +7,12 @@

 appimageTools.wrapType2 rec {
  pname = "cider-2";
-  version = "2.6.0";
+  version = "2.6.1";

  src = requireFile {
    name = "cider-linux-x64.AppImage";
    url = "https://cidercollective.itch.io/cider";
-    sha256 = "18by764idifnjs5h2cydv4qjm7w95lzdlxjkscp289w3jdpbmd05";
+    sha256 = "0qjhsssccxiq92zs04zhi53bkaf2qwfq7ryic1w9sha59ffyxqbf";
  };

  nativeBuildInputs = [ makeWrapper ];
@@ -7,13 +7,13 @@

 buildGoModule rec {
  pname = "cirrus-cli";
-  version = "0.138.1";
+  version = "0.138.3";

  src = fetchFromGitHub {
    owner = "cirruslabs";
    repo = "cirrus-cli";
    rev = "v${version}";
-    hash = "sha256-k9laBOhkor2jW7dMaVNXFK+FzSC/4DgJFM5k1NhX4V4=";
+    hash = "sha256-Fc3f3hVHuwO0hhH5ZDoQBKPPfxnt3TOWMRgefZa7bJU=";
  };

  vendorHash = "sha256-GjCwH0Xe9wyacfokI5EzF2TKUnSMKCdOljahChPBlso=";
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "dpp";
-  version = "10.1.0";
+  version = "10.1.1";

  src = fetchFromGitHub {
    owner = "brainboxdotcc";
    repo = "DPP";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-YkMwHJMDRbv2Pne0exCP52188zWyu8ozWENaBmgzPvc=";
+    hash = "sha256-DHsHmAvL22aC4g5MzY2x793IKB9XHCDrNabQwIbfZn8=";
  };

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

 stdenv.mkDerivation (finalAttrs: {
  pname = "dub";
-  version = "1.38.1";
+  version = "1.39.0";

  enableParallelBuilding = true;

@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "dlang";
    repo = "dub";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-8Lr/0sx4SKwU1aNOxZArta0RXpDM+EWl29ZsPDdPWFo=";
+    hash = "sha256-73b15A9+hClD6IbuxTy9QZKpTKjUFYBuqGOclUyhrnM=";
  };

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

 stdenv.mkDerivation (finalAttrs: {
  pname = "file-roller";
-  version = "44.4";
+  version = "44.5";

  src = fetchurl {
    url = "mirror://gnome/sources/file-roller/${lib.versions.major finalAttrs.version}/file-roller-${finalAttrs.version}.tar.xz";
-    hash = "sha256-uMMJ2jqnhMcZVYw0ZkAjePSj1sro7XfPaEmqzVbOuew=";
+    hash = "sha256-369LuYnAuJhr6L2un//quNDzBmmuOmJ+jD35TyOIgzk=";
  };

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

 stdenv.mkDerivation rec {
  pname = "flips";
-  version = "196";
+  version = "198";

  src = fetchFromGitHub {
    owner = "Alcaro";
    repo = "Flips";
    tag = "v${version}";
-    hash = "sha256-lQ88Iz607AcVzvN/jLGhOn7qiRe9pau9oQcLMt7JIT8=";
+    hash = "sha256-zYGDcUbtzstk1sTKgX2Mna0rzH7z6Dic+OvjZLI1umI=";
  };

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

 let
  pname = "gallery-dl";
-  version = "1.29.0";
+  version = "1.29.1";
 in
 python3Packages.buildPythonApplication {
  inherit pname version;
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication {
    owner = "mikf";
    repo = "gallery-dl";
    tag = "v${version}";
-    hash = "sha256-d0yGhEeupvC3QFsVhfy4DPj1mClAdGbsBp8FYop+hUc=";
+    hash = "sha256-NOKnR6+evDEYna+k7FdR5vJBtUwRnX9oaIDT4LkNLjg=";
  };

  build-system = [ python3Packages.setuptools ];
@@ -23,11 +23,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "glycin-loaders";
-  version = "1.1.4";
+  version = "1.1.6";

  src = fetchurl {
    url = "mirror://gnome/sources/glycin/${lib.versions.majorMinor finalAttrs.version}/glycin-${finalAttrs.version}.tar.xz";
-    hash = "sha256-0bbVkLaZtmgaZ9ARmKWBp/cQ2Mp0UJNN1/XbJB+hJQA=";
+    hash = "sha256-2EzFaBTyKEEArTQ5pDCDe7IfD5jUbg0rWGifLBlwjwQ=";
  };

  patches = [
@@ -190,6 +190,13 @@ stdenv.mkDerivation (finalAttrs: {
    rm data/theme/gnome-shell-{light,dark}.css
  '';

+  preInstall = ''
+    # gnome-shell contains GSettings schema overrides for Mutter.
+    schemadir="$out/share/glib-2.0/schemas"
+    mkdir -p "$schemadir"
+    cp "${glib.getSchemaPath mutter}/org.gnome.mutter.gschema.xml" "$schemadir"
+  '';
+
  postInstall = ''
    # Pull in WebP and JXL support for gnome-backgrounds.
    # In postInstall to run before gappsWrapperArgsHook.
@@ -30,11 +30,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-terminal";
-  version = "3.54.3";
+  version = "3.54.4";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor finalAttrs.version}/gnome-terminal-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Oa8AueYadNjN8oFSvq/uUTwyfhIjoHfRMcR5xQT0pHU=";
+    hash = "sha256-RDqAaJM3EI5LGQOZlp5mq6BBzDxju5nFc4Ul1SixMrg=";
  };

  nativeBuildInputs = [
@@ -22,13 +22,13 @@
 let
  inherit (python3Packages) python pygobject3;
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "gnumeric";
-  version = "1.12.57";
+  version = "1.12.59";

  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "r/ULG2I0DCT8z0U9X60+f7c/S8SzT340tsPS2a9qHk8=";
+    url = "mirror://gnome/sources/gnumeric/${lib.versions.majorMinor finalAttrs.version}/gnumeric-${finalAttrs.version}.tar.xz";
+    sha256 = "yzdQsXbWQflCPfchuDFljIKVV1UviIf+34pT2Qfs61E=";
  };

  configureFlags = [ "--disable-component" ];
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {

  passthru = {
    updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "gnumeric";
      versionPolicy = "odd-unstable";
    };
  };
@@ -82,4 +82,4 @@ stdenv.mkDerivation rec {
    platforms = platforms.unix;
    maintainers = [ maintainers.vcunat ];
  };
-}
+})
@@ -1,6 +0,0 @@
-{
-  godot_4,
-}:
-godot_4.override {
-  withMono = true;
-}
@@ -16,11 +16,12 @@
  gnome,
  autoreconfHook,
  gtk-doc,
+  gnumeric,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "goffice";
-  version = "0.10.57";
+  version = "0.10.59";

  outputs = [
    "out"
@@ -29,8 +30,8 @@ stdenv.mkDerivation rec {
  ];

  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-Zr/X4x0vZ1bVpiw2cDg8u6ArPLTBBClQGSqAG3Kjyas=";
+    url = "mirror://gnome/sources/goffice/${lib.versions.majorMinor finalAttrs.version}/goffice-${finalAttrs.version}.tar.xz";
+    hash = "sha256-sI9xczJVlLcfu+pHajC1sxIMPa3/XAom0UDk5SSRZiI=";
  };

  nativeBuildInputs = [
@@ -60,9 +61,13 @@ stdenv.mkDerivation rec {

  passthru = {
    updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "goffice";
      versionPolicy = "odd-unstable";
    };
+
+    tests = {
+      inherit gnumeric;
+    };
  };

  meta = {
@@ -78,4 +83,4 @@ stdenv.mkDerivation rec {

    platforms = lib.platforms.unix;
  };
-}
+})
@@ -36,13 +36,13 @@
  webkitgtk_4_0,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "gthumb";
-  version = "3.12.6";
+  version = "3.12.7";

  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-YIdwxsjnMHOh1AS2W9G3YeGsXcJecBMP8HJIj6kvXDM=";
+    url = "mirror://gnome/sources/gthumb/${lib.versions.majorMinor finalAttrs.version}/gthumb-${finalAttrs.version}.tar.xz";
+    sha256 = "sha256-7hLSTPIxAQJB91jWyVudU6c4Enj6dralGLPQmzce+uw=";
  };

  nativeBuildInputs = [
@@ -104,7 +104,7 @@ stdenv.mkDerivation rec {

  passthru = {
    updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "gthumb";
      versionPolicy = "odd-unstable";
    };
  };
@@ -117,4 +117,4 @@ stdenv.mkDerivation rec {
    license = licenses.gpl2Plus;
    maintainers = [ maintainers.mimame ];
  };
-}
+})
@@ -6,13 +6,13 @@

 stdenv.mkDerivation rec {
  pname = "hr";
-  version = "1.4";
+  version = "1.5";

  src = fetchFromGitHub {
    owner = "LuRsT";
    repo = "hr";
    rev = version;
-    sha256 = "sha256-Pcnkiq7ipLoz6MFWZkCIxneUuZ3w/d+iqiyTz55WZvs=";
+    sha256 = "sha256-05num4v8C3n+uieKQJVLOzu9OOMBsUMPqq08Ou6gmYQ=";
  };

  dontBuild = true;
@@ -0,0 +1,42 @@
+{
+  lib,
+  fetchurl,
+  appimageTools,
+  nix-update-script,
+}:
+let
+  pname = "hydralauncher";
+  version = "3.2.3";
+  src = fetchurl {
+    url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage";
+    hash = "sha256-iQL/xEyVgNfAeiz41sos8nbrGRxzQWR618EikPLS/Ig=";
+  };
+
+  appimageContents = appimageTools.extractType2 { inherit pname src version; };
+in
+appimageTools.wrapType2 {
+  inherit pname src version;
+
+  extraInstallCommands = ''
+    install -Dm644 ${appimageContents}/usr/share/icons/hicolor/512x512/apps/hydralauncher.png \
+      $out/share/icons/hicolor/512x512/apps/hydralauncher.png
+
+    install -Dm644 ${appimageContents}/hydralauncher.desktop \
+      $out/share/applications/hydralauncher.desktop
+    substituteInPlace $out/share/applications/hydralauncher.desktop \
+      --replace-fail 'Exec=AppRun' 'Exec=${placeholder "out"}/bin/hydralauncher'
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Game launcher with its own embedded bittorrent client";
+    homepage = "https://github.com/hydralauncher/hydra";
+    changelog = "https://github.com/hydralauncher/hydra/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ HeitorAugustoLN ];
+    mainProgram = "hydralauncher";
+    platforms = lib.platforms.linux;
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+  };
+}
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
  };

  meta = with lib; {
-    description = "Intel Graphics Compute Runtime for OpenCL with support for Gen8, Gen9 and Gen11 GPUs.d";
+    description = "Intel Graphics Compute Runtime oneAPI Level Zero and OpenCL with support for Gen8, Gen9 and Gen11 GPUs";
    mainProgram = "ocloc";
    homepage = "https://github.com/intel/compute-runtime";
    changelog = "https://github.com/intel/compute-runtime/releases/tag/${version}";
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
  '';

  meta = with lib; {
-    description = "Intel Graphics Compute Runtime for OpenCL. Replaces Beignet for Gen8 (Broadwell) and beyond";
+    description = "Intel Graphics Compute Runtime oneAPI Level Zero and  OpenCL, supporting 12th Gen and newer";
    mainProgram = "ocloc";
    homepage = "https://github.com/intel/compute-runtime";
    changelog = "https://github.com/intel/compute-runtime/releases/tag/${version}";
@@ -1,8 +1,9 @@
 {
  fetchFromGitHub,
-  kicad-small,
  lib,
+  kicad,
  python3Packages,
+  xvfb-run,
 }:

 python3Packages.buildPythonApplication rec {
@@ -22,11 +23,21 @@ python3Packages.buildPythonApplication rec {
  dependencies = [
    python3Packages.jsonschema
    python3Packages.wxpython
-    kicad-small
+    python3Packages.kicad
  ];

-  # has no tests
-  doCheck = false;
+  nativeCheckInputs = [
+    xvfb-run
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+
+    cp ${kicad.base}/share/kicad/demos/stickhub/StickHub.kicad_pcb .
+    HOME=$(mktemp -d) xvfb-run $out/bin/generate_interactive_bom --no-browser StickHub.kicad_pcb
+
+    runHook postCheck
+  '';

  meta = {
    description = "Interactive HTML BOM generation for KiCad, EasyEDA, Eagle, Fusion360 and Allegro PCB designer";
@@ -1,153 +0,0 @@
-From 46bad01581bca5bc64f6499eb1222ff067721a63 Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dimstar@opensuse.org>
-Date: Fri, 5 Apr 2024 10:28:16 +0200
-Subject: [PATCH 1/2] build: Fix build against, and require, libgit2 1.8.0
-
---
- libgit2-glib/ggit-clone-options.c        | 1 +
- libgit2-glib/ggit-cred-ssh-interactive.c | 2 +-
- libgit2-glib/ggit-remote-callbacks.h     | 1 +
- libgit2-glib/ggit-repository.c           | 4 ++--
- libgit2-glib/ggit-types.h                | 3 ++-
- meson.build                              | 2 +-
- 6 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/libgit2-glib/ggit-clone-options.c b/libgit2-glib/ggit-clone-options.c
-index b47fdb1..30c7d86 100644
--- a/libgit2-glib/ggit-clone-options.c
-+++ b/libgit2-glib/ggit-clone-options.c
-@@ -19,6 +19,7 @@
-  */
- 
- #include <git2.h>
-+#include <git2/sys/errors.h>
- #include <gio/gio.h>
- 
- #include "ggit-clone-options.h"
-diff --git a/libgit2-glib/ggit-cred-ssh-interactive.c b/libgit2-glib/ggit-cred-ssh-interactive.c
-index 4f60f8b..0bdca95 100644
--- a/libgit2-glib/ggit-cred-ssh-interactive.c
-+++ b/libgit2-glib/ggit-cred-ssh-interactive.c
-@@ -191,7 +191,7 @@ callback_wrapper (const char                            *name,
- 	{
- 		gchar *text;
- 
-		text = g_strndup (prompts[i].text, prompts[i].length);
-+		text = g_strndup ((const gchar *)prompts[i].text, prompts[i].length);
- 
- 		wprompts[i] = ggit_cred_ssh_interactive_prompt_new (wname,
- 		                                                    winstruction,
-diff --git a/libgit2-glib/ggit-remote-callbacks.h b/libgit2-glib/ggit-remote-callbacks.h
-index 3005ff4..2340712 100644
--- a/libgit2-glib/ggit-remote-callbacks.h
-+++ b/libgit2-glib/ggit-remote-callbacks.h
-@@ -24,6 +24,7 @@
- 
- #include <glib-object.h>
- #include <git2.h>
-+#include <git2/sys/errors.h>
- #include <libgit2-glib/ggit-cred.h>
- 
- G_BEGIN_DECLS
-diff --git a/libgit2-glib/ggit-repository.c b/libgit2-glib/ggit-repository.c
-index bf099f6..936c6fc 100644
--- a/libgit2-glib/ggit-repository.c
-+++ b/libgit2-glib/ggit-repository.c
-@@ -3182,7 +3182,7 @@ ggit_repository_create_commit (GgitRepository  *repository,
- 	                         message,
- 	                         _ggit_native_get (tree),
- 	                         parent_count,
-	                         (const git_commit **)parents_native);
-+	                         (gpointer)parents_native);
- 
- 	g_free (parents_native);
- 
-@@ -3323,7 +3323,7 @@ ggit_repository_create_commit_buffer(GgitRepository *repository,
- 	                                message,
- 	                                _ggit_tree_get_tree (tree),
- 	                                parent_count,
-	                                (git_commit const **)parents_native);
-+	                                (gpointer)parents_native);
- 
- 	g_free (parents_native);
- 
-diff --git a/libgit2-glib/ggit-types.h b/libgit2-glib/ggit-types.h
-index 7e28975..2a2ed99 100644
--- a/libgit2-glib/ggit-types.h
-+++ b/libgit2-glib/ggit-types.h
-@@ -355,7 +355,8 @@ typedef enum
- 	GGIT_CONFIG_LEVEL_XDG         = 3,
- 	GGIT_CONFIG_LEVEL_GLOBAL      = 4,
- 	GGIT_CONFIG_LEVEL_LOCAL       = 5,
-	GGIT_CONFIG_LEVEL_APP         = 6,
-+	GGIT_CONFIG_LEVEL_WORKTREE    = 6,
-+	GGIT_CONFIG_LEVEL_APP         = 7,
- 	GGIT_CONFIG_LEVEL_HIGHEST     = -1
- } GgitConfigLevel;
- 
-diff --git a/meson.build b/meson.build
-index e54a8b4..c21107d 100644
--- a/meson.build
-+++ b/meson.build
-@@ -126,7 +126,7 @@ glib_dep = dependency('glib-2.0', version: '>=' + glib_req)
- gobject_dep = dependency('gobject-2.0', version: '>=' + glib_req)
- gio_dep = dependency('gio-2.0', version: '>=' + glib_req)
- 
-libgit2_dep = dependency('libgit2', version: '>= 0.25.0')
-+libgit2_dep = dependency('libgit2', version: '>= 1.8.0')
- 
- # XXX: Not nice, but probably our best option
- enable_gir = get_option('introspection') and find_program('g-ir-scanner', required: false).found()
-- 
-GitLab
-
-
-From 93685d4297e425af67ac6888d6b66dfbcd4b95c8 Mon Sep 17 00:00:00 2001
-From: Rui Chen <rui@chenrui.dev>
-Date: Mon, 13 Jan 2025 21:23:50 -0500
-Subject: [PATCH 2/2] chore: support libgit2 1.9
-
-Signed-off-by: Rui Chen <rui@chenrui.dev>
---
- libgit2-glib/ggit-types.h | 4 ++--
- meson.build               | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libgit2-glib/ggit-types.h b/libgit2-glib/ggit-types.h
-index 2a2ed99..184c3e6 100644
--- a/libgit2-glib/ggit-types.h
-+++ b/libgit2-glib/ggit-types.h
-@@ -990,8 +990,7 @@ typedef enum
- 
- typedef enum
- {
-	GGIT_CHECKOUT_NONE                    = 0,
-	GGIT_CHECKOUT_SAFE                    = (1u << 0),
-+	GGIT_CHECKOUT_SAFE                    = 0,
- 	GGIT_CHECKOUT_FORCE                   = (1u << 1),
- 	GGIT_CHECKOUT_RECREATE_MISSING        = (1u << 2),
- 	GGIT_CHECKOUT_ALLOW_CONFLICTS         = (1u << 4),
-@@ -1010,6 +1009,7 @@ typedef enum
- 	GGIT_CHECKOUT_CONFLICT_STYLE_DIFF3    = (1u << 21),
- 	GGIT_CHECKOUT_DONT_REMOVE_EXISTING    = (1u << 22),
- 	GGIT_CHECKOUT_DONT_WRITE_INDEX        = (1u << 23),
-+	GGIT_CHECKOUT_NONE                    = (1u << 30),
- 	GGIT_CHECKOUT_UPDATE_SUBMODULES       = (1u << 16),
- 	GGIT_CHECKOUT_UPDATE_SUBMODULES_IF_CHANGED = (1u << 17)
- } GgitCheckoutStrategy;
-diff --git a/meson.build b/meson.build
-index c21107d..9cd26f8 100644
--- a/meson.build
-+++ b/meson.build
-@@ -126,7 +126,7 @@ glib_dep = dependency('glib-2.0', version: '>=' + glib_req)
- gobject_dep = dependency('gobject-2.0', version: '>=' + glib_req)
- gio_dep = dependency('gio-2.0', version: '>=' + glib_req)
- 
-libgit2_dep = dependency('libgit2', version: '>= 1.8.0')
-+libgit2_dep = dependency('libgit2', version: '>= 1.9.0')
- 
- # XXX: Not nice, but probably our best option
- enable_gir = get_option('introspection') and find_program('g-ir-scanner', required: false).found()
-- 
-GitLab
-
@@ -17,9 +17,9 @@
  fetchpatch,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "libgit2-glib";
-  version = "1.2.0";
+  version = "1.2.1";

  outputs = [
    "out"
@@ -28,17 +28,10 @@ stdenv.mkDerivation rec {
  ];

  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "EzHa2oOPTh9ZGyZFnUQSajJd52LcPNJhU6Ma+9/hgZA=";
+    url = "mirror://gnome/sources/libgit2-glib/${lib.versions.majorMinor finalAttrs.version}/libgit2-glib-${finalAttrs.version}.tar.xz";
+    sha256 = "l0I6d5ACs76HUcdfnXkEnfzMo2FqJhWfwWJIZ3K6eF8=";
  };

-  patches = [
-    # See:
-    # * <https://gitlab.gnome.org/GNOME/libgit2-glib/-/merge_requests/40>
-    # * <https://gitlab.gnome.org/GNOME/libgit2-glib/-/merge_requests/46>
-    ./libgit2-1.9.0.patch
-  ];
-
  nativeBuildInputs = [
    meson
    ninja
@@ -71,7 +64,7 @@ stdenv.mkDerivation rec {

  passthru = {
    updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "libgit2-glib";
      versionPolicy = "none";
    };
  };
@@ -83,4 +76,4 @@ stdenv.mkDerivation rec {
    maintainers = teams.gnome.members;
    platforms = platforms.linux;
  };
-}
+})
@@ -8,7 +8,7 @@
  pkg-config,
  vala,
  gtk-doc,
-  docbook_xsl,
+  docbook-xsl-nons,
  docbook_xml_dtd_412,
  glib,
  gdk-pixbuf,
@@ -16,9 +16,9 @@
  gnome,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "libmediaart";
-  version = "1.9.6";
+  version = "1.9.7";

  outputs = [
    "out"
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
  ];

  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "w7xQJdfbOAWH+cjrgAxhH2taFta0t4/P+T9ih2pnfxc=";
+    url = "mirror://gnome/sources/libmediaart/${lib.versions.majorMinor finalAttrs.version}/libmediaart-${finalAttrs.version}.tar.xz";
+    sha256 = "K0Pdn1Tw2NC4nirduDNBqwbXuYyxsucEODWEr5xWD2s=";
  };

  nativeBuildInputs =
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
      pkg-config
      vala
      gtk-doc
-      docbook_xsl
+      docbook-xsl-nons
      docbook_xml_dtd_412
      gobject-introspection
    ]
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {

  passthru = {
    updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "libmediaart";
      versionPolicy = "none";
    };
  };
@@ -68,4 +68,4 @@ stdenv.mkDerivation rec {
    license = licenses.gpl2;
    platforms = platforms.unix;
  };
-}
+})
@@ -9,13 +9,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "m8c";
-  version = "1.7.9";
+  version = "1.7.10";

  src = fetchFromGitHub {
    owner = "laamaa";
    repo = "m8c";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-ijPRh/aurquh5JFngtoIBniopfVC67lL2X0M7AxT4SU=";
+    hash = "sha256-8QkvvTtFxQmDIqpyhZi/ORcB7YwENu+YafYtCZw0faE=";
  };

  makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
@@ -8,11 +8,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "man-pages";
-  version = "6.12";
+  version = "6.13";

  src = fetchurl {
    url = "mirror://kernel/linux/docs/man-pages/man-pages-${finalAttrs.version}.tar.xz";
-    hash = "sha256-tstdZ+C7AKOz89G8s/4GwmsEW6Y5I+1655QSNQxeHLU=";
+    hash = "sha256-osigwu/oqXjOUc6ABGHrnokx8SzHukt/qjCCtpun8Sw=";
  };

  nativeInstallCheckInputs = [ man ];
@@ -1,6 +1,6 @@
 {
-  "version": "2.4.0",
-  "integrity": "sha512-CFpdfmJTpPFhKCfpNHkif5iPs/xnBBrBqA3xnBIOcOj0RxjKJzraRxpQqS/z1xdKZvWivfHtj3OIHJkvx/pwxQ==",
-  "filename": "mongosh-2.4.0.tgz",
-  "deps": "sha256-KN2MRQ3pSQe8wdmkTO0dysiWdFVzk4rZ/VG6FFPrstE="
+  "version": "2.4.2",
+  "integrity": "sha512-sNgCITVstYsOkHDH05//wGQ/FJnFfq5gHGoHpIMehX/r2vSm3LEcCW366JlLvRmFj/f4NRGjvFI9c1Ks30W+Zw==",
+  "filename": "mongosh-2.4.2.tgz",
+  "deps": "sha256-aXjK0cW48nih2nI/m2i25zRpmLQ/KHo0KMiNJSvb13g="
 }
@@ -12,13 +12,13 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "nezha-theme-nazhua";
-  version = "0.5.8";
+  version = "0.6.0";

  src = fetchFromGitHub {
    owner = "hi2shark";
    repo = "nazhua";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-aRHMOyTWBYXgVBAXshQNHds+KZn4F8Gz9mzazIwT5TQ=";
+    hash = "sha256-LxQkqLA2FUtuOMF7aRqUKZgRazqFEr3JrykJubMEUd0=";
  };

  yarnOfflineCache = fetchYarnDeps {
@@ -13,13 +13,13 @@

 buildGoModule rec {
  pname = "nwg-look";
-  version = "1.0.2";
+  version = "1.0.3";

  src = fetchFromGitHub {
    owner = "nwg-piotr";
    repo = "nwg-look";
    rev = "v${version}";
-    hash = "sha256-fvL7AGplIGlSEXlV3lCrBogAu2rD2XZKYTfHKK6Ztjc=";
+    hash = "sha256-02BzYhWWPPaNR0bt1cNn0H40hkLaSlcJHZx1eilluwI=";
  };

  vendorHash = "sha256-J9Wc5MCgztzzYnjm3lAREmYLGPyuCX9Xr+qhAwf9Fzg=";
@@ -0,0 +1,13 @@
+diff --git a/pkg/apis/options/load_test.go b/pkg/apis/options/load_test.go
+index 32d52fb8..ef343fd1 100644
+--- a/pkg/apis/options/load_test.go
+++ b/pkg/apis/options/load_test.go
+@@ -470,7 +470,7 @@ func(in loadYAMLTableInput) {
+ 				configFile:     []byte(`stringSliceOption: "a"`),
+ 				input:          &TestOptions{},
+ 				expectedOutput: &TestOptions{},
+-				expectedErr:    errors.New("error unmarshalling config: error unmarshaling JSON: while decoding JSON: json: cannot unmarshal string into Go struct field TestOptions.StringSliceOption of type []string"),
+				expectedErr:    errors.New("error unmarshalling config: error unmarshaling JSON: while decoding JSON: json: cannot unmarshal string into Go struct field TestOptions.TestOptionSubStruct.StringSliceOption of type []string"),
+ 			}),
+ 			Entry("with a config file containing environment variable references", loadYAMLTableInput{
+ 				configFile: []byte("stringOption: ${TESTUSER}"),
@@ -1,11 +1,10 @@
 {
  lib,
-  buildGo123Module,
+  buildGoModule,
  fetchFromGitHub,
 }:

-# tests fail in a weird way on 1.24
-buildGo123Module rec {
+buildGoModule rec {
  pname = "oauth2-proxy";
  version = "7.8.1";

@@ -16,6 +15,10 @@ buildGo123Module rec {
    rev = "v${version}";
  };

+  patches = [
+    ./fix-tests-go-1.24.diff
+  ];
+
  vendorHash = "sha256-t/SJjh9bcsIevr3S0ysDlvtaIGzkks+qvfXF5/SEidE=";

  # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile
@@ -1,15 +1,22 @@
 {
  lib,
  stdenv,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
  ogre_13,
  cegui,
-  boost,
-  sfml,
-  openal,
+  fetchFromGitHub,
+
+  # nativeBuildInputs
+  cmake,
+  pkg-config,
+
+  # buildInputs
+  boost183,
  ois,
+  openal,
+  sfml,
+
+  # passthru
+  unstableGitUpdater,
 }:

 let
@@ -24,13 +31,13 @@ let
 in
 stdenv.mkDerivation {
  pname = "opendungeons";
-  version = "unstable-2023-03-18";
+  version = "0-unstable-2024-07-27";

  src = fetchFromGitHub {
    owner = "paroj";
    repo = "OpenDungeons";
-    rev = "974378d75591214dccbe0fb26e6ec8a40c2156e0";
-    hash = "sha256-vz9cT+rNcyKT3W9I9VRKcFol2SH1FhOhOALALjgKfIE=";
+    rev = "2574db9fbe99aeb6a058b7a27bc191da37978c95";
+    hash = "sha256-EeyLwZmaVzzbxPA4PIooVbw12wYb131x+rnIB8n4fgg=";
  };

  patches = [
@@ -51,23 +58,27 @@ stdenv.mkDerivation {
  ];

  buildInputs = [
-    ogre'
+    boost183
    cegui'
-    boost
-    sfml
-    openal
+    ogre'
    ois
+    openal
+    sfml
  ];

  cmakeFlags = [
-    "-DOD_TREAT_WARNINGS_AS_ERRORS=FALSE"
+    (lib.cmakeBool "OD_TREAT_WARNINGS_AS_ERRORS" false)
  ];

-  meta = with lib; {
+  passthru = {
+    updateScript = unstableGitUpdater { };
+  };
+
+  meta = {
    description = "Open source, real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius";
    mainProgram = "opendungeons";
    homepage = "https://opendungeons.github.io";
-    license = with licenses; [
+    license = with lib.licenses; [
      gpl3Plus
      zlib
      mit
@@ -76,6 +87,6 @@ stdenv.mkDerivation {
      ofl
      cc-by-30
    ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
  };
 }
@@ -5,8 +5,7 @@
  dbus,
  fetchFromGitHub,
  gamescope,
-  godot_4,
-  godot_4-export-templates,
+  godot_4_3,
  hwdata,
  lib,
  libGL,
@@ -46,8 +45,8 @@ stdenv.mkDerivation (finalAttrs: {
  nativeBuildInputs = [
    autoPatchelfHook
    cargo
-    godot_4
-    godot_4-export-templates
+    godot_4_3
+    godot_4_3.export-templates-bin
    pkg-config
    rustPlatform.cargoSetupHook
  ];
@@ -76,13 +75,13 @@ stdenv.mkDerivation (finalAttrs: {

  env =
    let
-      versionAndRelease = lib.splitString "-" godot_4.version;
+      versionAndRelease = lib.splitString "-" godot_4_3.version;
    in
    {
-      GODOT = lib.getExe godot_4;
+      GODOT = lib.getExe godot_4_3;
      GODOT_VERSION = lib.elemAt versionAndRelease 0;
      GODOT_RELEASE = lib.elemAt versionAndRelease 1;
-      EXPORT_TEMPLATE = "${godot_4-export-templates}";
+      EXPORT_TEMPLATE = "${godot_4_3.export-templates-bin}";
      BUILD_TYPE = "${finalAttrs.buildType}";
    };

@@ -94,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
    # Godot looks for export templates in HOME
    export HOME=$(mktemp -d)
    mkdir -p $HOME/.local/share/godot/export_templates
-    ln -s "${godot_4-export-templates}" "$HOME/.local/share/godot/export_templates/$GODOT_VERSION.$GODOT_RELEASE"
+    ln -s "${godot_4_3.export-templates-bin}" "$HOME/.local/share/godot/export_templates/$GODOT_VERSION.$GODOT_RELEASE"
  '';

  postInstall = ''
@@ -7,16 +7,16 @@

 buildNpmPackage rec {
  pname = "pairdrop";
-  version = "1.11.1";
+  version = "1.11.2";

  src = fetchFromGitHub {
    owner = "schlagmichdoch";
    repo = "PairDrop";
    rev = "v${version}";
-    hash = "sha256-Ovro5vMf28Wz6srEmUYOMFZE746/mcEDcs+f8rG7X+g=";
+    hash = "sha256-LvrBIdBjb4M2LidEJVCdK2uYydsJY+Cr5eXdfbS46dk=";
  };

-  npmDepsHash = "sha256-vxH0YmSS3CXOrMQ4Tue8jcwjTZNfiT2Lnhs0O6xrfpQ=";
+  npmDepsHash = "sha256-Ovi5RzWPCVk6LkZ33Anb8abkyu+IrEaCXE/etBgsHYU=";

  dontNpmBuild = true;

@@ -4,8 +4,7 @@
  alsa-lib,
  autoPatchelfHook,
  fetchFromGitHub,
-  godot_4,
-  godot_4-export-templates,
+  godot_4_3,
  libGL,
  libpulseaudio,
  libX11,
@@ -28,7 +27,8 @@ let
    presets.${stdenv.hostPlatform.system}
      or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

-  godot_version_folder = lib.replaceStrings [ "-" ] [ "." ] godot_4.version;
+  godot = godot_4_3;
+  godot_version_folder = lib.replaceStrings [ "-" ] [ "." ] godot.version;
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "pixelorama";
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {

  nativeBuildInputs = [
    autoPatchelfHook
-    godot_4
+    godot
  ];

  runtimeDependencies = map lib.getLib [
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {

    export HOME=$(mktemp -d)
    mkdir -p $HOME/.local/share/godot/export_templates
-    ln -s "${godot_4-export-templates}" "$HOME/.local/share/godot/export_templates/${godot_version_folder}"
+    ln -s "${godot.export-templates-bin}" "$HOME/.local/share/godot/export_templates/${godot_version_folder}"
    mkdir -p build
    godot4 --headless --export-release "${preset}" ./build/pixelorama

@@ -3,14 +3,17 @@
 , fetchFromGitHub
 , makeWrapper
 , copyDesktopItems
-, electron
+, electron_34
 , nodejs
 , pnpm_9
 , makeDesktopItem
-, autoSignDarwinBinariesHook
+, darwin
 , nix-update-script
 }:

+let
+  electron = electron_34;
+in
 stdenv.mkDerivation (finalAttrs: {
  pname = "podman-desktop";
  version = "1.16.2";
@@ -31,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {

  patches = [
    # podman should be installed with nix; disable auto-installation
-    ./patches/extension-no-download-podman.patch
+    ./extension-no-download-podman.patch
  ];

  ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
@@ -43,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
    copyDesktopItems
    makeWrapper
  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    autoSignDarwinBinariesHook
+    darwin.autoSignDarwinBinariesHook
  ];

  buildPhase = ''
@@ -30,18 +30,18 @@

 stdenv.mkDerivation (finalAttrs: rec {
  pname = "q2pro";
-  version = "0-unstable-2025-02-18";
+  version = "0-unstable-2025-03-08";

  src = fetchFromGitHub {
    owner = "skullernet";
    repo = "q2pro";
-    rev = "1b0ee4c04f5509246ae20a3e4a1a19aeacac0d14";
-    hash = "sha256-jJwJXQuyucOo7kS8MiYRiP30aOtTStv2GA+TsYOtouQ=";
+    rev = "700559cd4669c1e2f899a4eae869395c33dd4933";
+    hash = "sha256-zJYEeVPyppVISjKC0L8zfjfoG0c8TjmSAML4gPryT0A=";
  };

  # build date and rev number is displayed in the game's console
-  revCount = "3674"; # git rev-list --count ${src.rev}
-  SOURCE_DATE_EPOCH = "1739897801"; # git show -s --format=%ct ${src.rev}
+  revCount = "3697"; # git rev-list --count ${src.rev}
+  SOURCE_DATE_EPOCH = "1741434552"; # git show -s --format=%ct ${src.rev}

  nativeBuildInputs =
    [
@@ -5,18 +5,18 @@
  nix,
  installShellFiles,
 }:
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage (finalAttrs: {
  pname = "ragenix";
-  version = "0-unstable-2024-09-19";
+  version = "2025.03.09";

  src = fetchFromGitHub {
    owner = "yaxitech";
    repo = "ragenix";
-    rev = "687ee92114bce9c4724376cf6b21235abe880bfa";
-    hash = "sha256-03XIEjHeZEjHXctsXYUB+ZLQmM0WuhR6qWQjwekFk/M=";
+    tag = finalAttrs.version;
+    hash = "sha256-iQf1WdNxaApOFHIx4RLMRZ4f8g+8Xp0Z1/E/Mz2rLxY=";
  };

-  cargoHash = "sha256-NO0VpLZTGjddh1aESulAx4pP4k1vdDm1+oCmf/ybuO4=";
+  cargoHash = "sha256-aM7kjyJJ8h4Yd1k2FTE8Vk/ezAXcCbfdAPxuNewptNQ=";
  useFetchCargoVendor = true;

  RAGENIX_NIX_BIN_PATH = lib.getExe nix;
@@ -54,4 +54,4 @@ rustPlatform.buildRustPackage {
    platforms = lib.platforms.linux ++ lib.platforms.darwin;
    mainProgram = "ragenix";
  };
-}
+})
@@ -12,19 +12,19 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "raycast";
-  version = "1.93.0";
+  version = "1.93.2";

  src =
    {
      aarch64-darwin = fetchurl {
        name = "Raycast.dmg";
        url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm";
-        hash = "sha256-sfbpDBNj3ZhRbspTLIDQVU7CrBN1t7SRWFGd7ZeCkQE=";
+        hash = "sha256-DSK42E11ZEfcTFXLY7dz54hqdRXzX8RUBv2YHKuOMMQ=";
      };
      x86_64-darwin = fetchurl {
        name = "Raycast.dmg";
        url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64";
-        hash = "sha256-Tjce+R0Zw+gm80medbF6jeLOhM7d+3N3//qXeBj0b2w=";
+        hash = "sha256-TMbgaENxPiM2UETNmpP5BmVHwdNs4+3FGssaOqNBzew=";
      };
    }
    .${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported.");
@@ -7,16 +7,16 @@

 buildGoModule rec {
  pname = "sshocker";
-  version = "0.3.5";
+  version = "0.3.6";

  src = fetchFromGitHub {
    owner = "lima-vm";
    repo = "sshocker";
    tag = "v${version}";
-    hash = "sha256-Q+g48Mm3JsFz9zTsFFypgp7RtQL/03EbVGAwnXLE8fA=";
+    hash = "sha256-ehsQ/Z1LCSpnvIvABLCIR2aLG4DK33VJ9gidoSEoeqw=";
  };

-  vendorHash = "sha256-D4TJ8bIahv05cE6gvF6LmcU2RzV2krjtU8t8wD6R/lY=";
+  vendorHash = "sha256-9le1ETAdMZ1s7Hl2STz76/9eU0YkI4yNM/PZVXOwndQ=";

  nativeInstallCheckInputs = [ versionCheckHook ];

@@ -9,23 +9,19 @@
  scdoc,
 }:

-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
  pname = "swww";
  version = "0.9.5";

  src = fetchFromGitHub {
    owner = "LGFae";
    repo = "swww";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
    hash = "sha256-ldy9HhIsWdtTdvtRLV3qDT80oX646BI4Q+YX5wJXbsc=";
  };

-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "bitcode-0.6.0" = "sha256-D1Jv9k9m6m7dXjU8s4YMEMC39FOUN7Ix9SvLKhM1yh0=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-K1ww0bOD747EDtqYkA0Dlu7cwbjYcPwSXPSqQDbTwZo=";

  buildInputs = [
    lz4
@@ -64,4 +60,4 @@ rustPlatform.buildRustPackage rec {
    platforms = lib.platforms.linux;
    mainProgram = "swww";
  };
-}
+})
@@ -7,14 +7,14 @@
  fetchFromGitHub,
 }:

-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
  pname = "system76-power";
  version = "1.2.3";

  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "system76-power";
-    rev = version;
+    tag = finalAttrs.version;
    hash = "sha256-fyatAoWw/4ORojayA90er+H5weRykg+2ZzTsGThpW5g=";
  };

@@ -24,12 +24,8 @@ rustPlatform.buildRustPackage rec {
    libusb1
  ];

-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "sysfs-class-0.1.3" = "sha256-ztfwfCRAkxUd/LLNG5fpVuFdgX+tCKL3F35qYJ2GDm8=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-/dhuWgHysJ2oWgJ6jc9u4tsUOxlFt/awlK/9Jk1GHCM=";

  postInstall = ''
    install -D -m 0644 data/com.system76.PowerDaemon.conf $out/etc/dbus-1/system.d/com.system76.PowerDaemon.conf
@@ -52,4 +48,4 @@ rustPlatform.buildRustPackage rec {
      ahoneybun
    ];
  };
-}
+})
@@ -3,6 +3,7 @@
  lib,
  fetchurl,
  makeWrapper,
+  writeText,
  makeDesktopItem,
  copyDesktopItems,
  jre,
@@ -23,15 +24,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
  # We cache potentially unstable upstream input (.tar.gz file) via https://web.archive.org - this is a common procedure in Nixpkgs.
  #
  # - Open https://tigerjython.ch/en/products/download and identify the new version string for "TigerJython IDE for Linux"
-  version = "2.39";
+  version = "2.40";

-  # - and copy download link (most likely https://tigerjython.ch/user/pages/download/TigerJython.tar.gz) to clipboard.
+  # - and copy download link (most likely https://tjgroup.ch/user/pages/download/TigerJython.tar.gz) to clipboard.
  # - Open http://web.archive.org and paste download link from clipboard into "Save Page Now" field and hit the "Save Page" button.
  # - Unselect "Save Error Pages" and hit "Save Page" again.
  # - Wait for the archive link to be generated and copy it to the url field - adjust hash accordingly.
  src = fetchurl {
-    url = "http://web.archive.org/web/20240119124245/https://tigerjython.ch/user/pages/download/TigerJython.tar.gz";
-    hash = "sha256-PdoAOjr19aLmXYrLtMCq/tZ2Fqq7pINTuhFyMMiC0yM=";
+    url = "http://web.archive.org/web/20250104142121/https://tjgroup.ch/download/TigerJython.tar.gz";
+    hash = "sha256-V/POFftRs/jjgNaHOrKcW2AdlQY2yjO+xiwJi63oECo=";
  };

  nativeBuildInputs = [
@@ -57,17 +58,31 @@ stdenvNoCC.mkDerivation (finalAttrs: {
  dontConfigure = true;
  dontBuild = true;

+  # https://tobiaskohn.ch/jython/faq.html
+  # Q: Can I install TigerJython for multiple users?
+  # A: Yes, create a config file.
+  # This file must be named tigerjython2.cfg and located
+  # in the same folder as tigerjython2.jar
+  tjconfig = writeText "tjconfig" ''
+    configfile = sys.userpath + ".tjython.cfg"
+    jython.cachedir = sys.userpath + ".jython.cache"
+  '';
+
  installPhase = ''
    runHook preInstall

    export CUSTOM_LIBS=$out/share/java
    export JAR=$CUSTOM_LIBS/tigerjython2.jar
-    export EXAMPLES_DIR=$CUSTOM_LIBS/Examples
+    export CFG=$CUSTOM_LIBS/tigerjython2.cfg
+    export ADDITIONAL_LIBS_DIR=$CUSTOM_LIBS/Lib
+    export EXAMPLES_DIR=$CUSTOM_LIBS/TestSamples

    install -Dm444 bin/tigerjython2.jar $JAR
-    install -Dm444 bin/Lib/* --target-directory=$CUSTOM_LIBS
+    install -Dm444 bin/Lib/* --target-directory=$ADDITIONAL_LIBS_DIR
    install -Dm444 bin/TestSamples/* --target-directory=$EXAMPLES_DIR

+    install -Dm444 $tjconfig $CFG
+
    makeWrapper ${jre}/bin/java $out/bin/tigerjython \
      --add-flags "-Duser.dir=$CUSTOM_LIBS/" \
      --add-flags "-Xmx512M" \
@@ -22,10 +22,10 @@

 let
  pname = "typora";
-  version = "1.9.3";
+  version = "1.10.8";
  src = fetchurl {
    url = "https://download.typora.io/linux/typora_${version}_amd64.deb";
-    hash = "sha256-3rR/CvFFjRPkz27mm1Wt5hwgRUnLL7lpLFKA2moILx8=";
+    hash = "sha256-7auxTtdVafvM2fIpQVvEey1Q6eLVG3mLdjdZXcqSE/Q=";
  };

  typoraBase = stdenv.mkDerivation {
@@ -38,9 +38,11 @@ let

    installPhase = ''
      runHook preInstall
+
      mkdir -p $out/bin $out/share
      mv usr/share $out
      ln -s $out/share/typora/Typora $out/bin/Typora
+
      runHook postInstall
    '';
  };
@@ -119,17 +121,19 @@ stdenv.mkDerivation {

  installPhase = ''
    runHook preInstall
+
    mkdir -p $out/bin
    ln -s ${launchScript} $out/bin/typora
    ln -s ${typoraBase}/share/ $out
+
    runHook postInstall
  '';

-  meta = with lib; {
+  meta = {
    description = "Markdown editor, a markdown reader";
    homepage = "https://typora.io/";
-    license = licenses.unfree;
-    maintainers = with maintainers; [ npulidomateo ];
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ npulidomateo ];
    platforms = [ "x86_64-linux" ];
    mainProgram = "typora";
  };
@@ -12,21 +12,21 @@
  buildMulticallBinary ? true,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "uutils-coreutils";
-  version = "0.0.29";
+  version = "0.0.30";

  src = fetchFromGitHub {
    owner = "uutils";
    repo = "coreutils";
-    tag = version;
-    hash = "sha256-B6lz75uxROo7npiZNCdTt0NCxVvsaIgtWnuGOKevDQQ=";
+    tag = finalAttrs.version;
+    hash = "sha256-OZ9AsCJmQmn271OzEmqSZtt1OPn7zHTScQiiqvPhqB0=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit src;
-    name = "uutils-coreutils-${version}";
-    hash = "sha256-Z5A1Tyf7SbvIBVGG3YPxh4q/SLU+yNlVv2jBRNumNwM=";
+    inherit (finalAttrs) src;
+    name = "uutils-coreutils-${finalAttrs.version}";
+    hash = "sha256-DsVLp2Y15k+KQI7S6A4hylOhJN016MEdEWx9VQIQEgQ=";
  };

  nativeBuildInputs = [
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
      prefix' = lib.optionalString (prefix != null) prefix;
    in
    "${placeholder "out"}/bin/${prefix'}ls";
-  versionCheckProgramArg = [ "--version" ];
+  versionCheckProgramArg = "--version";
  doInstallCheck = true;

  passthru = {
@@ -69,9 +69,9 @@ stdenv.mkDerivation rec {
      CLI utils in Rust. This repo is to aggregate the GNU coreutils rewrites.
    '';
    homepage = "https://github.com/uutils/coreutils";
-    changelog = "https://github.com/uutils/coreutils/releases/tag/${version}";
+    changelog = "https://github.com/uutils/coreutils/releases/tag/${finalAttrs.version}";
    maintainers = with lib.maintainers; [ siraben ];
    license = lib.licenses.mit;
    platforms = lib.platforms.unix;
  };
-}
+})
@@ -55,7 +55,10 @@ let
    .${stdenv.hostPlatform.system} or (throw "Unsupported platform: ${stdenv.hostPlatform.system}");
 in
 stdenv.mkDerivation (finalAttrs: {
-  pname = "ventoy";
+  pname =
+    "ventoy"
+    + optionalString (defaultGuiType == "gtk3") "-gtk3"
+    + optionalString (defaultGuiType == "qt5") "-qt5";
  version = "1.1.05";

  src = fetchurl {
@@ -194,7 +197,8 @@ stdenv.mkDerivation (finalAttrs: {

  meta = {
    homepage = "https://www.ventoy.net";
-    description = "New Bootable USB Solution";
+    description =
+      "New Bootable USB Solution" + optionalString (defaultGuiType != "") " with GUI support";
    longDescription = ''
      Ventoy is an open source tool to create bootable USB drive for
      ISO/WIM/IMG/VHD(x)/EFI files.  With ventoy, you don't need to format the
@@ -211,7 +215,9 @@ stdenv.mkDerivation (finalAttrs: {
    changelog = "https://www.ventoy.net/doc_news.html";
    license = lib.licenses.gpl3Plus;
    mainProgram = "ventoy";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [
+      johnrtitor
+    ];
    platforms = [
      "x86_64-linux"
      "i686-linux"
@@ -10,11 +10,11 @@

 stdenv.mkDerivation rec {
  pname = "viennarna";
-  version = "2.5.1";
+  version = "2.7.0";

  src = fetchurl {
-    url = "https://www.tbi.univie.ac.at/RNA/download/sourcecode/2_5_x/ViennaRNA-${version}.tar.gz";
-    sha256 = "sha256-BUAEN88VWV4QsaJd9snEiFbzVhMPnR44D6iGa20n9Fc=";
+    url = "https://www.tbi.univie.ac.at/RNA/download/sourcecode/2_7_x/ViennaRNA-${version}.tar.gz";
+    hash = "sha256-mpn9aO04CJTe+01eaooocWKScAKM338W8KBdpujHFHM=";
  };

  buildInputs = [
@@ -29,11 +29,11 @@ stdenv.mkDerivation rec {
    "--with-kinwalker"
  ];

-  meta = with lib; {
+  meta = {
    description = "Prediction and comparison of RNA secondary structures";
    homepage = "https://www.tbi.univie.ac.at/RNA/";
-    license = licenses.unfree;
-    maintainers = with maintainers; [ prusnak ];
-    platforms = platforms.unix;
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ prusnak ];
+    platforms = lib.platforms.unix;
  };
 }
@@ -6,10 +6,10 @@
 }:
 let
  pname = "volanta";
-  version = "1.10.10";
+  version = "1.10.11";
  src = fetchurl {
-    url = "https://cdn.volanta.app/software/volanta-app/${version}-a7ebf1c7/volanta-${version}.AppImage";
-    hash = "sha256-pdMPC3flJzguRYmS+xKiAXWQ4BKsD3N48S27djXDtuo=";
+    url = "https://cdn.volanta.app/software/volanta-app/${version}-5495eec5/volanta-${version}.AppImage";
+    hash = "sha256-DvAtgLe8eWG9sqxPaZGsk0CZWZci124bu2IFDU5Y1BQ=";
  };
  appImageContents = appimageTools.extract { inherit pname version src; };
 in
@@ -34,7 +34,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "vte";
-  version = "0.78.3";
+  version = "0.78.4";

  outputs = [
    "out"
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {

  src = fetchurl {
    url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz";
-    hash = "sha256-l+KsOie8V1U1iiI/VfWiUYZUqgNhv8YaGWwcLgh5jv8=";
+    hash = "sha256-LepOQSJmWStkYKP+RIj149UHEvE5gVeQwOy0RxD34X4=";
  };

  patches = [
@@ -2,27 +2,24 @@
  lib,
  rustPlatform,
  fetchFromGitHub,
+  nix-update-script,
 }:

 rustPlatform.buildRustPackage rec {
  pname = "wasmi";
-  version = "0.31.0";
+  version = "0.40.0";

  src = fetchFromGitHub {
    owner = "paritytech";
    repo = "wasmi";
-    rev = "v${version}";
-    hash = "sha256-chLWrZ+OLUTSFmTu+qKpjApXDmJFhS68N2RKjaql75U=";
+    tag = "v${version}";
+    hash = "sha256-O+8qBYxmiDQtmL2ThkQYenIXSf2wCoYFqLMJOtLP3Ic=";
    fetchSubmodules = true;
  };

-  cargoLock = {
-    lockFile = ./Cargo.lock;
-  };
-
-  postPatch = ''
-    ln -s ${./Cargo.lock} Cargo.lock
-  '';
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-b3mjGjOfIBHcQTIpA2obdCsjC1p0gjfatKmYI01vYME=";
+  passthru.updateScript = nix-update-script { };

  meta = with lib; {
    description = "Efficient WebAssembly interpreter";
@@ -39,6 +39,9 @@ stdenv.mkDerivation rec {

    # xcfview needs mailcap and isn't that useful anyway
    sed -i -e '/BINARIES/s/xcfview//' Makefile.in
+
+    # add missing header
+    sed -e '1i#include <stdlib.h>' -i xcf-general.c
  '';

  meta = {
@@ -22,11 +22,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "xdg-desktop-portal-gnome";
-  version = "47.2";
+  version = "47.3";

  src = fetchurl {
    url = "mirror://gnome/sources/xdg-desktop-portal-gnome/${lib.versions.major finalAttrs.version}/xdg-desktop-portal-gnome-${finalAttrs.version}.tar.xz";
-    hash = "sha256-S1NoqhncCqYsioTkgciiZJC013x5ALjlydQyzpHxJ0w=";
+    hash = "sha256-n25LFLWDNnyRXpSUdk8ny4SSf6o/nm4Bi5O7vPM2HkQ=";
  };

  nativeBuildInputs = [
@@ -3,6 +3,7 @@
  stdenv,
  fetchurl,
  readline,
+  autoreconfHook,
 }:

 let
@@ -17,6 +18,7 @@ stdenv.mkDerivation rec {
    sha256 = "06z73iq59lz8ibjrgs7d3xl39vh9yld1988yx8khssch4pw41s52";
  };

+  nativeBuildInputs = [ autoreconfHook ];
  buildInputs = [ readline ];

  patches = [
@@ -30,9 +32,13 @@ stdenv.mkDerivation rec {

  patchFlags = [ "-p0" ];

+  postPatch = ''
+    sed -i 1i'#include <pty.h>' openpty.c
+  '';
+
  # The makefile does not create the directories
  postBuild = ''
-    install -dm755 "$out"/{bin,man/man1}
+    install -dm755 "$out"/{bin,share/man/man1}
  '';

  meta = {
@@ -1,27 +1,27 @@
 let
-  version = "3.6.0";
+  version = "3.7.1";
 in
 { fetchurl }:
 {
  versionUsed = version;
  "${version}-x86_64-darwin" = fetchurl {
    url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip";
-    sha256 = "0avky36jmknnp3jwz4p0yz5yv8wqwl0v7rhv0s4v75r9v6mv2ndq";
+    sha256 = "0bldcn4j99cv2a6g3s263929r7wqhjaxylwm26nd2jdfnqbmjxm2";
  };
  "${version}-aarch64-darwin" = fetchurl {
    url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip";
-    sha256 = "1802lx2ijpi4lkbbnvlkk1swn579rpbnmxmvghz6flxa99acdnqv";
+    sha256 = "191jig17mnk0gjys2xd0qr267idjv2h50qnaz0cciflj60b2az7m";
  };
  "${version}-aarch64-linux" = fetchurl {
    url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip";
-    sha256 = "1gz7ai977ynl554rplfjnd585q5m429ax51js3806w4ch07z30hg";
+    sha256 = "1zj7k2bczb9yy63vjj8xm3ljd9sx9z77awf4wdvv6y02gnzxv4ga";
  };
  "${version}-x86_64-linux" = fetchurl {
    url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip";
-    sha256 = "18smc4nj77dvsg99mk69d0h1y9cp3914zjdbimhp5v0ydr1zy54f";
+    sha256 = "0wgfl118j7s7xjz4i0m4gyzxzsjv7x9wq9xr2m036l4ngng9a4r8";
  };
  "${version}-i686-linux" = fetchurl {
    url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip";
-    sha256 = "0k8ikz0rwhbgx6gdnxysikm8zcv3k6gf8d3a47wb5xx9dhgyk3vw";
+    sha256 = "1zj60jqpnv1apl4439vvxxrgfvg3azwaaizdmq8chfmrg97vr85x";
  };
 }
@@ -16,13 +16,13 @@

 mkDerivation rec {
  pname = "g2o";
-  version = "20230806";
+  version = "20241228";

  src = fetchFromGitHub {
    owner = "RainerKuemmerle";
    repo = pname;
    rev = "${version}_git";
-    hash = "sha256-9u1FFRWe7qvDhzSKdGTduuGBXmmgzcSriGFb/oCJjNA=";
+    hash = "sha256-MW1IO1P2e3KgurOW5ZfHlxK0m5sF0JhdLmvQNEHWEtI=";
  };

  # Removes a reference to gcc that is only used in a debug message
@@ -129,7 +129,9 @@ stdenv.mkDerivation (finalAttrs: {
  doCheck = !stdenv.hostPlatform.isDarwin;

  passthru = {
-    inherit gimp;
+    tests = {
+      inherit gimp;
+    };
  };

  meta = with lib; {
@@ -18,11 +18,11 @@
 }:
 stdenv.mkDerivation (final: {
  pname = "quarto";
-  version = "1.6.41";
+  version = "1.6.42";

  src = fetchurl {
    url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz";
-    hash = "sha256-+OsTnNxb/67sy3SOV0wHmR7Nm+hpgy5k2Jn28J6RNmw=";
+    hash = "sha256-9mf1YfcfCWMZaYFlYyJN9WKlRHk8U2sq2ESb4mqz3sY=";
  };

  patches = [
@@ -46,7 +46,7 @@ let
    };
 in {
  wt4 = generic {
-    version = "4.11.1";
-    sha256 = "sha256-Vp5vALQqI84NiYnK8amXSyOwX0Fq6VkodBHAf25wAfM=";
+    version = "4.11.3";
+    sha256 = "sha256-YEzuif+8DACSVu2U4uaLncvE1WaVonJVnCf2rAc/sUc=";
  };
 }
@@ -2,7 +2,7 @@

 buildDunePackage rec {
  pname = "pcre";
-  version = "7.5.0";
+  version = "8.0.3";

  useDune2 = true;

@@ -10,7 +10,7 @@ buildDunePackage rec {

  src = fetchurl {
    url = "https://github.com/mmottl/pcre-ocaml/releases/download/${version}/pcre-${version}.tbz";
-    sha256 = "sha256-ZxFC9AtthhccvAZyU/qt+QMBkWHVdIi9D7bFRWwsvRo=";
+    sha256 = "sha256-FIgCeBEAHKz7/6bNsUoqbH2c3eMq62gphVdEa+kNf3k=";
  };

  buildInputs = [ dune-configurator ];
@@ -8,14 +8,14 @@

 buildPythonPackage rec {
  pname = "aiosseclient";
-  version = "0.1.7";
+  version = "0.1.8";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "ebraminio";
    repo = "aiosseclient";
    tag = version;
-    hash = "sha256-Z14Wl/M1FFq9HcLgzhsC/wfqamdwBcqHcOketFg5f+U=";
+    hash = "sha256-ynWqRQsCuog8myNleJDdp+omyujmNB1Ys7O6gU2AaUc=";
  };

  build-system = [ setuptools ];
@@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "celery-types";
-  version = "0.22.0";
+  version = "0.23.0";
  pyproject = true;

  disabled = pythonOlder "3.10";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "celery_types";
    inherit version;
-    hash = "sha256-DsrS+lpu3tCh+Rnl4eOBzC/wY1/ksh21O0ZhtodtWzA=";
+    hash = "sha256-QC7QVVrqPNXh5iSPRjLk8Y7sjtskNRc/nm3AhEn6EB4=";
  };

  nativeBuildInputs = [ poetry-core ];
@@ -11,14 +11,14 @@

 buildPythonPackage rec {
  pname = "cssbeautifier";
-  version = "1.15.2";
+  version = "1.15.4";
  pyproject = true;

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-AtQv+mrvqofxhFK0N9u3P2uY9C6ahHWYENxY96a/wmw=";
+    hash = "sha256-m7CNw/ZMEBoBZ38Sis8BkFkUz0Brr4dDTc3gW3TArPU=";
  };

  nativeBuildInputs = [ setuptools ];
@@ -22,14 +22,14 @@

 buildPythonPackage rec {
  pname = "databricks-sdk";
-  version = "0.44.1";
+  version = "0.45.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "databricks";
    repo = "databricks-sdk-py";
    tag = "v${version}";
-    hash = "sha256-+zRsw+nQjkee7AGg0xW7HHbROUAz6cVO91XDlgGtJfs=";
+    hash = "sha256-SoE8MgwOhm82ymjaZQZCzw7hd5DMWxSvgaAwIGlm9cQ=";
  };

  build-system = [
@@ -1,25 +1,33 @@
 {
  lib,
-  antlr4,
-  antlr4-python3-runtime,
  buildPythonPackage,
  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # patches
+  replaceVars,
+  antlr4,
  fetchpatch,
-  importlib-resources,
+
+  # nativeBuildInputs
  jre_headless,
+
+  # dependencies
+  antlr4-python3-runtime,
  omegaconf,
  packaging,
+
+  # tests
  pytestCheckHook,
-  pythonOlder,
-  replaceVars,
+  pythonAtLeast,
 }:

 buildPythonPackage rec {
  pname = "hydra-core";
  version = "1.3.2";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.6";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "facebookresearch";
@@ -44,17 +52,23 @@ buildPythonPackage rec {
    # We substitute the path to the jar with the one from our antlr4
    # package, so this file becomes unused
    rm -v build_helpers/bin/antlr*-complete.jar
-
-    sed -i 's/antlr4-python3-runtime==.*/antlr4-python3-runtime/' requirements/requirements.txt
  '';

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

-  propagatedBuildInputs = [
+  pythonRelaxDeps = [
+    "antlr4-python3-runtime"
+  ];
+
+  dependencies = [
    antlr4-python3-runtime
    omegaconf
    packaging
-  ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
+  ];

  nativeCheckInputs = [ pytestCheckHook ];

@@ -64,13 +78,18 @@ buildPythonPackage rec {
  ];

  # Test environment setup broken under Nix for a few tests:
-  disabledTests = [
-    "test_bash_completion_with_dot_in_path"
-    "test_install_uninstall"
-    "test_config_search_path"
-    # does not raise UserWarning
-    "test_initialize_compat_version_base"
-  ];
+  disabledTests =
+    [
+      "test_bash_completion_with_dot_in_path"
+      "test_install_uninstall"
+      "test_config_search_path"
+      # does not raise UserWarning
+      "test_initialize_compat_version_base"
+    ]
+    ++ lib.optionals (pythonAtLeast "3.13") [
+      # AssertionError: Regex pattern did not match
+      "test_failure"
+    ];

  disabledTestPaths = [ "tests/test_hydra.py" ];

@@ -80,10 +99,11 @@ buildPythonPackage rec {
    "hydra.version"
  ];

-  meta = with lib; {
+  meta = {
    description = "Framework for configuring complex applications";
    homepage = "https://hydra.cc";
-    license = licenses.mit;
-    maintainers = with maintainers; [ bcdarwin ];
+    changelog = "https://github.com/facebookresearch/hydra/blob/v${version}/NEWS.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ bcdarwin ];
  };
 }
@@ -11,7 +11,7 @@

 buildPythonPackage rec {
  pname = "identify";
-  version = "2.6.8";
+  version = "2.6.9";
  pyproject = true;

  disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "pre-commit";
    repo = "identify";
    tag = "v${version}";
-    hash = "sha256-5TAGRYr5ilUBhQjUMI4Z/bW24HOYS757Wld6H+fFSAU=";
+    hash = "sha256-5MirPDgV5+dq+2Hr1sxpbDiQ2h+BxO5axtf2ntbFsMg=";
  };

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

 buildPythonPackage rec {
  pname = "ipyparallel";
-  version = "9.0.0";
+  version = "9.0.1";
  pyproject = true;

  disabled = pythonOlder "3.8";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-cGAcuvmhadNQ/+IsgtW73+bf5MTfAoNtmZDpxVm1vLY=";
+    hash = "sha256-LlksrSIAxalPu/9jm/825uyRIvNLNrL8a01njZ6Y8pw=";
  };

  # We do not need the jupyterlab build dependency, because we do not need to
@@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "jh2";
-  version = "5.0.5";
+  version = "5.0.8";
  pyproject = true;

  disabled = pythonOlder "3.10";
@@ -21,14 +21,14 @@ buildPythonPackage rec {
    owner = "jawah";
    repo = "h2";
    tag = "v${version}";
-    hash = "sha256-H1i2lolctispLtQc+uqeE+NUeKr/dtgDq1zdTJH5gyU=";
+    hash = "sha256-dQ0FqiX9IqgF8fz0JDWQSHQrr9H3UwG9+mkZI3DwWSU=";
    fetchSubmodules = true;
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit src;
    name = "${pname}-${version}";
-    hash = "sha256-nzLU6QhoJGNCqFF6pzzMr7FHbrLnNq7PvPC42VOrYo8=";
+    hash = "sha256-P27BIsloNsHHej8qE8EDtXLVvnUmWcbb/6LhP2w7wrw=";
  };

  build-system = [
@@ -50,6 +50,9 @@ buildPythonPackage rec {
    homepage = "https://github.com/jawah/h2";
    changelog = "https://github.com/jawah/h2/blob/${src.rev}/CHANGELOG.rst";
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ fab ];
+    maintainers = with lib.maintainers; [
+      fab
+      techknowlogick
+    ];
  };
 }
@@ -13,13 +13,13 @@

 buildPythonPackage rec {
  pname = "matplotlib-venn";
-  version = "1.1.1";
+  version = "1.1.2";

  pyproject = true;

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-2IW8AV9QkaS4qBOP8gp+0WbDO1w228BIn5Wly8dqKuU=";
+    hash = "sha256-bysHoD6btaYt4vMvllIWc54XUXb51lTdGeevLCLsNuM=";
  };

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

 buildPythonPackage rec {
  pname = "nbsphinx";
-  version = "0.9.6";
+  version = "0.9.7";
  pyproject = true;

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-wrKKLXAvEVmpW4Q4MXmOhuYKF/xke5v/m6FYU1XeVOM=";
+    hash = "sha256-q9KYpobVX6iU72l8UdRPJOU6oxLa2uOOgpIPJQpUVv4=";
  };

  build-system = [ setuptools ];
@@ -1,27 +1,28 @@
 {
-  buildPythonPackage,
-  cmake,
-  fetchFromGitHub,
-  gtest,
-  hydra-core,
  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
  nlohmann_json,
  pybind11,
-  pyvirtualdisplay,
-  sfml,
  replaceVars,
+  gtest,
+  setuptools,
+  cmake,
+  sfml,
+  hydra-core,
+  pyvirtualdisplay,
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "nocturne";
-  version = "unstable-2022-10-15";
-  format = "setuptools";
+  version = "0-unstable-2024-06-19";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "facebookresearch";
-    repo = pname;
-    rev = "ae0a4e361457caf6b7e397675cc86f46161405ed";
-    hash = "sha256-pFVbl4m7qX1mJgleNabRboS9klDDsbzUa4PYL5+Jupc=";
+    repo = "nocturne";
+    rev = "6d1e0f329f7acbed01c934842b269333540af6d2";
+    hash = "sha256-Ufhvc+IZUrn8i6Fmu6o81LPjY1Jo0vzsso+eLbI1F2s=";
  };

  # Simulate the git submodules but with nixpkgs dependencies
@@ -37,13 +38,17 @@ buildPythonPackage rec {
    })
  ];

+  build-system = [
+    setuptools
+  ];
+
  nativeBuildInputs = [ cmake ];
  dontUseCmakeConfigure = true;

  buildInputs = [ sfml ];

  # hydra-core and pyvirtualdisplay are not declared as dependences but they are requirements
-  propagatedBuildInputs = [
+  dependencies = [
    hydra-core
    pyvirtualdisplay
  ];
@@ -53,10 +58,10 @@ buildPythonPackage rec {

  pythonImportsCheck = [ "nocturne" ];

-  meta = with lib; {
+  meta = {
    description = "Data-driven, fast driving simulator for multi-agent coordination under partial observability";
    homepage = "https://github.com/facebookresearch/nocturne";
-    license = licenses.mit;
-    maintainers = with maintainers; [ samuela ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ samuela ];
  };
 }
@@ -11,7 +11,7 @@

 buildPythonPackage rec {
  pname = "pcffont";
-  version = "0.0.16";
+  version = "0.0.17";
  pyproject = true;

  disabled = pythonOlder "3.10";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "pcffont";
    inherit version;
-    hash = "sha256-erZ9zcXZqBg71subC8U7QA7nwwoh2lQeIzRAkmxBxzg=";
+    hash = "sha256-rno4zgK3mdlkAGC76HkcNo+O8G+FW0oqdg0uuYqdJm4=";
  };

  build-system = [ hatchling ];
@@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "pyexploitdb";
-  version = "0.2.70";
+  version = "0.2.71";
  pyproject = true;

  disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "pyExploitDb";
    inherit version;
-    hash = "sha256-Y/iAQPCVhKdGLuABuANJahDhIBKjWf3M2aREaZ5wF3Y=";
+    hash = "sha256-AE9fD7OKrpi74rXQibtmyQoAeMAO2QCagpCT3HaUGaQ=";
  };

  build-system = [ setuptools ];
@@ -27,21 +27,18 @@
  polars,
  pytestCheckHook,
  tqdm,
-
-  # passthru
-  nix-update-script,
 }:

 buildPythonPackage rec {
  pname = "pylance";
-  version = "0.23.2";
+  version = "0.24.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "lancedb";
    repo = "lance";
    tag = "v${version}";
-    hash = "sha256-HVT/39zhcviVkF6dKM+ZIy7vGW6tOWEBUXTEIuFaVno=";
+    hash = "sha256-tzz+Zww6/owkcFhHBt8+2cvouCeqdspuv6Gy7HpZTP0=";
  };

  sourceRoot = "${src.name}/python";
@@ -53,7 +50,7 @@ buildPythonPackage rec {
      src
      sourceRoot
      ;
-    hash = "sha256-H5Z6YgaSfRrRPGZVbgNWxcFboS1I65p+08c1VgaL+lE=";
+    hash = "sha256-7GN4iAQMvqZkK5kjBMrNa8Q6fETW0HDZklSQGye+Huc=";
  };

  nativeBuildInputs = [
@@ -122,8 +119,6 @@ buildPythonPackage rec {
      "test_iter_over_dataset_fixed_size_lists"
    ];

-  passthru.updateScript = nix-update-script { };
-
  meta = {
    description = "Python wrapper for Lance columnar format";
    homepage = "https://github.com/lancedb/lance";
@@ -3,7 +3,6 @@
  stdenv,
  buildPythonPackage,
  cargo,
-  darwin,
  fetchFromGitHub,
  libiconv,
  pythonOlder,
@@ -25,12 +24,9 @@ buildPythonPackage rec {
    hash = "sha256-1XULyxu3XujhAcFnvqI5zMiXOc0axx1LS4EevjhoGDc=";
  };

-  cargoDeps = rustPlatform.importCargoLock {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "lsp-types-0.95.1" = "sha256-8Oh299exWXVi6A39pALOISNfp8XBya8z+KT/Z7suRxQ=";
-      "ruff-0.4.10" = "sha256-FRBuvXtnbxRWoI0f8SM0U0Z5TRyX5Tbgq3d34Oh2bG4=";
-    };
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit pname version src;
+    hash = "sha256-q8Y5oqoSzUk1Xg4AmjLs7RO8Kr87Oi3eKLSpmXlHp4U=";
  };

  nativeBuildInputs = [
@@ -41,8 +37,6 @@ buildPythonPackage rec {
  ];

  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.apple_sdk.frameworks.CoreFoundation
-    darwin.apple_sdk.frameworks.CoreServices
    libiconv
  ];

@@ -51,11 +45,11 @@ buildPythonPackage rec {

  pythonImportsCheck = [ "ruff_api" ];

-  meta = with lib; {
+  meta = {
    description = "Experimental Python API for Ruff";
    homepage = "https://github.com/amyreese/ruff-api";
    changelog = "https://github.com/amyreese/ruff-api/blob/${src.rev}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
  };
 }
@@ -99,6 +99,11 @@ buildPythonPackage {
    # AssertionError: Scalars are not close!
    # Expected 7.781850814819336 but got 7.781772613525391
    "--deselect=tests/metrics/image/test_psnr.py::TestPeakSignalNoiseRatio::test_psnr_with_random_data"
+
+    # -- tests/metrics/regression/test_mean_squared_error.py --
+    # AssertionError: Scalars are not close!
+    # Expected -640.4547729492188 but got -640.4707641601562
+    "--deselect=tests/metrics/regression/test_mean_squared_error.py::TestMeanSquaredError::test_mean_squared_error_class_update_input_shape_different"
  ];

  meta = {
@@ -8,7 +8,7 @@

 buildPythonPackage rec {
  pname = "types-s3transfer";
-  version = "0.11.2";
+  version = "0.11.4";
  pyproject = true;

  disabled = pythonOlder "3.8";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "types_s3transfer";
    inherit version;
-    hash = "sha256-PMuLkLFENK8vsNbAhQBZbZPzqD+4BKK7hD2b9PfCymA=";
+    hash = "sha256-Bf3lk8hCcPGf0FPwseCPWgV9fF8Da5iE5o+4zTBBrDA=";
  };

  build-system = [ setuptools ];
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  numpy,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "wrapcco";
+  version = "0.1.3";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-nts5cujixB+PfAf9Fk7kOXW4BeI/0q5GYTthCI76ZOA=";
+  };
+
+  build-system = [ setuptools ];
+  dependencies = [
+    numpy
+    setuptools
+  ];
+
+  # require non trivial test setup
+  doCheck = false;
+
+  pythonImportsCheck = [ "wrapcco" ];
+
+  meta = {
+    description = "Supercharge Python with C++ extensions!";
+    homepage = "https://github.com/H3cth0r/wrapc.co";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ h3cth0r ];
+  };
+}
@@ -0,0 +1,6 @@
+{
+  version = "4.3-stable";
+  hash = "sha256-MzElflwXHWLgPtoOIhPLA00xX8eEdQsexZaGIEOzbj0=";
+  exportTemplatesHash = "sha256-XRnKii+eexIkbGf7bqc42SR0NBULFvgMdOpSRNNk6kg=";
+  nugetDeps = ./deps.json;
+}
--- a/Show More
+++ b/Show More