Merge remote-tracking branch 'origin/master' into staging-next

2025-02-06 09:37:26 +03:00
parent 3282b5f2cb 29c58cf78d
commit 7d1c33c8ff
77 changed files with 2915 additions and 2049 deletions
@@ -249,6 +249,8 @@

 - `pnpm` was updated to version 10. If your project is incompatible, you can install the previous version from the package attribute `pnpm_9`.

+- `zig_0_9` and `zig_0_10` have been removed, you should upgrade to `zig_0_13` (also available as just `zig`), `zig_0_12` or `zig_0_11` instead.
+
 - `programs.less.lessopen` is now null by default. To restore the previous behaviour, set it to `''|${lib.getExe' pkgs.lesspipe "lesspipe.sh"} %s''`.

 - `hardware.pulseaudio` has been renamed to `services.pulseaudio`.  The deprecated option names will continue to work, but causes a warning.
@@ -337,6 +339,8 @@
  +extraCreateArgs+=("--exclude" "/some/path")
  ```

+- `borgmatic` has been updated from 1.8.14 to 1.9.5, please check the [upstream changelog](https://projects.torsion.org/borgmatic-collective/borgmatic/releases) for more details, especially for a few possibly breaking changes noted in the [1.9.0 changelog](https://projects.torsion.org/borgmatic-collective/borgmatic/releases/tag/1.9.0).
+
 - `nodePackages.ganache` has been removed, as the package has been deprecated by upstream.

 - `virtualisation.azure.agent` option provided by `azure-agent.nix` is replaced by `services.waagent`, and will be removed in a future release.
@@ -107,6 +107,7 @@ print_summary() {
        for module in "${failed_modules[@]}"; do
            echo -e "  ${RED}- $module${NC}"
        done
+        echo -e "\n${RED}Checkout https://nixos.org/manual/nixpkgs/unstable/#testing-neovim-plugins-neovim-require-check${NC}"
    fi
    echo "======================================================"

@@ -10,12 +10,12 @@
  vimUtils,
 }:
 let
-  version = "0.0.15";
+  version = "0.0.16";
  src = fetchFromGitHub {
    owner = "yetone";
    repo = "avante.nvim";
    tag = "v${version}";
-    hash = "sha256-REFF+4U0AjNwiK1ecbDPwF7C1jKRzITV29aolx+HI24=";
+    hash = "sha256-rnd+ASzKTOF3JXjbq6JaNd/tYPpEIvzKK0TZHmDJ+MQ=";
  };
  avante-nvim-lib = rustPlatform.buildRustPackage {
    pname = "avante-nvim-lib";
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
  core = "mame2003-plus";
-  version = "0-unstable-2025-01-24";
+  version = "0-unstable-2025-02-04";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "mame2003-plus-libretro";
-    rev = "cea00d3aa54e61c929e8e205454793f45472c46d";
-    hash = "sha256-v/L9qEhsymWfpep3YKwLiS2OBC3OBCIVpXOZatLGpN4=";
+    rev = "82c214ba5ef00e4f31117ddf1c60728f93ca8dcc";
+    hash = "sha256-xq6nwKhZQAxmRskvxiDpwiGeMxjxn3XYjo9WoqD9E8Q=";
  };

  makefile = "Makefile";
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
  core = "mame2003";
-  version = "0-unstable-2024-12-10";
+  version = "0-unstable-2025-01-26";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "mame2003-libretro";
-    rev = "b6c6d52d8d630d1a172b6b771443dcbbdb45b76d";
-    hash = "sha256-E0kymRxy5aubvcwE5sHcS4T3OEY924TAOXtJN69wp+8=";
+    rev = "290027956a5bfc9e22e3e96fb4b5958968da6b70";
+    hash = "sha256-FlroIr4T5Z4tBPJ32AxDjXdSnQpU9ergDCznP5qvh3Y=";
  };

  # Fix build with GCC 14
@@ -15,6 +15,7 @@

  # Native build inputs:
  ninja,
+  bashInteractive,
  pkg-config,
  python3,
  perl,
@@ -214,6 +215,7 @@ let
  };

  isElectron = packageName == "electron";
+  needsCompgen = chromiumVersionAtLeast "133";

  chromiumDeps = lib.mapAttrs (
    path: args:
@@ -291,6 +293,11 @@ let
    nativeBuildInputs =
      [
        ninja
+      ]
+      ++ lib.optionals needsCompgen [
+        bashInteractive # needed for compgen in buildPhase -> process_template
+      ]
+      ++ [
        pkg-config
        python3WithPackages
        perl
@@ -795,12 +802,12 @@ let
      let
        buildCommand = target: ''
          TERM=dumb ninja -C "${buildPath}" -j$NIX_BUILD_CORES "${target}"
-          (
+          ${lib.optionalString needsCompgen "bash -s << EOL\n"}(
            source chrome/installer/linux/common/installer.include
            PACKAGE=$packageName
            MENUNAME="Chromium"
            process_template chrome/app/resources/manpage.1.in "${buildPath}/chrome.1"
-          )
+          )${lib.optionalString needsCompgen "\nEOL"}
        '';
        targets = extraAttrs.buildTargets or [ ];
        commands = map buildCommand targets;
@@ -1,52 +1,52 @@
 {
  "chromium": {
-    "version": "132.0.6834.159",
+    "version": "133.0.6943.53",
    "chromedriver": {
-      "hash_darwin": "sha256-t1WACSAqvu8Lp5xJpEpALXfSjF92gPdN0mUHQzz71YA=",
-      "hash_darwin_aarch64": "sha256-T0fDfWegn9kjhdDtAAK/IAFbKZ0r5VmvO2VQXzuNmSg="
+      "hash_darwin": "sha256-aMpn8kj3Guj8HxNMEwujZbE2R4jNTRDVO+cg8JgOvkA=",
+      "hash_darwin_aarch64": "sha256-SWLTeD4aJVHKl2BXGUJRNL0eslMNhm+9zWrWh5EMQiY="
    },
    "deps": {
      "depot_tools": {
-        "rev": "41d43a2a2290450aeab946883542f8049b155c87",
-        "hash": "sha256-m/6b4VZZTUQOeED1mYvZOQCx8Re+Zd4O8SKDMjJ9Djo="
+        "rev": "423f1e1914ab4aa7b2bdf804e216d4c097853ba2",
+        "hash": "sha256-R7cGQLM6yJgFL43UO+zAGbq+9XEbKbtJVFRwdIUB1F8="
      },
      "gn": {
-        "rev": "feafd1012a32c05ec6095f69ddc3850afb621f3a",
-        "hash": "sha256-zZoD5Bx7wIEP2KJkHef6wHrxU3px+8Vseq29QcK32bg="
+        "rev": "c97a86a72105f3328a540f5a5ab17d11989ab7dd",
+        "hash": "sha256-T2dcISln9WCODoI/LsE2ldkRfFdMwVOmqqjQinAmZss="
      },
-      "npmHash": "sha256-H1/h3x+Cgp1x94Ze3UPPHxRVpylZDvpMXMOuS+jk2dw="
+      "npmHash": "sha256-oVoTruhxTymYiGkELd2Oa1wOfjGLtChQZozP4GzOO1A="
    },
    "DEPS": {
      "src": {
        "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "2d77d3fc4452661469b78f115e0aed4d71269739",
-        "hash": "sha256-LbLIxN13fx6zzU5xzGvkTpw7tKRQBel2PYhflHLbWE8=",
+        "rev": "9a80935019b0925b01cc21d254da203bc3986f04",
+        "hash": "sha256-doJ/HygMtLxr04S73lhs5kTt8qC7SHrCxHbjAoFPv2M=",
        "recompress": true
      },
      "src/third_party/clang-format/script": {
        "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git",
-        "rev": "3c0acd2d4e73dd911309d9e970ba09d58bf23a62",
-        "hash": "sha256-whD8isX2ZhLrFzdxHhFP1S/sZDRgyrzLFaVd7OEFqYo="
+        "rev": "37f6e68a107df43b7d7e044fd36a13cbae3413f2",
+        "hash": "sha256-d9uweklBffiuCWEb03ti1eFLnMac2qRtvggzXY1n/RU="
      },
      "src/third_party/libc++/src": {
        "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
-        "rev": "8e31ad42561900383e10dbefc1d3e8f38cedfbe9",
-        "hash": "sha256-kmhTlz/qjvN0Qlra7Wz05O6X058hPPn0nVvAxFXQDC4="
+        "rev": "1f7db7501cf902d5d3ad5fd9b31bea33bb8bf9da",
+        "hash": "sha256-d1Am+7O7KYKEfs9HpAHlw6n6nWpd219gw2Cr5RaBl7w="
      },
      "src/third_party/libc++abi/src": {
        "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
-        "rev": "cec7f478354a8c8599f264ed8bb6043b5468f72d",
-        "hash": "sha256-CwiK9Td8aRS08RywItHKFvibzDAUYYd0YNRKxYPLTD8="
+        "rev": "83dfa1f5bfce32d5f75695542468e37ead8163b8",
+        "hash": "sha256-SUpg+lGtjchvh2CejKEIADAo6ozvHYj2BxzMcMZODCw="
      },
      "src/third_party/libunwind/src": {
        "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
-        "rev": "5b01ea4a6f3b666b7d190e7cb7c31db2ed4d94ce",
-        "hash": "sha256-uA+t5Ecc/iK3mllHR8AMVGRfU/7z1G3yrw0TamPQiOY="
+        "rev": "d1e95b102f113ded38974cf06a65fe0457b6004b",
+        "hash": "sha256-cRqctLgtiqODZf3B8ZIA2wJWCiEsuYTH24ppFtzDh3M="
      },
      "src/third_party/llvm-libc/src": {
        "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
-        "rev": "ca74a72e2b32ad804522bbef04dfe32560a10206",
-        "hash": "sha256-av9JdqLOQbezgRS4P8QXmvfB5l47v04WRagNJJgT5u4="
+        "rev": "039fea2058d14b408637a931b36a717169617227",
+        "hash": "sha256-Uf9DfH62xWzcOsvaekeqXiwsIaIJMFK7kXK82ReY66Y="
      },
      "src/chrome/test/data/perf/canvas_bench": {
        "url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
@@ -65,18 +65,18 @@
      },
      "src/docs/website": {
        "url": "https://chromium.googlesource.com/website.git",
-        "rev": "be9c3dfd3781964fc0bab0d6c91d9ad117b71b02",
-        "hash": "sha256-CqveHvjPEcRWnzi8w13xr2OainrmABNO8uj0GzKmQqo="
+        "rev": "4d214097ba7305ec2b3f2dfcf0aa4fd2104c960a",
+        "hash": "sha256-QvwWHVdLnDqJ6hz0Eli5AnM5gaXDya0En7BIm4vlm6c="
      },
      "src/media/cdm/api": {
        "url": "https://chromium.googlesource.com/chromium/cdm.git",
-        "rev": "eb21edc44e8e5a82095037be80c8b15c51624293",
-        "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw="
+        "rev": "06395a2863cb1ebdb47617a995b73f95c14fe120",
+        "hash": "sha256-bx0zCgqgGPjm3wjo8Y3T5kWp14WW9uoDtvn5+QOAPw0="
      },
      "src/net/third_party/quiche/src": {
        "url": "https://quiche.googlesource.com/quiche.git",
-        "rev": "9616efc903b7469161996006c8cf963238e26503",
-        "hash": "sha256-Z2uFWfZDYcY0m4R6mFMZJLnnVHu3/hQOAkCPQ5049SQ="
+        "rev": "981c424462d9e5210dc843e92b325c93d3bee4e9",
+        "hash": "sha256-O/3qN0pCHSzTURuqzk4schY+aRgRCHHbaTVzbQl3ur4="
      },
      "src/testing/libfuzzer/fuzzers/wasm_corpus": {
        "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
@@ -90,8 +90,8 @@
      },
      "src/third_party/angle": {
        "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "ce13a00a2b049a1ef5e0e70a3d333ce70838ef7b",
-        "hash": "sha256-fMIHpa2QFsQQ19LGyhvV3Ihh6Ls8wwwhqTtpLoTEaf4="
+        "rev": "8304737811a7851e2bfdcf6f667b68dbac4e962a",
+        "hash": "sha256-kjBkeTaZ0aCpMVyHOJLK5mbGBMB5xG1bnx7pr6d92jc="
      },
      "src/third_party/angle/third_party/glmark2/src": {
        "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -105,8 +105,8 @@
      },
      "src/third_party/angle/third_party/VK-GL-CTS/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
-        "rev": "f674555ab03e6355e0981a647c115097e9fe5324",
-        "hash": "sha256-2ZhG4cJf85zO7x+SGG6RD2qgOxZVosxAIbuZt9GYUKs="
+        "rev": "9509eb274dfec320e970d4c85e17ecf15f27ebe3",
+        "hash": "sha256-EZBAJP6puSn1vIO+JRPzZkp+uftneyga0zOXpf0W2os="
      },
      "src/third_party/anonymous_tokens/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
@@ -120,13 +120,13 @@
      },
      "src/third_party/dav1d/libdav1d": {
        "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git",
-        "rev": "93f12c117a4e1c0cc2b129dcc52e84dbd9b84200",
-        "hash": "sha256-Q2CaWvDqOmfaPG6a+SUHG5rFHalPEf4Oq/ytT3xuSOk="
+        "rev": "b129d9f2cb897cedba77a60bd5e3621c14ee5484",
+        "hash": "sha256-79NsUzY9fxOXlzwutAF80salew+uVHsadj2BgtEQbfo="
      },
      "src/third_party/dawn": {
        "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "73dbf565079c89a531e6e01c4e8fc048a8a9660b",
-        "hash": "sha256-6P3Mw60+xZVsFbrhG6UkTlz8xvvEOptV3Ar1sos0CsU="
+        "rev": "d4321eef8c5c94107783d903355c1cbbbb8a3776",
+        "hash": "sha256-28I6Q/Ip6FhlZa2uFuMrW5YJFaDJrv/bc/wztpfO42g="
      },
      "src/third_party/dawn/third_party/glfw": {
        "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -135,8 +135,8 @@
      },
      "src/third_party/dawn/third_party/dxc": {
        "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
-        "rev": "ac36a797d3470e8ee906b98457a59270d01db30d",
-        "hash": "sha256-rhUNPA5b0H3PBsOpXbAeRLpS0tNQkiHbjRBWmJycSAY="
+        "rev": "a8a4e98a2367080af683c48feedd7f7481a31a96",
+        "hash": "sha256-kc3s0LLYi3rNVTPzKQiX46JqnPkqV98tbVQr7OHuRvs="
      },
      "src/third_party/dawn/third_party/dxheaders": {
        "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
@@ -160,8 +160,8 @@
      },
      "src/third_party/dawn/third_party/webgpu-cts": {
        "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
-        "rev": "8690defa74b6975c10e85c113f121d4b2a3f2564",
-        "hash": "sha256-ArbHGjkHd1sko7gDPFksYz7XHKNge+e6tVy6oKPuqzg="
+        "rev": "ba2bd8ab91d41b60b879b134d850d326eb86ef12",
+        "hash": "sha256-FOHgZOI7w7LzZZ14O72b7B/D/Gkvv/2KCf8+bZEPXNM="
      },
      "src/third_party/highway/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/highway.git",
@@ -175,13 +175,13 @@
      },
      "src/third_party/boringssl/src": {
        "url": "https://boringssl.googlesource.com/boringssl.git",
-        "rev": "571c76e919c0c48219ced35bef83e1fc83b00eed",
-        "hash": "sha256-ib9wbV6S64OFc4zx0wQsQ84+5RxbETK0PS9Wm1BFQ1U="
+        "rev": "d777ea2a7004ff7ef40ef983b41a5125f316f898",
+        "hash": "sha256-GOzeQ6BOXSqpDtgYOIyQae+jCKkqzMsU5N2WE95UR6Q="
      },
      "src/third_party/breakpad/breakpad": {
        "url": "https://chromium.googlesource.com/breakpad/breakpad.git",
-        "rev": "47f7823bdf4b1f39e462b2a497a674860e922e38",
-        "hash": "sha256-cFXUi2oO/614jF0GV7oW0ss62dXWFHDNWNT8rWHAiQc="
+        "rev": "02dd5c3ffbfed2bcbc93b553ed0e90a1ac951cb4",
+        "hash": "sha256-1JL9QLMycOXvSrwuvqHxYjSxru6qOmrsJIKMAzPId2s="
      },
      "src/third_party/cast_core/public/src": {
        "url": "https://chromium.googlesource.com/cast_core/public",
@@ -190,8 +190,8 @@
      },
      "src/third_party/catapult": {
        "url": "https://chromium.googlesource.com/catapult.git",
-        "rev": "b91cf840ac3255ef03b23cc93621369627422a1a",
-        "hash": "sha256-65cZPyqZUdSnYPJYUMYeJgx3mUC6L/qb9P2bDqd2Zkk="
+        "rev": "8e5d239c953a309d4bf8aa70481bafa921834cc3",
+        "hash": "sha256-2sBXPPb9o/YKE9v9W+IxJ7o/6yOzP0q5GZWcWvohUM4="
      },
      "src/third_party/ced/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
@@ -200,8 +200,8 @@
      },
      "src/third_party/chromium-variations": {
        "url": "https://chromium.googlesource.com/chromium-variations.git",
-        "rev": "c170abb48f7715c237f4c06eaed0fe6f8a4c6f8d",
-        "hash": "sha256-mg5mu2jcy0xyNJ650ywWUMC94keRsqhZQuPZclHmyLI="
+        "rev": "0fcd7c5b11aca584c5c03b2af870c9f3af6c631c",
+        "hash": "sha256-K9saSXK6fCRuRBdX2PPmotO2K3tatiDwuciCDK6O1MU="
      },
      "src/third_party/cld_3/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git",
@@ -220,8 +220,8 @@
      },
      "src/third_party/cpuinfo/src": {
        "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git",
-        "rev": "8df44962d437a0477f07ba6b8843d0b6a48646a4",
-        "hash": "sha256-FlvmSjY8kt5XHymDLaZdPuZ4k5xcagJk8w/U6adTkWI="
+        "rev": "ca156f7bc9109c552973414a63d310f76ef0cbf8",
+        "hash": "sha256-hIGizsl1NSGySXPI9Xx69xCfQLAMpYviYhBXX201N4o="
      },
      "src/third_party/crc32c/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git",
@@ -230,23 +230,23 @@
      },
      "src/third_party/cros_system_api": {
        "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
-        "rev": "554629b9242e6ae832ef14e3384654426f7fcc06",
-        "hash": "sha256-fvGypRhgl2uX9YE2cwjL7d3pYBa3Imd5p0RLhMYRgrc="
+        "rev": "497b90c6e283745f976d783ed2beaafeef42b1bf",
+        "hash": "sha256-s8ot4NvZfpUbLz/AMNX4F9e78AquKWk/YjguErBZCYE="
      },
      "src/third_party/crossbench": {
        "url": "https://chromium.googlesource.com/crossbench.git",
-        "rev": "ae6f165652e0ea983d73f5d04b7470d08c869e4f",
-        "hash": "sha256-/K6eM9s+fd2wjCrK0g0CgFNy0zxEN9SxTvmE50hMtXw="
+        "rev": "1b41ed2574ef931f2d1157ebb153c9d552f69670",
+        "hash": "sha256-FgI0D1neQ/jrNaQxMsj2hOM6nF14ZYfGHuqUznRK4Rc="
      },
      "src/third_party/depot_tools": {
        "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
-        "rev": "41d43a2a2290450aeab946883542f8049b155c87",
-        "hash": "sha256-m/6b4VZZTUQOeED1mYvZOQCx8Re+Zd4O8SKDMjJ9Djo="
+        "rev": "423f1e1914ab4aa7b2bdf804e216d4c097853ba2",
+        "hash": "sha256-R7cGQLM6yJgFL43UO+zAGbq+9XEbKbtJVFRwdIUB1F8="
      },
      "src/third_party/devtools-frontend/src": {
        "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "f2f3682c9db8ca427f8c64f0402cc2c5152c6c24",
-        "hash": "sha256-mBWZdbgZfO01Pt2lZSHX/d5r+8A/+qCZA8MRtZdeTrs="
+        "rev": "41deafc3d1ae776a97d8fd1cfb457a06908e3a6d",
+        "hash": "sha256-8ev0h+/R1L8VXQqpKJ3zVIQ+kYHKWyNJYcGhPdVhSa4="
      },
      "src/third_party/dom_distiller_js/dist": {
        "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -255,8 +255,8 @@
      },
      "src/third_party/eigen3/src": {
        "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
-        "rev": "b396a6fbb2e173f52edb3360485dedf3389ef830",
-        "hash": "sha256-UroGjERR5TW9KbyLwR/NBpytXrW1tHfu6ZvQPngROq4="
+        "rev": "24e0c2a125d2b37b35719124d1f758777c150ca8",
+        "hash": "sha256-c0QHya0eDKQc5YvvxIoL722fPm3XD3PagJb+pEwSAGQ="
      },
      "src/third_party/farmhash/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git",
@@ -270,8 +270,8 @@
      },
      "src/third_party/ffmpeg": {
        "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git",
-        "rev": "591ae4b02eaff9a03e2ec863da895128b0b49910",
-        "hash": "sha256-wwHxNuZe2hBmGBpVg/iQJBoL350jfPYPTPqDn3RiqZE="
+        "rev": "d10a0f8bf5ddcce572df95105152bc74041cae0c",
+        "hash": "sha256-OXumpRb9XB38dOCJmL3jDcabiJ08wAvydVlJwMgpCoQ="
      },
      "src/third_party/flac": {
        "url": "https://chromium.googlesource.com/chromium/deps/flac.git",
@@ -305,8 +305,8 @@
      },
      "src/third_party/freetype/src": {
        "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
-        "rev": "0ae7e607370cc66218ccfacf5de4db8a35424c2f",
-        "hash": "sha256-+nbRZi3vAMTURhhFVUu5+59fVIv0GH3YZog2JavyVLY="
+        "rev": "afc7000cacb8cc90ae61036858c5306defa1236a",
+        "hash": "sha256-ZaAoUxqr3GZ05Zux2jDS4YCbFaeJ4Z+dc3gZCRL09NE="
      },
      "src/third_party/freetype-testing/src": {
        "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git",
@@ -320,13 +320,13 @@
      },
      "src/third_party/harfbuzz-ng/src": {
        "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
-        "rev": "1da053e87f0487382404656edca98b85fe51f2fd",
-        "hash": "sha256-iR49rfGDKxPObCff1/30hYHpP5FpZ28ROgMZhNk9eFY="
+        "rev": "1c249be96e27eafd15eb86d832b67fbc3751634b",
+        "hash": "sha256-TStJvz3Txn4cvU1tCPPZn6RLslvM+VNUqt8l8g67JN4="
      },
      "src/third_party/ink/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/ink.git",
-        "rev": "4300dc7402a257b85fc5bf2559137edacb050227",
-        "hash": "sha256-+Ikr9E7KlXBFyf6fSDmIF3ygNUiwlXeA5bmO2CtkI7Q="
+        "rev": "e5673a4ff2d82f29b22f7bec114161cbc1ff8cf8",
+        "hash": "sha256-/F4p2VRDWJ0bZRtSoWtgK8gnQDaOrHwoKwGvuSRq3a0="
      },
      "src/third_party/ink_stroke_modeler/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git",
@@ -335,8 +335,8 @@
      },
      "src/third_party/instrumented_libs": {
        "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git",
-        "rev": "bb6dbcf2df7a9beb34c3773ef4df161800e3aed9",
-        "hash": "sha256-kHKGADAgzlaeckXFbpU1GhJK+zkiRd9XvdtPF6qrQFY="
+        "rev": "3cc43119a29158bcde39d288a8def4b8ec49baf8",
+        "hash": "sha256-7w5wMcmPcKLS91buxyRdcgaQjbKGFdmrKClvYVO3iko="
      },
      "src/third_party/emoji-segmenter/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git",
@@ -355,8 +355,8 @@
      },
      "src/third_party/googletest/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git",
-        "rev": "d144031940543e15423a25ae5a8a74141044862f",
-        "hash": "sha256-n7tiIFAj8AiSCa9Tw+1j+ro9cSt5vagZpkbBBUUtYQY="
+        "rev": "7d76a231b0e29caf86e68d1df858308cd53b2a66",
+        "hash": "sha256-ssYxqE/NZJGTAbuWTXg150qlvMS3QNaonEk9dK8jJWI="
      },
      "src/third_party/hunspell_dictionaries": {
        "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git",
@@ -365,8 +365,8 @@
      },
      "src/third_party/icu": {
        "url": "https://chromium.googlesource.com/chromium/deps/icu.git",
-        "rev": "ba7ed88cc5ffa428a82a0f787dd61031aa5ef4ca",
-        "hash": "sha256-WtCoxcbEkkZayB6kXdQEhZ7/ue+ka6cguhFbpeWUBJA="
+        "rev": "bbccc2f6efc1b825de5f2c903c48be685cd0cf22",
+        "hash": "sha256-O9qrAt8lwNBg5LCVz+SfTe48uJx8onVYwn0LRXIhUvY="
      },
      "src/third_party/jsoncpp/source": {
        "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git",
@@ -375,18 +375,18 @@
      },
      "src/third_party/leveldatabase/src": {
        "url": "https://chromium.googlesource.com/external/leveldb.git",
-        "rev": "23e35d792b9154f922b8b575b12596a4d8664c65",
-        "hash": "sha256-y3awFXL8ih2UhEqWj8JRgkhzSxfQciLztb020JHJ350="
+        "rev": "578eeb702ec0fbb6b9780f3d4147b1076630d633",
+        "hash": "sha256-tOSl9w9hEUnuQR+DxfZlHqEXXcpeyDlZrw2NWDUyXoY="
      },
      "src/third_party/libFuzzer/src": {
        "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git",
-        "rev": "a7128317fe7935a43d6c9f39df54f21113951941",
-        "hash": "sha256-jPS+Xi/ia0sMspxSGN38zasmVS/HslxH/qOFsV9TguE="
+        "rev": "e31b99917861f891308269c36a32363b120126bb",
+        "hash": "sha256-Lb+HczYax0T7qvC0/Nwhc5l2szQTUYDouWRMD/Qz7sA="
      },
      "src/third_party/fuzztest/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
-        "rev": "0021f30508bc7f73fa5270962d022acb480d242f",
-        "hash": "sha256-UYmzjOX8k+CWL+xOIF3NiEL3TRUjS8JflortB2RUT4o="
+        "rev": "3b4a590f7fc75a77823580c4c4e19d1c7bd6da52",
+        "hash": "sha256-+m6F1rqfIQcxKZbAJgQfKbokYPZSR+PrEHxMiE9IVKA="
      },
      "src/third_party/domato/src": {
        "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git",
@@ -400,23 +400,23 @@
      },
      "src/third_party/libaom/source/libaom": {
        "url": "https://aomedia.googlesource.com/aom.git",
-        "rev": "be60f06ab420d6a65c477213f04c8b0f2e12ba2e",
-        "hash": "sha256-9VhEVOG9cReDOGoX+x5G/jJ8Y5RDoQIiLMoZtt5c9pI="
+        "rev": "0c13a5d54053f82bf8500b421b5cdefb1cc1b3ed",
+        "hash": "sha256-uGvdLJNzvd7WxRAjTxYVaX5Y7Oc54f8fLEtpErAdCdg="
      },
      "src/third_party/libavif/src": {
        "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git",
-        "rev": "1cdeff7ecf456492c47cf48fc0cef6591cdc95da",
-        "hash": "sha256-lUuVyh2srhWMNUp4lEivyDic3MSZf5s63iAb84We80M="
+        "rev": "e9a27bc6a84f01b6670c05c301c445f33a464992",
+        "hash": "sha256-4slyN5V7UCDbGHK/xZfC5MuOGhctVF6r/1lSnOHJB5Y="
      },
      "src/third_party/crabbyavif/src": {
        "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
-        "rev": "c3548280e0a516ed7cad7ff1591b5807cef64aa4",
-        "hash": "sha256-hO5epHYNYI6pGwVSUv1Hp3qb7qOv8uOs4u+IdhDxd8Q="
+        "rev": "879ca873d6648a01de65e4cb0b86336b581aa513",
+        "hash": "sha256-JF1s3rDH0u5srtzyGQt/LU8iVlx1qPqE4RBE1AR8KPQ="
      },
      "src/third_party/nearby/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
-        "rev": "8e87a6e51c93e7836ecdbcc0a520c7992f3ece13",
-        "hash": "sha256-DO3FW5Q233ctFKk4K5F8oZec9kfrVl6uxAwMn0niKz4="
+        "rev": "1864b0b55506bfc1eafc3785502f085f41aa0921",
+        "hash": "sha256-tTJ9tJBiWbAurKvb8aPn0KLHd724CYk5wlVIVZPWB0o="
      },
      "src/third_party/beto-core/src": {
        "url": "https://beto-core.googlesource.com/beto-core.git",
@@ -428,11 +428,26 @@
        "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84",
        "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78="
      },
+      "src/third_party/speedometer/main": {
+        "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
+        "rev": "67bc21f1f44567a3ba41d7a3d8d0bec0e74f4a9e",
+        "hash": "sha256-mx4Z/co1mZcu//nlGIg5yH+XiTWB0sdiEK8Jvbi4THU="
+      },
      "src/third_party/speedometer/v3.0": {
        "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
        "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d",
        "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU="
      },
+      "src/third_party/speedometer/v2.0": {
+        "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
+        "rev": "732af0dfe867f8815e662ac637357e55f285dbbb",
+        "hash": "sha256-p7WUS8gZUaS+LOm7pNmRkwgxjx+V8R6yy7bbaEHaIs4="
+      },
+      "src/third_party/speedometer/v2.1": {
+        "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
+        "rev": "8bf7946e39e47c875c00767177197aea5727e84a",
+        "hash": "sha256-0z5tZlz32fYh9I1ALqfLm2WWO8HiRBwt0hcmgKQhaeM="
+      },
      "src/third_party/ukey2/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git",
        "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47",
@@ -440,8 +455,8 @@
      },
      "src/third_party/cros-components/src": {
        "url": "https://chromium.googlesource.com/external/google3/cros_components.git",
-        "rev": "9129cf4b2a5ca775c280243257a0b4856a93c7fb",
-        "hash": "sha256-owXaTIj0pbhUeJkirxaRoCmgIN9DwNzY3h771kaN+Fc="
+        "rev": "59dd6e3d06e111c6a3d323a92e6478b9bbf15915",
+        "hash": "sha256-x9udwohR5jKPL6x2Hxu2FdS2aW3T8VIGZ4mLtgNQ5io="
      },
      "src/third_party/libdrm/src": {
        "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git",
@@ -470,8 +485,8 @@
      },
      "src/third_party/libphonenumber/dist": {
        "url": "https://chromium.googlesource.com/external/libphonenumber.git",
-        "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362",
-        "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo="
+        "rev": "9d46308f313f2bf8dbce1dfd4f364633ca869ca7",
+        "hash": "sha256-ZbuDrZEUVp/ekjUP8WO/FsjAomRjeDBptT4nQZvTVi4="
      },
      "src/third_party/libprotobuf-mutator/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git",
@@ -480,18 +495,23 @@
      },
      "src/third_party/libsrtp": {
        "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git",
-        "rev": "000edd791434c8738455f10e0dd6b268a4852c0b",
-        "hash": "sha256-4qEZ9MD97MoqCUlZtbEhIKy+fDO1iIWqyrBsKwkjXTg="
+        "rev": "a52756acb1c5e133089c798736dd171567df11f5",
+        "hash": "sha256-bkG1+ss+1a2rCHGwZjhvf5UaNVbPPZJt9HZSIPBKGwM="
      },
      "src/third_party/libsync/src": {
        "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git",
        "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6",
        "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E="
      },
+      "src/third_party/libva-fake-driver/src": {
+        "url": "https://chromium.googlesource.com/chromiumos/platform/libva-fake-driver.git",
+        "rev": "a9bcab9cd6b15d4e3634ca44d5e5f7652c612194",
+        "hash": "sha256-em/8rNqwv6szlxyji7mnYr3nObSW/x3OzEEnkiLuqpI="
+      },
      "src/third_party/libvpx/source/libvpx": {
        "url": "https://chromium.googlesource.com/webm/libvpx.git",
-        "rev": "727319a77ffe68e9aacb08e09ae7151b3a8f70a3",
-        "hash": "sha256-QGm37X4uid8zv+vRu0pVTvoQd2WcKztrj3tJkDjx82o="
+        "rev": "8058a0b54991257a0e1a2fcf08d993a8b70c1d3a",
+        "hash": "sha256-iwUQ7WI9ThluB2+a4T7FlE7gPyBxTt9PZJnG6k5PYew="
      },
      "src/third_party/libwebm/source": {
        "url": "https://chromium.googlesource.com/webm/libwebm.git",
@@ -500,13 +520,13 @@
      },
      "src/third_party/libwebp/src": {
        "url": "https://chromium.googlesource.com/webm/libwebp.git",
-        "rev": "845d5476a866141ba35ac133f856fa62f0b7445f",
-        "hash": "sha256-xuRpEwOnaLGZmrPvfUn3DSoJANd94CG+JXcN7Mdmk5I="
+        "rev": "2af6c034ac871c967e04c8c9f8bf2dbc2e271b18",
+        "hash": "sha256-0sKGhXr6Rrpq0eoitAdLQ4l4fgNOzMWIEICrPyzwNz4="
      },
      "src/third_party/libyuv": {
        "url": "https://chromium.googlesource.com/libyuv/libyuv.git",
-        "rev": "6ac7c8f25170c85265fca69fd1fe5d31baf3344f",
-        "hash": "sha256-vPVq7RzqO7gBUgYuNX0Fwxqok9jtXXJZgbhVFchG5Ws="
+        "rev": "47ddac2996378c34aab9318f0d218303b1d282e7",
+        "hash": "sha256-sB5iCuc3+Dp9uVm2mUt4XhQ3zazsueEVNNw6uTMGTuQ="
      },
      "src/third_party/lss": {
        "url": "https://chromium.googlesource.com/linux-syscall-support.git",
@@ -530,8 +550,8 @@
      },
      "src/third_party/neon_2_sse/src": {
        "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git",
-        "rev": "a15b489e1222b2087007546b4912e21293ea86ff",
-        "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0="
+        "rev": "eb8b80b28f956275e291ea04a7beb5ed8289e872",
+        "hash": "sha256-AkDAHOPO5NdXXk0hETS5D67mzw0RVXwPDDKqM0XXo5g="
      },
      "src/third_party/openh264/src": {
        "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264",
@@ -540,8 +560,8 @@
      },
      "src/third_party/openscreen/src": {
        "url": "https://chromium.googlesource.com/openscreen",
-        "rev": "cb6fd42532fc3a831d6863d5006217e32a67c417",
-        "hash": "sha256-IlGxfw6Mhc7FYvhU2+Ngt9qflqr4JMC2OcplvksGI+U="
+        "rev": "991678c7c3b66807cb40619e46ebb7de1bc45a18",
+        "hash": "sha256-ULAd+neG99IXGMOT4Ur4tDdV+jxMucwQFid2xhHqcMY="
      },
      "src/third_party/openscreen/src/buildtools": {
        "url": "https://chromium.googlesource.com/chromium/src/buildtools",
@@ -555,13 +575,13 @@
      },
      "src/third_party/pdfium": {
        "url": "https://pdfium.googlesource.com/pdfium.git",
-        "rev": "84a8011ec69d0e2de271c05be7d62979608040d9",
-        "hash": "sha256-d8qJECIdq01ct+sS7cHVKFulYJarwahKCEcVf762JNI="
+        "rev": "c674dba647e81805158339785c0c7e3b57643f8c",
+        "hash": "sha256-2Z7Dg3IuxMB+xKFURo0Z7NztPQht7Fd+A1dX99gQ+A4="
      },
      "src/third_party/perfetto": {
        "url": "https://android.googlesource.com/platform/external/perfetto.git",
-        "rev": "ea011a2c2d3aecdc4f1674887e107a56d2905edd",
-        "hash": "sha256-3vervpsq/QLMrR7RcJMwwh+CdFvSEj8yAzj6s9d1XMo="
+        "rev": "2473cc95bc0d2d0c3c240be49ce4c2d0dc48edd4",
+        "hash": "sha256-OUnQ4XStZ0Olm/IvlaLzcRdHo/EMPlQ6ekVTSrG7HW0="
      },
      "src/third_party/protobuf-javascript/src": {
        "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
@@ -595,23 +615,23 @@
      },
      "src/third_party/ruy/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git",
-        "rev": "c08ec529fc91722bde519628d9449258082eb847",
-        "hash": "sha256-4NVvqUZn2BdwTxJINTHwPeRqbGXZrWdcd7jv1Y+eoKY="
+        "rev": "95484c3e02206f73309c08ee5ee23d2304ca092b",
+        "hash": "sha256-BaRyNHZLpXNsJltffV7T19QrMWkTcCq37JZiWjAdSHo="
      },
      "src/third_party/skia": {
        "url": "https://skia.googlesource.com/skia.git",
-        "rev": "c17fe9bc158c29de3cdd655ac73d14f52c17810a",
-        "hash": "sha256-mRfkEm+NzEX0DkJejk1THx4G7v0sIFmRrAnt3Zl5uco="
+        "rev": "ecebe831881cdf52c65df518777210071f7970dd",
+        "hash": "sha256-9pq0MEWRlR6bOamQW+onZkhGH82FUYRn3P1ooDUqnPY="
      },
      "src/third_party/smhasher/src": {
        "url": "https://chromium.googlesource.com/external/smhasher.git",
-        "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f",
+        "rev": "3e1f0d1d8340cfe136d33fd27c75eb7694148214",
        "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw="
      },
      "src/third_party/snappy/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git",
-        "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c",
-        "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0="
+        "rev": "32ded457c0b1fe78ceb8397632c416568d6714a0",
+        "hash": "sha256-jUwnjbaqXz7fgI2TPRK7SlUPQUVzcpjp4ZlFbEzwA+o="
      },
      "src/third_party/sqlite/src": {
        "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git",
@@ -620,8 +640,8 @@
      },
      "src/third_party/swiftshader": {
        "url": "https://swiftshader.googlesource.com/SwiftShader.git",
-        "rev": "d5c4284774115bb1e32c012a2be1b5fbeb1ab1f9",
-        "hash": "sha256-h2BHyaOM0oscfX5cu8s4N1yyOkg/yQbvwD1DxF+RAQc="
+        "rev": "52586b554f93e50bc67277c6031673ed23a8d903",
+        "hash": "sha256-WPTpjJK6qFzXJg5eYLpEb6hqGgNzAkQOlSeA5a78Vpk="
      },
      "src/third_party/text-fragments-polyfill/src": {
        "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
@@ -630,18 +650,18 @@
      },
      "src/third_party/tflite/src": {
        "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
-        "rev": "658227d3b535287dc6859788bde6076c4fe3fe7c",
-        "hash": "sha256-gOUt/NljRK5wMFwy2aLqZ5NHwk4y/GxbQ+AZ3MxM0M8="
+        "rev": "b25df276c8e912c22f57263ffcae6ca8f4c64342",
+        "hash": "sha256-Xl5dgjiKpkwf3Iv15Oj83AR1iJQ5qNzClCk24Y28TVw="
      },
      "src/third_party/vulkan-deps": {
        "url": "https://chromium.googlesource.com/vulkan-deps",
-        "rev": "0b56dd5952b25fad65139b64096fcd187048ed38",
-        "hash": "sha256-LVWvbMLjkMyAUM+0UpQ4oRsfcRU5F/xY60wiwxth4Ko="
+        "rev": "915d114daeb26a3dbdad1622f5a72c0aa255acbb",
+        "hash": "sha256-K7HND6c357xoDFAczG77RY4E7lGyEvt0J4NidSkRYTE="
      },
      "src/third_party/glslang/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
-        "rev": "9c644fcb5b9a1a9c975c50a790fd14c5451292b0",
-        "hash": "sha256-twWSeJp9bNbLYFszCWv9BCztfbXUBKSWV55/U+hd2hw="
+        "rev": "10fb91c403b2f5e2142c751884dd12ed3fb13952",
+        "hash": "sha256-MvX2ApY5EF/jVMCkSSLHkPVIyHPe+CIlKJnkURzmxLU="
      },
      "src/third_party/spirv-cross/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
@@ -650,44 +670,49 @@
      },
      "src/third_party/spirv-headers/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
-        "rev": "996c728cf7dcfb29845cfa15222822318f047810",
-        "hash": "sha256-FrT/kVIMjcu2zv+7kDeNKM77NnOyMBb8pV0w8DBP42A="
+        "rev": "36d5e2ddaa54c70d2f29081510c66f4fc98e5e53",
+        "hash": "sha256-8hx8/1vaY4mRnfNaBsghWqpzyzY4hkVkNFbQEFZif9g="
      },
      "src/third_party/spirv-tools/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
-        "rev": "9117e042b93d4ff08d2406542708170f77aaa2a3",
-        "hash": "sha256-m/a1i26u8lzpKuQHyAy6ktWWjbLZEaio1awz8VovTGE="
+        "rev": "f3c4a5053f1bd34056282e56659659873f9d47ad",
+        "hash": "sha256-1qIdXDDRDXT27O8o9gFNEQHQKJVAoqN3BDepL/iu1zQ="
      },
      "src/third_party/vulkan-headers/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
-        "rev": "cbcad3c0587dddc768d76641ea00f5c45ab5a278",
-        "hash": "sha256-exXzafLgrgxyRvaF+4pCF+OLtPT2gDmcvzazQ4EQ1eA="
+        "rev": "36872f9062b17b1a30b8ed1d81ca5ea6bb608a72",
+        "hash": "sha256-+29yOL4VBAR8QpsK/WcCiJkPQxSoReTXVSoAhzsPPKc="
      },
      "src/third_party/vulkan-loader/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
-        "rev": "b0177a972b8d47e823a4500cf88df88a8c27add7",
-        "hash": "sha256-NDp2TLeMLAHb92R+PjaPDTx8ckIlpSsS3BNx3lerB68="
+        "rev": "081b529a37f43249225114c4c0dea12a29ce605f",
+        "hash": "sha256-QyWnBxTo5KcbEB1/Kcz2679KCsSTRDini4Ef9YRY+lw="
      },
      "src/third_party/vulkan-tools/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
-        "rev": "15f2de809304aba619ee327f3273425418ca83de",
-        "hash": "sha256-PiWKL045DAOGm+Hl/UyO6vmD4fVfuf2fSvXK6gSYbwo="
+        "rev": "86d6be76350413def51e96ed98a25cc2c9d048c9",
+        "hash": "sha256-2LQGTmViNb4G19zcHyEpor2E0c1wD9+JDknLfeT1M2Y="
      },
      "src/third_party/vulkan-utility-libraries/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
-        "rev": "87ab6b39a97d084a2ef27db85e3cbaf5d2622a09",
-        "hash": "sha256-luDw6g/EMSK67Et2wNta74PHGQU6Y7IRpDlSpgDYV6Q="
+        "rev": "b538fb5b08513aa78346cd414ad5e576a2a3e920",
+        "hash": "sha256-XoMQ9VhyS4eJ8TLxNKZ1YygeOJp65AsFSk2galRM7BE="
      },
      "src/third_party/vulkan-validation-layers/src": {
        "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
-        "rev": "bc2c38412f739c298d6f5c076c064e6b5696959f",
-        "hash": "sha256-WWV+P++0Czeqg5p2UTqIP81pY8oz7cS7E7Z/sc0km6g="
+        "rev": "24ad452082bfbf3eb749d7894266666a8aae4bbb",
+        "hash": "sha256-OUdlPRua+Ujn2rdzmg62OLqlsgByBNh4yUnL11oM5gE="
      },
      "src/third_party/vulkan_memory_allocator": {
        "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
        "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21",
        "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ="
      },
+      "src/third_party/wasm_tts_engine/src": {
+        "url": "https://chromium.googlesource.com/chromium/wasm-tts-engine",
+        "rev": "6d5bc87a28e49361dac2964015957698b04a0df8",
+        "hash": "sha256-uqPCMa95uoLhf+cjmc5iz3m3qGy2BNrr8oipfDbColA="
+      },
      "src/third_party/wayland/src": {
        "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git",
        "rev": "a156431ea66fe67d69c9fbba8a8ad34dabbab81c",
@@ -720,13 +745,18 @@
      },
      "src/third_party/webgpu-cts/src": {
        "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
-        "rev": "b9f32fd2943dd2b3d0033bf938c9d843f4b5c9a9",
-        "hash": "sha256-Dd5uWNtnBIc2jiMkh9KjI5O1tJtmMvdlMA2nf+VOkQQ="
+        "rev": "e99550b44ea9eedb364beb553d1a48549d0da115",
+        "hash": "sha256-uklVbu4Sgb9FmmKcaep8ncd5FNfdPGwdKMvzVr2qUBI="
+      },
+      "src/third_party/webpagereplay": {
+        "url": "https://chromium.googlesource.com/webpagereplay.git",
+        "rev": "d812e180206934eb3b7ae411d82d61bc21c22f70",
+        "hash": "sha256-KAkkFVxEfQxbSjD+55LO4UZYWWwmGK6B9ENFSPljNu0="
      },
      "src/third_party/webrtc": {
        "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "afaf497805cbb502da89991c2dcd783201efdd08",
-        "hash": "sha256-S8kGTd3+lf5OTayCMOqqrjxH4tcbT0NLZBpKmTCysMs="
+        "rev": "283b6ef9d3eabe5bb3ed7c9d6b6d211a92f9b6d0",
+        "hash": "sha256-KMyO88KoYiTHq+stdbc8vRYqeQbrqexDIiOeWbqytrU="
      },
      "src/third_party/wuffs/src": {
        "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -745,23 +775,18 @@
      },
      "src/third_party/xnnpack/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
-        "rev": "d1d33679661a34f03a806af2b813f699db3004f9",
-        "hash": "sha256-aDPlmLxNY9M5+Qb8VtdfxphHXU/X6JwYhkUSXkLh/FE="
-      },
-      "src/tools/page_cycler/acid3": {
-        "url": "https://chromium.googlesource.com/chromium/deps/acid3.git",
-        "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba",
-        "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0="
+        "rev": "7440eee88f66c4b81d4e7d31f6ae07af66e059ea",
+        "hash": "sha256-qC4hSubtlNKwRikKNYtiEnvCtV0/IGvQegnhrMCTKKs="
      },
      "src/third_party/zstd/src": {
        "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
-        "rev": "7fb5347e88f10472226c9aa1962a148e55d8c480",
-        "hash": "sha256-4J/F2v2W3mMdhqQ4q35gYkGaqTKlcG6OxUt3vQ8pcLs="
+        "rev": "b0a179d469680276adbd4007435989a6b7fd8b4f",
+        "hash": "sha256-uFzzxbTxCUl69URMJdb9BL9cHkwwiuSHyXGSVo2xX6w="
      },
      "src/v8": {
        "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "210ec27ca748c70580fe374f9811761667312b41",
-        "hash": "sha256-pfkztEU22T15H2amf+b5bpALQ6Er1YAxZoxbbfb2YU8="
+        "rev": "fe051262efbbd92479a08436f733eba9f756e008",
+        "hash": "sha256-l3hMgnhy2Ml6kExwGFWi+M6Oq4YFsOSIkRDCmji+syY="
      }
    }
  },
@@ -1,18 +1,18 @@
 {
  "airgap-images-amd64": {
    "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.12%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "0p3d0k4ckzrbd3xd4v9vb8rhw9jcl4ilx9ch94yhf8kxnnblgzyb"
+    "sha256": "cbff4797b57d22073d4990a54e23a14c260e335a3b6dd2fa682bffc9c8046d5c"
  },
  "airgap-images-arm": {
    "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.12%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "0j9ajjz201w319gfryx2q7jnmyi8gg805v7jsdmy4xkyl8ki80jw"
+    "sha256": "5c021427a27e76e26bd3f2ec02d07b28fa6ae5c1a2fbec5e0a830720be942a49"
  },
  "airgap-images-arm64": {
    "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.12%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "1yc1yafr16mli1jk9xc4vgp6q36zk9z5p4rjmdng42dp0j6kvj0w"
+    "sha256": "1cc83d8d04b709f26cab32935b7e9adf0c6ceedb84f5346588b49a909df281f9"
  },
  "images-list": {
    "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.12%2Bk3s1/k3s-images.txt",
-    "sha256": "1gqiaszfw49hsbn7xkkadykaf028vys13ykqvpkqar0f7hwwbja6"
+    "sha256": "46c9c5393c0e6485e7dd78fa11b4df4800a7a66f6ace7eecd23011eebe5611bf"
  }
 }
@@ -1,18 +1,18 @@
 {
  "airgap-images-amd64": {
    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.8%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "12vvc79jy1nyvcpsr2bi6w1zf28rqx99vh7anjm13snzsk7kzqc2"
+    "sha256": "82e13fcfd4dfea11aab4eac09d52c71909f703377189ac2fdbde062fd3617b8b"
  },
  "airgap-images-arm": {
    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.8%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "0mhn1ilh830m403yg1y3nqzjcakhs3i6hgdq2s8w2spyz2kdrgv1"
+    "sha256": "61bfdca6f8fe6ac19116b83d68e2d0702a263fb6c387e70720150c04690c1656"
  },
  "airgap-images-arm64": {
    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.8%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "0jdxf36dksypjvgil23wn8ins5rp0achmlavmv12vhijfllkqnn5"
+    "sha256": "c55a3c297532c22dc2ae5bd10a990237176d23b27c081adf96d7ebd9cc70bd49"
  },
  "images-list": {
    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.8%2Bk3s1/k3s-images.txt",
-    "sha256": "1gqiaszfw49hsbn7xkkadykaf028vys13ykqvpkqar0f7hwwbja6"
+    "sha256": "46c9c5393c0e6485e7dd78fa11b4df4800a7a66f6ace7eecd23011eebe5611bf"
  }
 }
@@ -1,18 +1,18 @@
 {
  "airgap-images-amd64": {
    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.4%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "1dykfk58sp4phf125jfrzx031pp1mj0g8q0kliis139sig14vagp"
+    "sha256": "f7a94dc28b3a8da063a41360f480ace1de3040ffd9c9228283975c8dca74d3b7"
  },
  "airgap-images-arm": {
    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.4%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "0z4h9yd8843q58hhm8jw072k1ixxnmprp9c30pwb796iy1mpirbm"
+    "sha256": "75e5786bf0d1a4b3f80583a59b6fb5bdc730c5015ca20a212a7810849a4f907c"
  },
  "airgap-images-arm64": {
    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.4%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "0xsq095dkf89c6jjd126rrdl7k0zy7cxb38rimzpacb8zfj4ss82"
+    "sha256": "02694da4fb6831757f8d198dd5d9f11fcc435bce468426a56109b9d94a025877"
  },
  "images-list": {
    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.4%2Bk3s1/k3s-images.txt",
-    "sha256": "1gqiaszfw49hsbn7xkkadykaf028vys13ykqvpkqar0f7hwwbja6"
+    "sha256": "46c9c5393c0e6485e7dd78fa11b4df4800a7a66f6ace7eecd23011eebe5611bf"
  }
 }
@@ -1,18 +1,18 @@
 {
  "airgap-images-amd64": {
    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.1%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "0sn4m1djj8npdx90mny7cwc843ri9q4s0w906rgabjw2v1h56qz0"
+    "sha256": "e0635360d882cba55e362071a0094e310f821867c7db0a526fd722295ba8c46a"
  },
  "airgap-images-arm": {
    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.1%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "1mk8xjc4zj3a6jm53drwicqsipy58faxmq990s14lqvrhh3qjnh4"
+    "sha256": "045a89078479634a820629e1da9543c5dfa8318b3cb751aa346ac84f98ec68d6"
  },
  "airgap-images-arm64": {
    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.1%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "0s1h6lksn83r71ia61h9cjwiqigz9nw9n9jm92749782c8zi918x"
+    "sha256": "1d85143f62029d448e4855269bb84dff451cb9640906a362387920ab27353068"
  },
  "images-list": {
    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.1%2Bk3s1/k3s-images.txt",
-    "sha256": "08qxykq9aylfgm24g8ybki62r2sdzvnmv72pan4i2nn0js93nnk9"
+    "sha256": "695a3b9296c05a118955579c5dedfe4d8b2c4c9ccba347447d8e7a95f0f41d23"
  }
 }
@@ -70,21 +70,28 @@ cat > chart-versions.nix.update <<EOF
 EOF
 mv chart-versions.nix.update chart-versions.nix

+# Concatenate all sha256sums, one entry per line
+SHA256_HASHES="$(curl -L "https://github.com/k3s-io/k3s/releases/download/v${K3S_VERSION}/sha256sum-amd64.txt")
+    \n$(curl -L "https://github.com/k3s-io/k3s/releases/download/v${K3S_VERSION}/sha256sum-arm64.txt")
+    \n$(curl -L "https://github.com/k3s-io/k3s/releases/download/v${K3S_VERSION}/sha256sum-arm.txt")"
+
 # Get all airgap images files associated with this release
 IMAGES_ARCHIVES=$(curl "https://api.github.com/repos/k3s-io/k3s/releases/tags/v${K3S_VERSION}" | \
    # Filter the assets so that only zstd archives and text files that have "images" in their name remain
-    # Modify the name and write the modified name and download URL to a string
    jq -r '.assets[] | select(.name | contains("images")) |
        select(.content_type == "application/zstd" or .content_type == "text/plain; charset=utf-8") |
-        .name = (.name | sub("k3s-"; "") | sub(".tar.zst"; "") | sub(".txt"; "-list")) |
        "\(.name) \(.browser_download_url)"')

 # Create a JSON object for each airgap images file and prefetch all download URLs in the process
 # Combine all JSON objects and write the result to images-versions.json
 while read -r name url; do
-    jq --null-input --arg name "$name" \
+    # Pick the right hash based on the name
+    sha256=$(grep "$name" <<< "$SHA256_HASHES" | cut -d ' ' -f 1)
+    # Remove the k3s- prefix and file endings
+    clean_name=$(sed -e 's/^k3s-//' -e 's/\.tar\.zst//' -e 's/\.txt/-list/' <<< "$name")
+    jq --null-input --arg name "$clean_name" \
            --arg url "$url" \
-            --arg sha256 "$(nix-prefetch-url --quiet "${url}")" \
+            --arg sha256 "$sha256" \
        '{$name: {"url": $url, "sha256": $sha256}}'
 done <<<"${IMAGES_ARCHIVES}" | jq --slurp 'reduce .[] as $item ({}; . * $item)' > images-versions.json

@@ -11,14 +11,14 @@

 buildPythonApplication rec {
  pname = "pass-git-helper";
-  version = "3.1.0";
+  version = "3.2.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "languitar";
    repo = "pass-git-helper";
    tag = "v${version}";
-    sha256 = "sha256-HcafOaunDsyUm5KPcDNo/hENFMZseWSD8GYilKYOPco=";
+    sha256 = "sha256-Dc7oM5xzRCdD6M/F3jetg3JA1KMTITyONd8Tf9VpU5A=";
  };

  build-system = [ setuptools ];
@@ -14,11 +14,12 @@
 }:
 python3Packages.buildPythonApplication rec {
  pname = "borgmatic";
-  version = "1.8.14";
+  version = "1.9.5";
+  format = "pyproject";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-WYs7wiwZ1TvTdeUpWv7FbREXWfdGcYRarP4FXFOfp0Y=";
+    hash = "sha256-wVGM2BsgmZiKWttceIw5pbJGYY2V3+MY1Iv86PwIcU8=";
  };

  nativeCheckInputs =
@@ -36,6 +37,12 @@ python3Packages.buildPythonApplication rec {
    "test_borgmatic_version_matches_news_version"
  ];

+  # by default only 70.02% coverage is reached
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace '--cov-fail-under=100' '--cov-fail-under=70'
+  '';
+
  nativeBuildInputs = [ installShellFiles ];

  propagatedBuildInputs = with python3Packages; [
@@ -6,14 +6,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "dnstwist";
-  version = "20240812";
+  version = "20250130";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "elceef";
    repo = "dnstwist";
    tag = version;
-    hash = "sha256-J6MfPKj7iACsiiSUU/2gxQdwtmqw9NKnjDoSdhxKoAw=";
+    hash = "sha256-cgSQ6KDCvTYX0vp0jqNzKHzo84IXrztoYqoTJNF+FiI=";
  };

  build-system = with python3.pkgs; [
@@ -0,0 +1,65 @@
+{
+  lib,
+  stdenv,
+  blueprint-compiler,
+  desktop-file-utils,
+  fetchFromGitHub,
+  gjs,
+  glib,
+  gtk4,
+  libadwaita,
+  libportal,
+  meson,
+  ninja,
+  nix-update-script,
+  wrapGAppsHook4,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "dosage";
+  version = "1.8.0";
+
+  src = fetchFromGitHub {
+    owner = "diegopvlk";
+    repo = "Dosage";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-u/HnlnitLJjYxt+LqbhS2DYUDVVBamZCakBym2eNK1c=";
+  };
+
+  # https://github.com/NixOS/nixpkgs/issues/318830
+  postPatch = ''
+    sed -i "1 a imports.package._findEffectiveEntryPointName = () => 'io.github.diegopvlk.Dosage';" src/io.github.diegopvlk.Dosage.in
+  '';
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    blueprint-compiler
+    desktop-file-utils
+    gjs
+    glib # For `glib-compile-schemas`
+    gtk4 # For `gtk-update-icon-theme`
+    meson
+    ninja
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    gjs
+    libadwaita
+    libportal
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Medication tracker for Linux";
+    homepage = "https://github.com/diegopvlk/Dosage";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ getchoo ];
+    mainProgram = "io.github.diegopvlk.Dosage";
+    platforms = lib.platforms.linux;
+  };
+})
@@ -8,17 +8,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "dumbpipe";
-  version = "0.23.0";
+  version = "0.24.0";

  src = fetchFromGitHub {
    owner = "n0-computer";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-ZIPvdlE/oBmtdTpWm5GU53wGGYWCc74a9w5Kqpi8tBg=";
+    hash = "sha256-7Q+X1NcpzhWEmsCFhebW5KhT7gpzxSEDrgEtAOvHkqk=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-D9HBJXn68jdY8ocSNUNNQHJy21H3z4KccyzTECTYYx0=";
+  cargoHash = "sha256-8V/8aX/PFeekRuXj/kxGS3TQwxMS4mUD3seZMqc8oUk=";

  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
    with darwin.apple_sdk.frameworks;
@@ -0,0 +1,59 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodejs,
+  jq,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "eas-cli";
+  version = "14.7.1";
+
+  src = fetchFromGitHub {
+    owner = "expo";
+    repo = "eas-cli";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-h7LohShs4j9Z7Mbe6MSMqfszrEPBcGeTpB+ma3iBXyM=";
+  };
+
+  packageJson = finalAttrs.src + "/packages/eas-cli/package.json";
+
+  yarnOfflineCache = fetchYarnDeps {
+    yarnLock = finalAttrs.src + "/yarn.lock"; # Point to the root lockfile
+    hash = "sha256-pnp9MI2S5v4a7KftxYC3Sgc487vooX8+7lmYkmRTWWs=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+    jq
+  ];
+
+  # Add version field to package.json to prevent yarn pack from failing
+  preInstall = ''
+    echo "Adding version field to package.json"
+    jq '. + {version: "${finalAttrs.version}"}' package.json > package.json.tmp
+    mv package.json.tmp package.json
+  '';
+
+  postInstall = ''
+    echo "Creating symlink for eas-cli binary"
+    mkdir -p $out/bin
+    ln -sf $out/lib/node_modules/eas-cli-root/packages/eas-cli/bin/run $out/bin/eas
+    chmod +x $out/bin/eas
+  '';
+
+  meta = {
+    changelog = "https://github.com/expo/eas-cli/releases/tag/v${finalAttrs.version}";
+    description = "EAS command line tool from submodule";
+    homepage = "https://github.com/expo/eas-cli";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ zestsystem ];
+  };
+})
@@ -16,13 +16,13 @@

 stdenv.mkDerivation rec {
  pname = "folio";
-  version = "24.14";
+  version = "25.01";

  src = fetchFromGitHub {
    owner = "toolstack";
    repo = "Folio";
    tag = version;
-    hash = "sha256-A0vUM6oIchpC/1NEjPmZkT2/f/CmEWmPsMHQrGkDKXQ=";
+    hash = "sha256-EfZMHoF6xyRaxrLDLkBb07fvUxSQFDFViQJ2y68YhZg=";
  };

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

 buildDotnetModule rec {
  pname = "garnet";
-  version = "1.0.53";
+  version = "1.0.54";

  src = fetchFromGitHub {
    owner = "microsoft";
    repo = "garnet";
    tag = "v${version}";
-    hash = "sha256-04USuwfoACJdEQ98DCzUKBVAyoGhTn1dHgVHw38xaWY=";
+    hash = "sha256-tTJz4LilzrSDDmsTwRRK3Svif3ewUWuU3nbUN8GyyPY=";
  };

  projectFile = "main/GarnetServer/GarnetServer.csproj";
@@ -9,13 +9,13 @@

 stdenv.mkDerivation rec {
  pname = "gcfflasher";
-  version = "4.5.2";
+  version = "4.6.0";

  src = fetchFromGitHub {
    owner = "dresden-elektronik";
    repo = pname;
    tag = "v${version}";
-    hash = "sha256-jBKYKjsog0vfyrPoixqTifej5Kb+qYS11Tn+il3J0w0=";
+    hash = "sha256-z7FsxTAsAmjz76NxbqZuecN1ywAZYHhgcPfOe6y5QNQ=";
  };

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

 rustPlatform.buildRustPackage rec {
  pname = "hayagriva";
-  version = "0.8.0";
+  version = "0.8.1";

  src = fetchCrate {
    inherit pname version;
-    hash = "sha256-B0q5jwJVDpxywTuSspsfDameDfEkok5oTz/Oty9LkOI=";
+    hash = "sha256-JZfkYrb4Gn6oP+kcFj7kC10r1aSddigGZPRx18pr5Gg=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-1YCmPGxDDnZmty8vMDUec45ZYXZbFA8GAT6UJQxa/4M=";
+  cargoHash = "sha256-2KlZTOp78HITJMRLNzw1bTUQSYeg5SmquRJWwwG3Xfw=";

  buildFeatures = [ "cli" ];

@@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "hcledit";
-  version = "0.2.15";
+  version = "0.2.16";

  src = fetchFromGitHub {
    owner = "minamijoyo";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-EJSV7CsxnRCsVcqsJcImqeELdeg6Mnf7N6S9TlMbTaE=";
+    hash = "sha256-ULoqb9+GQB+Rg5p/Lqa1gHvZDDAmcfNE6FOK/R5mVK8=";
  };

-  vendorHash = "sha256-G6jmdosQHBA+n7MgVAlzdSTqPYb5d+k4b4EzAI384FQ=";
+  vendorHash = "sha256-V7Ppb5u6to8bc0TWgJirC04N9lMOYav/dgEPWHzvGro=";

  meta = with lib; {
    description = "Command line editor for HCL";
@@ -14,7 +14,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "i2p";
-  version = "2.7.0";
+  version = "2.8.0";

  src = fetchzip {
    urls =
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
        "https://files.i2p-projekt.de/"
        "https://download.i2p2.no/releases/"
      ]);
-    hash = "sha256-gw1i6jrmTfz9CZlCjtOUdH5R4vD57ysDeQxyyWifieg=";
+    hash = "sha256-Gw60l6aB9EcDxWowSHUF8LIoxs5bYamJYTVGKQI2V80=";
  };

  strictDeps = true;
@@ -33,11 +33,16 @@ stdenv.mkDerivation rec {
    "dev"
  ];

-  configureFlags = [
-    "--enable-optional-progs"
-    "--enable-libkeymap"
-    "--disable-nls"
-  ];
+  configureFlags =
+    [
+      "--enable-optional-progs"
+      "--enable-libkeymap"
+      "--disable-nls"
+    ]
+    ++ lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [
+      "ac_cv_func_malloc_0_nonnull=yes"
+      "ac_cv_func_realloc_0_nonnull=yes"
+    ];

  patches = [
    ./search-paths.patch
@@ -24,11 +24,11 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "keycloak";
-  version = "26.1.0";
+  version = "26.1.1";

  src = fetchzip {
    url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
-    hash = "sha256-5Us/cBH10SnO6wiggmwg6V7u4FKoLd1V0x8Z4GNDaXc=";
+    hash = "sha256-glBfG/j9J3ZjTTmMrNIbJhHUUIOV0Kardc5P3ohT98Y=";
  };

  nativeBuildInputs = [
@@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "kubecm";
-  version = "0.32.2";
+  version = "0.32.3";

  src = fetchFromGitHub {
    owner = "sunny0826";
    repo = "kubecm";
    rev = "v${version}";
-    hash = "sha256-cW96teV0k0MJq6WJ37Ao4tDOOsB48uU2+WTD07n5EuQ=";
+    hash = "sha256-z0uQhAfyrK2LKs4hwnHGE7hKQwhLGCmp7yN58ehDn/w=";
  };

-  vendorHash = "sha256-Fr31wLvzIoN2wIU2EmUrsqiMcPpdJpQI3ZfB//JYIXE=";
+  vendorHash = "sha256-2GFZ++7H0ii+9WJKPxtDBHikJTQQyDFqJ6qzwVvA84g=";
  ldflags = [
    "-s"
    "-w"
@@ -9,16 +9,16 @@

 buildGoModule rec {
  pname = "kubeone";
-  version = "1.9.1";
+  version = "1.9.2";

  src = fetchFromGitHub {
    owner = "kubermatic";
    repo = "kubeone";
    rev = "v${version}";
-    hash = "sha256-k/okEg9jiLyVn1v3zeduSJ2dY8xWppH5V8L7rud4/H8=";
+    hash = "sha256-pMY86Ucp5nuH63YgAh60l3WZYDPvM8LcTaV9QS2BzAA=";
  };

-  vendorHash = "sha256-gwyY6g//uEvvzChLQrTKlzq9REMUIXVjIDZXBMOHNO8=";
+  vendorHash = "sha256-dvsq2idsLmo1Tc8kfg3pJKNIMosrAMXN1fxvayS7glQ=";

  ldflags = [
    "-s"
@@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromGitHub {
    owner = "leanprover";
    repo = "lean4";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
    hash = "sha256-RdFTxLk0Yahwhu/oQeTappvWnUtnim63dxN7gmU8Jt8=";
  };

  postPatch = ''
    substituteInPlace src/CMakeLists.txt \
-      --replace-fail 'set(GIT_SHA1 "")' 'set(GIT_SHA1 "${finalAttrs.src.rev}")'
+      --replace-fail 'set(GIT_SHA1 "")' 'set(GIT_SHA1 "${finalAttrs.src.tag}")'

    # Remove tests that fails in sandbox.
    # It expects `sourceRoot` to be a git repository.
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
  meta = with lib; {
    description = "Automatic and interactive theorem prover";
    homepage = "https://leanprover.github.io/";
-    changelog = "https://github.com/leanprover/lean4/blob/${finalAttrs.src.rev}/RELEASES.md";
+    changelog = "https://github.com/leanprover/lean4/blob/${finalAttrs.src.tag}/RELEASES.md";
    license = licenses.asl20;
    platforms = platforms.all;
    maintainers = with maintainers; [
@@ -13,9 +13,10 @@
  sqlite,
  libiconv,
  zlib,
+  testers,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "libspatialite";
  version = "5.1.0";

@@ -25,7 +26,7 @@ stdenv.mkDerivation rec {
  ];

  src = fetchurl {
-    url = "https://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${version}.tar.gz";
+    url = "https://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${finalAttrs.version}.tar.gz";
    hash = "sha256-Q74t00na/+AW3RQAxdEShYKMIv6jXKUQnyHz7VBgUIA=";
  };

@@ -36,6 +37,11 @@ stdenv.mkDerivation rec {
    ./xmlNanoHTTPCleanup.patch
  ];

+  postPatch = lib.optionalString (!stdenv.hostPlatform.isStatic) ''
+    substituteInPlace spatialite.pc.in \
+      --replace-fail "@LIBS@ @LIBXML2_LIBS@ @SQLITE3_LIBS@ -lm" ""
+  '';
+
  nativeBuildInputs = [
    pkg-config
    validatePkgConfig
@@ -73,16 +79,21 @@ stdenv.mkDerivation rec {
    export DYLD_LIBRARY_PATH=$(pwd)/src/.libs
  '';

-  meta = with lib; {
+  passthru.tests = {
+    pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
    description = "Extensible spatial index library in C++";
    homepage = "https://www.gaia-gis.it/fossil/libspatialite";
    # They allow any of these
-    license = with licenses; [
+    license = with lib.licenses; [
      gpl2Plus
      lgpl21Plus
      mpl11
    ];
-    platforms = platforms.unix;
-    maintainers = with maintainers; teams.geospatial.members ++ [ dotlambda ];
+    pkgConfigModules = [ "spatialite" ];
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; lib.teams.geospatial.members ++ [ dotlambda ];
  };
-}
+})
@@ -8,7 +8,7 @@
  darwin,
 }:
 let
-  version = "0.19.0";
+  version = "0.19.2";
 in
 rustPlatform.buildRustPackage {
  pname = "markuplinkchecker";
@@ -18,11 +18,11 @@ rustPlatform.buildRustPackage {
    owner = "becheran";
    repo = "mlc";
    rev = "v${version}";
-    hash = "sha256-Nh+P5+dvl2gBQuvo0iKjsJgz/2OYQqAWSIJBzE7yO6I=";
+    hash = "sha256-NsGgUAe8CYAZhQMR/Jg+MGGKmL2ziFqK+MalrDSLcJQ=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-CVfp87b/oTfZ3uXySTqrPnXDDRSSupXRUBJLzT3ZWDY=";
+  cargoHash = "sha256-4H5dsLOggB/KlDcZ/eCxZxreczkg5rXsGyCO9P+OLvw=";

  nativeBuildInputs = [ pkg-config ];

@@ -9,11 +9,11 @@

 stdenv.mkDerivation rec {
  pname = "micronaut";
-  version = "4.7.4";
+  version = "4.7.5";

  src = fetchzip {
    url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip";
-    sha256 = "sha256-R/7ozlbx7WAX7rLdhgckJGt9troBj+0rFcFDBz6eZiM=";
+    sha256 = "sha256-Bm2K3xXT/2+0YD2NizKraKZDs7Suv3GTS3B2bOseE9Q=";
  };

  nativeBuildInputs = [
@@ -6,14 +6,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "modelscan";
-  version = "0.8.3";
+  version = "0.8.4";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "protectai";
    repo = "modelscan";
    tag = "v${version}";
-    hash = "sha256-MhwXarjIHZgSC7G7+XevVyCflM/SiaNagJMhzLvs1Uc=";
+    hash = "sha256-tpxonfkdqPNLQQPjn+uIYSEzpXfeoRk4PG14cXR+tS8=";
  };

  build-system = with python3.pkgs; [
@@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "namespace-cli";
-  version = "0.0.400";
+  version = "0.0.402";

  src = fetchFromGitHub {
    owner = "namespacelabs";
    repo = "foundation";
    rev = "v${version}";
-    hash = "sha256-fsvyMel2OJZNkRJoBBZ4ibP6nX0r8ypFXGNA3A8YJ+M=";
+    hash = "sha256-1QqBfi9OL2b+mR2ubtErVtIFXIK95vO9WrzrdZWqqAo=";
  };

-  vendorHash = "sha256-b8er/iF7Dqq+BAulzE/tUebNeKmTMilc+a0yCAJ5E/0=";
+  vendorHash = "sha256-narbmKAmVFtTR8JkGkem8aHScoXiZ+0V+3a9Vkd7BSA=";

  subPackages = [
    "cmd/nsc"
@@ -6,13 +6,13 @@

 stdenvNoCC.mkDerivation rec {
  pname = "nu_scripts";
-  version = "0-unstable-2025-01-17";
+  version = "0-unstable-2025-02-03";

  src = fetchFromGitHub {
    owner = "nushell";
    repo = pname;
-    rev = "fd686c0b0c10e284b1da72d6c3c42ab28c7504a7";
-    hash = "sha256-nO7Dyg1ZxjSInkWW+kHa32H0P1CQ6vc6ODLLTj2abcI=";
+    rev = "b45fd953c171bda74d8e201ce6822570467c1d68";
+    hash = "sha256-V+mCYfABDh2K/wVYX00ZtcxeSZOJe+9TlDLeoxaXJpM=";
  };

  installPhase = ''
@@ -12,17 +12,17 @@ let
 in
 rustPlatform.buildRustPackage rec {
  pname = "railway";
-  version = "3.20.2";
+  version = "3.21.0";

  src = fetchFromGitHub {
    owner = "railwayapp";
    repo = "cli";
    rev = "v${version}";
-    hash = "sha256-AFcgONdWHHIK4/3zON6PRJaTXEXiE/0/Ha2rZpABiyw=";
+    hash = "sha256-Y5kyf/F1Icf1GVkPY1pYTaMvh5IE07CgTuwy9KHQQjM=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-5+iUvAUqQZKm5uLYyVN+2Uoz/4htdgowDJZPY47AkOA=";
+  cargoHash = "sha256-a+b49uaqKvmdbV0XHT+qYy9weO3vhs2Jkaht5a74qGU=";

  nativeBuildInputs = [ pkg-config ];

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

 rustPlatform.buildRustPackage rec {
  pname = "rippkgs";
-  version = "1.1.1";
+  version = "1.1.2";

  src = fetchFromGitHub {
    owner = "replit";
    repo = "rippkgs";
    tag = "v${version}";
-    hash = "sha256-k50q78ycjrFVFTDstTdOLF8aJjsUpQ3lFRbFD1nL8xM=";
+    hash = "sha256-CQGmTXzAj3wA7UTwdeL7gujbT4duS8QE5yZzGKwvzog=";
  };

  useFetchCargoVendor = true;
@@ -8,17 +8,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "sendme";
-  version = "0.22.0";
+  version = "0.23.0";

  src = fetchFromGitHub {
    owner = "n0-computer";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-f3OgG6PTv9UUT5Gn1hBTHRIATrlvzBz1pjJ6fuWiCXM=";
+    hash = "sha256-CLkzcHkQ/FngBc3VvQVnsZNYOHru2LKgQfcd6zlwSdc=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-OcZkjjAUIWvTyzKEscT6q+fUWGC2X34Lxk34kzMZ6rY=";
+  cargoHash = "sha256-m59piYO8zaP2aFNgzZrR47G319blvUerlcCMWlhevwc=";

  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
    with darwin.apple_sdk.frameworks;
@@ -11,7 +11,7 @@
  libXxf86vm,
 }:
 let
-  version = "4.15.7";
+  version = "4.15.8";

  desktopItem = makeDesktopItem {
    name = "unciv";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
-    hash = "sha256-5EA4AaHP0RsceiCbXkwPrAiSH62xshVS8E9c68gTk+c=";
+    hash = "sha256-Ytov2n7XieMQtc0C0uvMzpamLHhhTEtkKSfoU88Mlaw=";
  };

  dontUnpack = true;
@@ -9,12 +9,12 @@

 stdenv.mkDerivation rec {
  pname = "unifi-controller";
-  version = "9.0.108";
+  version = "9.0.114";

  # see https://community.ui.com/releases / https://www.ui.com/download/unifi
  src = fetchurl {
    url = "https://dl.ui.com/unifi/${version}/unifi_sysvinit_all.deb";
-    hash = "sha256-p+t4W8mR+CtmSXZqxpP1U55iHhKz7sXcL3Pu+0peNrU=";
+    hash = "sha256-3xumIIzr+tx60kPhPfSs2Kz2iJ39Kt5934Vca/MpUu4=";
  };

  nativeBuildInputs = [ dpkg ];
@@ -14,13 +14,13 @@

 stdenv.mkDerivation {
  pname = "urn-timer";
-  version = "0-unstable-2024-03-05";
+  version = "0-unstable-2025-02-02";

  src = fetchFromGitHub {
    owner = "paoloose";
    repo = "urn";
-    rev = "10082428749fabb69db1556f19940d8700ce48a2";
-    hash = "sha256-sQjHQ/i1d4v4ZnM0YAay+MdIj5l/FfIYj+NdH48OqfU=";
+    rev = "124b411301f20d62b69832bbe1f7e6af2df85e9f";
+    hash = "sha256-7mSuu2eebKWlMPOQAHBTYRxEEkpygrfKK7C1Ts8py6U=";
  };

  nativeBuildInputs = [
@@ -20,6 +20,7 @@
  nixosTests,
  nix-update-script,
  darwin,
+  zlib,
 }:

 let
@@ -62,6 +63,7 @@ rustPlatform.buildRustPackage {
      rust-jemalloc-sys
      libiconv
      coreutils
+      zlib
    ];

  # Rust 1.80.0 introduced the unexepcted_cfgs lint, which requires crates to allowlist custom cfg options that they inspect.
@@ -6,17 +6,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "wgsl-analyzer";
-  version = "0.8.1";
+  version = "0.9.4";

  src = fetchFromGitHub {
    owner = "wgsl-analyzer";
    repo = "wgsl-analyzer";
    tag = "v${version}";
-    hash = "sha256-bhosTihbW89vkqp1ua0C1HGLJJdCNfRde98z4+IjkOc=";
+    hash = "sha256-su9ZhDeZSGcDT3Wnoh/Z9i+rCaApD9bJRAWTgvWdFHA=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-+SeVxobUh2o2xNVBgXf1AgGI6hpNkoDNzXcKfabKEVc=";
+  cargoHash = "sha256-yGA6qugaoN39mryICi6cYNnnVdh+QCc1bRQdAgqcxcQ=";

  checkFlags = [
    # Imports failures
@@ -16,13 +16,13 @@

 stdenv.mkDerivation rec {
  pname = "xwallpaper";
-  version = "0.7.5";
+  version = "0.7.6";

  src = fetchFromGitHub {
    owner = "stoeckmann";
    repo = "xwallpaper";
    rev = "v${version}";
-    sha256 = "sha256-smhqovPgDdSLhAwW1y/hnPjNwFcpIUocs3MKizdvZj0=";
+    sha256 = "sha256-8VRQFH00yXplvhCqBuMGrwvOB7bJhfe50Ii6h8kvDMM=";
  };

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

 stdenvNoCC.mkDerivation rec {
  pname = "numix-icon-theme";
-  version = "24.12.12";
+  version = "25.01.31";

  src = fetchFromGitHub {
    owner = "numixproject";
    repo = pname;
    rev = version;
-    sha256 = "sha256-oWMIT/mZ//+15hxGGy9r8mtjlZWMCooOMDJS8JZdcv0=";
+    sha256 = "sha256-LON73XRVZQxbEMJ32qKXU/TYf6Q8nWU9wms7eT/DHa8=";
  };

  nativeBuildInputs = [
@@ -1,8 +1,6 @@
 {
  lib,
  callPackage,
-  llvmPackages_13,
-  llvmPackages_15,
  llvmPackages_16,
  llvmPackages_17,
  llvmPackages_18,
@@ -10,14 +8,6 @@
 }:
 let
  versions = {
-    "0.9.1" = {
-      llvmPackages = llvmPackages_13;
-      hash = "sha256-x2c4c9RSrNWGqEngio4ArW7dJjW0gg+8nqBwPcR721k=";
-    };
-    "0.10.1" = {
-      llvmPackages = llvmPackages_15;
-      hash = "sha256-69QIkkKzApOGfrBdgtmxFMDytRkSh+0YiaJQPbXsBeo=";
-    };
    "0.11.0" = {
      llvmPackages = llvmPackages_16;
      hash = "sha256-iuU1fzkbJxI+0N1PiLQM013Pd1bzrgqkbIyTxo5gB2I=";
@@ -28,19 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
    inherit hash;
  };

-  patches =
-    args.patches or [ ]
-    ++ lib.optionals (lib.versions.majorMinor finalAttrs.version == "0.9") [
-      # Fix index out of bounds reading RPATH (cherry-picked from 0.10-dev)
-      ./patches/0.9-read-dynstr-at-rpath-offset.patch
-      # Fix build on macOS 13 (cherry-picked from 0.10-dev)
-      ./patches/0.9-bump-macos-supported-version.patch
-    ]
-    ++
-      lib.optional (lib.versions.majorMinor finalAttrs.version == "0.10")
-        # Backport alignment related panics from zig-master to 0.10.
-        # Upstream issue: https://github.com/ziglang/zig/issues/14559
-        ./patches/0.10-macho-fixes.patch;
+  patches = args.patches or [ ];

  nativeBuildInputs = [
    cmake
@@ -69,7 +57,8 @@ stdenv.mkDerivation (finalAttrs: {

  outputs = [
    "out"
-  ] ++ lib.optional (lib.versionAtLeast finalAttrs.version "0.10") "doc";
+    "doc"
+  ];

  # strictDeps breaks zig when clang is being used.
  # https://github.com/NixOS/nixpkgs/issues/317055#issuecomment-2148438395
@@ -108,28 +97,20 @@ stdenv.mkDerivation (finalAttrs: {
      ''
        stage3/bin/zig build langref
      ''
-    else if lib.versionAtLeast finalAttrs.version "0.11" then
+    else
      ''
        stage3/bin/zig run ../tools/docgen.zig -- ../doc/langref.html.in langref.html --zig $PWD/stage3/bin/zig
-      ''
-    else if lib.versionAtLeast finalAttrs.version "0.10" then
-      ''
-        ./zig2 run ../doc/docgen.zig -- ./zig2 ../doc/langref.html.in langref.html
-      ''
-    else
-      null;
+      '';

  postInstall =
    if lib.versionAtLeast finalAttrs.version "0.13" then
      ''
        install -Dm444 ../zig-out/doc/langref.html -t $doc/share/doc/zig-${finalAttrs.version}/html
      ''
-    else if lib.versionAtLeast finalAttrs.version "0.10" then
+    else
      ''
        install -Dm444 langref.html -t $doc/share/doc/zig-${finalAttrs.version}/html
-      ''
-    else
-      null;
+      '';

  doInstallCheck = true;
  installCheckPhase = ''
@@ -1,367 +0,0 @@
-From 405801d8a8be734425eca4f3eebc56287804ac93 Mon Sep 17 00:00:00 2001
-From: Jakub Konka <kubkon@jakubkonka.com>
-Date: Sun, 5 Feb 2023 10:04:34 +0100
-Subject: [PATCH] macho: temp fix alignment and enable some logs
-
---
- src/link/MachO/Object.zig  | 80 ++++++++++++++++++++++++++------------
- src/link/MachO/ZldAtom.zig | 29 +++++++-------
- src/link/MachO/zld.zig     | 22 +++++------
- 3 files changed, 79 insertions(+), 52 deletions(-)
-
-diff --git a/src/link/MachO/Object.zig b/src/link/MachO/Object.zig
-index 401184da515..05638c1f858 100644
--- a/src/link/MachO/Object.zig
-+++ b/src/link/MachO/Object.zig
-@@ -54,12 +54,18 @@ atom_by_index_table: []AtomIndex = undefined,
- /// Can be undefined as set together with in_symtab.
- globals_lookup: []i64 = undefined,
- 
-+/// All relocs sorted and flattened.
-+relocs: std.ArrayListUnmanaged(macho.relocation_info) = .{},
-+sect_relocs_lookup: std.ArrayListUnmanaged(u32) = .{},
-+
- atoms: std.ArrayListUnmanaged(AtomIndex) = .{},
- 
- pub fn deinit(self: *Object, gpa: Allocator) void {
-     self.atoms.deinit(gpa);
-     gpa.free(self.name);
-     gpa.free(self.contents);
-+    self.relocs.deinit(gpa);
-+    self.sect_relocs_lookup.deinit(gpa);
-     if (self.in_symtab) |_| {
-         gpa.free(self.source_symtab_lookup);
-         gpa.free(self.source_address_lookup);
-@@ -101,6 +107,10 @@ pub fn parse(self: *Object, allocator: Allocator, cpu_arch: std.Target.Cpu.Arch)
-         return error.MismatchedCpuArchitecture;
-     }
- 
-+    const nsects = self.getSourceSections().len;
-+    try self.sect_relocs_lookup.resize(allocator, nsects);
-+    mem.set(u32, self.sect_relocs_lookup.items, 0);
-+
-     var it = LoadCommandIterator{
-         .ncmds = self.header.ncmds,
-         .buffer = self.contents[@sizeOf(macho.mach_header_64)..][0..self.header.sizeofcmds],
-@@ -110,13 +120,11 @@ pub fn parse(self: *Object, allocator: Allocator, cpu_arch: std.Target.Cpu.Arch)
-             .SYMTAB => {
-                 const symtab = cmd.cast(macho.symtab_command).?;
-                 self.in_symtab = @ptrCast(
-                    [*]const macho.nlist_64,
-                    @alignCast(@alignOf(macho.nlist_64), &self.contents[symtab.symoff]),
-+                    [*]align(1) const macho.nlist_64,
-+                    self.contents.ptr + symtab.symoff,
-                 )[0..symtab.nsyms];
-                 self.in_strtab = self.contents[symtab.stroff..][0..symtab.strsize];
- 
-                const nsects = self.getSourceSections().len;
-
-                 self.symtab = try allocator.alloc(macho.nlist_64, self.in_symtab.?.len + nsects);
-                 self.source_symtab_lookup = try allocator.alloc(u32, self.in_symtab.?.len);
-                 self.strtab_lookup = try allocator.alloc(u32, self.in_symtab.?.len);
-@@ -192,6 +200,17 @@ const SymbolAtIndex = struct {
-         return mem.sliceTo(@ptrCast([*:0]const u8, ctx.in_strtab.?.ptr + off), 0);
-     }
- 
-+    fn getSymbolSeniority(self: SymbolAtIndex, ctx: Context) u2 {
-+        const sym = self.getSymbol(ctx);
-+        if (!sym.ext()) {
-+            const sym_name = self.getSymbolName(ctx);
-+            if (mem.startsWith(u8, sym_name, "l") or mem.startsWith(u8, sym_name, "L")) return 0;
-+            return 1;
-+        }
-+        if (sym.weakDef() or sym.pext()) return 2;
-+        return 3;
-+    }
-+
-     /// Performs lexicographic-like check.
-     /// * lhs and rhs defined
-     ///   * if lhs == rhs
-@@ -206,23 +225,15 @@ const SymbolAtIndex = struct {
-         if (lhs.sect() and rhs.sect()) {
-             if (lhs.n_value == rhs.n_value) {
-                 if (lhs.n_sect == rhs.n_sect) {
-                    if (lhs.ext() and rhs.ext()) {
-                        if ((lhs.pext() or lhs.weakDef()) and (rhs.pext() or rhs.weakDef())) {
-                            return false;
-                        } else return rhs.pext() or rhs.weakDef();
-                    } else {
-                        const lhs_name = lhs_index.getSymbolName(ctx);
-                        const lhs_temp = mem.startsWith(u8, lhs_name, "l") or mem.startsWith(u8, lhs_name, "L");
-                        const rhs_name = rhs_index.getSymbolName(ctx);
-                        const rhs_temp = mem.startsWith(u8, rhs_name, "l") or mem.startsWith(u8, rhs_name, "L");
-                        if (lhs_temp and rhs_temp) {
-                            return false;
-                        } else return rhs_temp;
-                    }
-+                    const lhs_senior = lhs_index.getSymbolSeniority(ctx);
-+                    const rhs_senior = rhs_index.getSymbolSeniority(ctx);
-+                    if (lhs_senior == rhs_senior) {
-+                        return lessThanByNStrx(ctx, lhs_index, rhs_index);
-+                    } else return lhs_senior < rhs_senior;
-                 } else return lhs.n_sect < rhs.n_sect;
-             } else return lhs.n_value < rhs.n_value;
-         } else if (lhs.undf() and rhs.undf()) {
-            return false;
-+            return lessThanByNStrx(ctx, lhs_index, rhs_index);
-         } else return rhs.undf();
-     }
- 
-@@ -393,6 +404,16 @@ pub fn splitIntoAtoms(self: *Object, zld: *Zld, object_id: u31) !void {
-             zld.sections.items(.header)[out_sect_id].sectName(),
-         });
- 
-+        // Parse all relocs for the input section, and sort in descending order.
-+        // Previously, I have wrongly assumed the compilers output relocations for each
-+        // section in a sorted manner which is simply not true.
-+        const start = @intCast(u32, self.relocs.items.len);
-+        if (self.getSourceRelocs(section.header)) |relocs| {
-+            try self.relocs.appendUnalignedSlice(gpa, relocs);
-+            std.sort.sort(macho.relocation_info, self.relocs.items[start..], {}, relocGreaterThan);
-+        }
-+        self.sect_relocs_lookup.items[section.id] = start;
-+
-         const cpu_arch = zld.options.target.cpu.arch;
-         const sect_loc = filterSymbolsBySection(symtab[sect_sym_index..], sect_id + 1);
-         const sect_start_index = sect_sym_index + sect_loc.index;
-@@ -559,7 +580,7 @@ pub fn getSourceSections(self: Object) []const macho.section_64 {
-     } else unreachable;
- }
- 
-pub fn parseDataInCode(self: Object) ?[]const macho.data_in_code_entry {
-+pub fn parseDataInCode(self: Object) ?[]align(1) const macho.data_in_code_entry {
-     var it = LoadCommandIterator{
-         .ncmds = self.header.ncmds,
-         .buffer = self.contents[@sizeOf(macho.mach_header_64)..][0..self.header.sizeofcmds],
-@@ -569,10 +590,7 @@ pub fn parseDataInCode(self: Object) ?[]const macho.data_in_code_entry {
-             .DATA_IN_CODE => {
-                 const dice = cmd.cast(macho.linkedit_data_command).?;
-                 const ndice = @divExact(dice.datasize, @sizeOf(macho.data_in_code_entry));
-                return @ptrCast(
-                    [*]const macho.data_in_code_entry,
-                    @alignCast(@alignOf(macho.data_in_code_entry), &self.contents[dice.dataoff]),
-                )[0..ndice];
-+                return @ptrCast([*]align(1) const macho.data_in_code_entry, self.contents.ptr + dice.dataoff)[0..ndice];
-             },
-             else => {},
-         }
-@@ -632,11 +650,23 @@ pub fn getSectionAliasSymbolPtr(self: *Object, sect_id: u8) *macho.nlist_64 {
-     return &self.symtab[self.getSectionAliasSymbolIndex(sect_id)];
- }
- 
-pub fn getRelocs(self: Object, sect: macho.section_64) []align(1) const macho.relocation_info {
-    if (sect.nreloc == 0) return &[0]macho.relocation_info{};
-+fn getSourceRelocs(self: Object, sect: macho.section_64) ?[]align(1) const macho.relocation_info {
-+    if (sect.nreloc == 0) return null;
-     return @ptrCast([*]align(1) const macho.relocation_info, self.contents.ptr + sect.reloff)[0..sect.nreloc];
- }
- 
-+pub fn getRelocs(self: Object, sect_id: u16) []const macho.relocation_info {
-+    const sect = self.getSourceSection(sect_id);
-+    const start = self.sect_relocs_lookup.items[sect_id];
-+    const len = sect.nreloc;
-+    return self.relocs.items[start..][0..len];
-+}
-+
-+fn relocGreaterThan(ctx: void, lhs: macho.relocation_info, rhs: macho.relocation_info) bool {
-+    _ = ctx;
-+    return lhs.r_address > rhs.r_address;
-+}
-+
- pub fn getSymbolName(self: Object, index: u32) []const u8 {
-     const strtab = self.in_strtab.?;
-     const sym = self.symtab[index];
-diff --git a/src/link/MachO/ZldAtom.zig b/src/link/MachO/ZldAtom.zig
-index 817aa816625..b42309598d7 100644
--- a/src/link/MachO/ZldAtom.zig
-+++ b/src/link/MachO/ZldAtom.zig
-@@ -465,7 +465,7 @@ pub fn resolveRelocs(
-     zld: *Zld,
-     atom_index: AtomIndex,
-     atom_code: []u8,
-    atom_relocs: []align(1) const macho.relocation_info,
-+    atom_relocs: []const macho.relocation_info,
-     reverse_lookup: []u32,
- ) !void {
-     const arch = zld.options.target.cpu.arch;
-@@ -540,7 +540,7 @@ fn resolveRelocsArm64(
-     zld: *Zld,
-     atom_index: AtomIndex,
-     atom_code: []u8,
-    atom_relocs: []align(1) const macho.relocation_info,
-+    atom_relocs: []const macho.relocation_info,
-     reverse_lookup: []u32,
-     context: RelocContext,
- ) !void {
-@@ -579,7 +579,6 @@ fn resolveRelocsArm64(
-         }
- 
-         const target = parseRelocTarget(zld, atom_index, rel, reverse_lookup);
-        const rel_offset = @intCast(u32, rel.r_address - context.base_offset);
- 
-         log.debug("  RELA({s}) @ {x} => %{d} ('{s}') in object({?})", .{
-             @tagName(rel_type),
-@@ -589,6 +588,7 @@ fn resolveRelocsArm64(
-             target.file,
-         });
- 
-+        const rel_offset = @intCast(u32, rel.r_address - context.base_offset);
-         const source_addr = blk: {
-             const source_sym = zld.getSymbol(atom.getSymbolWithLoc());
-             break :blk source_sym.n_value + rel_offset;
-@@ -596,7 +596,7 @@ fn resolveRelocsArm64(
-         const is_tlv = is_tlv: {
-             const source_sym = zld.getSymbol(atom.getSymbolWithLoc());
-             const header = zld.sections.items(.header)[source_sym.n_sect - 1];
-            break :is_tlv header.@"type"() == macho.S_THREAD_LOCAL_VARIABLES;
-+            break :is_tlv header.type() == macho.S_THREAD_LOCAL_VARIABLES;
-         };
-         const target_addr = try getRelocTargetAddress(zld, rel, target, is_tlv);
- 
-@@ -831,7 +831,7 @@ fn resolveRelocsX86(
-     zld: *Zld,
-     atom_index: AtomIndex,
-     atom_code: []u8,
-    atom_relocs: []align(1) const macho.relocation_info,
-+    atom_relocs: []const macho.relocation_info,
-     reverse_lookup: []u32,
-     context: RelocContext,
- ) !void {
-@@ -877,7 +877,7 @@ fn resolveRelocsX86(
-         const is_tlv = is_tlv: {
-             const source_sym = zld.getSymbol(atom.getSymbolWithLoc());
-             const header = zld.sections.items(.header)[source_sym.n_sect - 1];
-            break :is_tlv header.@"type"() == macho.S_THREAD_LOCAL_VARIABLES;
-+            break :is_tlv header.type() == macho.S_THREAD_LOCAL_VARIABLES;
-         };
- 
-         log.debug("    | source_addr = 0x{x}", .{source_addr});
-@@ -1015,27 +1015,24 @@ pub fn getAtomCode(zld: *Zld, atom_index: AtomIndex) []const u8 {
-     return code[offset..][0..code_len];
- }
- 
-pub fn getAtomRelocs(zld: *Zld, atom_index: AtomIndex) []align(1) const macho.relocation_info {
-+pub fn getAtomRelocs(zld: *Zld, atom_index: AtomIndex) []const macho.relocation_info {
-     const atom = zld.getAtomPtr(atom_index);
-     assert(atom.getFile() != null); // Synthetic atom shouldn't need to unique for relocs.
-     const object = zld.objects.items[atom.getFile().?];
- 
-    const source_sect = if (object.getSourceSymbol(atom.sym_index)) |source_sym| blk: {
-        const source_sect = object.getSourceSection(source_sym.n_sect - 1);
-        assert(!source_sect.isZerofill());
-        break :blk source_sect;
-+    const source_sect_id = if (object.getSourceSymbol(atom.sym_index)) |source_sym| blk: {
-+        break :blk source_sym.n_sect - 1;
-     } else blk: {
-         // If there was no matching symbol present in the source symtab, this means
-         // we are dealing with either an entire section, or part of it, but also
-         // starting at the beginning.
-         const nbase = @intCast(u32, object.in_symtab.?.len);
-         const sect_id = @intCast(u16, atom.sym_index - nbase);
-        const source_sect = object.getSourceSection(sect_id);
-        assert(!source_sect.isZerofill());
-        break :blk source_sect;
-+        break :blk sect_id;
-     };
-
-    const relocs = object.getRelocs(source_sect);
-+    const source_sect = object.getSourceSection(source_sect_id);
-+    assert(!source_sect.isZerofill());
-+    const relocs = object.getRelocs(source_sect_id);
- 
-     if (atom.cached_relocs_start == -1) {
-         const indexes = if (object.getSourceSymbol(atom.sym_index)) |source_sym| blk: {
-diff --git a/src/link/MachO/zld.zig b/src/link/MachO/zld.zig
-index 3a2ea79c6ec..cee3f302c08 100644
--- a/src/link/MachO/zld.zig
-+++ b/src/link/MachO/zld.zig
-@@ -396,7 +396,7 @@ pub const Zld = struct {
-                 break :blk null;
-             }
- 
-            switch (sect.@"type"()) {
-+            switch (sect.type()) {
-                 macho.S_4BYTE_LITERALS,
-                 macho.S_8BYTE_LITERALS,
-                 macho.S_16BYTE_LITERALS,
-@@ -1701,7 +1701,7 @@ pub const Zld = struct {
-                             break :outer;
-                         }
-                     }
-                    switch (header.@"type"()) {
-+                    switch (header.type()) {
-                         macho.S_NON_LAZY_SYMBOL_POINTERS => {
-                             try self.writeGotPointer(count, buffer.writer());
-                         },
-@@ -1718,7 +1718,7 @@ pub const Zld = struct {
-                                     break :outer;
-                                 }
-                             }
-                            if (header.@"type"() == macho.S_SYMBOL_STUBS) {
-+                            if (header.type() == macho.S_SYMBOL_STUBS) {
-                                 try self.writeStubCode(atom_index, count, buffer.writer());
-                             } else if (mem.eql(u8, header.sectName(), "__stub_helper")) {
-                                 try self.writeStubHelperCode(atom_index, buffer.writer());
-@@ -1802,7 +1802,7 @@ pub const Zld = struct {
-         for (slice.items(.header)) |*header, sect_id| {
-             if (header.size == 0) continue;
-             if (self.requiresThunks()) {
-                if (header.isCode() and !(header.@"type"() == macho.S_SYMBOL_STUBS) and !mem.eql(u8, header.sectName(), "__stub_helper")) continue;
-+                if (header.isCode() and !(header.type() == macho.S_SYMBOL_STUBS) and !mem.eql(u8, header.sectName(), "__stub_helper")) continue;
-             }
- 
-             var atom_index = slice.items(.first_atom_index)[sect_id];
-@@ -1830,7 +1830,7 @@ pub const Zld = struct {
-         if (self.requiresThunks()) {
-             for (slice.items(.header)) |header, sect_id| {
-                 if (!header.isCode()) continue;
-                if (header.@"type"() == macho.S_SYMBOL_STUBS) continue;
-+                if (header.type() == macho.S_SYMBOL_STUBS) continue;
-                 if (mem.eql(u8, header.sectName(), "__stub_helper")) continue;
- 
-                 // Create jump/branch range extenders if needed.
-@@ -1994,10 +1994,10 @@ pub const Zld = struct {
-         const section_precedence: u4 = blk: {
-             if (header.isCode()) {
-                 if (mem.eql(u8, "__text", header.sectName())) break :blk 0x0;
-                if (header.@"type"() == macho.S_SYMBOL_STUBS) break :blk 0x1;
-+                if (header.type() == macho.S_SYMBOL_STUBS) break :blk 0x1;
-                 break :blk 0x2;
-             }
-            switch (header.@"type"()) {
-+            switch (header.type()) {
-                 macho.S_NON_LAZY_SYMBOL_POINTERS,
-                 macho.S_LAZY_SYMBOL_POINTERS,
-                 => break :blk 0x0,
-@@ -2121,7 +2121,7 @@ pub const Zld = struct {
- 
-         // Finally, unpack the rest.
-         for (slice.items(.header)) |header, sect_id| {
-            switch (header.@"type"()) {
-+            switch (header.type()) {
-                 macho.S_LITERAL_POINTERS,
-                 macho.S_REGULAR,
-                 macho.S_MOD_INIT_FUNC_POINTERS,
-@@ -2252,7 +2252,7 @@ pub const Zld = struct {
-         // Finally, unpack the rest.
-         const slice = self.sections.slice();
-         for (slice.items(.header)) |header, sect_id| {
-            switch (header.@"type"()) {
-+            switch (header.type()) {
-                 macho.S_LITERAL_POINTERS,
-                 macho.S_REGULAR,
-                 macho.S_MOD_INIT_FUNC_POINTERS,
-@@ -2707,10 +2707,10 @@ pub const Zld = struct {
-     }
- 
-     fn filterDataInCode(
-        dices: []const macho.data_in_code_entry,
-+        dices: []align(1) const macho.data_in_code_entry,
-         start_addr: u64,
-         end_addr: u64,
-    ) []const macho.data_in_code_entry {
-+    ) []align(1) const macho.data_in_code_entry {
-         const Predicate = struct {
-             addr: u64,
- 
-
@@ -1,50 +0,0 @@
-From 98285b17b3887de37b630da66f09a44f42ddbe01 Mon Sep 17 00:00:00 2001
-From: Jakub Konka <kubkon@jakubkonka.com>
-Date: Tue, 25 Oct 2022 11:46:42 +0200
-Subject: [PATCH] darwin: bump max macOS version to 13.0
-
---
- lib/std/target.zig | 4 ++--
- src/target.zig     | 2 ++
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/lib/std/target.zig b/lib/std/target.zig
-index d791e3b0350..7fbad5baa3c 100644
--- a/lib/std/target.zig
-+++ b/lib/std/target.zig
-@@ -277,13 +277,13 @@ pub const Target = struct {
-                         .aarch64 => VersionRange{
-                             .semver = .{
-                                 .min = .{ .major = 11, .minor = 6 },
-                                .max = .{ .major = 12, .minor = 0 },
-+                                .max = .{ .major = 13, .minor = 0 },
-                             },
-                         },
-                         .x86_64 => VersionRange{
-                             .semver = .{
-                                 .min = .{ .major = 10, .minor = 13 },
-                                .max = .{ .major = 12, .minor = 0 },
-+                                .max = .{ .major = 13, .minor = 0 },
-                             },
-                         },
-                         else => unreachable,
-diff --git a/src/target.zig b/src/target.zig
-index 9e2d26dac65..fc585912c45 100644
--- a/src/target.zig
-+++ b/src/target.zig
-@@ -18,6 +18,7 @@ pub const available_libcs = [_]ArchOsAbi{
-     .{ .arch = .aarch64, .os = .windows, .abi = .gnu },
-     .{ .arch = .aarch64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 11, .minor = 0 } },
-     .{ .arch = .aarch64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 12, .minor = 0 } },
-+    .{ .arch = .aarch64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 13, .minor = 0 } },
-     .{ .arch = .armeb, .os = .linux, .abi = .gnueabi },
-     .{ .arch = .armeb, .os = .linux, .abi = .gnueabihf },
-     .{ .arch = .armeb, .os = .linux, .abi = .musleabi },
-@@ -73,6 +74,7 @@ pub const available_libcs = [_]ArchOsAbi{
-     .{ .arch = .x86_64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 10, .minor = 0 } },
-     .{ .arch = .x86_64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 11, .minor = 0 } },
-     .{ .arch = .x86_64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 12, .minor = 0 } },
-+    .{ .arch = .x86_64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 13, .minor = 0 } },
- };
- 
- pub fn libCGenericName(target: std.Target) [:0]const u8 {
@@ -1,39 +0,0 @@
-commit ebcdbd9b3c9d437780aee4d6af76bbd2ab32ea06
-Author: LeRoyce Pearson <contact@leroycepearson.dev>
-Date:   2022-07-17 16:01:22 -0600
-
-    Read dynstr starting at rpath offset
-    
-    Since we know the offset, we may as well read starting there. Still expects
-    rpath to fit in 4096 bytes; that might be worth fixing in the future.
-    
-    Fixes issue #12112
-
-diff --git a/lib/std/zig/system/NativeTargetInfo.zig b/lib/std/zig/system/NativeTargetInfo.zig
-index af41fc790579..ad0b6d5ce1e1 100644
--- a/lib/std/zig/system/NativeTargetInfo.zig
-+++ b/lib/std/zig/system/NativeTargetInfo.zig
-@@ -652,14 +652,19 @@ pub fn abiAndDynamicLinkerFromFile(
-             } else null;
- 
-             if (dynstr) |ds| {
-                const strtab_len = std.math.min(ds.size, strtab_buf.len);
-                const strtab_read_len = try preadMin(file, &strtab_buf, ds.offset, strtab_len);
-                const strtab = strtab_buf[0..strtab_read_len];
-                 // TODO this pointer cast should not be necessary
-                 const rpoff_usize = std.math.cast(usize, rpoff) catch |err| switch (err) {
-                     error.Overflow => return error.InvalidElfFile,
-                 };
-                const rpath_list = mem.sliceTo(std.meta.assumeSentinel(strtab[rpoff_usize..].ptr, 0), 0);
-+                if (rpoff_usize > ds.size) return error.InvalidElfFile;
-+                const rpoff_file = ds.offset + rpoff_usize;
-+                const rp_max_size = ds.size - rpoff_usize;
-+
-+                const strtab_len = std.math.min(rp_max_size, strtab_buf.len);
-+                const strtab_read_len = try preadMin(file, &strtab_buf, rpoff_file, strtab_len);
-+                const strtab = strtab_buf[0..strtab_read_len];
-+
-+                const rpath_list = mem.sliceTo(std.meta.assumeSentinel(strtab.ptr, 0), 0);
-                 var it = mem.tokenize(u8, rpath_list, ":");
-                 while (it.next()) |rpath| {
-                     var dir = fs.cwd().openDir(rpath, .{}) catch |err| switch (err) {
@@ -2,17 +2,20 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  fetchpatch,
  cmake,
  pkg-config,
  boost,
  curl,
+  cxxopts,
+  gdal,
  geos,
  libspatialite,
  luajit,
+  lz4,
  prime-server,
  protobuf,
  python3,
+  rapidjson,
  sqlite,
  zeromq,
  zlib,
@@ -21,35 +24,21 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "valhalla";
-  version = "3.4.0";
+  version = "3.5.1";

  src = fetchFromGitHub {
    owner = "valhalla";
    repo = "valhalla";
-    rev = finalAttrs.version;
-    hash = "sha256-1X9vsWsgnzmXn7bCMhN2PNwtfV0RRdzRFZIrQN2PLfA=";
+    tag = finalAttrs.version;
+    hash = "sha256-v/EwoJA1j8PuF9jOsmxQL6i+MT0rXbyLUE4HvBHUWDo=";
    fetchSubmodules = true;
  };

-  patches = [
-    # Fix build
-    (fetchpatch {
-      url = "https://github.com/valhalla/valhalla/commit/e4845b68e8ef8de9eabb359b23bf34c879e21f2b.patch";
-      hash = "sha256-xCufmXHGj1JxaMwm64JT9FPY+o0+x4glfJSYLdvHI8U=";
-    })
-
-    # Fix gcc-13 build:
-    #   https://github.com/valhalla/valhalla/pull/4154
-    (fetchpatch {
-      name = "gcc-13.patch";
-      url = "https://github.com/valhalla/valhalla/commit/ed93f30272377cc6803533a1bb94fe81d14af81c.patch";
-      hash = "sha256-w4pnOqk/Jj3unVuesE64QSecrUIVSqwK69t9xNVc4GA=";
-    })
-  ];
-
  postPatch = ''
    substituteInPlace src/bindings/python/CMakeLists.txt \
-      --replace "\''${Python_SITEARCH}" "${placeholder "out"}/${python3.sitePackages}"
+      --replace-fail "\''${Python_SITEARCH}" "${placeholder "out"}/${python3.sitePackages}"
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "rapidjson_include_dir rapidjson" "rapidjson_include_dir RapidJSON"
  '';

  nativeBuildInputs = [
@@ -58,35 +47,33 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  cmakeFlags = [
-    "-DENABLE_TESTS=OFF"
-    "-DENABLE_BENCHMARKS=OFF"
-  ];
-
-  env.NIX_CFLAGS_COMPILE = toString [
-    # Needed for date submodule with GCC 12 https://github.com/HowardHinnant/date/issues/750
-    "-Wno-error=stringop-overflow"
+    (lib.cmakeBool "BUILD_SHARED_LIBS" true)
+    (lib.cmakeBool "ENABLE_TESTS" false)
+    (lib.cmakeBool "ENABLE_SINGLE_FILES_WERROR" false)
+    (lib.cmakeBool "PREFER_EXTERNAL_DEPS" true)
  ];

  buildInputs = [
    boost
+    cxxopts
+    lz4
+    (python3.withPackages (ps: [ ps.pybind11 ]))
+    rapidjson
+    zeromq
+  ];
+
+  propagatedBuildInputs = [
    curl
+    gdal
    geos
    libspatialite
    luajit
    prime-server
    protobuf
-    python3
    sqlite
-    zeromq
    zlib
  ];

-  postFixup = ''
-    substituteInPlace "$out"/lib/pkgconfig/libvalhalla.pc \
-      --replace '=''${prefix}//' '=/' \
-      --replace '=''${exec_prefix}//' '=/'
-  '';
-
  passthru.tests = {
    pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
  };
@@ -7,7 +7,7 @@
 , platformToolsVersion ? "35.0.2"
 , buildToolsVersions ? [ "35.0.0" ]
 , includeEmulator ? false
-, emulatorVersion ? "35.1.4"
+, emulatorVersion ? "35.3.10"
 , platformVersions ? []
 , includeSources ? false
 , includeSystemImages ? false
@@ -150,16 +150,10 @@ rec {

    postInstall = ''
      ${linkPlugin { name = "platform-tools"; plugin = platform-tools; }}
-      ${linkPlugin { name = "patcher"; plugin = patcher; }}
      ${linkPlugin { name = "emulator"; plugin = emulator; check = includeEmulator; }}
    '';
  };

-  patcher = callPackage ./patcher.nix {
-    inherit deployAndroidPackage os;
-    package = packages.patcher."1";
-  };
-
  build-tools = map (version:
    callPackage ./build-tools.nix {
      inherit deployAndroidPackage os;
@@ -339,7 +333,6 @@ rec {
      # Symlink all requested plugins
      ${linkPlugin { name = "platform-tools"; plugin = platform-tools; }}
      ${linkPlugin { name = "tools"; plugin = tools; check = toolsVersion != null; }}
-      ${linkPlugin { name = "patcher"; plugin = patcher; }}
      ${linkPlugins { name = "build-tools"; plugins = build-tools; }}
      ${linkPlugin { name = "emulator"; plugin = emulator; check = includeEmulator; }}
      ${linkPlugins { name = "platforms"; plugins = platforms; }}
@@ -354,16 +347,16 @@ rec {
      # Link extras
      ${lib.concatMapStrings (identifier:
        let
-          path = addons.extras.${identifier}.path;
-          addon = deployAndroidPackage {
-            inherit os;
-            package = addons.extras.${identifier};
+          package = addons.extras.${identifier};
+          path = package.path;
+          extras = callPackage ./extras.nix {
+            inherit deployAndroidPackage package os;
          };
        in
        ''
          targetDir=$(dirname ${path})
          mkdir -p $targetDir
-          ln -s ${addon}/libexec/android-sdk/${path} $targetDir
+          ln -s ${extras}/libexec/android-sdk/${path} $targetDir
        '') includeExtras}

      # Expose common executables in bin/
@@ -134,7 +134,7 @@ pkgs.mkShell rec {

          packages=(
            "build-tools;35.0.0" "cmdline-tools;13.0" \
-            "emulator" "patcher;v4" "platform-tools" "platforms;android-35" \
+            "emulator" "platform-tools" "platforms;android-35" \
            "system-images;android-35;google_apis;x86_64"
          )

@@ -127,7 +127,7 @@ pkgs.mkShell rec {

          packages=(
            "build-tools;35.0.0" "cmdline-tools;13.0" \
-            "patcher;v4" "platform-tools" "platforms;android-35"
+            "platform-tools" "platforms;android-35"
          )

          for package in "''${packages[@]}"; do
@@ -37,7 +37,10 @@ let

    platforms = [ "23" "24" "25" "26" "27" "28" "29" "30" "31" "32" "33" "34" "35" ];
    abis = [ "x86_64" ];
-    extras = ["extras;google;gcm"];
+    extras = [
+      "extras;google;gcm"
+      "extras;google;auto"
+    ];
  };

  # If you copy this example out of nixpkgs, something like this will work:
@@ -180,7 +183,9 @@ pkgs.mkShell rec {
        "system-images;android-32;google_apis_playstore;x86_64" \
        "system-images;android-33;google_apis_playstore;x86_64" \
        "system-images;android-34;google_apis;x86_64" \
-        "system-images;android-35;google_apis_playstore_ps16k;x86_64"
+        "system-images;android-35;google_apis;x86_64" \
+        "extras;google;gcm"
+        "extras;google;auto"
      )

      for package in "''${packages[@]}"; do
@@ -0,0 +1,39 @@
+{
+  deployAndroidPackage,
+  lib,
+  package,
+  os,
+  autoPatchelfHook,
+  makeWrapper,
+  pkgs,
+}:
+
+deployAndroidPackage {
+  inherit package os;
+  nativeBuildInputs = [ makeWrapper ] ++ lib.optionals (os == "linux") [ autoPatchelfHook ];
+  buildInputs = lib.optionals (os == "linux") (
+    with pkgs;
+    [
+      llvmPackages.libcxx
+      SDL2
+    ]
+  );
+
+  patchInstructions = lib.optionalString (os == "linux") ''
+    autoPatchelf --no-recurse $packageBaseDir
+
+    if [ -f $PWD/desktop-head-unit ]; then
+      echo "desktop-head-unit exists"
+      wrapProgram $PWD/desktop-head-unit \
+        --prefix LD_LIBRARY_PATH : ${
+          lib.makeLibraryPath (
+            with pkgs;
+            [
+              xorg.libX11
+              xorg.libXrandr
+            ]
+          )
+        }
+    fi
+  '';
+}
@@ -248,11 +248,18 @@ end
 def parse_package_xml doc
  licenses = get_licenses doc
  packages = {}
+  # check https://github.com/NixOS/nixpkgs/issues/373785
+  extras = {}

  doc.css('remotePackage').each do |package|
    name, _, version = package['path'].partition(';')
    next if version == 'latest'

+    is_extras = name == 'extras'
+    if is_extras
+      name = package['path'].tr(';', '-')
+    end
+
    type, revision, _ = package_revision(package)
    next unless revision

@@ -267,8 +274,14 @@ def parse_package_xml doc
    dependencies_xml = package.at_css('> dependencies')
    dependencies = to_json_collector dependencies_xml if dependencies_xml

-    target = (packages[name] ||= {})
-    target = (target[revision] ||= {})
+    if is_extras
+      target = extras
+      component = package['path']
+      target = (target[component] ||= {})
+    else
+      target = (packages[name] ||= {})
+      target = (target[revision] ||= {})
+    end

    target['name'] ||= name
    target['path'] ||= path
@@ -284,7 +297,7 @@ def parse_package_xml doc
    target['last-available-day'] = today
  end

-  [licenses, packages]
+  [licenses, packages, extras]
 end

 def parse_image_xml doc
@@ -431,9 +444,10 @@ result['addons'] = {}
 result['extras'] = {}

 opts[:packages].each do |filename|
-  licenses, packages = parse_package_xml(Nokogiri::XML(File.open(filename)) { |conf| conf.noblanks })
+  licenses, packages, extras = parse_package_xml(Nokogiri::XML(File.open(filename)) { |conf| conf.noblanks })
  merge result['licenses'], licenses
  merge result['packages'], packages
+  merge result['extras'], extras
 end

 opts[:images].each do |filename|
@@ -12,6 +12,7 @@ cat ./repo.json | ruby mkrepo.rb \
    --images ./xml/android-tv-sys-img2-1.xml \
    --images ./xml/android-wear-cn-sys-img2-1.xml \
    --images ./xml/android-wear-sys-img2-1.xml \
+    --images ./xml/android-automotive-sys-img2-1.xml \
    --images ./xml/google_apis-sys-img2-1.xml \
    --images ./xml/google_apis_playstore-sys-img2-1.xml \
    --addons ./xml/addon2-1.xml \
@@ -97,6 +97,7 @@ mapAliases {
  inherit (pkgs.elmPackages) elm-test;
  inherit (pkgs) eslint; # Added 2024-08-28
  inherit (pkgs) eslint_d; # Added 2023-05-26
+  inherit (pkgs) eas-cli; # added 2025-01-08
  expo-cli = throw "expo-cli was removed because it was deprecated upstream. Use `npx expo` or eas-cli instead."; # added 2024-12-02
  inherit (pkgs) firebase-tools; # added 2023-08-18
  inherit (pkgs) fixjson; # added 2024-06-26
@@ -76,7 +76,6 @@
 , "dotenv-vault"
 , "elasticdump"
 , "@electron-forge/cli"
-, "eas-cli"
 , "elm-oracle"
 , "emoj"
 , "emojione"
@@ -61423,655 +61423,6 @@ in
    bypassCache = true;
    reconstructLock = true;
  };
-  eas-cli = nodeEnv.buildNodePackage {
-    name = "eas-cli";
-    packageName = "eas-cli";
-    version = "12.4.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/eas-cli/-/eas-cli-12.4.1.tgz";
-      sha512 = "BcQGQ82KnQLHk2F2gKhCkb1GTiwnJ5EThnzd/1MpFL8dbPns2vFElxWHj+byKPUjMMurhWa3YCYyEtiI1EGPrg==";
-    };
-    dependencies = [
-      sources."@0no-co/graphql.web-1.0.8"
-      sources."@babel/code-frame-7.10.4"
-      sources."@babel/helper-validator-identifier-7.24.7"
-      (sources."@babel/highlight-7.24.7" // {
-        dependencies = [
-          sources."ansi-styles-3.2.1"
-          sources."chalk-2.4.2"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-          sources."has-flag-3.0.0"
-          sources."supports-color-5.5.0"
-        ];
-      })
-      (sources."@cspotcode/source-map-support-0.8.1" // {
-        dependencies = [
-          sources."@jridgewell/trace-mapping-0.3.9"
-        ];
-      })
-      sources."@expo/apple-utils-1.8.0"
-      (sources."@expo/bunyan-4.0.1" // {
-        dependencies = [
-          sources."uuid-8.3.2"
-        ];
-      })
-      sources."@expo/code-signing-certificates-0.0.5"
-      (sources."@expo/config-8.5.4" // {
-        dependencies = [
-          sources."brace-expansion-1.1.11"
-          sources."glob-7.1.6"
-          sources."minimatch-3.1.2"
-          sources."semver-7.5.3"
-        ];
-      })
-      (sources."@expo/config-plugins-7.8.4" // {
-        dependencies = [
-          sources."@expo/json-file-8.3.3"
-          sources."@expo/plist-0.1.3"
-          sources."brace-expansion-1.1.11"
-          sources."find-up-5.0.0"
-          sources."glob-7.1.6"
-          sources."locate-path-6.0.0"
-          sources."minimatch-3.1.2"
-          sources."p-limit-3.1.0"
-          sources."p-locate-5.0.0"
-        ];
-      })
-      sources."@expo/config-types-50.0.0"
-      (sources."@expo/eas-build-job-1.0.133" // {
-        dependencies = [
-          sources."joi-17.13.3"
-          sources."semver-7.6.3"
-        ];
-      })
-      (sources."@expo/eas-json-12.0.0" // {
-        dependencies = [
-          (sources."@babel/code-frame-7.23.5" // {
-            dependencies = [
-              sources."chalk-2.4.2"
-            ];
-          })
-          sources."ansi-styles-3.2.1"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-          sources."has-flag-3.0.0"
-          sources."semver-7.5.2"
-          sources."supports-color-5.5.0"
-          sources."tslib-2.4.1"
-        ];
-      })
-      (sources."@expo/env-0.3.0" // {
-        dependencies = [
-          sources."dotenv-16.4.5"
-        ];
-      })
-      (sources."@expo/fingerprint-0.6.1" // {
-        dependencies = [
-          sources."brace-expansion-1.1.11"
-          sources."find-up-5.0.0"
-          sources."locate-path-6.0.0"
-          sources."minimatch-3.1.2"
-          sources."p-limit-3.1.0"
-          sources."p-locate-5.0.0"
-        ];
-      })
-      (sources."@expo/image-utils-0.4.2" // {
-        dependencies = [
-          sources."@expo/spawn-async-1.5.0"
-          (sources."cross-spawn-6.0.5" // {
-            dependencies = [
-              sources."semver-5.7.2"
-            ];
-          })
-          sources."fs-extra-9.0.0"
-          sources."path-key-2.0.1"
-          sources."semver-7.3.2"
-          sources."shebang-command-1.2.0"
-          sources."shebang-regex-1.0.0"
-          sources."universalify-1.0.0"
-          sources."which-1.3.1"
-        ];
-      })
-      sources."@expo/json-file-8.2.37"
-      sources."@expo/logger-1.0.117"
-      sources."@expo/multipart-body-parser-1.1.0"
-      sources."@expo/osascript-2.0.33"
-      (sources."@expo/package-manager-1.1.2" // {
-        dependencies = [
-          sources."find-up-5.0.0"
-          sources."locate-path-6.0.0"
-          sources."p-limit-3.1.0"
-          sources."p-locate-5.0.0"
-        ];
-      })
-      sources."@expo/pkcs12-0.0.8"
-      sources."@expo/plist-0.0.20"
-      (sources."@expo/plugin-help-5.1.23" // {
-        dependencies = [
-          sources."@oclif/core-2.16.0"
-          sources."emoji-regex-8.0.0"
-          sources."string-width-4.2.3"
-          sources."supports-color-8.1.1"
-        ];
-      })
-      (sources."@expo/plugin-warn-if-update-available-2.5.1" // {
-        dependencies = [
-          sources."@oclif/core-2.16.0"
-          sources."emoji-regex-8.0.0"
-          sources."fs-extra-10.1.0"
-          sources."string-width-4.2.3"
-          sources."supports-color-8.1.1"
-        ];
-      })
-      (sources."@expo/prebuild-config-6.7.3" // {
-        dependencies = [
-          sources."fs-extra-9.1.0"
-          sources."semver-7.5.3"
-        ];
-      })
-      sources."@expo/results-1.0.0"
-      (sources."@expo/rudder-sdk-node-1.1.1" // {
-        dependencies = [
-          sources."uuid-8.3.2"
-        ];
-      })
-      sources."@expo/sdk-runtime-versions-1.0.0"
-      sources."@expo/spawn-async-1.7.0"
-      (sources."@expo/steps-1.0.134" // {
-        dependencies = [
-          sources."@expo/spawn-async-1.7.2"
-          sources."joi-17.13.3"
-        ];
-      })
-      sources."@expo/timeago.js-1.0.0"
-      sources."@hapi/hoek-9.3.0"
-      sources."@hapi/topo-5.1.0"
-      (sources."@isaacs/cliui-8.0.2" // {
-        dependencies = [
-          sources."ansi-regex-6.1.0"
-          sources."ansi-styles-6.2.1"
-          sources."strip-ansi-7.1.0"
-          sources."wrap-ansi-8.1.0"
-        ];
-      })
-      sources."@jridgewell/gen-mapping-0.3.5"
-      sources."@jridgewell/resolve-uri-3.1.2"
-      sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/sourcemap-codec-1.5.0"
-      sources."@jridgewell/trace-mapping-0.3.25"
-      sources."@nodelib/fs.scandir-2.1.5"
-      sources."@nodelib/fs.stat-2.0.5"
-      sources."@nodelib/fs.walk-1.2.8"
-      (sources."@oclif/core-1.26.2" // {
-        dependencies = [
-          sources."emoji-regex-8.0.0"
-          sources."fs-extra-9.1.0"
-          sources."string-width-4.2.3"
-          sources."supports-color-8.1.1"
-        ];
-      })
-      sources."@oclif/linewrap-1.0.0"
-      (sources."@oclif/plugin-autocomplete-2.3.10" // {
-        dependencies = [
-          sources."@oclif/core-2.16.0"
-          sources."emoji-regex-8.0.0"
-          sources."string-width-4.2.3"
-          sources."supports-color-8.1.1"
-        ];
-      })
-      sources."@oclif/screen-3.0.8"
-      sources."@react-native/normalize-color-2.1.0"
-      sources."@segment/ajv-human-errors-2.13.0"
-      sources."@segment/loosely-validate-event-2.0.0"
-      sources."@sideway/address-4.1.5"
-      sources."@sideway/formula-3.0.1"
-      sources."@sideway/pinpoint-2.0.0"
-      sources."@swc/core-1.7.26"
-      sources."@swc/counter-0.1.3"
-      sources."@swc/helpers-0.5.13"
-      sources."@swc/types-0.1.12"
-      sources."@swc/wasm-1.7.26"
-      sources."@tsconfig/node10-1.0.11"
-      sources."@tsconfig/node12-1.0.11"
-      sources."@tsconfig/node14-1.0.3"
-      sources."@tsconfig/node16-1.0.4"
-      sources."@types/bunyan-1.8.11"
-      sources."@types/cli-progress-3.11.6"
-      sources."@types/node-22.5.5"
-      sources."@urql/core-4.0.11"
-      sources."@urql/exchange-retry-1.2.0"
-      sources."@xmldom/xmldom-0.7.13"
-      sources."acorn-8.12.1"
-      sources."acorn-walk-8.3.4"
-      sources."agent-base-6.0.2"
-      sources."ajv-8.11.0"
-      sources."ajv-formats-2.1.1"
-      sources."ansi-escapes-4.3.2"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-4.3.0"
-      sources."ansicolors-0.3.2"
-      sources."any-promise-1.3.0"
-      sources."arg-5.0.2"
-      sources."argparse-1.0.10"
-      sources."array-union-2.1.0"
-      sources."asn1-0.2.6"
-      sources."astral-regex-2.0.0"
-      sources."async-3.2.6"
-      sources."asynckit-0.4.0"
-      sources."at-least-node-1.0.0"
-      sources."b4a-1.6.6"
-      sources."balanced-match-1.0.2"
-      sources."base64-js-1.5.1"
-      sources."better-opn-3.0.2"
-      sources."big-integer-1.6.52"
-      sources."bplist-creator-0.1.1"
-      sources."bplist-parser-0.3.2"
-      sources."brace-expansion-2.0.1"
-      sources."braces-3.0.3"
-      sources."buffer-equal-constant-time-1.0.1"
-      sources."builtins-1.0.3"
-      sources."bunyan-1.8.15"
-      sources."cardinal-2.1.1"
-      sources."chalk-4.1.2"
-      sources."charenc-0.0.2"
-      sources."chownr-2.0.0"
-      (sources."clean-stack-3.0.1" // {
-        dependencies = [
-          sources."escape-string-regexp-4.0.0"
-        ];
-      })
-      sources."cli-cursor-3.1.0"
-      (sources."cli-progress-3.12.0" // {
-        dependencies = [
-          sources."emoji-regex-8.0.0"
-          sources."string-width-4.2.3"
-        ];
-      })
-      sources."cli-spinners-2.9.2"
-      sources."clone-1.0.4"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."combined-stream-1.0.8"
-      sources."commander-4.1.1"
-      sources."component-type-1.2.2"
-      sources."concat-map-0.0.1"
-      sources."content-type-1.0.5"
-      sources."create-require-1.1.1"
-      sources."cross-spawn-7.0.3"
-      sources."crypt-0.0.2"
-      sources."crypto-random-string-1.0.0"
-      sources."dateformat-4.6.3"
-      sources."debug-4.3.7"
-      sources."defaults-1.0.4"
-      sources."define-lazy-prop-2.0.0"
-      sources."delayed-stream-1.0.0"
-      sources."dicer-0.3.1"
-      sources."diff-4.0.2"
-      sources."dir-glob-3.0.1"
-      sources."domino-2.1.6"
-      sources."dotenv-16.3.1"
-      (sources."dotenv-expand-11.0.6" // {
-        dependencies = [
-          sources."dotenv-16.4.5"
-        ];
-      })
-      sources."dtrace-provider-0.8.8"
-      sources."eastasianwidth-0.2.0"
-      sources."ecdsa-sig-formatter-1.0.11"
-      sources."ejs-3.1.10"
-      sources."emoji-regex-9.2.2"
-      sources."encoding-0.1.13"
-      sources."env-paths-2.2.0"
-      sources."env-string-1.0.1"
-      sources."envinfo-7.11.0"
-      sources."err-code-2.0.3"
-      sources."error-ex-1.3.2"
-      sources."escape-string-regexp-1.0.5"
-      sources."esprima-4.0.1"
-      sources."exec-async-2.2.0"
-      (sources."expo-modules-autolinking-1.11.2" // {
-        dependencies = [
-          sources."commander-7.2.0"
-          sources."find-up-5.0.0"
-          sources."fs-extra-9.1.0"
-          sources."locate-path-6.0.0"
-          sources."p-limit-3.1.0"
-          sources."p-locate-5.0.0"
-        ];
-      })
-      sources."fast-deep-equal-3.1.3"
-      sources."fast-fifo-1.3.2"
-      sources."fast-glob-3.3.2"
-      sources."fastq-1.17.1"
-      sources."fetch-retry-4.1.1"
-      sources."figures-3.2.0"
-      sources."filelist-1.0.4"
-      sources."fill-range-7.1.1"
-      sources."find-up-4.1.0"
-      sources."find-yarn-workspace-root-2.0.0"
-      (sources."foreground-child-3.3.0" // {
-        dependencies = [
-          sources."signal-exit-4.1.0"
-        ];
-      })
-      sources."form-data-4.0.0"
-      sources."fs-extra-11.2.0"
-      (sources."fs-minipass-2.1.0" // {
-        dependencies = [
-          sources."minipass-3.3.6"
-        ];
-      })
-      sources."fs.realpath-1.0.0"
-      sources."get-package-type-0.1.0"
-      sources."getenv-1.0.0"
-      (sources."glob-10.4.5" // {
-        dependencies = [
-          sources."minimatch-9.0.5"
-          sources."minipass-7.1.2"
-        ];
-      })
-      sources."glob-parent-5.1.2"
-      sources."globby-11.1.0"
-      sources."golden-fleece-1.0.9"
-      sources."graceful-fs-4.2.11"
-      sources."gradle-to-js-2.0.1"
-      sources."graphql-16.8.1"
-      sources."graphql-tag-2.12.6"
-      sources."has-flag-4.0.0"
-      sources."hosted-git-info-3.0.8"
-      sources."http-call-5.3.0"
-      sources."https-proxy-agent-5.0.1"
-      sources."hyperlinker-1.0.0"
-      sources."iconv-lite-0.6.3"
-      sources."ignore-5.3.0"
-      sources."imurmurhash-0.1.4"
-      sources."indent-string-4.0.0"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."is-arrayish-0.2.1"
-      sources."is-buffer-1.1.6"
-      sources."is-docker-2.2.1"
-      sources."is-extglob-2.1.1"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."is-glob-4.0.3"
-      sources."is-interactive-1.0.0"
-      sources."is-number-7.0.0"
-      sources."is-retry-allowed-1.2.0"
-      sources."is-stream-2.0.1"
-      sources."is-unicode-supported-0.1.0"
-      sources."is-wsl-2.2.0"
-      sources."isexe-2.0.0"
-      sources."jackspeak-3.4.3"
-      (sources."jake-10.9.2" // {
-        dependencies = [
-          sources."brace-expansion-1.1.11"
-          sources."minimatch-3.1.2"
-        ];
-      })
-      sources."jimp-compact-0.16.1"
-      sources."jks-js-1.1.0"
-      sources."joi-17.11.0"
-      sources."join-component-1.1.0"
-      sources."js-tokens-4.0.0"
-      sources."js-yaml-3.14.1"
-      sources."jsep-1.3.9"
-      sources."json-parse-better-errors-1.0.2"
-      sources."json-schema-traverse-1.0.0"
-      sources."json5-2.2.3"
-      sources."jsonfile-6.1.0"
-      sources."jsonwebtoken-9.0.0"
-      sources."jwa-1.4.1"
-      sources."jws-3.2.2"
-      sources."keychain-1.5.0"
-      sources."kleur-3.0.3"
-      sources."lines-and-columns-1.2.4"
-      sources."locate-path-5.0.0"
-      sources."lodash-4.17.21"
-      sources."lodash.clonedeep-4.5.0"
-      sources."lodash.get-4.4.2"
-      sources."lodash.merge-4.6.2"
-      sources."log-symbols-4.1.0"
-      sources."lru-cache-6.0.0"
-      sources."make-error-1.3.6"
-      sources."md5-2.3.0"
-      sources."merge2-1.4.1"
-      sources."micromatch-4.0.8"
-      sources."mime-3.0.0"
-      sources."mime-db-1.52.0"
-      sources."mime-types-2.1.35"
-      sources."mimic-fn-2.1.0"
-      sources."minimatch-5.1.2"
-      sources."minimist-1.2.8"
-      sources."minipass-5.0.0"
-      (sources."minizlib-3.0.1" // {
-        dependencies = [
-          sources."minipass-7.1.2"
-        ];
-      })
-      sources."mkdirp-1.0.4"
-      sources."moment-2.30.1"
-      sources."ms-2.1.3"
-      sources."mute-stream-0.0.8"
-      (sources."mv-2.1.1" // {
-        dependencies = [
-          sources."brace-expansion-1.1.11"
-          sources."glob-6.0.4"
-          sources."minimatch-3.1.2"
-          sources."mkdirp-0.5.6"
-          sources."rimraf-2.4.5"
-        ];
-      })
-      sources."mz-2.7.0"
-      sources."nan-2.20.0"
-      sources."nanoid-3.3.4"
-      sources."natural-orderby-2.0.3"
-      sources."ncp-2.0.0"
-      sources."nice-try-1.0.5"
-      sources."node-fetch-2.6.7"
-      sources."node-forge-1.3.1"
-      sources."node-int64-0.4.0"
-      sources."node-rsa-1.1.1"
-      (sources."npm-package-arg-7.0.0" // {
-        dependencies = [
-          sources."semver-5.7.2"
-        ];
-      })
-      sources."nullthrows-1.1.1"
-      sources."object-assign-4.1.1"
-      sources."object-treeify-1.1.33"
-      sources."once-1.4.0"
-      sources."onetime-5.1.2"
-      sources."open-8.4.2"
-      sources."ora-5.1.0"
-      sources."os-homedir-1.0.2"
-      sources."os-tmpdir-1.0.2"
-      sources."osenv-0.1.5"
-      sources."p-limit-2.3.0"
-      sources."p-locate-4.1.0"
-      sources."p-try-2.2.0"
-      sources."package-json-from-dist-1.0.0"
-      sources."parse-json-4.0.0"
-      (sources."parse-png-2.1.0" // {
-        dependencies = [
-          sources."pngjs-3.4.0"
-        ];
-      })
-      sources."password-prompt-1.1.3"
-      sources."path-exists-4.0.0"
-      sources."path-is-absolute-1.0.1"
-      sources."path-key-3.1.1"
-      (sources."path-scurry-1.11.1" // {
-        dependencies = [
-          sources."lru-cache-10.4.3"
-        ];
-      })
-      sources."path-type-4.0.0"
-      sources."picocolors-1.1.0"
-      sources."picomatch-2.3.1"
-      sources."pirates-4.0.6"
-      sources."pkg-dir-4.2.0"
-      (sources."plist-3.1.0" // {
-        dependencies = [
-          sources."@xmldom/xmldom-0.8.10"
-          sources."xmlbuilder-15.1.1"
-        ];
-      })
-      sources."pngjs-7.0.0"
-      sources."promise-limit-2.7.0"
-      sources."promise-retry-2.0.1"
-      sources."prompts-2.4.2"
-      sources."punycode-2.3.1"
-      sources."qrcode-terminal-0.12.0"
-      sources."queue-microtask-1.2.3"
-      sources."queue-tick-1.0.1"
-      sources."redeyed-2.1.1"
-      sources."remove-trailing-slash-0.1.1"
-      sources."require-from-string-2.0.2"
-      sources."resolve-from-5.0.0"
-      sources."restore-cursor-3.1.0"
-      sources."retry-0.12.0"
-      sources."reusify-1.0.4"
-      sources."rimraf-5.0.10"
-      sources."run-parallel-1.2.0"
-      sources."safe-buffer-5.2.1"
-      sources."safe-json-stringify-1.2.0"
-      sources."safer-buffer-2.1.2"
-      sources."sax-1.4.1"
-      sources."semver-7.5.4"
-      sources."shebang-command-2.0.0"
-      sources."shebang-regex-3.0.0"
-      sources."signal-exit-3.0.7"
-      sources."simple-plist-1.4.0"
-      sources."sisteransi-1.0.5"
-      sources."slash-3.0.0"
-      sources."slice-ansi-4.0.0"
-      sources."slugify-1.6.6"
-      sources."split-1.0.1"
-      sources."sprintf-js-1.0.3"
-      sources."stream-buffers-2.2.0"
-      sources."streamsearch-1.1.0"
-      sources."streamx-2.20.1"
-      (sources."string-width-5.1.2" // {
-        dependencies = [
-          sources."ansi-regex-6.1.0"
-          sources."strip-ansi-7.1.0"
-        ];
-      })
-      (sources."string-width-cjs-4.2.3" // {
-        dependencies = [
-          sources."emoji-regex-8.0.0"
-        ];
-      })
-      sources."strip-ansi-6.0.1"
-      sources."strip-ansi-cjs-6.0.1"
-      sources."structured-headers-0.4.1"
-      (sources."sucrase-3.34.0" // {
-        dependencies = [
-          sources."brace-expansion-1.1.11"
-          sources."glob-7.1.6"
-          sources."minimatch-3.1.2"
-        ];
-      })
-      sources."sudo-prompt-9.1.1"
-      sources."supports-color-7.2.0"
-      sources."supports-hyperlinks-2.3.0"
-      (sources."tar-6.2.1" // {
-        dependencies = [
-          (sources."minizlib-2.1.2" // {
-            dependencies = [
-              sources."minipass-3.3.6"
-            ];
-          })
-        ];
-      })
-      sources."tar-stream-3.1.7"
-      sources."temp-dir-1.0.0"
-      (sources."tempy-0.3.0" // {
-        dependencies = [
-          sources."type-fest-0.3.1"
-        ];
-      })
-      sources."terminal-link-2.1.1"
-      sources."text-decoder-1.2.0"
-      sources."thenify-3.3.1"
-      sources."thenify-all-1.6.0"
-      sources."this-file-2.0.3"
-      sources."through-2.3.8"
-      sources."to-regex-range-5.0.1"
-      sources."tr46-0.0.3"
-      sources."ts-interface-checker-0.1.13"
-      (sources."ts-node-10.9.2" // {
-        dependencies = [
-          sources."arg-4.1.3"
-        ];
-      })
-      sources."tslib-2.6.2"
-      sources."tunnel-agent-0.6.0"
-      sources."turndown-7.1.2"
-      sources."type-fest-0.21.3"
-      sources."typescript-5.6.2"
-      sources."undici-types-6.19.8"
-      sources."unique-string-1.0.0"
-      sources."universalify-2.0.1"
-      sources."untildify-4.0.0"
-      sources."uri-js-4.4.1"
-      sources."uuid-9.0.1"
-      sources."v8-compile-cache-lib-3.0.1"
-      sources."validate-npm-package-name-3.0.0"
-      sources."wcwidth-1.0.1"
-      sources."webidl-conversions-3.0.1"
-      sources."whatwg-url-5.0.0"
-      sources."which-2.0.2"
-      (sources."widest-line-3.1.0" // {
-        dependencies = [
-          sources."emoji-regex-8.0.0"
-          sources."string-width-4.2.3"
-        ];
-      })
-      sources."wonka-6.3.4"
-      sources."wordwrap-1.0.0"
-      (sources."wrap-ansi-7.0.0" // {
-        dependencies = [
-          sources."emoji-regex-8.0.0"
-          sources."string-width-4.2.3"
-        ];
-      })
-      (sources."wrap-ansi-cjs-7.0.0" // {
-        dependencies = [
-          sources."emoji-regex-8.0.0"
-          sources."string-width-4.2.3"
-        ];
-      })
-      sources."wrappy-1.0.2"
-      sources."write-file-atomic-2.4.3"
-      (sources."xcode-3.0.1" // {
-        dependencies = [
-          sources."uuid-7.0.3"
-        ];
-      })
-      (sources."xml2js-0.6.0" // {
-        dependencies = [
-          sources."xmlbuilder-11.0.1"
-        ];
-      })
-      sources."xmlbuilder-14.0.0"
-      sources."yallist-4.0.0"
-      sources."yaml-2.5.1"
-      sources."yn-3.1.1"
-      sources."yocto-queue-0.1.0"
-      sources."zod-3.23.8"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "EAS command line tool";
-      homepage = "https://github.com/expo/eas-cli";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
  elm-oracle = nodeEnv.buildNodePackage {
    name = "elm-oracle";
    packageName = "elm-oracle";
@@ -19,7 +19,7 @@

 buildPythonPackage rec {
  pname = "cyclopts";
-  version = "3.4.1";
+  version = "3.5.0";
  pyproject = true;

  disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
    owner = "BrianPugh";
    repo = "cyclopts";
    tag = "v${version}";
-    hash = "sha256-Kn2Ixai1EUpFR2PpPOUOrsTPn/LbLXavWUZVUcO/lq8=";
+    hash = "sha256-otMKT7GQbI1ORqVRIf9gVzC28nwx8uWYjZcfth5PS/E=";
  };

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

 buildPythonPackage rec {
  pname = "flexit-bacnet";
-  version = "2.2.1";
+  version = "2.2.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "piotrbulinski";
    repo = "flexit_bacnet";
    tag = version;
-    hash = "sha256-Cy/WHKtJoZWSFOs+9rBYSLqZTF/68WRM1HiYXDyb9KM=";
+    hash = "sha256-c5561ewnAybYcdqesWYEgfT7Y+TetOjxLZeMTJ1ToUk=";
  };

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

 buildPythonPackage rec {
  pname = "mcdreforged";
-  version = "2.14.4";
+  version = "2.14.5";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "MCDReforged";
    repo = "MCDReforged";
    tag = "v${version}";
-    hash = "sha256-R9zM86ohABEaxj7NYj8FCPIYsMDJp0sKjOhWzit69B8=";
+    hash = "sha256-zhg4KK40nQAuKMaihALTXEeQuusKeSVp18yp8WKVZ2I=";
  };

  build-system = [ setuptools ];
@@ -2,7 +2,7 @@
  lib,
  buildPythonPackage,
  pythonOlder,
-  fetchPypi,
+  fetchFromGitHub,
  pdm-backend,
  pytz,
  oauthlib,
@@ -12,26 +12,21 @@

 buildPythonPackage rec {
  pname = "pyfireservicerota";
-  version = "0.0.44";
+  version = "0.0.45";
  pyproject = true;

  disabled = pythonOlder "3.10";

-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-OknGX4xP+AHXRuhizbeTVAfiOX0uRGzAly7FJ1vopDI=";
+  src = fetchFromGitHub {
+    owner = "cyberjunky";
+    repo = "python-fireservicerota";
+    tag = version;
+    hash = "sha256-lQkn/DlqJMLxQlh1sn+v7d6xHHCC9r8mnUJchyTTUqA=";
  };

-  postPatch = ''
-    # https://github.com/cyberjunky/python-fireservicerota/pull/1
-    substituteInPlace pyproject.toml \
-      --replace-fail '"aiohttp",' '"requests",' \
-      --replace-fail '"aiohttp_retry",' ""
-  '';
+  build-system = [ pdm-backend ];

-  nativeBuildInputs = [ pdm-backend ];
-
-  propagatedBuildInputs = [
+  dependencies = [
    pytz
    oauthlib
    requests
@@ -44,6 +39,7 @@ buildPythonPackage rec {
  pythonImportsCheck = [ "pyfireservicerota" ];

  meta = with lib; {
+    changelog = "https://github.com/cyberjunky/python-fireservicerota/releases/tag/${src.tag}";
    description = "Python 3 API wrapper for FireServiceRota/BrandweerRooster";
    homepage = "https://github.com/cyberjunky/python-fireservicerota";
    license = licenses.mit;
@@ -4,27 +4,29 @@
  fetchFromGitHub,
  numpy,
  scipy,
+  scikit-base,
  pytestCheckHook,
  setuptools,
 }:

 buildPythonPackage rec {
  pname = "pykalman";
-  version = "0.9.7";
+  version = "0.10.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "pykalman";
    repo = "pykalman";
-    rev = "aaf8c8574b0474b6f41b7b135a9a7f2dfbd0e86c"; # no tags
-    hash = "sha256-++YqxGMsFGv5OxicDFO9Xz89e62NG8X+6oR6M9ePUcg=";
+    tag = "v${version}";
+    hash = "sha256-9HaDNYVPdRvQH3r5j7r0uHqyuR6HqV7QaNuxKEYDcy8=";
  };

  build-system = [ setuptools ];

-  propagatedBuildInputs = [
+  dependencies = [
    numpy
    scipy
+    scikit-base
  ];

  nativeCheckInputs = [ pytestCheckHook ];
@@ -23,7 +23,7 @@

 buildPythonPackage rec {
  pname = "python-homeassistant-analytics";
-  version = "0.8.1";
+  version = "0.9.0";
  pyproject = true;

  disabled = pythonOlder "3.11";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
    owner = "joostlek";
    repo = "python-homeassistant-analytics";
    tag = "v${version}";
-    hash = "sha256-TfD1N4KoeIVoDp1YoOhBw8E7adow1nU1N6vj2j3W2No=";
+    hash = "sha256-Deh3pZKpqdrlgv6LQk3NHuATz3porWiM8dewjbdbR7M=";
  };

  build-system = [ poetry-core ];
@@ -0,0 +1,33 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  toml,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "scikit-base";
+  version = "0.12.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "sktime";
+    repo = "skbase";
+    tag = "v${version}";
+    hash = "sha256-UGYkYhgo6LzlZTg6YDehJXd4D5p8FfUgWPdlW4PPOdI=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ toml ];
+
+  pythonImportsCheck = [ "skbase" ];
+
+  meta = with lib; {
+    description = "Base classes for creating scikit-learn-like parametric objects, and tools for working with them";
+    homepage = "https://github.com/sktime/skbase";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ kirillrdy ];
+  };
+}
@@ -6,14 +6,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "checkov";
-  version = "3.2.361";
+  version = "3.2.364";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "bridgecrewio";
    repo = "checkov";
    tag = version;
-    hash = "sha256-7w8oAIBAgYH/TXNnAVKC6E3AT37WJDSSgnpAeRfY4vA=";
+    hash = "sha256-ZmvIICAnC9RDizKl06aOD1LNEAo8WG7E1ZZB3Rero+c=";
  };

  patches = [ ./flake8-compat-5.x.patch ];
@@ -11,7 +11,7 @@

 let
  pname = "surrealdb-migrations";
-  version = "2.1.0";
+  version = "2.1.2";
 in
 rustPlatform.buildRustPackage rec {
  inherit pname version;
@@ -20,11 +20,11 @@ rustPlatform.buildRustPackage rec {
    owner = "Odonno";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-zTOAwSjsgu3axq+VSnXAIGKRDeeRBaQtoNoVU2eKAIk=";
+    hash = "sha256-U44TaixLjLgQJQGohBydWPLt6GTPVORQDYtuoniSY0Q=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-0O4WWBevEyPMPS59rDmYHWpgKTc713jLn9MNHoLVd0I=";
+  cargoHash = "sha256-Jw6Dj6LRiOwIqZABS58l795TpQxyLY7pTQm2I9+r+Nc=";

  buildInputs = [ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ];

@@ -16,17 +16,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-lambda";
-  version = "1.6.2";
+  version = "1.6.3";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-21p9bo+kfqVrRAxVSuZ24XaHDU7XkIIhGXjHLUsGQOg=";
+    hash = "sha256-GiV5yjlzU4iU4BJ8Fq8I9uOchVCF2UGb+WLMMr7n8pc=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-GtlT2ek/HjRN/+1Ocp/bJgEL5Oy6Dm1p+CdWjs7NW7Q=";
+  cargoHash = "sha256-JMYGcIli72pH5O8DXQb7++bvnIgBpyYykqRbddObaAI=";

  nativeCheckInputs = [ cacert ];

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

 stdenv.mkDerivation rec {
  pname = "texpresso";
-  version = "0-unstable-2024-07-02";
+  version = "0-unstable-2025-01-29";

  postPatch = ''
    substituteInPlace Makefile \
@@ -42,8 +42,8 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "let-def";
    repo = "texpresso";
-    rev = "0e14b1df6269b07c2c985f001e32b48673495a8b";
-    hash = "sha256-av1yadR2giJUxFQuHSXFgTbCNsmccrzKOmLVnAGJt6c=";
+    rev = "c42a5912f501f180984840fa8adf9ffc09c5ac13";
+    hash = "sha256-T/vou7OcGtNoodCrznmjBLxg6ZAFDCjhpYgNyZaf44g=";
  };

  buildFlags = [ "texpresso" ];
@@ -10,8 +10,8 @@ tectonic-unwrapped.override (old: {
          src = fetchFromGitHub {
            owner = "let-def";
            repo = "tectonic";
-            rev = "5b844105c06e0b16e40b1254359f8c28e8956280";
-            hash = "sha256-RPsXmp+5MF9h+H3wdL1O1hXSRZWjWTY8lXq/dWZIM1g=";
+            rev = "b38cb3b2529bba947d520ac29fbb7873409bd270";
+            hash = "sha256-ap7fEPHsASAphIQkjcvk1CC7egTdxaUh7IpSS5os4W8=";
            fetchSubmodules = true;
          };
          useFetchCargoVendor = true;
@@ -1570,6 +1570,8 @@ mapAliases {
  zfsStable = zfs; # Added 2024-02-26
  zfsUnstable = zfs_unstable; # Added 2024-02-26
  zfs_2_1 = throw "zfs 2.1 has been removed as it is EOL. Please upgrade to a newer version"; # Added 2024-12-25
+  zig_0_9 = throw "zig 0.9 has been removed, upgrade to a newer version instead"; # Added 2025-01-24
+  zig_0_10 = throw "zig 0.10 has been removed, upgrade to a newer version instead"; # Added 2025-01-24
  zinc = zincsearch; # Added 2023-05-28
  zk-shell = throw "zk-shell has been removed as it was broken and unmaintained"; # Added 2024-08-10
  zkg = throw "'zkg' has been replaced by 'zeek'";
@@ -10845,14 +10845,10 @@ with pkgs;
  inherit (rec {
    zigPackages = recurseIntoAttrs (callPackage ../development/compilers/zig {});

-    zig_0_9 = zigPackages."0.9";
-    zig_0_10 = zigPackages."0.10";
    zig_0_11 = zigPackages."0.11";
    zig_0_12 = zigPackages."0.12";
    zig_0_13 = zigPackages."0.13";
  }) zigPackages
-     zig_0_9
-     zig_0_10
     zig_0_11
     zig_0_12
     zig_0_13;
@@ -14625,6 +14625,8 @@ self: super: with self; {

  scim2-tester = callPackage ../development/python-modules/scim2-tester { };

+  scikit-base = callPackage ../development/python-modules/scikit-base { };
+
  scikit-bio = callPackage ../development/python-modules/scikit-bio { };

  scikit-build = callPackage ../development/python-modules/scikit-build { };