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

2025-07-13 21:50:33 +03:00 · 2025-03-12 16:27:55 +03:00 · 2025-03-12 16:27:55 +03:00 · 49db95baf5
commit 49db95baf5
parent 42dc35ec5d 715bf028cb
96 changed files with 1586 additions and 23977 deletions
--- a/.github/ISSUE_TEMPLATE/06_update_request.yml
+++ b/.github/ISSUE_TEMPLATE/06_update_request.yml
@ -82,6 +82,7 @@ body:
        Please mention the people who are in the **Maintainers** list of the offending package. This is done by by searching for the package on the [NixOS Package Search](https://search.nixos.org/packages) and mentioning the people listed under **Maintainers** by prefixing their GitHub usernames with an '@' character. Please add the mentions above the `---` characters in the template below.
      value: |

+
        ---

        **Note for maintainers:** Please tag this issue in your pull request description. (i.e. `Resolves #ISSUE`.)
--- a/.github/ISSUE_TEMPLATE/07_module_request.yml
+++ b/.github/ISSUE_TEMPLATE/07_module_request.yml
@ -62,6 +62,7 @@ body:
        Please mention the people who are in the **Maintainers** list of the offending package. This is done by by searching for the package on the [NixOS Package Search](https://search.nixos.org/packages) and mentioning the people listed under **Maintainers** by prefixing their GitHub usernames with an '@' character. Please add the mentions above the `---` characters in the template below.
      value: |

+
        ---

        **Note for maintainers:** Please tag this issue in your pull request description. (i.e. `Resolves #ISSUE`.)
--- a/.github/ISSUE_TEMPLATE/08_backport_request.yml
+++ b/.github/ISSUE_TEMPLATE/08_backport_request.yml
@ -64,6 +64,7 @@ body:
        Please mention the people who are in the **Maintainers** list of the offending package. This is done by by searching for the package on the [NixOS Package Search](https://search.nixos.org/packages) and mentioning the people listed under **Maintainers** by prefixing their GitHub usernames with an '@' character. Please add the mentions above the `---` characters in the template below.
      value: |

+
        ---

        **Note for maintainers:** Please tag this issue in your pull request description. (i.e. `Resolves #ISSUE`.)
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -1825,6 +1825,13 @@
    githubId = 8436007;
    name = "Aria Edmonds";
  };
+  arbel-arad = {
+    email = "arbel@spacetime.technology";
+    github = "arbel-arad";
+    githubId = 65590498;
+    matrix = "@arbel:matrix.spacetime.technology";
+    name = "Arbel Arad";
+  };
  arcadio = {
    email = "arc@well.ox.ac.uk";
    github = "arcadio";
@ -13239,6 +13246,12 @@
    name = "Jakob Leifhelm";
    keys = [ { fingerprint = "4A82 F68D AC07 9FFD 8BF0  89C4 6817 AA02 3810 0822"; } ];
  };
+  leiserfg = {
+    email = "leiserfg@gmail.com";
+    github = "leiserfg";
+    githubId = 2947276;
+    name = "Leiser Fernández Gallo";
+  };
  leixb = {
    email = "abone9999+nixpkgs@gmail.com";
    matrix = "@leix_b:matrix.org";
@ -21489,6 +21502,12 @@
    githubId = 1151264;
    name = "Sebastian Graf";
  };
+  sguimmara = {
+    email = "fair.lid2365@fastmail.com";
+    github = "sguimmara";
+    githubId = 5512096;
+    name = "Sébastien Guimmara";
+  };
  shackra = {
    name = "Jorge Javier Araya Navarro";
    email = "jorge@esavara.cr";
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@ -525,6 +525,7 @@ with lib.maintainers;

  home-assistant = {
    members = [
+      dotlambda
      fab
      hexa
    ];
--- a/nixos/modules/programs/light.nix
+++ b/nixos/modules/programs/light.nix
@ -49,6 +49,15 @@ in
          '';
        };

+        minBrightness = lib.mkOption {
+          type = lib.types.numbers.between 0 100;
+          default = 0.1;
+          description = ''
+            The minimum authorized brightness value, e.g. to avoid the
+            display going dark.
+          '';
+        };
+
      };

    };
@ -63,13 +72,14 @@ in
        let
          light = "${pkgs.light}/bin/light";
          step = builtins.toString cfg.brightnessKeys.step;
+          minBrightness = builtins.toString cfg.brightnessKeys.minBrightness;
        in
        [
          {
            keys = [ 224 ];
            events = [ "key" ];
-            # Use minimum brightness 0.1 so the display won't go totally black.
-            command = "${light} -N 0.1 && ${light} -U ${step}";
+            # -N is used to ensure that value >= minBrightness
+            command = "${light} -N ${minBrightness} && ${light} -U ${step}";
          }
          {
            keys = [ 225 ];
--- a/nixos/modules/services/web-apps/akkoma.nix
+++ b/nixos/modules/services/web-apps/akkoma.nix
@ -26,7 +26,6 @@ let
    substring
    versionOlder

-    fileContents
    readFile

    literalExpression
@ -129,17 +128,18 @@ let
    in replaceSec' { };

  # Erlang/Elixir uses a somewhat special format for IP addresses
-  erlAddr = addr: fileContents
-    (pkgs.runCommand addr {
-      nativeBuildInputs = [ cfg.package.elixirPackage ];
-      code = ''
-        case :inet.parse_address('${addr}') do
-          {:ok, addr} -> IO.inspect addr
-          {:error, _} -> System.halt(65)
-        end
-      '';
-      passAsFile = [ "code" ];
-    } ''elixir "$codePath" >"$out"'');
+  erlAddr = addr:
+    let
+      isIPv4 = (lib.match "^([0-9]+\\.){3}[0-9]+$" addr) != null;
+    in
+    if isIPv4 then
+      "{${lib.concatStringsSep "," (lib.splitString "." addr)}}"
+    else
+      let
+        inherit (lib.network.ipv6.fromString addr) address;
+        parsed = lib.map (x: "16#${x}") (lib.splitString ":" address);
+      in
+      "{${lib.concatStringsSep "," parsed}}";

  configFile = format.generate "config.exs"
    (replaceSec
@ -327,11 +327,11 @@ let
        AKKOMA_CONFIG_PATH="''${RUNTIME_DIRECTORY%%:*}/config.exs" \
        ERL_EPMD_ADDRESS="${cfg.dist.address}" \
        ERL_EPMD_PORT="${toString cfg.dist.epmdPort}" \
-        ERL_FLAGS=${escapeShellArg (escapeShellArgs ([
+        ERL_FLAGS="${escapeShellArgs ([
          "-kernel" "inet_dist_use_interface" (erlAddr cfg.dist.address)
          "-kernel" "inet_dist_listen_min" (toString cfg.dist.portMin)
          "-kernel" "inet_dist_listen_max" (toString cfg.dist.portMax)
-        ] ++ cfg.dist.extraFlags))} \
+        ] ++ cfg.dist.extraFlags)}" \
        RELEASE_COOKIE="$(<"''${RUNTIME_DIRECTORY%%:*}/cookie")" \
        RELEASE_NAME="akkoma" \
          exec "${cfg.package}/bin/$(basename "$0")" "$@"
--- a/pkgs/applications/video/obs-studio/plugins/obs-composite-blur.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-composite-blur.nix
@ -8,13 +8,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "obs-composite-blur";
-  version = "1.5.0";
+  version = "1.5.1";

  src = fetchFromGitHub {
    owner = "FiniteSingularity";
    repo = "obs-composite-blur";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-/fGLsbChaxhnBBwVJXEGRcjni80p9lI5no45nrp2csM=";
+    hash = "sha256-12wgzZxEoEUKqGGmccZKfcdE0libBJDZ1EzwxRPLURc=";
  };

  buildInputs = [
--- a/pkgs/applications/virtualization/sail-riscv/default.nix
+++ b/pkgs/applications/virtualization/sail-riscv/default.nix
@ -1,77 +1,60 @@
 {
  stdenv,
  fetchFromGitHub,
-  fetchpatch,
  lib,
-  arch,
-  ocamlPackages,
-  ocaml,
+  cmake,
+  gmp,
+  pkg-config,
+  sail,
+  ninja,
  zlib,
  z3,
 }:

 stdenv.mkDerivation rec {
  pname = "sail-riscv";
-  version = "0.5";
+  version = "0.6";

  src = fetchFromGitHub {
    owner = "riscv";
    repo = pname;
    rev = version;
-    hash = "sha256-7PZNNUMaCZEBf0lOCqkquewRgZPooBOjIbGF7JlLnEo=";
+    hash = "sha256-cO0ZOr2frMMLE9NUGDxy9+KpuyBnixw6wcNzUArxDiE=";
  };

-  nativeBuildInputs = with ocamlPackages; [
-    ocamlbuild
-    findlib
-    ocaml
+  nativeBuildInputs = [
    z3
+    cmake
+    pkg-config
+    ninja
    sail
  ];
-  buildInputs = with ocamlPackages; [
+  buildInputs = [
    zlib
-    linksem
+    gmp
  ];
  strictDeps = true;

-  patches = [
-    (fetchpatch {
-      url = "https://github.com/riscv/sail-riscv/pull/250/commits/8bd37c484b83a8ce89c8bb7a001b8ae34dc4d77f.patch";
-      hash = "sha256-tDgkGhcbT6phoCAvilxMI56YUuUqQFgvh+2QduOjdMg=";
-    })
-  ];
+  postPatch = ''
+    rm -r prover_snapshots
+  '';

-  postPatch =
-    ''
-      rm -r prover_snapshots
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace Makefile --replace "-flto" ""
-    '';
-
-  makeFlags = [
-    "SAIL=sail"
-    "ARCH=${arch}"
-    "SAIL_DIR=${ocamlPackages.sail}/share/sail"
-    "LEM_DIR=${ocamlPackages.sail}/share/lem"
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin
-    cp c_emulator/riscv_sim_${arch} $out/bin
-    mkdir $out/share/
-    cp -r generated_definitions/{coq,hol4,isabelle} $out/share/
-
-    runHook postInstall
+  preBuild = ''
+    ninja \
+      riscv_sim_rv32d      \
+      riscv_sim_rv32d_rvfi \
+      riscv_sim_rv32f      \
+      riscv_sim_rv32f_rvfi \
+      riscv_sim_rv64d      \
+      riscv_sim_rv64d_rvfi \
+      riscv_sim_rv64f      \
+      riscv_sim_rv64f_rvfi
  '';

  meta = with lib; {
    homepage = "https://github.com/riscv/sail-riscv";
    description = "Formal specification of the RISC-V architecture, written in Sail";
    maintainers = with maintainers; [ genericnerdyusername ];
-    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
    license = licenses.bsd2;
  };
 }
--- a/pkgs/by-name/ad/ada/package.nix
+++ b/pkgs/by-name/ad/ada/package.nix
@ -7,13 +7,13 @@

 stdenv.mkDerivation rec {
  pname = "ada";
-  version = "3.1.3";
+  version = "3.2.1";

  src = fetchFromGitHub {
    owner = "ada-url";
    repo = "ada";
    tag = "v${version}";
-    hash = "sha256-WQjScror93W7E8j34PbVL6FENy83MpnirTgit3/+dWw=";
+    hash = "sha256-x58zGkuKEUqlJEdIvLFzwHZHJAzCsFV9EQCpi+zmV1o=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/by-name/ad/adminneo/package.nix
+++ b/pkgs/by-name/ad/adminneo/package.nix
@ -10,13 +10,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "adminneo";
-  version = "4.15";
+  version = "4.17";

  src = fetchFromGitHub {
    owner = "adminneo-org";
    repo = "adminneo";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-QqASJat7wHSqisBn1O5JNDVUmnZ8mxdRe8pePkIpWJI=";
+    hash = "sha256-WVNeox5xygQjD5ekmcwZX9AnfhBq6YpHBLC2+WZJzvI=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ag/age-plugin-sss/package.nix
+++ b/pkgs/by-name/ag/age-plugin-sss/package.nix
@ -0,0 +1,33 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "age-plugin-sss";
+  version = "0.2.5";
+
+  src = fetchFromGitHub {
+    owner = "olastor";
+    repo = "age-plugin-sss";
+    tag = "v${version}";
+    hash = "sha256-4cLQRG4Al1C3x/D385kb/aYTlQqe/5bS9oMLJmHOJ1I=";
+  };
+
+  vendorHash = "sha256-HQavX6X2k/oABnHXAnOwHNkGpCTr539zRk0xwO8zS9o=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.version=v${version}"
+  ];
+
+  meta = {
+    description = "Age plugin to split keys and wrap them with different recipients using Shamir's Secret Sharing";
+    homepage = "https://github.com/olastor/age-plugin-sss/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ arbel-arad ];
+    mainProgram = "age-plugin-sss";
+  };
+}
--- a/pkgs/by-name/ag/age-plugin-yubikey/Cargo.lock
+++ b/pkgs/by-name/ag/age-plugin-yubikey/Cargo.lock
--- a/pkgs/by-name/ag/age-plugin-yubikey/package.nix
+++ b/pkgs/by-name/ag/age-plugin-yubikey/package.nix
@ -19,12 +19,8 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-vfemYGQnn3IzG7Y6iVKHZlYN+55/+A+N/GMG3TLs1h0=";
  };

-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "age-core-0.10.0" = "sha256-Iw1KPYhUwfAvLGpYAGuSRhynrRJhD3EqOIS4UY6qC6c=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-CVbRKKX2A0MrHgjkjKAXhX80db1fimFlNxusvseUnxQ=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/by-name/an/anchor/Cargo.lock
+++ b/pkgs/by-name/an/anchor/Cargo.lock
--- a/pkgs/by-name/an/anchor/package.nix
+++ b/pkgs/by-name/an/anchor/package.nix
@ -18,12 +18,8 @@ rustPlatform.buildRustPackage rec {

  cargoPatches = [ ./0001-update-time-rs.patch ];

-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "serum_dex-0.4.0" = "sha256-Nzhh3OcAFE2LcbUgrA4zE2TnUMfV0dD4iH6fTi48GcI=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-CeTkYqRD5Xk61evYLGn8Gtdn2fTUmpKKPyPLtmABv6A=";

  checkFlags = [
    # the following test cases try to access network, skip them
--- a/pkgs/by-name/an/ante/Cargo.lock
+++ b/pkgs/by-name/an/ante/Cargo.lock
@ -1,970 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "ahash"
-version = "0.7.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd"
-dependencies = [
- "getrandom",
- "once_cell",
- "version_check",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "anstream"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
-dependencies = [
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628"
-dependencies = [
- "anstyle",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "ante"
-version = "0.1.1"
-dependencies = [
- "clap",
- "clap_complete",
- "colored",
- "cranelift",
- "cranelift-jit",
- "cranelift-module",
- "cranelift-object",
- "difference",
- "goldentests",
- "inkwell",
- "mimalloc",
- "petgraph",
- "target-lexicon",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.75"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
-
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
-[[package]]
-name = "cc"
-version = "1.0.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "clap"
-version = "4.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64"
-dependencies = [
- "clap_builder",
- "clap_derive",
-]
-
-[[package]]
-name = "clap_builder"
-version = "4.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc"
-dependencies = [
- "anstream",
- "anstyle",
- "clap_lex",
- "strsim",
-]
-
-[[package]]
-name = "clap_complete"
-version = "4.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bffe91f06a11b4b9420f62103854e90867812cd5d01557f853c5ee8e791b12ae"
-dependencies = [
- "clap",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
-
-[[package]]
-name = "colorchoice"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
-
-[[package]]
-name = "colored"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6"
-dependencies = [
- "is-terminal",
- "lazy_static",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "cranelift"
-version = "0.86.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd96bba738454eb373087df6d6891b18009361123fef90930def4978e3837448"
-dependencies = [
- "cranelift-codegen",
- "cranelift-frontend",
-]
-
-[[package]]
-name = "cranelift-bforest"
-version = "0.86.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "529ffacce2249ac60edba2941672dfedf3d96558b415d0d8083cd007456e0f55"
-dependencies = [
- "cranelift-entity",
-]
-
-[[package]]
-name = "cranelift-codegen"
-version = "0.86.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "427d105f617efc8cb55f8d036a7fded2e227892d8780b4985e5551f8d27c4a92"
-dependencies = [
- "cranelift-bforest",
- "cranelift-codegen-meta",
- "cranelift-codegen-shared",
- "cranelift-entity",
- "cranelift-isle",
- "log",
- "regalloc2",
- "smallvec",
- "target-lexicon",
-]
-
-[[package]]
-name = "cranelift-codegen-meta"
-version = "0.86.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "551674bed85b838d45358e3eab4f0ffaa6790c70dc08184204b9a54b41cdb7d1"
-dependencies = [
- "cranelift-codegen-shared",
-]
-
-[[package]]
-name = "cranelift-codegen-shared"
-version = "0.86.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b3a63ae57498c3eb495360944a33571754241e15e47e3bcae6082f40fec5866"
-
-[[package]]
-name = "cranelift-entity"
-version = "0.86.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11aa8aa624c72cc1c94ea3d0739fa61248260b5b14d3646f51593a88d67f3e6e"
-
-[[package]]
-name = "cranelift-frontend"
-version = "0.86.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "544ee8f4d1c9559c9aa6d46e7aaeac4a13856d620561094f35527356c7d21bd0"
-dependencies = [
- "cranelift-codegen",
- "log",
- "smallvec",
- "target-lexicon",
-]
-
-[[package]]
-name = "cranelift-isle"
-version = "0.86.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed16b14363d929b8c37e3c557d0a7396791b383ecc302141643c054343170aad"
-
-[[package]]
-name = "cranelift-jit"
-version = "0.86.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0308e7418208639fb96c1a3dc04955fa41c4bc92dfce9106635185f71d5caf46"
-dependencies = [
- "anyhow",
- "cranelift-codegen",
- "cranelift-entity",
- "cranelift-module",
- "cranelift-native",
- "libc",
- "log",
- "region",
- "target-lexicon",
- "windows-sys 0.36.1",
-]
-
-[[package]]
-name = "cranelift-module"
-version = "0.86.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76979aac10dbcf0c222cd5902565bc93597ac30bbe9d879a2aa5f2402d1561f2"
-dependencies = [
- "anyhow",
- "cranelift-codegen",
-]
-
-[[package]]
-name = "cranelift-native"
-version = "0.86.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51617cf8744634f2ed3c989c3c40cd6444f63377c6d994adab0d85807f3eb682"
-dependencies = [
- "cranelift-codegen",
- "libc",
- "target-lexicon",
-]
-
-[[package]]
-name = "cranelift-object"
-version = "0.86.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50e649a13f3951ad3b8cb13a3a774481c12159a98eb386b04583573c57d7cf56"
-dependencies = [
- "anyhow",
- "cranelift-codegen",
- "cranelift-module",
- "log",
- "object",
- "target-lexicon",
-]
-
-[[package]]
-name = "crc32fast"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
-dependencies = [
- "cfg-if",
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
-dependencies = [
- "autocfg",
- "cfg-if",
- "crossbeam-utils",
- "memoffset",
- "scopeguard",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "difference"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
-
-[[package]]
-name = "either"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
-
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
-[[package]]
-name = "errno"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8"
-dependencies = [
- "libc",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "fixedbitset"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
-
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "goldentests"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8476785a67758ffc17be1d41009468ef27fb96b5211c9d375a4356bf891dcbc5"
-dependencies = [
- "colored",
- "rayon",
- "shlex",
- "similar",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
-dependencies = [
- "ahash",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
-[[package]]
-name = "hashbrown"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
-
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
-
-[[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
-]
-
-[[package]]
-name = "indexmap"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
-dependencies = [
- "equivalent",
- "hashbrown 0.14.2",
-]
-
-[[package]]
-name = "inkwell"
-version = "0.2.0"
-source = "git+https://github.com/TheDan64/inkwell?branch=master#7a09ad8a5f3b1fc416f95b5e1c97d33df0ab3f06"
-dependencies = [
- "either",
- "inkwell_internals",
- "libc",
- "llvm-sys",
- "once_cell",
- "thiserror",
-]
-
-[[package]]
-name = "inkwell_internals"
-version = "0.8.0"
-source = "git+https://github.com/TheDan64/inkwell?branch=master#7a09ad8a5f3b1fc416f95b5e1c97d33df0ab3f06"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "is-terminal"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
-dependencies = [
- "hermit-abi",
- "rustix",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "libc"
-version = "0.2.150"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
-
-[[package]]
-name = "libmimalloc-sys"
-version = "0.1.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829"
-
-[[package]]
-name = "llvm-sys"
-version = "160.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf51981ac0622b10fe4790763e3de1f3d68a0ee4222e03accaaab6731bd508d"
-dependencies = [
- "cc",
- "lazy_static",
- "libc",
- "regex",
- "semver",
-]
-
-[[package]]
-name = "log"
-version = "0.4.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
-
-[[package]]
-name = "mach"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "memchr"
-version = "2.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
-
-[[package]]
-name = "memoffset"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "mimalloc"
-version = "0.1.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c"
-dependencies = [
- "libmimalloc-sys",
-]
-
-[[package]]
-name = "object"
-version = "0.28.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424"
-dependencies = [
- "crc32fast",
- "hashbrown 0.11.2",
- "indexmap 1.9.3",
- "memchr",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
-
-[[package]]
-name = "petgraph"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
-dependencies = [
- "fixedbitset",
- "indexmap 2.1.0",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rayon"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
-dependencies = [
- "crossbeam-deque",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "regalloc2"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d43a209257d978ef079f3d446331d0f1794f5e0fc19b306a199983857833a779"
-dependencies = [
- "fxhash",
- "log",
- "slice-group-by",
- "smallvec",
-]
-
-[[package]]
-name = "regex"
-version = "1.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
-
-[[package]]
-name = "region"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877e54ea2adcd70d80e9179344c97f93ef0dffd6b03e1f4529e6e83ab2fa9ae0"
-dependencies = [
- "bitflags 1.3.2",
- "libc",
- "mach",
- "winapi",
-]
-
-[[package]]
-name = "rustix"
-version = "0.38.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e"
-dependencies = [
- "bitflags 2.4.1",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "semver"
-version = "1.0.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
-
-[[package]]
-name = "shlex"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380"
-
-[[package]]
-name = "similar"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597"
-
-[[package]]
-name = "slice-group-by"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7"
-
-[[package]]
-name = "smallvec"
-version = "1.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
-
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "target-lexicon"
-version = "0.12.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a"
-
-[[package]]
-name = "thiserror"
-version = "1.0.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "utf8parse"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-sys"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
-dependencies = [
- "windows_aarch64_msvc 0.36.1",
- "windows_i686_gnu 0.36.1",
- "windows_i686_msvc 0.36.1",
- "windows_x86_64_gnu 0.36.1",
- "windows_x86_64_msvc 0.36.1",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.48.5",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
--- a/pkgs/by-name/an/ante/package.nix
+++ b/pkgs/by-name/an/ante/package.nix
@ -17,12 +17,9 @@ rustPlatform.buildRustPackage {
    rev = "e38231ffa51b84a2ca53b4b0439d1ca5e0dea32a";
    hash = "sha256-UKEoOm+Jc0YUwO74Tn038MLeX/c3d2z8I0cTBVfX61U=";
  };
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "inkwell-0.2.0" = "sha256-eMoclRtekg8v+m5KsTcjB3zCdPkcJy42NALEEuT/fw8=";
-    };
-  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-uOOSxRoc59XzJT5oVO2NOYC0BwrNq4X6Jd/gQz0ZBp8=";

  /*
     https://crates.io/crates/llvm-sys#llvm-compatibility
--- a/pkgs/by-name/av/avbroot/Cargo.lock
+++ b/pkgs/by-name/av/avbroot/Cargo.lock
--- a/pkgs/by-name/av/avbroot/package.nix
+++ b/pkgs/by-name/av/avbroot/package.nix
@ -19,13 +19,8 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-gG8pR/D5oaPPqq0e815J6z+dDVxh4VSoHIm1Yl3x2p4=";
  };

-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "bzip2-0.4.4" = "sha256-9YKPFvaGNdGPn2mLsfX8Dh90vR+X4l3YSrsz0u4d+uQ=";
-      "zip-0.6.6" = "sha256-oZQOW7xlSsb7Tw8lby4LjmySpWty9glcZfzpPuQSSz0=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-9FM6r7+R9aR0lYJdJxnCuGKLXZ71Ia9UVmY4Pk9UAqw=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/by-name/aw/awatcher/Cargo.lock
+++ b/pkgs/by-name/aw/awatcher/Cargo.lock
--- a/pkgs/by-name/aw/awatcher/package.nix
+++ b/pkgs/by-name/aw/awatcher/package.nix
@ -21,13 +21,8 @@ rustPlatform.buildRustPackage rec {
  buildInputs = [ openssl ];
  doCheck = false;

-  cargoLock = {
-    lockFile = ./Cargo.lock;
-
-    outputHashes = {
-      "aw-client-rust-0.1.0" = "sha256-yliRLPM33GWTPcNBDNuKMOkNOMNfD+TI5nRkh+5YSnw=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-QO6qCQEJesZAN0A0nk2VBxTxElnZy59J7pczX+kBo24=";

  meta = with lib; {
    description = "Activity and idle watchers";
--- a/pkgs/by-name/ax/ax25-apps/package.nix
+++ b/pkgs/by-name/ax/ax25-apps/package.nix
@ -1,25 +1,29 @@
 {
  lib,
  stdenv,
-  fetchurl,
+  fetchFromGitHub,
+  autoreconfHook,
  libax25,
  ncurses,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "ax25-apps";
-  version = "0.0.8-rc5";
+  version = "0.0.8-rc5-unstable-2021-05-13";

  buildInputs = [
+    autoreconfHook
    libax25
    ncurses
  ];

-  # Due to recent unsolvable administrative domain problems with linux-ax25.org,
-  # the new domain is linux-ax25.in-berlin.de
-  src = fetchurl {
-    url = "https://linux-ax25.in-berlin.de/pub/ax25-apps/ax25-apps-${version}.tar.gz";
-    sha256 = "sha256-MzQOIyy5tbJKmojMrgtOcsaQTFJvs3rqt2hUgholz5Y=";
+  # src from linux-ax25.in-berlin.de remote has been
+  # unreliable, pointing to github mirror from the radiocatalog
+  src = fetchFromGitHub {
+    owner = "radiocatalog";
+    repo = "ax25-apps";
+    rev = "afc4a5faa01a24c4da1d152b901066405f36adb6";
+    hash = "sha256-RLeFndis2OhIkJPLD+YfEUrJdZL33huVzlHq+kGq7dA=";
  };

  configureFlags = [
@ -28,11 +32,11 @@ stdenv.mkDerivation rec {
    "--program-transform-name=s@^call$@ax&@;s@^listen$@ax&@"
  ];

-  meta = with lib; {
+  meta = {
    description = "AX.25 ham radio applications";
    homepage = "https://linux-ax25.in-berlin.de/wiki/Main_Page";
-    license = licenses.lgpl21Only;
-    maintainers = with maintainers; [ sarcasticadmin ];
-    platforms = platforms.linux;
+    license = lib.licenses.lgpl21Only;
+    maintainers = with lib.maintainers; [ sarcasticadmin ];
+    platforms = lib.platforms.linux;
  };
 }
--- a/pkgs/by-name/br/brush/package.nix
+++ b/pkgs/by-name/br/brush/package.nix
@ -35,6 +35,8 @@ rustPlatform.buildRustPackage rec {
  doCheck = false;

  passthru = {
+    shellPath = "/bin/brush";
+
    tests = {
      complete = testers.testEqualContents {
        assertion = "brushinfo performs to inspect completions";
--- a/pkgs/by-name/bu/budgie-desktop/package.nix
+++ b/pkgs/by-name/bu/budgie-desktop/package.nix
@ -70,6 +70,13 @@ stdenv.mkDerivation (finalAttrs: {
      url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/ba8170b4f3108f9de28331b6a98a9d92bb0ed4de.patch";
      hash = "sha256-T//1/NmaV81j0jiIYK7vEp8sgKCgF2i10D+Rk9qAAeE=";
    })
+
+    # Resolve vala 0.56.18 compact class inheritance removal
+    # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/679
+    (fetchpatch {
+      url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/46c83b1265b4230668da472d9ef6926941678418.patch";
+      hash = "sha256-qnA8iBEctZbE86qIPudI1vMbgFy4xDWrxxej517ORws=";
+    })
  ];

  nativeBuildInputs = [
--- a/pkgs/by-name/bu/buteo-syncfw/package.nix
+++ b/pkgs/by-name/bu/buteo-syncfw/package.nix
@ -14,7 +14,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "buteo-syncfw";
-  version = "0.11.8";
+  version = "0.11.9";

  outputs = [
    "out"
@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "sailfishos";
    repo = "buteo-syncfw";
    tag = finalAttrs.version;
-    hash = "sha256-QQ2NG+zeKZbmZRdJgEQpx3Y/C+3j91ltC+5CRaf6qBY=";
+    hash = "sha256-4dQl+ghkedYOqFaaY2XYlA59lYtkHCgZXhmyo4dHMsI=";
  };

  postPatch = ''
--- a/pkgs/by-name/ca/castget/package.nix
+++ b/pkgs/by-name/ca/castget/package.nix
@ -1,23 +1,32 @@
 {
  lib,
  stdenv,
-  fetchurl,
+  fetchFromGitHub,
+
+  # native
+  autoreconfHook,
+  glibcLocales,
  pkg-config,
-  glib,
-  ronn,
+
+  # host
  curl,
+  glib,
  id3lib,
  libxml2,
-  glibcLocales,
+  taglib,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "castget";
-  version = "2.0.1";
+  # Using unstable version since it doesn't require `ronn`, see:
+  # https://github.com/mlj/castget/commit/e97b179227b4fc7e2e2bc5a373933624c0467daa
+  version = "2.0.1-unstable-2025-01-25";

-  src = fetchurl {
-    url = "http://savannah.nongnu.org/download/castget/castget-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-Q4tffsfjGkXtN1ZjD+RH9CAVrNpT7AkgL0hihya16HU=";
+  src = fetchFromGitHub {
+    owner = "mlj";
+    repo = "castget";
+    rev = "e97b179227b4fc7e2e2bc5a373933624c0467daa";
+    hash = "sha256-3t/N8JO36wjHuzIdWNstRWphC/ZR6KkZX0l9yKarS7c=";
  };

  # without this, the build fails because of an encoding issue with the manual page.
@ -29,19 +38,20 @@ stdenv.mkDerivation (finalAttrs: {
  '';

  buildInputs = [
-    glib
    curl
+    glib
    id3lib
    libxml2
+    taglib
  ];
  nativeBuildInputs = [
-    ronn
+    autoreconfHook
    # See comment on locale above
    glibcLocales
    pkg-config
  ];

-  meta = with lib; {
+  meta = {
    description = "Simple, command-line based RSS enclosure downloader";
    mainProgram = "castget";
    longDescription = ''
@ -49,8 +59,9 @@ stdenv.mkDerivation (finalAttrs: {
      primarily intended for automatic, unattended downloading of podcasts.
    '';
    homepage = "https://castget.johndal.com/";
-    maintainers = with maintainers; [ doronbehar ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
+    changelog = "https://github.com/mlj/castget/blob/${finalAttrs.version}/CHANGES.md";
+    maintainers = with lib.maintainers; [ doronbehar ];
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
  };
 })
--- a/pkgs/by-name/cl/clive/package.nix
+++ b/pkgs/by-name/cl/clive/package.nix
@ -0,0 +1,56 @@
+{
+  lib,
+  ttyd,
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
+  makeWrapper,
+  versionCheckHook,
+  nix-update-script,
+}:
+buildGoModule rec {
+  pname = "clive";
+  version = "0.12.9";
+
+  src = fetchFromGitHub {
+    owner = "koki-develop";
+    repo = "clive";
+    tag = "v${version}";
+    hash = "sha256-mNx5SCBvhpxk9IkKp1j0oyPNZl91cAKHGIUzyYf+bYU=";
+  };
+
+  vendorHash = "sha256-jHvr2tWp8iscm6vgHdRTYlFmPOWlRG3lz8hl4PM6e/c=";
+  subPackages = [ "." ];
+  buildInputs = [ ttyd ];
+  nativeBuildInputs = [
+    installShellFiles
+    makeWrapper
+  ];
+
+  ldflags = [
+    "-X github.com/koki-develop/clive/cmd.version=${version}"
+  ];
+
+  postInstall = ''
+    wrapProgram $out/bin/clive --prefix PATH : ${ttyd}/bin
+    installShellCompletion --cmd clive \
+      --bash <($out/bin/clive completion bash) \
+      --fish <($out/bin/clive completion fish) \
+      --zsh <($out/bin/clive completion zsh)
+  '';
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doinstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Automates terminal operations";
+    homepage = "https://github.com/koki-develop/clive";
+    changelog = "https://github.com/koki-develop/clive/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ misilelab ];
+    mainProgram = "clive";
+  };
+}
--- a/pkgs/by-name/do/docker-color-output/package.nix
+++ b/pkgs/by-name/do/docker-color-output/package.nix
@ -0,0 +1,33 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+  nix-update-script,
+}:
+
+buildGoModule rec {
+  pname = "docker-color-output";
+  version = "2.5.1";
+
+  src = fetchFromGitHub {
+    owner = "devemio";
+    repo = "docker-color-output";
+    tag = version;
+    hash = "sha256-rnCZ+6t6iOiLBynp1EPshO+/otAdtu8yy1FqFkYB07w=";
+  };
+
+  vendorHash = null;
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Add color to the Docker CLI";
+    mainProgram = "docker-color-output";
+    license = lib.licenses.mit;
+    homepage = "https://github.com/devemio/docker-color-output";
+    changelog = "https://github.com/devemio/docker-color-output/releases/tag/${version}";
+    maintainers = with lib.maintainers; [ sguimmara ];
+  };
+}
--- a/pkgs/by-name/en/ent-go/package.nix
+++ b/pkgs/by-name/en/ent-go/package.nix
@ -7,16 +7,16 @@

 buildGoModule rec {
  pname = "ent-go";
-  version = "0.14.0";
+  version = "0.14.3";

  src = fetchFromGitHub {
    owner = "ent";
    repo = "ent";
    rev = "v${version}";
-    sha256 = "sha256-Jq5txpjv2JxypOXYA8JKT0CNMIaJksMUIdnbwflVMZA=";
+    sha256 = "sha256-rKGzYOdNaSbFyHIuytuppYjpiTz1/tcvXel1SjtwEhA=";
  };

-  vendorHash = "sha256-9KdSGIyi95EVQq9jGoVqK8aq3JXlQXB+Qwlh/Kfz4Oc=";
+  vendorHash = "sha256-ec5tA9TsDKGnHVZWilLj7bdHrd46uQcNQ8YCK/s6UAY=";

  subPackages = [ "cmd/ent" ];

--- a/pkgs/by-name/fl/fluent-bit/package.nix
+++ b/pkgs/by-name/fl/fluent-bit/package.nix
@ -14,13 +14,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "fluent-bit";
-  version = "3.2.6";
+  version = "3.2.8";

  src = fetchFromGitHub {
    owner = "fluent";
    repo = "fluent-bit";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-S0sb954n17z+zrVNkYd6yiV01aNbOLJLOV+34PRkSXQ=";
+    hash = "sha256-E+y8lZ5fgJORFkig6aSVMYGk0US1b4xwjO9qnGu4R/Y=";
  };

  # optional only to avoid linux rebuild
--- a/pkgs/by-name/ha/haste-server/package.nix
+++ b/pkgs/by-name/ha/haste-server/package.nix
@ -22,6 +22,7 @@ buildNpmPackage rec {

  postInstall = ''
    install -Dt "$out/share/haste-server" about.md
+    rm -rf "$out/lib/node_modules/haste/node_modules/.bin/"
  '';

  passthru = {
--- a/pkgs/by-name/is/is-fast/package.nix
+++ b/pkgs/by-name/is/is-fast/package.nix
@ -11,17 +11,17 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "is-fast";
-  version = "0.1.3";
+  version = "0.8.5";

  src = fetchFromGitHub {
    owner = "Magic-JD";
    repo = "is-fast";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-exC9xD0scCa1jYomBCewaLv2kzoxSjHhc75EhEERPR8=";
+    hash = "sha256-6gMXYOgPlVaN5UM+U55Jtbva8/i9BFghBaqboqTwdPg=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-r1neLuUkWVKl7Qc4FNqW1jzX/HHyVJPEqgZV/GYkGRU=";
+  cargoHash = "sha256-EQdO4K3AQL0BR9hnoViiCMhDbcg2db8Ho2Ilvysr1dU=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/applications/terminal-emulators/kitty/themes.nix
+++ b/pkgs/applications/terminal-emulators/kitty/themes.nix
--- a/pkgs/applications/terminal-emulators/kitty/disable-test_ssh_bootstrap_with_different_launchers.patch
+++ b/pkgs/applications/terminal-emulators/kitty/disable-test_ssh_bootstrap_with_different_launchers.patch
--- a/pkgs/applications/terminal-emulators/kitty/fix-test_ssh_env_vars.patch
+++ b/pkgs/applications/terminal-emulators/kitty/fix-test_ssh_env_vars.patch
--- a/pkgs/applications/terminal-emulators/kitty/default.nix
+++ b/pkgs/applications/terminal-emulators/kitty/default.nix
@ -49,26 +49,28 @@
  nix-update-script,
  makeBinaryWrapper,
  autoSignDarwinBinariesHook,
+  cairo,
+  fetchpatch,
 }:

 with python3Packages;
 buildPythonApplication rec {
  pname = "kitty";
-  version = "0.39.1";
+  version = "0.40.0";
  format = "other";

  src = fetchFromGitHub {
    owner = "kovidgoyal";
    repo = "kitty";
    tag = "v${version}";
-    hash = "sha256-Cgbs9tdEGKhDShNh3M8N1UdRJu4aMylr9xLOGLpDAZE=";
+    hash = "sha256-c+u+lMuokDR8kWM0an3jFPC/qoK2RZTKqHZtfEnqtnM=";
  };

  goModules =
    (buildGo123Module {
      pname = "kitty-go-modules";
      inherit src version;
-      vendorHash = "sha256-j5ToLPQeaf4xIaziBAROYZNvoaOx2TkTcuY95X4Neqc=";
+      vendorHash = "sha256-gBEzW2k1HDDmg1P1t6u90Lf1lLe1IKGpF2T9iCA31qs=";
    }).goModules;

  buildInputs =
@ -109,6 +111,7 @@ buildPythonApplication rec {
      wayland
      dbus
      libGL
+      cairo
    ];

  nativeBuildInputs =
@ -156,6 +159,18 @@ buildPythonApplication rec {
    # Skip `test_ssh_bootstrap_with_different_launchers` when launcher is `zsh` since it causes:
    # OSError: master_fd is in error condition
    ./disable-test_ssh_bootstrap_with_different_launchers.patch
+
+    # Remove after 0.40.1
+    (fetchpatch {
+      url = "https://github.com/kovidgoyal/kitty/commit/6171ca6.patch";
+      hash = "sha256-OBB0YcgEYgw3Jcg+Dgus6rwQ4gGL6GMr6pd7m9CGq9k=";
+    })
+
+    (fetchpatch {
+      url = "https://github.com/kovidgoyal/kitty/commit/8cbdd003e2.patch";
+      hash = "sha256-pKIJIqIdPfB4kQ6FtpYDumpgjJkMxoLT8fKzfgWYJnw=";
+    })
+
  ];

  hardeningDisable = [
@ -327,6 +342,7 @@ buildPythonApplication rec {
      rvolosatovs
      Luflosi
      kashw2
+      leiserfg
    ];
  };
 }
--- a/pkgs/applications/terminal-emulators/kitty/zsh-compinit.patch
+++ b/pkgs/applications/terminal-emulators/kitty/zsh-compinit.patch
--- a/pkgs/by-name/ku/kubetui/package.nix
+++ b/pkgs/by-name/ku/kubetui/package.nix
@ -8,13 +8,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "kubetui";
-  version = "1.6.0";
+  version = "1.6.2";

  src = fetchFromGitHub {
    owner = "sarub0b0";
    repo = "kubetui";
    tag = "v${version}";
-    hash = "sha256-GCtcAoN/RjgaspTIR51TJQV2xT3dcVIFazITKVy7qYY=";
+    hash = "sha256-sEl/hkGn9X0NArCMA1Nr+KM5mR8ZXAl4hBiU8zGaS0U=";
  };

  checkFlags = [
@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
    ]
  );
  useFetchCargoVendor = true;
-  cargoHash = "sha256-bRznReljcnRRn2PsOukFHV634CkBByJZxJVyGL4f/10=";
+  cargoHash = "sha256-1wc2mXX2NQdFaygukeaSDn6qHUaBcTRvCo0uSX289s0=";

  meta = {
    homepage = "https://github.com/sarub0b0/kubetui";
--- a/pkgs/by-name/li/libwebsockets/package.nix
+++ b/pkgs/by-name/li/libwebsockets/package.nix
@ -12,13 +12,13 @@

 stdenv.mkDerivation rec {
  pname = "libwebsockets";
-  version = "4.3.3";
+  version = "4.3.5";

  src = fetchFromGitHub {
    owner = "warmcat";
    repo = "libwebsockets";
    rev = "v${version}";
-    hash = "sha256-IXA9NUh55GtZmn4BhCXntVdHcKZ34iZIJ/0wlySj0/M=";
+    hash = "sha256-KOAhIVn4G5u0A1TE75Xv7iYO3/i8foqWYecH0kJHdBM=";
  };

  outputs = [
--- a/pkgs/by-name/ni/nicotine-plus/package.nix
+++ b/pkgs/by-name/ni/nicotine-plus/package.nix
@ -13,7 +13,7 @@
 let

  pname = "nicotine-plus";
-  version = "3.3.8";
+  version = "3.3.10";
 in
 python3Packages.buildPythonApplication {
  inherit pname version;
@ -22,7 +22,7 @@ python3Packages.buildPythonApplication {
    owner = "nicotine-plus";
    repo = "nicotine-plus";
    tag = version;
-    hash = "sha256-KgFxMcL/sT00fkXLgdfDMAMODi4N1j1Y/oEKbjGaRdY=";
+    hash = "sha256-ic/+Us56UewMjD8vgmxxCisoId96Qtaq8/Ll+CCFR3Y=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@ -44,7 +44,7 @@ assert builtins.elem acceleration [
 let
  pname = "ollama";
  # don't forget to invalidate all hashes each update
-  version = "0.5.13";
+  version = "0.6.0";

  buildGoModule = buildGo124Module;

@ -52,11 +52,11 @@ let
    owner = "ollama";
    repo = "ollama";
    tag = "v${version}";
-    hash = "sha256-GRufz01lTSgBmDzRImY02xuAeuzjlIEFWv578fI8ciY=";
+    hash = "sha256-xcnzLBrTbH5IRDZoUR0OoXslcTvml9d/jnQEM52Rmyg=";
    fetchSubmodules = true;
  };

-  vendorHash = "sha256-s/qvMISNpxeEAZx8Je2v4yb2aPWhSYcKhwHQcEXJ20Y=";
+  vendorHash = "sha256-Zpzn2YWpiDAl4cwgrrSpN8CFy4GqqhE1mWsRxtYwdDA=";

  validateFallback = lib.warnIf (config.rocmSupport && config.cudaSupport) (lib.concatStrings [
    "both `nixpkgs.config.rocmSupport` and `nixpkgs.config.cudaSupport` are enabled, "
--- a/pkgs/by-name/or/orca-slicer/package.nix
+++ b/pkgs/by-name/or/orca-slicer/package.nix
@ -38,6 +38,7 @@
  webkitgtk_4_0,
  wxGTK31,
  xorg,
+  libnoise,
  withSystemd ? stdenv.hostPlatform.isLinux,
 }:
 let
@ -54,15 +55,15 @@ let
        ];
      });
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "orca-slicer";
-  version = "v2.2.0-unstable-2025-01-23";
+  version = "v2.3.0-rc";

  src = fetchFromGitHub {
    owner = "SoftFever";
    repo = "OrcaSlicer";
-    rev = "1b1288c4353afca44edee323061bdd5c87fcafb9";
-    hash = "sha256-IPdKusP2cB5jgr6JjQVu8ZjJ2kiG6mfmfZtDVSlAFNg=";
+    tag = finalAttrs.version;
+    hash = "sha256-obQUn5vG+6g8PYK9Xatt3QiBPNWskoTs2Byi+1xabBk=";
  };

  nativeBuildInputs = [
@ -116,9 +117,10 @@ stdenv.mkDerivation rec {
      wxGTK'
      xorg.libX11
      opencv
+      libnoise
    ]
    ++ lib.optionals withSystemd [ systemd ]
-    ++ checkInputs;
+    ++ finalAttrs.checkInputs;

  patches = [
    # Fix for webkitgtk linking
@ -174,23 +176,22 @@ stdenv.mkDerivation rec {

  prePatch = ''
    sed -i 's|nlopt_cxx|nlopt|g' cmake/modules/FindNLopt.cmake
+    sed -i 's|"libnoise/noise.h"|"noise/noise.h"|' src/libslic3r/PerimeterGenerator.cpp
  '';

  cmakeFlags = [
-    "-DSLIC3R_STATIC=0"
-    "-DSLIC3R_FHS=1"
-    "-DSLIC3R_GTK=3"
-    "-DBBL_RELEASE_TO_PUBLIC=1"
-    "-DBBL_INTERNAL_TESTING=0"
-    "-DDEP_WX_GTK3=ON"
-    "-DSLIC3R_BUILD_TESTS=0"
-    "-DCMAKE_CXX_FLAGS=-DBOOST_LOG_DYN_LINK"
-    "-DBOOST_LOG_DYN_LINK=1"
-    "-DBOOST_ALL_DYN_LINK=1"
-    "-DBOOST_LOG_NO_LIB=OFF"
-    "-DCMAKE_CXX_FLAGS=-DGL_SILENCE_DEPRECATION"
-    "-DCMAKE_EXE_LINKER_FLAGS=-Wl,--no-as-needed"
-    "-DORCA_VERSION_CHECK_DEFAULT=OFF"
+    (lib.cmakeBool "SLIC3R_STATIC" false)
+    (lib.cmakeBool "SLIC3R_FHS" true)
+    (lib.cmakeFeature "SLIC3R_GTK" "3")
+    (lib.cmakeBool "BBL_RELEASE_TO_PUBLIC" true)
+    (lib.cmakeBool "BBL_INTERNAL_TESTING" false)
+    (lib.cmakeBool "SLIC3R_BUILD_TESTS" false)
+    (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-DGL_SILENCE_DEPRECATION")
+    (lib.cmakeFeature "CMAKE_EXE_LINKER_FLAGS" "-Wl,--no-as-needed")
+    (lib.cmakeBool "ORCA_VERSION_CHECK_DEFAULT" false)
+    (lib.cmakeFeature "LIBNOISE_INCLUDE_DIR" "${libnoise}/include/noise")
+    (lib.cmakeFeature "LIBNOISE_LIBRARY" "${libnoise}/lib/libnoise-static.a")
+    "-Wno-dev"
  ];

  preFixup = ''
@ -207,7 +208,7 @@ stdenv.mkDerivation rec {
  meta = {
    description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.)";
    homepage = "https://github.com/SoftFever/OrcaSlicer";
-    changelog = "https://github.com/SoftFever/OrcaSlicer/releases/tag/v${version}";
+    changelog = "https://github.com/SoftFever/OrcaSlicer/releases/tag/v${finalAttrs.version}";
    license = lib.licenses.agpl3Only;
    maintainers = with lib.maintainers; [
      zhaofengli
@ -218,4 +219,4 @@ stdenv.mkDerivation rec {
    mainProgram = "orca-slicer";
    platforms = lib.platforms.linux;
  };
-}
+})
--- a/pkgs/by-name/or/orca-slicer/patches/dont-link-opencv-world-orca.patch
+++ b/pkgs/by-name/or/orca-slicer/patches/dont-link-opencv-world-orca.patch
@ -1,14 +1,14 @@
 diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
-index 38a1b2499..00c9060b3 100644
+index 64e0a9e87..e14f29488 100644
 --- a/src/libslic3r/CMakeLists.txt
 +++ b/src/libslic3r/CMakeLists.txt
-@@ -573,7 +573,8 @@ target_link_libraries(libslic3r
+@@ -576,7 +576,8 @@ target_link_libraries(libslic3r
     mcut
     JPEG::JPEG
     qoi
 -    opencv_world
 +    opencv_core
 +    opencv_imgproc
+     noise::noise
     )
 
- if(NOT WIN32)
--- a/pkgs/by-name/po/portfolio/package.nix
+++ b/pkgs/by-name/po/portfolio/package.nix
@ -33,11 +33,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "PortfolioPerformance";
-  version = "0.74.1";
+  version = "0.74.2";

  src = fetchurl {
    url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz";
-    hash = "sha256-KV+I2e1I1ZvyvNpTKpKt/l+rQ/HIcZuQ8gwVbnoahmA=";
+    hash = "sha256-RPoEby12DiJwdM2ejVfOQyrJjy/qgQ9BbqYyaV9KMD0=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/po/postmoogle/package.nix
+++ b/pkgs/by-name/po/postmoogle/package.nix
@ -5,13 +5,13 @@
 }:
 buildGoModule rec {
  pname = "postmoogle";
-  version = "0.9.24";
+  version = "0.9.25";

  src = fetchFromGitHub {
    owner = "etkecc";
    repo = "postmoogle";
    tag = "v${version}";
-    hash = "sha256-6KxPsg1zy8Dpo0UcgEWRmH6bI5oKJyzkZTelgk3SjoY=";
+    hash = "sha256-Pn+IHqHvKo1936Pw8WI2IhporIy/sIvh8PAUt0y5niU=";
  };

  tags = [
--- a/pkgs/by-name/py/pyradio/package.nix
+++ b/pkgs/by-name/py/pyradio/package.nix
@ -7,13 +7,13 @@

 python3Packages.buildPythonApplication rec {
  pname = "pyradio";
-  version = "0.9.3.11.4";
+  version = "0.9.3.11.5";

  src = fetchFromGitHub {
    owner = "coderholic";
    repo = "pyradio";
    tag = version;
-    hash = "sha256-r/XJIHxi/0+G+Xm0ftuffl01SGwnkSXk0OpAy8yoXzc=";
+    hash = "sha256-+guMfdYmXnWARyl5TQVUk2jCkIs11I5d0PMlCzs4ZFo=";
  };

  nativeBuildInputs = [
@ -47,7 +47,7 @@ python3Packages.buildPythonApplication rec {
    homepage = "http://www.coderholic.com/pyradio/";
    description = "Curses based internet radio player";
    mainProgram = "pyradio";
-    changelog = "https://github.com/coderholic/pyradio/releases/tag/${version}";
+    changelog = "https://github.com/coderholic/pyradio/releases/tag/${src.tag}";
    license = licenses.mit;
    maintainers = with maintainers; [
      contrun
--- a/pkgs/by-name/sn/snapcraft/package.nix
+++ b/pkgs/by-name/sn/snapcraft/package.nix
@ -104,6 +104,7 @@ python3Packages.buildPythonApplication rec {
  build-system = with python3Packages; [ setuptools-scm ];

  pythonRelaxDeps = [
+    "click"
    "craft-parts"
    "cryptography"
    "docutils"
--- a/pkgs/by-name/st/streamrip/package.nix
+++ b/pkgs/by-name/st/streamrip/package.nix
@ -8,14 +8,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "streamrip";
-  version = "2.0.5";
+  version = "2.1.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "nathom";
    repo = "streamrip";
    rev = "v${version}";
-    hash = "sha256-KwMt89lOPGt6nX7ywliG/iAJ1WnG0CRPwhAVlPR85q0=";
+    hash = "sha256-Klrkz0U36EIGO2sNxTnKPACvvqu1sslLFFrQRjFdxiE=";
  };

  patches = [
--- a/pkgs/by-name/to/tootik/package.nix
+++ b/pkgs/by-name/to/tootik/package.nix
@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "tootik";
-  version = "0.15.3";
+  version = "0.15.4";

  src = fetchFromGitHub {
    owner = "dimkr";
    repo = "tootik";
    tag = version;
-    hash = "sha256-2MD4WNeJ0XxbpMWelG+O25gXiTM5HeR1SJlN3gavg7I=";
+    hash = "sha256-BkMGozLr6yBj8TPhjJNUwH/SIC8qJ+HYne7CvJgbj3I=";
  };

-  vendorHash = "sha256-olXKx5uvdvms5oquZ21MsRFFVbtM/xi4Bk4QizwjjUs=";
+  vendorHash = "sha256-l5u4ImpMASri+3ph/Q5gs0oWPAk81ZmFkNfiMnIHxuU=";

  nativeBuildInputs = [ openssl ];

--- a/pkgs/by-name/vf/vfkit/package.nix
+++ b/pkgs/by-name/vf/vfkit/package.nix
@ -4,6 +4,7 @@
  buildGoModule,
  darwin,
  fetchFromGitHub,
+  fetchpatch2,
  nix-update-script,
  testers,
  vfkit,
@ -20,6 +21,13 @@ buildGoModule rec {
    hash = "sha256-uBFL3iZLpGcVUSgZSoq8FI87CDAr3NI8uu+u5UsrZCc=";
  };

+  patches = [
+    (fetchpatch2 {
+      url = "https://github.com/crc-org/vfkit/pull/276/commits/97ad151b208593d2fa0227ef5117f1ff2667b562.patch?full_index=1";
+      hash = "sha256-rcKLMXk5B2JoDpsNH4+aBmOidh9HtVQeYhx5q1raFJU=";
+    })
+  ];
+
  vendorHash = "sha256-+5QZcoI+/98hyd87NV6uX/VZqd5z38fk7K7RibX/9vw=";

  subPackages = [ "cmd/vfkit" ];
--- a/pkgs/by-name/x1/x11idle/package.nix
+++ b/pkgs/by-name/x1/x11idle/package.nix
@ -1,43 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  libXScrnSaver,
-  libX11,
-}:
-
-stdenv.mkDerivation rec {
-  version = "9.2.4";
-  pname = "x11idle-org";
-
-  src = fetchurl {
-    url = "https://code.orgmode.org/bzg/org-mode/raw/release_${version}/contrib/scripts/x11idle.c";
-    sha256 = "0fc5g57xd6bmghyl214gcff0ni3idv33i3gkr339kgn1mdjljv5g";
-  };
-
-  buildInputs = [
-    libXScrnSaver
-    libX11
-  ];
-
-  dontUnpack = true;
-
-  installPhase = ''
-    mkdir -p $out/bin
-    gcc -lXss -lX11 $src -o $out/bin/x11idle
-  '';
-
-  meta = with lib; {
-    description = ''
-      Compute consecutive idle time for current X11 session with millisecond resolution
-    '';
-    longDescription = ''
-      Idle time passes when the user does not act, i.e. when the user doesn't move the mouse or use the keyboard.
-    '';
-    homepage = "https://orgmode.org/";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.swflint ];
-    mainProgram = "x11idle";
-  };
-}
--- a/pkgs/development/compilers/openjdk/23/source.json
+++ b/pkgs/development/compilers/openjdk/23/source.json
@ -1,6 +1,6 @@
 {
-  "hash": "sha256-Sl0aEtndzlyuwMtcjOeDe2CVls89ONzicP5IXhAU2FA=",
+  "hash": "sha256-zlL2DV6iOfV3hgq/Ci95gTwVrhcvz5MWsg4/+O2ntE8=",
  "owner": "openjdk",
  "repo": "jdk23u",
-  "rev": "refs/tags/jdk-23.0.1+11"
+  "rev": "refs/tags/jdk-23.0.2+7"
 }
--- a/pkgs/development/ocaml-modules/sail/default.nix
+++ b/pkgs/development/ocaml-modules/sail/default.nix
@ -1,10 +1,13 @@
 {
  lib,
-  fetchFromGitHub,
+  stdenv,
+  darwin,
+  fetchurl,
  buildDunePackage,
  base64,
  omd,
  menhir,
+  menhirLib,
  ott,
  linenoise,
  dune-site,
@ -13,33 +16,37 @@
  lem,
  linksem,
  yojson,
+  version ? "0.18",
 }:

-buildDunePackage rec {
+buildDunePackage {
  pname = "sail";
-  version = "0.16";
+  inherit version;

-  src = fetchFromGitHub {
-    owner = "rems-project";
-    repo = "sail";
-    rev = version;
-    hash = "sha256-HY/rgWi0S7ZiAWZF0fVIRK6fpoJ7Xp5EQcxoPRCPJ5Y=";
+  src = fetchurl {
+    url = "https://github.com/rems-project/sail/releases/download/${version}/sail-${version}.tbz";
+    hash = "sha256-/NvaFPHtWfow4j2jSr4CVHQW48KoP77uVgbhAKXtzzU=";
  };

  minimalOCamlVersion = "4.08";

-  nativeBuildInputs = [
-    makeWrapper
-    ott
-    menhir
-    lem
-  ];
+  nativeBuildInputs =
+    [
+      makeWrapper
+      ott
+      menhir
+      lem
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+      darwin.sigtool
+    ];

  propagatedBuildInputs = [
    base64
    omd
    dune-site
    linenoise
+    menhirLib
    pprint
    linksem
    yojson
--- a/pkgs/development/python-modules/aioambient/default.nix
+++ b/pkgs/development/python-modules/aioambient/default.nix
@ -32,7 +32,7 @@ buildPythonPackage rec {

  postPatch = ''
    substituteInPlace pyproject.toml \
-      --replace-fail "poetry-core==" "poetry-core>="
+      --replace-fail poetry-core==2.0.1 poetry-core
  '';

  build-system = [ poetry-core ];
--- a/pkgs/development/python-modules/aioguardian/default.nix
+++ b/pkgs/development/python-modules/aioguardian/default.nix
@ -32,7 +32,7 @@ buildPythonPackage rec {

  postPatch = ''
    substituteInPlace pyproject.toml \
-      --replace-fail "poetry-core==" "poetry-core>="
+      --replace-fail poetry-core==2.0.1 poetry-core
  '';

  pythonRelaxDeps = [
--- a/pkgs/development/python-modules/aiowebdav2/default.nix
+++ b/pkgs/development/python-modules/aiowebdav2/default.nix
@ -16,14 +16,14 @@

 buildPythonPackage rec {
  pname = "aiowebdav2";
-  version = "0.4.1";
+  version = "0.4.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "jpbede";
    repo = "aiowebdav2";
    tag = "v${version}";
-    hash = "sha256-IhIfz3XVspQi/4uYxxKOexbg1/oYmOuBKfbpuUZ1n24=";
+    hash = "sha256-ftz5FYY1mTVSI0dn1Oc0GfDv7rBnsl/sIn81YG9IARE=";
  };

  build-system = [ poetry-core ];
--- a/pkgs/development/python-modules/ayla-iot-unofficial/default.nix
+++ b/pkgs/development/python-modules/ayla-iot-unofficial/default.nix
@ -12,14 +12,14 @@

 buildPythonPackage rec {
  pname = "ayla-iot-unofficial";
-  version = "1.4.5";
+  version = "1.4.7";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "rewardone";
    repo = "ayla-iot-unofficial";
    tag = "v${version}";
-    hash = "sha256-FV3jes1cpvYbpCmJ+gdzBdsii1kyYe46R1NIpxiELBY=";
+    hash = "sha256-N3xgtqb6QL58FgG7kv7vD8wwNxqZZWAcz2E1NvPwcfI=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/bleak-esphome/default.nix
+++ b/pkgs/development/python-modules/bleak-esphome/default.nix
@ -5,6 +5,7 @@
  bleak-retry-connector,
  bluetooth-data-tools,
  buildPythonPackage,
+  cython,
  fetchFromGitHub,
  habluetooth,
  lru-dict,
@ -13,21 +14,31 @@
  pytest-codspeed,
  pytest-cov-stub,
  pytestCheckHook,
+  setuptools,
 }:

 buildPythonPackage rec {
  pname = "bleak-esphome";
-  version = "2.9.0";
+  version = "2.11.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "bluetooth-devices";
    repo = "bleak-esphome";
    tag = "v${version}";
-    hash = "sha256-KuaaZXABR/jbC9ZNbVOyrezUZzb6w7Tn7s3VuVuAtfI=";
+    hash = "sha256-5APHpb2h//krpgVJs6pOPLapGZFzbFKNjFxDqpNyApQ=";
  };

-  build-system = [ poetry-core ];
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools>=75.8.2" setuptools
+  '';
+
+  build-system = [
+    cython
+    poetry-core
+    setuptools
+  ];

  dependencies = [
    aioesphomeapi
--- a/pkgs/development/python-modules/bytecode/default.nix
+++ b/pkgs/development/python-modules/bytecode/default.nix
@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "bytecode";
-  version = "0.16.0";
+  version = "0.16.1";
  format = "pyproject";
  disabled = pythonOlder "3.6";

@ -17,7 +17,7 @@ buildPythonPackage rec {
    owner = "vstinner";
    repo = pname;
    tag = version;
-    hash = "sha256-Nj/GKZC+zZt1M4Qd7CMXQCLwTIu64aidasH4PwBLtzw=";
+    hash = "sha256-ckakH+H4h2Iwl4tkUpnVV23dkKP9Q7I86oygxfHkXU8=";
  };

  nativeBuildInputs = [ setuptools-scm ];
--- a/pkgs/development/python-modules/craft-grammar/default.nix
+++ b/pkgs/development/python-modules/craft-grammar/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "craft-grammar";
-  version = "2.0.1";
+  version = "2.0.2";

  pyproject = true;

@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "canonical";
    repo = "craft-grammar";
    tag = version;
-    hash = "sha256-xex+7rCXqRegnws470VtVltM49fx7fSHzWDZawRmOdM=";
+    hash = "sha256-i6dy0YNCsYIW9Uw9RcnTrOXMY6Sgwftrg27WE3tskoA=";
  };

  build-system = [ setuptools-scm ];
--- a/pkgs/development/python-modules/evohome-async/default.nix
+++ b/pkgs/development/python-modules/evohome-async/default.nix
@ -20,7 +20,7 @@

 buildPythonPackage rec {
  pname = "evohome-async";
-  version = "1.0.3";
+  version = "1.0.4";
  pyproject = true;

  disabled = pythonOlder "3.12";
@ -29,7 +29,7 @@ buildPythonPackage rec {
    owner = "zxdavb";
    repo = "evohome-async";
    tag = version;
-    hash = "sha256-VjUndmthuKGlvFX6sTWWxeGWFWDwN+UEtS9J/8nKQ9s=";
+    hash = "sha256-nQEnhm70BseurCX3SR6jZvgq2TRI1DtmY6ygyalsZKY=";
  };

  build-system = [ hatchling ];
--- a/pkgs/development/python-modules/librosa/default.nix
+++ b/pkgs/development/python-modules/librosa/default.nix
@ -2,9 +2,7 @@
  lib,
  stdenv,
  buildPythonPackage,
-  pythonAtLeast,
  fetchFromGitHub,
-  fetchpatch2,

  # build-system
  setuptools,
@ -23,6 +21,8 @@
  scipy,
  soundfile,
  soxr,
+  standard-aifc,
+  standard-sunau,
  typing-extensions,

  # tests
@ -38,35 +38,17 @@

 buildPythonPackage rec {
  pname = "librosa";
-  version = "0.10.2.post1";
+  version = "0.11.0";
  pyproject = true;

-  disabled = pythonAtLeast "3.13";
-
  src = fetchFromGitHub {
    owner = "librosa";
    repo = "librosa";
    tag = version;
    fetchSubmodules = true; # for test data
-    hash = "sha256-0FbKVAFWmcFTW2dR27nif6hPZeIxFWYF1gTm4BEJZ/Q=";
+    hash = "sha256-T58J/Gi3tHzelr4enbYJi1KmO46QxE5Zlhkc0+EgvRg=";
  };

-  patches = [
-    (fetchpatch2 {
-      # https://github.com/librosa/librosa/issues/1849
-      name = "librosa-scipy-1.14-compat.patch";
-      url = "https://github.com/librosa/librosa/commit/d0a12c87cdff715ffb8ac1c7383bba1031aa71e4.patch";
-      hash = "sha256-NHuGo4U1FRikb5OIkycQBvuZ+0OdG/VykTcuhXkLUug=";
-    })
-    # Fix numpy2 test incompatibilities
-    # TODO: remove when updating to the next release
-    (fetchpatch2 {
-      name = "numpy2-support-tests";
-      url = "https://github.com/librosa/librosa/commit/7eb0a09e703a72a5979049ec546a522c70285aff.patch";
-      hash = "sha256-m9UpSDKOAr7qzTtahVQktu259cp8QDYjDChpQV0xuY0=";
-    })
-  ];
-
  build-system = [ setuptools ];

  dependencies = [
@ -78,10 +60,12 @@ buildPythonPackage rec {
    numba
    numpy
    pooch
-    scipy
    scikit-learn
+    scipy
    soundfile
    soxr
+    standard-aifc
+    standard-sunau
    typing-extensions
  ];

@ -110,8 +94,6 @@ buildPythonPackage rec {
      "test_cite_released"
      "test_cite_badversion"
      "test_cite_unreleased"
-      # assert 22050 == np.int64(30720)
-      "test_stream"
    ]
    ++ lib.optionals stdenv.hostPlatform.isDarwin [
      # crashing the python interpreter
@ -138,10 +120,5 @@ buildPythonPackage rec {
    changelog = "https://github.com/librosa/librosa/releases/tag/${version}";
    license = lib.licenses.isc;
    maintainers = with lib.maintainers; [ GuillaumeDesforges ];
-    badPlatforms = [
-      # Several non-deterministic occurrences of "Fatal Python error: Segmentation fault", both in
-      # numpy's and in this package's code.
-      "aarch64-linux"
-    ];
  };
 }
--- a/pkgs/development/python-modules/netbox-plugin-prometheus-sd/default.nix
+++ b/pkgs/development/python-modules/netbox-plugin-prometheus-sd/default.nix
@ -11,7 +11,7 @@

 buildPythonPackage rec {
  pname = "netbox-plugin-prometheus-sd";
-  version = "1.1.1";
+  version = "1.1.2";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "FlxPeters";
    repo = "netbox-plugin-prometheus-sd";
    tag = "v${version}";
-    hash = "sha256-UtvSkqs2PN3uxCB78hJjh0lZ1WbZGjDpwlKyeAGpiEM=";
+    hash = "sha256-R/gUaRAHI0+U4TGjqo3kK/rhIamRY4F68cg5plGIQaE=";
  };

  postPatch = ''
@ -48,7 +48,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Netbox plugin to provide Netbox entires to Prometheus HTTP service discovery";
    homepage = "https://github.com/FlxPeters/netbox-plugin-prometheus-sd";
-    changelog = "https://github.com/FlxPeters/netbox-plugin-prometheus-sd/releases/tag/v${version}";
+    changelog = "https://github.com/FlxPeters/netbox-plugin-prometheus-sd/releases/tag/${src.tag}";
    license = licenses.mit;
    maintainers = with maintainers; [ xanderio ];
  };
--- a/pkgs/development/python-modules/odc-geo/default.nix
+++ b/pkgs/development/python-modules/odc-geo/default.nix
@ -30,14 +30,14 @@

 buildPythonPackage rec {
  pname = "odc-geo";
-  version = "0.4.9";
+  version = "0.4.10";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "opendatacube";
    repo = "odc-geo";
    tag = "v${version}";
-    hash = "sha256-7OhXx+lPvZSHP+aP3ucIkVBvW5De0FLNa+azc3Ar050=";
+    hash = "sha256-f4wUUzcv4NM44zrCvW3sBRybppIBZEAm+oiTSW1B+Fw=";
  };

  build-system = [
@ -110,7 +110,7 @@ buildPythonPackage rec {
      with geospatial metadata and geo-registered `xarray` rasters.
    '';
    homepage = "https://github.com/opendatacube/odc-geo/";
-    changelog = "https://github.com/opendatacube/odc-geo/tag/v${version}";
+    changelog = "https://github.com/opendatacube/odc-geo/tag/${src.tag}";
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ daspk04 ];
  };
--- a/pkgs/development/python-modules/pydrawise/default.nix
+++ b/pkgs/development/python-modules/pydrawise/default.nix
@ -18,7 +18,7 @@

 buildPythonPackage rec {
  pname = "pydrawise";
-  version = "2025.2.0";
+  version = "2025.3.0";
  pyproject = true;

  disabled = pythonOlder "3.10";
@ -27,7 +27,7 @@ buildPythonPackage rec {
    owner = "dknowles2";
    repo = "pydrawise";
    tag = version;
-    hash = "sha256-eyAhEIUUqDURzp/6/MX51W0efYCeY75M6LTaoNVwkw4=";
+    hash = "sha256-sstHydNXoz7fwNrN/9gIRg+9H6vF8WR6sGL04RatTkw=";
  };

  build-system = [
--- a/pkgs/development/python-modules/pyheos/default.nix
+++ b/pkgs/development/python-modules/pyheos/default.nix
@ -10,14 +10,14 @@

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

  src = fetchFromGitHub {
    owner = "andrewsayre";
    repo = "pyheos";
    tag = version;
-    hash = "sha256-1JybtE5wweuIgZ8eFUX9XYPji7FzxbRFPKy75Fp1nw0=";
+    hash = "sha256-1Jv1889RSjuediG5RGRcNdr1OmlOhpzqodgjnNmE2RY=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/pysmartthings/default.nix
+++ b/pkgs/development/python-modules/pysmartthings/default.nix
@ -1,8 +1,8 @@
 {
  lib,
  aiohttp,
+  aiohttp-sse-client2,
  aioresponses,
-  aiosseclient,
  buildPythonPackage,
  fetchFromGitHub,
  mashumaro,
@ -18,7 +18,7 @@

 buildPythonPackage rec {
  pname = "pysmartthings";
-  version = "2.7.0";
+  version = "2.7.2";
  pyproject = true;

  disabled = pythonOlder "3.12";
@ -27,14 +27,14 @@ buildPythonPackage rec {
    owner = "andrewsayre";
    repo = "pysmartthings";
    rev = "v${version}";
-    hash = "sha256-ocLJWefXGq2gk6EBi5cKP8kdNBkPiF4I4NXFAaIkAjs=";
+    hash = "sha256-2MBm0I9dBr2N5iorN9BSKecHLnvmiTmcsIuGjDIWIKQ=";
  };

  build-system = [ poetry-core ];

  dependencies = [
    aiohttp
-    aiosseclient
+    aiohttp-sse-client2
    mashumaro
    orjson
    yarl
--- a/pkgs/development/python-modules/python-roborock/default.nix
+++ b/pkgs/development/python-modules/python-roborock/default.nix
@ -22,16 +22,16 @@

 buildPythonPackage rec {
  pname = "python-roborock";
-  version = "2.12.1";
+  version = "2.12.2";
  pyproject = true;

-  disabled = pythonOlder "3.10";
+  disabled = pythonOlder "3.11";

  src = fetchFromGitHub {
    owner = "humbertogontijo";
    repo = "python-roborock";
    tag = "v${version}";
-    hash = "sha256-oUsnjvrPq4VcYwafZqzZkA2I9Hs75j03nOcIIO7abpk=";
+    hash = "sha256-QAv4R4Nnn+BcPp0ktf7riKt+ZvaZTF5KI9sjjtDH3SY=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/pythonocc-core/default.nix
+++ b/pkgs/development/python-modules/pythonocc-core/default.nix
@ -14,19 +14,20 @@
  libXi,
  libXmu,
  opencascade-occt,
+  numpy,
  rapidjson,
  swig,
 }:

 stdenv.mkDerivation rec {
  pname = "pythonocc-core";
-  version = "7.6.2";
+  version = "7.8.1.1";

  src = fetchFromGitHub {
    owner = "tpaviot";
    repo = "pythonocc-core";
    tag = version;
-    hash = "sha256-45pqPQ07KYlpFwJSAYVHbzuqDQTbAvPpxReal52DCzU=";
+    hash = "sha256-0o2PQEN0/Z7FUPZEo2HxFFa+mN2bZnYI++HVu4ONpNA=";
  };

  postPatch = ''
@ -50,12 +51,14 @@ stdenv.mkDerivation rec {
    libXmu
    libXi
    fontconfig
+    numpy
    rapidjson
  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ];

  cmakeFlags = [
    "-Wno-dev"
    "-DPYTHONOCC_INSTALL_DIRECTORY=${placeholder "out"}/${python.sitePackages}/OCC"
+    "-DPYTHONOCC_MESHDS_NUMPY=on"
  ];

  passthru = {
--- a/pkgs/development/python-modules/rtree/default.nix
+++ b/pkgs/development/python-modules/rtree/default.nix
@ -13,16 +13,16 @@

 buildPythonPackage rec {
  pname = "rtree";
-  version = "1.3.0";
+  version = "1.4.0";
  pyproject = true;

-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";

  src = fetchFromGitHub {
    owner = "Toblerity";
    repo = "rtree";
    tag = version;
-    hash = "sha256-yuSPRb8SRz+FRmwFCKDx+gtp9IWaneQ84jDuZP7TX0A=";
+    hash = "sha256-swFvo57EUy69OInJNQzOzhjmfEIGL0aJSvYhzcmSzSs=";
  };

  postPatch = ''
@ -47,7 +47,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "R-Tree spatial index for Python GIS";
    homepage = "https://github.com/Toblerity/rtree";
-    changelog = "https://github.com/Toblerity/rtree/blob/${version}/CHANGES.rst";
+    changelog = "https://github.com/Toblerity/rtree/blob/${src.tag}/CHANGES.rst";
    license = licenses.mit;
    maintainers = with maintainers; teams.geospatial.members ++ [ bgamari ];
  };
--- a/pkgs/development/python-modules/standard-sunau/default.nix
+++ b/pkgs/development/python-modules/standard-sunau/default.nix
@ -0,0 +1,41 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  audioop-lts,
+  pytestCheckHook,
+}:
+buildPythonPackage rec {
+  pname = "standard-sunau";
+  version = "3.13.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "youknowone";
+    repo = "python-deadlib";
+    tag = "v${version}";
+    hash = "sha256-vhGFTd1yXL4Frqli5D1GwOatwByDjvcP8sxgkdu6Jqg=";
+  };
+
+  sourceRoot = "${src.name}/sunau";
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    audioop-lts
+  ];
+
+  pythonImportsCheck = [ "sunau" ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  meta = {
+    description = "Standard library sunau redistribution";
+    homepage = "https://github.com/youknowone/python-deadlib/tree/main/sunau";
+    license = lib.licenses.psfl;
+    maintainers = with lib.maintainers; [ GuillaumeDesforges ];
+  };
+}
--- a/pkgs/development/python-modules/tinygrad/default.nix
+++ b/pkgs/development/python-modules/tinygrad/default.nix
@ -236,6 +236,10 @@ buildPythonPackage rec {
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ GaetanLepage ];
    badPlatforms = [
+      # Fatal Python error: Aborted
+      # onnxruntime/capi/_pybind_state.py", line 32 in <module>
+      "aarch64-linux"
+
      # Tests segfault on darwin
      lib.systems.inspect.patterns.isDarwin
    ];
--- a/pkgs/development/python-modules/zha/default.nix
+++ b/pkgs/development/python-modules/zha/default.nix
@ -27,7 +27,7 @@

 buildPythonPackage rec {
  pname = "zha";
-  version = "0.0.51";
+  version = "0.0.52";
  pyproject = true;

  disabled = pythonOlder "3.12";
@ -36,7 +36,7 @@ buildPythonPackage rec {
    owner = "zigpy";
    repo = "zha";
    tag = version;
-    hash = "sha256-zcLhmUNjPgZNDcG1Nq2LrcW0hsvPvoFdZ6L9ejGPgaQ=";
+    hash = "sha256-tGVRlYUoXS3uEAis9NE3gYBjbY5KzMvx8+J67BgU3kI=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/zigpy/default.nix
+++ b/pkgs/development/python-modules/zigpy/default.nix
@ -27,7 +27,7 @@

 buildPythonPackage rec {
  pname = "zigpy";
-  version = "0.76.2";
+  version = "0.77.1";
  pyproject = true;

  disabled = pythonOlder "3.9";
@ -36,7 +36,7 @@ buildPythonPackage rec {
    owner = "zigpy";
    repo = "zigpy";
    tag = version;
-    hash = "sha256-FJ1mEo/+U0wqLRnmro34UVDwzVJXhI4aJtcvfDboPlc=";
+    hash = "sha256-gvgGRTZc+JT0seeDyiu59Bxxp7J/gGIO0rCCtTeS9t4=";
  };

  postPatch = ''
--- a/pkgs/development/tools/electron/binary/generic.nix
+++ b/pkgs/development/tools/electron/binary/generic.nix
@ -128,13 +128,6 @@ let
    vulkan-loader
  ];

-  # Fix read out of range on aarch64 16k pages builds
-  # https://github.com/NixOS/nixpkgs/pull/365364
-  # https://github.com/NixOS/nixpkgs/pull/380991
-  # Can likely be removed when v34.2.1 (or v32.3.0?) releases:
-  # https://github.com/electron/electron/pull/45571
-  needsAarch64PageSizeFix = lib.versionAtLeast version "34" && stdenv.hostPlatform.isAarch64;
-
  linux = finalAttrs: {
    buildInputs = [
      glib
@ -162,8 +155,7 @@ let

    preFixup = ''
      makeWrapper "$out/libexec/electron/electron" $out/bin/electron \
-        "''${gappsWrapperArgs[@]}" \
-        ${lib.optionalString needsAarch64PageSizeFix "--add-flags '--js-flags=--no-decommit-pooled-pages'"}
+        "''${gappsWrapperArgs[@]}"
    '';

    postFixup = ''
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@ -12,24 +12,24 @@
    },
    "33": {
        "hashes": {
-            "aarch64-darwin": "f9958bb4fe0e2f75ae96c4a34fb77f7af3f3daa05ca0d1912ff130dd2c238198",
-            "aarch64-linux": "0707c59025e9de913e155e54434afe5f9833b09da4f0f4f87653ac2194d01629",
-            "armv7l-linux": "e77a264223bb1f81224e14dff3682a00f111a4610d342dfd71e4c82e4c605055",
-            "headers": "1x430y2zw2qysz82jv1s3hk37qrxmv7g8q292ghp6h3cwngwpiq7",
-            "x86_64-darwin": "f987547716e4d03803503ffe33aac322f70b7992d2b3d37436e182d7b3c4f48f",
-            "x86_64-linux": "6f34eb4c27c2acc313f6b711ad798c840768f05eec083eccaf41579823f96add"
+            "aarch64-darwin": "9ccd393f8e7d817fb4595fd082b1e791ff0a794b34c50d71bd0c8ac37b8ced45",
+            "aarch64-linux": "10c2abca8baa52f5fac1ddf48450135ea321e8e2d177598798232ad8ea268f77",
+            "armv7l-linux": "e485d0e0d5a7e923e9060e34a0473b561a7e1f58d878e856cd86562a30d9fb9e",
+            "headers": "17sxs7qxjy3r9vxlvmm1l3hnr82w9yqjybkjhx7dramq5c3r9fc3",
+            "x86_64-darwin": "b072f47e5140b7f0bb9be8aa30e57a863056d4da260daec7228b4452369e9b85",
+            "x86_64-linux": "3d14f1447654542bafd40736a131478fa2496955533043f21e306b06c923cf65"
        },
-        "version": "33.4.2"
+        "version": "33.4.3"
    },
    "34": {
        "hashes": {
-            "aarch64-darwin": "a55e2923651791d8517241f7334f336a7b3a736c35643fccbd32b7ba2e37ca1d",
-            "aarch64-linux": "06895af4db0762a2c33f065bd71b92ebec5c9c557ffb2e3402aac74880687310",
-            "armv7l-linux": "e7c7d9dc69f882c095d560cc20743790d15dbfd868fdfc91f81deeeae6fff90a",
-            "headers": "1fgagzl5568pnk1h4sil6k8i1ghdmfdhjazg5v6prsky0q8xa325",
-            "x86_64-darwin": "67a85561dee115195dc161ea512b93b7f524891eee5f271b8f93d63f8146bfc4",
-            "x86_64-linux": "263ce56f37b6ab7954d1644bebd429c4c1522ddc48b55e8b3cbc4098def62588"
+            "aarch64-darwin": "2a4aa7e8fa30f229e465ebd18d3e4722e2b41529dc51a68a954d333a7e556ffe",
+            "aarch64-linux": "774e4ccb39d553e5487994a9f8c60774a90f08cdb049ff65f3963fc27c969ff2",
+            "armv7l-linux": "73ae92c8fffb351d3a455569cf57ce9a3f676f42bf61939c613c607fe0fc3bfb",
+            "headers": "0qzvyqr3jy5bkfv9rwngqjad0gbq1f399d077y4vad5i0mrpqn61",
+            "x86_64-darwin": "23938c62257a65a863ed7aa7c7966ba5f257a7d3dc16c78293e826962cc39c5c",
+            "x86_64-linux": "7b74c0c4fae82e27c7e9cbca13e9763e046113dba8737d3e27de9a0b300ac87e"
        },
-        "version": "34.3.0"
+        "version": "34.3.2"
    }
 }
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@ -12,24 +12,24 @@
    },
    "33": {
        "hashes": {
-            "aarch64-darwin": "6865c4169468dbbf6e18810cfb51a3eb47bf8f2c503101cdece257d902c91b31",
-            "aarch64-linux": "f4f0cfdfc02beab23df4fa30b09adee8e4d4b7c8674e75747fdbcb5aa612f62b",
-            "armv7l-linux": "04ab8fa11c0d14bf948b71b1edaa2e5d4038f6e9926eba7401c6d2141af13053",
-            "headers": "1x430y2zw2qysz82jv1s3hk37qrxmv7g8q292ghp6h3cwngwpiq7",
-            "x86_64-darwin": "96ac3f3c34a29a5e507cd48613eea9ac281693baf3ebe9162dd92e1c4a1551f0",
-            "x86_64-linux": "d7a4970c2a4fea0fcddee022d19cea6a911d3ce1695fc257de70a86d37c85d50"
+            "aarch64-darwin": "df4c6a7748c216487400c69672c01e79528e2bc3f0b3e2b0d9e211c0e9a6d112",
+            "aarch64-linux": "1e02eb6c463069ab6a6e835c12f9258caee5fcfca959f14a676a03d0df650fa9",
+            "armv7l-linux": "258df5b303f49c9c5b5e70947eb4530bf1a59ce1b8578c2ad137aa1dfb85b645",
+            "headers": "17sxs7qxjy3r9vxlvmm1l3hnr82w9yqjybkjhx7dramq5c3r9fc3",
+            "x86_64-darwin": "b1bc51d58977d14b22040e87dc31114e0be37f3395e98e52548d974a86df7f71",
+            "x86_64-linux": "9fd0d0c010de003d68ae4bbce57241f6d8a9d852d98c708412a3490fd48bca51"
        },
-        "version": "33.4.2"
+        "version": "33.4.3"
    },
    "34": {
        "hashes": {
-            "aarch64-darwin": "93a24cd159dcf9ad0015c4837cd20d6b85650b03373eff54c0e170c174d46812",
-            "aarch64-linux": "c635c23d92ecea82a914717cd398a15bc5f805c9d06c83ed8d3553d5aaf35f58",
-            "armv7l-linux": "c8833cdbc63f3b6df18b85ae1619e44a23d105a849d5249a2b27a0ed0b445b6b",
-            "headers": "1fgagzl5568pnk1h4sil6k8i1ghdmfdhjazg5v6prsky0q8xa325",
-            "x86_64-darwin": "f9156cb6ec55f364677134896391a6e98878299e6c78545876b3edce3103d88c",
-            "x86_64-linux": "f7d7220f5c9941cdec532f99e4f1b2caaf43b294a054bfe284caa5b8a50120d0"
+            "aarch64-darwin": "c9b82c9f381742e839fea00aeb14f24519bcaf38a0f4eed25532191701f9535b",
+            "aarch64-linux": "1cabad4f3303ac2ff172a9f22185f64944dbaa6fc68271609077158eaefdee35",
+            "armv7l-linux": "4213ce52c72ef414179b5c5c22ae8423847ff030d438296bd6c2aac763930a7b",
+            "headers": "0qzvyqr3jy5bkfv9rwngqjad0gbq1f399d077y4vad5i0mrpqn61",
+            "x86_64-darwin": "d556c1e2b06f1bf131e83c2fb981de755c28e1083a884d257eb964815be16b0c",
+            "x86_64-linux": "3c64c08221fdfc0f4be60ea8b1b126f2ecca45f60001b63778522f711022c6ea"
        },
-        "version": "34.3.0"
+        "version": "34.3.2"
    }
 }
--- a/pkgs/development/tools/electron/common.nix
+++ b/pkgs/development/tools/electron/common.nix
@ -66,11 +66,7 @@ in

  src = null;

-  patches =
-    base.patches
-    ++ lib.optionals (lib.versions.major info.version == "32") [
-      ./fix-electron-32-patch-apply-without-git-3way.patch
-    ];
+  patches = base.patches;

  unpackPhase =
    ''
--- a/pkgs/development/tools/electron/fix-electron-32-patch-apply-without-git-3way.patch
+++ b/pkgs/development/tools/electron/fix-electron-32-patch-apply-without-git-3way.patch
@ -1,73 +0,0 @@
-diff --git a/electron/patches/chromium/fix_osr_stutter_in_both_cpu_and_gpu_capture_when_page_has_animation.patch b/electron/patches/chromium/fix_osr_stutter_in_both_cpu_and_gpu_capture_when_page_has_animation.patch
-index a8d4bc910..1d9b97e5f 100644
--- a/electron/patches/chromium/fix_osr_stutter_in_both_cpu_and_gpu_capture_when_page_has_animation.patch
-+++ b/electron/patches/chromium/fix_osr_stutter_in_both_cpu_and_gpu_capture_when_page_has_animation.patch
-@@ -10,10 +10,10 @@ The upstream has a fix, which will be available in Chromium M135.
- Backport this fix for Electron versions before that.
- 
- diff --git a/media/capture/content/video_capture_oracle.cc b/media/capture/content/video_capture_oracle.cc
-index dad9598799a670b3cfb14965bc8a7b4ea3b4f95f..05a82788ae1e5c304ee150a2390f346d7b454630 100644
-+index 43a35d394ee045f78ffecfeea582300b4083091f..ae0cdf0dcda5df71df55776f0842071eaa1b87da 100644
- --- a/media/capture/content/video_capture_oracle.cc
- +++ b/media/capture/content/video_capture_oracle.cc
-@@ -118,8 +118,9 @@ void VideoCaptureOracle::SetCaptureSizeConstraints(
-+@@ -113,8 +113,9 @@ void VideoCaptureOracle::SetCaptureSizeConstraints(
-  void VideoCaptureOracle::SetAutoThrottlingEnabled(bool enabled) {
-    const bool was_enabled =
-        (capture_size_throttling_mode_ != kThrottlingDisabled);
-@@ -24,7 +24,7 @@ index dad9598799a670b3cfb14965bc8a7b4ea3b4f95f..05a82788ae1e5c304ee150a2390f346d
-    capture_size_throttling_mode_ =
-        enabled ? kThrottlingEnabled : kThrottlingDisabled;
-    VLOG(1) << "Capture size auto-throttling is now "
-@@ -127,19 +128,22 @@ void VideoCaptureOracle::SetAutoThrottlingEnabled(bool enabled) {
-+@@ -122,19 +123,22 @@ void VideoCaptureOracle::SetAutoThrottlingEnabled(bool enabled) {
-  
-    // When not auto-throttling, have the CaptureResolutionChooser target the max
-    // resolution within constraints.
-@@ -51,7 +51,7 @@ index dad9598799a670b3cfb14965bc8a7b4ea3b4f95f..05a82788ae1e5c304ee150a2390f346d
-  }
-  
-  bool VideoCaptureOracle::ObserveEventAndDecideCapture(
-@@ -172,6 +176,15 @@ bool VideoCaptureOracle::ObserveEventAndDecideCapture(
-+@@ -167,6 +171,15 @@ bool VideoCaptureOracle::ObserveEventAndDecideCapture(
-          if (should_sample) {
-            event_time = content_sampler_.frame_timestamp();
-            duration_of_next_frame_ = content_sampler_.sampling_period();
-@@ -67,8 +67,8 @@ index dad9598799a670b3cfb14965bc8a7b4ea3b4f95f..05a82788ae1e5c304ee150a2390f346d
-          }
-          last_time_animation_was_detected_ = event_time;
-        } else {
-@@ -198,8 +211,9 @@ bool VideoCaptureOracle::ObserveEventAndDecideCapture(
-       NOTREACHED();
-+@@ -194,8 +207,9 @@ bool VideoCaptureOracle::ObserveEventAndDecideCapture(
-+       break;
-    }
-  
- -  if (!should_sample)
-@@ -78,7 +78,7 @@ index dad9598799a670b3cfb14965bc8a7b4ea3b4f95f..05a82788ae1e5c304ee150a2390f346d
-  
-    // If the exact duration of the next frame has not been determined, estimate
-    // it using the difference between the current and last frame.
-@@ -373,16 +387,18 @@ void VideoCaptureOracle::RecordConsumerFeedback(
-+@@ -369,16 +383,18 @@ void VideoCaptureOracle::RecordConsumerFeedback(
-  
-    // resource_utilization feedback.
-  
-@@ -99,7 +99,7 @@ index dad9598799a670b3cfb14965bc8a7b4ea3b4f95f..05a82788ae1e5c304ee150a2390f346d
-  
-    if (capture_size_throttling_mode_ != kThrottlingActive) {
-      VLOG(1) << "Received consumer feedback at frame #" << frame_number
-@@ -553,12 +569,14 @@ int VideoCaptureOracle::AnalyzeForIncreasedArea(base::TimeTicks analyze_time) {
-+@@ -549,12 +565,14 @@ int VideoCaptureOracle::AnalyzeForIncreasedArea(base::TimeTicks analyze_time) {
-    const int current_area = capture_size_.GetArea();
-    const int increased_area =
-        resolution_chooser_.FindLargerFrameSize(current_area, 1).GetArea();
-@@ -116,7 +116,7 @@ index dad9598799a670b3cfb14965bc8a7b4ea3b4f95f..05a82788ae1e5c304ee150a2390f346d
-    if (buffer_pool_utilization_.current() > 0.0) {
-      const int buffer_capable_area = base::saturated_cast<int>(
-          current_area / buffer_pool_utilization_.current());
-@@ -593,8 +611,9 @@ int VideoCaptureOracle::AnalyzeForIncreasedArea(base::TimeTicks analyze_time) {
-+@@ -589,8 +607,9 @@ int VideoCaptureOracle::AnalyzeForIncreasedArea(base::TimeTicks analyze_time) {
-  
-    // At this point, the system is currently under-utilized.  Reset the start
-    // time if the system was not under-utilized when the last analysis was made.
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@ -47,10 +47,10 @@
            },
            "src/electron": {
                "fetcher": "fetchFromGitHub",
-                "hash": "sha256-kxRsRaLOJhKUcLNsyQ+9sC6oxGO/aDIYJnH5DUx61TM=",
+                "hash": "sha256-/tGxWvyqwb0TWli2JkFDiyrqAm6DF5JHD7NfC1XTa8I=",
                "owner": "electron",
                "repo": "electron",
-                "rev": "v33.4.2"
+                "rev": "v33.4.3"
            },
            "src/media/cdm/api": {
                "fetcher": "fetchFromGitiles",
@ -950,6 +950,971 @@
        "electron_yarn_hash": "0bzsswcg62b39xinq5vikk7qz7d15276s2vc15v1gcb5wvh05ff8",
        "modules": "130",
        "node": "20.18.3",
-        "version": "33.4.2"
+        "version": "33.4.3"
+    },
+    "34": {
+        "chrome": "132.0.6834.210",
+        "chromium": {
+            "deps": {
+                "gn": {
+                    "hash": "sha256-zZoD5Bx7wIEP2KJkHef6wHrxU3px+8Vseq29QcK32bg=",
+                    "rev": "feafd1012a32c05ec6095f69ddc3850afb621f3a",
+                    "url": "https://gn.googlesource.com/gn",
+                    "version": "2024-10-14"
+                }
+            },
+            "version": "132.0.6834.210"
+        },
+        "chromium_npm_hash": "sha256-H1/h3x+Cgp1x94Ze3UPPHxRVpylZDvpMXMOuS+jk2dw=",
+        "deps": {
+            "src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-NVaErCSvuTQyt7yv2sc4aIX2J/6mxM648Wbbut2Jjxc=",
+                "postFetch": "rm -r $out/third_party/blink/web_tests; rm -rf $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
+                "rev": "132.0.6834.210",
+                "url": "https://chromium.googlesource.com/chromium/src.git"
+            },
+            "src/chrome/test/data/perf/canvas_bench": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=",
+                "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732",
+                "url": "https://chromium.googlesource.com/chromium/canvas_bench.git"
+            },
+            "src/chrome/test/data/perf/frame_rate/content": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=",
+                "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9",
+                "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git"
+            },
+            "src/chrome/test/data/xr/webvr_info": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=",
+                "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248",
+                "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git"
+            },
+            "src/docs/website": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-CqveHvjPEcRWnzi8w13xr2OainrmABNO8uj0GzKmQqo=",
+                "rev": "be9c3dfd3781964fc0bab0d6c91d9ad117b71b02",
+                "url": "https://chromium.googlesource.com/website.git"
+            },
+            "src/electron": {
+                "fetcher": "fetchFromGitHub",
+                "hash": "sha256-HQ2RHDTG0DaZ54j6Il9Ajez8dBIg1zwG71/yOQg7o0s=",
+                "owner": "electron",
+                "repo": "electron",
+                "rev": "v34.3.2"
+            },
+            "src/media/cdm/api": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=",
+                "rev": "eb21edc44e8e5a82095037be80c8b15c51624293",
+                "url": "https://chromium.googlesource.com/chromium/cdm.git"
+            },
+            "src/net/third_party/quiche/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-Z2uFWfZDYcY0m4R6mFMZJLnnVHu3/hQOAkCPQ5049SQ=",
+                "rev": "9616efc903b7469161996006c8cf963238e26503",
+                "url": "https://quiche.googlesource.com/quiche.git"
+            },
+            "src/testing/libfuzzer/fuzzers/wasm_corpus": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-gItDOfNqm1tHlmelz3l2GGdiKi9adu1EpPP6U7+8EQY=",
+                "rev": "1df5e50a45db9518a56ebb42cb020a94a090258b",
+                "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git"
+            },
+            "src/third_party/accessibility_test_framework/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-mzVgoxxBWebesG6okyMxxmO6oH+TITA4o9ucHHMMzkQ=",
+                "rev": "4a764c690353ea136c82f1a696a70bf38d1ef5fe",
+                "url": "https://chromium.googlesource.com/external/github.com/google/Accessibility-Test-Framework-for-Android.git"
+            },
+            "src/third_party/angle": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-fMIHpa2QFsQQ19LGyhvV3Ihh6Ls8wwwhqTtpLoTEaf4=",
+                "rev": "ce13a00a2b049a1ef5e0e70a3d333ce70838ef7b",
+                "url": "https://chromium.googlesource.com/angle/angle.git"
+            },
+            "src/third_party/angle/third_party/VK-GL-CTS/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-2ZhG4cJf85zO7x+SGG6RD2qgOxZVosxAIbuZt9GYUKs=",
+                "rev": "f674555ab03e6355e0981a647c115097e9fe5324",
+                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS"
+            },
+            "src/third_party/angle/third_party/glmark2/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=",
+                "rev": "ca8de51fedb70bace5351c6b002eb952c747e889",
+                "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2"
+            },
+            "src/third_party/angle/third_party/rapidjson/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=",
+                "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f",
+                "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson"
+            },
+            "src/third_party/anonymous_tokens/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-PMB49+zW9ewlS9ym+xi0xYQYLN0j5Urx6yBXWd8FjjI=",
+                "rev": "6ea6ec78f9e4998d0a7a5677b2aec08f0ac858f8",
+                "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git"
+            },
+            "src/third_party/beto-core/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-QPFGjtu/I0r4+dTQ2eSlWIEYwJ43B3yW0q4QtVFTVGY=",
+                "rev": "89563fec14c756482afa08b016eeba9087c8d1e3",
+                "url": "https://beto-core.googlesource.com/beto-core.git"
+            },
+            "src/third_party/boringssl/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-ib9wbV6S64OFc4zx0wQsQ84+5RxbETK0PS9Wm1BFQ1U=",
+                "rev": "571c76e919c0c48219ced35bef83e1fc83b00eed",
+                "url": "https://boringssl.googlesource.com/boringssl.git"
+            },
+            "src/third_party/breakpad/breakpad": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-cFXUi2oO/614jF0GV7oW0ss62dXWFHDNWNT8rWHAiQc=",
+                "rev": "47f7823bdf4b1f39e462b2a497a674860e922e38",
+                "url": "https://chromium.googlesource.com/breakpad/breakpad.git"
+            },
+            "src/third_party/cast_core/public/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-o5/Lbhh6HHSWCVCEyDwDCgs+PLm67si981w0HuIWY7c=",
+                "rev": "fbc5e98031e1271a0a566fcd4d9092b2d3275d05",
+                "url": "https://chromium.googlesource.com/cast_core/public"
+            },
+            "src/third_party/catapult": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-65cZPyqZUdSnYPJYUMYeJgx3mUC6L/qb9P2bDqd2Zkk=",
+                "rev": "b91cf840ac3255ef03b23cc93621369627422a1a",
+                "url": "https://chromium.googlesource.com/catapult.git"
+            },
+            "src/third_party/ced/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=",
+                "rev": "ba412eaaacd3186085babcd901679a48863c7dd5",
+                "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git"
+            },
+            "src/third_party/chromium-variations": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-mg5mu2jcy0xyNJ650ywWUMC94keRsqhZQuPZclHmyLI=",
+                "rev": "c170abb48f7715c237f4c06eaed0fe6f8a4c6f8d",
+                "url": "https://chromium.googlesource.com/chromium-variations.git"
+            },
+            "src/third_party/clang-format/script": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-whD8isX2ZhLrFzdxHhFP1S/sZDRgyrzLFaVd7OEFqYo=",
+                "rev": "3c0acd2d4e73dd911309d9e970ba09d58bf23a62",
+                "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git"
+            },
+            "src/third_party/cld_3/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=",
+                "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661",
+                "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git"
+            },
+            "src/third_party/colorama/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=",
+                "rev": "3de9f013df4b470069d03d250224062e8cf15c49",
+                "url": "https://chromium.googlesource.com/external/colorama.git"
+            },
+            "src/third_party/content_analysis_sdk/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=",
+                "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc",
+                "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git"
+            },
+            "src/third_party/cpu_features/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=",
+                "rev": "936b9ab5515dead115606559502e3864958f7f6e",
+                "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git"
+            },
+            "src/third_party/cpuinfo/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-FlvmSjY8kt5XHymDLaZdPuZ4k5xcagJk8w/U6adTkWI=",
+                "rev": "8df44962d437a0477f07ba6b8843d0b6a48646a4",
+                "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git"
+            },
+            "src/third_party/crabbyavif/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-hO5epHYNYI6pGwVSUv1Hp3qb7qOv8uOs4u+IdhDxd8Q=",
+                "rev": "c3548280e0a516ed7cad7ff1591b5807cef64aa4",
+                "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git"
+            },
+            "src/third_party/crc32c/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-KBraGaO5LmmPP+p8RuDogGldbTWdNDK+WzF4Q09keuE=",
+                "rev": "d3d60ac6e0f16780bcfcc825385e1d338801a558",
+                "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git"
+            },
+            "src/third_party/cros-components/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-owXaTIj0pbhUeJkirxaRoCmgIN9DwNzY3h771kaN+Fc=",
+                "rev": "9129cf4b2a5ca775c280243257a0b4856a93c7fb",
+                "url": "https://chromium.googlesource.com/external/google3/cros_components.git"
+            },
+            "src/third_party/cros_system_api": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-fvGypRhgl2uX9YE2cwjL7d3pYBa3Imd5p0RLhMYRgrc=",
+                "rev": "554629b9242e6ae832ef14e3384654426f7fcc06",
+                "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git"
+            },
+            "src/third_party/crossbench": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-/K6eM9s+fd2wjCrK0g0CgFNy0zxEN9SxTvmE50hMtXw=",
+                "rev": "ae6f165652e0ea983d73f5d04b7470d08c869e4f",
+                "url": "https://chromium.googlesource.com/crossbench.git"
+            },
+            "src/third_party/dav1d/libdav1d": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-Q2CaWvDqOmfaPG6a+SUHG5rFHalPEf4Oq/ytT3xuSOk=",
+                "rev": "93f12c117a4e1c0cc2b129dcc52e84dbd9b84200",
+                "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git"
+            },
+            "src/third_party/dawn": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-1d8cCtqBIfYbVqUQ4q4BtH2FujbNJeeW9agJUjcktgE=",
+                "rev": "c3530f2883610bb6606a5f55935c189e732e67d0",
+                "url": "https://dawn.googlesource.com/dawn.git"
+            },
+            "src/third_party/dawn/third_party/dxc": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-rhUNPA5b0H3PBsOpXbAeRLpS0tNQkiHbjRBWmJycSAY=",
+                "rev": "ac36a797d3470e8ee906b98457a59270d01db30d",
+                "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler"
+            },
+            "src/third_party/dawn/third_party/dxheaders": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=",
+                "rev": "980971e835876dc0cde415e8f9bc646e64667bf7",
+                "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers"
+            },
+            "src/third_party/dawn/third_party/glfw": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-E1zXIDiw87badrLOZTvV+Wh9NZHu51nb70ZK9vlAlqE=",
+                "rev": "b35641f4a3c62aa86a0b3c983d163bc0fe36026d",
+                "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw"
+            },
+            "src/third_party/dawn/third_party/khronos/EGL-Registry": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=",
+                "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071",
+                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry"
+            },
+            "src/third_party/dawn/third_party/khronos/OpenGL-Registry": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=",
+                "rev": "5bae8738b23d06968e7c3a41308568120943ae77",
+                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry"
+            },
+            "src/third_party/dawn/third_party/webgpu-cts": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-ArbHGjkHd1sko7gDPFksYz7XHKNge+e6tVy6oKPuqzg=",
+                "rev": "8690defa74b6975c10e85c113f121d4b2a3f2564",
+                "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts"
+            },
+            "src/third_party/dawn/third_party/webgpu-headers": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-J3PcwYoO79HqrACFgk77BZLTCi7oi5k2J6v3wlcFVD4=",
+                "rev": "8049c324dc7b3c09dc96ea04cb02860f272c8686",
+                "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers"
+            },
+            "src/third_party/depot_tools": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-m/6b4VZZTUQOeED1mYvZOQCx8Re+Zd4O8SKDMjJ9Djo=",
+                "rev": "41d43a2a2290450aeab946883542f8049b155c87",
+                "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
+            },
+            "src/third_party/devtools-frontend/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-mBWZdbgZfO01Pt2lZSHX/d5r+8A/+qCZA8MRtZdeTrs=",
+                "rev": "f2f3682c9db8ca427f8c64f0402cc2c5152c6c24",
+                "url": "https://chromium.googlesource.com/devtools/devtools-frontend"
+            },
+            "src/third_party/dom_distiller_js/dist": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=",
+                "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d",
+                "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git"
+            },
+            "src/third_party/domato/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-fYxoA0fxKe9U23j+Jp0MWj4m7RfsRpM0XjF6/yOhX1I=",
+                "rev": "053714bccbda79cf76dac3fee48ab2b27f21925e",
+                "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git"
+            },
+            "src/third_party/eigen3/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-UroGjERR5TW9KbyLwR/NBpytXrW1tHfu6ZvQPngROq4=",
+                "rev": "b396a6fbb2e173f52edb3360485dedf3389ef830",
+                "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git"
+            },
+            "src/third_party/electron_node": {
+                "fetcher": "fetchFromGitHub",
+                "hash": "sha256-ta9gw6A0aYguKYNRBW2nSPC3UTU5/7GNUPS02yyByis=",
+                "owner": "nodejs",
+                "repo": "node",
+                "rev": "v20.18.3"
+            },
+            "src/third_party/emoji-segmenter/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-KdQdKBBipEBRT8UmNGao6yCB4m2CU8/SrMVvcXlb5qE=",
+                "rev": "955936be8b391e00835257059607d7c5b72ce744",
+                "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git"
+            },
+            "src/third_party/engflow-reclient-configs": {
+                "fetcher": "fetchFromGitHub",
+                "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=",
+                "owner": "EngFlow",
+                "repo": "reclient-configs",
+                "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d"
+            },
+            "src/third_party/expat/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-Iwu9+i/0vsPyu6pOWFxjNNblVxMl6bTPW5eWyaju4Mg=",
+                "rev": "624da0f593bb8d7e146b9f42b06d8e6c80d032a3",
+                "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git"
+            },
+            "src/third_party/farmhash/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=",
+                "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45",
+                "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git"
+            },
+            "src/third_party/fast_float/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-0eVovauN7SnO3nSIWBRWAJ4dR7q5beZrIGUZ18M2pao=",
+                "rev": "3e57d8dcfb0a04b5a8a26b486b54490a2e9b310f",
+                "url": "https://chromium.googlesource.com/external/github.com/fastfloat/fast_float.git"
+            },
+            "src/third_party/ffmpeg": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-wwHxNuZe2hBmGBpVg/iQJBoL350jfPYPTPqDn3RiqZE=",
+                "rev": "591ae4b02eaff9a03e2ec863da895128b0b49910",
+                "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git"
+            },
+            "src/third_party/flac": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=",
+                "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c",
+                "url": "https://chromium.googlesource.com/chromium/deps/flac.git"
+            },
+            "src/third_party/flatbuffers/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-tbc45o0MbMvK5XqRUJt5Eg8BU6+TJqlmwFgQhHq6wRM=",
+                "rev": "8db59321d9f02cdffa30126654059c7d02f70c32",
+                "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git"
+            },
+            "src/third_party/fontconfig/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-W5WIgC6A52kY4fNkbsDEa0o+dfd97Rl5NKfgnIRpI00=",
+                "rev": "14d466b30a8ab4a9d789977ed94f2c30e7209267",
+                "url": "https://chromium.googlesource.com/external/fontconfig.git"
+            },
+            "src/third_party/fp16/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=",
+                "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91",
+                "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git"
+            },
+            "src/third_party/freetype-testing/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=",
+                "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f",
+                "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git"
+            },
+            "src/third_party/freetype/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-+nbRZi3vAMTURhhFVUu5+59fVIv0GH3YZog2JavyVLY=",
+                "rev": "0ae7e607370cc66218ccfacf5de4db8a35424c2f",
+                "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git"
+            },
+            "src/third_party/fuzztest/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-UYmzjOX8k+CWL+xOIF3NiEL3TRUjS8JflortB2RUT4o=",
+                "rev": "0021f30508bc7f73fa5270962d022acb480d242f",
+                "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git"
+            },
+            "src/third_party/fxdiv/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=",
+                "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8",
+                "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git"
+            },
+            "src/third_party/gemmlowp/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=",
+                "rev": "13d57703abca3005d97b19df1f2db731607a7dc2",
+                "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git"
+            },
+            "src/third_party/glslang/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-twWSeJp9bNbLYFszCWv9BCztfbXUBKSWV55/U+hd2hw=",
+                "rev": "9c644fcb5b9a1a9c975c50a790fd14c5451292b0",
+                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang"
+            },
+            "src/third_party/google_benchmark/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-cH8s1gP6kCcojAAfTt5iQCVqiAaSooNk4BdaILujM3w=",
+                "rev": "761305ec3b33abf30e08d50eb829e19a802581cc",
+                "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git"
+            },
+            "src/third_party/googletest/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-n7tiIFAj8AiSCa9Tw+1j+ro9cSt5vagZpkbBBUUtYQY=",
+                "rev": "d144031940543e15423a25ae5a8a74141044862f",
+                "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git"
+            },
+            "src/third_party/grpc/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=",
+                "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737",
+                "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git"
+            },
+            "src/third_party/harfbuzz-ng/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-iR49rfGDKxPObCff1/30hYHpP5FpZ28ROgMZhNk9eFY=",
+                "rev": "1da053e87f0487382404656edca98b85fe51f2fd",
+                "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git"
+            },
+            "src/third_party/highway/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-IS7m1wBwpPBUNhx2GttY1fzvmLIeAp3o2gXfrFpRdvY=",
+                "rev": "00fe003dac355b979f36157f9407c7c46448958e",
+                "url": "https://chromium.googlesource.com/external/github.com/google/highway.git"
+            },
+            "src/third_party/hunspell_dictionaries": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=",
+                "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e",
+                "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git"
+            },
+            "src/third_party/icu": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-WtCoxcbEkkZayB6kXdQEhZ7/ue+ka6cguhFbpeWUBJA=",
+                "rev": "ba7ed88cc5ffa428a82a0f787dd61031aa5ef4ca",
+                "url": "https://chromium.googlesource.com/chromium/deps/icu.git"
+            },
+            "src/third_party/ink/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-+Ikr9E7KlXBFyf6fSDmIF3ygNUiwlXeA5bmO2CtkI7Q=",
+                "rev": "4300dc7402a257b85fc5bf2559137edacb050227",
+                "url": "https://chromium.googlesource.com/external/github.com/google/ink.git"
+            },
+            "src/third_party/ink_stroke_modeler/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-IQ+n+kHdEq8Q8/qaPGMvgD7cPN3zzaY8dbiokq6r/Vs=",
+                "rev": "0999e4cf816b42c770d07916698bce943b873048",
+                "url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git"
+            },
+            "src/third_party/instrumented_libs": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-kHKGADAgzlaeckXFbpU1GhJK+zkiRd9XvdtPF6qrQFY=",
+                "rev": "bb6dbcf2df7a9beb34c3773ef4df161800e3aed9",
+                "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git"
+            },
+            "src/third_party/jsoncpp/source": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=",
+                "rev": "42e892d96e47b1f6e29844cc705e148ec4856448",
+                "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git"
+            },
+            "src/third_party/leveldatabase/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-y3awFXL8ih2UhEqWj8JRgkhzSxfQciLztb020JHJ350=",
+                "rev": "23e35d792b9154f922b8b575b12596a4d8664c65",
+                "url": "https://chromium.googlesource.com/external/leveldb.git"
+            },
+            "src/third_party/libFuzzer/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-jPS+Xi/ia0sMspxSGN38zasmVS/HslxH/qOFsV9TguE=",
+                "rev": "a7128317fe7935a43d6c9f39df54f21113951941",
+                "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git"
+            },
+            "src/third_party/libaddressinput/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=",
+                "rev": "e8712e415627f22d0b00ebee8db99547077f39bd",
+                "url": "https://chromium.googlesource.com/external/libaddressinput.git"
+            },
+            "src/third_party/libaom/source/libaom": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-9VhEVOG9cReDOGoX+x5G/jJ8Y5RDoQIiLMoZtt5c9pI=",
+                "rev": "be60f06ab420d6a65c477213f04c8b0f2e12ba2e",
+                "url": "https://aomedia.googlesource.com/aom.git"
+            },
+            "src/third_party/libavif/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-lUuVyh2srhWMNUp4lEivyDic3MSZf5s63iAb84We80M=",
+                "rev": "1cdeff7ecf456492c47cf48fc0cef6591cdc95da",
+                "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git"
+            },
+            "src/third_party/libc++/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-kmhTlz/qjvN0Qlra7Wz05O6X058hPPn0nVvAxFXQDC4=",
+                "rev": "8e31ad42561900383e10dbefc1d3e8f38cedfbe9",
+                "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git"
+            },
+            "src/third_party/libc++abi/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-CwiK9Td8aRS08RywItHKFvibzDAUYYd0YNRKxYPLTD8=",
+                "rev": "cec7f478354a8c8599f264ed8bb6043b5468f72d",
+                "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git"
+            },
+            "src/third_party/libdrm/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-woSYEDUfcEBpYOYnli13wLMt754A7KnUbmTEcFQdFGw=",
+                "rev": "ad78bb591d02162d3b90890aa4d0a238b2a37cde",
+                "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git"
+            },
+            "src/third_party/libgav1/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-+ss9S5t+yoHzqbtX68+5OyyUbJVecYLwp+C3EXfAziE=",
+                "rev": "a2f139e9123bdb5edf7707ac6f1b73b3aa5038dd",
+                "url": "https://chromium.googlesource.com/codecs/libgav1.git"
+            },
+            "src/third_party/libipp/libipp": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=",
+                "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f",
+                "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git"
+            },
+            "src/third_party/libjpeg_turbo": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-qgHXAjCDFxQ+QqJ8pSmI1NUvHvKKTi4MkIe1I/+hUAI=",
+                "rev": "927aabfcd26897abb9776ecf2a6c38ea5bb52ab6",
+                "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git"
+            },
+            "src/third_party/liblouis/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=",
+                "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376",
+                "url": "https://chromium.googlesource.com/external/liblouis-github.git"
+            },
+            "src/third_party/libphonenumber/dist": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=",
+                "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362",
+                "url": "https://chromium.googlesource.com/external/libphonenumber.git"
+            },
+            "src/third_party/libprotobuf-mutator/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=",
+                "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf",
+                "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git"
+            },
+            "src/third_party/libsrtp": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-4qEZ9MD97MoqCUlZtbEhIKy+fDO1iIWqyrBsKwkjXTg=",
+                "rev": "000edd791434c8738455f10e0dd6b268a4852c0b",
+                "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git"
+            },
+            "src/third_party/libsync/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=",
+                "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6",
+                "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git"
+            },
+            "src/third_party/libunwind/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-uA+t5Ecc/iK3mllHR8AMVGRfU/7z1G3yrw0TamPQiOY=",
+                "rev": "5b01ea4a6f3b666b7d190e7cb7c31db2ed4d94ce",
+                "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git"
+            },
+            "src/third_party/libvpx/source/libvpx": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-QGm37X4uid8zv+vRu0pVTvoQd2WcKztrj3tJkDjx82o=",
+                "rev": "727319a77ffe68e9aacb08e09ae7151b3a8f70a3",
+                "url": "https://chromium.googlesource.com/webm/libvpx.git"
+            },
+            "src/third_party/libwebm/source": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-Mn3snC2g4BDKBJsS6cxT3BZL7LZknOWg77+60Nr4Hy0=",
+                "rev": "26d9f667170dc75e8d759a997bb61c64dec42dda",
+                "url": "https://chromium.googlesource.com/webm/libwebm.git"
+            },
+            "src/third_party/libwebp/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-xuRpEwOnaLGZmrPvfUn3DSoJANd94CG+JXcN7Mdmk5I=",
+                "rev": "845d5476a866141ba35ac133f856fa62f0b7445f",
+                "url": "https://chromium.googlesource.com/webm/libwebp.git"
+            },
+            "src/third_party/libyuv": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-vPVq7RzqO7gBUgYuNX0Fwxqok9jtXXJZgbhVFchG5Ws=",
+                "rev": "6ac7c8f25170c85265fca69fd1fe5d31baf3344f",
+                "url": "https://chromium.googlesource.com/libyuv/libyuv.git"
+            },
+            "src/third_party/llvm-libc/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-av9JdqLOQbezgRS4P8QXmvfB5l47v04WRagNJJgT5u4=",
+                "rev": "ca74a72e2b32ad804522bbef04dfe32560a10206",
+                "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git"
+            },
+            "src/third_party/lss": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=",
+                "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521",
+                "url": "https://chromium.googlesource.com/linux-syscall-support.git"
+            },
+            "src/third_party/material_color_utilities/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-Y85XU+z9W6tvmDNHJ/dXQnUKXvvDkO3nH/kUJRLqbc4=",
+                "rev": "13434b50dcb64a482cc91191f8cf6151d90f5465",
+                "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git"
+            },
+            "src/third_party/minigbm/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=",
+                "rev": "3018207f4d89395cc271278fb9a6558b660885f5",
+                "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git"
+            },
+            "src/third_party/nan": {
+                "fetcher": "fetchFromGitHub",
+                "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=",
+                "owner": "nodejs",
+                "repo": "nan",
+                "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213"
+            },
+            "src/third_party/nasm": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-SiRXHsUlWXtH6dbDjDjqNAm105ibEB3jOfNtQAM4CaY=",
+                "rev": "f477acb1049f5e043904b87b825c5915084a9a29",
+                "url": "https://chromium.googlesource.com/chromium/deps/nasm.git"
+            },
+            "src/third_party/nearby/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-DO3FW5Q233ctFKk4K5F8oZec9kfrVl6uxAwMn0niKz4=",
+                "rev": "8e87a6e51c93e7836ecdbcc0a520c7992f3ece13",
+                "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git"
+            },
+            "src/third_party/neon_2_sse/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=",
+                "rev": "a15b489e1222b2087007546b4912e21293ea86ff",
+                "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git"
+            },
+            "src/third_party/openh264/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-S7dS2IZwt4p4ZrF6K7E5HnwKuI3owU2I7vwtu95uTkE=",
+                "rev": "478e5ab3eca30e600006d5a0a08b176fd34d3bd1",
+                "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264"
+            },
+            "src/third_party/openscreen/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-IlGxfw6Mhc7FYvhU2+Ngt9qflqr4JMC2OcplvksGI+U=",
+                "rev": "cb6fd42532fc3a831d6863d5006217e32a67c417",
+                "url": "https://chromium.googlesource.com/openscreen"
+            },
+            "src/third_party/openscreen/src/buildtools": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-suuxUL//BfAMmG8os8ChI7ic9EjGTi7y5kjxiAyrEQc=",
+                "rev": "4e0e9c73a0f26735f034f09a9cab2a5c0178536b",
+                "url": "https://chromium.googlesource.com/chromium/src/buildtools"
+            },
+            "src/third_party/openscreen/src/third_party/tinycbor/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=",
+                "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7",
+                "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git"
+            },
+            "src/third_party/ots/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=",
+                "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33",
+                "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git"
+            },
+            "src/third_party/pdfium": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-d8qJECIdq01ct+sS7cHVKFulYJarwahKCEcVf762JNI=",
+                "rev": "84a8011ec69d0e2de271c05be7d62979608040d9",
+                "url": "https://pdfium.googlesource.com/pdfium.git"
+            },
+            "src/third_party/perfetto": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-3vervpsq/QLMrR7RcJMwwh+CdFvSEj8yAzj6s9d1XMo=",
+                "rev": "ea011a2c2d3aecdc4f1674887e107a56d2905edd",
+                "url": "https://android.googlesource.com/platform/external/perfetto.git"
+            },
+            "src/third_party/protobuf-javascript/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-TmP6xftUVTD7yML7UEM/DB8bcsL5RFlKPyCpcboD86U=",
+                "rev": "e34549db516f8712f678fcd4bc411613b5cc5295",
+                "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript"
+            },
+            "src/third_party/pthreadpool/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-rGg6lgLkmbYo+a9CdaXz9ZUyrqJ1rxLcjLJeBEOPAlE=",
+                "rev": "560c60d342a76076f0557a3946924c6478470044",
+                "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git"
+            },
+            "src/third_party/pyelftools": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=",
+                "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae",
+                "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git"
+            },
+            "src/third_party/pywebsocket3/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=",
+                "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2",
+                "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git"
+            },
+            "src/third_party/quic_trace/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-N1uFoNd3mz/LH1z06581Ds7BUyc67SNXUPzqomYREr8=",
+                "rev": "413da873d93a03d3662f24b881ea459a79f9c589",
+                "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git"
+            },
+            "src/third_party/re2/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc=",
+                "rev": "6dcd83d60f7944926bfd308cc13979fc53dd69ca",
+                "url": "https://chromium.googlesource.com/external/github.com/google/re2.git"
+            },
+            "src/third_party/ruy/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-4NVvqUZn2BdwTxJINTHwPeRqbGXZrWdcd7jv1Y+eoKY=",
+                "rev": "c08ec529fc91722bde519628d9449258082eb847",
+                "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git"
+            },
+            "src/third_party/securemessage/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=",
+                "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84",
+                "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git"
+            },
+            "src/third_party/skia": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-e+oaFqj0D7jKiyDJRmT3BWZEd9j9BKkTdMg8hUOAvzA=",
+                "rev": "ee9db7d1348f76780fd0184b9b0243d653e36411",
+                "url": "https://skia.googlesource.com/skia.git"
+            },
+            "src/third_party/smhasher/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=",
+                "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f",
+                "url": "https://chromium.googlesource.com/external/smhasher.git"
+            },
+            "src/third_party/snappy/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=",
+                "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c",
+                "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git"
+            },
+            "src/third_party/speedometer/v3.0": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU=",
+                "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d",
+                "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
+            },
+            "src/third_party/spirv-cross/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=",
+                "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3",
+                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross"
+            },
+            "src/third_party/spirv-headers/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-FrT/kVIMjcu2zv+7kDeNKM77NnOyMBb8pV0w8DBP42A=",
+                "rev": "996c728cf7dcfb29845cfa15222822318f047810",
+                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers"
+            },
+            "src/third_party/spirv-tools/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-m/a1i26u8lzpKuQHyAy6ktWWjbLZEaio1awz8VovTGE=",
+                "rev": "9117e042b93d4ff08d2406542708170f77aaa2a3",
+                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools"
+            },
+            "src/third_party/sqlite/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-ltl3OTk/wZPSj3yYthNlKd3mBxef6l5uW6UYTwebNek=",
+                "rev": "567495a62a62dc013888500526e82837d727fe01",
+                "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git"
+            },
+            "src/third_party/squirrel.mac": {
+                "fetcher": "fetchFromGitHub",
+                "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=",
+                "owner": "Squirrel",
+                "repo": "Squirrel.Mac",
+                "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38"
+            },
+            "src/third_party/squirrel.mac/vendor/Mantle": {
+                "fetcher": "fetchFromGitHub",
+                "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=",
+                "owner": "Mantle",
+                "repo": "Mantle",
+                "rev": "78d3966b3c331292ea29ec38661b25df0a245948"
+            },
+            "src/third_party/squirrel.mac/vendor/ReactiveObjC": {
+                "fetcher": "fetchFromGitHub",
+                "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=",
+                "owner": "ReactiveCocoa",
+                "repo": "ReactiveObjC",
+                "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76"
+            },
+            "src/third_party/swiftshader": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-h2BHyaOM0oscfX5cu8s4N1yyOkg/yQbvwD1DxF+RAQc=",
+                "rev": "d5c4284774115bb1e32c012a2be1b5fbeb1ab1f9",
+                "url": "https://swiftshader.googlesource.com/SwiftShader.git"
+            },
+            "src/third_party/text-fragments-polyfill/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=",
+                "rev": "c036420683f672d685e27415de0a5f5e85bdc23f",
+                "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git"
+            },
+            "src/third_party/tflite/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-gOUt/NljRK5wMFwy2aLqZ5NHwk4y/GxbQ+AZ3MxM0M8=",
+                "rev": "658227d3b535287dc6859788bde6076c4fe3fe7c",
+                "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git"
+            },
+            "src/third_party/ukey2/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=",
+                "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47",
+                "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git"
+            },
+            "src/third_party/vulkan-deps": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-LVWvbMLjkMyAUM+0UpQ4oRsfcRU5F/xY60wiwxth4Ko=",
+                "rev": "0b56dd5952b25fad65139b64096fcd187048ed38",
+                "url": "https://chromium.googlesource.com/vulkan-deps"
+            },
+            "src/third_party/vulkan-headers/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-exXzafLgrgxyRvaF+4pCF+OLtPT2gDmcvzazQ4EQ1eA=",
+                "rev": "cbcad3c0587dddc768d76641ea00f5c45ab5a278",
+                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers"
+            },
+            "src/third_party/vulkan-loader/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-NDp2TLeMLAHb92R+PjaPDTx8ckIlpSsS3BNx3lerB68=",
+                "rev": "b0177a972b8d47e823a4500cf88df88a8c27add7",
+                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader"
+            },
+            "src/third_party/vulkan-tools/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-PiWKL045DAOGm+Hl/UyO6vmD4fVfuf2fSvXK6gSYbwo=",
+                "rev": "15f2de809304aba619ee327f3273425418ca83de",
+                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools"
+            },
+            "src/third_party/vulkan-utility-libraries/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-luDw6g/EMSK67Et2wNta74PHGQU6Y7IRpDlSpgDYV6Q=",
+                "rev": "87ab6b39a97d084a2ef27db85e3cbaf5d2622a09",
+                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries"
+            },
+            "src/third_party/vulkan-validation-layers/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-WWV+P++0Czeqg5p2UTqIP81pY8oz7cS7E7Z/sc0km6g=",
+                "rev": "bc2c38412f739c298d6f5c076c064e6b5696959f",
+                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers"
+            },
+            "src/third_party/vulkan_memory_allocator": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=",
+                "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21",
+                "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git"
+            },
+            "src/third_party/wayland-protocols/gtk": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=",
+                "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0",
+                "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git"
+            },
+            "src/third_party/wayland-protocols/kde": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=",
+                "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e",
+                "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git"
+            },
+            "src/third_party/wayland-protocols/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-o/adWEXYSqWib6KoK7XMCWbojapcS4O/CEPxv7iFCw8=",
+                "rev": "7d5a3a8b494ae44cd9651f9505e88a250082765e",
+                "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git"
+            },
+            "src/third_party/wayland/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-oK0Z8xO2ILuySGZS0m37ZF0MOyle2l8AXb0/6wai0/w=",
+                "rev": "a156431ea66fe67d69c9fbba8a8ad34dabbab81c",
+                "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git"
+            },
+            "src/third_party/webdriver/pylib": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=",
+                "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04",
+                "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git"
+            },
+            "src/third_party/webgl/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-32r3BdmsNA89mo0k+vK1G3718AOjseE7cJlopZ/0pSw=",
+                "rev": "450cceb587613ac1469c5a131fac15935c99e0e7",
+                "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git"
+            },
+            "src/third_party/webgpu-cts/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-Dd5uWNtnBIc2jiMkh9KjI5O1tJtmMvdlMA2nf+VOkQQ=",
+                "rev": "b9f32fd2943dd2b3d0033bf938c9d843f4b5c9a9",
+                "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git"
+            },
+            "src/third_party/webrtc": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-S8kGTd3+lf5OTayCMOqqrjxH4tcbT0NLZBpKmTCysMs=",
+                "rev": "afaf497805cbb502da89991c2dcd783201efdd08",
+                "url": "https://webrtc.googlesource.com/src.git"
+            },
+            "src/third_party/weston/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=",
+                "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7",
+                "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git"
+            },
+            "src/third_party/wuffs/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=",
+                "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8",
+                "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git"
+            },
+            "src/third_party/xdg-utils": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=",
+                "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44",
+                "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git"
+            },
+            "src/third_party/xnnpack/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-aDPlmLxNY9M5+Qb8VtdfxphHXU/X6JwYhkUSXkLh/FE=",
+                "rev": "d1d33679661a34f03a806af2b813f699db3004f9",
+                "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git"
+            },
+            "src/third_party/zstd/src": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-4J/F2v2W3mMdhqQ4q35gYkGaqTKlcG6OxUt3vQ8pcLs=",
+                "rev": "7fb5347e88f10472226c9aa1962a148e55d8c480",
+                "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git"
+            },
+            "src/tools/page_cycler/acid3": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=",
+                "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba",
+                "url": "https://chromium.googlesource.com/chromium/deps/acid3.git"
+            },
+            "src/v8": {
+                "fetcher": "fetchFromGitiles",
+                "hash": "sha256-o+THwG/lBFw495DxAckGPeoiTV5zOopVF4B3MXmraf0=",
+                "rev": "7130a7a08a7075cc1967528402ec536f6fd85ed2",
+                "url": "https://chromium.googlesource.com/v8/v8.git"
+            }
+        },
+        "electron_yarn_hash": "10ny8cj2m8wn8zb5ljsfc8rpv6y4rp049zv5i5slyk3lj2zpgr6y",
+        "modules": "132",
+        "node": "20.18.3",
+        "version": "34.3.2"
    }
 }
--- a/pkgs/development/tools/electron/update.py
+++ b/pkgs/development/tools/electron/update.py
@ -189,7 +189,7 @@ class GitilesRepo(Repo):

        if url == "https://chromium.googlesource.com/chromium/src.git":
            self.args["postFetch"] = "rm -r $out/third_party/blink/web_tests; "
-            self.args["postFetch"] += "rm -r $out/third_party/hunspell/tests; "
+            self.args["postFetch"] += "rm -rf $out/third_party/hunspell/tests; "
            self.args["postFetch"] += "rm -r $out/content/test/data; "
            self.args["postFetch"] += "rm -rf $out/courgette/testdata; "
            self.args["postFetch"] += "rm -r $out/extensions/test/data; "
@ -470,7 +470,7 @@ def get_electron_info(major_version: str) -> Tuple[str, str, GitHubRepo]:
            },
            **{
            f"checkout_{arch}": True
-            for arch in ["x64", "arm64", "arm", "x86", "mips", "mips64"]
+            for arch in ["x64", "arm64", "arm", "x86", "mips", "mips64", "ppc"]
            },
        },
        "src/electron",
--- a/pkgs/servers/akkoma/admin-fe/default.nix
+++ b/pkgs/servers/akkoma/admin-fe/default.nix
@ -3,6 +3,7 @@
  stdenv,
  fetchFromGitea,
  fetchYarnDeps,
+  writableTmpDirAsHomeHook,
  fixup-yarn-lock,
  yarn,
  nodejs,
@ -10,6 +11,7 @@
  python3,
  pkg-config,
  libsass,
+  nix-update-script,
 }:

 stdenv.mkDerivation (finalAttrs: {
@ -31,6 +33,7 @@ stdenv.mkDerivation (finalAttrs: {

  nativeBuildInputs = [
    fixup-yarn-lock
+    writableTmpDirAsHomeHook
    yarn
    nodejs
    pkg-config
@ -42,8 +45,6 @@ stdenv.mkDerivation (finalAttrs: {
  configurePhase = ''
    runHook preConfigure

-    export HOME="$(mktemp -d)"
-
    yarn config --offline set yarn-offline-mirror ${lib.escapeShellArg finalAttrs.offlineCache}
    fixup-yarn-lock yarn.lock
    substituteInPlace yarn.lock \
@ -79,6 +80,10 @@ stdenv.mkDerivation (finalAttrs: {
    runHook postInstall
  '';

+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version=branch=stable" ];
+  };
+
  meta = {
    description = "Admin interface for Akkoma";
    homepage = "https://akkoma.dev/AkkomaGang/akkoma-fe/";
--- a/pkgs/servers/akkoma/akkoma-fe/default.nix
+++ b/pkgs/servers/akkoma/akkoma-fe/default.nix
@ -3,32 +3,35 @@
  stdenv,
  fetchFromGitea,
  fetchYarnDeps,
+  writableTmpDirAsHomeHook,
  fixup-yarn-lock,
  yarn,
  nodejs,
  jpegoptim,
  oxipng,
  nodePackages,
+  nix-update-script,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "akkoma-fe";
-  version = "3.11.0";
+  version = "3.15.0";

  src = fetchFromGitea {
    domain = "akkoma.dev";
    owner = "AkkomaGang";
    repo = "akkoma-fe";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-Z7psmIyOo8Rvwcip90JgxLhZ5SkkGB94QInEgm8UOjQ=";
+    hash = "sha256-VKYeJwAc4pMpF1dWBnx5D39ffNk7eGpJI2es+GAxdow=";
  };

  offlineCache = fetchYarnDeps {
    yarnLock = finalAttrs.src + "/yarn.lock";
-    hash = "sha256-Uet3zdjLdI4qpiuU4CtW2WwWGcFaOhotLLKfnsAUqho=";
+    hash = "sha256-QB523QZX8oBMHWBSFF7MpaWWXc+MgEUaw/2gsCPZ9a4=";
  };

  nativeBuildInputs = [
+    writableTmpDirAsHomeHook
    fixup-yarn-lock
    yarn
    nodejs
@ -48,8 +51,6 @@ stdenv.mkDerivation (finalAttrs: {
  configurePhase = ''
    runHook preConfigure

-    export HOME="$(mktemp -d)"
-
    yarn config --offline set yarn-offline-mirror ${lib.escapeShellArg finalAttrs.offlineCache}
    fixup-yarn-lock yarn.lock

@ -81,6 +82,13 @@ stdenv.mkDerivation (finalAttrs: {
    runHook postInstall
  '';

+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      ''^v(\d+\.\d+\.\d+)$''
+    ];
+  };
+
  meta = {
    description = "Frontend for Akkoma";
    homepage = "https://akkoma.dev/AkkomaGang/akkoma-fe/";
--- a/pkgs/servers/akkoma/default.nix
+++ b/pkgs/servers/akkoma/default.nix
@ -1,23 +1,49 @@
-{ lib
-, beamPackages
-, fetchFromGitea
-, fetchFromGitHub
-, fetchFromGitLab
-, cmake
-, file
-, nixosTests
-, ...
+{
+  lib,
+  beamPackages,
+  fetchFromGitea,
+  cmake,
+  file,
+  nixosTests,
+  nix-update-script,
 }:
+
 beamPackages.mixRelease rec {
  pname = "akkoma";
-  version = "3.14.1";
+  version = "3.15.1";

  src = fetchFromGitea {
    domain = "akkoma.dev";
    owner = "AkkomaGang";
    repo = "akkoma";
-    rev = "v${version}";
-    hash = "sha256-Ygb51jQatdyX/DzJk84X1AEliBGD938f83UnI5OqBPM=";
+    tag = "v${version}";
+    hash = "sha256-6qsqTguEVu9t6dW8c+VAE5Z7D3FbQ0S2ZfAN5qy7Xak=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ file ];
+
+  mixFodDeps = beamPackages.fetchMixDeps {
+    pname = "mix-deps-${pname}";
+    inherit src version;
+    hash = "sha256-nWtY5eohP9pv/vS9FuCh2nlPxLJ2Y4IRmve5in328DU=";
+
+    postInstall = ''
+      substituteInPlace "$out/http_signatures/mix.exs" \
+        --replace-fail ":logger" ":logger, :public_key"
+
+      # Akkoma adds some things to the `mime` package's configuration, which
+      # requires it to be recompiled. However, we can't just recompile things
+      # like we would on other systems. Therefore, we need to add it to mime's
+      # compile-time config too, and also in every package that depends on
+      # mime, directly or indirectly. We take the lazy way out and just add it
+      # to every dependency – it won't make a difference in packages that don't
+      # depend on `mime`.
+      for dep in "$out/"*; do
+        mkdir -p "$dep/config"
+        cat ${./mime.exs} >>"$dep/config/config.exs"
+      done
+    '';
  };

  postPatch = ''
@ -26,183 +52,26 @@ beamPackages.mixRelease rec {
      mix.exs
  '';

+  dontUseCmakeConfigure = true;
+
  postBuild = ''
    # Digest and compress static files
    rm -f priv/static/READ_THIS_BEFORE_TOUCHING_FILES_HERE
-    mix phx.digest --no-compile
+    mix do deps.loadpaths --no-deps-check, phx.digest --no-compile
  '';

-  mixNixDeps = import ./mix.nix {
-    inherit beamPackages lib;
-    overrides = final: prev:
-      let
-        mimeTypePatchPhase = ''
-          mkdir -p config
-          cat >> config/config.exs <<EOF
-          Mix.Config.config :mime, :types, %{
-            "application/xml" => ["xml"],
-            "application/xrd+xml" => ["xrd+xml"],
-            "application/jrd+json" => ["jrd+json"],
-            "application/activity+json" => ["activity+json"],
-            "application/ld+json" => ["activity+json"],
-            "image/apng" => ["apng"]
-          }
-          Mix.Config.config :mime, :extensions, %{
-            "activity+json" => "text/plain",
-            "jrd+json" => "text/plain",
-            "xrd+xml" => "text/plain"
-          }
-          EOF
-        '';
-        # Akkoma adds some things to the `mime` package's configuration, which requires it to be recompiled.
-        # However, we can't just recompile things like we would on other systems.
-        # Therefore, we need to add it to mime's compile-time config too, and also in every package that depends on mime, directly or indirectly.
-        # We take the lazy way out and just add it to every dependency - it won't make a difference in packages that don't depend on `mime`.
-        addMimeTypes = _: p: p.override {
-          patchPhase = mimeTypePatchPhase;
-        };
-      in
-      (lib.attrsets.mapAttrs addMimeTypes prev) // {
-        # mix2nix does not support git dependencies yet,
-        # so we need to add them manually
-        captcha = beamPackages.buildMix rec {
-          name = "captcha";
-          version = "0.1.0";
-
-          src = fetchFromGitLab {
-            domain = "git.pleroma.social";
-            group = "pleroma";
-            owner = "elixir-libraries";
-            repo = "elixir-captcha";
-            rev = "6630c42aaaab124e697b4e513190c89d8b64e410";
-            hash = "sha256-KLsKBfCt6bUylSTTqRQi6ic0MyimanvIZRhU4Iv5Fmw=";
-          };
-
-          # the binary is not getting installed by default
-          postInstall = "mv priv/* $out/lib/erlang/lib/${name}-${version}/priv/";
-        };
-        concurrent_limiter = beamPackages.buildMix rec {
-          name = "concurrent_limiter";
-          version = "0.1.1";
-
-          src = fetchFromGitea {
-            domain = "akkoma.dev";
-            owner = "AkkomaGang";
-            repo = "concurrent-limiter";
-            rev = "a9e0b3d64574bdba761f429bb4fba0cf687b3338";
-            hash = "sha256-A7ucZnXks4K+JDVY5vV2cT5KfEOUOo/OHO4rga5mGys=";
-          };
-        };
-        elasticsearch = beamPackages.buildMix rec {
-          name = "elasticsearch";
-          version = "1.0.1";
-
-          src = fetchFromGitea {
-            domain = "akkoma.dev";
-            owner = "AkkomaGang";
-            repo = "elasticsearch-elixir";
-            rev = "6cd946f75f6ab9042521a009d1d32d29a90113ca";
-            hash = "sha256-CtmQHVl+VTpemne+nxbkYGcErrgCo+t3ZBPbkFSpyF0=";
-          };
-        };
-        mfm_parser = beamPackages.buildMix rec {
-          name = "mfm_parser";
-          version = "0.1.0";
-
-          src = fetchFromGitea {
-            domain = "akkoma.dev";
-            owner = "AkkomaGang";
-            repo = "mfm-parser";
-            rev = "b21ab7754024af096f2d14247574f55f0063295b";
-            hash = "sha256-couG5jrAo0Fbk/WABd4n3vhXpDUp+9drxExKc5NM9CI=";
-          };
-
-          beamDeps = with final; [ phoenix_view temple ];
-          patchPhase = mimeTypePatchPhase;
-        };
-        search_parser = beamPackages.buildMix rec {
-          name = "search_parser";
-          version = "0.1.0";
-
-          src = fetchFromGitHub {
-            owner = "FloatingGhost";
-            repo = "pleroma-contrib-search-parser";
-            rev = "08971a81e68686f9ac465cfb6661d51c5e4e1e7f";
-            hash = "sha256-sbo9Kcp2oT05o2GAF+IgziLPYmCkWgBfFMBCytmqg3Y=";
-          };
-
-          beamDeps = with final; [ nimble_parsec ];
-        };
-        temple = beamPackages.buildMix rec {
-          name = "temple";
-          version = "0.9.0-rc.0";
-
-          src = fetchFromGitea {
-            domain = "akkoma.dev";
-            owner = "AkkomaGang";
-            repo = "temple";
-            rev = "066a699ade472d8fa42a9d730b29a61af9bc8b59";
-            hash = "sha256-qA0z8WTMjO2OixcZBARn/LbuV3s3LGtwZ9nSjj/tWBc=";
-          };
-
-          mixEnv = "dev";
-          beamDeps = with final; [ earmark_parser ex_doc makeup makeup_elixir makeup_erlang nimble_parsec ];
-          patchPhase = mimeTypePatchPhase;
-        };
-
-        # Some additional build inputs and build fixes
-        fast_html = prev.fast_html.override {
-          nativeBuildInputs = [ cmake ];
-          dontUseCmakeConfigure = true;
-        };
-        http_signatures = beamPackages.buildMix rec {
-          name = "http_signatures";
-          version = "0.1.3";
-
-          src = fetchFromGitea {
-            domain = "akkoma.dev";
-            owner = "AkkomaGang";
-            repo = "http_signatures";
-            rev = "d44c43d66758c6a73eaa4da9cffdbee0c5da44ae";
-            hash = "sha256-o5xF++AIJLVMFuQwldNyWpYJGWFHZZTfGy1V80TZzR8=";
-          };
-
-          beamDeps = with final; [ credo ex_doc dialyxir temple ];
-          patchPhase = ''
-            substituteInPlace mix.exs --replace ":logger" ":logger, :public_key"
-            ${mimeTypePatchPhase}
-          '';
-        };
-        majic = beamPackages.buildMix {
-          name = "majic";
-          version = "1.0.0";
-
-          src = fetchFromGitea {
-            domain = "akkoma.dev";
-            owner = "AkkomaGang";
-            repo = "majic";
-            rev = "80540b36939ec83f48e76c61e5000e0fd67706f0";
-            hash = "sha256-OMM9aDRvbqCOBIE+iPySU8ONRn1BqHDql22rRSmdW08=";
-          };
-
-          buildInputs = [ file ];
-          beamDeps = with final; [ nimble_pool mime plug credo dialyxir ex_doc elixir_make ];
-          patchPhase = mimeTypePatchPhase;
-        };
-
-        syslog = prev.syslog.override {
-          buildPlugins = with beamPackages; [ pc ];
-        };
-      };
-  };
-
  passthru = {
-    tests = with nixosTests; { inherit akkoma akkoma-confined; };
-    inherit mixNixDeps;
+    tests = with nixosTests; {
+      inherit akkoma akkoma-confined;
+    };
+
+    inherit mixFodDeps;

    # Used to make sure the service uses the same version of elixir as
    # the package
    elixirPackage = beamPackages.elixir;
+
+    updateScript = nix-update-script { };
  };

  meta = {
--- a/pkgs/servers/akkoma/emoji/blobs_gg.nix
+++ b/pkgs/servers/akkoma/emoji/blobs_gg.nix
@ -30,10 +30,10 @@ stdenvNoCC.mkDerivation {
    runHook postInstall
  '';

-  meta = with lib; {
+  meta = {
    description = "Blob emoji from blobs.gg repacked as APNG";
    homepage = "https://blobs.gg";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ mvs ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ mvs ];
  };
 }
--- a/pkgs/servers/akkoma/mime.exs
+++ b/pkgs/servers/akkoma/mime.exs
@ -0,0 +1,14 @@
+config :mime, :types, %{
+  "application/xml" => ["xml"],
+  "application/xrd+xml" => ["xrd+xml"],
+  "application/jrd+json" => ["jrd+json"],
+  "application/activity+json" => ["activity+json"],
+  "application/ld+json" => ["activity+json"],
+  "image/apng" => ["apng"]
+}
+
+config :mime, :extensions, %{
+  "xrd+xml" => "text/plain",
+  "jrd+json" => "text/plain",
+  "activity+json" => "text/plain"
+}
--- a/pkgs/servers/akkoma/mix.nix
+++ b/pkgs/servers/akkoma/mix.nix
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@ -2,7 +2,7 @@
 # Do not edit!

 {
-  version = "2025.3.1";
+  version = "2025.3.2";
  components = {
    "3_day_blinds" =
      ps: with ps; [
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@ -383,7 +383,7 @@ let
  extraBuildInputs = extraPackages python.pkgs;

  # Don't forget to run update-component-packages.py after updating
-  hassVersion = "2025.3.1";
+  hassVersion = "2025.3.2";

 in
 python.pkgs.buildPythonApplication rec {
@ -404,13 +404,13 @@ python.pkgs.buildPythonApplication rec {
    owner = "home-assistant";
    repo = "core";
    tag = version;
-    hash = "sha256-tM23n0/98kzB7fqCNZ0+qREQnLxlc6oBmPAKv//TDNk=";
+    hash = "sha256-iL0yzgYlPIhdNEKwxCVqe1M1co+z7AMArbtxA0KJQoo=";
  };

  # Secondary source is pypi sdist for translations
  sdist = fetchPypi {
    inherit pname version;
-    hash = "sha256-s+4l9FZQ5A0cvPXXypxzxzpMgrEnrgogzH/S7VwUZe4=";
+    hash = "sha256-21WtUbqhsxv2DEy63zZ7dPGP+UE+snln3wLGbtICGDQ=";
  };

  build-system = with python.pkgs; [
--- a/pkgs/servers/home-assistant/stubs.nix
+++ b/pkgs/servers/home-assistant/stubs.nix
@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "homeassistant-stubs";
-  version = "2025.3.1";
+  version = "2025.3.2";
  pyproject = true;

  disabled = python.version != home-assistant.python.version;
@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "KapJI";
    repo = "homeassistant-stubs";
    rev = "refs/tags/${version}";
-    hash = "sha256-EtgSd9TXyGjNvFYB7klcdJNhiVQsAfF18b6J35/7bUM=";
+    hash = "sha256-aUkXbAyuyL8iZuWxFwVJNNYA6ANK8R2UrV5bA7MCLZc=";
  };

  build-system = [
--- a/pkgs/tools/games/ajour/Cargo.lock
+++ b/pkgs/tools/games/ajour/Cargo.lock
--- a/pkgs/tools/games/ajour/default.nix
+++ b/pkgs/tools/games/ajour/default.nix
@ -1,105 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  rustPlatform,
-  autoPatchelfHook,
-  cmake,
-  makeWrapper,
-  pkg-config,
-  python3,
-  expat,
-  freetype,
-  kdialog,
-  zenity,
-  openssl,
-  libglvnd,
-  libX11,
-  libxcb,
-  libXcursor,
-  libXi,
-  libxkbcommon,
-  libXrandr,
-  vulkan-loader,
-  wayland,
-}:
-
-let
-  rpathLibs = [
-    libglvnd
-    libXcursor
-    libXi
-    libxkbcommon
-    libXrandr
-    libX11
-    vulkan-loader
-    wayland
-  ];
-
-in
-rustPlatform.buildRustPackage rec {
-  pname = "ajour";
-  version = "1.3.2";
-
-  src = fetchFromGitHub {
-    owner = "casperstorm";
-    repo = "ajour";
-    rev = version;
-    sha256 = "sha256-oVaNLclU0EVNtxAASE8plXcC+clkwhBeb9pz1vXufV0=";
-  };
-
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "iced-0.3.0" = "sha256-cPQ0qqcdCMx2agSpAKSvVDBEoF/vUffGg1UkX85KmfY=";
-    };
-  };
-
-  nativeBuildInputs = [
-    autoPatchelfHook
-    cmake
-    makeWrapper
-    pkg-config
-    python3
-  ];
-
-  buildInputs = [
-    expat
-    freetype
-    openssl
-    libxcb
-    libX11
-    libxkbcommon
-  ];
-
-  postInstall = ''
-    mkdir -p $out/share
-    cp -r resources/logo $out/share/icons
-    install -Dm444 resources/linux/ajour.desktop -t $out/share/applications
-  '';
-
-  fixupPhase = ''
-    patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}:$(patchelf --print-rpath $out/bin/ajour)" $out/bin/ajour
-    wrapProgram $out/bin/ajour --prefix PATH ":" ${
-      lib.makeBinPath [
-        zenity
-        kdialog
-      ]
-    }
-  '';
-
-  meta = with lib; {
-    description = "World of Warcraft addon manager written in Rust";
-    mainProgram = "ajour";
-    longDescription = ''
-      Ajour is a World of Warcraft addon manager written in Rust with a
-      strong focus on performance and simplicity. The project is
-      completely advertisement free, privacy respecting and open source.
-    '';
-    homepage = "https://github.com/casperstorm/ajour";
-    changelog = "https://github.com/casperstorm/ajour/blob/master/CHANGELOG.md";
-    license = licenses.mit;
-    broken = stdenv.hostPlatform.isDarwin;
-    maintainers = with maintainers; [ hexa ];
-  };
-}
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@ -147,6 +147,7 @@ mapAliases {
  aeon = throw "aeon has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-07-15
  afl = throw "afl has been removed as the upstream project was archived. Consider using 'aflplusplus'"; # Added 2024-04-21
  agda-pkg = throw "agda-pkg has been removed due to being unmaintained"; # Added 2024-09-10"
+  ajour = throw "ajour has been removed, the project was archived upstream on 2024-09-17."; # Added 2025-03-12
  alass = throw "'alass' has been removed due to being unmaintained upstream"; # Added 2025-01-25
  alsaLib = throw "'alsaLib' has been renamed to/replaced by 'alsa-lib'"; # Converted to throw 2024-10-17
  alsaOss = throw "'alsaOss' has been renamed to/replaced by 'alsa-oss'"; # Converted to throw 2024-10-17
@ -1633,6 +1634,7 @@ mapAliases {

  ### X ###

+  x11idle = throw "'x11idle' has been removed as the upstream is no longer available. Please see 'xprintidle' as an alternative"; # Added 2025-03-10
  x509-limbo = throw "'x509-limbo' has been removed from nixpkgs"; # Added 2024-10-22
  xarchive = throw "'xarchive' has been removed due to lack of maintenance upstream. Consider using 'file-roller' instead"; # Added 2024-10-19
  xbmc-retroarch-advanced-launchers = throw "'xbmc-retroarch-advanced-launchers' has been renamed to/replaced by 'kodi-retroarch-advanced-launchers'"; # Converted to throw 2024-10-17
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -921,8 +921,12 @@ with pkgs;
  };

  akkoma = callPackage ../servers/akkoma {
-    elixir = beam_nox.packages.erlang_26.elixir_1_16;
-    beamPackages = beam_nox.packages.erlang_26.extend (self: super: { elixir = self.elixir_1_16; });
+    beamPackages = beam_nox.packages.erlang_26.extend (self: super: {
+      elixir = self.elixir_1_16;
+      rebar3 = self.rebar3WithPlugins {
+        plugins = with self; [ pc ];
+      };
+    });
  };
  akkoma-frontends = recurseIntoAttrs {
    akkoma-fe = callPackage ../servers/akkoma/akkoma-fe { };
@ -954,10 +958,6 @@ with pkgs;

  aioblescan = with python3Packages; toPythonApplication aioblescan;

-  ajour = callPackage ../tools/games/ajour {
-    inherit (plasma5Packages) kdialog;
-  };
-
  inherit (recurseIntoAttrs (callPackage ../tools/package-management/akku { }))
    akku akkuPackages;

@ -1522,7 +1522,7 @@ with pkgs;

  cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { };

-  kitty = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/kitty {
+  kitty = darwin.apple_sdk_11_0.callPackage ../by-name/ki/kitty/package.nix {
    harfbuzz = harfbuzz.override { withCoreText = stdenv.hostPlatform.isDarwin; };
    inherit (darwin) autoSignDarwinBinariesHook;
    inherit (darwin.apple_sdk_11_0) Libsystem;
@ -1534,8 +1534,6 @@ with pkgs;
    ;
  };

-  kitty-themes  = callPackage ../applications/terminal-emulators/kitty/themes.nix { };
-
  mlterm = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/mlterm { };
  mlterm-wayland = mlterm.override {
    enableX11 = false;
@ -7495,7 +7493,7 @@ with pkgs;

  electron_32 = electron_32-bin;
  electron_33 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_33 then electron-source.electron_33 else electron_33-bin;
-  electron_34 = electron_34-bin;
+  electron_34 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_34 then electron-source.electron_34 else electron_34-bin;
  electron = electron_34;
  electron-bin = electron_34-bin;
  electron-chromedriver = electron-chromedriver_34;
@ -17767,12 +17765,8 @@ with pkgs;

  xdragon = lowPrio (callPackage ../tools/X11/xdragon { });

-  sail-riscv-rv32 = callPackage ../applications/virtualization/sail-riscv {
-    arch = "RV32";
-  };
-
-  sail-riscv-rv64 = callPackage ../applications/virtualization/sail-riscv {
-    arch = "RV64";
+  sail-riscv = callPackage ../applications/virtualization/sail-riscv {
+    inherit (ocamlPackages) sail;
  };

  timeloop = pkgs.darwin.apple_sdk_11_0.callPackage ../applications/science/computer-architecture/timeloop { };
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -13633,7 +13633,6 @@ self: super: with self; {
    inherit (pkgs) fontconfig rapidjson;
    inherit (pkgs.xorg) libX11 libXi libXmu libXext;
    inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
-    opencascade-occt = pkgs.opencascade-occt_7_6;
  });

  python-olm = callPackage ../development/python-modules/python-olm { };
@ -15978,6 +15977,8 @@ self: super: with self; {

  standard-pipes = if pythonAtLeast "3.13" then callPackage ../development/python-modules/standard-pipes { } else null;

+  standard-sunau = if pythonAtLeast "3.13" then callPackage ../development/python-modules/standard-sunau { } else null;
+
  standard-telnetlib = if pythonAtLeast "3.13" then callPackage ../development/python-modules/standard-telnetlib { } else null;

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