diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fdb6e41dc668..702620144ad7 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -19534,6 +19534,12 @@
     githubId = 488734;
     name = "Puck Meerburg";
   };
+  PuercoPop = {
+    email = "pirata@gmail.com";
+    github = "PuercoPop";
+    githubId = 387111;
+    name = "Javier Olaechea";
+  };
   puffnfresh = {
     email = "brian@brianmckenna.org";
     github = "puffnfresh";
diff --git a/nixos/modules/services/desktop-managers/cosmic.nix b/nixos/modules/services/desktop-managers/cosmic.nix
index 576cbe1438ec..386070fa36f1 100644
--- a/nixos/modules/services/desktop-managers/cosmic.nix
+++ b/nixos/modules/services/desktop-managers/cosmic.nix
@@ -45,7 +45,7 @@ in
         cosmic-applets
         cosmic-applibrary
         cosmic-bg
-        (cosmic-comp.override { useXWayland = false; })
+        cosmic-comp
         cosmic-edit
         cosmic-files
         config.services.displayManager.cosmic-greeter.package
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index daf5e22d0ac9..d40193d3718f 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -8,7 +8,7 @@
 
 }:
 # The return value of this function will be an attrset with arbitrary depth and
-# the `anything` returned by callTest at its test leafs.
+# the `anything` returned by callTest at its test leaves.
 # The tests not supported by `system` will be replaced with `{}`, so that
 # `passthru.tests` can contain links to those without breaking on architectures
 # where said tests are unsupported.
@@ -655,7 +655,7 @@ in
   jool = import ./jool.nix { inherit pkgs runTest; };
   jotta-cli = handleTest ./jotta-cli.nix { };
   k3s = handleTest ./k3s { };
-  kafka = handleTest ./kafka.nix { };
+  kafka = handleTest ./kafka { };
   kanboard = runTest ./web-apps/kanboard.nix;
   kanidm = handleTest ./kanidm.nix { };
   kanidm-provisioning = handleTest ./kanidm-provisioning.nix { };
diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka/base.nix
similarity index 95%
rename from nixos/tests/kafka.nix
rename to nixos/tests/kafka/base.nix
index 6bcc03dca95e..80121a722465 100644
--- a/nixos/tests/kafka.nix
+++ b/nixos/tests/kafka/base.nix
@@ -1,8 +1,4 @@
-{
-  system ? builtins.currentSystem,
-  config ? { },
-  pkgs ? import ../.. { inherit system config; },
-}:
+{ pkgs, ... }:
 
 with pkgs.lib;
 
@@ -13,7 +9,7 @@ let
       kafkaPackage,
       mode ? "kraft",
     }:
-    (import ./make-test-python.nix ({
+    (import ../make-test-python.nix ({
       inherit name;
       meta = with pkgs.lib.maintainers; {
         maintainers = [ nequissimus ];
@@ -71,6 +67,7 @@ let
                 9092
                 9093
               ];
+              virtualisation.diskSize = 1024;
               # i686 tests: qemu-system-i386 can simulate max 2047MB RAM (not 2048)
               virtualisation.memorySize = 2047;
             };
@@ -84,6 +81,7 @@ let
               };
 
               networking.firewall.allowedTCPPorts = [ 2181 ];
+              virtualisation.diskSize = 1024;
             };
         };
 
@@ -116,7 +114,7 @@ let
             + "--from-beginning --max-messages 1"
         )
       '';
-    }) { inherit system; });
+    }));
 
 in
 with pkgs;
diff --git a/nixos/tests/kafka/cluster.nix b/nixos/tests/kafka/cluster.nix
new file mode 100644
index 000000000000..ace64a3d3da2
--- /dev/null
+++ b/nixos/tests/kafka/cluster.nix
@@ -0,0 +1,199 @@
+import ../make-test-python.nix (
+  { lib, pkgs, ... }:
+
+  let
+    inherit (lib) mkMerge;
+
+    # Generate with `kafka-storage.sh random-uuid`
+    clusterId = "ii5pZE5LRkSeWrnyBhMOYQ";
+
+    kafkaConfig = {
+      networking.firewall.allowedTCPPorts = [
+        9092
+        9093
+      ];
+
+      virtualisation.diskSize = 1024;
+      virtualisation.memorySize = 1024 * 2;
+
+      environment.systemPackages = [ pkgs.apacheKafka ];
+
+      services.apache-kafka = {
+        enable = true;
+
+        clusterId = "${clusterId}";
+
+        formatLogDirs = true;
+
+        settings = {
+          listeners = [
+            "PLAINTEXT://:9092"
+            "CONTROLLER://:9093"
+          ];
+          "listener.security.protocol.map" = [
+            "PLAINTEXT:PLAINTEXT"
+            "CONTROLLER:PLAINTEXT"
+          ];
+          "controller.quorum.voters" = lib.imap1 (i: name: "${toString i}@${name}:9093") (
+            builtins.attrNames kafkaNodes
+          );
+          "controller.listener.names" = [ "CONTROLLER" ];
+
+          "process.roles" = [
+            "broker"
+            "controller"
+          ];
+
+          "log.dirs" = [ "/var/lib/apache-kafka" ];
+          "num.partitions" = 6;
+          "offsets.topic.replication.factor" = 2;
+          "transaction.state.log.replication.factor" = 2;
+          "transaction.state.log.min.isr" = 2;
+        };
+      };
+
+      systemd.services.apache-kafka = {
+        after = [ "network-online.target" ];
+        requires = [ "network-online.target" ];
+        serviceConfig.StateDirectory = "apache-kafka";
+      };
+    };
+
+    extraKafkaConfig = {
+      kafka1 = {
+        services.apache-kafka.settings = {
+          "node.id" = 1;
+          "broker.rack" = 1;
+        };
+      };
+
+      kafka2 = {
+        services.apache-kafka.settings = {
+          "node.id" = 2;
+          "broker.rack" = 2;
+        };
+      };
+
+      kafka3 = {
+        services.apache-kafka.settings = {
+          "node.id" = 3;
+          "broker.rack" = 3;
+        };
+      };
+
+      kafka4 = {
+        services.apache-kafka.settings = {
+          "node.id" = 4;
+          "broker.rack" = 3;
+        };
+      };
+    };
+
+    kafkaNodes = builtins.mapAttrs (
+      _: val:
+      mkMerge [
+        val
+        kafkaConfig
+      ]
+    ) extraKafkaConfig;
+  in
+  {
+    name = "kafka-cluster";
+    meta = with pkgs.lib.maintainers; {
+      maintainers = [ jpds ];
+    };
+
+    nodes = {
+      inherit (kafkaNodes)
+        kafka1
+        kafka2
+        kafka3
+        kafka4
+        ;
+
+      client =
+        { config, ... }:
+        {
+          environment.systemPackages = [ pkgs.apacheKafka ];
+          virtualisation.diskSize = 1024;
+        };
+    };
+
+    testScript = ''
+      import json
+
+      for machine in kafka1, kafka2, kafka3, kafka4:
+        machine.wait_for_unit("apache-kafka")
+
+      for machine in kafka1, kafka2, kafka3, kafka4:
+        machine.wait_for_open_port(9092)
+        machine.wait_for_open_port(9093)
+
+        machine.wait_until_succeeds(
+          "journalctl -o cat -u apache-kafka.service | grep 'Transition from STARTING to STARTED'"
+        )
+
+        machine.wait_until_succeeds(
+          "journalctl -o cat -u apache-kafka.service | grep 'Kafka Server started'"
+        )
+
+        machine.wait_until_succeeds(
+          "journalctl -o cat -u apache-kafka.service | grep 'BrokerLifecycleManager' | grep 'Incarnation [[:graph:]]\+ of broker [[:digit:]] in cluster ${clusterId}'"
+        )
+
+      current_voters_json = kafka1.wait_until_succeeds(
+        "kafka-metadata-quorum.sh --bootstrap-server kafka1:9092,kafka2:9092,kafka3:9092 describe --status | grep CurrentVoters"
+      ).replace("CurrentVoters:", "")
+
+      voters = json.loads(current_voters_json)
+
+      assert len(voters) == 4
+
+      kafka1.wait_until_succeeds(
+        "kafka-topics.sh --bootstrap-server kafka1:9092 --create --topic test-123 --replication-factor 2"
+      )
+
+      for machine in kafka1, kafka2, kafka3, kafka4:
+        machine.wait_until_succeeds(
+          "journalctl -o cat -u apache-kafka.service | grep -E 'Created log for partition test-123-[[:digit:]] in /var/lib/apache-kafka/test-123-[[:digit:]] with properties'"
+        )
+
+      kafka1.wait_until_succeeds(
+        "kafka-topics.sh --bootstrap-server=kafka1:9092 --describe --topic test-123 | "
+        + "grep 'PartitionCount: 6'"
+      )
+
+      # Should never see a replica on both 3 and 4 as they're in the same rack
+      kafka1.fail(
+        "kafka-topics.sh --bootstrap-server=kafka1:9092 --describe --topic test-123 | "
+        + "grep -E 'Replicas: (3,4|4,3)'"
+      )
+
+      client.succeed(
+          "echo 'test 2' | "
+          + "kafka-console-producer.sh "
+          + "--bootstrap-server kafka1:9092 "
+          + "--topic test-123"
+      )
+      assert "test 2" in client.succeed(
+          "kafka-console-consumer.sh "
+          + "--bootstrap-server kafka2:9092 --topic test-123 "
+          + "--group readtest "
+          + "--from-beginning --max-messages 1"
+      )
+
+      client.succeed(
+          "echo 'test 3' | "
+          + "kafka-console-producer.sh "
+          + "--bootstrap-server kafka2:9092 "
+          + "--topic test-123"
+      )
+      assert "test 3" in client.succeed(
+          "kafka-console-consumer.sh "
+          + "--bootstrap-server kafka3:9092 --topic test-123 "
+          + "--group readtest "
+          + "--max-messages 1"
+      )
+    '';
+  }
+)
diff --git a/nixos/tests/kafka/default.nix b/nixos/tests/kafka/default.nix
new file mode 100644
index 000000000000..1056117a9a10
--- /dev/null
+++ b/nixos/tests/kafka/default.nix
@@ -0,0 +1,11 @@
+{
+  system ? builtins.currentSystem,
+  config ? { },
+  pkgs ? import ../../.. { inherit system config; },
+}:
+
+{
+  base = import ./base.nix { inherit system pkgs; };
+  cluster = import ./cluster.nix { inherit system pkgs; };
+  mirrormaker = import ./mirrormaker.nix { inherit system pkgs; };
+}
diff --git a/nixos/tests/kafka/mirrormaker.nix b/nixos/tests/kafka/mirrormaker.nix
new file mode 100644
index 000000000000..623f729d9fab
--- /dev/null
+++ b/nixos/tests/kafka/mirrormaker.nix
@@ -0,0 +1,240 @@
+import ../make-test-python.nix (
+  { lib, pkgs, ... }:
+
+  let
+    inherit (lib) mkMerge;
+
+    # Generate with `kafka-storage.sh random-uuid`
+    clusterAId = "ihzlrasUQ9O3Yy0ZWYkd6w";
+
+    clusterBId = "Bnu_zrzKRH6-7KcK7t3I5Q";
+
+    kafkaConfig = {
+      networking.firewall.allowedTCPPorts = [
+        9092
+        9093
+      ];
+
+      virtualisation.diskSize = 1024;
+      virtualisation.memorySize = 1024 * 2;
+
+      environment.systemPackages = [ pkgs.apacheKafka ];
+
+      services.apache-kafka = {
+        enable = true;
+
+        formatLogDirs = true;
+
+        settings = {
+          listeners = [
+            "PLAINTEXT://:9092"
+            "CONTROLLER://:9093"
+          ];
+          "listener.security.protocol.map" = [
+            "PLAINTEXT:PLAINTEXT"
+            "CONTROLLER:PLAINTEXT"
+          ];
+          "controller.listener.names" = [ "CONTROLLER" ];
+
+          "process.roles" = [
+            "broker"
+            "controller"
+          ];
+
+          "log.dirs" = [ "/var/lib/apache-kafka" ];
+          "num.partitions" = 1;
+          "offsets.topic.replication.factor" = 1;
+          "transaction.state.log.replication.factor" = 1;
+          "transaction.state.log.min.isr" = 1;
+        };
+      };
+
+      systemd.services.apache-kafka = {
+        after = [ "network-online.target" ];
+        requires = [ "network-online.target" ];
+        serviceConfig.StateDirectory = "apache-kafka";
+      };
+    };
+
+    extraKafkaConfig = {
+      kafkaa1 = {
+        services.apache-kafka = {
+          clusterId = "${clusterAId}";
+
+          settings = {
+            "node.id" = 1;
+            "controller.quorum.voters" = [ "1@kafkaa1:9093" ];
+          };
+        };
+      };
+
+      kafkab1 = {
+        services.apache-kafka = {
+          clusterId = "${clusterBId}";
+
+          settings = {
+            "node.id" = 1;
+            "controller.quorum.voters" = [ "1@kafkab1:9093" ];
+          };
+        };
+      };
+    };
+
+    kafkaNodes = builtins.mapAttrs (
+      _: val:
+      mkMerge [
+        val
+        kafkaConfig
+      ]
+    ) extraKafkaConfig;
+
+    mirrorMakerProperties = pkgs.writeText "mm2.properties" ''
+      name = A->B
+
+      clusters = A, B
+
+      A.bootstrap.servers = kafkaa1:9092
+      B.bootstrap.servers = kafkab1:9092
+
+      A->B.enabled = true
+      A->B.topics = .*
+
+      B->A.enabled = false
+      B->A.topics = .*
+
+      replication.factor=1
+      replication.policy.class=org.apache.kafka.connect.mirror.IdentityReplicationPolicy
+
+      tasks.max = 2
+      refresh.topics.enabled = true
+      refresh.topics.interval.seconds = 5
+      sync.topic.configs.enabled = true
+
+      checkpoints.topic.replication.factor=1
+      heartbeats.topic.replication.factor=1
+      offset-syncs.topic.replication.factor=1
+
+      offset.storage.replication.factor=1
+      status.storage.replication.factor=1
+      config.storage.replication.factor=1
+
+      emit.checkpoints.enabled = true
+      emit.checkpoints.interval.seconds = 5
+    '';
+  in
+  {
+    name = "kafka-mirrormaker";
+    meta = with pkgs.lib.maintainers; {
+      maintainers = [ jpds ];
+    };
+
+    nodes = {
+      inherit (kafkaNodes) kafkaa1 kafkab1;
+
+      mirrormaker =
+        { config, ... }:
+        {
+          virtualisation.diskSize = 1024;
+          virtualisation.memorySize = 1024 * 2;
+
+          # Define a mirrormaker systemd service
+          systemd.services.kafka-connect-mirror-maker = {
+            after = [ "network-online.target" ];
+            requires = [ "network-online.target" ];
+            wantedBy = [ "multi-user.target" ];
+
+            serviceConfig = {
+              ExecStart = ''
+                ${pkgs.apacheKafka}/bin/connect-mirror-maker.sh ${mirrorMakerProperties}
+              '';
+              Restart = "on-failure";
+              RestartSec = "5s";
+            };
+          };
+        };
+    };
+
+    testScript = ''
+      import json
+
+      for machine in kafkaa1, kafkab1:
+        machine.wait_for_unit("apache-kafka")
+
+      for machine in kafkaa1, kafkab1:
+        machine.wait_for_open_port(9092)
+        machine.wait_for_open_port(9093)
+
+        machine.wait_until_succeeds(
+          "journalctl -o cat -u apache-kafka.service | grep 'Transition from STARTING to STARTED'"
+        )
+
+        machine.wait_until_succeeds(
+          "journalctl -o cat -u apache-kafka.service | grep 'Kafka Server started'"
+        )
+
+      for machine in kafkaa1, kafkab1:
+        current_voters_json = machine.wait_until_succeeds(
+          f"kafka-metadata-quorum.sh --bootstrap-server {machine.name}:9092 describe --status | grep CurrentVoters"
+        ).replace("CurrentVoters:", "")
+
+        voters = json.loads(current_voters_json)
+
+        assert len(voters) == 1
+
+      mirrormaker.wait_for_unit("kafka-connect-mirror-maker")
+
+      mirrormaker.wait_until_succeeds(
+        "journalctl -o cat -u kafka-connect-mirror-maker.service | grep 'Kafka MirrorMaker initializing'"
+      )
+      mirrormaker.wait_until_succeeds(
+        "journalctl -o cat -u kafka-connect-mirror-maker.service | grep 'Targeting clusters \[A, B\]'"
+      )
+      mirrormaker.wait_until_succeeds(
+        "journalctl -o cat -u kafka-connect-mirror-maker.service | grep 'INFO \[Worker clientId=A->B, groupId=A-mm2\] Finished starting connectors and tasks'"
+      )
+
+      mirrormaker.wait_until_succeeds(
+        """
+          journalctl -o cat -u kafka-connect-mirror-maker.service | grep 'INFO \[MirrorSourceConnector\|task-0\] \[Producer clientId=A->B\|A->B-0\|offset-syncs-source-producer\] Cluster ID: ${clusterAId}'
+        """
+      )
+
+      kafkaa1.wait_until_succeeds(
+        "journalctl -o cat -u apache-kafka.service | grep 'Stabilized group B-mm2'"
+      )
+
+      kafkab1.wait_until_succeeds(
+        "journalctl -o cat -u apache-kafka.service | grep 'Stabilized group A-mm2'"
+      )
+
+      kafkaa1.wait_until_succeeds(
+        "kafka-topics.sh --bootstrap-server localhost:9092 --create --topic test-mm-1 --partitions 1 --replication-factor 1"
+      )
+
+      for machine in kafkaa1, kafkab1:
+        machine.succeed(
+          "kafka-topics.sh --bootstrap-server localhost:9092 --list | grep 'test-mm-1'"
+        )
+
+      mirrormaker.wait_until_succeeds(
+        "journalctl -o cat -u kafka-connect-mirror-maker.service | grep 'replicating [[:digit:]]\+ topic-partitions A->B: \[test-mm-1-0\]'"
+      )
+
+      mirrormaker.wait_until_succeeds(
+        "journalctl -o cat -u kafka-connect-mirror-maker.service | grep 'Found [[:digit:]]\+ new topic-partitions on A'"
+      )
+
+      kafkaa1.wait_until_succeeds(
+        "kafka-verifiable-producer.sh --bootstrap-server kafkaa1:9092 --throughput 10 --max-messages 100 --topic test-mm-1"
+      )
+
+      mirrormaker.wait_until_succeeds(
+        "journalctl -o cat -u kafka-connect-mirror-maker.service | grep 'Committing offsets for [[:digit:]]\+ acknowledged messages'"
+      )
+
+      kafkab1.wait_until_succeeds(
+        "kafka-verifiable-consumer.sh --bootstrap-server kafkab1:9092 --topic test-mm-1 --group-id testreplication --max-messages 100"
+      )
+    '';
+  }
+)
diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
index 6e40bc10a938..9e9ff594aa3e 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
+++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
@@ -61884,8 +61884,8 @@
   "repo": "ushin/hyperdrive.el",
   "unstable": {
    "version": [
-    20250331,
-    427
+    20250406,
+    2225
    ],
    "deps": [
     "compat",
@@ -61896,8 +61896,8 @@
     "taxy-magit-section",
     "transient"
    ],
-   "commit": "1784ae20556990d205360463f069aba319c25909",
-   "sha256": "05p9avasp7nx1wx5mvc5rj85j1n28hw1ibwag0gbxrnpxvrbqvzr"
+   "commit": "42048ef8bc7e568f9f1e1fa82c9f70b06a4d574d",
+   "sha256": "07fvdzd93836msaxpw9rk0sdrxpm29fn2zk22ln91v7s9aazjd3w"
   },
   "stable": {
    "version": [
diff --git a/pkgs/applications/editors/vscode/extensions/language-packs.nix b/pkgs/applications/editors/vscode/extensions/language-packs.nix
index 6eab196c383f..627e009c9a54 100644
--- a/pkgs/applications/editors/vscode/extensions/language-packs.nix
+++ b/pkgs/applications/editors/vscode/extensions/language-packs.nix
@@ -13,7 +13,7 @@ let
   buildVscodeLanguagePack =
     {
       language,
-      version ? "1.98.2025031209",
+      version ? "1.99.2025040209",
       hash,
     }:
     buildVscodeMarketplaceExtension {
@@ -25,7 +25,7 @@ let
       passthru.updateScript = lib.optionalAttrs (language == "fr") (
         writeShellScript "vscode-language-packs-update-script" ''
           ${lib.getExe vscode-extensions-update} vscode-extensions.ms-ceintl.vscode-language-pack-fr --override-filename "pkgs/applications/editors/vscode/extensions/language-packs.nix"
-          for lang in cs de es it ja ko pt-br qps-ploc ru tr zh-hans zh-hant; do
+          for lang in cs de es it ja ko pl pt-br qps-ploc ru tr zh-hans zh-hant; do
             ${lib.getExe nix-update} --version "skip" "vscode-extensions.ms-ceintl.vscode-language-pack-$lang" --override-filename "pkgs/applications/editors/vscode/extensions/language-packs.nix"
           done
         ''
@@ -41,66 +41,71 @@ in
   # French
   vscode-language-pack-fr = buildVscodeLanguagePack {
     language = "fr";
-    hash = "sha256-ulFnHulIa1T+WdlXa000cYDY/SWGcA9W/uLZrP5l40Q=";
+    hash = "sha256-QQHaNifN6ol6dnmuLZcIv74g8gbAWJgQBX4BPNx1bgM=";
   };
   # Italian
   vscode-language-pack-it = buildVscodeLanguagePack {
     language = "it";
-    hash = "sha256-o9EwOKuFVqB1gJvCh4S5ArwQDN21a3zhLBsCpeztUhU=";
+    hash = "sha256-b8HVmF9Wf4jLpaHMK+9EuCayMLxAKyPRJpohBNTDk7I=";
   };
   # German
   vscode-language-pack-de = buildVscodeLanguagePack {
     language = "de";
-    hash = "sha256-x20EJ6YfMT59bk8o8LYDqQgyOmI1NH/Jq2zjtrUHOt8=";
+    hash = "sha256-e7slPjnns7Y3GwmYDKjvIi7eJBkrBUG6KTnUJFoz0nk=";
   };
   # Spanish
   vscode-language-pack-es = buildVscodeLanguagePack {
     language = "es";
-    hash = "sha256-MerP4/WBKj/TauDnQcWv0YCFh9JA1ce0jHiFAvt5NdI=";
+    hash = "sha256-OtxIM70wTLkgxFN6s4myLGe2fdjVG3p13tYko0MzhUc=";
   };
   # Russian
   vscode-language-pack-ru = buildVscodeLanguagePack {
     language = "ru";
-    hash = "sha256-0Z4jSiP16EDFyHwQAgvFpMh5F8tCu74hUojXH5EK66o=";
+    hash = "sha256-JLcQ2JVR7eFThgKrabQPo0Z27AigWfeHVY+lW2ZY1es=";
   };
   # Chinese (Simplified)
   vscode-language-pack-zh-hans = buildVscodeLanguagePack {
     language = "zh-hans";
-    hash = "sha256-CQtb7FJGR2JVznbEYVN76IywQopwZ6TzWjxE1as7WWE=";
+    hash = "sha256-oUb3nj67HBAavB6b0XLgwpbQO2aZ9HMF42Rdw53Z9B4=";
   };
   # Chinese (Traditional)
   vscode-language-pack-zh-hant = buildVscodeLanguagePack {
     language = "zh-hant";
-    hash = "sha256-LmBcWZlyAVvXoa5sZ4gpWBkBZD+5AKkFZqSs4zXkCwc=";
+    hash = "sha256-1ESY/7woVrPN/PITD2T0/Cm9zFKDyYcGy4x1/oBxZeE=";
   };
   # Japanese
   vscode-language-pack-ja = buildVscodeLanguagePack {
     language = "ja";
-    hash = "sha256-4tj4wTCOnC2KpHWN86EZl5KmNl2QLXb7Co1aYwRZ7uY=";
+    hash = "sha256-nHeWIcipl/nztwPkUTzetO5eGTVEaEp7oW3a31c5Obo=";
   };
   # Korean
   vscode-language-pack-ko = buildVscodeLanguagePack {
     language = "ko";
-    hash = "sha256-NmSSijvWckFiyyQBo+2Lv70YsqOYR/5kHP4iiqaQUZU=";
+    hash = "sha256-R/mbXCUsVTYhRpvCUr44jbDvYWYKqBXF4kr+TRl/MeU=";
   };
   # Czech
   vscode-language-pack-cs = buildVscodeLanguagePack {
     language = "cs";
-    hash = "sha256-Q8jSCYzl/DXasi0n228Kd7Ru0z1Bb/ovTySAYCV42pg=";
+    hash = "sha256-oVpGg7OMZ+8WrO2vGzmwF2mDwTaRGYvM1kOXEtmFvdw=";
   };
   # Portuguese (Brazil)
   vscode-language-pack-pt-br = buildVscodeLanguagePack {
     language = "pt-BR";
-    hash = "sha256-PJPeTn+0g1s+L7t9d6A/hyrBEF0EE/QKshHa3vuQZxU=";
+    hash = "sha256-cY1hGBNeTa3rul8ZtvtZW2PCLp0MZwugufdLTaI7rx0=";
   };
   # Turkish
   vscode-language-pack-tr = buildVscodeLanguagePack {
     language = "tr";
-    hash = "sha256-+M43EdHHsmw1pJopLi0nMIGwcxk6+LeVvZjkxnxUatI=";
+    hash = "sha256-DzPerwuqvHk4G5/AcrXLJh0PINd5HK+TelO9C4EOdVc=";
+  };
+  # Polish
+  vscode-language-pack-pl = buildVscodeLanguagePack {
+    language = "pl";
+    hash = "sha256-9UilVHsAWCZq6N6sqrGpnIEzjCBfalBL9LgCfEGFLvU=";
   };
   # Pseudo Language
   vscode-language-pack-qps-ploc = buildVscodeLanguagePack {
     language = "qps-ploc";
-    hash = "sha256-2ERwup1z7wGVwoGfakV0oCADxXWfWbYxlkQ6iJYgXkc=";
+    hash = "sha256-lYS+uje6eLUr7J7diq2Lkh3xjhPKWdU+ccwVQrOs75g=";
   };
 }
diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix
index 4904c2494e70..329a96835187 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix
@@ -15,8 +15,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
   mktplcRef = {
     name = "python";
     publisher = "ms-python";
-    version = "2025.3.2025031001";
-    hash = "sha256-uYz0WgFqbLohCEmT8ewYgvlFrVLuZr9OAiKnrbNup7U=";
+    version = "2025.4.0";
+    hash = "sha256-/yQbmZTnkks1gvMItEApRzfk8Lczjq+JC5rnyJxr6fo=";
   };
 
   buildInputs = [ icu ];
diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index d60931d05533..affc623f5e6c 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -26,11 +26,11 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-qiSCrPScPtfoxVXpjapOUqzIAHlNsXwVAZNYN6CeuQo=";
-      x86_64-darwin = "sha256-2MEBSjiy4Ct4RrlbsD6ZiYO7Fb3hFcQnzZpa1WjMKXY=";
-      aarch64-linux = "sha256-wax6tTFkaGsKsOrkfcXF1yvBsVmUexNwe7Aex04HS/Q=";
-      aarch64-darwin = "sha256-ccHrhEVqxKrgQK5iP4nlOROEQWbLBRWXjXrhnkaRpMQ=";
-      armv7l-linux = "sha256-1+4/QdAi9wLtnZTwutCIpjMwBA3Zzzi4M2746mIu3gE=";
+      x86_64-linux = "sha256-yK7ORsRAWMJ8yrWROS/jSKdyCyuJ2Y+gIdZlqto+/Xo=";
+      x86_64-darwin = "sha256-d+8vt5grnLwD/cIIGgb2ogpgZrZLZs+2bqfBrRzLfJw=";
+      aarch64-linux = "sha256-D93Eh5TPRgd9OxJ4pWsOryS5mOz2amQOHOnO+K99hAg=";
+      aarch64-darwin = "sha256-xKBWAb23jUi8pI7mZpHOP2eF3PZFh0MWj+BM+alKF18=";
+      armv7l-linux = "sha256-EqJNi/qMM08voA/Ltle3/28zbgIz/Ae42IE5oXLxcKU=";
     }
     .${system} or throwSystem;
 
@@ -41,7 +41,7 @@ callPackage ./generic.nix rec {
 
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.98.2.25078";
+  version = "1.99.02289";
   pname = "vscodium";
 
   executableName = "codium";
diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix
index 355630d9443a..80c5cf781b97 100644
--- a/pkgs/applications/emulators/wine/base.nix
+++ b/pkgs/applications/emulators/wine/base.nix
@@ -265,7 +265,7 @@ stdenv.mkDerivation (
             hidden="$(dirname "$prog")/.$(basename "$prog")"
             mv "$prog" "$hidden"
             makeWrapper "$hidden" "$prog" \
-              --argv0 "" \
+              --inherit-argv0 \
               --set WINELOADER "$hidden" \
               --prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0"
           fi
diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json
index 510aab612186..ca549a1b0f3f 100644
--- a/pkgs/applications/networking/browsers/librewolf/src.json
+++ b/pkgs/applications/networking/browsers/librewolf/src.json
@@ -1,11 +1,11 @@
 {
-  "packageVersion": "136.0.4-1",
+  "packageVersion": "137.0-3",
   "source": {
-    "rev": "136.0.4-1",
-    "hash": "sha256-ymW9vj4CariMaswrMQRKYEvTofFRjc50gF9EmTuhsRA="
+    "rev": "137.0-3",
+    "hash": "sha256-3E8xjruyAHoOklvSt4sH6DY6cIzcOEFy8v3UhqKSpdI="
   },
   "firefox": {
-    "version": "136.0.4",
-    "hash": "sha512-wiUqpi0BXO1lNMsqwHH2gImZe0ZpAIPMHv9LrTBq5shlQ3Ge0tNfb5c790Rn1qBKukYNMJwG3qQl52xyDjROKA=="
+    "version": "137.0",
+    "hash": "sha512-gaLAzBT/wuSeSTeebCq1bPtuE7ZmZqZPOr/0SkO7Ln3BcnTTJdHCCvBi1Av/gGPXiNSy+TGnpkbbiwcgTKa0gQ=="
   }
 }
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index c467308b04fe..24a783b70faf 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -71,7 +71,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "vivaldi";
-  version = "7.1.3570.60";
+  version = "7.3.3635.4";
 
   suffix =
     {
@@ -84,8 +84,8 @@ stdenv.mkDerivation rec {
     url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
     hash =
       {
-        aarch64-linux = "sha256-x7CjbOrEb0+/1eqRoYTxA1RDxQeLJFmziuFcBapYaOU=";
-        x86_64-linux = "sha256-G0y49vUsFJTzxKRw1ZsXQvep7/MtGaO0FAF2nAinysw=";
+        aarch64-linux = "sha256-ddmWP1Tfim8DyP4S+Mq3khu7WU995k8p1Pqx63Z7oRQ=";
+        x86_64-linux = "sha256-sYC3dgwFhS39eOSAifWghCVcm0HliPaI0Xvf4i3KLPY=";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index e7edb3ebee33..e0f30c0846bd 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -1,20 +1,20 @@
 {
   lib,
+  stdenv,
   buildGoModule,
   fetchFromGitHub,
   installShellFiles,
   testers,
-  kubernetes-helm,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "kubernetes-helm";
   version = "3.17.2";
 
   src = fetchFromGitHub {
     owner = "helm";
     repo = "helm";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-EMvKmnf4KfimjPYHoylij2kZVnvClK3Q/+offZvlO1I=";
   };
   vendorHash = "sha256-IX4zZnu8+cb2mJxQHOmZLUVxyqfWvbsRQR3q02Wpx6c=";
@@ -23,8 +23,8 @@ buildGoModule rec {
   ldflags = [
     "-w"
     "-s"
-    "-X helm.sh/helm/v3/internal/version.version=v${version}"
-    "-X helm.sh/helm/v3/internal/version.gitCommit=${src.rev}"
+    "-X helm.sh/helm/v3/internal/version.version=v${finalAttrs.version}"
+    "-X helm.sh/helm/v3/internal/version.gitCommit=${finalAttrs.src.rev}"
   ];
 
   preBuild = ''
@@ -57,7 +57,7 @@ buildGoModule rec {
   '';
 
   nativeBuildInputs = [ installShellFiles ];
-  postInstall = ''
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     $out/bin/helm completion bash > helm.bash
     $out/bin/helm completion zsh > helm.zsh
     $out/bin/helm completion fish > helm.fish
@@ -65,9 +65,9 @@ buildGoModule rec {
   '';
 
   passthru.tests.version = testers.testVersion {
-    package = kubernetes-helm;
+    package = finalAttrs.finalPackage;
     command = "helm version";
-    version = "v${version}";
+    version = "v${finalAttrs.version}";
   };
 
   meta = with lib; {
@@ -84,4 +84,4 @@ buildGoModule rec {
       techknowlogick
     ];
   };
-}
+})
diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix
index 80b8f6ce03f2..8dc8c1bb8c44 100644
--- a/pkgs/applications/networking/cluster/nixops/default.nix
+++ b/pkgs/applications/networking/cluster/nixops/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  config,
   python3,
   emptyFile,
 }:
@@ -28,23 +29,28 @@ let
     };
 
     plugins =
-      ps: _super: with ps; rec {
-        nixops-digitalocean = callPackage ./plugins/nixops-digitalocean.nix { };
-        nixops-encrypted-links = callPackage ./plugins/nixops-encrypted-links.nix { };
-        nixops-hercules-ci = callPackage ./plugins/nixops-hercules-ci.nix { };
-        nixops-vbox = callPackage ./plugins/nixops-vbox.nix { };
-        nixos-modules-contrib = callPackage ./plugins/nixos-modules-contrib.nix { };
+      ps: _super:
+      with ps;
+      (
+        rec {
+          nixops-digitalocean = callPackage ./plugins/nixops-digitalocean.nix { };
+          nixops-encrypted-links = callPackage ./plugins/nixops-encrypted-links.nix { };
+          nixops-hercules-ci = callPackage ./plugins/nixops-hercules-ci.nix { };
+          nixops-vbox = callPackage ./plugins/nixops-vbox.nix { };
+          nixos-modules-contrib = callPackage ./plugins/nixos-modules-contrib.nix { };
 
-        nixops-aws = throw "nixops-aws was broken and was removed from nixpkgs";
-        nixops-gce = throw "nixops-gce was broken and was removed from nixpkgs";
-        nixops-libvirtd = throw "nixops-libvirtd was broken and was removed from nixpkgs";
-        nixops-hetzner = throw "nixops-hetzner was broken and was removed from nixpkgs";
-        nixops-hetznercloud = throw "nixops-hetznercloud was broken and was removed from nixpkgs";
-
-        # aliases for backwards compatibility
-        nixops-virtd = nixops-libvirtd;
-        nixopsvbox = nixops-vbox;
-      };
+          # aliases for backwards compatibility
+          nixopsvbox = nixops-vbox;
+        }
+        // lib.optionalAttrs config.allowAliases rec {
+          nixops-aws = throw "nixops-aws was broken and was removed from nixpkgs";
+          nixops-gce = throw "nixops-gce was broken and was removed from nixpkgs";
+          nixops-libvirtd = throw "nixops-libvirtd was broken and was removed from nixpkgs";
+          nixops-hetzner = throw "nixops-hetzner was broken and was removed from nixpkgs";
+          nixops-hetznercloud = throw "nixops-hetznercloud was broken and was removed from nixpkgs";
+          nixops-virtd = nixops-libvirtd;
+        }
+      );
 
     # We should not reapply the overlay, but it tends to work out. (It's been this way since poetry2nix was dropped.)
     availablePlugins = this.plugins this.python.pkgs this.python.pkgs;
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 0b878b7d28c0..0ae39566c1a9 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -36,13 +36,13 @@
     "vendorHash": "sha256-bviZHOxZajmx++SG6k/mkjHCa4Q7jMY7CaLUele/jgw="
   },
   "akamai": {
-    "hash": "sha256-MZF4yTG4wiFeOi4NLItQmxZ9ZcgHCryFpxpGy2jQYE8=",
+    "hash": "sha256-ivIJvWKfL9oYvLZeoErvYKuCZLEwNaZD7jFrIGPlurI=",
     "homepage": "https://registry.terraform.io/providers/akamai/akamai",
     "owner": "akamai",
     "repo": "terraform-provider-akamai",
-    "rev": "v7.0.0",
+    "rev": "v7.1.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-NO7e8S+UhbbGWeBm4+bzm6HqqA3G3WZwj3wJmug0aSA="
+    "vendorHash": "sha256-Sp65odS8Axdv5UpA5j2SXvbC/rfet4GlIawxk054Cs4="
   },
   "alicloud": {
     "hash": "sha256-Jn4VzU6aPhMv6eMmXQ5gD5SA9IZfpmkRKpTrjRGrNF8=",
@@ -90,13 +90,13 @@
     "vendorHash": "sha256-YIn8akPW+DCVF0eYZxsmJxmrJuYhK4QLG/uhmmrXd4c="
   },
   "auth0": {
-    "hash": "sha256-5HiSoU3wxUtu2nsrq7h5cbqIenRMH2MpRfGJNqk8guI=",
+    "hash": "sha256-NBY9f1/VGU6VyPwy7LqgmsulLlzz17Ie8nU7JOirlFo=",
     "homepage": "https://registry.terraform.io/providers/auth0/auth0",
     "owner": "auth0",
     "repo": "terraform-provider-auth0",
-    "rev": "v1.14.0",
+    "rev": "v1.15.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-gD5HWmmy5P5yQH7UfzehDpxjB47aPfiUFDlQSY4BsVM="
+    "vendorHash": "sha256-Tfkk3+PWzlC7nZlhnD7rEYO+6OKps6pXgi+eqfmRSic="
   },
   "avi": {
     "hash": "sha256-e8yzc3nRP0ktcuuKyBXydS9NhoceYZKzJcqCWOfaPL0=",
@@ -126,11 +126,11 @@
     "vendorHash": "sha256-zjb8SQ6ALQryN7wE4MKn3nhhqEvoeq8CyZd8PlkZJt4="
   },
   "azuread": {
-    "hash": "sha256-xU6fsJIWl9WNzmZIK8qAB4ih4wcgiICdfYbgnCLNA1Y=",
+    "hash": "sha256-64afLKTgJ58O9GUv3GRTJKw7xgg0cglIv3EvARsxnn0=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/azuread",
     "owner": "hashicorp",
     "repo": "terraform-provider-azuread",
-    "rev": "v3.2.0",
+    "rev": "v3.3.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
@@ -660,13 +660,13 @@
     "vendorHash": null
   },
   "incus": {
-    "hash": "sha256-ARxXTh0mGA3VNqqDKgMLBRr8wNZ4D2p75/8dMxFowWU=",
+    "hash": "sha256-zIth+M/70f/uw+CE1r3z5m36VcenCW224x64BG2gkes=",
     "homepage": "https://registry.terraform.io/providers/lxc/incus",
     "owner": "lxc",
     "repo": "terraform-provider-incus",
-    "rev": "v0.3.0",
+    "rev": "v0.3.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-BuVUDDwUgGo7FrgWDzhq4qkEudECoyqApftALBnQveE="
+    "vendorHash": "sha256-HcKNrvDNthxPjg3qmUoRa0Ecj0dNJ5okf5wKT5SWGhU="
   },
   "infoblox": {
     "hash": "sha256-iz/Khne3wggjkZFWZOK9DVZsB8HW6nsNBCfEbsBdhzk=",
@@ -858,13 +858,13 @@
     "vendorHash": null
   },
   "newrelic": {
-    "hash": "sha256-KQqCckDXsxQrmRptttV9f7tSHBmKWE14aIppcR2dJrQ=",
+    "hash": "sha256-wh/6nkBtmZb+nwwGpk4F/YlSbmSFgCjMprnMmXslWHg=",
     "homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
     "owner": "newrelic",
     "repo": "terraform-provider-newrelic",
-    "rev": "v3.59.0",
+    "rev": "v3.60.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-ZZtfVgxp7YXNRXpeUisLzweQhHzgYOuQDAp1MsxAVhg="
+    "vendorHash": "sha256-9E1I7ZgBwFo7XouQjBkQQVxQKvkwE6dhVF1hZxec+WY="
   },
   "nexus": {
     "hash": "sha256-6RPga80ZoqEEFL7I2OVXcrwaxbdhSzZDEV07xL07rZs=",
@@ -1210,20 +1210,20 @@
     "vendorHash": "sha256-skswuFKhN4FFpIunbom9rM/FVRJVOFb1WwHeAIaEjn8="
   },
   "sops": {
-    "hash": "sha256-MdsWKV98kWpZpTK5qC7x6vN6cODxeeiVVc+gtlh1s88=",
+    "hash": "sha256-VuQTJFI4KcSnaog9VTV+zBg0XAORvWzuCFYMB0BM6n4=",
     "homepage": "https://registry.terraform.io/providers/carlpett/sops",
     "owner": "carlpett",
     "repo": "terraform-provider-sops",
-    "rev": "v1.1.1",
+    "rev": "v1.2.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-YFV+qXD78eajSeagJPgPu+qIktx1Vh/ZT0fUPOBuZyo="
+    "vendorHash": "sha256-K/44Jio2a1kKYuyI6o/5wwMNRaZvx9zrNEC85v56xdU="
   },
   "spacelift": {
-    "hash": "sha256-ZnUQBVsNuvr0jfuJL5h8uvrqyiahq7CoMeQ7tXU/gTc=",
+    "hash": "sha256-9TYSIIIqRSOFGbGv6mUgGyvcUb+PoMJ3IAHQFeRsSZ8=",
     "homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift",
     "owner": "spacelift-io",
     "repo": "terraform-provider-spacelift",
-    "rev": "v1.20.4",
+    "rev": "v1.21.0",
     "spdx": "MIT",
     "vendorHash": "sha256-oEamCseBGmETqeBLiBHfh81oQNUHWfTrsegkFijvb20="
   },
@@ -1300,13 +1300,13 @@
     "vendorHash": "sha256-iEi3zkr4kIZ1FTAft/Fy//v7xtlX/8uSrnbuxgFTDyA="
   },
   "temporalcloud": {
-    "hash": "sha256-qzBgk6FOKiaKXwpUEj61pYW/72a0EpR3GTces5IbjJw=",
+    "hash": "sha256-scM3cz4DVv66+VyLKWSjNbGFRcbUt9uZU4QooWQPioI=",
     "homepage": "https://registry.terraform.io/providers/temporalio/temporalcloud",
     "owner": "temporalio",
     "repo": "terraform-provider-temporalcloud",
-    "rev": "v0.6.1",
+    "rev": "v0.7.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-0B2XRpvUk0mgDu3inz37LLJijwH3aQyoSb8IaHr6was="
+    "vendorHash": "sha256-IKoDnClkmcCDFyt9QqWp10vZjfQpWByoUArY+hkXkVE="
   },
   "tencentcloud": {
     "hash": "sha256-DkktMcHU0T9H/jGOq66N7n1bfBF7aDEWGYmQrzWsqr8=",
diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix
index 4df72311568d..1b6d530016b2 100644
--- a/pkgs/applications/networking/netmaker/default.nix
+++ b/pkgs/applications/networking/netmaker/default.nix
@@ -13,16 +13,16 @@
 
 buildGoModule rec {
   pname = "netmaker";
-  version = "0.30.0";
+  version = "0.90.0";
 
   src = fetchFromGitHub {
     owner = "gravitl";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-Z2omesoEB6lJFy8ph6CFTb6XWsdgsvEG+i49dXmaC0Y=";
+    hash = "sha256-/7tj3SuTa2lSMgN4f2/OutzoPvAN7ARK1RKTLlMw13Y=";
   };
 
-  vendorHash = "sha256-PYkjJ17hS0E0ncsUdrGWRn+3dEwZxS1nD0UjSDQflQ8=";
+  vendorHash = "sha256-Yd9vwdIwAGinIr/RLGdb4N9hsDeMu9aB2Z1EVnlxxtA=";
 
   inherit subPackages;
 
diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix
index ee79119edb25..8bc4f5f856ee 100644
--- a/pkgs/applications/networking/sync/backintime/common.nix
+++ b/pkgs/applications/networking/sync/backintime/common.nix
@@ -32,13 +32,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "backintime-common";
-  version = "1.5.3";
+  version = "1.5.4";
 
   src = fetchFromGitHub {
     owner = "bit-team";
     repo = "backintime";
     rev = "v${version}";
-    sha256 = "sha256-byJyRsjZND0CQAfx45jQa3PNHhqzF2O0cFGSfN4o/QA=";
+    sha256 = "sha256-QTUezD3OdOMqrxOCrdPFI8fB5XDhNVo9XpLgi7Y2aRg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix
index 66ec4e7fdc6b..309ca8bf0f6a 100644
--- a/pkgs/applications/radio/qlog/default.nix
+++ b/pkgs/applications/radio/qlog/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qlog";
-  version = "0.42.2";
+  version = "0.43.0";
 
   src = fetchFromGitHub {
     owner = "foldynl";
     repo = "QLog";
     rev = "v${version}";
-    hash = "sha256-DWUfP0C48JMvUashqCaDfnsn1IxzhtOzmSG5Fh+sL/w=";
+    hash = "sha256-gCXLZ00klyjisLxSvs4wKD0Sg8CFvF0xR+eHpc1D0Jc=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/video/pipe-viewer/default.nix b/pkgs/applications/video/pipe-viewer/default.nix
index ad0ee012cebf..2c9c1d9b47fd 100644
--- a/pkgs/applications/video/pipe-viewer/default.nix
+++ b/pkgs/applications/video/pipe-viewer/default.nix
@@ -43,13 +43,13 @@ let
 in
 buildPerlModule rec {
   pname = "pipe-viewer";
-  version = "0.5.4";
+  version = "0.5.5";
 
   src = fetchFromGitHub {
     owner = "trizen";
     repo = "pipe-viewer";
     rev = version;
-    hash = "sha256-xChwX6lfwLH1Rv9rnd+ONKJFQTnoPv1aX9fIv7AUDBU=";
+    hash = "sha256-NVUZn02rBhOQyIfBp/BArbL2YY19TuDTwfiQH2pEWzk=";
   };
 
   nativeBuildInputs = [ makeWrapper ] ++ lib.optionals withGtk3 [ wrapGAppsHook3 ];
diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix
index 705aef607045..6365ef7d44c8 100644
--- a/pkgs/applications/virtualization/lima/default.nix
+++ b/pkgs/applications/virtualization/lima/default.nix
@@ -14,16 +14,16 @@
 
 buildGoModule rec {
   pname = "lima";
-  version = "1.0.6";
+  version = "1.0.7";
 
   src = fetchFromGitHub {
     owner = "lima-vm";
     repo = "lima";
     rev = "v${version}";
-    hash = "sha256-3K2RC4cPoIuDePTOYzY+ejmBFZwgYDvCtoe/ZLX66sc=";
+    hash = "sha256-pwSLQlYPJNzvXuW6KLmQoaafQyf3o6fjVAfKe9RJ3UE=";
   };
 
-  vendorHash = "sha256-tjogQUD+F/3ALlJwpdDKdXHRcYB+n0EuJ81TB1VKKDY=";
+  vendorHash = "sha256-JxrUX22yNb5/tZIBWDiBaMLOpEnOk+2lZdpzCjjqO4E=";
 
   nativeBuildInputs = [
     makeWrapper
diff --git a/pkgs/tools/admin/ansible/doctor.nix b/pkgs/by-name/an/ansible-doctor/package.nix
similarity index 100%
rename from pkgs/tools/admin/ansible/doctor.nix
rename to pkgs/by-name/an/ansible-doctor/package.nix
diff --git a/pkgs/tools/admin/ansible/later.nix b/pkgs/by-name/an/ansible-later/package.nix
similarity index 100%
rename from pkgs/tools/admin/ansible/later.nix
rename to pkgs/by-name/an/ansible-later/package.nix
diff --git a/pkgs/tools/admin/ansible/lint.nix b/pkgs/by-name/an/ansible-lint/package.nix
similarity index 100%
rename from pkgs/tools/admin/ansible/lint.nix
rename to pkgs/by-name/an/ansible-lint/package.nix
diff --git a/pkgs/by-name/ap/apt/package.nix b/pkgs/by-name/ap/apt/package.nix
index c6724ca7b683..c95aea8d14ee 100644
--- a/pkgs/by-name/ap/apt/package.nix
+++ b/pkgs/by-name/ap/apt/package.nix
@@ -34,14 +34,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "apt";
-  version = "2.9.33";
+  version = "2.9.35";
 
   src = fetchFromGitLab {
     domain = "salsa.debian.org";
     owner = "apt-team";
     repo = "apt";
     rev = finalAttrs.version;
-    hash = "sha256-CniUdpQWUyS0GMRLmdA4zX0iF3geT5dglBfJy1li9O0=";
+    hash = "sha256-B4rFOt4J94/XkFw09sdvfogdY1b5R6QYnNC3HVUV9pc=";
   };
 
   # cycle detection; lib can't be split
diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix
index 94165c99ec07..1e1070f1759d 100644
--- a/pkgs/by-name/az/azahar/package.nix
+++ b/pkgs/by-name/az/azahar/package.nix
@@ -43,6 +43,7 @@
   cubeb,
   useDiscordRichPresence ? true,
   rapidjson,
+  azahar,
 }:
 let
   inherit (lib)
@@ -150,6 +151,7 @@ stdenv.mkDerivation (finalAttrs: {
     (cmakeBool "ENABLE_QT" enableQt)
     (cmakeBool "ENABLE_QT_TRANSLATION" enableQtTranslations)
     (cmakeBool "ENABLE_SDL2" enableSDL2)
+    (cmakeBool "ENABLE_SDL2_FRONTEND" enableSDL2)
     (cmakeBool "ENABLE_CUBEB" enableCubeb)
     (cmakeBool "USE_DISCORD_PRESENCE" useDiscordRichPresence)
   ];
diff --git a/pkgs/by-name/ca/cargo-deny/package.nix b/pkgs/by-name/ca/cargo-deny/package.nix
index 44ac63b9ae51..61bfb416f9af 100644
--- a/pkgs/by-name/ca/cargo-deny/package.nix
+++ b/pkgs/by-name/ca/cargo-deny/package.nix
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec {
   doCheck = false;
 
   meta = with lib; {
-    description = "Cargo plugin to generate list of all licenses for a crate";
+    description = "Cargo plugin for linting your dependencies";
     mainProgram = "cargo-deny";
     homepage = "https://github.com/EmbarkStudios/cargo-deny";
     changelog = "https://github.com/EmbarkStudios/cargo-deny/blob/${version}/CHANGELOG.md";
diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix
index a5a4baf1c97d..b71bd6670dd4 100644
--- a/pkgs/by-name/co/cockpit/package.nix
+++ b/pkgs/by-name/co/cockpit/package.nix
@@ -37,13 +37,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cockpit";
-  version = "331";
+  version = "336.2";
 
   src = fetchFromGitHub {
     owner = "cockpit-project";
     repo = "cockpit";
     tag = finalAttrs.version;
-    hash = "sha256-G0L1ZcvjUCSNkDvYoyConymZ4bsEye03t5K15EyI008=";
+    hash = "sha256-QRtKxrOIGZuAj+NrnXDpnejJQ/lm0hP/JqZyVZn/VL0=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/co/converseen/package.nix b/pkgs/by-name/co/converseen/package.nix
index 7fc8c3a66588..2bf443fb52b8 100644
--- a/pkgs/by-name/co/converseen/package.nix
+++ b/pkgs/by-name/co/converseen/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "converseen";
-  version = "0.12.2.5";
+  version = "0.13.0.1";
 
   src = fetchFromGitHub {
     owner = "Faster3ck";
     repo = "Converseen";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Q1MmKPzk7erMM5Z5zYP3hGyazupfPjArkmFOFEhxWg4=";
+    hash = "sha256-EFeOBk/KK7CaX+Da5PxIWsImw8Sgjlvcl29QKO71V+Y=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix
index 90fb1c30c203..2f3ae72a11c6 100644
--- a/pkgs/by-name/co/cosmic-comp/package.nix
+++ b/pkgs/by-name/co/cosmic-comp/package.nix
@@ -12,10 +12,8 @@
   seatd,
   udev,
   systemd,
-  xwayland,
   nix-update-script,
 
-  useXWayland ? true,
   useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
 }:
 
@@ -59,10 +57,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   dontCargoInstall = true;
 
-  preFixup = lib.optionalString useXWayland ''
-    libcosmicAppWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ xwayland ]})
-  '';
-
   passthru.updateScript = nix-update-script {
     extraArgs = [
       "--version"
diff --git a/pkgs/by-name/cp/cppad/package.nix b/pkgs/by-name/cp/cppad/package.nix
index 5d6a9830c9b3..ed8b57071380 100644
--- a/pkgs/by-name/cp/cppad/package.nix
+++ b/pkgs/by-name/cp/cppad/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "coin-or";
     repo = "CppAD";
-    tag = "${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-rAKD/PAjepDchvrJp7iLYw5doNq8Af1oVh61gfMcNYI=";
   };
 
diff --git a/pkgs/by-name/cr/cryptomator/package.nix b/pkgs/by-name/cr/cryptomator/package.nix
index bee6f77e3291..800c57d798c6 100644
--- a/pkgs/by-name/cr/cryptomator/package.nix
+++ b/pkgs/by-name/cr/cryptomator/package.nix
@@ -17,18 +17,18 @@ let
 in
 maven.buildMavenPackage rec {
   pname = "cryptomator";
-  version = "1.15.1";
+  version = "1.15.2";
 
   src = fetchFromGitHub {
     owner = "cryptomator";
     repo = "cryptomator";
     tag = version;
-    hash = "sha256-yNCVSaA2GtTFUYoN7IZxEYMxkkQwMiNnfnmSXaruFjM=";
+    hash = "sha256-uhsX4VIA8NNUjxa0dHyB5bhWMxjd2LJfcKJInxROQRY=";
   };
 
   mvnJdk = jdk;
   mvnParameters = "-Dmaven.test.skip=true -Plinux";
-  mvnHash = "sha256-w0mIeSFRSGl3EorrGcxqnXF6C0SowjWUMYT/NN1erwM=";
+  mvnHash = "sha256-KfQdYsPdmQRQqjx/kpDQR9tYjb54goA31w55x6VX6KM=";
 
   preBuild = ''
     VERSION=${version}
diff --git a/pkgs/by-name/dn/dnscrypt-proxy/package.nix b/pkgs/by-name/dn/dnscrypt-proxy/package.nix
index 92d43baaa160..0084aa0c5120 100644
--- a/pkgs/by-name/dn/dnscrypt-proxy/package.nix
+++ b/pkgs/by-name/dn/dnscrypt-proxy/package.nix
@@ -7,7 +7,7 @@
 
 buildGoModule rec {
   pname = "dnscrypt-proxy";
-  version = "2.1.7";
+  version = "2.1.8";
 
   vendorHash = null;
 
@@ -17,7 +17,7 @@ buildGoModule rec {
     owner = "DNSCrypt";
     repo = "dnscrypt-proxy";
     rev = version;
-    sha256 = "sha256-s0ooICual87+y/DMppuTQtNzZRRCg/42SQImDrPVRng=";
+    sha256 = "sha256-/D5RE8AbI9i9TVdFQCYW8OLPU4TgIIDRsZfWEyXo92g=";
   };
 
   passthru.tests = { inherit (nixosTests) dnscrypt-proxy2; };
diff --git a/pkgs/by-name/do/dolibarr/package.nix b/pkgs/by-name/do/dolibarr/package.nix
index ba87da6065cb..8c0ac47b5ff1 100644
--- a/pkgs/by-name/do/dolibarr/package.nix
+++ b/pkgs/by-name/do/dolibarr/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dolibarr";
-  version = "21.0.0";
+  version = "21.0.1";
 
   src = fetchFromGitHub {
     owner = "Dolibarr";
     repo = "dolibarr";
     tag = finalAttrs.version;
-    hash = "sha256-OTYX9CZ1gQlAOsrWIMJwhH8QPDM2J3MM183/Tj18jHg=";
+    hash = "sha256-aOFqfXsT1kmQwIB8clLMQaMeZtsyIYCxCGqaGCjlBRY=";
   };
 
   dontBuild = true;
diff --git a/pkgs/by-name/do/dozenal/lua-header.patch b/pkgs/by-name/do/dozenal/lua-header.patch
deleted file mode 100644
index 45b76e159a11..000000000000
--- a/pkgs/by-name/do/dozenal/lua-header.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ruN dozenal-12010904/dozenal/dozcal/call_lua.c dozenal-patched/dozenal/dozcal/call_lua.c
---- dozenal-12010904/dozenal/dozcal/call_lua.c	2017-09-04 19:25:01.000000000 +0200
-+++ dozenal-patched/dozenal/dozcal/call_lua.c	2018-06-13 10:19:57.821950327 +0200
-@@ -38,9 +38,9 @@
- #include"utility.h"
- #include"conv.h"
- #include"proc_date.h"
--#include<lua5.2/lua.h>
--#include<lua5.2/lauxlib.h>
--#include<lua5.2/lualib.h>
-+#include<lua.h>
-+#include<lauxlib.h>
-+#include<lualib.h>
- 
- void bail(lua_State *L, int err_code, char *filename);
- int file_prefix(char **s, char *t);
diff --git a/pkgs/by-name/do/dozenal/package.nix b/pkgs/by-name/do/dozenal/package.nix
deleted file mode 100644
index 4cef1375f4e8..000000000000
--- a/pkgs/by-name/do/dozenal/package.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  ncurses,
-  hdate,
-  lua5_2,
-}:
-
-stdenv.mkDerivation rec {
-  version = "12010904";
-  pname = "dozenal";
-  src = fetchFromGitHub {
-    owner = "dgoodmaniii";
-    repo = "dozenal";
-    rev = "v${version}";
-    sha256 = "1ic63gpdda762x6ks3al71dwgmsy2isicqyr2935bd245jx8s209";
-  };
-  makeFlags = [
-    # author do not use configure and prefix directly using $prefix
-    "prefix=$(out)"
-    # graphical version of dozdc requires xforms, which is not i nixpkgs so I turned it down
-    "XFORMS_FLAGS=-UXFORMS"
-    "LUALIB=-llua"
-    "bindir=$(prefix)/bin/"
-  ];
-  # some include hardcodes the lua libraries path. This is a patch for that
-  patches = [ ./lua-header.patch ];
-  preBuild = "cd dozenal";
-  buildInputs = [
-    ncurses
-    hdate
-    lua5_2
-  ];
-
-  # Parallel builds fail due to no dependencies between subdirs.
-  # As a result some subdirs are atempted to build twice:
-  #   ../dec/dec.c:39:10: fatal error: conv.h: No such file or directory
-  # Let's disable parallelism until it's fixed upstream:
-  #  https://gitlab.com/dgoodmaniii/dozenal/-/issues/8
-  enableParallelBuilding = false;
-
-  # I remove gdozdc, as I didn't figure all it's dependency yet.
-  postInstall = "rm $out/bin/gdozdc";
-
-  meta = {
-    description = "Complete suite of dozenal (base twelve) programs";
-    longDescription = ''
-      Programs
-
-      doz --- a converter; converts decimal numbers into dozenal. Accepts
-         input in standard or exponential notation (i.e., "1492.2" or "1.4922e3").
-      dec --- a converter; converts dozenal numbers into decimal. Accepts input
-         in standard or exponential notation (i.e., "X44;4" or "X;444e2").
-      dozword --- converts a dozenal number (integers only) into words,
-         according to the Pendlebury system.
-      dozdc --- a full-featured scientific calculator which works in the
-         dozenal base. RPN command line.
-      tgmconv --- a converter for all standard measurements; converts to and
-         from TGM, Imperial, customary, and SI metric.
-      dozpret --- a pretty-printer for dozenal numbers; inserts spacing (or
-         other characters) as desired, and can also transform transdecimal digits
-         from 'X' to 'E' into any character or sequence of characters desired.
-      dozdate --- a more-or-less drop-in replacement for GNU and BSD date, it
-         outputs the date and time in dozenal, as well as containing some TGM
-         extensions.
-      dozstring --- a simple byte converter; absorbs a string either from
-         standard input or a command line argument, leaving it identical but
-         for the numbers, which it converts into dozenal. Options for padding
-         and for not converting specific numbers.
-      doman --- a converter which takes a dozenal integer and
-         emits its equivalent in a non-place-value system, such as
-         Roman numerals.  Arbitrary ranks and symbols may be used.
-         Defaults to dozenal Roman numerals.
-    '';
-    homepage = "https://github.com/dgoodmaniii/dozenal/";
-    maintainers = with lib.maintainers; [ CharlesHD ];
-    license = lib.licenses.gpl3;
-  };
-}
diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix
index d3eb7709a10b..f0f14cadd358 100644
--- a/pkgs/by-name/ek/eksctl/package.nix
+++ b/pkgs/by-name/ek/eksctl/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "eksctl";
-  version = "0.206.0";
+  version = "0.207.0";
 
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = pname;
     rev = version;
-    hash = "sha256-wJl3PhrTbjgrI5aRNmqHkPr43SYw0m5nLWPtVqazlfg=";
+    hash = "sha256-USWeMzJ1k+sJx2p3FzFhbO48m61WUuCvp7Juwa9jtus=";
   };
 
-  vendorHash = "sha256-Ipj4Ss9x7HnAAweoQlWsmOUhU+toGyR4aGTRhIHHw/0=";
+  vendorHash = "sha256-TEw5ts51M/nvcljqrCHIkTGk64dhhEamhkP/qS/y1uo=";
 
   doCheck = false;
 
diff --git a/pkgs/by-name/es/espup/package.nix b/pkgs/by-name/es/espup/package.nix
index bbd6e88cb6f9..cc0916d2f808 100644
--- a/pkgs/by-name/es/espup/package.nix
+++ b/pkgs/by-name/es/espup/package.nix
@@ -12,6 +12,7 @@
   darwin,
   testers,
   espup,
+  gitUpdater,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -67,6 +68,7 @@ rustPlatform.buildRustPackage rec {
       --zsh <($out/bin/espup completions zsh)
   '';
 
+  passthru.updateScript = gitUpdater { };
   passthru.tests.version = testers.testVersion {
     package = espup;
   };
diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix
index e94704b0e3ea..1a4c30b169ac 100644
--- a/pkgs/by-name/ez/eza/package.nix
+++ b/pkgs/by-name/ez/eza/package.nix
@@ -13,14 +13,14 @@
   exaAlias ? true,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "eza";
   version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "eza-community";
     repo = "eza";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-edBFMqY+61kFumLTcVFgnmhE4d+bMVz+udR5h02kDk0=";
   };
 
@@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec {
   postInstall =
     ''
       for page in eza.1 eza_colors.5 eza_colors-explanation.5; do
-        sed "s/\$version/v${version}/g" "man/$page.md" |
+        sed "s/\$version/v${finalAttrs.version}/g" "man/$page.md" |
           pandoc --standalone -f markdown -t man >"man/$page"
       done
       installManPage man/eza.1 man/eza_colors.5 man/eza_colors-explanation.5
@@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec {
       ln -s eza $out/bin/exa
     '';
 
-  meta = with lib; {
+  meta = {
     description = "Modern, maintained replacement for ls";
     longDescription = ''
       eza is a modern replacement for ls. It uses colours for information by
@@ -70,14 +70,14 @@ rustPlatform.buildRustPackage rec {
       written in Rust, so it’s small, fast, and portable.
     '';
     homepage = "https://github.com/eza-community/eza";
-    changelog = "https://github.com/eza-community/eza/releases/tag/v${version}";
-    license = licenses.eupl12;
+    changelog = "https://github.com/eza-community/eza/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.eupl12;
     mainProgram = "eza";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       cafkafk
       _9glenda
       sigmasquadron
     ];
-    platforms = platforms.unix ++ platforms.windows;
+    platforms = with lib.platforms; unix ++ windows;
   };
-}
+})
diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix
index 90c2148746e9..7b9ff2ffdd2a 100644
--- a/pkgs/by-name/fe/fex/package.nix
+++ b/pkgs/by-name/fe/fex/package.nix
@@ -8,6 +8,9 @@
   qt5,
   python3,
   nix-update-script,
+  xxHash,
+  fmt,
+  nasm,
 }:
 
 llvmPackages.stdenv.mkDerivation (finalAttrs: {
@@ -18,8 +21,32 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     owner = "FEX-Emu";
     repo = "FEX";
     tag = "FEX-${finalAttrs.version}";
-    hash = "sha256-tqUJBHYSRlEUaLI4WItzotIHGMUNbdjA7o9NjBYZmHw=";
-    fetchSubmodules = true;
+
+    hash = "sha256-oXducy4uvf/3Ox6AadPWNl9450D9TiPIr53P91/qEvw=";
+
+    leaveDotGit = true;
+    postFetch = ''
+      cd $out
+      git reset
+
+      # Only fetch required submodules
+      git submodule update --init --depth 1 \
+        External/Vulkan-Headers \
+        External/drm-headers \
+        External/jemalloc \
+        External/jemalloc_glibc \
+        External/robin-map \
+        External/vixl \
+        Source/Common/cpp-optparse \
+        External/Catch2
+
+      find . -name .git -print0 | xargs -0 rm -rf
+
+      # Remove some more unnecessary directories
+      rm -r \
+        External/vixl/src/aarch32 \
+        External/vixl/test
+    '';
   };
 
   nativeBuildInputs = [
@@ -37,12 +64,19 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     ))
   ];
 
-  buildInputs = with qt5; [
-    qtbase
-    qtdeclarative
-    qtquickcontrols
-    qtquickcontrols2
-  ];
+  nativeCheckInputs = [ nasm ];
+
+  buildInputs =
+    [
+      xxHash
+      fmt
+    ]
+    ++ (with qt5; [
+      qtbase
+      qtdeclarative
+      qtquickcontrols
+      qtquickcontrols2
+    ]);
 
   cmakeFlags = [
     (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
@@ -54,7 +88,18 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
   ];
 
   strictDeps = true;
-  doCheck = false; # broken on Apple silicon computers
+
+  # Unsupported on non-4K page size kernels (e.g. Apple Silicon)
+  doCheck = true;
+
+  # List not exhaustive, e.g. because they depend on an x86 compiler or some
+  # other difficult-to-build test binaries.
+  checkTarget = lib.concatStringsSep " " [
+    "asm_tests"
+    "api_tests"
+    "fexcore_apitests"
+    "emitter_tests"
+  ];
 
   # Avoid wrapping anything other than FEXConfig, since the wrapped executables
   # don't seem to work when registered as binfmts.
diff --git a/pkgs/by-name/fi/figlet/package.nix b/pkgs/by-name/fi/figlet/package.nix
index 5b13d3631fc1..edc900d718b1 100644
--- a/pkgs/by-name/fi/figlet/package.nix
+++ b/pkgs/by-name/fi/figlet/package.nix
@@ -5,15 +5,14 @@
   fetchpatch,
   fetchzip,
 }:
-
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "figlet";
   version = "2.2.5";
 
   # some tools can be found here ftp://ftp.figlet.org/pub/figlet/util/
   src = fetchurl {
-    url = "ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-${version}.tar.gz";
-    sha256 = "0za1ax15x7myjl8jz271ybly8ln9kb9zhm1gf6rdlxzhs07w925z";
+    url = "ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-${finalAttrs.version}.tar.gz";
+    sha256 = "sha256-v4jED9Dwd9qycS9U+NOayVLk6fLhiC8Rlb6eXkJXQX0=";
   };
 
   contributed = fetchzip {
@@ -25,12 +24,12 @@ stdenv.mkDerivation rec {
     (fetchpatch {
       url = "https://git.alpinelinux.org/aports/plain/main/figlet/musl-fix-cplusplus-decls.patch?h=3.4-stable&id=71776c73a6f04b6f671430f702bcd40b29d48399";
       name = "musl-fix-cplusplus-decls.patch";
-      sha256 = "1720zgrfk9makznqkbjrnlxm7nnhk6zx7g458fv53337n3g3zn7j";
+      sha256 = "sha256-8tg/3rBnjFG2Q4W807+Z0NpTO7VZrontn6qm6fL7QJw=";
     })
     (fetchpatch {
       url = "https://github.com/cmatsuoka/figlet/commit/9a50c1795bc32e5a698b855131ee87c8d7762c9e.patch";
       name = "unistd-on-darwin.patch";
-      sha256 = "hyfY87N+yuAwjsBIjpgvcdJ1IbzlR4A2yUJQSzShCRI=";
+      sha256 = "sha256-hyfY87N+yuAwjsBIjpgvcdJ1IbzlR4A2yUJQSzShCRI=";
     })
   ];
 
@@ -40,7 +39,7 @@ stdenv.mkDerivation rec {
     "LD:=$(CC)"
   ];
 
-  postInstall = "cp -ar ${contributed}/* $out/share/figlet/";
+  postInstall = "cp -ar ${finalAttrs.contributed}/* $out/share/figlet/";
 
   doCheck = true;
 
@@ -50,5 +49,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.afl21;
     maintainers = with lib.maintainers; [ ehmry ];
     platforms = lib.platforms.unix;
+    mainProgram = "figlet";
   };
-}
+})
diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix
index 277a0b6a6de1..076779c9dfb0 100644
--- a/pkgs/by-name/fi/firebase-tools/package.nix
+++ b/pkgs/by-name/fi/firebase-tools/package.nix
@@ -9,16 +9,16 @@
 }:
 buildNpmPackage rec {
   pname = "firebase-tools";
-  version = "13.35.1";
+  version = "14.1.0";
 
   src = fetchFromGitHub {
     owner = "firebase";
     repo = "firebase-tools";
     tag = "v${version}";
-    hash = "sha256-66VG82o+gg+Vt4QR/RkaM6aOv8i3lQ7bUmeqGqj1JGs=";
+    hash = "sha256-7yxDBK3A2Yosp/83JmFpV3cm+YEDxHMLVj5B+rwSIR8=";
   };
 
-  npmDepsHash = "sha256-/UuQ1bwEFDPahxUgqrxY/xIcHQ+KKxnc2QUMOW+GwHE=";
+  npmDepsHash = "sha256-r6vonG5edL/nTtyj8uXc/4w2xgihRce/Md+umxomTzo=";
 
   postPatch = ''
     ln -s npm-shrinkwrap.json package-lock.json
diff --git a/pkgs/by-name/fz/fzf/package.nix b/pkgs/by-name/fz/fzf/package.nix
index 59102aef3dc3..5ca024df633f 100644
--- a/pkgs/by-name/fz/fzf/package.nix
+++ b/pkgs/by-name/fz/fzf/package.nix
@@ -12,13 +12,13 @@
 
 buildGoModule rec {
   pname = "fzf";
-  version = "0.61.0";
+  version = "0.61.1";
 
   src = fetchFromGitHub {
     owner = "junegunn";
     repo = "fzf";
     rev = "v${version}";
-    hash = "sha256-pqHfHWv8PoaMxEP90AbVM2u88D6VE3px+lxJfoZfMgk=";
+    hash = "sha256-PKfVG2eYsg3J1OixDzXsmxCtsuFhdEGyxuYtwPEdVi8=";
   };
 
   vendorHash = "sha256-WcrJfvY3GZLDuRr2PZR1ooNPJ6FQ4S3RvUc2+zePw5w=";
diff --git a/pkgs/by-name/gc/gclient2nix/gclient-unpack-hook.sh b/pkgs/by-name/gc/gclient2nix/gclient-unpack-hook.sh
new file mode 100644
index 000000000000..6dac91b9e25a
--- /dev/null
+++ b/pkgs/by-name/gc/gclient2nix/gclient-unpack-hook.sh
@@ -0,0 +1,28 @@
+# shellcheck shell=bash
+
+gclientUnpackHook() {
+    echo "Executing gclientUnpackHook"
+
+    runHook preUnpack
+
+    if [ -z "${gclientDeps-}" ]; then
+        echo "gclientDeps missing"
+        exit 1
+    fi
+
+    for dep in $(@jq@ -c "to_entries[]" "$gclientDeps")
+    do
+        local name="$(echo "$dep" | @jq@ -r .key)"
+        echo "copying $name..."
+        local path="$(echo "$dep" | @jq@ -r .value.path)"
+        mkdir -p $(dirname "$name")
+        cp -r "$path/." "$name"
+        chmod u+w -R "$name"
+    done
+
+    runHook postUnpack
+}
+
+if [ -z "${dontGclientUnpack-}" ] && [ -z "${unpackPhase-}" ]; then
+  unpackPhase=(gclientUnpackHook)
+fi
diff --git a/pkgs/by-name/gc/gclient2nix/gclient2nix.py b/pkgs/by-name/gc/gclient2nix/gclient2nix.py
new file mode 100755
index 000000000000..8535593f0d18
--- /dev/null
+++ b/pkgs/by-name/gc/gclient2nix/gclient2nix.py
@@ -0,0 +1,232 @@
+#!/usr/bin/env python3
+import base64
+import json
+import os
+import subprocess
+import re
+import random
+import sys
+import tempfile
+import logging
+import click
+import click_log
+from typing import Optional
+from urllib.request import urlopen
+from joblib import Parallel, delayed, Memory
+from platformdirs import user_cache_dir
+
+sys.path.append("@depot_tools_checkout@")
+import gclient_eval
+import gclient_utils
+
+
+logger = logging.getLogger(__name__)
+click_log.basic_config(logger)
+
+nixpkgs_path = "@nixpkgs_path@"
+
+memory: Memory = Memory(user_cache_dir("gclient2nix"), verbose=0)
+
+def cache(mem, **mem_kwargs):
+    def cache_(f):
+        f.__module__ = "gclient2nix"
+        f.__qualname__ = f.__name__
+        return mem.cache(f, **mem_kwargs)
+    return cache_
+
+@cache(memory)
+def get_repo_hash(fetcher: str, args: dict) -> str:
+    expr = f"(import {nixpkgs_path} {{}}).gclient2nix.fetchers.{fetcher}{{"
+    for key, val in args.items():
+        expr += f'{key}="{val}";'
+    expr += "}"
+    cmd = ["nurl", "-H", "--expr", expr]
+    print(" ".join(cmd), file=sys.stderr)
+    out = subprocess.check_output(cmd)
+    return out.decode("utf-8").strip()
+
+
+class Repo:
+    fetcher: str
+    args: dict
+
+    def __init__(self) -> None:
+        self.deps: dict = {}
+
+    def get_deps(self, repo_vars: dict, path: str) -> None:
+        print(
+            "evaluating " + json.dumps(self, default=vars, sort_keys=True),
+            file=sys.stderr,
+        )
+
+        deps_file = self.get_file("DEPS")
+        evaluated = gclient_eval.Parse(deps_file, vars_override=repo_vars, filename="DEPS")
+
+        repo_vars = dict(evaluated.get("vars", {})) | repo_vars
+
+        prefix = f"{path}/" if evaluated.get("use_relative_paths", False) else ""
+
+        self.deps = {
+            prefix + dep_name: repo_from_dep(dep)
+            for dep_name, dep in evaluated.get("deps", {}).items()
+            if (
+                gclient_eval.EvaluateCondition(dep["condition"], repo_vars)
+                if "condition" in dep
+                else True
+            )
+            and repo_from_dep(dep) != None
+        }
+
+        for key in evaluated.get("recursedeps", []):
+            dep_path = prefix + key
+            if dep_path in self.deps:
+                self.deps[dep_path].get_deps(repo_vars, dep_path)
+
+    def eval(self) -> None:
+        self.get_deps(
+            {
+                **{
+                f"checkout_{platform}": platform == "linux"
+                for platform in ["ios", "chromeos", "android", "mac", "win", "linux"]
+                },
+                **{
+                f"checkout_{arch}": True
+                for arch in ["x64", "arm64", "arm", "x86", "mips", "mips64", "ppc"]
+                },
+            },
+            "",
+        )
+
+    def prefetch(self) -> None:
+        self.hash = get_repo_hash(self.fetcher, self.args)
+
+    def prefetch_all(self) -> int:
+        return sum(
+            [dep.prefetch_all() for [_, dep] in self.deps.items()],
+            [delayed(self.prefetch)()],
+        )
+
+    def flatten_repr(self) -> dict:
+        return {"fetcher": self.fetcher, "attrs": {**({"hash": self.hash} if hasattr(self, "hash") else {}), **self.args}}
+
+    def flatten(self, path: str) -> dict:
+        out = {path: self.flatten_repr()}
+        for dep_path, dep in self.deps.items():
+            out |= dep.flatten(dep_path)
+        return out
+
+    def get_file(self, filepath: str) -> str:
+        raise NotImplementedError
+
+
+class GitRepo(Repo):
+    def __init__(self, url: str, rev: str) -> None:
+        super().__init__()
+        self.fetcher = "fetchgit"
+        self.args = {
+            "url": url,
+            "rev": rev,
+        }
+
+
+class GitHubRepo(Repo):
+    def __init__(self, owner: str, repo: str, rev: str) -> None:
+        super().__init__()
+        self.fetcher = "fetchFromGitHub"
+        self.args = {
+            "owner": owner,
+            "repo": repo,
+            "rev": rev,
+        }
+
+    def get_file(self, filepath: str) -> str:
+        return (
+            urlopen(
+                f"https://raw.githubusercontent.com/{self.args['owner']}/{self.args['repo']}/{self.args['rev']}/{filepath}"
+            )
+            .read()
+            .decode("utf-8")
+        )
+
+
+class GitilesRepo(Repo):
+    def __init__(self, url: str, rev: str) -> None:
+        super().__init__()
+        self.fetcher = "fetchFromGitiles"
+        self.args = {
+            "url": url,
+            "rev": rev,
+        }
+
+        # Quirk: Chromium source code exceeds the Hydra output limit
+        # We prefer deleting test data over recompressing the sources into a
+        # tarball, because the NAR will be compressed after the size check
+        # anyways, so recompressing is more like bypassing the size limit
+        # (making it count the compressed instead of uncompressed size)
+        # rather than complying with it.
+        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/content/test/data; "
+            self.args["postFetch"] += "rm -rf $out/courgette/testdata; "
+            self.args["postFetch"] += "rm -r $out/extensions/test/data; "
+            self.args["postFetch"] += "rm -r $out/media/test/data; "
+
+    def get_file(self, filepath: str) -> str:
+        return base64.b64decode(
+            urlopen(
+                f"{self.args['url']}/+/{self.args['rev']}/{filepath}?format=TEXT"
+            ).read()
+        ).decode("utf-8")
+
+
+
+def repo_from_dep(dep: dict) -> Optional[Repo]:
+    if "url" in dep:
+        url, rev = gclient_utils.SplitUrlRevision(dep["url"])
+
+        search_object = re.search(r"https://github.com/(.+)/(.+?)(\.git)?$", url)
+        if search_object:
+            return GitHubRepo(search_object.group(1), search_object.group(2), rev)
+
+        if re.match(r"https://.+\.googlesource.com", url):
+            return GitilesRepo(url, rev)
+
+        return GitRepo(url, rev)
+    else:
+        # Not a git dependency; skip
+        return None
+
+
+@click.group()
+def cli() -> None:
+    """gclient2nix"""
+    pass
+
+
+@cli.command("eval", help="Evaluate and print the dependency tree of a gclient project")
+@click.argument("url", required=True, type=str)
+@click.option("--root", default="src", help="Root path, where the given url is placed", type=str)
+def eval(url: str, root: str) -> None:
+    repo = repo_from_dep({"url": url})
+    repo.eval()
+    print(json.dumps(repo.flatten(root), sort_keys=True, indent=4))
+
+
+@cli.command("generate", help="Generate a dependencies description for a gclient project")
+@click.argument("url", required=True, type=str)
+@click.option("--root", default="src", help="Root path, where the given url is placed", type=str)
+def generate(url: str, root: str) -> None:
+    repo = repo_from_dep({"url": url})
+    repo.eval()
+    tasks = repo.prefetch_all()
+    random.shuffle(tasks)
+    task_results = {
+        n[0]: n[1]
+        for n in Parallel(n_jobs=20, require="sharedmem", return_as="generator")(tasks)
+        if n != None
+    }
+    print(json.dumps(repo.flatten(root), sort_keys=True, indent=4))
+
+
+if __name__ == "__main__":
+    cli()
diff --git a/pkgs/by-name/gc/gclient2nix/package.nix b/pkgs/by-name/gc/gclient2nix/package.nix
new file mode 100644
index 000000000000..ee7251b9ffa7
--- /dev/null
+++ b/pkgs/by-name/gc/gclient2nix/package.nix
@@ -0,0 +1,86 @@
+{
+  lib,
+  python3,
+  runCommand,
+  makeWrapper,
+  path,
+  fetchgit,
+  nurl,
+  writers,
+  callPackage,
+  fetchFromGitiles,
+  fetchFromGitHub,
+}:
+
+let
+  fetchers = {
+    inherit fetchgit fetchFromGitiles fetchFromGitHub;
+  };
+
+  importGclientDeps =
+    depsAttrsOrFile:
+    let
+      depsAttrs = if lib.isAttrs depsAttrsOrFile then depsAttrsOrFile else lib.importJSON depsAttrsOrFile;
+      fetchdep = dep: fetchers.${dep.fetcher} dep.args;
+      fetchedDeps = lib.mapAttrs (_name: fetchdep) depsAttrs;
+      manifestContents = lib.mapAttrs (_: dep: {
+        path = dep;
+      }) fetchedDeps;
+      manifest = writers.writeJSON "gclient-manifest.json" manifestContents;
+    in
+    manifestContents
+    // {
+      inherit manifest;
+      __toString = _: manifest;
+    };
+
+  gclientUnpackHook = callPackage (
+    {
+      lib,
+      makeSetupHook,
+      jq,
+    }:
+
+    makeSetupHook {
+      name = "gclient-unpack-hook";
+      substitutions = {
+        jq = lib.getExe jq;
+      };
+    } ./gclient-unpack-hook.sh
+  ) { };
+
+  python = python3.withPackages (
+    ps: with ps; [
+      joblib
+      platformdirs
+      click
+      click-log
+    ]
+  );
+
+in
+
+runCommand "gclient2nix"
+  {
+    nativeBuildInputs = [ makeWrapper ];
+    buildInputs = [ python ];
+
+    # substitutions
+    nixpkgs_path = if builtins.pathExists (path + "/.git") then lib.cleanSource path else path;
+    depot_tools_checkout = fetchgit {
+      url = "https://chromium.googlesource.com/chromium/tools/depot_tools";
+      rev = "452fe3be37f78fbecefa1b4b0d359531bcd70d0d";
+      hash = "sha256-8IiJOm0FLa/u1Vd96tb33Ruj4IUTCeYgBpTk88znhPw=";
+    };
+
+    passthru = {
+      inherit fetchers importGclientDeps gclientUnpackHook;
+    };
+  }
+  ''
+    mkdir -p $out/bin
+    substituteAll ${./gclient2nix.py} $out/bin/gclient2nix
+    chmod u+x $out/bin/gclient2nix
+    patchShebangs $out/bin/gclient2nix
+    wrapProgram $out/bin/gclient2nix --set PATH "${lib.makeBinPath [ nurl ]}"
+  ''
diff --git a/pkgs/by-name/ge/gemmi/package.nix b/pkgs/by-name/ge/gemmi/package.nix
index d20b8ea9dc1b..3ab6d09b978c 100644
--- a/pkgs/by-name/ge/gemmi/package.nix
+++ b/pkgs/by-name/ge/gemmi/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gemmi";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "project-gemmi";
     repo = "gemmi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XOu//yY5CnnzjvGu7IIC5GvecYsnZQV3Y2wvGVTwWzU=";
+    hash = "sha256-1msV/gW6BH90rHm6t7xm0hYqbG/yGBt65GVTbKuwdtg=";
   };
 
   nativeBuildInputs =
diff --git a/pkgs/by-name/gi/gitoxide/package.nix b/pkgs/by-name/gi/gitoxide/package.nix
index 2f2d6c546f88..3a3c636ba646 100644
--- a/pkgs/by-name/gi/gitoxide/package.nix
+++ b/pkgs/by-name/gi/gitoxide/package.nix
@@ -31,6 +31,8 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-q35MQGN/tvsK7gg0a/ljoVY6wedy7rwKlSakONgBIgk=";
 
   patches = [
+    # TODO: remove after next update
+    # https://github.com/GitoxideLabs/gitoxide/pull/1929
     ./fix-cargo-dependencies.patch
   ];
 
diff --git a/pkgs/by-name/go/go-ecoflow-exporter/package.nix b/pkgs/by-name/go/go-ecoflow-exporter/package.nix
index 79a36efa67b1..6ba9adfd6de1 100644
--- a/pkgs/by-name/go/go-ecoflow-exporter/package.nix
+++ b/pkgs/by-name/go/go-ecoflow-exporter/package.nix
@@ -12,7 +12,7 @@ buildGoModule (finalAttrs: {
   src = fetchFromGitHub {
     owner = "tess1o";
     repo = "go-ecoflow-exporter";
-    tag = "${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-VCzMItYgnuDXDYdrk/ojzqUE2Fjr7KWGNnLhoQ+ZPYs=";
   };
 
diff --git a/pkgs/by-name/gr/graphite-cli/package-lock.json b/pkgs/by-name/gr/graphite-cli/package-lock.json
index 21ba90c8afd3..4ea132ec68e6 100644
--- a/pkgs/by-name/gr/graphite-cli/package-lock.json
+++ b/pkgs/by-name/gr/graphite-cli/package-lock.json
@@ -1,19 +1,16 @@
 {
   "name": "@withgraphite/graphite-cli",
-  "version": "1.5.3",
+  "version": "1.6.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@withgraphite/graphite-cli",
-      "version": "1.5.3",
+      "version": "1.6.1",
       "hasInstallScript": true,
       "license": "None",
       "dependencies": {
-        "chalk": "^4.1.2",
-        "semver": "^7.5.4",
-        "ws": "^8.6.0",
-        "yargs": "^17.5.1"
+        "semver": "^7.5.4"
       },
       "bin": {
         "graphite": "graphite.js",
@@ -23,129 +20,6 @@
         "node": ">=16"
       }
     },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/cliui": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-      "license": "ISC",
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "license": "MIT"
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "license": "MIT"
-    },
-    "node_modules/escalade": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
-      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "license": "ISC",
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/semver": {
       "version": "7.7.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
@@ -157,118 +31,6 @@
       "engines": {
         "node": ">=10"
       }
-    },
-    "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/ws": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
-      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "license": "ISC",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yargs": {
-      "version": "17.7.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-      "license": "MIT",
-      "dependencies": {
-        "cliui": "^8.0.1",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^21.1.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/yargs-parser": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-      "license": "ISC",
-      "engines": {
-        "node": ">=12"
-      }
     }
   }
 }
diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix
index 9b1a442694bf..b806ce0f33cb 100644
--- a/pkgs/by-name/gr/graphite-cli/package.nix
+++ b/pkgs/by-name/gr/graphite-cli/package.nix
@@ -8,14 +8,14 @@
 
 buildNpmPackage rec {
   pname = "graphite-cli";
-  version = "1.5.3";
+  version = "1.6.1";
 
   src = fetchurl {
     url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz";
-    hash = "sha256-hWr4HOpcNXEpdboeHige5nliVCLY3RukMVh2xRKGIlI=";
+    hash = "sha256-r7tChs0vsg60LXFf9WZjthqMxXGgohNL4ojdjXNZcCo=";
   };
 
-  npmDepsHash = "sha256-v/zIQvcFGHA4Jr7Hh+hTw8BqwBF7b65X9or230qCsMc=";
+  npmDepsHash = "sha256-DoK3GaGIwei9kumvAwfgaIY9iw+Z6ysFzUm5dMVV2W4=";
 
   postPatch = ''
     ln -s ${./package-lock.json} package-lock.json
diff --git a/pkgs/by-name/ht/httpyac/package.nix b/pkgs/by-name/ht/httpyac/package.nix
index 8b12615f6e60..df8d7f93362d 100644
--- a/pkgs/by-name/ht/httpyac/package.nix
+++ b/pkgs/by-name/ht/httpyac/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "httpyac";
-  version = "6.16.6";
+  version = "6.16.7";
 
   src = fetchFromGitHub {
     owner = "anweber";
     repo = "httpyac";
     tag = version;
-    hash = "sha256-JsrGoUZKo5/qjH+GKm5FBY19NE6KN7NhLpPvM8Cw97U=";
+    hash = "sha256-6qhKOb2AJrDhZLRU6vrDfuW9KED+5TLf4hHH/0iADeA=";
   };
 
-  npmDepsHash = "sha256-08RJ1lLIaTXi3JHGIFR44GbEqOGez7+VFQGlejZqgAI=";
+  npmDepsHash = "sha256-X3Yz+W7lijOLP+tEuO0JOpeOMOGdUYN6OpxPYHwFQEo=";
 
   nativeInstallCheckInputs = [
     versionCheckHook
diff --git a/pkgs/by-name/hy/hyperrogue/package.nix b/pkgs/by-name/hy/hyperrogue/package.nix
index 063034a0d2f2..375f5f22c7b5 100644
--- a/pkgs/by-name/hy/hyperrogue/package.nix
+++ b/pkgs/by-name/hy/hyperrogue/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hyperrogue";
-  version = "13.0w";
+  version = "13.0x";
 
   src = fetchFromGitHub {
     owner = "zenorogue";
     repo = "hyperrogue";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-/ERMR4JtlIsZ5mvPKTjcjiUfX5/7DTqT0Zc/LEFdZ+M=";
+    sha256 = "sha256-CwicLUQThNDc8Ig0kRNTnkSwUcoIw+tNQoXVgoWbkIE=";
   };
 
   env = {
diff --git a/pkgs/by-name/ir/irpf/package.nix b/pkgs/by-name/ir/irpf/package.nix
index f69230e40899..70be4394034e 100644
--- a/pkgs/by-name/ir/irpf/package.nix
+++ b/pkgs/by-name/ir/irpf/package.nix
@@ -13,7 +13,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "irpf";
-  version = "2025-1.0";
+  version = "2025-1.1";
 
   # https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf
   # Para outros sistemas operacionais -> Multi
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     in
     fetchzip {
       url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${finalAttrs.version}.zip";
-      hash = "sha256-gDGDOthUbRmj68CHmHhaYlGs4tiQTNVlEmuyLZ5e0zY=";
+      hash = "sha256-C5Ebit11TGhh3jI0ZKVEPFpuqnHbrDC1JoMt0v21S90=";
     };
 
   passthru.updateScript = writeScript "update-irpf" ''
diff --git a/pkgs/by-name/ki/kikit/default.nix b/pkgs/by-name/ki/kikit/default.nix
index 8807d8887ba4..8f24acfff73e 100644
--- a/pkgs/by-name/ki/kikit/default.nix
+++ b/pkgs/by-name/ki/kikit/default.nix
@@ -26,7 +26,7 @@ let
 in
 buildPythonApplication rec {
   pname = "kikit";
-  version = "1.7.1";
+  version = "1.7.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -35,7 +35,13 @@ buildPythonApplication rec {
     owner = "yaqwsx";
     repo = "KiKit";
     tag = "v${version}";
-    hash = "sha256-GG0OXPoTy219QefQ7GwMen4u66lPob5DI8lU9sqwaRQ=";
+    hash = "sha256-HSAQJJqJMVh44wgOQm+0gteShLogklBFuIzWtoVTf9I=";
+    # Upstream uses versioneer, which relies on gitattributes substitution.
+    # This leads to non-reproducible archives on GitHub.
+    # See https://github.com/NixOS/nixpkgs/issues/84312
+    postFetch = ''
+      rm "$out/kikit/_version.py"
+    '';
   };
 
   build-system = [
@@ -75,6 +81,11 @@ buildPythonApplication rec {
     "kikit"
   ];
 
+  postPatch = ''
+    # Recreate _version.py, deleted at fetch time due to non-reproducibility.
+    echo 'def get_versions(): return {"version": "${version}"}' > kikit/_version.py
+  '';
+
   preCheck = ''
     export PATH=$PATH:$out/bin
 
diff --git a/pkgs/by-name/ki/kikit/drop-versioneer.patch b/pkgs/by-name/ki/kikit/drop-versioneer.patch
new file mode 100644
index 000000000000..efddd64c7f23
--- /dev/null
+++ b/pkgs/by-name/ki/kikit/drop-versioneer.patch
@@ -0,0 +1,14 @@
+diff --git a/setup.py b/setup.py
+index 9351fc9..75dfb2c 100644
+--- a/setup.py
++++ b/setup.py
+@@ -66,9 +66,6 @@
+         "solidpython>=1.1.2",
+         "commentjson>=0.9"
+     ],
+-    setup_requires=[
+-        "versioneer"
+-    ],
+     extras_require={
+         "dev": ["pytest"],
+     },
diff --git a/pkgs/by-name/li/libdatovka/package.nix b/pkgs/by-name/li/libdatovka/package.nix
index 3f7bbef3c1a8..ab55e106dd7f 100644
--- a/pkgs/by-name/li/libdatovka/package.nix
+++ b/pkgs/by-name/li/libdatovka/package.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libdatovka";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchurl {
     url = "https://gitlab.nic.cz/datovka/libdatovka/-/archive/v${version}/libdatovka-v${version}.tar.gz";
-    sha256 = "sha256-D/4+ldVnJrPAPrgrV1V4FfgCzgMbw/f/rxWT7Esf8Wk=";
+    sha256 = "sha256-qVbSxPLYe+PjGwRH2U/V2Ku2X1fRPbDOUjFamCsYVgY=";
   };
 
   patches = [
diff --git a/pkgs/by-name/li/libdmtx/package.nix b/pkgs/by-name/li/libdmtx/package.nix
index fca4825a8b5a..62d1c3e05b44 100644
--- a/pkgs/by-name/li/libdmtx/package.nix
+++ b/pkgs/by-name/li/libdmtx/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libdmtx";
-  version = "0.7.7";
+  version = "0.7.8";
 
   src = fetchFromGitHub {
     owner = "dmtx";
     repo = "libdmtx";
     rev = "v${version}";
-    sha256 = "sha256-UQy8iFfl8BNT5cBUMVF1tIScFPfHekSofaebtel9JWk=";
+    sha256 = "sha256-/sV+t7RAr5dTwfUsGz0KEZYgm0DzQWRdiwrbbEbC1OY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/liblscp/package.nix b/pkgs/by-name/li/liblscp/package.nix
index 97c48cfa2ca2..daea8f6fc48a 100644
--- a/pkgs/by-name/li/liblscp/package.nix
+++ b/pkgs/by-name/li/liblscp/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "liblscp";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchurl {
     url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.gz";
-    sha256 = "sha256-ZaPfB3Veg1YCBHieoK9fFqL0tB4PiNsY81oJmn2rd/I=";
+    sha256 = "sha256-21SjPA5emMRKEQIukhg7r3uXfnByEpNkGhCepNu09sc=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/ma/magic-vlsi/package.nix b/pkgs/by-name/ma/magic-vlsi/package.nix
index 7cb7a5bbcbba..6f82114d2cb5 100644
--- a/pkgs/by-name/ma/magic-vlsi/package.nix
+++ b/pkgs/by-name/ma/magic-vlsi/package.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation rec {
   pname = "magic-vlsi";
-  version = "8.3.522";
+  version = "8.3.524";
 
   src = fetchurl {
     url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz";
-    sha256 = "sha256-haXmCVnPPAry4n9EpVWS5UclK6PCA8J9OFlw4jPMGw4=";
+    sha256 = "sha256-PmnxTICQlcrdA+Xd0VP9pC66hsOBhxxKRlQUk1NFHcI=";
   };
 
   nativeBuildInputs = [ python3 ];
diff --git a/pkgs/by-name/ma/mattermostLatest/package.nix b/pkgs/by-name/ma/mattermostLatest/package.nix
index 3dee4870ce1c..cdd22ef281e7 100644
--- a/pkgs/by-name/ma/mattermostLatest/package.nix
+++ b/pkgs/by-name/ma/mattermostLatest/package.nix
@@ -11,8 +11,8 @@ mattermost.override {
     # and make sure the version regex is up to date here.
     # Ensure you also check ../mattermost/package.nix for ESR releases.
     regex = "^v(10\\.[0-9]+\\.[0-9]+)$";
-    version = "10.6.0";
-    srcHash = "sha256-GnXxhhbOKJezUAyKRBbn5IE22gzsn80mwnPANOT9Qu4=";
+    version = "10.6.1";
+    srcHash = "sha256-xCrjJc6JCZXnCZ5lJ3o1bRbt7sxlEmcWeiw2cKmyWG0=";
     vendorHash = "sha256-wj+bAQNJSs9m2SSfl+Ipm965iAhKQ2v1iMjH7I79qf4=";
     npmDepsHash = "sha256-MdLfjLmizFbLfSqOdAZ+euXomB2ZPjZOqspQYnyHcuk=";
     lockfileOverlay = ''
diff --git a/pkgs/by-name/ne/nezha/package.nix b/pkgs/by-name/ne/nezha/package.nix
index ffa7a9767a86..205daad58fae 100644
--- a/pkgs/by-name/ne/nezha/package.nix
+++ b/pkgs/by-name/ne/nezha/package.nix
@@ -14,7 +14,7 @@
 
 let
   pname = "nezha";
-  version = "1.10.4";
+  version = "1.10.8";
 
   frontendName = lib.removePrefix "nezha-theme-";
 
@@ -58,7 +58,7 @@ buildGo124Module {
     owner = "nezhahq";
     repo = "nezha";
     tag = "v${version}";
-    hash = "sha256-9dw1MT3v7ZCpC/MrlZDJmZ9EdTNVIbE0b45ao3eXO7o=";
+    hash = "sha256-uYZclZPvjiOpCVpxkyU6BjdxBmdryBzoGkTctsRuapY=";
   };
 
   proxyVendor = true;
diff --git a/pkgs/by-name/ni/nix-output-monitor/generated-package.nix b/pkgs/by-name/ni/nix-output-monitor/generated-package.nix
index aae28fd797ad..e97ec3c342b0 100644
--- a/pkgs/by-name/ni/nix-output-monitor/generated-package.nix
+++ b/pkgs/by-name/ni/nix-output-monitor/generated-package.nix
@@ -9,21 +9,21 @@
   bytestring,
   cassava,
   containers,
-  data-default,
   directory,
   extra,
   fetchzip,
+  filelock,
   filepath,
   hermes-json,
   HUnit,
   lib,
-  lock-file,
   MemoTrie,
   nix-derivation,
   optics,
   random,
   relude,
   safe,
+  safe-exceptions,
   stm,
   streamly-core,
   strict,
@@ -38,10 +38,10 @@
 }:
 mkDerivation {
   pname = "nix-output-monitor";
-  version = "2.1.5";
+  version = "2.1.6";
   src = fetchzip {
-    url = "https://code.maralorn.de/maralorn/nix-output-monitor/archive/v2.1.5.tar.gz";
-    sha256 = "01rsd2x74ainpadmyldxmjypkcc80f3caiysz9dz6vm8q2arcfbd";
+    url = "https://code.maralorn.de/maralorn/nix-output-monitor/archive/v2.1.6.tar.gz";
+    sha256 = "0v291s6lx9rxlw38a3329gc37nyl2x24blyrf9rv8lzxc1q4bz31";
   };
   isLibrary = true;
   isExecutable = true;
@@ -53,17 +53,17 @@ mkDerivation {
     bytestring
     cassava
     containers
-    data-default
     directory
     extra
+    filelock
     filepath
     hermes-json
-    lock-file
     MemoTrie
     nix-derivation
     optics
     relude
     safe
+    safe-exceptions
     stm
     streamly-core
     strict
@@ -82,17 +82,17 @@ mkDerivation {
     bytestring
     cassava
     containers
-    data-default
     directory
     extra
+    filelock
     filepath
     hermes-json
-    lock-file
     MemoTrie
     nix-derivation
     optics
     relude
     safe
+    safe-exceptions
     stm
     streamly-core
     strict
@@ -113,19 +113,19 @@ mkDerivation {
     bytestring
     cassava
     containers
-    data-default
     directory
     extra
+    filelock
     filepath
     hermes-json
     HUnit
-    lock-file
     MemoTrie
     nix-derivation
     optics
     random
     relude
     safe
+    safe-exceptions
     stm
     streamly-core
     strict
diff --git a/pkgs/by-name/ni/nix-output-monitor/update.sh b/pkgs/by-name/ni/nix-output-monitor/update.sh
index a83043df66ee..71f4e2634fd7 100755
--- a/pkgs/by-name/ni/nix-output-monitor/update.sh
+++ b/pkgs/by-name/ni/nix-output-monitor/update.sh
@@ -27,4 +27,6 @@ cabal2nix \
   "https://code.maralorn.de/maralorn/nix-output-monitor/archive/${new_version}.tar.gz" \
   >> "$derivation_file"
 
+nixfmt "$derivation_file"
+
 echo "Finished."
diff --git a/pkgs/by-name/ni/nixos-facter/package.nix b/pkgs/by-name/ni/nixos-facter/package.nix
index 9f0304aa4a3c..91b9c2588009 100644
--- a/pkgs/by-name/ni/nixos-facter/package.nix
+++ b/pkgs/by-name/ni/nixos-facter/package.nix
@@ -6,8 +6,7 @@
   libusb1,
   gcc,
   pkg-config,
-  util-linux,
-  pciutils,
+  makeWrapper,
   stdenv,
   systemdMinimal,
 }:
@@ -24,16 +23,16 @@ let
 in
 buildGoModule rec {
   pname = "nixos-facter";
-  version = "0.3.1";
+  version = "0.3.2";
 
   src = fetchFromGitHub {
     owner = "numtide";
     repo = "nixos-facter";
     rev = "v${version}";
-    hash = "sha256-HJt6FEQbzwlVMow47p1DtqXdmCxLYA6g3D1EgGnKcUo=";
+    hash = "sha256-QD9b3r91ukGbAg+ZWj9cdBsXb6pl3wlVgEY3zF+tDQI=";
   };
 
-  vendorHash = "sha256-WCItbRbGgclXGtJyHCkDgaPe3Mobe4mT/4c16AEdF5o=";
+  vendorHash = "sha256-A7ZuY8Gc/a0Y8O6UG2WHWxptHstJOxi4n9F8TY6zqiw=";
 
   env.CGO_ENABLED = 1;
 
@@ -45,14 +44,14 @@ buildGoModule rec {
   nativeBuildInputs = [
     gcc
     pkg-config
+    makeWrapper
   ];
 
-  runtimeInputs = [
-    libusb1
-    util-linux
-    pciutils
-    systemdMinimal
-  ];
+  # nixos-facter calls systemd-detect-virt
+  postInstall = ''
+    wrapProgram "$out/bin/nixos-facter" \
+        --prefix PATH : "${lib.makeBinPath [ systemdMinimal ]}"
+  '';
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/ns/nsq/package.nix b/pkgs/by-name/ns/nsq/package.nix
index fd7bc11e0649..f8290cf52916 100644
--- a/pkgs/by-name/ns/nsq/package.nix
+++ b/pkgs/by-name/ns/nsq/package.nix
@@ -29,5 +29,6 @@ buildGoModule rec {
     description = "Realtime distributed messaging platform";
     changelog = "https://github.com/nsqio/nsq/raw/v${version}/ChangeLog.md";
     license = licenses.mit;
+    maintainers = with maintainers; [ blakesmith ];
   };
 }
diff --git a/pkgs/by-name/oc/oci-seccomp-bpf-hook/package.nix b/pkgs/by-name/oc/oci-seccomp-bpf-hook/package.nix
index 3e572473abde..7814da4e5965 100644
--- a/pkgs/by-name/oc/oci-seccomp-bpf-hook/package.nix
+++ b/pkgs/by-name/oc/oci-seccomp-bpf-hook/package.nix
@@ -11,12 +11,12 @@
 
 buildGoModule rec {
   pname = "oci-seccomp-bpf-hook";
-  version = "1.2.10";
+  version = "1.2.11";
   src = fetchFromGitHub {
     owner = "containers";
     repo = "oci-seccomp-bpf-hook";
     rev = "v${version}";
-    sha256 = "sha256-bWlm+JYNf7+faKSQfW5fhxoH/D2I8ujjakswH+1r49o=";
+    sha256 = "sha256-1LRwbKOLNBkY/TMTLlWq2lkFzCabXqwdaMRT9HNr6HE=";
   };
   vendorHash = null;
 
diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix
index 6e702bb1b236..64a52d824fc7 100644
--- a/pkgs/by-name/op/open-webui/package.nix
+++ b/pkgs/by-name/op/open-webui/package.nix
@@ -8,13 +8,13 @@
 }:
 let
   pname = "open-webui";
-  version = "0.6.1";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "open-webui";
     repo = "open-webui";
     tag = "v${version}";
-    hash = "sha256-4thzEyXANDKARwWR8NvPsTW9/ZsV26B1NLXR0UsAWyg=";
+    hash = "sha256-E9bZr2HG1TSZQDW4KBd3rV8AoQ3lWH8tfTsCY7XAwy0=";
   };
 
   frontend = buildNpmPackage rec {
@@ -30,7 +30,7 @@ let
       url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2";
     };
 
-    npmDepsHash = "sha256-JTOl1qDcERdVq6g1nt5wD+Z9MjJw0MFxq0N2e5Hvo7M=";
+    npmDepsHash = "sha256-PNuZ1PsUtNfwI24zfzvnUzkvBznZQHLUG12E+p1bL68=";
 
     # Disabling `pyodide:fetch` as it downloads packages during `buildPhase`
     # Until this is solved, running python packages from the browser will not work.
@@ -82,6 +82,7 @@ python312.pkgs.buildPythonApplication rec {
   dependencies =
     with python312.pkgs;
     [
+      accelerate
       aiocache
       aiofiles
       aiohttp
diff --git a/pkgs/by-name/op/opera/package.nix b/pkgs/by-name/op/opera/package.nix
index 30f6059fc633..c1b56776a90c 100644
--- a/pkgs/by-name/op/opera/package.nix
+++ b/pkgs/by-name/op/opera/package.nix
@@ -52,11 +52,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "opera";
-  version = "117.0.5408.93";
+  version = "117.0.5408.197";
 
   src = fetchurl {
     url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
-    hash = "sha256-1Qi1Suh5gDJXFOnI3sjmLCNrNFDqV9n1sTh3rFrRBro=";
+    hash = "sha256-ZTYdmp8fScBm5SF1cx2LwhMV66MkShEtww7VDJTDATk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ow/owntone/package.nix b/pkgs/by-name/ow/owntone/package.nix
index 4fcfb8cd2616..e6460bdcb471 100644
--- a/pkgs/by-name/ow/owntone/package.nix
+++ b/pkgs/by-name/ow/owntone/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "owntone";
     repo = "owntone-server";
-    tag = "${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-Mj3G1+Hwa/zl0AM4SO6TcB4W3WJkpIDzrSPEFx0vaEk=";
   };
 
diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix
index c6dcc236ac06..692c399a5855 100644
--- a/pkgs/by-name/pk/pkgsite/package.nix
+++ b/pkgs/by-name/pk/pkgsite/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule {
   pname = "pkgsite";
-  version = "0-unstable-2025-03-21";
+  version = "0-unstable-2025-04-01";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "pkgsite";
-    rev = "d037ac96d503b32fcdcb5f5efeefef10447c394e";
-    hash = "sha256-/zcnS3qYmiI5kuOZ4jJB7/3C2U9KELYgte7d9OgaLmo=";
+    rev = "e806f9c8871f0247a0989e5124d82e7d841bce91";
+    hash = "sha256-J8v0P+KIhh07c0G+XN5aWuVp2btaJel2T+U6g/D/2sM=";
   };
 
   vendorHash = "sha256-M4cbpMZ/ujnMUoGp//KpBM2oEl/RCOfI1IcmoGMw+fw=";
diff --git a/pkgs/by-name/pl/plan-exporter/package.nix b/pkgs/by-name/pl/plan-exporter/package.nix
index 936ef9107dd8..21cc7e91d467 100644
--- a/pkgs/by-name/pl/plan-exporter/package.nix
+++ b/pkgs/by-name/pl/plan-exporter/package.nix
@@ -2,18 +2,25 @@
   lib,
   fetchFromGitHub,
   buildGoModule,
+  nix-update-script,
 }:
 buildGoModule rec {
   pname = "plan-exporter";
   version = "0.0.6";
+
   src = fetchFromGitHub {
     owner = "agneum";
     repo = "plan-exporter";
     tag = "v${version}";
     hash = "sha256-Csp57wmkDA8b05hmKbk1+bGtORFgNls7I01A0irTKao=";
   };
+
   vendorHash = null;
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Query plan exporter for psql";
     homepage = "https://github.com/agneum/plan-exporter";
diff --git a/pkgs/by-name/po/pomerium-cli/package.nix b/pkgs/by-name/po/pomerium-cli/package.nix
index 7a51ae3e8ad8..6fbf07776211 100644
--- a/pkgs/by-name/po/pomerium-cli/package.nix
+++ b/pkgs/by-name/po/pomerium-cli/package.nix
@@ -14,16 +14,16 @@ let
 in
 buildGoModule rec {
   pname = "pomerium-cli";
-  version = "0.29.0";
+  version = "0.29.1";
 
   src = fetchFromGitHub {
     owner = "pomerium";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "sha256-H5wZaZsMgHPcO1qDoaqp/UP+stU7IG070DNFhxC7Ehw=";
+    sha256 = "sha256-CcXreKZ83+WDucV3sr62bwKzSs+S9R3e+z0JD0rR8jw=";
   };
 
-  vendorHash = "sha256-a5eESlDBxYVvfiafdZFIjUqIxB51LZc67fUJek69qwc=";
+  vendorHash = "sha256-k6HOIpz0cPCkP3TXg62u+tuYd41TF+YAoCWINAcFoB8=";
 
   subPackages = [
     "cmd/pomerium-cli"
diff --git a/pkgs/by-name/pr/protonmail-bridge-gui/package.nix b/pkgs/by-name/pr/protonmail-bridge-gui/package.nix
index 3d159ffb6459..d8d87b4909b2 100644
--- a/pkgs/by-name/pr/protonmail-bridge-gui/package.nix
+++ b/pkgs/by-name/pr/protonmail-bridge-gui/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     find . -type f -name "CMakeLists.txt" -exec sed -i "/BridgeSetup\\.cmake/d" {} \;
 
     # Use the available ICU version
-    sed -i "s/libicu\(i18n\|uc\|data\)\.so\.56/libicu\1.so/g" bridge-gui/DeployLinux.cmake
+    sed -i "s/libicu\(i18n\|uc\|data\)\.so\.[0-9][0-9]/libicu\1.so/g" bridge-gui/DeployLinux.cmake
 
     # Create a Desktop Entry that uses a `protonmail-bridge-gui` binary without upstream's launcher
     sed "s/^\(Icon\|Exec\)=.*$/\1=protonmail-bridge-gui/" ../../../dist/proton-bridge.desktop > proton-bridge-gui.desktop
diff --git a/pkgs/by-name/pr/protonmail-bridge/package.nix b/pkgs/by-name/pr/protonmail-bridge/package.nix
index 80842c582a8d..4e3a5558a601 100644
--- a/pkgs/by-name/pr/protonmail-bridge/package.nix
+++ b/pkgs/by-name/pr/protonmail-bridge/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "protonmail-bridge";
-  version = "3.18.0";
+  version = "3.19.0";
 
   src = fetchFromGitHub {
     owner = "ProtonMail";
     repo = "proton-bridge";
     rev = "v${version}";
-    hash = "sha256-qLxIXAGa1nqLOroz5VYWktznId+vfOPvHpUT/oVPD8M=";
+    hash = "sha256-Jx6yzn3QNOVz/VM8dqmTm4Upzz46aNo9d6lvhjLwdL4=";
   };
 
   vendorHash = "sha256-S08Vw/dLLVd6zFWmpG8wDVf7LOdSC29qo7pUscYHDyY=";
diff --git a/pkgs/by-name/rm/rmg/package.nix b/pkgs/by-name/rm/rmg/package.nix
index 62c326b36bfc..5558fd286168 100644
--- a/pkgs/by-name/rm/rmg/package.nix
+++ b/pkgs/by-name/rm/rmg/package.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rmg";
-  version = "0.7.7";
+  version = "0.7.8";
 
   src = fetchFromGitHub {
     owner = "Rosalie241";
     repo = "RMG";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Jwp3DXCh30TLBALXdnu6IubT4Y/8NGjJoSj7WwPp8Q8=";
+    hash = "sha256-ijoXKZbK4tm1KQ4I7R/g12tCUqrg4wRRRBCPPL03WEk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
index 8391703774f4..4271b93eb79b 100644
--- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
+++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
@@ -12,15 +12,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rust-analyzer-unwrapped";
-  version = "2025-03-24";
+  version = "2025-03-31";
   useFetchCargoVendor = true;
-  cargoHash = "sha256-cLSUCdc0q1P1z8STZ9GhNzT752ruFqyhnnhDzA6nb+o=";
+  cargoHash = "sha256-sOuswCnF5y/L8x586PpcrLQj19+5x8COi9xBE2SRLYY=";
 
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "rust-analyzer";
     rev = version;
-    hash = "sha256-Hs+FeeFB+YTKIW39/b2OKr1/Q+vgDnfMYM1g+sRgFCU=";
+    hash = "sha256-GLefofvDqIcyZ/S8rcF6cuKoSPJOVkm7TSK23MGT3Kk=";
   };
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/ru/rustdesk/package.nix b/pkgs/by-name/ru/rustdesk/package.nix
index fcb851e8748b..67e4eaf6a680 100644
--- a/pkgs/by-name/ru/rustdesk/package.nix
+++ b/pkgs/by-name/ru/rustdesk/package.nix
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   src = fetchFromGitHub {
     owner = "rustdesk";
     repo = "rustdesk";
-    tag = "${finalAttrs.version}";
+    tag = finalAttrs.version;
     fetchSubmodules = true;
     hash = "sha256-m1bFljZL8vNaugepVs8u1EWNpDLtxgSSZqKGQmgrmsA=";
   };
diff --git a/pkgs/by-name/sc/scrot/package.nix b/pkgs/by-name/sc/scrot/package.nix
index 7b7474f090aa..236899adab11 100644
--- a/pkgs/by-name/sc/scrot/package.nix
+++ b/pkgs/by-name/sc/scrot/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "scrot";
-  version = "1.11.1";
+  version = "1.12.1";
 
   src = fetchFromGitHub {
     owner = "resurrecting-open-source-projects";
     repo = "scrot";
     rev = version;
-    sha256 = "sha256-MUmvzZMzzKKw5GjOUhpdrMIgKO9/i9RDqDtTsSghd18=";
+    sha256 = "sha256-ExZH+bjpEvdbSYM8OhV+cyn4j+0YrHp5/b+HsHKAHCA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/si/signal-cli/package.nix b/pkgs/by-name/si/signal-cli/package.nix
index 0448ecb7bd32..79079d066912 100644
--- a/pkgs/by-name/si/signal-cli/package.nix
+++ b/pkgs/by-name/si/signal-cli/package.nix
@@ -11,12 +11,12 @@
 
 stdenv.mkDerivation rec {
   pname = "signal-cli";
-  version = "0.13.13";
+  version = "0.13.14";
 
   # Building from source would be preferred, but is much more involved.
   src = fetchurl {
     url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz";
-    hash = "sha256-nSaf8VkHxuAvedUhFAIeagOxKYNxp3hi0zH6BbomtMQ=";
+    hash = "sha256-TKAUSVIBF9FVbwZYc5R3ZsVecF/RsII1nl7GuITxAoc=";
   };
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
diff --git a/pkgs/by-name/si/signal-desktop-source/libsignal-node.nix b/pkgs/by-name/si/signal-desktop-source/libsignal-node.nix
index a0e60c798137..a1d45fe6a3d0 100644
--- a/pkgs/by-name/si/signal-desktop-source/libsignal-node.nix
+++ b/pkgs/by-name/si/signal-desktop-source/libsignal-node.nix
@@ -12,7 +12,6 @@
   fetchFromGitHub,
   python3,
   nodejs,
-
 }:
 let
   # boring-sys expects the static libraries in build/ instead of lib/
@@ -25,23 +24,23 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "libsignal-node";
-  version = "0.67.3";
+  version = "0.67.4";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "libsignal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kZZS3IpmxFFuHMH4O1H+JLyf2zBTSr1RnuV0wrwZeXk=";
+    hash = "sha256-s7vTzAOWKvGCkrWcxDcKptsmxvW5VxrF5X9Vfkjj1jA=";
   };
   useFetchCargoVendor = true;
-  cargoHash = "sha256-ozroDfxDdBtyBEE0d7nf63wUqilBhakT/lxwYV/7V5I=";
+  cargoHash = "sha256-wxBbq4WtqzHbdro+tm2hU6JVwTgC2X/Cx9po+ndgECg=";
 
   npmRoot = "node";
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-npm-deps";
     inherit (finalAttrs) version src;
     sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
-    hash = "sha256-TpjpRDsKT/RCPxzV7mzfmZHI9QhH+OColGuEMSdVwBA=";
+    hash = "sha256-GJTNuVK1YGDpx89fF6hXXd+/fEqnFMG5FgJUJhp6344=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/si/signal-desktop-source/package.nix b/pkgs/by-name/si/signal-desktop-source/package.nix
index 183afb777715..1fb16de41ff2 100644
--- a/pkgs/by-name/si/signal-desktop-source/package.nix
+++ b/pkgs/by-name/si/signal-desktop-source/package.nix
@@ -7,11 +7,9 @@
   python3,
   makeWrapper,
   callPackage,
-  libpulseaudio,
   fetchFromGitHub,
   runCommand,
-  fetchzip,
-  autoPatchelfHook,
+  jq,
   makeDesktopItem,
   copyDesktopItems,
   replaceVars,
@@ -29,29 +27,9 @@ let
     tar -C $out --strip-components=1 -xvf ${electron.headers}
   '';
 
-  sqlcipher-signal-extension = callPackage ./sqlcipher-signal-extension.nix { };
   libsignal-node = callPackage ./libsignal-node.nix { inherit nodejs; };
 
-  ringrtc = stdenv.mkDerivation (finalAttrs: {
-    pname = "ringrtc-bin";
-    version = "2.50.2";
-    src = fetchzip {
-      url = "https://build-artifacts.signal.org/libraries/ringrtc-desktop-build-v${finalAttrs.version}.tar.gz";
-      hash = "sha256-hNlz+gSulyJ//FdbPvY/5OHbtJ4rEUdi9/SHJDX6gZE=";
-    };
-
-    installPhase = ''
-      cp -r . $out
-    '';
-
-    nativeBuildInputs = [ autoPatchelfHook ];
-    buildInputs = [ libpulseaudio ];
-    meta = {
-      homepage = "https://github.com/signalapp/ringrtc";
-      license = lib.licenses.agpl3Only;
-      sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    };
-  });
+  ringrtc-bin = callPackage ./ringrtc-bin.nix { };
 
   # Noto Color Emoji PNG files for emoji replacement; see below.
   noto-fonts-color-emoji-png = noto-fonts-color-emoji.overrideAttrs (prevAttrs: {
@@ -74,16 +52,16 @@ let
     '';
   });
 
-  version = "7.48.0";
+  version = "7.49.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "Signal-Desktop";
     tag = "v${version}";
-    hash = "sha256-/jtuGsBOFsSgJZNpRilWZ0daI0iYVziZBaF/vLvQ7NU=";
+    hash = "sha256-URWDSHiPK+DCh8giT8YFW2HNY0tYNokqbAKBpBWZKD0=";
   };
 
-  stickerCreator = stdenv.mkDerivation (finalAttrs: {
+  sticker-creator = stdenv.mkDerivation (finalAttrs: {
     pname = "signal-desktop-sticker-creator";
     inherit version;
     src = src + "/sticker-creator";
@@ -121,6 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
     makeWrapper
     copyDesktopItems
     python3
+    jq
   ];
   buildInputs = (lib.optional (!withAppleEmojis) noto-fonts-color-emoji-png);
 
@@ -139,21 +118,39 @@ stdenv.mkDerivation (finalAttrs: {
       ;
     hash =
       if withAppleEmojis then
-        "sha256-xba5MfIjwnLHDKVM9+2KSpC3gcw6cM4cX3dn3/jqT3o="
+        "sha256-QBlouzA3PhRGiL94sCQS/zRSdsFbKf4VI20x3seMpE4="
       else
-        "sha256-I5UGY9Fz4wCa23snq0pir2uq/P+w+fAGU4Bks+CqEgk=";
+        "sha256-LKSFptmJyfI0ACo1egZ2LAY5pAXexu9UNjIhD79rJ9E=";
   };
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
     SIGNAL_ENV = "production";
-    SOURCE_DATE_EPOCH = 1743538878;
+    SOURCE_DATE_EPOCH = 1743627521;
   };
 
   preBuild = ''
-    cp ${sqlcipher-signal-extension}/share/sqlite3.gyp node_modules/@signalapp/better-sqlite3/deps/sqlite3.gyp
+    if [ "`jq -r '.engines.node' < package.json | head -c 2`" != `head -c 2 <<< "${nodejs.version}"` ]
+    then
+      die "nodejs version mismatch"
+    fi
 
-    cp -r ${ringrtc} node_modules/@signalapp/ringrtc/build
+    if [ "`jq -r '.devDependencies.electron' < package.json | head -c 2`" != `head -c 2 <<< "${electron.version}"` ]
+    then
+      die "electron version mismatch"
+    fi
+
+    if [ "`jq -r '.dependencies."@signalapp/libsignal-client"' < package.json`" != "${libsignal-node.version}" ]
+    then
+      die "libsignal-client version mismatch"
+    fi
+
+    if [ "`jq -r '.dependencies."@signalapp/ringrtc"' < package.json`" != "${ringrtc-bin.version}" ]
+    then
+      die "ringrtc version mismatch"
+    fi
+
+    cp -r ${ringrtc-bin} node_modules/@signalapp/ringrtc/build
 
     rm -fr node_modules/@signalapp/libsignal-client/prebuilds
     cp -r ${libsignal-node}/lib node_modules/@signalapp/libsignal-client/prebuilds
@@ -165,7 +162,7 @@ stdenv.mkDerivation (finalAttrs: {
     export npm_config_nodedir=${electron-headers}
     cp -r ${electron.dist} electron-dist
     chmod -R u+w electron-dist
-    cp -r ${stickerCreator} sticker-creator/dist
+    cp -r ${sticker-creator} sticker-creator/dist
 
     pnpm run generate
     pnpm exec electron-builder \
@@ -219,8 +216,13 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   passthru = {
-    inherit sqlcipher-signal-extension libsignal-node;
+    inherit
+      libsignal-node
+      ringrtc-bin
+      sticker-creator
+      ;
     tests.application-launch = nixosTests.signal-desktop;
+    updateScript.command = [ ./update.sh ];
   };
 
   meta = {
@@ -251,6 +253,7 @@ stdenv.mkDerivation (finalAttrs: {
     sourceProvenance = with lib.sourceTypes; [
       fromSource
 
+      # @signalapp/sqlcipher
       # ringrtc
       binaryNativeCode
     ];
diff --git a/pkgs/by-name/si/signal-desktop-source/replace-apple-emoji-with-noto-emoji.patch b/pkgs/by-name/si/signal-desktop-source/replace-apple-emoji-with-noto-emoji.patch
index 3779f5859b23..5d235dc80041 100644
--- a/pkgs/by-name/si/signal-desktop-source/replace-apple-emoji-with-noto-emoji.patch
+++ b/pkgs/by-name/si/signal-desktop-source/replace-apple-emoji-with-noto-emoji.patch
@@ -1,8 +1,8 @@
 diff --git a/ACKNOWLEDGMENTS.md b/ACKNOWLEDGMENTS.md
-index aed1048..e4c1f50 100644
+index 2c963f1..96edd02 100644
 --- a/ACKNOWLEDGMENTS.md
 +++ b/ACKNOWLEDGMENTS.md
-@@ -745,30 +745,6 @@ Signal Desktop makes use of the following open source projects.
+@@ -1636,30 +1636,6 @@ Signal Desktop makes use of the following open source projects.
      OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
      SOFTWARE.
  
@@ -46,10 +46,10 @@ index 68dceea..4b35bb1 100644
      getBadgesPath(userDataPath),
      getDraftPath(userDataPath),
 diff --git a/package.json b/package.json
-index 3a6ac26..40cdb25 100644
+index 5755fec..86125ba 100644
 --- a/package.json
 +++ b/package.json
-@@ -130,7 +130,6 @@
+@@ -137,7 +137,6 @@
      "dashdash": "2.0.0",
      "direction": "1.0.4",
      "emoji-datasource": "15.1.2",
@@ -57,11 +57,18 @@ index 3a6ac26..40cdb25 100644
      "emoji-regex": "10.4.0",
      "encoding": "0.1.13",
      "fabric": "4.6.0",
+@@ -649,4 +648,4 @@
+       "sticker-creator/dist/**"
+     ]
+   }
+-}
++}
+\ No newline at end of file
 diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
-index ba2f205..705e454 100644
+index f04b2b1..070fa0f 100644
 --- a/pnpm-lock.yaml
 +++ b/pnpm-lock.yaml
-@@ -169,9 +169,6 @@ importers:
+@@ -184,9 +184,6 @@ importers:
        emoji-datasource:
          specifier: 15.1.2
          version: 15.1.2
@@ -71,7 +78,7 @@ index ba2f205..705e454 100644
        emoji-regex:
          specifier: 10.4.0
          version: 10.4.0
-@@ -4790,9 +4787,6 @@ packages:
+@@ -4817,9 +4814,6 @@ packages:
      resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==}
      engines: {node: '>=12'}
  
@@ -81,7 +88,7 @@ index ba2f205..705e454 100644
    emoji-datasource@15.1.2:
      resolution: {integrity: sha512-tXAqGsrDVhgCRpFePtaD9P4Z8Ro2SUQSL/4MIJBG0SxqQJaMslEbin8J53OaFwEBu6e7JxFaIF6s4mw9+8acAQ==}
  
-@@ -14929,8 +14923,6 @@ snapshots:
+@@ -14990,8 +14984,6 @@ snapshots:
  
    emittery@0.13.1: {}
  
@@ -90,14 +97,42 @@ index ba2f205..705e454 100644
    emoji-datasource@15.1.2: {}
  
    emoji-regex@10.4.0: {}
-diff --git a/ts/components/conversation/Emojify.tsx b/ts/components/conversation/Emojify.tsx
-index f0b1115..7613230 100644
---- a/ts/components/conversation/Emojify.tsx
-+++ b/ts/components/conversation/Emojify.tsx
-@@ -35,8 +35,15 @@ function getImageTag({
-   }
+diff --git a/stylesheets/components/fun/FunEmoji.scss b/stylesheets/components/fun/FunEmoji.scss
+index 78c7563..83d196c 100644
+--- a/stylesheets/components/fun/FunEmoji.scss
++++ b/stylesheets/components/fun/FunEmoji.scss
+@@ -5,19 +5,9 @@
+ $emoji-sprite-sheet-grid-item-count: 62;
  
-   let srcSet: string | undefined;
+ @mixin emoji-sprite($sheet, $margin, $scale) {
+-  $size: calc($sheet * 1px * $scale);
+-  $margin-start: calc($margin * $scale);
+-  $margin-end: calc($margin * $scale);
+-  $size-outer: calc($size + $margin-start + $margin-end);
+-  $image: url('../images/emoji-sheet-#{$sheet}.webp');
+-  background-image: $image;
+-  background-size: calc($size-outer * $emoji-sprite-sheet-grid-item-count);
+-  background-position-x: calc(
+-    var(--fun-emoji-sheet-x) * ($size-outer * -1) + ($margin-start * -1)
+-  );
+-  background-position-y: calc(
+-    var(--fun-emoji-sheet-y) * ($size-outer * -1) + ($margin-start * -1)
+-  );
++  background-image: var(--fun-emoji-jumbo-image);
++  background-size: contain;
++  background-position: center;
+   background-repeat: no-repeat;
+ }
+ 
+diff --git a/ts/components/fun/FunEmoji.tsx b/ts/components/fun/FunEmoji.tsx
+index 08785e8..d25b868 100644
+--- a/ts/components/fun/FunEmoji.tsx
++++ b/ts/components/fun/FunEmoji.tsx
+@@ -10,7 +10,14 @@ export const FUN_STATIC_EMOJI_CLASS = 'FunStaticEmoji';
+ export const FUN_INLINE_EMOJI_CLASS = 'FunInlineEmoji';
+ 
+ function getEmojiJumboUrl(emoji: EmojiVariantData): string {
+-  return `emoji://jumbo?emoji=${encodeURIComponent(emoji.value)}`;
 +  const emojiToNotoName = (emoji: string): string =>
 +    `emoji_u${
 +      [...emoji]
@@ -105,25 +140,7 @@ index f0b1115..7613230 100644
 +        .map(c => c.codePointAt(0)?.toString(16).padStart(4, "0"))
 +        .join("_")
 +    }.png`;
-   if (sizeClass != null && JUMBO_SIZES.has(sizeClass)) {
--    srcSet = `emoji://jumbo?emoji=${encodeURIComponent(match)} 2x, ${img}`;
-+    srcSet = `file://@noto-emoji-pngs@/${emojiToNotoName(match)} 2x, ${img}`;
-   }
++  return `file://@noto-emoji-pngs@/${emojiToNotoName(emoji.value)}`;
+ }
  
-   return (
-diff --git a/ts/components/emoji/lib.ts b/ts/components/emoji/lib.ts
-index 9753017..cf51d3d 100644
---- a/ts/components/emoji/lib.ts
-+++ b/ts/components/emoji/lib.ts
-@@ -102,7 +102,10 @@ const ROOT_PATH = get(
- );
- 
- const makeImagePath = (src: string) => {
--  return `${ROOT_PATH}node_modules/emoji-datasource-apple/img/apple/64/${src}`;
-+  const datasourceToNoto = (name: string): string =>
-+    `emoji_u${name.slice(0,-4).split("-").filter(c => c != "fe0f").join("_")}.png`;
-+
-+  return `@noto-emoji-pngs@/${datasourceToNoto(src)}`;
- };
- 
- const imageQueue = new PQueue({
+ export type FunStaticEmojiSize =
diff --git a/pkgs/by-name/si/signal-desktop-source/ringrtc-bin.nix b/pkgs/by-name/si/signal-desktop-source/ringrtc-bin.nix
new file mode 100644
index 000000000000..65cc9fdb1e65
--- /dev/null
+++ b/pkgs/by-name/si/signal-desktop-source/ringrtc-bin.nix
@@ -0,0 +1,27 @@
+{
+  stdenv,
+  lib,
+  fetchzip,
+  autoPatchelfHook,
+  libpulseaudio,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ringrtc-bin";
+  version = "2.50.3";
+  src = fetchzip {
+    url = "https://build-artifacts.signal.org/libraries/ringrtc-desktop-build-v${finalAttrs.version}.tar.gz";
+    hash = "sha256-UJqH/UiT9j36r6fr673CP/Z4lGaSPXIzAkf72YZfExo=";
+  };
+
+  installPhase = ''
+    cp -r . $out
+  '';
+
+  nativeBuildInputs = [ autoPatchelfHook ];
+  buildInputs = [ libpulseaudio ];
+  meta = {
+    homepage = "https://github.com/signalapp/ringrtc";
+    license = lib.licenses.agpl3Only;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
+})
diff --git a/pkgs/by-name/si/signal-desktop-source/sqlcipher-signal-extension.nix b/pkgs/by-name/si/signal-desktop-source/sqlcipher-signal-extension.nix
deleted file mode 100644
index e53a3e63eb0a..000000000000
--- a/pkgs/by-name/si/signal-desktop-source/sqlcipher-signal-extension.nix
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-  rustPlatform,
-  lib,
-  fetchFromGitHub,
-  sqlcipher,
-  fetchpatch,
-  stdenv,
-  openssl,
-  tcl,
-  buildEnv,
-  rust-cbindgen,
-}:
-let
-  signal-sqlcipher-extension = rustPlatform.buildRustPackage (finalAttrs: {
-    pname = "signal-sqlcipher-extension";
-    version = "0.2.1";
-
-    src = fetchFromGitHub {
-      owner = "signalapp";
-      repo = "Signal-Sqlcipher-Extension";
-      tag = "v${finalAttrs.version}";
-      hash = "sha256-INSkm7ZuetPASuIqezzzG/bXoEHClUb9XpxWbxLVXRc=";
-    };
-    useFetchCargoVendor = true;
-    cargoHash = "sha256-qT4HM/FRL8qugKKNlMYM/0zgUsC6cDOa9fgd1d4VIrc=";
-
-    meta = {
-      description = "SQLite extension used by Signal Desktop";
-      homepage = "https://github.com/signalapp/Signal-Sqlcipher-Extension";
-      license = lib.licenses.agpl3Only;
-      maintainers = with lib.maintainers; [ marcin-serwin ];
-      platforms = lib.platforms.all;
-    };
-  });
-
-  sqlcipher-amalgamation = stdenv.mkDerivation {
-    pname = "sqlcipher-with-signal-extension";
-
-    inherit (sqlcipher) version src meta;
-
-    patches = [
-      (fetchpatch {
-        # https://github.com/sqlcipher/sqlcipher/pull/529
-        name = "custom-crypto-provider.patch";
-        url = "https://github.com/sqlcipher/sqlcipher/commit/0e3b20c155df8a2943b62a9f3cc0f4d3dba9e152.patch";
-        hash = "sha256-OKh6qCGHBQWZyzXfyEveAs71wrNwlWLuG9jNqDeKNG4=";
-      })
-    ];
-
-    nativeBuildInputs = [ tcl ];
-
-    buildInputs = [ openssl ];
-
-    CFLAGS = [ "-DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1" ];
-
-    makeFlags = [ "sqlite3.c" ];
-
-    installPhase = ''
-      install -Dm644 sqlite3.c $out/src/sqlite3.c
-      install -Dm644 sqlite3.h $out/include/sqlite3.h
-      install -Dm644 sqlite3ext.h $out/include/sqlite3ext.h
-    '';
-  };
-
-  signal-tokenizer-headers = rustPlatform.buildRustPackage (finalAttrs: {
-    pname = "Signal-FTS5-Extension";
-    version = "0.2.1";
-
-    src = fetchFromGitHub {
-      owner = "signalapp";
-      repo = "Signal-FTS5-Extension";
-      tag = "v${finalAttrs.version}";
-      hash = "sha256-MzgdRuRsfL3yhlVU0RAAUtAaOukMpqSSa42nRYhpmh0=";
-    };
-    useFetchCargoVendor = true;
-    cargoHash = "sha256-0DDX3ciXk5/3MqsHzxV8s4qEhqYmrwGg7cSbrkFRZbw=";
-
-    nativeBuildInputs = [ rust-cbindgen ];
-
-    buildPhase = ''
-      cbindgen --profile release . -o signal-tokenizer.h
-    '';
-    installPhase = ''
-      install -Dm644 signal-tokenizer.h $out/include/signal-tokenizer.h
-    '';
-    doCheck = false;
-  });
-
-in
-buildEnv {
-  name = "sqlcipher-signal";
-
-  paths = [
-    sqlcipher-amalgamation
-    signal-tokenizer-headers
-    signal-sqlcipher-extension
-  ];
-
-  postBuild = ''
-    install -Dm644 ${./sqlite3.gyp} $out/share/sqlite3.gyp
-    substituteInPlace $out/share/sqlite3.gyp \
-      --replace-fail "@extension@" "$out" \
-      --replace-fail "@static_lib_ext@" "${stdenv.hostPlatform.extensions.staticLibrary}"
-  '';
-}
diff --git a/pkgs/by-name/si/signal-desktop-source/update.sh b/pkgs/by-name/si/signal-desktop-source/update.sh
new file mode 100755
index 000000000000..cb4312587ff7
--- /dev/null
+++ b/pkgs/by-name/si/signal-desktop-source/update.sh
@@ -0,0 +1,47 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bash nix-update common-updater-scripts curl coreutils jq
+
+set -ex
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
+
+curl_github() {
+  curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "$@"
+}
+
+releaseInfo="`curl_github \
+  "https://api.github.com/repos/signalapp/Signal-Desktop/releases/latest"`"
+
+releaseTag="`jq -r ".tag_name" <<< $releaseInfo`"
+releaseDate="`jq -r ".created_at" <<< $releaseInfo`"
+releaseEpoch=`date -d $releaseDate +%s`
+
+packageJson="`curl_github "https://raw.githubusercontent.com/signalapp/Signal-Desktop/refs/tags/$releaseTag/package.json"`"
+
+latestVersion="`jq -r '.version' <<< $packageJson`"
+nodeVersion="`jq -r '.engines.node' <<< $packageJson | head -c2`"
+electronVersion="`jq -r '.devDependencies.electron' <<< $packageJson | head -c2`"
+libsignalClientVersion=`jq -r '.dependencies."@signalapp/libsignal-client"' <<< $packageJson`
+ringrtcVersion=`jq -r '.dependencies."@signalapp/ringrtc"' <<< $packageJson`
+
+sed -E -i "s/(nodejs_)../\1$nodeVersion/" $SCRIPT_DIR/package.nix
+sed -E -i "s/(electron_)../\1$electronVersion/" $SCRIPT_DIR/package.nix
+sed -E -i "s/(SOURCE_DATE_EPOCH = )[0-9]+/\1$releaseEpoch/" $SCRIPT_DIR/package.nix
+
+sed -E -i "s/(withAppleEmojis \? )false/\1true/" $SCRIPT_DIR/package.nix
+nix-update signal-desktop-source --subpackage sticker-creator --version="$latestVersion"
+sed -E -i "s/(withAppleEmojis \? )true/\1false/" $SCRIPT_DIR/package.nix
+update-source-version signal-desktop-source \
+  --ignore-same-version \
+  --source-key=pnpmDeps
+
+update-source-version signal-desktop-source.libsignal-node \
+  "$libsignalClientVersion"
+update-source-version signal-desktop-source.libsignal-node \
+  --ignore-same-version \
+  --source-key=cargoDeps.vendorStaging
+update-source-version signal-desktop-source.libsignal-node \
+  --ignore-same-version \
+  --source-key=npmDeps
+
+update-source-version signal-desktop-source.ringrtc-bin "$ringrtcVersion"
diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix
index 098149418ce4..5ef262012d3c 100644
--- a/pkgs/by-name/si/signalbackup-tools/package.nix
+++ b/pkgs/by-name/si/signalbackup-tools/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "signalbackup-tools";
-  version = "20250331-1";
+  version = "20250406-1";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
     rev = version;
-    hash = "sha256-MrpHGSuV5HhZuwCC8E1konE3DhyK/hv6m6Mt+Wx3JT4=";
+    hash = "sha256-PdbZxDmaM1kdc5IHkWf8RcJcT5cmfRAvUl76VYnqFXc=";
   };
 
   nativeBuildInputs =
diff --git a/pkgs/by-name/si/siril/package.nix b/pkgs/by-name/si/siril/package.nix
index 4bb192410135..551ae7542570 100644
--- a/pkgs/by-name/si/siril/package.nix
+++ b/pkgs/by-name/si/siril/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "free-astro";
     repo = "siril";
-    tag = "${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-pSJp4Oj8x4pKuwPSaSyGbyGfpnanoWBxAdXtzGTP7uA=";
   };
 
diff --git a/pkgs/by-name/su/sudo-rs/package.nix b/pkgs/by-name/su/sudo-rs/package.nix
index 9908c3de7ecc..2706ef823421 100644
--- a/pkgs/by-name/su/sudo-rs/package.nix
+++ b/pkgs/by-name/su/sudo-rs/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "sudo-rs";
-  version = "0.2.4";
+  version = "0.2.5";
 
   src = fetchFromGitHub {
     owner = "trifectatechfoundation";
     repo = "sudo-rs";
     rev = "v${version}";
-    hash = "sha256-jzK/AkBtS2XxxRaSYk5wsaj1IbLlcqyyMk3AqambkKs=";
+    hash = "sha256-apvMcn/1dV9uujyoHikiOxregwWtAFPvrZvYjd3XQwM=";
   };
   useFetchCargoVendor = true;
-  cargoHash = "sha256-0NzHmpf/0YwtgVPkhMpBqxuQQAmKghZ5cZbIr5taM4o=";
+  cargoHash = "sha256-EAfNg7hUsynFZ+EcUqeD9o44BakBYIMgxRXc4vcl8HY=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/su/sunshine/package.nix b/pkgs/by-name/su/sunshine/package.nix
index 9a79973dfe2f..6a0de7ef3ef2 100644
--- a/pkgs/by-name/su/sunshine/package.nix
+++ b/pkgs/by-name/su/sunshine/package.nix
@@ -47,6 +47,7 @@
   miniupnpc,
   nlohmann_json,
   config,
+  coreutils,
   cudaSupport ? config.cudaSupport,
   cudaPackages ? { },
 }:
@@ -200,7 +201,8 @@ stdenv'.mkDerivation rec {
 
     substituteInPlace packaging/linux/sunshine.service.in \
       --subst-var-by PROJECT_DESCRIPTION 'Self-hosted game stream host for Moonlight' \
-      --subst-var-by SUNSHINE_EXECUTABLE_PATH $out/bin/sunshine
+      --subst-var-by SUNSHINE_EXECUTABLE_PATH $out/bin/sunshine \
+      --replace-fail '/bin/sleep' '${lib.getExe' coreutils "sleep"}'
   '';
 
   preBuild = ''
diff --git a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix
index c62c837acfeb..f45c1852f4a0 100644
--- a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix
+++ b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix
@@ -1,23 +1,23 @@
 {
-  version = "1.21.0";
+  version = "1.22.0";
 
   x86_64-linux = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.21.0/linux/amd64/sysdig-cli-scanner";
-    hash = "sha256-QFI6mXrI6TXRVgjYyKhMIT4EAZzKdH4aWvRkURSHN6c=";
+    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.0/linux/amd64/sysdig-cli-scanner";
+    hash = "sha256-qGbQRiUvoynxUeYSmjrz5r9bunthcmQWDzLtTqPu4IU=";
   };
 
   aarch64-linux = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.21.0/linux/arm64/sysdig-cli-scanner";
-    hash = "sha256-JsGbIZkwOSTJ3kDg3yxaHMVeH5ZCx49iAvMYkiP0iYI=";
+    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.0/linux/arm64/sysdig-cli-scanner";
+    hash = "sha256-bfY5FRPU7rEVN0o/nf39q8qFP7zgffoEX1iPXbZ22pw=";
   };
 
   x86_64-darwin = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.21.0/darwin/amd64/sysdig-cli-scanner";
-    hash = "sha256-CQVmeZK2+Ezba7v6FURh5DPCqDxXYR62O+xw4gAzj6M=";
+    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.0/darwin/amd64/sysdig-cli-scanner";
+    hash = "sha256-F5br4BJnB9yRWfpqEJgy79csjfYY/St1a/rPGXdvj6A=";
   };
 
   aarch64-darwin = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.21.0/darwin/arm64/sysdig-cli-scanner";
-    hash = "sha256-F/FBkqsS7RCVktxwHJhiP7uS5XAW53BJjlRsLQ4DWAc=";
+    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.0/darwin/arm64/sysdig-cli-scanner";
+    hash = "sha256-CsMZ8m9eJNcOxq77IVLuW1COOa2+mABoMGJ+xk/NARI=";
   };
 }
diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix
index 7b9bb10ba3da..10db36bc3bba 100644
--- a/pkgs/by-name/te/terragrunt/package.nix
+++ b/pkgs/by-name/te/terragrunt/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "terragrunt";
-  version = "0.76.6";
+  version = "0.77.7";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-xhJUkjdMkOI8E7HxazBfl05FF0XzwlFsEgW+WEv0EGg=";
+    hash = "sha256-LP6qy0IAO/vD4eDTX6bgUe5mpL3ao+R4wwVNjBsaXhI=";
   };
 
   nativeBuildInputs = [
@@ -26,7 +26,7 @@ buildGoModule rec {
     make generate-mocks
   '';
 
-  vendorHash = "sha256-sPgA1LMbYMcrlN+4no3DhJ0TVMEnGEgGhQMy+g0nrtg=";
+  vendorHash = "sha256-dxpb3tzVBlsZM6kAEvCVWxXVsuh6fkfxz0GpArtAi7g=";
 
   doCheck = false;
 
diff --git a/pkgs/by-name/th/theforceengine/package.nix b/pkgs/by-name/th/theforceengine/package.nix
index 8f9cb7640bf4..ef3e677bc65b 100644
--- a/pkgs/by-name/th/theforceengine/package.nix
+++ b/pkgs/by-name/th/theforceengine/package.nix
@@ -22,13 +22,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "theforceengine";
-  version = "1.22.200";
+  version = "1.22.300";
 
   src = fetchFromGitHub {
     owner = "luciusDXL";
     repo = "TheForceEngine";
     rev = "v${version}";
-    hash = "sha256-Mvp9VrPk36wNTUwNQT83JPOEO72Xhqmhkn3/KfZhQX4=";
+    hash = "sha256-m/VNlcuvpJkcfTpL97gCUTQtdAWqimVrhU0qLj0Erck=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/tr/trunk/package.nix b/pkgs/by-name/tr/trunk/package.nix
index a264e838e575..df7650f46460 100644
--- a/pkgs/by-name/tr/trunk/package.nix
+++ b/pkgs/by-name/tr/trunk/package.nix
@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "trunk";
-  version = "0.21.9";
+  version = "0.21.12";
 
   src = fetchFromGitHub {
     owner = "trunk-rs";
     repo = "trunk";
     rev = "v${version}";
-    hash = "sha256-+HKEaXdGW3F5DCvyvQalr65+BZv+NA2r34MSvPwlhac=";
+    hash = "sha256-GFRNbrfI0sJ/GuvT924/gxmzbnf0s0QNf+Mpv1+5rbc=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ];
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-xaL7gF9gWRn0geKIUwksDovaIHMqfl57O9GvHOjgsic=";
+  cargoHash = "sha256-XQyHGavGUnWCTim2jC+kKKNYaWzwXg0slXxABSrKqJg=";
 
   meta = with lib; {
     homepage = "https://github.com/trunk-rs/trunk";
diff --git a/pkgs/by-name/up/upbound/sources-main.json b/pkgs/by-name/up/upbound/sources-main.json
index 23aba8c6550c..1b82f4122c09 100644
--- a/pkgs/by-name/up/upbound/sources-main.json
+++ b/pkgs/by-name/up/upbound/sources-main.json
@@ -8,38 +8,38 @@
   "fetchurlAttrSet": {
     "docker-credential-up": {
       "aarch64-darwin": {
-        "hash": "sha256-AYOZmdNaiGZLwvbyl6DaubWyXDqZcSbWP1/jJ3Idx6Q=",
-        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/docker-credential-up/darwin_arm64.tar.gz"
+        "hash": "sha256-UT2zZNvgRKhntFAYnGFxth3bdpSdeVa1BFVRFlz4KTk=",
+        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.301.gaa3d1f39/bundle/docker-credential-up/darwin_arm64.tar.gz"
       },
       "aarch64-linux": {
-        "hash": "sha256-r4chc5wMENvoEHtSIGw1fSys6ixZmg1WqfR+0ovdCDg=",
-        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/docker-credential-up/linux_arm64.tar.gz"
+        "hash": "sha256-KugJ8I6fpWLovBhfnnGBq+OgwGOi7VbWx+MhuwqEFKU=",
+        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.301.gaa3d1f39/bundle/docker-credential-up/linux_arm64.tar.gz"
       },
       "x86_64-darwin": {
-        "hash": "sha256-x4b3j1fyS3P5ouJTDovgJcZVaNzxvqiZn++p5d6WDRI=",
-        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/docker-credential-up/darwin_amd64.tar.gz"
+        "hash": "sha256-PCd4qBLAktUNlGWtfJyT2P2mzteyhbLODhaharEHyhs=",
+        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.301.gaa3d1f39/bundle/docker-credential-up/darwin_amd64.tar.gz"
       },
       "x86_64-linux": {
-        "hash": "sha256-uZPfsXNz3Z0cdBV9hJ4x7HPSXFVDiXqDf/NA1CMBa/M=",
-        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/docker-credential-up/linux_amd64.tar.gz"
+        "hash": "sha256-lBvQ+37tQqGLwbSihZlY4egzr+4GyoOYfGEyxSnP8cU=",
+        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.301.gaa3d1f39/bundle/docker-credential-up/linux_amd64.tar.gz"
       }
     },
     "up": {
       "aarch64-darwin": {
-        "hash": "sha256-CcJi11DZivlcelg6nKYUyWstTUqQ6r9EIt6dhWI3fbQ=",
-        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/up/darwin_arm64.tar.gz"
+        "hash": "sha256-Fw6ucwazCy3VSTJ4vCFRQthp33dpbznqOfUq2UVBQHE=",
+        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.301.gaa3d1f39/bundle/up/darwin_arm64.tar.gz"
       },
       "aarch64-linux": {
-        "hash": "sha256-QKdkDzoVzxbO677nl8tMoJA4/oqV4V8/h72HikOzxTc=",
-        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/up/linux_arm64.tar.gz"
+        "hash": "sha256-OEo0HvcsOH1hCz/cCMDoEhJO0mYKQd2gmFaHMztSvM8=",
+        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.301.gaa3d1f39/bundle/up/linux_arm64.tar.gz"
       },
       "x86_64-darwin": {
-        "hash": "sha256-xfvMty4OkVFG+UkIfOgD6ZOOXILbPGTjApKH0oJKsKY=",
-        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/up/darwin_amd64.tar.gz"
+        "hash": "sha256-S+hdh01O+lit/1AJz95mbZJugujRxwpxPlOjRpHAzj0=",
+        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.301.gaa3d1f39/bundle/up/darwin_amd64.tar.gz"
       },
       "x86_64-linux": {
-        "hash": "sha256-/5/+dPh6V/69RrqPj/0D4bECX2/2pqQJjo/dNgi/EgE=",
-        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.249.g7b07f31c/bundle/up/linux_amd64.tar.gz"
+        "hash": "sha256-l4Wz8Frj/3wmCKKwSy+jMklRJrw+Ca/YD6VApE5795k=",
+        "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.301.gaa3d1f39/bundle/up/linux_amd64.tar.gz"
       }
     }
   },
@@ -49,5 +49,5 @@
     "x86_64-darwin",
     "x86_64-linux"
   ],
-  "version": "0.39.0-0.rc.0.249.g7b07f31c"
+  "version": "0.39.0-0.rc.0.301.gaa3d1f39"
 }
diff --git a/pkgs/by-name/uu/uutils-findutils/package.nix b/pkgs/by-name/uu/uutils-findutils/package.nix
index d7af8dafed54..37d5c90713a7 100644
--- a/pkgs/by-name/uu/uutils-findutils/package.nix
+++ b/pkgs/by-name/uu/uutils-findutils/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uutils-findutils";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "uutils";
     repo = "findutils";
     tag = finalAttrs.version;
-    hash = "sha256-EEyrXG9jybtYoBvjiXTCNg6/1WPchEGJcldB6Gqgmdc=";
+    hash = "sha256-i+ryTF2hlZFbyFft/769c800FkzL26E4snUsxU79sKY=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-nZOa7O0S9ykFM9sH6aqlAPtv3hWKF/vAXZYNRnjcOj4=";
+  cargoHash = "sha256-gtaD2jqnGhoJGw9FAJefnU9BSGIODi/RrhTeB3MC69U=";
 
   postInstall = ''
     rm $out/bin/testing-commandline
diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix
index f721ece73b08..26015c781a43 100644
--- a/pkgs/by-name/ux/uxn/package.nix
+++ b/pkgs/by-name/ux/uxn/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "uxn";
-  version = "1.0-unstable-2025-03-14";
+  version = "1.0-unstable-2025-04-04";
 
   src = fetchFromSourcehut {
     owner = "~rabbits";
     repo = "uxn";
-    rev = "7bdf99afc4748ed5c1f1b356fdff488164111d1e";
-    hash = "sha256-OZo7e7M7MVkkT+SW13IOmQp6PyN6/LDqQ8fe+oc71i0=";
+    rev = "289a265c4186e84308d817f5b34086853d816fd4";
+    hash = "sha256-ctjZx9IvLPEIgX9o0ZLcOW//wbGDA3YjRxg+lMdaSHs=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/vo/voms/package.nix b/pkgs/by-name/vo/voms/package.nix
index b878e0b9d13b..2ecf704387a2 100644
--- a/pkgs/by-name/vo/voms/package.nix
+++ b/pkgs/by-name/vo/voms/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "voms";
-  version = "2.1.0";
+  version = "2.1.2";
 
   src = fetchFromGitHub {
     owner = "italiangrid";
     repo = "voms";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Xz9+NYaSZsVuoIbyuejVWmwEmsPmMVtBAD94/SXP8ag=";
+    hash = "sha256-ipNgx87M/NNvAaeUf30nUDmf4Q9k5zakkgMk4/1N6VM=";
   };
 
   passthru = {
diff --git a/pkgs/by-name/ya/yandex-cloud/sources.json b/pkgs/by-name/ya/yandex-cloud/sources.json
index 186f39fab5c9..112c735d5701 100644
--- a/pkgs/by-name/ya/yandex-cloud/sources.json
+++ b/pkgs/by-name/ya/yandex-cloud/sources.json
@@ -1,25 +1,25 @@
 {
-  "version": "0.145.0",
+  "version": "0.146.1",
   "binaries": {
     "aarch64-darwin": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.145.0/darwin/arm64/yc",
-      "hash": "sha256-TYceYoir13NUvvxwhAdLrVpiJ1DgYCq5bE/GS9eNJTo="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.146.1/darwin/arm64/yc",
+      "hash": "sha256-CB8TjVYK7BvfMxGa/i4/Nx/6CDVEO942yC+FvSGPVdQ="
     },
     "aarch64-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.145.0/linux/arm64/yc",
-      "hash": "sha256-7Y//gt9vLAubd/LPgbMafSEC/Qz9vXK6m3NSMysF1/Q="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.146.1/linux/arm64/yc",
+      "hash": "sha256-Lftf19hdhw/vulo3jwMxfoIWkGrKZIFh8GmslLXzUng="
     },
     "i686-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.145.0/linux/386/yc",
-      "hash": "sha256-ykLtSuAdMpR+c5gu3L5iO9AZlw4NrsV8TPGdkHsDQ/4="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.146.1/linux/386/yc",
+      "hash": "sha256-2RQHVU7uglR7FQDJQQ5KnFkNtVsMeO9RAH1g0OX28vQ="
     },
     "x86_64-darwin": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.145.0/darwin/amd64/yc",
-      "hash": "sha256-TlgK5RK6u94N/IsMEsL1+57cMx9d/MokLJrfXPpMEPk="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.146.1/darwin/amd64/yc",
+      "hash": "sha256-Qvp3HiHlg6ddReTFRSpc2MDQgnwcQohF1ugFhzWR0os="
     },
     "x86_64-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.145.0/linux/amd64/yc",
-      "hash": "sha256-bOY5908sOHjZN0L6aF/YXVHoS8r/W82nRg/2FFtjibI="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.146.1/linux/amd64/yc",
+      "hash": "sha256-yHl67bzX4HKcaaAH2dRNI6+bWfvM90Zkh/qkXC3Cw14="
     }
   }
 }
diff --git a/pkgs/by-name/ya/yarn-berry/package.nix b/pkgs/by-name/ya/yarn-berry/package.nix
index 641cba8f6e81..9fa497d53f60 100644
--- a/pkgs/by-name/ya/yarn-berry/package.nix
+++ b/pkgs/by-name/ya/yarn-berry/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "yarnpkg";
     repo = "berry";
-    rev = "@yarnpkg/cli/${finalAttrs.version}";
+    tag = "@yarnpkg/cli/${finalAttrs.version}";
     hash = "sha256-cNgR0t780/LJA+IIwycro/7AQjWa1tn00bh4ucPjVEc=";
   };
 
@@ -50,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = with lib; {
     homepage = "https://yarnpkg.com/";
+    changelog = "https://github.com/yarnpkg/berry/releases/tag/${finalAttrs.src.tag}";
     description = "Fast, reliable, and secure dependency management";
     license = licenses.bsd2;
     maintainers = with maintainers; [
diff --git a/pkgs/by-name/yo/youtrack/package.nix b/pkgs/by-name/yo/youtrack/package.nix
index 9f07c1468050..7e8c01d9db24 100644
--- a/pkgs/by-name/yo/youtrack/package.nix
+++ b/pkgs/by-name/yo/youtrack/package.nix
@@ -10,11 +10,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "youtrack";
-  version = "2025.1.66652";
+  version = "2025.1.67057";
 
   src = fetchzip {
     url = "https://download.jetbrains.com/charisma/youtrack-${finalAttrs.version}.zip";
-    hash = "sha256-2w/7NR2GPqP6tLvzU9xIO3OXzwqa06BzHWBnmMDFvbQ=";
+    hash = "sha256-IWzyVH21mW6KcCL4WbpeBTGs+P+RjeA2gm5uq1r94Jo=";
   };
 
   nativeBuildInputs = [ makeBinaryWrapper ];
diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index e19350031225..c25876740f15 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -98,7 +98,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
-  version = "0.179.4";
+  version = "0.180.2";
 
   outputs =
     [ "out" ]
@@ -110,7 +110,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pUspLaCO9sQX8R4bb3+rhHQ8aAwseWtfc0A7EmU51vk=";
+    hash = "sha256-4FwQxg3UUE0vFLsy+88Naal+YTCGfNMOtNhnG+W2HiU=";
   };
 
   patches = [
@@ -136,7 +136,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-sVQV5kpc0xoDBlQCd3jMvy9DzjkiRjpKTWMKZjXnQyI=";
+  cargoHash = "sha256-5Y4GH4AP4Ry73w2cUllVTLP3RulJ0cE8B+S//QpjdFc=";
 
   nativeBuildInputs =
     [
diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix
index c72f5ec607f9..84e1b76ad428 100644
--- a/pkgs/desktops/lxde/core/lxtask/default.nix
+++ b/pkgs/desktops/lxde/core/lxtask/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxtask";
-  version = "0.1.11";
+  version = "0.1.12";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = "lxtask";
     rev = version;
-    hash = "sha256-KPne7eWzOOSZjHlam3e6HifNk2Sx1vWnQYkXDFZGop0=";
+    hash = "sha256-BI50jV/17jGX91rcmg98+gkoy35oNpdSSaVDLyagbIc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix
index bdc332731296..3c193dbe7d03 100644
--- a/pkgs/development/interpreters/janet/default.nix
+++ b/pkgs/development/interpreters/janet/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "janet";
-  version = "1.37.1";
+  version = "1.38.0";
 
   src = fetchFromGitHub {
     owner = "janet-lang";
     repo = "janet";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-KwuBJY3SG5Ao/sFgjrp0pzEasdI7AAWrG49uHjVA1Rs=";
+    hash = "sha256-PLfBFsZqwSpE+3cduDXyRZZDpiL8+zHyIjVopK0oqPo=";
   };
 
   postPatch =
diff --git a/pkgs/development/libraries/astal/buildAstalModule.nix b/pkgs/development/libraries/astal/buildAstalModule.nix
index 4a3e148212d2..5ef28e83396b 100644
--- a/pkgs/development/libraries/astal/buildAstalModule.nix
+++ b/pkgs/development/libraries/astal/buildAstalModule.nix
@@ -39,7 +39,7 @@ let
       cleanArgs args
       // {
         pname = "astal-${name}";
-        version = "0-unstable-2025-03-17";
+        version = "0-unstable-2025-03-21";
 
         __structuredAttrs = true;
         strictDeps = true;
@@ -47,8 +47,8 @@ let
         src = fetchFromGitHub {
           owner = "Aylur";
           repo = "astal";
-          rev = "e5a8e3b60e41d06450284baf7008abe4ac27a53d";
-          hash = "sha256-8gWNDDVS7TqLiS+eR1XhfMHBeknmTzLQ3ItB40OK3p0=";
+          rev = "dc0e5d37abe9424c53dcbd2506a4886ffee6296e";
+          hash = "sha256-5WgfJAeBpxiKbTR/gJvxrGYfqQRge5aUDcGKmU1YZ1Q=";
         };
 
         sourceRoot = "${finalAttrs.src.name}/${sourceRoot}";
diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix
index 792f7506a8ec..c5e9bc24419f 100644
--- a/pkgs/development/libraries/quarto/default.nix
+++ b/pkgs/development/libraries/quarto/default.nix
@@ -19,11 +19,11 @@
 }:
 stdenv.mkDerivation (final: {
   pname = "quarto";
-  version = "1.6.42";
+  version = "1.6.43";
 
   src = fetchurl {
     url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz";
-    hash = "sha256-9mf1YfcfCWMZaYFlYyJN9WKlRHk8U2sq2ESb4mqz3sY=";
+    hash = "sha256-9cwGPduP0BN0fNtMb8lklK5FftJMuuPaqCFRN8vL+cI=";
   };
 
   patches = [
diff --git a/pkgs/development/libraries/tbb/2022_0.nix b/pkgs/development/libraries/tbb/2022_0.nix
index 86165afb2324..14231faf6068 100644
--- a/pkgs/development/libraries/tbb/2022_0.nix
+++ b/pkgs/development/libraries/tbb/2022_0.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   fetchpatch,
   cmake,
+  ninja,
 }:
 
 stdenv.mkDerivation rec {
@@ -24,6 +25,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
+    ninja
   ];
 
   patches = [
@@ -34,6 +36,11 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  cmakeFlags = [
+    # Skip tests to work around https://github.com/uxlfoundation/oneTBB/issues/1695
+    (lib.cmakeBool "TBB_TEST" (!stdenv.hostPlatform.isWindows))
+  ];
+
   # Fix build with modern gcc
   # In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]',
   NIX_CFLAGS_COMPILE =
@@ -61,6 +68,8 @@ stdenv.mkDerivation rec {
       --replace-fail 'tbb_add_test(SUBDIR conformance NAME conformance_resumable_tasks DEPENDENCIES TBB::tbb)' ""
   '';
 
+  enableParallelBuilding = true;
+
   meta = with lib; {
     description = "Intel Thread Building Blocks C++ Library";
     homepage = "http://threadingbuildingblocks.org/";
@@ -73,7 +82,7 @@ stdenv.mkDerivation rec {
       represents a higher-level, task-based parallelism that abstracts platform
       details and threading mechanisms for scalability and performance.
     '';
-    platforms = platforms.unix;
+    platforms = platforms.unix ++ platforms.windows;
     maintainers = with maintainers; [
       thoughtpolice
       tmarkus
diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix
index a27ff43e241f..05e18da04560 100644
--- a/pkgs/development/libraries/tbb/default.nix
+++ b/pkgs/development/libraries/tbb/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   fetchpatch,
   cmake,
+  ninja,
 }:
 
 stdenv.mkDerivation rec {
@@ -24,6 +25,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
+    ninja
   ];
 
   patches = [
@@ -32,6 +34,21 @@ stdenv.mkDerivation rec {
       url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/899.patch";
       hash = "sha256-kU6RRX+sde0NrQMKlNtW3jXav6J4QiVIUmD50asmBPU=";
     })
+    (fetchpatch {
+      name = "fix-tbb-mingw-compile.patch";
+      url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/1361.patch";
+      hash = "sha256-jVa4HQetZv0vImdv549MyTy6/8t9dy8m6YAmjPGNQ18=";
+    })
+    (fetchpatch {
+      name = "fix-tbb-mingw-link.patch";
+      url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/1193.patch";
+      hash = "sha256-ZQbwUmuIZoGVBof8QNR3V8vU385e2X7EvU3+Fbj4+M8=";
+    })
+  ];
+
+  cmakeFlags = [
+    # Skip tests to work around https://github.com/uxlfoundation/oneTBB/issues/1695
+    (lib.cmakeBool "TBB_TEST" (!stdenv.hostPlatform.isWindows))
   ];
 
   # Fix build with modern gcc
@@ -61,6 +78,8 @@ stdenv.mkDerivation rec {
       --replace-fail 'tbb_add_test(SUBDIR conformance NAME conformance_resumable_tasks DEPENDENCIES TBB::tbb)' ""
   '';
 
+  enableParallelBuilding = true;
+
   meta = with lib; {
     description = "Intel Thread Building Blocks C++ Library";
     homepage = "http://threadingbuildingblocks.org/";
@@ -73,7 +92,7 @@ stdenv.mkDerivation rec {
       represents a higher-level, task-based parallelism that abstracts platform
       details and threading mechanisms for scalability and performance.
     '';
-    platforms = platforms.unix;
+    platforms = platforms.unix ++ platforms.windows;
     maintainers = with maintainers; [
       thoughtpolice
       tmarkus
diff --git a/pkgs/development/php-packages/php-codesniffer/default.nix b/pkgs/development/php-packages/php-codesniffer/default.nix
index 3da3c55795e7..fe010ef8d790 100644
--- a/pkgs/development/php-packages/php-codesniffer/default.nix
+++ b/pkgs/development/php-packages/php-codesniffer/default.nix
@@ -11,7 +11,7 @@ php.buildComposerProject2 (finalAttrs: {
   src = fetchFromGitHub {
     owner = "PHPCSStandards";
     repo = "PHP_CodeSniffer";
-    tag = "${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-wlI/ylBeSkeg96sDwvDV9EedSLILFqsl96yWIOFtDQo=";
   };
 
diff --git a/pkgs/development/python-modules/pcbnewtransition/default.nix b/pkgs/development/python-modules/pcbnewtransition/default.nix
index f5a674d3763d..77d59c1851c8 100644
--- a/pkgs/development/python-modules/pcbnewtransition/default.nix
+++ b/pkgs/development/python-modules/pcbnewtransition/default.nix
@@ -8,15 +8,15 @@
 }:
 buildPythonPackage rec {
   pname = "pcbnewtransition";
-  version = "0.5.0";
+  version = "0.5.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    pname = "pcbnewTransition";
+    inherit pname;
     inherit version;
-    hash = "sha256-4XNcnQzUWpY0NEfS2bdtkedvG4lY79jaPe0QqTWNW6s=";
+    hash = "sha256-zLnvbu0G2mJKCHLCjbIKHBqSfdEyhR+1afkOFU++TfI=";
   };
 
   propagatedBuildInputs = [ kicad ];
diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix
index b6d71da5fdc7..8abe78c1ac54 100644
--- a/pkgs/development/python-modules/radish-bdd/default.nix
+++ b/pkgs/development/python-modules/radish-bdd/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "radish-bdd";
-  version = "0.18.1";
+  version = "0.18.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.10";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = "radish";
     tag = "v${version}";
-    hash = "sha256-VCxqhTr0vHJ14tm/0zw/v9bCOQ2q4rzHv40NVYwI254=";
+    hash = "sha256-SSrEKGs4q4rcnQM03/gc0/vEb7gmTmpfgeNp3e+Hyvg=";
   };
 
   propagatedBuildInputs = [
@@ -52,7 +52,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Behaviour-Driven-Development tool for python";
     homepage = "https://radish-bdd.github.io/";
-    changelog = "https://github.com/radish-bdd/radish/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/radish-bdd/radish/blob/${src.tag}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [
       kalbasit
diff --git a/pkgs/development/tools/electron/binary/update.py b/pkgs/development/tools/electron/binary/update.py
new file mode 100755
index 000000000000..2ebf3fbad047
--- /dev/null
+++ b/pkgs/development/tools/electron/binary/update.py
@@ -0,0 +1,216 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i python -p python3.pkgs.click python3.pkgs.click-log nix
+"""
+electron updater
+
+A script for updating binary hashes.
+
+It supports the following modes:
+
+| Mode         | Description                                     |
+|------------- | ----------------------------------------------- |
+| `update`     | for updating a specific Electron release        |
+| `update-all` | for updating all electron releases at once      |
+
+The `update` command requires a `--version` flag
+to specify the major release to be update.
+The `update-all` command updates all non-eol major releases.
+
+The `update` and `update-all` commands accept an optional `--commit`
+flag to automatically commit the changes for you.
+"""
+import logging
+import os
+import subprocess
+import sys
+import click
+import click_log
+
+from typing import Tuple
+os.chdir(os.path.dirname(__file__))
+sys.path.append("..")
+from update_util import *
+
+
+# Relatice path to the electron-bin info.json
+BINARY_INFO_JSON = "info.json"
+
+# Relative path the the electron-chromedriver info.json
+CHROMEDRIVER_INFO_JSON = "../chromedriver/info.json"
+
+logger = logging.getLogger(__name__)
+click_log.basic_config(logger)
+
+
+systems = {
+    "i686-linux": "linux-ia32",
+    "x86_64-linux": "linux-x64",
+    "armv7l-linux": "linux-armv7l",
+    "aarch64-linux": "linux-arm64",
+    "x86_64-darwin": "darwin-x64",
+    "aarch64-darwin": "darwin-arm64",
+}
+
+def get_shasums256(version: str) -> list:
+    """Returns the contents of SHASUMS256.txt"""
+    try:
+        called_process: subprocess.CompletedProcess = subprocess.run(
+            [
+                "nix-prefetch-url",
+                "--print-path",
+                f"https://github.com/electron/electron/releases/download/v{version}/SHASUMS256.txt",
+            ],
+            capture_output=True,
+            check=True,
+            text=True,
+        )
+
+        hash_file_path = called_process.stdout.split("\n")[1]
+
+        with open(hash_file_path, "r") as f:
+            return f.read().split("\n")
+
+    except subprocess.CalledProcessError as err:
+        print(err.stderr)
+        sys.exit(1)
+
+
+def get_headers(version: str) -> str:
+    """Returns the hash of the release headers tarball"""
+    try:
+        called_process: subprocess.CompletedProcess = subprocess.run(
+            [
+                "nix-prefetch-url",
+                f"https://artifacts.electronjs.org/headers/dist/v{version}/node-v{version}-headers.tar.gz",
+            ],
+            capture_output=True,
+            check=True,
+            text=True,
+        )
+        return called_process.stdout.split("\n")[0]
+    except subprocess.CalledProcessError as err:
+        print(err.stderr)
+        sys.exit(1)
+
+
+def get_electron_hashes(major_version: str) -> dict:
+    """Returns a dictionary of hashes for a given major version"""
+    m, _ = get_latest_version(major_version)
+    version: str = m["version"]
+
+    out = {}
+    out[major_version] = {
+        "hashes": {},
+        "version": version,
+    }
+
+    hashes: list = get_shasums256(version)
+
+    for nix_system, electron_system in systems.items():
+        filename = f"*electron-v{version}-{electron_system}.zip"
+        if any([x.endswith(filename) for x in hashes]):
+            out[major_version]["hashes"][nix_system] = [
+                x.split(" ")[0] for x in hashes if x.endswith(filename)
+            ][0]
+            out[major_version]["hashes"]["headers"] = get_headers(version)
+
+    return out
+
+
+def get_chromedriver_hashes(major_version: str) -> dict:
+    """Returns a dictionary of hashes for a given major version"""
+    m, _ = get_latest_version(major_version)
+    version: str = m["version"]
+
+    out = {}
+    out[major_version] = {
+        "hashes": {},
+        "version": version,
+    }
+
+    hashes: list = get_shasums256(version)
+
+    for nix_system, electron_system in systems.items():
+        filename = f"*chromedriver-v{version}-{electron_system}.zip"
+        if any([x.endswith(filename) for x in hashes]):
+            out[major_version]["hashes"][nix_system] = [
+                x.split(" ")[0] for x in hashes if x.endswith(filename)
+            ][0]
+            out[major_version]["hashes"]["headers"] = get_headers(version)
+
+    return out
+
+
+def update_binary(major_version: str, commit: bool, chromedriver: bool) -> None:
+    """Update a given electron-bin or chromedriver release
+
+    Args:
+        major_version: The major version number, e.g. '27'
+        commit: Whether the updater should commit the result
+    """
+    if chromedriver:
+        json_path=CHROMEDRIVER_INFO_JSON
+        package_name = f"electron-chromedriver_{major_version}"
+        update_fn=get_chromedriver_hashes
+    else:
+        json_path=BINARY_INFO_JSON
+        package_name = f"electron_{major_version}-bin"
+        update_fn = get_electron_hashes
+    print(f"Updating {package_name}")
+
+    old_info = load_info_json(json_path)
+    new_info = update_fn(major_version)
+
+    out = old_info | new_info
+
+    save_info_json(json_path, out)
+
+    old_version = (
+        old_info[major_version]["version"] if major_version in old_info else None
+    )
+    new_version = new_info[major_version]["version"]
+    if old_version == new_version:
+        print(f"{package_name} is up-to-date")
+    elif commit:
+        commit_result(package_name, old_version, new_version, json_path)
+
+
+@click.group()
+def cli() -> None:
+    """A script for updating electron-bin and chromedriver hashes"""
+    pass
+
+
+@cli.command("update-chromedriver", help="Update a single major release")
+@click.option("-v", "--version", help="The major version, e.g. '23'")
+@click.option("-c", "--commit", is_flag=True, default=False, help="Commit the result")
+def update_chromedriver(version: str, commit: bool) -> None:
+    update_binary(version, commit, True)
+
+
+@cli.command("update", help="Update a single major release")
+@click.option("-v", "--version", required=True, type=str, help="The major version, e.g. '23'")
+@click.option("-c", "--commit", is_flag=True, default=False, help="Commit the result")
+def update(version: str, commit: bool) -> None:
+    update_binary(version, commit, False)
+    update_binary(version, commit, True)
+
+
+@cli.command("update-all", help="Update all releases at once")
+@click.option("-c", "--commit", is_flag=True, default=False, help="Commit the result")
+def update_all(commit: bool) -> None:
+    # Filter out releases that have reached end-of-life
+    filtered_bin_info = dict(
+        filter(
+            lambda entry: int(entry[0]) in supported_version_range(),
+            load_info_json(BINARY_INFO_JSON).items(),
+        )
+    )
+
+    for major_version, _ in filtered_bin_info.items():
+        update_binary(str(major_version), commit, False)
+        update_binary(str(major_version), commit, True)
+
+
+if __name__ == "__main__":
+    cli()
diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix
index 55a60ced7e65..0a92ed74a765 100644
--- a/pkgs/development/tools/electron/common.nix
+++ b/pkgs/development/tools/electron/common.nix
@@ -17,19 +17,13 @@
   libpulseaudio,
   speechd-minimal,
   info,
+  gclient2nix,
 }:
 
 let
-  fetchdep =
-    dep:
-    let
-      opts = removeAttrs dep [ "fetcher" ];
-    in
-    pkgs.${dep.fetcher} opts;
-
-  fetchedDeps = lib.mapAttrs (name: fetchdep) info.deps;
-
+  gclientDeps = gclient2nix.importGclientDeps info.deps;
 in
+
 ((chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {
   packageName = "electron";
   inherit (info) version;
@@ -49,20 +43,24 @@ in
     fixup-yarn-lock
     unzip
     npmHooks.npmConfigHook
+    gclient2nix.gclientUnpackHook
   ];
   buildInputs = base.buildInputs ++ [ libnotify ];
 
   electronOfflineCache = fetchYarnDeps {
-    yarnLock = fetchedDeps."src/electron" + "/yarn.lock";
+    yarnLock = gclientDeps."src/electron".path + "/yarn.lock";
     sha256 = info.electron_yarn_hash;
   };
   npmDeps = fetchNpmDeps rec {
-    src = fetchedDeps."src";
+    src = gclientDeps."src".path;
     # Assume that the fetcher always unpack the source,
     # based on update.py
     sourceRoot = "${src.name}/third_party/node";
     hash = info.chromium_npm_hash;
   };
+  inherit gclientDeps;
+  unpackPhase = null; # prevent chromium's unpackPhase from being used
+  sourceRoot = "src";
 
   env =
     base.env
@@ -85,22 +83,6 @@ in
 
   patches = base.patches;
 
-  unpackPhase =
-    ''
-      runHook preUnpack
-    ''
-    + (lib.concatStrings (
-      lib.mapAttrsToList (path: dep: ''
-        mkdir -p ${builtins.dirOf path}
-        cp -r ${dep}/. ${path}
-        chmod u+w -R ${path}
-      '') fetchedDeps
-    ))
-    + ''
-      sourceRoot=src
-      runHook postUnpack
-    '';
-
   npmRoot = "third_party/node";
 
   postPatch =
@@ -121,14 +103,14 @@ in
       echo 'cros_boards_with_qemu_images = ""' >> build/config/gclient_args.gni
       echo 'generate_location_tags = true' >> build/config/gclient_args.gni
 
-      echo 'LASTCHANGE=${info.deps."src".rev}-refs/heads/master@{#0}'        > build/util/LASTCHANGE
-      echo "$SOURCE_DATE_EPOCH"                                              > build/util/LASTCHANGE.committime
+      echo 'LASTCHANGE=${info.deps."src".args.rev}-refs/heads/master@{#0}' > build/util/LASTCHANGE
+      echo "$SOURCE_DATE_EPOCH" > build/util/LASTCHANGE.committime
 
       cat << EOF > gpu/config/gpu_lists_version.h
       /* Generated by lastchange.py, do not edit.*/
       #ifndef GPU_CONFIG_GPU_LISTS_VERSION_H_
       #define GPU_CONFIG_GPU_LISTS_VERSION_H_
-      #define GPU_LISTS_VERSION "${info.deps."src".rev}"
+      #define GPU_LISTS_VERSION "${info.deps."src".args.rev}"
       #endif  // GPU_CONFIG_GPU_LISTS_VERSION_H_
       EOF
 
@@ -136,11 +118,11 @@ in
       /* Generated by lastchange.py, do not edit.*/
       #ifndef SKIA_EXT_SKIA_COMMIT_HASH_H_
       #define SKIA_EXT_SKIA_COMMIT_HASH_H_
-      #define SKIA_COMMIT_HASH "${info.deps."src/third_party/skia".rev}-"
+      #define SKIA_COMMIT_HASH "${info.deps."src/third_party/skia".args.rev}-"
       #endif  // SKIA_EXT_SKIA_COMMIT_HASH_H_
       EOF
 
-      echo -n '${info.deps."src/third_party/dawn".rev}'                     > gpu/webgpu/DAWN_VERSION
+      echo -n '${info.deps."src/third_party/dawn".args.rev}' > gpu/webgpu/DAWN_VERSION
 
       (
         cd electron
@@ -261,7 +243,7 @@ in
   requiredSystemFeatures = [ "big-parallel" ];
 
   passthru = {
-    inherit info fetchedDeps;
+    inherit info;
   };
 
   meta = with lib; {
diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 230d05651108..08673da08fec 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -15,936 +15,1244 @@
         "chromium_npm_hash": "sha256-4w5m/bTMygidlb4TZHMx1Obp784DLxMwrfe1Uvyyfp8=",
         "deps": {
             "src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-hJZWDT7D2YP75CQJwYNqnMTvLyMIF3wS2yJaRuUiOhY=",
-                "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": "130.0.6723.191",
-                "url": "https://chromium.googlesource.com/chromium/src.git"
+                "args": {
+                    "hash": "sha256-Vk3D3w8molUl0Gsg/LbgCktU2JQ3TzOhrwC/t2LuOy0=",
+                    "postFetch": "rm -r $out/third_party/blink/web_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": "130.0.6723.191",
+                    "url": "https://chromium.googlesource.com/chromium/src.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/chrome/test/data/perf/canvas_bench": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=",
-                "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732",
-                "url": "https://chromium.googlesource.com/chromium/canvas_bench.git"
+                "args": {
+                    "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=",
+                    "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732",
+                    "url": "https://chromium.googlesource.com/chromium/canvas_bench.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=",
+                    "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9",
+                    "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=",
+                    "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248",
+                    "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/docs/website": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-XK22S9WwNN4zQZ5teiQ1sZA5m/8rArwq3jCgM6H9KQY=",
-                "rev": "052e29447b43b18da32fff653b9d58ef79fbc836",
-                "url": "https://chromium.googlesource.com/website.git"
+                "args": {
+                    "hash": "sha256-XK22S9WwNN4zQZ5teiQ1sZA5m/8rArwq3jCgM6H9KQY=",
+                    "rev": "052e29447b43b18da32fff653b9d58ef79fbc836",
+                    "url": "https://chromium.googlesource.com/website.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/electron": {
-                "fetcher": "fetchFromGitHub",
-                "hash": "sha256-mvDHVVjrKoeg2E2ucAGTsjnMRDqcrqr3QlDoCmxHQJY=",
-                "owner": "electron",
-                "repo": "electron",
-                "rev": "v33.4.8"
+                "args": {
+                    "hash": "sha256-mvDHVVjrKoeg2E2ucAGTsjnMRDqcrqr3QlDoCmxHQJY=",
+                    "owner": "electron",
+                    "repo": "electron",
+                    "rev": "v33.4.8"
+                },
+                "fetcher": "fetchFromGitHub"
             },
             "src/media/cdm/api": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=",
-                "rev": "eb21edc44e8e5a82095037be80c8b15c51624293",
-                "url": "https://chromium.googlesource.com/chromium/cdm.git"
+                "args": {
+                    "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=",
+                    "rev": "eb21edc44e8e5a82095037be80c8b15c51624293",
+                    "url": "https://chromium.googlesource.com/chromium/cdm.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/net/third_party/quiche/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-NJKJ5cc+wEcmCIFYXWQX4x9BZblbS+wqj+25CcUiPZM=",
-                "rev": "9808dac40e034f09d7af53d3d79589a02e39c211",
-                "url": "https://quiche.googlesource.com/quiche.git"
+                "args": {
+                    "hash": "sha256-NJKJ5cc+wEcmCIFYXWQX4x9BZblbS+wqj+25CcUiPZM=",
+                    "rev": "9808dac40e034f09d7af53d3d79589a02e39c211",
+                    "url": "https://quiche.googlesource.com/quiche.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/testing/libfuzzer/fuzzers/wasm_corpus": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-qWsGQNUptbz0jYvUuxP7woNf5QQrfn9k3uvr82Yk0QM=",
-                "rev": "f650ff816f2ef227f61ea2e9f222aa69708ab367",
-                "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git"
+                "args": {
+                    "hash": "sha256-qWsGQNUptbz0jYvUuxP7woNf5QQrfn9k3uvr82Yk0QM=",
+                    "rev": "f650ff816f2ef227f61ea2e9f222aa69708ab367",
+                    "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-mzVgoxxBWebesG6okyMxxmO6oH+TITA4o9ucHHMMzkQ=",
+                    "rev": "4a764c690353ea136c82f1a696a70bf38d1ef5fe",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/Accessibility-Test-Framework-for-Android.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/angle": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-OtpF7+KQzk0MWhgBlNV1DheHywtBMDQIPhGUOss9Dtg=",
-                "rev": "fffbc739779a2df56a464fd6853bbfb24bebb5f6",
-                "url": "https://chromium.googlesource.com/angle/angle.git"
+                "args": {
+                    "hash": "sha256-OtpF7+KQzk0MWhgBlNV1DheHywtBMDQIPhGUOss9Dtg=",
+                    "rev": "fffbc739779a2df56a464fd6853bbfb24bebb5f6",
+                    "url": "https://chromium.googlesource.com/angle/angle.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/angle/third_party/VK-GL-CTS/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-yPQG/Ddat9H4XZq6Zu5S3VzcZeMhLBcM//KI/3Kxaxg=",
-                "rev": "1df39e522f4aa358012180fd4cf876af68aff78d",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS"
+                "args": {
+                    "hash": "sha256-yPQG/Ddat9H4XZq6Zu5S3VzcZeMhLBcM//KI/3Kxaxg=",
+                    "rev": "1df39e522f4aa358012180fd4cf876af68aff78d",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=",
+                    "rev": "ca8de51fedb70bace5351c6b002eb952c747e889",
+                    "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=",
+                    "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f",
+                    "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-PMB49+zW9ewlS9ym+xi0xYQYLN0j5Urx6yBXWd8FjjI=",
+                    "rev": "6ea6ec78f9e4998d0a7a5677b2aec08f0ac858f8",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/beto-core/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-QPFGjtu/I0r4+dTQ2eSlWIEYwJ43B3yW0q4QtVFTVGY=",
-                "rev": "89563fec14c756482afa08b016eeba9087c8d1e3",
-                "url": "https://beto-core.googlesource.com/beto-core.git"
+                "args": {
+                    "hash": "sha256-QPFGjtu/I0r4+dTQ2eSlWIEYwJ43B3yW0q4QtVFTVGY=",
+                    "rev": "89563fec14c756482afa08b016eeba9087c8d1e3",
+                    "url": "https://beto-core.googlesource.com/beto-core.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/boringssl/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-on+VonYXZ710oqgaK/OKa9Huq2mSXp8SJcj9CciHsf8=",
-                "rev": "58f3bc83230d2958bb9710bc910972c4f5d382dc",
-                "url": "https://boringssl.googlesource.com/boringssl.git"
+                "args": {
+                    "hash": "sha256-on+VonYXZ710oqgaK/OKa9Huq2mSXp8SJcj9CciHsf8=",
+                    "rev": "58f3bc83230d2958bb9710bc910972c4f5d382dc",
+                    "url": "https://boringssl.googlesource.com/boringssl.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/breakpad/breakpad": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-kTkwRfaqw5ZCHEvu2YPZ+1vCfekHkY5pY3m9snDN64g=",
-                "rev": "6b0c5b7ee1988a14a4af94564e8ae8bba8a94374",
-                "url": "https://chromium.googlesource.com/breakpad/breakpad.git"
+                "args": {
+                    "hash": "sha256-kTkwRfaqw5ZCHEvu2YPZ+1vCfekHkY5pY3m9snDN64g=",
+                    "rev": "6b0c5b7ee1988a14a4af94564e8ae8bba8a94374",
+                    "url": "https://chromium.googlesource.com/breakpad/breakpad.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/cast_core/public/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I=",
-                "rev": "71f51fd6fa45fac73848f65421081edd723297cd",
-                "url": "https://chromium.googlesource.com/cast_core/public"
+                "args": {
+                    "hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I=",
+                    "rev": "71f51fd6fa45fac73848f65421081edd723297cd",
+                    "url": "https://chromium.googlesource.com/cast_core/public"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/catapult": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-IHubCuEBE9W0wRudOmjUoaOvT66JuVTzEBUOTvdnXqQ=",
-                "rev": "296226a4a0067c8cffeb8831fb87526a8035f3cc",
-                "url": "https://chromium.googlesource.com/catapult.git"
+                "args": {
+                    "hash": "sha256-IHubCuEBE9W0wRudOmjUoaOvT66JuVTzEBUOTvdnXqQ=",
+                    "rev": "296226a4a0067c8cffeb8831fb87526a8035f3cc",
+                    "url": "https://chromium.googlesource.com/catapult.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=",
+                    "rev": "ba412eaaacd3186085babcd901679a48863c7dd5",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/chromium-variations": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-DR5rJdnDKunS/PHtVK1n4zk0MmK54LhlawZW74711LY=",
-                "rev": "6aa57f2c6b49402b55ec607c17bd7ee8946970b0",
-                "url": "https://chromium.googlesource.com/chromium-variations.git"
+                "args": {
+                    "hash": "sha256-DR5rJdnDKunS/PHtVK1n4zk0MmK54LhlawZW74711LY=",
+                    "rev": "6aa57f2c6b49402b55ec607c17bd7ee8946970b0",
+                    "url": "https://chromium.googlesource.com/chromium-variations.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-whD8isX2ZhLrFzdxHhFP1S/sZDRgyrzLFaVd7OEFqYo=",
+                    "rev": "3c0acd2d4e73dd911309d9e970ba09d58bf23a62",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=",
+                    "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/colorama/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=",
-                "rev": "3de9f013df4b470069d03d250224062e8cf15c49",
-                "url": "https://chromium.googlesource.com/external/colorama.git"
+                "args": {
+                    "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=",
+                    "rev": "3de9f013df4b470069d03d250224062e8cf15c49",
+                    "url": "https://chromium.googlesource.com/external/colorama.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=",
+                    "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc",
+                    "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=",
+                    "rev": "936b9ab5515dead115606559502e3864958f7f6e",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/cpuinfo/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-UKy9TIiO/UJ5w+qLRlMd085CX2qtdVH2W3rtxB5r6MY=",
-                "rev": "ca678952a9a8eaa6de112d154e8e104b22f9ab3f",
-                "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git"
+                "args": {
+                    "hash": "sha256-UKy9TIiO/UJ5w+qLRlMd085CX2qtdVH2W3rtxB5r6MY=",
+                    "rev": "ca678952a9a8eaa6de112d154e8e104b22f9ab3f",
+                    "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/crabbyavif/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-9ooMkYOHRYbV2kdxu8VWUNgBeBsrN4kWUb8cZJwZfiU=",
-                "rev": "adfb834d76c6a064f28bb3a694689fc14a42425e",
-                "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git"
+                "args": {
+                    "hash": "sha256-9ooMkYOHRYbV2kdxu8VWUNgBeBsrN4kWUb8cZJwZfiU=",
+                    "rev": "adfb834d76c6a064f28bb3a694689fc14a42425e",
+                    "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-KBraGaO5LmmPP+p8RuDogGldbTWdNDK+WzF4Q09keuE=",
+                    "rev": "d3d60ac6e0f16780bcfcc825385e1d338801a558",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/cros-components/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-gEhAwW6u8VgBRFmAddRBlosbf/a9lhRLgs70Dvh1zos=",
-                "rev": "08a6ca6559c8d07c79fb5576a44e016e3126c221",
-                "url": "https://chromium.googlesource.com/external/google3/cros_components.git"
+                "args": {
+                    "hash": "sha256-gEhAwW6u8VgBRFmAddRBlosbf/a9lhRLgs70Dvh1zos=",
+                    "rev": "08a6ca6559c8d07c79fb5576a44e016e3126c221",
+                    "url": "https://chromium.googlesource.com/external/google3/cros_components.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/cros_system_api": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-9rM9m6VRX7B+h9JiICN5O9rBYdQEHNlCUnQMuaTy/1s=",
-                "rev": "2f88f9c4581a9c854604fa23516de8c9c13b227b",
-                "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git"
+                "args": {
+                    "hash": "sha256-9rM9m6VRX7B+h9JiICN5O9rBYdQEHNlCUnQMuaTy/1s=",
+                    "rev": "2f88f9c4581a9c854604fa23516de8c9c13b227b",
+                    "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/crossbench": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-7IuhXuxXD3xBkgazg3B9GZknlNv8Xi0eTHkeQv63ayk=",
-                "rev": "2b812597dd143dbdc560ff2f28d5f8d3adc700d4",
-                "url": "https://chromium.googlesource.com/crossbench.git"
+                "args": {
+                    "hash": "sha256-7IuhXuxXD3xBkgazg3B9GZknlNv8Xi0eTHkeQv63ayk=",
+                    "rev": "2b812597dd143dbdc560ff2f28d5f8d3adc700d4",
+                    "url": "https://chromium.googlesource.com/crossbench.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/dav1d/libdav1d": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-qJSUt8gMFB+IhOnEAw3t6nj1y7XUY91pLQBF8CeYtas=",
-                "rev": "6b3c489a2ee2c030f351f21987c27611b4cbe725",
-                "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git"
+                "args": {
+                    "hash": "sha256-qJSUt8gMFB+IhOnEAw3t6nj1y7XUY91pLQBF8CeYtas=",
+                    "rev": "6b3c489a2ee2c030f351f21987c27611b4cbe725",
+                    "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/dawn": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-T3uqU4eTYDFPrDkUCro/RjNUwCEoFUu6n+wzmkYgO1U=",
-                "rev": "f1041a163d06fb86b082e29260ab53a4637b0e98",
-                "url": "https://dawn.googlesource.com/dawn.git"
+                "args": {
+                    "hash": "sha256-T3uqU4eTYDFPrDkUCro/RjNUwCEoFUu6n+wzmkYgO1U=",
+                    "rev": "f1041a163d06fb86b082e29260ab53a4637b0e98",
+                    "url": "https://dawn.googlesource.com/dawn.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/dawn/third_party/dxc": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-CrR08tw9e+4U+fa6E9xoP/4puPNHEjLrxtSju8psLlk=",
-                "rev": "05334a70d3e5355fc86c94bb4e3cfe1c31a65999",
-                "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler"
+                "args": {
+                    "hash": "sha256-CrR08tw9e+4U+fa6E9xoP/4puPNHEjLrxtSju8psLlk=",
+                    "rev": "05334a70d3e5355fc86c94bb4e3cfe1c31a65999",
+                    "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=",
+                    "rev": "980971e835876dc0cde415e8f9bc646e64667bf7",
+                    "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-E1zXIDiw87badrLOZTvV+Wh9NZHu51nb70ZK9vlAlqE=",
+                    "rev": "b35641f4a3c62aa86a0b3c983d163bc0fe36026d",
+                    "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=",
+                    "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=",
+                    "rev": "5bae8738b23d06968e7c3a41308568120943ae77",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/dawn/third_party/webgpu-cts": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-heIL8hhaVr0uRi2lD+7RFltggVFW48ZY9Tdl0yVRdac=",
-                "rev": "a5065e398d2430c83e17ef9cbad6eae31d1efa8f",
-                "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts"
+                "args": {
+                    "hash": "sha256-heIL8hhaVr0uRi2lD+7RFltggVFW48ZY9Tdl0yVRdac=",
+                    "rev": "a5065e398d2430c83e17ef9cbad6eae31d1efa8f",
+                    "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-J3PcwYoO79HqrACFgk77BZLTCi7oi5k2J6v3wlcFVD4=",
+                    "rev": "8049c324dc7b3c09dc96ea04cb02860f272c8686",
+                    "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/depot_tools": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-C8U5BFLBCorwHvfKvh1xmAzOaDcBAbe3GhwJebENZD4=",
-                "rev": "22df6f8e622dc3e8df8dc8b5d3e3503b169af78e",
-                "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
+                "args": {
+                    "hash": "sha256-C8U5BFLBCorwHvfKvh1xmAzOaDcBAbe3GhwJebENZD4=",
+                    "rev": "22df6f8e622dc3e8df8dc8b5d3e3503b169af78e",
+                    "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/devtools-frontend/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-gRc2ei5m7a5KVKEMIivPGy1IQqDIaJxUJHLd5k2F+GQ=",
-                "rev": "deee9c11c9f76ef595b7d0b52fcf677d25aac5f2",
-                "url": "https://chromium.googlesource.com/devtools/devtools-frontend"
+                "args": {
+                    "hash": "sha256-gRc2ei5m7a5KVKEMIivPGy1IQqDIaJxUJHLd5k2F+GQ=",
+                    "rev": "deee9c11c9f76ef595b7d0b52fcf677d25aac5f2",
+                    "url": "https://chromium.googlesource.com/devtools/devtools-frontend"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=",
+                    "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d",
+                    "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-fYxoA0fxKe9U23j+Jp0MWj4m7RfsRpM0XjF6/yOhX1I=",
+                    "rev": "053714bccbda79cf76dac3fee48ab2b27f21925e",
+                    "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/eigen3/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-U4SMReXTFZg7YGyefI6MXIB66nt5OiANMH0HUyr/xIc=",
-                "rev": "134b526d6110061469168e7e0511822a8e30bcaf",
-                "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git"
+                "args": {
+                    "hash": "sha256-U4SMReXTFZg7YGyefI6MXIB66nt5OiANMH0HUyr/xIc=",
+                    "rev": "134b526d6110061469168e7e0511822a8e30bcaf",
+                    "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/electron_node": {
-                "fetcher": "fetchFromGitHub",
-                "hash": "sha256-ta9gw6A0aYguKYNRBW2nSPC3UTU5/7GNUPS02yyByis=",
-                "owner": "nodejs",
-                "repo": "node",
-                "rev": "v20.18.3"
+                "args": {
+                    "hash": "sha256-ta9gw6A0aYguKYNRBW2nSPC3UTU5/7GNUPS02yyByis=",
+                    "owner": "nodejs",
+                    "repo": "node",
+                    "rev": "v20.18.3"
+                },
+                "fetcher": "fetchFromGitHub"
             },
             "src/third_party/emoji-segmenter/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-sI6UgXTWxXJajB2h2LH3caf7cqRbBshD5GoLocrUivk=",
-                "rev": "6b8f235b72deba7d6ef113631129b274c14941ef",
-                "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git"
+                "args": {
+                    "hash": "sha256-sI6UgXTWxXJajB2h2LH3caf7cqRbBshD5GoLocrUivk=",
+                    "rev": "6b8f235b72deba7d6ef113631129b274c14941ef",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/engflow-reclient-configs": {
-                "fetcher": "fetchFromGitHub",
-                "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=",
-                "owner": "EngFlow",
-                "repo": "reclient-configs",
-                "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d"
+                "args": {
+                    "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=",
+                    "owner": "EngFlow",
+                    "repo": "reclient-configs",
+                    "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d"
+                },
+                "fetcher": "fetchFromGitHub"
             },
             "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"
+                "args": {
+                    "hash": "sha256-Iwu9+i/0vsPyu6pOWFxjNNblVxMl6bTPW5eWyaju4Mg=",
+                    "rev": "624da0f593bb8d7e146b9f42b06d8e6c80d032a3",
+                    "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=",
+                    "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-0eVovauN7SnO3nSIWBRWAJ4dR7q5beZrIGUZ18M2pao=",
+                    "rev": "3e57d8dcfb0a04b5a8a26b486b54490a2e9b310f",
+                    "url": "https://chromium.googlesource.com/external/github.com/fastfloat/fast_float.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/ffmpeg": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-HnpWlSfXxa951UkFgL/2zKoaBeveuVkTZz/iqYXjkH8=",
-                "rev": "91903c28af60a732a051c343b496e1188eec9b05",
-                "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git"
+                "args": {
+                    "hash": "sha256-HnpWlSfXxa951UkFgL/2zKoaBeveuVkTZz/iqYXjkH8=",
+                    "rev": "91903c28af60a732a051c343b496e1188eec9b05",
+                    "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/flac": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=",
-                "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c",
-                "url": "https://chromium.googlesource.com/chromium/deps/flac.git"
+                "args": {
+                    "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=",
+                    "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c",
+                    "url": "https://chromium.googlesource.com/chromium/deps/flac.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/flatbuffers/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-tbc45o0MbMvK5XqRUJt5Eg8BU6+TJqlmwFgQhHq6wRM=",
-                "rev": "8db59321d9f02cdffa30126654059c7d02f70c32",
-                "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git"
+                "args": {
+                    "hash": "sha256-tbc45o0MbMvK5XqRUJt5Eg8BU6+TJqlmwFgQhHq6wRM=",
+                    "rev": "8db59321d9f02cdffa30126654059c7d02f70c32",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/fontconfig/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-W5WIgC6A52kY4fNkbsDEa0o+dfd97Rl5NKfgnIRpI00=",
-                "rev": "14d466b30a8ab4a9d789977ed94f2c30e7209267",
-                "url": "https://chromium.googlesource.com/external/fontconfig.git"
+                "args": {
+                    "hash": "sha256-W5WIgC6A52kY4fNkbsDEa0o+dfd97Rl5NKfgnIRpI00=",
+                    "rev": "14d466b30a8ab4a9d789977ed94f2c30e7209267",
+                    "url": "https://chromium.googlesource.com/external/fontconfig.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/fp16/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=",
-                "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91",
-                "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git"
+                "args": {
+                    "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=",
+                    "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91",
+                    "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=",
+                    "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f",
+                    "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/freetype/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-w5Zd4yvGoMQ0BmDGa2b9gK/+7f+UaZDRYqEdMGH/zKg=",
-                "rev": "83af801b552111e37d9466a887e1783a0fb5f196",
-                "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git"
+                "args": {
+                    "hash": "sha256-w5Zd4yvGoMQ0BmDGa2b9gK/+7f+UaZDRYqEdMGH/zKg=",
+                    "rev": "83af801b552111e37d9466a887e1783a0fb5f196",
+                    "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/fuzztest/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-g+iJrywURQfdYpco26VN+OlhZkVcFzmAK18C7W7/WLU=",
-                "rev": "a29e31cb00ec9b123dec5a0c6b8d4bc12c2480c8",
-                "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git"
+                "args": {
+                    "hash": "sha256-g+iJrywURQfdYpco26VN+OlhZkVcFzmAK18C7W7/WLU=",
+                    "rev": "a29e31cb00ec9b123dec5a0c6b8d4bc12c2480c8",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/fxdiv/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=",
-                "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8",
-                "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git"
+                "args": {
+                    "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=",
+                    "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8",
+                    "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/gemmlowp/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=",
-                "rev": "13d57703abca3005d97b19df1f2db731607a7dc2",
-                "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git"
+                "args": {
+                    "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=",
+                    "rev": "13d57703abca3005d97b19df1f2db731607a7dc2",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/glslang/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-6lVjQb8FOyGmRGEcNDzL55s/9bcDY3jIz4Xm3BK3GoI=",
-                "rev": "dc1012140e015d43711514d1294ac6f626890a40",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang"
+                "args": {
+                    "hash": "sha256-6lVjQb8FOyGmRGEcNDzL55s/9bcDY3jIz4Xm3BK3GoI=",
+                    "rev": "dc1012140e015d43711514d1294ac6f626890a40",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/google_benchmark/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-gztnxui9Fe/FTieMjdvfJjWHjkImtlsHn6fM1FruyME=",
-                "rev": "344117638c8ff7e239044fd0fa7085839fc03021",
-                "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git"
+                "args": {
+                    "hash": "sha256-gztnxui9Fe/FTieMjdvfJjWHjkImtlsHn6fM1FruyME=",
+                    "rev": "344117638c8ff7e239044fd0fa7085839fc03021",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/googletest/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-jccFUondvjWgCBC3oCLUXqtLV07pkEq8IEZ+FLu1MrE=",
-                "rev": "0953a17a4281fc26831da647ad3fcd5e21e6473b",
-                "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git"
+                "args": {
+                    "hash": "sha256-jccFUondvjWgCBC3oCLUXqtLV07pkEq8IEZ+FLu1MrE=",
+                    "rev": "0953a17a4281fc26831da647ad3fcd5e21e6473b",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=",
+                    "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737",
+                    "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-iR49rfGDKxPObCff1/30hYHpP5FpZ28ROgMZhNk9eFY=",
+                    "rev": "1da053e87f0487382404656edca98b85fe51f2fd",
+                    "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/highway/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-PXsXIqWB4NNiFhanRjMIFSWYuW/IRuQo8mMPUBEentY=",
-                "rev": "8295336dd70f1201d42c22ab5b0861de38cf8fbf",
-                "url": "https://chromium.googlesource.com/external/github.com/google/highway.git"
+                "args": {
+                    "hash": "sha256-PXsXIqWB4NNiFhanRjMIFSWYuW/IRuQo8mMPUBEentY=",
+                    "rev": "8295336dd70f1201d42c22ab5b0861de38cf8fbf",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/highway.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/hunspell_dictionaries": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=",
-                "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e",
-                "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git"
+                "args": {
+                    "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=",
+                    "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e",
+                    "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/icu": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-YlX+PaPhvYh9JzHT9WtS1beUK+cQrHGVUl+IBbv7GeQ=",
-                "rev": "9408c6fd4a39e6fef0e1c4077602e1c83b15f3fb",
-                "url": "https://chromium.googlesource.com/chromium/deps/icu.git"
+                "args": {
+                    "hash": "sha256-YlX+PaPhvYh9JzHT9WtS1beUK+cQrHGVUl+IBbv7GeQ=",
+                    "rev": "9408c6fd4a39e6fef0e1c4077602e1c83b15f3fb",
+                    "url": "https://chromium.googlesource.com/chromium/deps/icu.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/instrumented_libs": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-kHKGADAgzlaeckXFbpU1GhJK+zkiRd9XvdtPF6qrQFY=",
-                "rev": "bb6dbcf2df7a9beb34c3773ef4df161800e3aed9",
-                "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git"
+                "args": {
+                    "hash": "sha256-kHKGADAgzlaeckXFbpU1GhJK+zkiRd9XvdtPF6qrQFY=",
+                    "rev": "bb6dbcf2df7a9beb34c3773ef4df161800e3aed9",
+                    "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=",
+                    "rev": "42e892d96e47b1f6e29844cc705e148ec4856448",
+                    "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/leveldatabase/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-y3awFXL8ih2UhEqWj8JRgkhzSxfQciLztb020JHJ350=",
-                "rev": "23e35d792b9154f922b8b575b12596a4d8664c65",
-                "url": "https://chromium.googlesource.com/external/leveldb.git"
+                "args": {
+                    "hash": "sha256-y3awFXL8ih2UhEqWj8JRgkhzSxfQciLztb020JHJ350=",
+                    "rev": "23e35d792b9154f922b8b575b12596a4d8664c65",
+                    "url": "https://chromium.googlesource.com/external/leveldb.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libFuzzer/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-xQXfRIcQmAVP0k2mT7Blv1wBxL6wDaWTbIPGcTiMZRo=",
-                "rev": "487e79376394754705984c5de7c4ce7f82f2bd7c",
-                "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git"
+                "args": {
+                    "hash": "sha256-xQXfRIcQmAVP0k2mT7Blv1wBxL6wDaWTbIPGcTiMZRo=",
+                    "rev": "487e79376394754705984c5de7c4ce7f82f2bd7c",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libaddressinput/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=",
-                "rev": "e8712e415627f22d0b00ebee8db99547077f39bd",
-                "url": "https://chromium.googlesource.com/external/libaddressinput.git"
+                "args": {
+                    "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=",
+                    "rev": "e8712e415627f22d0b00ebee8db99547077f39bd",
+                    "url": "https://chromium.googlesource.com/external/libaddressinput.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libaom/source/libaom": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-uFUIodoC9qpLycwtWRgc0iqaqcUsvVmwAAQGHKolWto=",
-                "rev": "d5265b173616ce62de231cd1b1eae853ad03641e",
-                "url": "https://aomedia.googlesource.com/aom.git"
+                "args": {
+                    "hash": "sha256-uFUIodoC9qpLycwtWRgc0iqaqcUsvVmwAAQGHKolWto=",
+                    "rev": "d5265b173616ce62de231cd1b1eae853ad03641e",
+                    "url": "https://aomedia.googlesource.com/aom.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libavif/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-2GKqPgWs1TD0nPW7VoSo8dz3ugPsZhcy2K1V35XflSk=",
-                "rev": "c2177c3316a49505dcd592ba21073f7abc25cd37",
-                "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git"
+                "args": {
+                    "hash": "sha256-2GKqPgWs1TD0nPW7VoSo8dz3ugPsZhcy2K1V35XflSk=",
+                    "rev": "c2177c3316a49505dcd592ba21073f7abc25cd37",
+                    "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libavifinfo/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-61OPjdMCIbHvWncmBzNw6sqlHcuc1kyqm9k1j4UTcZ0=",
-                "rev": "8d8b58a3f517ef8d1794baa28ca6ae7d19f65514",
-                "url": "https://aomedia.googlesource.com/libavifinfo.git"
+                "args": {
+                    "hash": "sha256-61OPjdMCIbHvWncmBzNw6sqlHcuc1kyqm9k1j4UTcZ0=",
+                    "rev": "8d8b58a3f517ef8d1794baa28ca6ae7d19f65514",
+                    "url": "https://aomedia.googlesource.com/libavifinfo.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libc++/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-hKlmY2Bn1f6w0Gmx/Le/LwWk/Gf6hzXqR5C+/w+0CNA=",
-                "rev": "50ab693ecb611942ce4440d8c9ed707ee65ed5e8",
-                "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git"
+                "args": {
+                    "hash": "sha256-hKlmY2Bn1f6w0Gmx/Le/LwWk/Gf6hzXqR5C+/w+0CNA=",
+                    "rev": "50ab693ecb611942ce4440d8c9ed707ee65ed5e8",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libc++abi/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-GtK8z2jn4es3uuxpAgm5AoQvUjvhAunAyUwm3HEqLVA=",
-                "rev": "29b2e9a0f48688da116692cb04758393053d269c",
-                "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git"
+                "args": {
+                    "hash": "sha256-GtK8z2jn4es3uuxpAgm5AoQvUjvhAunAyUwm3HEqLVA=",
+                    "rev": "29b2e9a0f48688da116692cb04758393053d269c",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libdrm/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-woSYEDUfcEBpYOYnli13wLMt754A7KnUbmTEcFQdFGw=",
-                "rev": "ad78bb591d02162d3b90890aa4d0a238b2a37cde",
-                "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git"
+                "args": {
+                    "hash": "sha256-woSYEDUfcEBpYOYnli13wLMt754A7KnUbmTEcFQdFGw=",
+                    "rev": "ad78bb591d02162d3b90890aa4d0a238b2a37cde",
+                    "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libgav1/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-+ss9S5t+yoHzqbtX68+5OyyUbJVecYLwp+C3EXfAziE=",
-                "rev": "a2f139e9123bdb5edf7707ac6f1b73b3aa5038dd",
-                "url": "https://chromium.googlesource.com/codecs/libgav1.git"
+                "args": {
+                    "hash": "sha256-+ss9S5t+yoHzqbtX68+5OyyUbJVecYLwp+C3EXfAziE=",
+                    "rev": "a2f139e9123bdb5edf7707ac6f1b73b3aa5038dd",
+                    "url": "https://chromium.googlesource.com/codecs/libgav1.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libipp/libipp": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=",
-                "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f",
-                "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git"
+                "args": {
+                    "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=",
+                    "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f",
+                    "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libjpeg_turbo": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-qgHXAjCDFxQ+QqJ8pSmI1NUvHvKKTi4MkIe1I/+hUAI=",
-                "rev": "927aabfcd26897abb9776ecf2a6c38ea5bb52ab6",
-                "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git"
+                "args": {
+                    "hash": "sha256-qgHXAjCDFxQ+QqJ8pSmI1NUvHvKKTi4MkIe1I/+hUAI=",
+                    "rev": "927aabfcd26897abb9776ecf2a6c38ea5bb52ab6",
+                    "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/liblouis/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=",
-                "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376",
-                "url": "https://chromium.googlesource.com/external/liblouis-github.git"
+                "args": {
+                    "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=",
+                    "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376",
+                    "url": "https://chromium.googlesource.com/external/liblouis-github.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libphonenumber/dist": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=",
-                "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362",
-                "url": "https://chromium.googlesource.com/external/libphonenumber.git"
+                "args": {
+                    "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=",
+                    "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362",
+                    "url": "https://chromium.googlesource.com/external/libphonenumber.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=",
+                    "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libsrtp": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-4qEZ9MD97MoqCUlZtbEhIKy+fDO1iIWqyrBsKwkjXTg=",
-                "rev": "000edd791434c8738455f10e0dd6b268a4852c0b",
-                "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git"
+                "args": {
+                    "hash": "sha256-4qEZ9MD97MoqCUlZtbEhIKy+fDO1iIWqyrBsKwkjXTg=",
+                    "rev": "000edd791434c8738455f10e0dd6b268a4852c0b",
+                    "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libsync/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=",
-                "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6",
-                "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git"
+                "args": {
+                    "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=",
+                    "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6",
+                    "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libunwind/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-5xsrVVSu9b+78GEKeLGNpo7ySxrJ2SeuuKghN6NHlSU=",
-                "rev": "dc70138c3e68e2f946585f134e20815851e26263",
-                "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git"
+                "args": {
+                    "hash": "sha256-5xsrVVSu9b+78GEKeLGNpo7ySxrJ2SeuuKghN6NHlSU=",
+                    "rev": "dc70138c3e68e2f946585f134e20815851e26263",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libvpx/source/libvpx": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-fXEPPgUdTsvzbLc8mp7v0MWw/9FfOooIIKjRshvYi2o=",
-                "rev": "fbf63dff1f528d44f24bd662abb89fd01a4a1c25",
-                "url": "https://chromium.googlesource.com/webm/libvpx.git"
+                "args": {
+                    "hash": "sha256-fXEPPgUdTsvzbLc8mp7v0MWw/9FfOooIIKjRshvYi2o=",
+                    "rev": "fbf63dff1f528d44f24bd662abb89fd01a4a1c25",
+                    "url": "https://chromium.googlesource.com/webm/libvpx.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libwebm/source": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-Mn3snC2g4BDKBJsS6cxT3BZL7LZknOWg77+60Nr4Hy0=",
-                "rev": "26d9f667170dc75e8d759a997bb61c64dec42dda",
-                "url": "https://chromium.googlesource.com/webm/libwebm.git"
+                "args": {
+                    "hash": "sha256-Mn3snC2g4BDKBJsS6cxT3BZL7LZknOWg77+60Nr4Hy0=",
+                    "rev": "26d9f667170dc75e8d759a997bb61c64dec42dda",
+                    "url": "https://chromium.googlesource.com/webm/libwebm.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libwebp/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-xuRpEwOnaLGZmrPvfUn3DSoJANd94CG+JXcN7Mdmk5I=",
-                "rev": "845d5476a866141ba35ac133f856fa62f0b7445f",
-                "url": "https://chromium.googlesource.com/webm/libwebp.git"
+                "args": {
+                    "hash": "sha256-xuRpEwOnaLGZmrPvfUn3DSoJANd94CG+JXcN7Mdmk5I=",
+                    "rev": "845d5476a866141ba35ac133f856fa62f0b7445f",
+                    "url": "https://chromium.googlesource.com/webm/libwebp.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libyuv": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-tQ7eCY1udoGHRoFr83obQ994IMfxqaH68StvXJ6obZ8=",
-                "rev": "4620f1705822fd6ab99939f43ce63099bd3d9ae0",
-                "url": "https://chromium.googlesource.com/libyuv/libyuv.git"
+                "args": {
+                    "hash": "sha256-tQ7eCY1udoGHRoFr83obQ994IMfxqaH68StvXJ6obZ8=",
+                    "rev": "4620f1705822fd6ab99939f43ce63099bd3d9ae0",
+                    "url": "https://chromium.googlesource.com/libyuv/libyuv.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/lss": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=",
-                "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521",
-                "url": "https://chromium.googlesource.com/linux-syscall-support.git"
+                "args": {
+                    "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=",
+                    "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521",
+                    "url": "https://chromium.googlesource.com/linux-syscall-support.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-Y85XU+z9W6tvmDNHJ/dXQnUKXvvDkO3nH/kUJRLqbc4=",
+                    "rev": "13434b50dcb64a482cc91191f8cf6151d90f5465",
+                    "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/minigbm/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=",
-                "rev": "3018207f4d89395cc271278fb9a6558b660885f5",
-                "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git"
+                "args": {
+                    "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=",
+                    "rev": "3018207f4d89395cc271278fb9a6558b660885f5",
+                    "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/nan": {
-                "fetcher": "fetchFromGitHub",
-                "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=",
-                "owner": "nodejs",
-                "repo": "nan",
-                "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213"
+                "args": {
+                    "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=",
+                    "owner": "nodejs",
+                    "repo": "nan",
+                    "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213"
+                },
+                "fetcher": "fetchFromGitHub"
             },
             "src/third_party/nasm": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-SiRXHsUlWXtH6dbDjDjqNAm105ibEB3jOfNtQAM4CaY=",
-                "rev": "f477acb1049f5e043904b87b825c5915084a9a29",
-                "url": "https://chromium.googlesource.com/chromium/deps/nasm.git"
+                "args": {
+                    "hash": "sha256-SiRXHsUlWXtH6dbDjDjqNAm105ibEB3jOfNtQAM4CaY=",
+                    "rev": "f477acb1049f5e043904b87b825c5915084a9a29",
+                    "url": "https://chromium.googlesource.com/chromium/deps/nasm.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/nearby/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-RZsdeT1gkbrOuHvngs+Iavl9YE27jLx4AXXYOvSXZoI=",
-                "rev": "3c8737f92d765407e4ff6c87b8758ba99ede40ed",
-                "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git"
+                "args": {
+                    "hash": "sha256-RZsdeT1gkbrOuHvngs+Iavl9YE27jLx4AXXYOvSXZoI=",
+                    "rev": "3c8737f92d765407e4ff6c87b8758ba99ede40ed",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=",
+                    "rev": "a15b489e1222b2087007546b4912e21293ea86ff",
+                    "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/openh264/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-S7dS2IZwt4p4ZrF6K7E5HnwKuI3owU2I7vwtu95uTkE=",
-                "rev": "478e5ab3eca30e600006d5a0a08b176fd34d3bd1",
-                "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264"
+                "args": {
+                    "hash": "sha256-S7dS2IZwt4p4ZrF6K7E5HnwKuI3owU2I7vwtu95uTkE=",
+                    "rev": "478e5ab3eca30e600006d5a0a08b176fd34d3bd1",
+                    "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/openscreen/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-y2XOZ3CmGdI0S/DLnOwAhm0kGTf/ayJ6OwPVlQCQqBw=",
-                "rev": "b720e33d337c68353e5d80a72491fb438f27d93a",
-                "url": "https://chromium.googlesource.com/openscreen"
+                "args": {
+                    "hash": "sha256-y2XOZ3CmGdI0S/DLnOwAhm0kGTf/ayJ6OwPVlQCQqBw=",
+                    "rev": "b720e33d337c68353e5d80a72491fb438f27d93a",
+                    "url": "https://chromium.googlesource.com/openscreen"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/openscreen/src/buildtools": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-suuxUL//BfAMmG8os8ChI7ic9EjGTi7y5kjxiAyrEQc=",
-                "rev": "4e0e9c73a0f26735f034f09a9cab2a5c0178536b",
-                "url": "https://chromium.googlesource.com/chromium/src/buildtools"
+                "args": {
+                    "hash": "sha256-suuxUL//BfAMmG8os8ChI7ic9EjGTi7y5kjxiAyrEQc=",
+                    "rev": "4e0e9c73a0f26735f034f09a9cab2a5c0178536b",
+                    "url": "https://chromium.googlesource.com/chromium/src/buildtools"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=",
+                    "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7",
+                    "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/ots/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=",
-                "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33",
-                "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git"
+                "args": {
+                    "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=",
+                    "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33",
+                    "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/pdfium": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-znfeKj2ttFWalFPeP9o8NPYLHD+pWAKuWVudX59MhLw=",
-                "rev": "2b675cf15ab4b68bf1ed4e0511ba2479e11f1605",
-                "url": "https://pdfium.googlesource.com/pdfium.git"
+                "args": {
+                    "hash": "sha256-znfeKj2ttFWalFPeP9o8NPYLHD+pWAKuWVudX59MhLw=",
+                    "rev": "2b675cf15ab4b68bf1ed4e0511ba2479e11f1605",
+                    "url": "https://pdfium.googlesource.com/pdfium.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/perfetto": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-ej8yXGOlmqwnWBbKR99qtIn3MvImaqV5ResVp95zdcM=",
-                "rev": "9170899ab284db894f14439e561f02f83a04d88e",
-                "url": "https://android.googlesource.com/platform/external/perfetto.git"
+                "args": {
+                    "hash": "sha256-ej8yXGOlmqwnWBbKR99qtIn3MvImaqV5ResVp95zdcM=",
+                    "rev": "9170899ab284db894f14439e561f02f83a04d88e",
+                    "url": "https://android.googlesource.com/platform/external/perfetto.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-TmP6xftUVTD7yML7UEM/DB8bcsL5RFlKPyCpcboD86U=",
+                    "rev": "e34549db516f8712f678fcd4bc411613b5cc5295",
+                    "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/pthreadpool/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-rGg6lgLkmbYo+a9CdaXz9ZUyrqJ1rxLcjLJeBEOPAlE=",
-                "rev": "560c60d342a76076f0557a3946924c6478470044",
-                "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git"
+                "args": {
+                    "hash": "sha256-rGg6lgLkmbYo+a9CdaXz9ZUyrqJ1rxLcjLJeBEOPAlE=",
+                    "rev": "560c60d342a76076f0557a3946924c6478470044",
+                    "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/pyelftools": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=",
-                "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae",
-                "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git"
+                "args": {
+                    "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=",
+                    "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae",
+                    "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=",
+                    "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2",
+                    "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/quic_trace/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=",
-                "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc",
-                "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git"
+                "args": {
+                    "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=",
+                    "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/re2/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc=",
-                "rev": "6dcd83d60f7944926bfd308cc13979fc53dd69ca",
-                "url": "https://chromium.googlesource.com/external/github.com/google/re2.git"
+                "args": {
+                    "hash": "sha256-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc=",
+                    "rev": "6dcd83d60f7944926bfd308cc13979fc53dd69ca",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/re2.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/ruy/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-4NVvqUZn2BdwTxJINTHwPeRqbGXZrWdcd7jv1Y+eoKY=",
-                "rev": "c08ec529fc91722bde519628d9449258082eb847",
-                "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git"
+                "args": {
+                    "hash": "sha256-4NVvqUZn2BdwTxJINTHwPeRqbGXZrWdcd7jv1Y+eoKY=",
+                    "rev": "c08ec529fc91722bde519628d9449258082eb847",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/securemessage/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=",
-                "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84",
-                "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git"
+                "args": {
+                    "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=",
+                    "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/skia": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-jwZUcrrya3xGmcocgvLFYGY75uoRwMJRphKBzjVW73Y=",
-                "rev": "d41eba845cdb7ade07e68f20676675c25e2734fc",
-                "url": "https://skia.googlesource.com/skia.git"
+                "args": {
+                    "hash": "sha256-jwZUcrrya3xGmcocgvLFYGY75uoRwMJRphKBzjVW73Y=",
+                    "rev": "d41eba845cdb7ade07e68f20676675c25e2734fc",
+                    "url": "https://skia.googlesource.com/skia.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/smhasher/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=",
-                "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f",
-                "url": "https://chromium.googlesource.com/external/smhasher.git"
+                "args": {
+                    "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=",
+                    "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f",
+                    "url": "https://chromium.googlesource.com/external/smhasher.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/snappy/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=",
-                "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c",
-                "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git"
+                "args": {
+                    "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=",
+                    "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU=",
+                    "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d",
+                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/spirv-cross/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=",
-                "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross"
+                "args": {
+                    "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=",
+                    "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/spirv-headers/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-o1yRTvP7a+XVwendTKBJKNnelVGWLD0gH258GGeUDhQ=",
-                "rev": "2a9b6f951c7d6b04b6c21fe1bf3f475b68b84801",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers"
+                "args": {
+                    "hash": "sha256-o1yRTvP7a+XVwendTKBJKNnelVGWLD0gH258GGeUDhQ=",
+                    "rev": "2a9b6f951c7d6b04b6c21fe1bf3f475b68b84801",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/spirv-tools/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-13y7Z6wMeAmV2dgMepgQPB+c+Pjc2O3C2G0kdlBVsNE=",
-                "rev": "37d2fcb485bf3fcadb18ef90aab6f283dcc4be72",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools"
+                "args": {
+                    "hash": "sha256-13y7Z6wMeAmV2dgMepgQPB+c+Pjc2O3C2G0kdlBVsNE=",
+                    "rev": "37d2fcb485bf3fcadb18ef90aab6f283dcc4be72",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/sqlite/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-ltl3OTk/wZPSj3yYthNlKd3mBxef6l5uW6UYTwebNek=",
-                "rev": "567495a62a62dc013888500526e82837d727fe01",
-                "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git"
+                "args": {
+                    "hash": "sha256-ltl3OTk/wZPSj3yYthNlKd3mBxef6l5uW6UYTwebNek=",
+                    "rev": "567495a62a62dc013888500526e82837d727fe01",
+                    "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/squirrel.mac": {
-                "fetcher": "fetchFromGitHub",
-                "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=",
-                "owner": "Squirrel",
-                "repo": "Squirrel.Mac",
-                "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38"
+                "args": {
+                    "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=",
+                    "owner": "Squirrel",
+                    "repo": "Squirrel.Mac",
+                    "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38"
+                },
+                "fetcher": "fetchFromGitHub"
             },
             "src/third_party/squirrel.mac/vendor/Mantle": {
-                "fetcher": "fetchFromGitHub",
-                "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=",
-                "owner": "Mantle",
-                "repo": "Mantle",
-                "rev": "78d3966b3c331292ea29ec38661b25df0a245948"
+                "args": {
+                    "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=",
+                    "owner": "Mantle",
+                    "repo": "Mantle",
+                    "rev": "78d3966b3c331292ea29ec38661b25df0a245948"
+                },
+                "fetcher": "fetchFromGitHub"
             },
             "src/third_party/squirrel.mac/vendor/ReactiveObjC": {
-                "fetcher": "fetchFromGitHub",
-                "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=",
-                "owner": "ReactiveCocoa",
-                "repo": "ReactiveObjC",
-                "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76"
+                "args": {
+                    "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=",
+                    "owner": "ReactiveCocoa",
+                    "repo": "ReactiveObjC",
+                    "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76"
+                },
+                "fetcher": "fetchFromGitHub"
             },
             "src/third_party/swiftshader": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-U29q1G3gnJdoucdLGZEbwpkGpDE4C2lv2b5WqpUf2Ho=",
-                "rev": "2afc8c97882a5c66abf5f26670ae420d2e30adc3",
-                "url": "https://swiftshader.googlesource.com/SwiftShader.git"
+                "args": {
+                    "hash": "sha256-U29q1G3gnJdoucdLGZEbwpkGpDE4C2lv2b5WqpUf2Ho=",
+                    "rev": "2afc8c97882a5c66abf5f26670ae420d2e30adc3",
+                    "url": "https://swiftshader.googlesource.com/SwiftShader.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=",
+                    "rev": "c036420683f672d685e27415de0a5f5e85bdc23f",
+                    "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/tflite/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-HtvrZur/vifocB/TKLDkzTLjFbGee4xGUhRLShozo9M=",
-                "rev": "d29299c16ec49623af1294900dba53fc8864f0bb",
-                "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git"
+                "args": {
+                    "hash": "sha256-HtvrZur/vifocB/TKLDkzTLjFbGee4xGUhRLShozo9M=",
+                    "rev": "d29299c16ec49623af1294900dba53fc8864f0bb",
+                    "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/ukey2/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=",
-                "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47",
-                "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git"
+                "args": {
+                    "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=",
+                    "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/vulkan-deps": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-U8iB5HlLHzpeBJjd9XODWONDy7GTfNbM2kjGBIAhabU=",
-                "rev": "c045c2192ab45a144b419033dffe6190be5d8c93",
-                "url": "https://chromium.googlesource.com/vulkan-deps"
+                "args": {
+                    "hash": "sha256-U8iB5HlLHzpeBJjd9XODWONDy7GTfNbM2kjGBIAhabU=",
+                    "rev": "c045c2192ab45a144b419033dffe6190be5d8c93",
+                    "url": "https://chromium.googlesource.com/vulkan-deps"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/vulkan-headers/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-8q6uu3v7j7poTMkn0oxj+RewIqhjCOuBz/QG/oFnWBI=",
-                "rev": "c6391a7b8cd57e79ce6b6c832c8e3043c4d9967b",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers"
+                "args": {
+                    "hash": "sha256-8q6uu3v7j7poTMkn0oxj+RewIqhjCOuBz/QG/oFnWBI=",
+                    "rev": "c6391a7b8cd57e79ce6b6c832c8e3043c4d9967b",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/vulkan-loader/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-dA9yc8nv8HDF8WA7bSReqI2JtUU41/Xl4J/CQlq0nuU=",
-                "rev": "1108bba6c97174d172d45470a7470a3d6a564647",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader"
+                "args": {
+                    "hash": "sha256-dA9yc8nv8HDF8WA7bSReqI2JtUU41/Xl4J/CQlq0nuU=",
+                    "rev": "1108bba6c97174d172d45470a7470a3d6a564647",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/vulkan-tools/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-eEJ9S1/fF5WMT+fRq+ZTzRfb+gxDA8drK8uwPVrFoNc=",
-                "rev": "4c63e845962ff3b197855f3ae4907a47d0863f5a",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools"
+                "args": {
+                    "hash": "sha256-eEJ9S1/fF5WMT+fRq+ZTzRfb+gxDA8drK8uwPVrFoNc=",
+                    "rev": "4c63e845962ff3b197855f3ae4907a47d0863f5a",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/vulkan-utility-libraries/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-4jK6OQT5Za46HixUe1kOay2NlTYtf9OHkbZrZ0y6pdI=",
-                "rev": "ea5774a13e3017b6d5d79af6fba9f0d72ca5c61a",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries"
+                "args": {
+                    "hash": "sha256-4jK6OQT5Za46HixUe1kOay2NlTYtf9OHkbZrZ0y6pdI=",
+                    "rev": "ea5774a13e3017b6d5d79af6fba9f0d72ca5c61a",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/vulkan-validation-layers/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-vwd7n30odVW/Q39lIiVuhyWhnm20giEHlzP14ONXyuw=",
-                "rev": "ef846ac0883cde5e69ced0e7d7af59fe92f34e25",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers"
+                "args": {
+                    "hash": "sha256-vwd7n30odVW/Q39lIiVuhyWhnm20giEHlzP14ONXyuw=",
+                    "rev": "ef846ac0883cde5e69ced0e7d7af59fe92f34e25",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=",
+                    "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21",
+                    "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=",
+                    "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0",
+                    "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=",
+                    "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e",
+                    "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-o/adWEXYSqWib6KoK7XMCWbojapcS4O/CEPxv7iFCw8=",
+                    "rev": "7d5a3a8b494ae44cd9651f9505e88a250082765e",
+                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-oK0Z8xO2ILuySGZS0m37ZF0MOyle2l8AXb0/6wai0/w=",
+                    "rev": "a156431ea66fe67d69c9fbba8a8ad34dabbab81c",
+                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/webdriver/pylib": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=",
-                "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04",
-                "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git"
+                "args": {
+                    "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=",
+                    "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04",
+                    "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/webgl/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-Yn0e1bpvtD4mGdZaRiBytc+upLulYVyHJqXJiTWEfmA=",
-                "rev": "1b6371436a0a60e6b9a4ae2a40a8eba198e3af02",
-                "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git"
+                "args": {
+                    "hash": "sha256-Yn0e1bpvtD4mGdZaRiBytc+upLulYVyHJqXJiTWEfmA=",
+                    "rev": "1b6371436a0a60e6b9a4ae2a40a8eba198e3af02",
+                    "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/webgpu-cts/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-3ruYKYHOkqlJcrjl4xvQV+OtULbgNUvXGBfrd5WTGyY=",
-                "rev": "2f55512456a725e77f3baac3d951de5c6c5e28a3",
-                "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git"
+                "args": {
+                    "hash": "sha256-3ruYKYHOkqlJcrjl4xvQV+OtULbgNUvXGBfrd5WTGyY=",
+                    "rev": "2f55512456a725e77f3baac3d951de5c6c5e28a3",
+                    "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/webrtc": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-4URlxWupNm67GeUGLJe3Dz1IONIq1mCjG5Lf4csKFKo=",
-                "rev": "28b793b4dd275bf2b901b87e01c0ee8d4f5732fc",
-                "url": "https://webrtc.googlesource.com/src.git"
+                "args": {
+                    "hash": "sha256-4URlxWupNm67GeUGLJe3Dz1IONIq1mCjG5Lf4csKFKo=",
+                    "rev": "28b793b4dd275bf2b901b87e01c0ee8d4f5732fc",
+                    "url": "https://webrtc.googlesource.com/src.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=",
+                    "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7",
+                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=",
+                    "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8",
+                    "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/xdg-utils": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=",
-                "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44",
-                "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git"
+                "args": {
+                    "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=",
+                    "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44",
+                    "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/xnnpack/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-VBrBNjoF3hsRXpBfXP2g9xOujVsmm7AkV6wE4ZwW2ts=",
-                "rev": "c4a28daf28c98300da9d9b5213c53f762908825e",
-                "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git"
+                "args": {
+                    "hash": "sha256-VBrBNjoF3hsRXpBfXP2g9xOujVsmm7AkV6wE4ZwW2ts=",
+                    "rev": "c4a28daf28c98300da9d9b5213c53f762908825e",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/zstd/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-/IUfh0De9m7ACrisqKlpxZsb+asoAWGXCaK6L+s24Q8=",
-                "rev": "20707e3718ee14250fb8a44b3bf023ea36bd88df",
-                "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git"
+                "args": {
+                    "hash": "sha256-/IUfh0De9m7ACrisqKlpxZsb+asoAWGXCaK6L+s24Q8=",
+                    "rev": "20707e3718ee14250fb8a44b3bf023ea36bd88df",
+                    "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/tools/page_cycler/acid3": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=",
-                "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba",
-                "url": "https://chromium.googlesource.com/chromium/deps/acid3.git"
+                "args": {
+                    "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=",
+                    "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba",
+                    "url": "https://chromium.googlesource.com/chromium/deps/acid3.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/v8": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-9TZ8a0ufsG/gWM2nYAWDymWeDlDg23Dgy/G6ic67QBI=",
-                "rev": "3551594a5f6604c7e5070f408cc81d60d08ddbbf",
-                "url": "https://chromium.googlesource.com/v8/v8.git"
+                "args": {
+                    "hash": "sha256-9TZ8a0ufsG/gWM2nYAWDymWeDlDg23Dgy/G6ic67QBI=",
+                    "rev": "3551594a5f6604c7e5070f408cc81d60d08ddbbf",
+                    "url": "https://chromium.googlesource.com/v8/v8.git"
+                },
+                "fetcher": "fetchFromGitiles"
             }
         },
         "electron_yarn_hash": "0bzsswcg62b39xinq5vikk7qz7d15276s2vc15v1gcb5wvh05ff8",
@@ -968,957 +1276,1269 @@
         "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"
+                "args": {
+                    "hash": "sha256-NVaErCSvuTQyt7yv2sc4aIX2J/6mxM648Wbbut2Jjxc=",
+                    "postFetch": "rm -r $out/third_party/blink/web_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"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/chrome/test/data/perf/canvas_bench": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=",
-                "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732",
-                "url": "https://chromium.googlesource.com/chromium/canvas_bench.git"
+                "args": {
+                    "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=",
+                    "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732",
+                    "url": "https://chromium.googlesource.com/chromium/canvas_bench.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=",
+                    "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9",
+                    "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=",
+                    "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248",
+                    "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/docs/website": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-CqveHvjPEcRWnzi8w13xr2OainrmABNO8uj0GzKmQqo=",
-                "rev": "be9c3dfd3781964fc0bab0d6c91d9ad117b71b02",
-                "url": "https://chromium.googlesource.com/website.git"
+                "args": {
+                    "hash": "sha256-CqveHvjPEcRWnzi8w13xr2OainrmABNO8uj0GzKmQqo=",
+                    "rev": "be9c3dfd3781964fc0bab0d6c91d9ad117b71b02",
+                    "url": "https://chromium.googlesource.com/website.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/electron": {
-                "fetcher": "fetchFromGitHub",
-                "hash": "sha256-q4StFkSb6IbTJ7rC2qiKOyEwLCErNuK5r/iSFEmTSYo=",
-                "owner": "electron",
-                "repo": "electron",
-                "rev": "v34.4.1"
+                "args": {
+                    "hash": "sha256-azo3XHWccI9jmmFx1Ck83861Eu/jF64J+rz3uudeFe0=",
+                    "owner": "electron",
+                    "repo": "electron",
+                    "rev": "v34.5.0"
+                },
+                "fetcher": "fetchFromGitHub"
             },
             "src/media/cdm/api": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=",
-                "rev": "eb21edc44e8e5a82095037be80c8b15c51624293",
-                "url": "https://chromium.googlesource.com/chromium/cdm.git"
+                "args": {
+                    "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=",
+                    "rev": "eb21edc44e8e5a82095037be80c8b15c51624293",
+                    "url": "https://chromium.googlesource.com/chromium/cdm.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/net/third_party/quiche/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-Z2uFWfZDYcY0m4R6mFMZJLnnVHu3/hQOAkCPQ5049SQ=",
-                "rev": "9616efc903b7469161996006c8cf963238e26503",
-                "url": "https://quiche.googlesource.com/quiche.git"
+                "args": {
+                    "hash": "sha256-Z2uFWfZDYcY0m4R6mFMZJLnnVHu3/hQOAkCPQ5049SQ=",
+                    "rev": "9616efc903b7469161996006c8cf963238e26503",
+                    "url": "https://quiche.googlesource.com/quiche.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/testing/libfuzzer/fuzzers/wasm_corpus": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-gItDOfNqm1tHlmelz3l2GGdiKi9adu1EpPP6U7+8EQY=",
-                "rev": "1df5e50a45db9518a56ebb42cb020a94a090258b",
-                "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git"
+                "args": {
+                    "hash": "sha256-gItDOfNqm1tHlmelz3l2GGdiKi9adu1EpPP6U7+8EQY=",
+                    "rev": "1df5e50a45db9518a56ebb42cb020a94a090258b",
+                    "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-mzVgoxxBWebesG6okyMxxmO6oH+TITA4o9ucHHMMzkQ=",
+                    "rev": "4a764c690353ea136c82f1a696a70bf38d1ef5fe",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/Accessibility-Test-Framework-for-Android.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/angle": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-fMIHpa2QFsQQ19LGyhvV3Ihh6Ls8wwwhqTtpLoTEaf4=",
-                "rev": "ce13a00a2b049a1ef5e0e70a3d333ce70838ef7b",
-                "url": "https://chromium.googlesource.com/angle/angle.git"
+                "args": {
+                    "hash": "sha256-fMIHpa2QFsQQ19LGyhvV3Ihh6Ls8wwwhqTtpLoTEaf4=",
+                    "rev": "ce13a00a2b049a1ef5e0e70a3d333ce70838ef7b",
+                    "url": "https://chromium.googlesource.com/angle/angle.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-2ZhG4cJf85zO7x+SGG6RD2qgOxZVosxAIbuZt9GYUKs=",
+                    "rev": "f674555ab03e6355e0981a647c115097e9fe5324",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=",
+                    "rev": "ca8de51fedb70bace5351c6b002eb952c747e889",
+                    "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=",
+                    "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f",
+                    "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-PMB49+zW9ewlS9ym+xi0xYQYLN0j5Urx6yBXWd8FjjI=",
+                    "rev": "6ea6ec78f9e4998d0a7a5677b2aec08f0ac858f8",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/beto-core/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-QPFGjtu/I0r4+dTQ2eSlWIEYwJ43B3yW0q4QtVFTVGY=",
-                "rev": "89563fec14c756482afa08b016eeba9087c8d1e3",
-                "url": "https://beto-core.googlesource.com/beto-core.git"
+                "args": {
+                    "hash": "sha256-QPFGjtu/I0r4+dTQ2eSlWIEYwJ43B3yW0q4QtVFTVGY=",
+                    "rev": "89563fec14c756482afa08b016eeba9087c8d1e3",
+                    "url": "https://beto-core.googlesource.com/beto-core.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/boringssl/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-ib9wbV6S64OFc4zx0wQsQ84+5RxbETK0PS9Wm1BFQ1U=",
-                "rev": "571c76e919c0c48219ced35bef83e1fc83b00eed",
-                "url": "https://boringssl.googlesource.com/boringssl.git"
+                "args": {
+                    "hash": "sha256-ib9wbV6S64OFc4zx0wQsQ84+5RxbETK0PS9Wm1BFQ1U=",
+                    "rev": "571c76e919c0c48219ced35bef83e1fc83b00eed",
+                    "url": "https://boringssl.googlesource.com/boringssl.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/breakpad/breakpad": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-cFXUi2oO/614jF0GV7oW0ss62dXWFHDNWNT8rWHAiQc=",
-                "rev": "47f7823bdf4b1f39e462b2a497a674860e922e38",
-                "url": "https://chromium.googlesource.com/breakpad/breakpad.git"
+                "args": {
+                    "hash": "sha256-cFXUi2oO/614jF0GV7oW0ss62dXWFHDNWNT8rWHAiQc=",
+                    "rev": "47f7823bdf4b1f39e462b2a497a674860e922e38",
+                    "url": "https://chromium.googlesource.com/breakpad/breakpad.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/cast_core/public/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-o5/Lbhh6HHSWCVCEyDwDCgs+PLm67si981w0HuIWY7c=",
-                "rev": "fbc5e98031e1271a0a566fcd4d9092b2d3275d05",
-                "url": "https://chromium.googlesource.com/cast_core/public"
+                "args": {
+                    "hash": "sha256-o5/Lbhh6HHSWCVCEyDwDCgs+PLm67si981w0HuIWY7c=",
+                    "rev": "fbc5e98031e1271a0a566fcd4d9092b2d3275d05",
+                    "url": "https://chromium.googlesource.com/cast_core/public"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/catapult": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-65cZPyqZUdSnYPJYUMYeJgx3mUC6L/qb9P2bDqd2Zkk=",
-                "rev": "b91cf840ac3255ef03b23cc93621369627422a1a",
-                "url": "https://chromium.googlesource.com/catapult.git"
+                "args": {
+                    "hash": "sha256-65cZPyqZUdSnYPJYUMYeJgx3mUC6L/qb9P2bDqd2Zkk=",
+                    "rev": "b91cf840ac3255ef03b23cc93621369627422a1a",
+                    "url": "https://chromium.googlesource.com/catapult.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=",
+                    "rev": "ba412eaaacd3186085babcd901679a48863c7dd5",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/chromium-variations": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-mg5mu2jcy0xyNJ650ywWUMC94keRsqhZQuPZclHmyLI=",
-                "rev": "c170abb48f7715c237f4c06eaed0fe6f8a4c6f8d",
-                "url": "https://chromium.googlesource.com/chromium-variations.git"
+                "args": {
+                    "hash": "sha256-mg5mu2jcy0xyNJ650ywWUMC94keRsqhZQuPZclHmyLI=",
+                    "rev": "c170abb48f7715c237f4c06eaed0fe6f8a4c6f8d",
+                    "url": "https://chromium.googlesource.com/chromium-variations.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-whD8isX2ZhLrFzdxHhFP1S/sZDRgyrzLFaVd7OEFqYo=",
+                    "rev": "3c0acd2d4e73dd911309d9e970ba09d58bf23a62",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=",
+                    "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/colorama/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=",
-                "rev": "3de9f013df4b470069d03d250224062e8cf15c49",
-                "url": "https://chromium.googlesource.com/external/colorama.git"
+                "args": {
+                    "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=",
+                    "rev": "3de9f013df4b470069d03d250224062e8cf15c49",
+                    "url": "https://chromium.googlesource.com/external/colorama.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=",
+                    "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc",
+                    "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=",
+                    "rev": "936b9ab5515dead115606559502e3864958f7f6e",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/cpuinfo/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-FlvmSjY8kt5XHymDLaZdPuZ4k5xcagJk8w/U6adTkWI=",
-                "rev": "8df44962d437a0477f07ba6b8843d0b6a48646a4",
-                "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git"
+                "args": {
+                    "hash": "sha256-FlvmSjY8kt5XHymDLaZdPuZ4k5xcagJk8w/U6adTkWI=",
+                    "rev": "8df44962d437a0477f07ba6b8843d0b6a48646a4",
+                    "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/crabbyavif/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-hO5epHYNYI6pGwVSUv1Hp3qb7qOv8uOs4u+IdhDxd8Q=",
-                "rev": "c3548280e0a516ed7cad7ff1591b5807cef64aa4",
-                "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git"
+                "args": {
+                    "hash": "sha256-hO5epHYNYI6pGwVSUv1Hp3qb7qOv8uOs4u+IdhDxd8Q=",
+                    "rev": "c3548280e0a516ed7cad7ff1591b5807cef64aa4",
+                    "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-KBraGaO5LmmPP+p8RuDogGldbTWdNDK+WzF4Q09keuE=",
+                    "rev": "d3d60ac6e0f16780bcfcc825385e1d338801a558",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/cros-components/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-owXaTIj0pbhUeJkirxaRoCmgIN9DwNzY3h771kaN+Fc=",
-                "rev": "9129cf4b2a5ca775c280243257a0b4856a93c7fb",
-                "url": "https://chromium.googlesource.com/external/google3/cros_components.git"
+                "args": {
+                    "hash": "sha256-owXaTIj0pbhUeJkirxaRoCmgIN9DwNzY3h771kaN+Fc=",
+                    "rev": "9129cf4b2a5ca775c280243257a0b4856a93c7fb",
+                    "url": "https://chromium.googlesource.com/external/google3/cros_components.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/cros_system_api": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-fvGypRhgl2uX9YE2cwjL7d3pYBa3Imd5p0RLhMYRgrc=",
-                "rev": "554629b9242e6ae832ef14e3384654426f7fcc06",
-                "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git"
+                "args": {
+                    "hash": "sha256-fvGypRhgl2uX9YE2cwjL7d3pYBa3Imd5p0RLhMYRgrc=",
+                    "rev": "554629b9242e6ae832ef14e3384654426f7fcc06",
+                    "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/crossbench": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-/K6eM9s+fd2wjCrK0g0CgFNy0zxEN9SxTvmE50hMtXw=",
-                "rev": "ae6f165652e0ea983d73f5d04b7470d08c869e4f",
-                "url": "https://chromium.googlesource.com/crossbench.git"
+                "args": {
+                    "hash": "sha256-/K6eM9s+fd2wjCrK0g0CgFNy0zxEN9SxTvmE50hMtXw=",
+                    "rev": "ae6f165652e0ea983d73f5d04b7470d08c869e4f",
+                    "url": "https://chromium.googlesource.com/crossbench.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-Q2CaWvDqOmfaPG6a+SUHG5rFHalPEf4Oq/ytT3xuSOk=",
+                    "rev": "93f12c117a4e1c0cc2b129dcc52e84dbd9b84200",
+                    "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/dawn": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-1d8cCtqBIfYbVqUQ4q4BtH2FujbNJeeW9agJUjcktgE=",
-                "rev": "c3530f2883610bb6606a5f55935c189e732e67d0",
-                "url": "https://dawn.googlesource.com/dawn.git"
+                "args": {
+                    "hash": "sha256-1d8cCtqBIfYbVqUQ4q4BtH2FujbNJeeW9agJUjcktgE=",
+                    "rev": "c3530f2883610bb6606a5f55935c189e732e67d0",
+                    "url": "https://dawn.googlesource.com/dawn.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/dawn/third_party/dxc": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-rhUNPA5b0H3PBsOpXbAeRLpS0tNQkiHbjRBWmJycSAY=",
-                "rev": "ac36a797d3470e8ee906b98457a59270d01db30d",
-                "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler"
+                "args": {
+                    "hash": "sha256-rhUNPA5b0H3PBsOpXbAeRLpS0tNQkiHbjRBWmJycSAY=",
+                    "rev": "ac36a797d3470e8ee906b98457a59270d01db30d",
+                    "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=",
+                    "rev": "980971e835876dc0cde415e8f9bc646e64667bf7",
+                    "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-E1zXIDiw87badrLOZTvV+Wh9NZHu51nb70ZK9vlAlqE=",
+                    "rev": "b35641f4a3c62aa86a0b3c983d163bc0fe36026d",
+                    "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=",
+                    "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=",
+                    "rev": "5bae8738b23d06968e7c3a41308568120943ae77",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-ArbHGjkHd1sko7gDPFksYz7XHKNge+e6tVy6oKPuqzg=",
+                    "rev": "8690defa74b6975c10e85c113f121d4b2a3f2564",
+                    "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-J3PcwYoO79HqrACFgk77BZLTCi7oi5k2J6v3wlcFVD4=",
+                    "rev": "8049c324dc7b3c09dc96ea04cb02860f272c8686",
+                    "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/depot_tools": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-m/6b4VZZTUQOeED1mYvZOQCx8Re+Zd4O8SKDMjJ9Djo=",
-                "rev": "41d43a2a2290450aeab946883542f8049b155c87",
-                "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
+                "args": {
+                    "hash": "sha256-m/6b4VZZTUQOeED1mYvZOQCx8Re+Zd4O8SKDMjJ9Djo=",
+                    "rev": "41d43a2a2290450aeab946883542f8049b155c87",
+                    "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/devtools-frontend/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-mBWZdbgZfO01Pt2lZSHX/d5r+8A/+qCZA8MRtZdeTrs=",
-                "rev": "f2f3682c9db8ca427f8c64f0402cc2c5152c6c24",
-                "url": "https://chromium.googlesource.com/devtools/devtools-frontend"
+                "args": {
+                    "hash": "sha256-mBWZdbgZfO01Pt2lZSHX/d5r+8A/+qCZA8MRtZdeTrs=",
+                    "rev": "f2f3682c9db8ca427f8c64f0402cc2c5152c6c24",
+                    "url": "https://chromium.googlesource.com/devtools/devtools-frontend"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=",
+                    "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d",
+                    "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-fYxoA0fxKe9U23j+Jp0MWj4m7RfsRpM0XjF6/yOhX1I=",
+                    "rev": "053714bccbda79cf76dac3fee48ab2b27f21925e",
+                    "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/eigen3/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-UroGjERR5TW9KbyLwR/NBpytXrW1tHfu6ZvQPngROq4=",
-                "rev": "b396a6fbb2e173f52edb3360485dedf3389ef830",
-                "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git"
+                "args": {
+                    "hash": "sha256-UroGjERR5TW9KbyLwR/NBpytXrW1tHfu6ZvQPngROq4=",
+                    "rev": "b396a6fbb2e173f52edb3360485dedf3389ef830",
+                    "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/electron_node": {
-                "fetcher": "fetchFromGitHub",
-                "hash": "sha256-ta9gw6A0aYguKYNRBW2nSPC3UTU5/7GNUPS02yyByis=",
-                "owner": "nodejs",
-                "repo": "node",
-                "rev": "v20.18.3"
+                "args": {
+                    "hash": "sha256-y2goL+xmyHPe3NXj1/bxmY98fUrgjP6bim0T0sWjBgw=",
+                    "owner": "nodejs",
+                    "repo": "node",
+                    "rev": "v20.19.0"
+                },
+                "fetcher": "fetchFromGitHub"
             },
             "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"
+                "args": {
+                    "hash": "sha256-KdQdKBBipEBRT8UmNGao6yCB4m2CU8/SrMVvcXlb5qE=",
+                    "rev": "955936be8b391e00835257059607d7c5b72ce744",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/engflow-reclient-configs": {
-                "fetcher": "fetchFromGitHub",
-                "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=",
-                "owner": "EngFlow",
-                "repo": "reclient-configs",
-                "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d"
+                "args": {
+                    "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=",
+                    "owner": "EngFlow",
+                    "repo": "reclient-configs",
+                    "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d"
+                },
+                "fetcher": "fetchFromGitHub"
             },
             "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"
+                "args": {
+                    "hash": "sha256-Iwu9+i/0vsPyu6pOWFxjNNblVxMl6bTPW5eWyaju4Mg=",
+                    "rev": "624da0f593bb8d7e146b9f42b06d8e6c80d032a3",
+                    "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=",
+                    "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-0eVovauN7SnO3nSIWBRWAJ4dR7q5beZrIGUZ18M2pao=",
+                    "rev": "3e57d8dcfb0a04b5a8a26b486b54490a2e9b310f",
+                    "url": "https://chromium.googlesource.com/external/github.com/fastfloat/fast_float.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/ffmpeg": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-wwHxNuZe2hBmGBpVg/iQJBoL350jfPYPTPqDn3RiqZE=",
-                "rev": "591ae4b02eaff9a03e2ec863da895128b0b49910",
-                "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git"
+                "args": {
+                    "hash": "sha256-wwHxNuZe2hBmGBpVg/iQJBoL350jfPYPTPqDn3RiqZE=",
+                    "rev": "591ae4b02eaff9a03e2ec863da895128b0b49910",
+                    "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/flac": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=",
-                "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c",
-                "url": "https://chromium.googlesource.com/chromium/deps/flac.git"
+                "args": {
+                    "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=",
+                    "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c",
+                    "url": "https://chromium.googlesource.com/chromium/deps/flac.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/flatbuffers/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-tbc45o0MbMvK5XqRUJt5Eg8BU6+TJqlmwFgQhHq6wRM=",
-                "rev": "8db59321d9f02cdffa30126654059c7d02f70c32",
-                "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git"
+                "args": {
+                    "hash": "sha256-tbc45o0MbMvK5XqRUJt5Eg8BU6+TJqlmwFgQhHq6wRM=",
+                    "rev": "8db59321d9f02cdffa30126654059c7d02f70c32",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/fontconfig/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-W5WIgC6A52kY4fNkbsDEa0o+dfd97Rl5NKfgnIRpI00=",
-                "rev": "14d466b30a8ab4a9d789977ed94f2c30e7209267",
-                "url": "https://chromium.googlesource.com/external/fontconfig.git"
+                "args": {
+                    "hash": "sha256-W5WIgC6A52kY4fNkbsDEa0o+dfd97Rl5NKfgnIRpI00=",
+                    "rev": "14d466b30a8ab4a9d789977ed94f2c30e7209267",
+                    "url": "https://chromium.googlesource.com/external/fontconfig.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/fp16/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=",
-                "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91",
-                "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git"
+                "args": {
+                    "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=",
+                    "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91",
+                    "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=",
+                    "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f",
+                    "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/freetype/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-+nbRZi3vAMTURhhFVUu5+59fVIv0GH3YZog2JavyVLY=",
-                "rev": "0ae7e607370cc66218ccfacf5de4db8a35424c2f",
-                "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git"
+                "args": {
+                    "hash": "sha256-+nbRZi3vAMTURhhFVUu5+59fVIv0GH3YZog2JavyVLY=",
+                    "rev": "0ae7e607370cc66218ccfacf5de4db8a35424c2f",
+                    "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-UYmzjOX8k+CWL+xOIF3NiEL3TRUjS8JflortB2RUT4o=",
+                    "rev": "0021f30508bc7f73fa5270962d022acb480d242f",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/fxdiv/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=",
-                "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8",
-                "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git"
+                "args": {
+                    "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=",
+                    "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8",
+                    "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/gemmlowp/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=",
-                "rev": "13d57703abca3005d97b19df1f2db731607a7dc2",
-                "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git"
+                "args": {
+                    "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=",
+                    "rev": "13d57703abca3005d97b19df1f2db731607a7dc2",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/glslang/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-twWSeJp9bNbLYFszCWv9BCztfbXUBKSWV55/U+hd2hw=",
-                "rev": "9c644fcb5b9a1a9c975c50a790fd14c5451292b0",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang"
+                "args": {
+                    "hash": "sha256-twWSeJp9bNbLYFszCWv9BCztfbXUBKSWV55/U+hd2hw=",
+                    "rev": "9c644fcb5b9a1a9c975c50a790fd14c5451292b0",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/google_benchmark/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-cH8s1gP6kCcojAAfTt5iQCVqiAaSooNk4BdaILujM3w=",
-                "rev": "761305ec3b33abf30e08d50eb829e19a802581cc",
-                "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git"
+                "args": {
+                    "hash": "sha256-cH8s1gP6kCcojAAfTt5iQCVqiAaSooNk4BdaILujM3w=",
+                    "rev": "761305ec3b33abf30e08d50eb829e19a802581cc",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-n7tiIFAj8AiSCa9Tw+1j+ro9cSt5vagZpkbBBUUtYQY=",
+                    "rev": "d144031940543e15423a25ae5a8a74141044862f",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=",
+                    "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737",
+                    "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-iR49rfGDKxPObCff1/30hYHpP5FpZ28ROgMZhNk9eFY=",
+                    "rev": "1da053e87f0487382404656edca98b85fe51f2fd",
+                    "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/highway/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-IS7m1wBwpPBUNhx2GttY1fzvmLIeAp3o2gXfrFpRdvY=",
-                "rev": "00fe003dac355b979f36157f9407c7c46448958e",
-                "url": "https://chromium.googlesource.com/external/github.com/google/highway.git"
+                "args": {
+                    "hash": "sha256-IS7m1wBwpPBUNhx2GttY1fzvmLIeAp3o2gXfrFpRdvY=",
+                    "rev": "00fe003dac355b979f36157f9407c7c46448958e",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/highway.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/hunspell_dictionaries": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=",
-                "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e",
-                "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git"
+                "args": {
+                    "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=",
+                    "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e",
+                    "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/icu": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-WtCoxcbEkkZayB6kXdQEhZ7/ue+ka6cguhFbpeWUBJA=",
-                "rev": "ba7ed88cc5ffa428a82a0f787dd61031aa5ef4ca",
-                "url": "https://chromium.googlesource.com/chromium/deps/icu.git"
+                "args": {
+                    "hash": "sha256-WtCoxcbEkkZayB6kXdQEhZ7/ue+ka6cguhFbpeWUBJA=",
+                    "rev": "ba7ed88cc5ffa428a82a0f787dd61031aa5ef4ca",
+                    "url": "https://chromium.googlesource.com/chromium/deps/icu.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/ink/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-+Ikr9E7KlXBFyf6fSDmIF3ygNUiwlXeA5bmO2CtkI7Q=",
-                "rev": "4300dc7402a257b85fc5bf2559137edacb050227",
-                "url": "https://chromium.googlesource.com/external/github.com/google/ink.git"
+                "args": {
+                    "hash": "sha256-+Ikr9E7KlXBFyf6fSDmIF3ygNUiwlXeA5bmO2CtkI7Q=",
+                    "rev": "4300dc7402a257b85fc5bf2559137edacb050227",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/ink.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-IQ+n+kHdEq8Q8/qaPGMvgD7cPN3zzaY8dbiokq6r/Vs=",
+                    "rev": "0999e4cf816b42c770d07916698bce943b873048",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/instrumented_libs": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-kHKGADAgzlaeckXFbpU1GhJK+zkiRd9XvdtPF6qrQFY=",
-                "rev": "bb6dbcf2df7a9beb34c3773ef4df161800e3aed9",
-                "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git"
+                "args": {
+                    "hash": "sha256-kHKGADAgzlaeckXFbpU1GhJK+zkiRd9XvdtPF6qrQFY=",
+                    "rev": "bb6dbcf2df7a9beb34c3773ef4df161800e3aed9",
+                    "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=",
+                    "rev": "42e892d96e47b1f6e29844cc705e148ec4856448",
+                    "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/leveldatabase/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-y3awFXL8ih2UhEqWj8JRgkhzSxfQciLztb020JHJ350=",
-                "rev": "23e35d792b9154f922b8b575b12596a4d8664c65",
-                "url": "https://chromium.googlesource.com/external/leveldb.git"
+                "args": {
+                    "hash": "sha256-y3awFXL8ih2UhEqWj8JRgkhzSxfQciLztb020JHJ350=",
+                    "rev": "23e35d792b9154f922b8b575b12596a4d8664c65",
+                    "url": "https://chromium.googlesource.com/external/leveldb.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "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"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libaddressinput/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=",
-                "rev": "e8712e415627f22d0b00ebee8db99547077f39bd",
-                "url": "https://chromium.googlesource.com/external/libaddressinput.git"
+                "args": {
+                    "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=",
+                    "rev": "e8712e415627f22d0b00ebee8db99547077f39bd",
+                    "url": "https://chromium.googlesource.com/external/libaddressinput.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libaom/source/libaom": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-9VhEVOG9cReDOGoX+x5G/jJ8Y5RDoQIiLMoZtt5c9pI=",
-                "rev": "be60f06ab420d6a65c477213f04c8b0f2e12ba2e",
-                "url": "https://aomedia.googlesource.com/aom.git"
+                "args": {
+                    "hash": "sha256-9VhEVOG9cReDOGoX+x5G/jJ8Y5RDoQIiLMoZtt5c9pI=",
+                    "rev": "be60f06ab420d6a65c477213f04c8b0f2e12ba2e",
+                    "url": "https://aomedia.googlesource.com/aom.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libavif/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-lUuVyh2srhWMNUp4lEivyDic3MSZf5s63iAb84We80M=",
-                "rev": "1cdeff7ecf456492c47cf48fc0cef6591cdc95da",
-                "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git"
+                "args": {
+                    "hash": "sha256-lUuVyh2srhWMNUp4lEivyDic3MSZf5s63iAb84We80M=",
+                    "rev": "1cdeff7ecf456492c47cf48fc0cef6591cdc95da",
+                    "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-kmhTlz/qjvN0Qlra7Wz05O6X058hPPn0nVvAxFXQDC4=",
+                    "rev": "8e31ad42561900383e10dbefc1d3e8f38cedfbe9",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-CwiK9Td8aRS08RywItHKFvibzDAUYYd0YNRKxYPLTD8=",
+                    "rev": "cec7f478354a8c8599f264ed8bb6043b5468f72d",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libdrm/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-woSYEDUfcEBpYOYnli13wLMt754A7KnUbmTEcFQdFGw=",
-                "rev": "ad78bb591d02162d3b90890aa4d0a238b2a37cde",
-                "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git"
+                "args": {
+                    "hash": "sha256-woSYEDUfcEBpYOYnli13wLMt754A7KnUbmTEcFQdFGw=",
+                    "rev": "ad78bb591d02162d3b90890aa4d0a238b2a37cde",
+                    "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libgav1/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-+ss9S5t+yoHzqbtX68+5OyyUbJVecYLwp+C3EXfAziE=",
-                "rev": "a2f139e9123bdb5edf7707ac6f1b73b3aa5038dd",
-                "url": "https://chromium.googlesource.com/codecs/libgav1.git"
+                "args": {
+                    "hash": "sha256-+ss9S5t+yoHzqbtX68+5OyyUbJVecYLwp+C3EXfAziE=",
+                    "rev": "a2f139e9123bdb5edf7707ac6f1b73b3aa5038dd",
+                    "url": "https://chromium.googlesource.com/codecs/libgav1.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libipp/libipp": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=",
-                "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f",
-                "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git"
+                "args": {
+                    "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=",
+                    "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f",
+                    "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libjpeg_turbo": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-qgHXAjCDFxQ+QqJ8pSmI1NUvHvKKTi4MkIe1I/+hUAI=",
-                "rev": "927aabfcd26897abb9776ecf2a6c38ea5bb52ab6",
-                "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git"
+                "args": {
+                    "hash": "sha256-qgHXAjCDFxQ+QqJ8pSmI1NUvHvKKTi4MkIe1I/+hUAI=",
+                    "rev": "927aabfcd26897abb9776ecf2a6c38ea5bb52ab6",
+                    "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/liblouis/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=",
-                "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376",
-                "url": "https://chromium.googlesource.com/external/liblouis-github.git"
+                "args": {
+                    "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=",
+                    "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376",
+                    "url": "https://chromium.googlesource.com/external/liblouis-github.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libphonenumber/dist": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=",
-                "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362",
-                "url": "https://chromium.googlesource.com/external/libphonenumber.git"
+                "args": {
+                    "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=",
+                    "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362",
+                    "url": "https://chromium.googlesource.com/external/libphonenumber.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=",
+                    "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libsrtp": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-4qEZ9MD97MoqCUlZtbEhIKy+fDO1iIWqyrBsKwkjXTg=",
-                "rev": "000edd791434c8738455f10e0dd6b268a4852c0b",
-                "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git"
+                "args": {
+                    "hash": "sha256-4qEZ9MD97MoqCUlZtbEhIKy+fDO1iIWqyrBsKwkjXTg=",
+                    "rev": "000edd791434c8738455f10e0dd6b268a4852c0b",
+                    "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libsync/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=",
-                "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6",
-                "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git"
+                "args": {
+                    "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=",
+                    "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6",
+                    "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-uA+t5Ecc/iK3mllHR8AMVGRfU/7z1G3yrw0TamPQiOY=",
+                    "rev": "5b01ea4a6f3b666b7d190e7cb7c31db2ed4d94ce",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libvpx/source/libvpx": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-QGm37X4uid8zv+vRu0pVTvoQd2WcKztrj3tJkDjx82o=",
-                "rev": "727319a77ffe68e9aacb08e09ae7151b3a8f70a3",
-                "url": "https://chromium.googlesource.com/webm/libvpx.git"
+                "args": {
+                    "hash": "sha256-QGm37X4uid8zv+vRu0pVTvoQd2WcKztrj3tJkDjx82o=",
+                    "rev": "727319a77ffe68e9aacb08e09ae7151b3a8f70a3",
+                    "url": "https://chromium.googlesource.com/webm/libvpx.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libwebm/source": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-Mn3snC2g4BDKBJsS6cxT3BZL7LZknOWg77+60Nr4Hy0=",
-                "rev": "26d9f667170dc75e8d759a997bb61c64dec42dda",
-                "url": "https://chromium.googlesource.com/webm/libwebm.git"
+                "args": {
+                    "hash": "sha256-Mn3snC2g4BDKBJsS6cxT3BZL7LZknOWg77+60Nr4Hy0=",
+                    "rev": "26d9f667170dc75e8d759a997bb61c64dec42dda",
+                    "url": "https://chromium.googlesource.com/webm/libwebm.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libwebp/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-xuRpEwOnaLGZmrPvfUn3DSoJANd94CG+JXcN7Mdmk5I=",
-                "rev": "845d5476a866141ba35ac133f856fa62f0b7445f",
-                "url": "https://chromium.googlesource.com/webm/libwebp.git"
+                "args": {
+                    "hash": "sha256-xuRpEwOnaLGZmrPvfUn3DSoJANd94CG+JXcN7Mdmk5I=",
+                    "rev": "845d5476a866141ba35ac133f856fa62f0b7445f",
+                    "url": "https://chromium.googlesource.com/webm/libwebp.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libyuv": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-vPVq7RzqO7gBUgYuNX0Fwxqok9jtXXJZgbhVFchG5Ws=",
-                "rev": "6ac7c8f25170c85265fca69fd1fe5d31baf3344f",
-                "url": "https://chromium.googlesource.com/libyuv/libyuv.git"
+                "args": {
+                    "hash": "sha256-vPVq7RzqO7gBUgYuNX0Fwxqok9jtXXJZgbhVFchG5Ws=",
+                    "rev": "6ac7c8f25170c85265fca69fd1fe5d31baf3344f",
+                    "url": "https://chromium.googlesource.com/libyuv/libyuv.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-av9JdqLOQbezgRS4P8QXmvfB5l47v04WRagNJJgT5u4=",
+                    "rev": "ca74a72e2b32ad804522bbef04dfe32560a10206",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/lss": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=",
-                "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521",
-                "url": "https://chromium.googlesource.com/linux-syscall-support.git"
+                "args": {
+                    "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=",
+                    "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521",
+                    "url": "https://chromium.googlesource.com/linux-syscall-support.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-Y85XU+z9W6tvmDNHJ/dXQnUKXvvDkO3nH/kUJRLqbc4=",
+                    "rev": "13434b50dcb64a482cc91191f8cf6151d90f5465",
+                    "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/minigbm/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=",
-                "rev": "3018207f4d89395cc271278fb9a6558b660885f5",
-                "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git"
+                "args": {
+                    "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=",
+                    "rev": "3018207f4d89395cc271278fb9a6558b660885f5",
+                    "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/nan": {
-                "fetcher": "fetchFromGitHub",
-                "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=",
-                "owner": "nodejs",
-                "repo": "nan",
-                "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213"
+                "args": {
+                    "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=",
+                    "owner": "nodejs",
+                    "repo": "nan",
+                    "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213"
+                },
+                "fetcher": "fetchFromGitHub"
             },
             "src/third_party/nasm": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-SiRXHsUlWXtH6dbDjDjqNAm105ibEB3jOfNtQAM4CaY=",
-                "rev": "f477acb1049f5e043904b87b825c5915084a9a29",
-                "url": "https://chromium.googlesource.com/chromium/deps/nasm.git"
+                "args": {
+                    "hash": "sha256-SiRXHsUlWXtH6dbDjDjqNAm105ibEB3jOfNtQAM4CaY=",
+                    "rev": "f477acb1049f5e043904b87b825c5915084a9a29",
+                    "url": "https://chromium.googlesource.com/chromium/deps/nasm.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/nearby/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-DO3FW5Q233ctFKk4K5F8oZec9kfrVl6uxAwMn0niKz4=",
-                "rev": "8e87a6e51c93e7836ecdbcc0a520c7992f3ece13",
-                "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git"
+                "args": {
+                    "hash": "sha256-DO3FW5Q233ctFKk4K5F8oZec9kfrVl6uxAwMn0niKz4=",
+                    "rev": "8e87a6e51c93e7836ecdbcc0a520c7992f3ece13",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=",
+                    "rev": "a15b489e1222b2087007546b4912e21293ea86ff",
+                    "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/openh264/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-S7dS2IZwt4p4ZrF6K7E5HnwKuI3owU2I7vwtu95uTkE=",
-                "rev": "478e5ab3eca30e600006d5a0a08b176fd34d3bd1",
-                "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264"
+                "args": {
+                    "hash": "sha256-S7dS2IZwt4p4ZrF6K7E5HnwKuI3owU2I7vwtu95uTkE=",
+                    "rev": "478e5ab3eca30e600006d5a0a08b176fd34d3bd1",
+                    "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/openscreen/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-IlGxfw6Mhc7FYvhU2+Ngt9qflqr4JMC2OcplvksGI+U=",
-                "rev": "cb6fd42532fc3a831d6863d5006217e32a67c417",
-                "url": "https://chromium.googlesource.com/openscreen"
+                "args": {
+                    "hash": "sha256-IlGxfw6Mhc7FYvhU2+Ngt9qflqr4JMC2OcplvksGI+U=",
+                    "rev": "cb6fd42532fc3a831d6863d5006217e32a67c417",
+                    "url": "https://chromium.googlesource.com/openscreen"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/openscreen/src/buildtools": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-suuxUL//BfAMmG8os8ChI7ic9EjGTi7y5kjxiAyrEQc=",
-                "rev": "4e0e9c73a0f26735f034f09a9cab2a5c0178536b",
-                "url": "https://chromium.googlesource.com/chromium/src/buildtools"
+                "args": {
+                    "hash": "sha256-suuxUL//BfAMmG8os8ChI7ic9EjGTi7y5kjxiAyrEQc=",
+                    "rev": "4e0e9c73a0f26735f034f09a9cab2a5c0178536b",
+                    "url": "https://chromium.googlesource.com/chromium/src/buildtools"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=",
+                    "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7",
+                    "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/ots/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=",
-                "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33",
-                "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git"
+                "args": {
+                    "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=",
+                    "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33",
+                    "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/pdfium": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-d8qJECIdq01ct+sS7cHVKFulYJarwahKCEcVf762JNI=",
-                "rev": "84a8011ec69d0e2de271c05be7d62979608040d9",
-                "url": "https://pdfium.googlesource.com/pdfium.git"
+                "args": {
+                    "hash": "sha256-d8qJECIdq01ct+sS7cHVKFulYJarwahKCEcVf762JNI=",
+                    "rev": "84a8011ec69d0e2de271c05be7d62979608040d9",
+                    "url": "https://pdfium.googlesource.com/pdfium.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/perfetto": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-3vervpsq/QLMrR7RcJMwwh+CdFvSEj8yAzj6s9d1XMo=",
-                "rev": "ea011a2c2d3aecdc4f1674887e107a56d2905edd",
-                "url": "https://android.googlesource.com/platform/external/perfetto.git"
+                "args": {
+                    "hash": "sha256-3vervpsq/QLMrR7RcJMwwh+CdFvSEj8yAzj6s9d1XMo=",
+                    "rev": "ea011a2c2d3aecdc4f1674887e107a56d2905edd",
+                    "url": "https://android.googlesource.com/platform/external/perfetto.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-TmP6xftUVTD7yML7UEM/DB8bcsL5RFlKPyCpcboD86U=",
+                    "rev": "e34549db516f8712f678fcd4bc411613b5cc5295",
+                    "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/pthreadpool/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-rGg6lgLkmbYo+a9CdaXz9ZUyrqJ1rxLcjLJeBEOPAlE=",
-                "rev": "560c60d342a76076f0557a3946924c6478470044",
-                "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git"
+                "args": {
+                    "hash": "sha256-rGg6lgLkmbYo+a9CdaXz9ZUyrqJ1rxLcjLJeBEOPAlE=",
+                    "rev": "560c60d342a76076f0557a3946924c6478470044",
+                    "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/pyelftools": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=",
-                "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae",
-                "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git"
+                "args": {
+                    "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=",
+                    "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae",
+                    "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=",
+                    "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2",
+                    "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-N1uFoNd3mz/LH1z06581Ds7BUyc67SNXUPzqomYREr8=",
+                    "rev": "413da873d93a03d3662f24b881ea459a79f9c589",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/re2/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc=",
-                "rev": "6dcd83d60f7944926bfd308cc13979fc53dd69ca",
-                "url": "https://chromium.googlesource.com/external/github.com/google/re2.git"
+                "args": {
+                    "hash": "sha256-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc=",
+                    "rev": "6dcd83d60f7944926bfd308cc13979fc53dd69ca",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/re2.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/ruy/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-4NVvqUZn2BdwTxJINTHwPeRqbGXZrWdcd7jv1Y+eoKY=",
-                "rev": "c08ec529fc91722bde519628d9449258082eb847",
-                "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git"
+                "args": {
+                    "hash": "sha256-4NVvqUZn2BdwTxJINTHwPeRqbGXZrWdcd7jv1Y+eoKY=",
+                    "rev": "c08ec529fc91722bde519628d9449258082eb847",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/securemessage/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=",
-                "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84",
-                "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git"
+                "args": {
+                    "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=",
+                    "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/skia": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-e+oaFqj0D7jKiyDJRmT3BWZEd9j9BKkTdMg8hUOAvzA=",
-                "rev": "ee9db7d1348f76780fd0184b9b0243d653e36411",
-                "url": "https://skia.googlesource.com/skia.git"
+                "args": {
+                    "hash": "sha256-e+oaFqj0D7jKiyDJRmT3BWZEd9j9BKkTdMg8hUOAvzA=",
+                    "rev": "ee9db7d1348f76780fd0184b9b0243d653e36411",
+                    "url": "https://skia.googlesource.com/skia.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/smhasher/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=",
-                "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f",
-                "url": "https://chromium.googlesource.com/external/smhasher.git"
+                "args": {
+                    "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=",
+                    "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f",
+                    "url": "https://chromium.googlesource.com/external/smhasher.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/snappy/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=",
-                "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c",
-                "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git"
+                "args": {
+                    "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=",
+                    "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU=",
+                    "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d",
+                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/spirv-cross/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=",
-                "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross"
+                "args": {
+                    "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=",
+                    "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-FrT/kVIMjcu2zv+7kDeNKM77NnOyMBb8pV0w8DBP42A=",
+                    "rev": "996c728cf7dcfb29845cfa15222822318f047810",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-m/a1i26u8lzpKuQHyAy6ktWWjbLZEaio1awz8VovTGE=",
+                    "rev": "9117e042b93d4ff08d2406542708170f77aaa2a3",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/sqlite/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-ltl3OTk/wZPSj3yYthNlKd3mBxef6l5uW6UYTwebNek=",
-                "rev": "567495a62a62dc013888500526e82837d727fe01",
-                "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git"
+                "args": {
+                    "hash": "sha256-ltl3OTk/wZPSj3yYthNlKd3mBxef6l5uW6UYTwebNek=",
+                    "rev": "567495a62a62dc013888500526e82837d727fe01",
+                    "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/squirrel.mac": {
-                "fetcher": "fetchFromGitHub",
-                "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=",
-                "owner": "Squirrel",
-                "repo": "Squirrel.Mac",
-                "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38"
+                "args": {
+                    "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=",
+                    "owner": "Squirrel",
+                    "repo": "Squirrel.Mac",
+                    "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38"
+                },
+                "fetcher": "fetchFromGitHub"
             },
             "src/third_party/squirrel.mac/vendor/Mantle": {
-                "fetcher": "fetchFromGitHub",
-                "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=",
-                "owner": "Mantle",
-                "repo": "Mantle",
-                "rev": "78d3966b3c331292ea29ec38661b25df0a245948"
+                "args": {
+                    "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=",
+                    "owner": "Mantle",
+                    "repo": "Mantle",
+                    "rev": "78d3966b3c331292ea29ec38661b25df0a245948"
+                },
+                "fetcher": "fetchFromGitHub"
             },
             "src/third_party/squirrel.mac/vendor/ReactiveObjC": {
-                "fetcher": "fetchFromGitHub",
-                "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=",
-                "owner": "ReactiveCocoa",
-                "repo": "ReactiveObjC",
-                "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76"
+                "args": {
+                    "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=",
+                    "owner": "ReactiveCocoa",
+                    "repo": "ReactiveObjC",
+                    "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76"
+                },
+                "fetcher": "fetchFromGitHub"
             },
             "src/third_party/swiftshader": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-h2BHyaOM0oscfX5cu8s4N1yyOkg/yQbvwD1DxF+RAQc=",
-                "rev": "d5c4284774115bb1e32c012a2be1b5fbeb1ab1f9",
-                "url": "https://swiftshader.googlesource.com/SwiftShader.git"
+                "args": {
+                    "hash": "sha256-h2BHyaOM0oscfX5cu8s4N1yyOkg/yQbvwD1DxF+RAQc=",
+                    "rev": "d5c4284774115bb1e32c012a2be1b5fbeb1ab1f9",
+                    "url": "https://swiftshader.googlesource.com/SwiftShader.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=",
+                    "rev": "c036420683f672d685e27415de0a5f5e85bdc23f",
+                    "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-gOUt/NljRK5wMFwy2aLqZ5NHwk4y/GxbQ+AZ3MxM0M8=",
+                    "rev": "658227d3b535287dc6859788bde6076c4fe3fe7c",
+                    "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/ukey2/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=",
-                "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47",
-                "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git"
+                "args": {
+                    "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=",
+                    "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/vulkan-deps": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-LVWvbMLjkMyAUM+0UpQ4oRsfcRU5F/xY60wiwxth4Ko=",
-                "rev": "0b56dd5952b25fad65139b64096fcd187048ed38",
-                "url": "https://chromium.googlesource.com/vulkan-deps"
+                "args": {
+                    "hash": "sha256-LVWvbMLjkMyAUM+0UpQ4oRsfcRU5F/xY60wiwxth4Ko=",
+                    "rev": "0b56dd5952b25fad65139b64096fcd187048ed38",
+                    "url": "https://chromium.googlesource.com/vulkan-deps"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-exXzafLgrgxyRvaF+4pCF+OLtPT2gDmcvzazQ4EQ1eA=",
+                    "rev": "cbcad3c0587dddc768d76641ea00f5c45ab5a278",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-NDp2TLeMLAHb92R+PjaPDTx8ckIlpSsS3BNx3lerB68=",
+                    "rev": "b0177a972b8d47e823a4500cf88df88a8c27add7",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-PiWKL045DAOGm+Hl/UyO6vmD4fVfuf2fSvXK6gSYbwo=",
+                    "rev": "15f2de809304aba619ee327f3273425418ca83de",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-luDw6g/EMSK67Et2wNta74PHGQU6Y7IRpDlSpgDYV6Q=",
+                    "rev": "87ab6b39a97d084a2ef27db85e3cbaf5d2622a09",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-WWV+P++0Czeqg5p2UTqIP81pY8oz7cS7E7Z/sc0km6g=",
+                    "rev": "bc2c38412f739c298d6f5c076c064e6b5696959f",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=",
+                    "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21",
+                    "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=",
+                    "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0",
+                    "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=",
+                    "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e",
+                    "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-o/adWEXYSqWib6KoK7XMCWbojapcS4O/CEPxv7iFCw8=",
+                    "rev": "7d5a3a8b494ae44cd9651f9505e88a250082765e",
+                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-oK0Z8xO2ILuySGZS0m37ZF0MOyle2l8AXb0/6wai0/w=",
+                    "rev": "a156431ea66fe67d69c9fbba8a8ad34dabbab81c",
+                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/webdriver/pylib": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=",
-                "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04",
-                "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git"
+                "args": {
+                    "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=",
+                    "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04",
+                    "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/webgl/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-32r3BdmsNA89mo0k+vK1G3718AOjseE7cJlopZ/0pSw=",
-                "rev": "450cceb587613ac1469c5a131fac15935c99e0e7",
-                "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git"
+                "args": {
+                    "hash": "sha256-32r3BdmsNA89mo0k+vK1G3718AOjseE7cJlopZ/0pSw=",
+                    "rev": "450cceb587613ac1469c5a131fac15935c99e0e7",
+                    "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-Dd5uWNtnBIc2jiMkh9KjI5O1tJtmMvdlMA2nf+VOkQQ=",
+                    "rev": "b9f32fd2943dd2b3d0033bf938c9d843f4b5c9a9",
+                    "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/webrtc": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-S8kGTd3+lf5OTayCMOqqrjxH4tcbT0NLZBpKmTCysMs=",
-                "rev": "afaf497805cbb502da89991c2dcd783201efdd08",
-                "url": "https://webrtc.googlesource.com/src.git"
+                "args": {
+                    "hash": "sha256-S8kGTd3+lf5OTayCMOqqrjxH4tcbT0NLZBpKmTCysMs=",
+                    "rev": "afaf497805cbb502da89991c2dcd783201efdd08",
+                    "url": "https://webrtc.googlesource.com/src.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=",
+                    "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7",
+                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=",
+                    "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8",
+                    "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/xdg-utils": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=",
-                "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44",
-                "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git"
+                "args": {
+                    "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=",
+                    "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44",
+                    "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-aDPlmLxNY9M5+Qb8VtdfxphHXU/X6JwYhkUSXkLh/FE=",
+                    "rev": "d1d33679661a34f03a806af2b813f699db3004f9",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/zstd/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-4J/F2v2W3mMdhqQ4q35gYkGaqTKlcG6OxUt3vQ8pcLs=",
-                "rev": "7fb5347e88f10472226c9aa1962a148e55d8c480",
-                "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git"
+                "args": {
+                    "hash": "sha256-4J/F2v2W3mMdhqQ4q35gYkGaqTKlcG6OxUt3vQ8pcLs=",
+                    "rev": "7fb5347e88f10472226c9aa1962a148e55d8c480",
+                    "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/tools/page_cycler/acid3": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=",
-                "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba",
-                "url": "https://chromium.googlesource.com/chromium/deps/acid3.git"
+                "args": {
+                    "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=",
+                    "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba",
+                    "url": "https://chromium.googlesource.com/chromium/deps/acid3.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/v8": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-o+THwG/lBFw495DxAckGPeoiTV5zOopVF4B3MXmraf0=",
-                "rev": "7130a7a08a7075cc1967528402ec536f6fd85ed2",
-                "url": "https://chromium.googlesource.com/v8/v8.git"
+                "args": {
+                    "hash": "sha256-o+THwG/lBFw495DxAckGPeoiTV5zOopVF4B3MXmraf0=",
+                    "rev": "7130a7a08a7075cc1967528402ec536f6fd85ed2",
+                    "url": "https://chromium.googlesource.com/v8/v8.git"
+                },
+                "fetcher": "fetchFromGitiles"
             }
         },
         "electron_yarn_hash": "10ny8cj2m8wn8zb5ljsfc8rpv6y4rp049zv5i5slyk3lj2zpgr6y",
         "modules": "132",
-        "node": "20.18.3",
-        "version": "34.4.1"
+        "node": "20.19.0",
+        "version": "34.5.0"
     },
     "35": {
-        "chrome": "134.0.6998.178",
+        "chrome": "134.0.6998.179",
         "chromium": {
             "deps": {
                 "gn": {
@@ -1928,982 +2548,1302 @@
                     "version": "2025-01-13"
                 }
             },
-            "version": "134.0.6998.178"
+            "version": "134.0.6998.179"
         },
         "chromium_npm_hash": "sha256-oVoTruhxTymYiGkELd2Oa1wOfjGLtChQZozP4GzOO1A=",
         "deps": {
             "src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-9oFVt+a34Zes3fivgmqRprKPBMjvXWVxfA2J1Q9QWPU=",
-                "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": "134.0.6998.178",
-                "url": "https://chromium.googlesource.com/chromium/src.git"
+                "args": {
+                    "hash": "sha256-DI59KsXSy7xQIdHSpl++4S26sLP6lHqMGx1U1xi+pZY=",
+                    "postFetch": "rm -r $out/third_party/blink/web_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": "134.0.6998.179",
+                    "url": "https://chromium.googlesource.com/chromium/src.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/chrome/test/data/perf/canvas_bench": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=",
-                "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732",
-                "url": "https://chromium.googlesource.com/chromium/canvas_bench.git"
+                "args": {
+                    "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=",
+                    "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732",
+                    "url": "https://chromium.googlesource.com/chromium/canvas_bench.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=",
+                    "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9",
+                    "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=",
+                    "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248",
+                    "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/docs/website": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-f3Tdz0ykxQ2FHbNweJwPdAZHA8eVpjPuxqRpxwhYtRM=",
-                "rev": "600fc3a0b121d5007b4bb97b001e756625e6d418",
-                "url": "https://chromium.googlesource.com/website.git"
+                "args": {
+                    "hash": "sha256-f3Tdz0ykxQ2FHbNweJwPdAZHA8eVpjPuxqRpxwhYtRM=",
+                    "rev": "600fc3a0b121d5007b4bb97b001e756625e6d418",
+                    "url": "https://chromium.googlesource.com/website.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/electron": {
-                "fetcher": "fetchFromGitHub",
-                "hash": "sha256-30Y/IhEyoFFXdhe94WP7wBLEsNRvZRs1I7tXSPYWI4Y=",
-                "owner": "electron",
-                "repo": "electron",
-                "rev": "v35.1.2"
+                "args": {
+                    "hash": "sha256-P7GjUmkATDOo2B/uLs5Pv3E+meFoenwe2FTkIEc/Go0=",
+                    "owner": "electron",
+                    "repo": "electron",
+                    "rev": "v35.1.4"
+                },
+                "fetcher": "fetchFromGitHub"
             },
             "src/media/cdm/api": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-FgeuOsxToA4qx3H76czCPeO/WVtprRkllDMPancw3Ik=",
-                "rev": "5a1675c86821a48f8983842d07f774df28dfb43c",
-                "url": "https://chromium.googlesource.com/chromium/cdm.git"
+                "args": {
+                    "hash": "sha256-FgeuOsxToA4qx3H76czCPeO/WVtprRkllDMPancw3Ik=",
+                    "rev": "5a1675c86821a48f8983842d07f774df28dfb43c",
+                    "url": "https://chromium.googlesource.com/chromium/cdm.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/net/third_party/quiche/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-5YFqWgkyQ/PUKTkk1j3mAFD8JMbI+E4XRdSq34HFMWA=",
-                "rev": "e7d001c82ee5bead5140481671828d5e156a525a",
-                "url": "https://quiche.googlesource.com/quiche.git"
+                "args": {
+                    "hash": "sha256-5YFqWgkyQ/PUKTkk1j3mAFD8JMbI+E4XRdSq34HFMWA=",
+                    "rev": "e7d001c82ee5bead5140481671828d5e156a525a",
+                    "url": "https://quiche.googlesource.com/quiche.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/testing/libfuzzer/fuzzers/wasm_corpus": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-gItDOfNqm1tHlmelz3l2GGdiKi9adu1EpPP6U7+8EQY=",
-                "rev": "1df5e50a45db9518a56ebb42cb020a94a090258b",
-                "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git"
+                "args": {
+                    "hash": "sha256-gItDOfNqm1tHlmelz3l2GGdiKi9adu1EpPP6U7+8EQY=",
+                    "rev": "1df5e50a45db9518a56ebb42cb020a94a090258b",
+                    "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-mzVgoxxBWebesG6okyMxxmO6oH+TITA4o9ucHHMMzkQ=",
+                    "rev": "4a764c690353ea136c82f1a696a70bf38d1ef5fe",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/Accessibility-Test-Framework-for-Android.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/angle": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-Y4eX8YHwVXiXW4U8KGbFd4fTU/v/EAUpfwv6lB127Y4=",
-                "rev": "914c97c116e09ef01a99fbbbe9cd28cda56552c7",
-                "url": "https://chromium.googlesource.com/angle/angle.git"
+                "args": {
+                    "hash": "sha256-Y4eX8YHwVXiXW4U8KGbFd4fTU/v/EAUpfwv6lB127Y4=",
+                    "rev": "914c97c116e09ef01a99fbbbe9cd28cda56552c7",
+                    "url": "https://chromium.googlesource.com/angle/angle.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/angle/third_party/VK-GL-CTS/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-g59uC7feByGR1Ema8LqUCr5XWKpDMeXXvlS2thOo5Ks=",
-                "rev": "48e7f3020f52ef9adc31aa0f5db01dc42cc487cd",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS"
+                "args": {
+                    "hash": "sha256-g59uC7feByGR1Ema8LqUCr5XWKpDMeXXvlS2thOo5Ks=",
+                    "rev": "48e7f3020f52ef9adc31aa0f5db01dc42cc487cd",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/angle/third_party/glmark2/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-kqBpWHCxUl1ekmrbdPn6cL2y75nK4FxECJ5mo83Zgf4=",
-                "rev": "cb550a25c75a99ae0def91a02e16ae29d73e6d1e",
-                "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2"
+                "args": {
+                    "hash": "sha256-kqBpWHCxUl1ekmrbdPn6cL2y75nK4FxECJ5mo83Zgf4=",
+                    "rev": "cb550a25c75a99ae0def91a02e16ae29d73e6d1e",
+                    "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=",
+                    "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f",
+                    "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/anonymous_tokens/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-mh4s57NonFQzWNaPiKfe9kW4Ow7XAN+hW6Xpvgjvb0w=",
-                "rev": "2e328dd4eace9648adcc943cac6a1792b5dcdec5",
-                "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git"
+                "args": {
+                    "hash": "sha256-mh4s57NonFQzWNaPiKfe9kW4Ow7XAN+hW6Xpvgjvb0w=",
+                    "rev": "2e328dd4eace9648adcc943cac6a1792b5dcdec5",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/beto-core/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-QPFGjtu/I0r4+dTQ2eSlWIEYwJ43B3yW0q4QtVFTVGY=",
-                "rev": "89563fec14c756482afa08b016eeba9087c8d1e3",
-                "url": "https://beto-core.googlesource.com/beto-core.git"
+                "args": {
+                    "hash": "sha256-QPFGjtu/I0r4+dTQ2eSlWIEYwJ43B3yW0q4QtVFTVGY=",
+                    "rev": "89563fec14c756482afa08b016eeba9087c8d1e3",
+                    "url": "https://beto-core.googlesource.com/beto-core.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/boringssl/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-g9i5v11uZy/3Smn8zSCFmC27Gdp5VP2b0ROrj+VmP1k=",
-                "rev": "ea42fe28775844ec8fe0444fc421398be42d51fe",
-                "url": "https://boringssl.googlesource.com/boringssl.git"
+                "args": {
+                    "hash": "sha256-g9i5v11uZy/3Smn8zSCFmC27Gdp5VP2b0ROrj+VmP1k=",
+                    "rev": "ea42fe28775844ec8fe0444fc421398be42d51fe",
+                    "url": "https://boringssl.googlesource.com/boringssl.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/breakpad/breakpad": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-jOTRgF2WxsX5P0LgUI9zdCc0+NcqSnO310aq15msThY=",
-                "rev": "0dfd77492fdb0dcd06027c5842095e2e908adc90",
-                "url": "https://chromium.googlesource.com/breakpad/breakpad.git"
+                "args": {
+                    "hash": "sha256-jOTRgF2WxsX5P0LgUI9zdCc0+NcqSnO310aq15msThY=",
+                    "rev": "0dfd77492fdb0dcd06027c5842095e2e908adc90",
+                    "url": "https://chromium.googlesource.com/breakpad/breakpad.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/cast_core/public/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-o5/Lbhh6HHSWCVCEyDwDCgs+PLm67si981w0HuIWY7c=",
-                "rev": "fbc5e98031e1271a0a566fcd4d9092b2d3275d05",
-                "url": "https://chromium.googlesource.com/cast_core/public"
+                "args": {
+                    "hash": "sha256-o5/Lbhh6HHSWCVCEyDwDCgs+PLm67si981w0HuIWY7c=",
+                    "rev": "fbc5e98031e1271a0a566fcd4d9092b2d3275d05",
+                    "url": "https://chromium.googlesource.com/cast_core/public"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/catapult": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-xkvz743+w0xsI0w4reAo2rfC4J7opl1biA3eNYuRn+o=",
-                "rev": "d5166861902b565df446e15181eba270fe168275",
-                "url": "https://chromium.googlesource.com/catapult.git"
+                "args": {
+                    "hash": "sha256-xkvz743+w0xsI0w4reAo2rfC4J7opl1biA3eNYuRn+o=",
+                    "rev": "d5166861902b565df446e15181eba270fe168275",
+                    "url": "https://chromium.googlesource.com/catapult.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=",
+                    "rev": "ba412eaaacd3186085babcd901679a48863c7dd5",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/chromium-variations": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-zXAmoKyj104BaIe4Rug18WbVKkyAsyWPCTPPEerinVo=",
-                "rev": "84c18c7a0205fbd0a27b0214b16ded7fc44dc062",
-                "url": "https://chromium.googlesource.com/chromium-variations.git"
+                "args": {
+                    "hash": "sha256-zXAmoKyj104BaIe4Rug18WbVKkyAsyWPCTPPEerinVo=",
+                    "rev": "84c18c7a0205fbd0a27b0214b16ded7fc44dc062",
+                    "url": "https://chromium.googlesource.com/chromium-variations.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/clang-format/script": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-d9uweklBffiuCWEb03ti1eFLnMac2qRtvggzXY1n/RU=",
-                "rev": "37f6e68a107df43b7d7e044fd36a13cbae3413f2",
-                "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git"
+                "args": {
+                    "hash": "sha256-d9uweklBffiuCWEb03ti1eFLnMac2qRtvggzXY1n/RU=",
+                    "rev": "37f6e68a107df43b7d7e044fd36a13cbae3413f2",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=",
+                    "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/colorama/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=",
-                "rev": "3de9f013df4b470069d03d250224062e8cf15c49",
-                "url": "https://chromium.googlesource.com/external/colorama.git"
+                "args": {
+                    "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=",
+                    "rev": "3de9f013df4b470069d03d250224062e8cf15c49",
+                    "url": "https://chromium.googlesource.com/external/colorama.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=",
+                    "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc",
+                    "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=",
+                    "rev": "936b9ab5515dead115606559502e3864958f7f6e",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/cpuinfo/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-dKmZ5YXLhvVdxaJ4PefR+SWlh+MTFHNxOMeM6Vj7Gvo=",
-                "rev": "8a1772a0c5c447df2d18edf33ec4603a8c9c04a6",
-                "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git"
+                "args": {
+                    "hash": "sha256-dKmZ5YXLhvVdxaJ4PefR+SWlh+MTFHNxOMeM6Vj7Gvo=",
+                    "rev": "8a1772a0c5c447df2d18edf33ec4603a8c9c04a6",
+                    "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/crabbyavif/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-+6339vcd0KJj5V11dvJvs0YpQpTxsLmDuBoYVzyn9Ec=",
-                "rev": "c5938b119ef52f9ff628436c1e66c9a5322ece83",
-                "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git"
+                "args": {
+                    "hash": "sha256-+6339vcd0KJj5V11dvJvs0YpQpTxsLmDuBoYVzyn9Ec=",
+                    "rev": "c5938b119ef52f9ff628436c1e66c9a5322ece83",
+                    "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-KBraGaO5LmmPP+p8RuDogGldbTWdNDK+WzF4Q09keuE=",
+                    "rev": "d3d60ac6e0f16780bcfcc825385e1d338801a558",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/cros-components/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-80WqSMP5Vlc4OY+gfpU3SRGavs7fJbTQVW1AIhq6jmE=",
-                "rev": "1f1c782f06956a2deb5d33f09c466e4852099c71",
-                "url": "https://chromium.googlesource.com/external/google3/cros_components.git"
+                "args": {
+                    "hash": "sha256-80WqSMP5Vlc4OY+gfpU3SRGavs7fJbTQVW1AIhq6jmE=",
+                    "rev": "1f1c782f06956a2deb5d33f09c466e4852099c71",
+                    "url": "https://chromium.googlesource.com/external/google3/cros_components.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/cros_system_api": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-xUaGf4MaEXg2RHgrGS1Uuz97vq5Vbt4HFV/AXYB4lCA=",
-                "rev": "ea21b22629965105426f3df5e58190513e95a17e",
-                "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git"
+                "args": {
+                    "hash": "sha256-xUaGf4MaEXg2RHgrGS1Uuz97vq5Vbt4HFV/AXYB4lCA=",
+                    "rev": "ea21b22629965105426f3df5e58190513e95a17e",
+                    "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/crossbench": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-EL+lOTe1Vzg4JW2q7t3UoXzHHiEmLjf7khH9fXdplbo=",
-                "rev": "0391f0d11cbf3cf3c5bcf82e19e9d9839b1936ed",
-                "url": "https://chromium.googlesource.com/crossbench.git"
+                "args": {
+                    "hash": "sha256-EL+lOTe1Vzg4JW2q7t3UoXzHHiEmLjf7khH9fXdplbo=",
+                    "rev": "0391f0d11cbf3cf3c5bcf82e19e9d9839b1936ed",
+                    "url": "https://chromium.googlesource.com/crossbench.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/dav1d/libdav1d": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-qcs9QoZ/uWEQ8l1ChZ8nYctZnnWJ0VvCw1q2rEktC9g=",
-                "rev": "42b2b24fb8819f1ed3643aa9cf2a62f03868e3aa",
-                "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git"
+                "args": {
+                    "hash": "sha256-qcs9QoZ/uWEQ8l1ChZ8nYctZnnWJ0VvCw1q2rEktC9g=",
+                    "rev": "42b2b24fb8819f1ed3643aa9cf2a62f03868e3aa",
+                    "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/dawn": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-aYlcplXSGjFov9dqql6d+a1PxJWtZJNQaaezof0u9QQ=",
-                "rev": "7056f50fdefc6bc46aa442e720d0336e2855b570",
-                "url": "https://dawn.googlesource.com/dawn.git"
+                "args": {
+                    "hash": "sha256-aYlcplXSGjFov9dqql6d+a1PxJWtZJNQaaezof0u9QQ=",
+                    "rev": "7056f50fdefc6bc46aa442e720d0336e2855b570",
+                    "url": "https://dawn.googlesource.com/dawn.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/dawn/third_party/dxc": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-jecGwARtdSr2OEC68749mpFUAHuYP/IzYUZyj23CwJE=",
-                "rev": "c2ed9ad4ee775f3de903ce757c994aecc59a5306",
-                "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler"
+                "args": {
+                    "hash": "sha256-jecGwARtdSr2OEC68749mpFUAHuYP/IzYUZyj23CwJE=",
+                    "rev": "c2ed9ad4ee775f3de903ce757c994aecc59a5306",
+                    "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=",
+                    "rev": "980971e835876dc0cde415e8f9bc646e64667bf7",
+                    "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-E1zXIDiw87badrLOZTvV+Wh9NZHu51nb70ZK9vlAlqE=",
+                    "rev": "b35641f4a3c62aa86a0b3c983d163bc0fe36026d",
+                    "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=",
+                    "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=",
+                    "rev": "5bae8738b23d06968e7c3a41308568120943ae77",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/dawn/third_party/webgpu-cts": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-AEGYE2rSsPcRzJSm97DGsrPVbhCH+lyVI61Z4qavKc8=",
-                "rev": "24d5dfa7725d6ece31941c3f3343ba6362986d6b",
-                "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts"
+                "args": {
+                    "hash": "sha256-AEGYE2rSsPcRzJSm97DGsrPVbhCH+lyVI61Z4qavKc8=",
+                    "rev": "24d5dfa7725d6ece31941c3f3343ba6362986d6b",
+                    "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/depot_tools": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-BvEkk15Rm4nSoV/uWiwmQW/+gg2vpLQ187TbBAHl9Rk=",
-                "rev": "e42fac3e9c1726ab14a61a25e6291d9ccc49e688",
-                "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
+                "args": {
+                    "hash": "sha256-BvEkk15Rm4nSoV/uWiwmQW/+gg2vpLQ187TbBAHl9Rk=",
+                    "rev": "e42fac3e9c1726ab14a61a25e6291d9ccc49e688",
+                    "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/devtools-frontend/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-rdBpJWdQ5VtFnIfbr/Vq1q1euSvkbY8iIqyuTMAS2KM=",
-                "rev": "65b3f414b81ffe4df49202af6fc75bc26a3cb109",
-                "url": "https://chromium.googlesource.com/devtools/devtools-frontend"
+                "args": {
+                    "hash": "sha256-rdBpJWdQ5VtFnIfbr/Vq1q1euSvkbY8iIqyuTMAS2KM=",
+                    "rev": "65b3f414b81ffe4df49202af6fc75bc26a3cb109",
+                    "url": "https://chromium.googlesource.com/devtools/devtools-frontend"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=",
+                    "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d",
+                    "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-fYxoA0fxKe9U23j+Jp0MWj4m7RfsRpM0XjF6/yOhX1I=",
+                    "rev": "053714bccbda79cf76dac3fee48ab2b27f21925e",
+                    "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/eigen3/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-WG7uiduuMnXrvEpXJNGksrYkBsim+l7eiu5N+mx0Yr0=",
-                "rev": "2a35a917be47766a895be610bedd66006980b7e6",
-                "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git"
+                "args": {
+                    "hash": "sha256-WG7uiduuMnXrvEpXJNGksrYkBsim+l7eiu5N+mx0Yr0=",
+                    "rev": "2a35a917be47766a895be610bedd66006980b7e6",
+                    "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/electron_node": {
-                "fetcher": "fetchFromGitHub",
-                "hash": "sha256-bJPSHe3CsL9T1SYwC8hyDbAMqj/5WvgM8VqQU9mpVww=",
-                "owner": "nodejs",
-                "repo": "node",
-                "rev": "v22.14.0"
+                "args": {
+                    "hash": "sha256-bJPSHe3CsL9T1SYwC8hyDbAMqj/5WvgM8VqQU9mpVww=",
+                    "owner": "nodejs",
+                    "repo": "node",
+                    "rev": "v22.14.0"
+                },
+                "fetcher": "fetchFromGitHub"
             },
             "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"
+                "args": {
+                    "hash": "sha256-KdQdKBBipEBRT8UmNGao6yCB4m2CU8/SrMVvcXlb5qE=",
+                    "rev": "955936be8b391e00835257059607d7c5b72ce744",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/engflow-reclient-configs": {
-                "fetcher": "fetchFromGitHub",
-                "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=",
-                "owner": "EngFlow",
-                "repo": "reclient-configs",
-                "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d"
+                "args": {
+                    "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=",
+                    "owner": "EngFlow",
+                    "repo": "reclient-configs",
+                    "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d"
+                },
+                "fetcher": "fetchFromGitHub"
             },
             "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"
+                "args": {
+                    "hash": "sha256-Iwu9+i/0vsPyu6pOWFxjNNblVxMl6bTPW5eWyaju4Mg=",
+                    "rev": "624da0f593bb8d7e146b9f42b06d8e6c80d032a3",
+                    "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=",
+                    "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/fast_float/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-CG5je117WYyemTe5PTqznDP0bvY5TeXn8Vu1Xh5yUzQ=",
-                "rev": "cb1d42aaa1e14b09e1452cfdef373d051b8c02a4",
-                "url": "https://chromium.googlesource.com/external/github.com/fastfloat/fast_float.git"
+                "args": {
+                    "hash": "sha256-CG5je117WYyemTe5PTqznDP0bvY5TeXn8Vu1Xh5yUzQ=",
+                    "rev": "cb1d42aaa1e14b09e1452cfdef373d051b8c02a4",
+                    "url": "https://chromium.googlesource.com/external/github.com/fastfloat/fast_float.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/ffmpeg": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-OXumpRb9XB38dOCJmL3jDcabiJ08wAvydVlJwMgpCoQ=",
-                "rev": "d10a0f8bf5ddcce572df95105152bc74041cae0c",
-                "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git"
+                "args": {
+                    "hash": "sha256-OXumpRb9XB38dOCJmL3jDcabiJ08wAvydVlJwMgpCoQ=",
+                    "rev": "d10a0f8bf5ddcce572df95105152bc74041cae0c",
+                    "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/flac": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=",
-                "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c",
-                "url": "https://chromium.googlesource.com/chromium/deps/flac.git"
+                "args": {
+                    "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=",
+                    "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c",
+                    "url": "https://chromium.googlesource.com/chromium/deps/flac.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/flatbuffers/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-tbc45o0MbMvK5XqRUJt5Eg8BU6+TJqlmwFgQhHq6wRM=",
-                "rev": "8db59321d9f02cdffa30126654059c7d02f70c32",
-                "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git"
+                "args": {
+                    "hash": "sha256-tbc45o0MbMvK5XqRUJt5Eg8BU6+TJqlmwFgQhHq6wRM=",
+                    "rev": "8db59321d9f02cdffa30126654059c7d02f70c32",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/fontconfig/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-W5WIgC6A52kY4fNkbsDEa0o+dfd97Rl5NKfgnIRpI00=",
-                "rev": "14d466b30a8ab4a9d789977ed94f2c30e7209267",
-                "url": "https://chromium.googlesource.com/external/fontconfig.git"
+                "args": {
+                    "hash": "sha256-W5WIgC6A52kY4fNkbsDEa0o+dfd97Rl5NKfgnIRpI00=",
+                    "rev": "14d466b30a8ab4a9d789977ed94f2c30e7209267",
+                    "url": "https://chromium.googlesource.com/external/fontconfig.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/fp16/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=",
-                "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91",
-                "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git"
+                "args": {
+                    "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=",
+                    "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91",
+                    "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/freetype-testing/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-cpzz5QDeAT3UgAZzwW7c0SgLDQsBwy/1Q+5hz2XW4lE=",
-                "rev": "04fa94191645af39750f5eff0a66c49c5cb2c2cc",
-                "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git"
+                "args": {
+                    "hash": "sha256-cpzz5QDeAT3UgAZzwW7c0SgLDQsBwy/1Q+5hz2XW4lE=",
+                    "rev": "04fa94191645af39750f5eff0a66c49c5cb2c2cc",
+                    "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/freetype/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-YxWz3O9see1dktqZnC551V12yU5jcOERTB1Hn1lwUNM=",
-                "rev": "b1f47850878d232eea372ab167e760ccac4c4e32",
-                "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git"
+                "args": {
+                    "hash": "sha256-YxWz3O9see1dktqZnC551V12yU5jcOERTB1Hn1lwUNM=",
+                    "rev": "b1f47850878d232eea372ab167e760ccac4c4e32",
+                    "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/fuzztest/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-AKXKxXqOMUb3APf5r15NmIMyhJ4ZmW5+t7y5XdgdZkw=",
-                "rev": "44ac6c2594a880edbb9cb1e4e197c2b53d078130",
-                "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git"
+                "args": {
+                    "hash": "sha256-AKXKxXqOMUb3APf5r15NmIMyhJ4ZmW5+t7y5XdgdZkw=",
+                    "rev": "44ac6c2594a880edbb9cb1e4e197c2b53d078130",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/fxdiv/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=",
-                "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8",
-                "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git"
+                "args": {
+                    "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=",
+                    "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8",
+                    "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/gemmlowp/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=",
-                "rev": "13d57703abca3005d97b19df1f2db731607a7dc2",
-                "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git"
+                "args": {
+                    "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=",
+                    "rev": "13d57703abca3005d97b19df1f2db731607a7dc2",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/glslang/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-LwspMo771iaV5YeEJWgdb8xi37KMa0rsSdvO3uqMOAI=",
-                "rev": "0549c7127c2fbab2904892c9d6ff491fa1e93751",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang"
+                "args": {
+                    "hash": "sha256-LwspMo771iaV5YeEJWgdb8xi37KMa0rsSdvO3uqMOAI=",
+                    "rev": "0549c7127c2fbab2904892c9d6ff491fa1e93751",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/google_benchmark/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-cH8s1gP6kCcojAAfTt5iQCVqiAaSooNk4BdaILujM3w=",
-                "rev": "761305ec3b33abf30e08d50eb829e19a802581cc",
-                "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git"
+                "args": {
+                    "hash": "sha256-cH8s1gP6kCcojAAfTt5iQCVqiAaSooNk4BdaILujM3w=",
+                    "rev": "761305ec3b33abf30e08d50eb829e19a802581cc",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/googletest/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-jpXIcz5Uy6fDEvxTq8rTFx/M+0+SQ6TCDaqnp7nMtng=",
-                "rev": "e235eb34c6c4fed790ccdad4b16394301360dcd4",
-                "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git"
+                "args": {
+                    "hash": "sha256-jpXIcz5Uy6fDEvxTq8rTFx/M+0+SQ6TCDaqnp7nMtng=",
+                    "rev": "e235eb34c6c4fed790ccdad4b16394301360dcd4",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/grpc/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-RKGZWtH2JmP2mXN+4ln/nCJvOyzynrYcfrxSY8k1vVg=",
-                "rev": "a363b6c001139b9c8ffb7cd63f60a72f15349c3b",
-                "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git"
+                "args": {
+                    "hash": "sha256-RKGZWtH2JmP2mXN+4ln/nCJvOyzynrYcfrxSY8k1vVg=",
+                    "rev": "a363b6c001139b9c8ffb7cd63f60a72f15349c3b",
+                    "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/harfbuzz-ng/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-isQvwaVdL4cM465A8Gs06VioAu8RvZFrwXDsXhfOoFo=",
-                "rev": "6d8035a99c279e32183ad063f0de201ef1b2f05c",
-                "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git"
+                "args": {
+                    "hash": "sha256-isQvwaVdL4cM465A8Gs06VioAu8RvZFrwXDsXhfOoFo=",
+                    "rev": "6d8035a99c279e32183ad063f0de201ef1b2f05c",
+                    "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/highway/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-IS7m1wBwpPBUNhx2GttY1fzvmLIeAp3o2gXfrFpRdvY=",
-                "rev": "00fe003dac355b979f36157f9407c7c46448958e",
-                "url": "https://chromium.googlesource.com/external/github.com/google/highway.git"
+                "args": {
+                    "hash": "sha256-IS7m1wBwpPBUNhx2GttY1fzvmLIeAp3o2gXfrFpRdvY=",
+                    "rev": "00fe003dac355b979f36157f9407c7c46448958e",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/highway.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/hunspell_dictionaries": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=",
-                "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e",
-                "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git"
+                "args": {
+                    "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=",
+                    "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e",
+                    "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/icu": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-Omv4sp9z44eINXtaE0+1TzIU1q2hWviANA79fmkF78U=",
-                "rev": "c9fb4b3a6fb54aa8c20a03bbcaa0a4a985ffd34b",
-                "url": "https://chromium.googlesource.com/chromium/deps/icu.git"
+                "args": {
+                    "hash": "sha256-Omv4sp9z44eINXtaE0+1TzIU1q2hWviANA79fmkF78U=",
+                    "rev": "c9fb4b3a6fb54aa8c20a03bbcaa0a4a985ffd34b",
+                    "url": "https://chromium.googlesource.com/chromium/deps/icu.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/ink/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-OcGUJxKEjeiYJgknpyb/KvDu76GMaddxWO0Lj7l9Eu8=",
-                "rev": "bf387a71d7def4b48bf24c8e09d412dfb9962746",
-                "url": "https://chromium.googlesource.com/external/github.com/google/ink.git"
+                "args": {
+                    "hash": "sha256-OcGUJxKEjeiYJgknpyb/KvDu76GMaddxWO0Lj7l9Eu8=",
+                    "rev": "bf387a71d7def4b48bf24c8e09d412dfb9962746",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/ink.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-IQ+n+kHdEq8Q8/qaPGMvgD7cPN3zzaY8dbiokq6r/Vs=",
+                    "rev": "0999e4cf816b42c770d07916698bce943b873048",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/instrumented_libs": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-7w5wMcmPcKLS91buxyRdcgaQjbKGFdmrKClvYVO3iko=",
-                "rev": "3cc43119a29158bcde39d288a8def4b8ec49baf8",
-                "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git"
+                "args": {
+                    "hash": "sha256-7w5wMcmPcKLS91buxyRdcgaQjbKGFdmrKClvYVO3iko=",
+                    "rev": "3cc43119a29158bcde39d288a8def4b8ec49baf8",
+                    "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=",
+                    "rev": "42e892d96e47b1f6e29844cc705e148ec4856448",
+                    "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/leveldatabase/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-ANtMVRZmW6iOjDVn2y15ak2fTagFTTaz1Se6flUHL8w=",
-                "rev": "4ee78d7ea98330f7d7599c42576ca99e3c6ff9c5",
-                "url": "https://chromium.googlesource.com/external/leveldb.git"
+                "args": {
+                    "hash": "sha256-ANtMVRZmW6iOjDVn2y15ak2fTagFTTaz1Se6flUHL8w=",
+                    "rev": "4ee78d7ea98330f7d7599c42576ca99e3c6ff9c5",
+                    "url": "https://chromium.googlesource.com/external/leveldb.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libFuzzer/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-Lb+HczYax0T7qvC0/Nwhc5l2szQTUYDouWRMD/Qz7sA=",
-                "rev": "e31b99917861f891308269c36a32363b120126bb",
-                "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git"
+                "args": {
+                    "hash": "sha256-Lb+HczYax0T7qvC0/Nwhc5l2szQTUYDouWRMD/Qz7sA=",
+                    "rev": "e31b99917861f891308269c36a32363b120126bb",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libaddressinput/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-6h4/DQUBoBtuGfbaTL5Te1Z+24qjTaBuIydcTV18j80=",
-                "rev": "2610f7b1043d6784ada41392fc9392d1ea09ea07",
-                "url": "https://chromium.googlesource.com/external/libaddressinput.git"
+                "args": {
+                    "hash": "sha256-6h4/DQUBoBtuGfbaTL5Te1Z+24qjTaBuIydcTV18j80=",
+                    "rev": "2610f7b1043d6784ada41392fc9392d1ea09ea07",
+                    "url": "https://chromium.googlesource.com/external/libaddressinput.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libaom/source/libaom": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-4NOQug0MlWZ18527V3IDuGcxGEJ4b+mZZbdzugWoBgQ=",
-                "rev": "3990233fc06a35944d6d33797e63931802122a95",
-                "url": "https://aomedia.googlesource.com/aom.git"
+                "args": {
+                    "hash": "sha256-4NOQug0MlWZ18527V3IDuGcxGEJ4b+mZZbdzugWoBgQ=",
+                    "rev": "3990233fc06a35944d6d33797e63931802122a95",
+                    "url": "https://aomedia.googlesource.com/aom.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libc++/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-QxEbtsEKCs2Xgulq7nVWtAeOGkIYFOy/L1ROfXa5u8U=",
-                "rev": "2e25154d49c29fa9aa42c30ad4a027bd30123434",
-                "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git"
+                "args": {
+                    "hash": "sha256-QxEbtsEKCs2Xgulq7nVWtAeOGkIYFOy/L1ROfXa5u8U=",
+                    "rev": "2e25154d49c29fa9aa42c30ad4a027bd30123434",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libc++abi/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-ln/DCNYJXVksbwdDBnxCfc4VwtjQlJXF7ktl/NxLupg=",
-                "rev": "634228a732a1d9ae1a6d459556e8fc58707cf961",
-                "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git"
+                "args": {
+                    "hash": "sha256-ln/DCNYJXVksbwdDBnxCfc4VwtjQlJXF7ktl/NxLupg=",
+                    "rev": "634228a732a1d9ae1a6d459556e8fc58707cf961",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libdrm/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-woSYEDUfcEBpYOYnli13wLMt754A7KnUbmTEcFQdFGw=",
-                "rev": "ad78bb591d02162d3b90890aa4d0a238b2a37cde",
-                "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git"
+                "args": {
+                    "hash": "sha256-woSYEDUfcEBpYOYnli13wLMt754A7KnUbmTEcFQdFGw=",
+                    "rev": "ad78bb591d02162d3b90890aa4d0a238b2a37cde",
+                    "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libgav1/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-BgTfWmbcMvJB1KewJpRcMtbOd2FVuJ+fi1zAXBXfkrg=",
-                "rev": "c05bf9be660cf170d7c26bd06bb42b3322180e58",
-                "url": "https://chromium.googlesource.com/codecs/libgav1.git"
+                "args": {
+                    "hash": "sha256-BgTfWmbcMvJB1KewJpRcMtbOd2FVuJ+fi1zAXBXfkrg=",
+                    "rev": "c05bf9be660cf170d7c26bd06bb42b3322180e58",
+                    "url": "https://chromium.googlesource.com/codecs/libgav1.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libipp/libipp": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=",
-                "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f",
-                "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git"
+                "args": {
+                    "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=",
+                    "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f",
+                    "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libjpeg_turbo": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-qgHXAjCDFxQ+QqJ8pSmI1NUvHvKKTi4MkIe1I/+hUAI=",
-                "rev": "927aabfcd26897abb9776ecf2a6c38ea5bb52ab6",
-                "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git"
+                "args": {
+                    "hash": "sha256-qgHXAjCDFxQ+QqJ8pSmI1NUvHvKKTi4MkIe1I/+hUAI=",
+                    "rev": "927aabfcd26897abb9776ecf2a6c38ea5bb52ab6",
+                    "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/liblouis/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=",
-                "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376",
-                "url": "https://chromium.googlesource.com/external/liblouis-github.git"
+                "args": {
+                    "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=",
+                    "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376",
+                    "url": "https://chromium.googlesource.com/external/liblouis-github.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libphonenumber/dist": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-ZbuDrZEUVp/ekjUP8WO/FsjAomRjeDBptT4nQZvTVi4=",
-                "rev": "9d46308f313f2bf8dbce1dfd4f364633ca869ca7",
-                "url": "https://chromium.googlesource.com/external/libphonenumber.git"
+                "args": {
+                    "hash": "sha256-ZbuDrZEUVp/ekjUP8WO/FsjAomRjeDBptT4nQZvTVi4=",
+                    "rev": "9d46308f313f2bf8dbce1dfd4f364633ca869ca7",
+                    "url": "https://chromium.googlesource.com/external/libphonenumber.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=",
+                    "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libsrtp": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-bkG1+ss+1a2rCHGwZjhvf5UaNVbPPZJt9HZSIPBKGwM=",
-                "rev": "a52756acb1c5e133089c798736dd171567df11f5",
-                "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git"
+                "args": {
+                    "hash": "sha256-bkG1+ss+1a2rCHGwZjhvf5UaNVbPPZJt9HZSIPBKGwM=",
+                    "rev": "a52756acb1c5e133089c798736dd171567df11f5",
+                    "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libsync/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=",
-                "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6",
-                "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git"
+                "args": {
+                    "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=",
+                    "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6",
+                    "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libunwind/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-JazjgI+ch9RgnsDgu6p4cT4UmCBor4x4sRi1ClLISAY=",
-                "rev": "e55d8cf51c6db1fdd4bb56c158945ec59772c8ee",
-                "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git"
+                "args": {
+                    "hash": "sha256-JazjgI+ch9RgnsDgu6p4cT4UmCBor4x4sRi1ClLISAY=",
+                    "rev": "e55d8cf51c6db1fdd4bb56c158945ec59772c8ee",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libva-fake-driver/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-em/8rNqwv6szlxyji7mnYr3nObSW/x3OzEEnkiLuqpI=",
-                "rev": "a9bcab9cd6b15d4e3634ca44d5e5f7652c612194",
-                "url": "https://chromium.googlesource.com/chromiumos/platform/libva-fake-driver.git"
+                "args": {
+                    "hash": "sha256-em/8rNqwv6szlxyji7mnYr3nObSW/x3OzEEnkiLuqpI=",
+                    "rev": "a9bcab9cd6b15d4e3634ca44d5e5f7652c612194",
+                    "url": "https://chromium.googlesource.com/chromiumos/platform/libva-fake-driver.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libvpx/source/libvpx": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-2FgBb0HzgMihGsWbEtQqyN2EXZs/y5+ToWL1ZXG35W0=",
-                "rev": "7b3fa8114cf8ef23cbf91e50c368c1ca768d95d5",
-                "url": "https://chromium.googlesource.com/webm/libvpx.git"
+                "args": {
+                    "hash": "sha256-2FgBb0HzgMihGsWbEtQqyN2EXZs/y5+ToWL1ZXG35W0=",
+                    "rev": "7b3fa8114cf8ef23cbf91e50c368c1ca768d95d5",
+                    "url": "https://chromium.googlesource.com/webm/libvpx.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libwebm/source": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-yQ5MIUKtuWQM5SfD74vPeqGEdLJNss2/RBUZfq5701A=",
-                "rev": "b4f01ea3ed6fd00923caa383bb2cf6f7a0b7f633",
-                "url": "https://chromium.googlesource.com/webm/libwebm.git"
+                "args": {
+                    "hash": "sha256-yQ5MIUKtuWQM5SfD74vPeqGEdLJNss2/RBUZfq5701A=",
+                    "rev": "b4f01ea3ed6fd00923caa383bb2cf6f7a0b7f633",
+                    "url": "https://chromium.googlesource.com/webm/libwebm.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libwebp/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-0sKGhXr6Rrpq0eoitAdLQ4l4fgNOzMWIEICrPyzwNz4=",
-                "rev": "2af6c034ac871c967e04c8c9f8bf2dbc2e271b18",
-                "url": "https://chromium.googlesource.com/webm/libwebp.git"
+                "args": {
+                    "hash": "sha256-0sKGhXr6Rrpq0eoitAdLQ4l4fgNOzMWIEICrPyzwNz4=",
+                    "rev": "2af6c034ac871c967e04c8c9f8bf2dbc2e271b18",
+                    "url": "https://chromium.googlesource.com/webm/libwebp.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/libyuv": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-E5ePVHrEXMM8mS1qaUwPTqYO0BdP7TYuUhfX+BCiq/0=",
-                "rev": "5a9a6ea936085310f3b9fbd4a774868e6a984ec4",
-                "url": "https://chromium.googlesource.com/libyuv/libyuv.git"
+                "args": {
+                    "hash": "sha256-E5ePVHrEXMM8mS1qaUwPTqYO0BdP7TYuUhfX+BCiq/0=",
+                    "rev": "5a9a6ea936085310f3b9fbd4a774868e6a984ec4",
+                    "url": "https://chromium.googlesource.com/libyuv/libyuv.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/llvm-libc/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-bF4hV9fY0GLYAHUnxSXkCxdZLMKR3wYWaqYJaM9aQiE=",
-                "rev": "6d0c8ee02e2fd44e69ac30e721e13be463035ee5",
-                "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git"
+                "args": {
+                    "hash": "sha256-bF4hV9fY0GLYAHUnxSXkCxdZLMKR3wYWaqYJaM9aQiE=",
+                    "rev": "6d0c8ee02e2fd44e69ac30e721e13be463035ee5",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/lss": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=",
-                "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521",
-                "url": "https://chromium.googlesource.com/linux-syscall-support.git"
+                "args": {
+                    "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=",
+                    "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521",
+                    "url": "https://chromium.googlesource.com/linux-syscall-support.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-Y85XU+z9W6tvmDNHJ/dXQnUKXvvDkO3nH/kUJRLqbc4=",
+                    "rev": "13434b50dcb64a482cc91191f8cf6151d90f5465",
+                    "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/minigbm/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=",
-                "rev": "3018207f4d89395cc271278fb9a6558b660885f5",
-                "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git"
+                "args": {
+                    "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=",
+                    "rev": "3018207f4d89395cc271278fb9a6558b660885f5",
+                    "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/nan": {
-                "fetcher": "fetchFromGitHub",
-                "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=",
-                "owner": "nodejs",
-                "repo": "nan",
-                "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213"
+                "args": {
+                    "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=",
+                    "owner": "nodejs",
+                    "repo": "nan",
+                    "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213"
+                },
+                "fetcher": "fetchFromGitHub"
             },
             "src/third_party/nasm": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-SiRXHsUlWXtH6dbDjDjqNAm105ibEB3jOfNtQAM4CaY=",
-                "rev": "f477acb1049f5e043904b87b825c5915084a9a29",
-                "url": "https://chromium.googlesource.com/chromium/deps/nasm.git"
+                "args": {
+                    "hash": "sha256-SiRXHsUlWXtH6dbDjDjqNAm105ibEB3jOfNtQAM4CaY=",
+                    "rev": "f477acb1049f5e043904b87b825c5915084a9a29",
+                    "url": "https://chromium.googlesource.com/chromium/deps/nasm.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/nearby/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-d1D9/6d7a1+27nD8VijhzRMglE2PqvAMK8+GbMeesSQ=",
-                "rev": "97690c6996f683a6f3e07d75fc4557958c55ac7b",
-                "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git"
+                "args": {
+                    "hash": "sha256-d1D9/6d7a1+27nD8VijhzRMglE2PqvAMK8+GbMeesSQ=",
+                    "rev": "97690c6996f683a6f3e07d75fc4557958c55ac7b",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/neon_2_sse/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-AkDAHOPO5NdXXk0hETS5D67mzw0RVXwPDDKqM0XXo5g=",
-                "rev": "eb8b80b28f956275e291ea04a7beb5ed8289e872",
-                "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git"
+                "args": {
+                    "hash": "sha256-AkDAHOPO5NdXXk0hETS5D67mzw0RVXwPDDKqM0XXo5g=",
+                    "rev": "eb8b80b28f956275e291ea04a7beb5ed8289e872",
+                    "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/openh264/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-lZlZjX8GCJOc77VJ9i1fSWn63pfVOEcwwlzh0UpIgy4=",
-                "rev": "33f7f48613258446decb33b3575fc0a3c9ed14e3",
-                "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264"
+                "args": {
+                    "hash": "sha256-lZlZjX8GCJOc77VJ9i1fSWn63pfVOEcwwlzh0UpIgy4=",
+                    "rev": "33f7f48613258446decb33b3575fc0a3c9ed14e3",
+                    "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/openscreen/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-KGVFyGp7ItKeapub3Bd+htXH/gMaaBd+k8iC7hLtvl0=",
-                "rev": "38d1445b41d1eb597fcd100688dbaff98aa072ed",
-                "url": "https://chromium.googlesource.com/openscreen"
+                "args": {
+                    "hash": "sha256-KGVFyGp7ItKeapub3Bd+htXH/gMaaBd+k8iC7hLtvl0=",
+                    "rev": "38d1445b41d1eb597fcd100688dbaff98aa072ed",
+                    "url": "https://chromium.googlesource.com/openscreen"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/openscreen/src/buildtools": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-Dz7wMYQHVR7sjCGaQe2nxIxZsAxsK6GGDNpDvypPefo=",
-                "rev": "56013b77b6c0a650d00bde40e750e7c3b7c6bc3d",
-                "url": "https://chromium.googlesource.com/chromium/src/buildtools"
+                "args": {
+                    "hash": "sha256-Dz7wMYQHVR7sjCGaQe2nxIxZsAxsK6GGDNpDvypPefo=",
+                    "rev": "56013b77b6c0a650d00bde40e750e7c3b7c6bc3d",
+                    "url": "https://chromium.googlesource.com/chromium/src/buildtools"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=",
+                    "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7",
+                    "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/ots/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=",
-                "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33",
-                "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git"
+                "args": {
+                    "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=",
+                    "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33",
+                    "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/pdfium": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-/u+HYjmxSIX2GlriEWYZQJ8TDFNfzSufATGq1j9zx9w=",
-                "rev": "12f7715a6390050c5cffb7e4c9b2be1c2f2956d0",
-                "url": "https://pdfium.googlesource.com/pdfium.git"
+                "args": {
+                    "hash": "sha256-/u+HYjmxSIX2GlriEWYZQJ8TDFNfzSufATGq1j9zx9w=",
+                    "rev": "12f7715a6390050c5cffb7e4c9b2be1c2f2956d0",
+                    "url": "https://pdfium.googlesource.com/pdfium.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/perfetto": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-bjgSwq4LPz9qN9rVqIJUTHetRguCx67Uq5oe1ksPqGE=",
-                "rev": "0d78d85c2bfb993ab8dd9a85b6fee6caa6a0f357",
-                "url": "https://android.googlesource.com/platform/external/perfetto.git"
+                "args": {
+                    "hash": "sha256-bjgSwq4LPz9qN9rVqIJUTHetRguCx67Uq5oe1ksPqGE=",
+                    "rev": "0d78d85c2bfb993ab8dd9a85b6fee6caa6a0f357",
+                    "url": "https://android.googlesource.com/platform/external/perfetto.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-TmP6xftUVTD7yML7UEM/DB8bcsL5RFlKPyCpcboD86U=",
+                    "rev": "e34549db516f8712f678fcd4bc411613b5cc5295",
+                    "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/pthreadpool/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-cFRELaRtWspZaqtmdKmVPqM7HVskHlFMAny+Zv/Zflw=",
-                "rev": "e1469417238e13eebaa001779fa031ed25c59def",
-                "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git"
+                "args": {
+                    "hash": "sha256-cFRELaRtWspZaqtmdKmVPqM7HVskHlFMAny+Zv/Zflw=",
+                    "rev": "e1469417238e13eebaa001779fa031ed25c59def",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/pyelftools": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=",
-                "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae",
-                "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git"
+                "args": {
+                    "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=",
+                    "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae",
+                    "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=",
+                    "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2",
+                    "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-N1uFoNd3mz/LH1z06581Ds7BUyc67SNXUPzqomYREr8=",
+                    "rev": "413da873d93a03d3662f24b881ea459a79f9c589",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/re2/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc=",
-                "rev": "6dcd83d60f7944926bfd308cc13979fc53dd69ca",
-                "url": "https://chromium.googlesource.com/external/github.com/google/re2.git"
+                "args": {
+                    "hash": "sha256-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc=",
+                    "rev": "6dcd83d60f7944926bfd308cc13979fc53dd69ca",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/re2.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/ruy/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-O3JEtXchCdIHdGvjD6kGMJzj7TWVczQCW2YUHK3cABA=",
-                "rev": "83fd40d730feb0804fafbc2d8814bcc19a17b2e5",
-                "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git"
+                "args": {
+                    "hash": "sha256-O3JEtXchCdIHdGvjD6kGMJzj7TWVczQCW2YUHK3cABA=",
+                    "rev": "83fd40d730feb0804fafbc2d8814bcc19a17b2e5",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/search_engines_data/resources": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-8RY3AU2V4iZKEmVwT7Z1Q3QlcTXDIdeyYwnQoyJcAUY=",
-                "rev": "6dc3b54b420e6e03a34ee7259fcd2b1978fac5f3",
-                "url": "https://chromium.googlesource.com/external/search_engines_data.git"
+                "args": {
+                    "hash": "sha256-8RY3AU2V4iZKEmVwT7Z1Q3QlcTXDIdeyYwnQoyJcAUY=",
+                    "rev": "6dc3b54b420e6e03a34ee7259fcd2b1978fac5f3",
+                    "url": "https://chromium.googlesource.com/external/search_engines_data.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/securemessage/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=",
-                "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84",
-                "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git"
+                "args": {
+                    "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=",
+                    "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/skia": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-tP6DnMeOoVqfTSn6bYXMLiCb4wg5f9uB28KzYMAeBUw=",
-                "rev": "aefbd9403c1b3032ad4cd0281ef312ed262c7125",
-                "url": "https://skia.googlesource.com/skia.git"
+                "args": {
+                    "hash": "sha256-tP6DnMeOoVqfTSn6bYXMLiCb4wg5f9uB28KzYMAeBUw=",
+                    "rev": "aefbd9403c1b3032ad4cd0281ef312ed262c7125",
+                    "url": "https://skia.googlesource.com/skia.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/smhasher/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-OgZQwkQcVgRMf62ROGuY+3zQhBoWuUSP4naTmSKdq8s=",
-                "rev": "0ff96f7835817a27d0487325b6c16033e2992eb5",
-                "url": "https://chromium.googlesource.com/external/smhasher.git"
+                "args": {
+                    "hash": "sha256-OgZQwkQcVgRMf62ROGuY+3zQhBoWuUSP4naTmSKdq8s=",
+                    "rev": "0ff96f7835817a27d0487325b6c16033e2992eb5",
+                    "url": "https://chromium.googlesource.com/external/smhasher.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/snappy/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-jUwnjbaqXz7fgI2TPRK7SlUPQUVzcpjp4ZlFbEzwA+o=",
-                "rev": "32ded457c0b1fe78ceb8397632c416568d6714a0",
-                "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git"
+                "args": {
+                    "hash": "sha256-jUwnjbaqXz7fgI2TPRK7SlUPQUVzcpjp4ZlFbEzwA+o=",
+                    "rev": "32ded457c0b1fe78ceb8397632c416568d6714a0",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/speedometer/main": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-lCwGk4Q+OXwO8vOlOQrkgygYqLrwpku/PkR03oEdX3Y=",
-                "rev": "d6b5ffea959ad31e231c203d7446bf8b39e987ce",
-                "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
+                "args": {
+                    "hash": "sha256-lCwGk4Q+OXwO8vOlOQrkgygYqLrwpku/PkR03oEdX3Y=",
+                    "rev": "d6b5ffea959ad31e231c203d7446bf8b39e987ce",
+                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/speedometer/v2.0": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-p7WUS8gZUaS+LOm7pNmRkwgxjx+V8R6yy7bbaEHaIs4=",
-                "rev": "732af0dfe867f8815e662ac637357e55f285dbbb",
-                "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
+                "args": {
+                    "hash": "sha256-p7WUS8gZUaS+LOm7pNmRkwgxjx+V8R6yy7bbaEHaIs4=",
+                    "rev": "732af0dfe867f8815e662ac637357e55f285dbbb",
+                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/speedometer/v2.1": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-0z5tZlz32fYh9I1ALqfLm2WWO8HiRBwt0hcmgKQhaeM=",
-                "rev": "8bf7946e39e47c875c00767177197aea5727e84a",
-                "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
+                "args": {
+                    "hash": "sha256-0z5tZlz32fYh9I1ALqfLm2WWO8HiRBwt0hcmgKQhaeM=",
+                    "rev": "8bf7946e39e47c875c00767177197aea5727e84a",
+                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU=",
+                    "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d",
+                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/spirv-cross/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=",
-                "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross"
+                "args": {
+                    "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=",
+                    "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/spirv-headers/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-/p7kBW7mwpG/Uz0goMM7L3zjpOMBzGiuN+0ZBEOpORo=",
-                "rev": "e7294a8ebed84f8c5bd3686c68dbe12a4e65b644",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers"
+                "args": {
+                    "hash": "sha256-/p7kBW7mwpG/Uz0goMM7L3zjpOMBzGiuN+0ZBEOpORo=",
+                    "rev": "e7294a8ebed84f8c5bd3686c68dbe12a4e65b644",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/spirv-tools/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-SJcxmKdzOjg6lOJk/3m8qo7puvtci1YEU6dXKjthx0Q=",
-                "rev": "ce37fd67f83cd1e8793b988d2e4126bbf72b19dd",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools"
+                "args": {
+                    "hash": "sha256-SJcxmKdzOjg6lOJk/3m8qo7puvtci1YEU6dXKjthx0Q=",
+                    "rev": "ce37fd67f83cd1e8793b988d2e4126bbf72b19dd",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/sqlite/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-ltl3OTk/wZPSj3yYthNlKd3mBxef6l5uW6UYTwebNek=",
-                "rev": "567495a62a62dc013888500526e82837d727fe01",
-                "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git"
+                "args": {
+                    "hash": "sha256-ltl3OTk/wZPSj3yYthNlKd3mBxef6l5uW6UYTwebNek=",
+                    "rev": "567495a62a62dc013888500526e82837d727fe01",
+                    "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/squirrel.mac": {
-                "fetcher": "fetchFromGitHub",
-                "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=",
-                "owner": "Squirrel",
-                "repo": "Squirrel.Mac",
-                "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38"
+                "args": {
+                    "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=",
+                    "owner": "Squirrel",
+                    "repo": "Squirrel.Mac",
+                    "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38"
+                },
+                "fetcher": "fetchFromGitHub"
             },
             "src/third_party/squirrel.mac/vendor/Mantle": {
-                "fetcher": "fetchFromGitHub",
-                "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=",
-                "owner": "Mantle",
-                "repo": "Mantle",
-                "rev": "78d3966b3c331292ea29ec38661b25df0a245948"
+                "args": {
+                    "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=",
+                    "owner": "Mantle",
+                    "repo": "Mantle",
+                    "rev": "78d3966b3c331292ea29ec38661b25df0a245948"
+                },
+                "fetcher": "fetchFromGitHub"
             },
             "src/third_party/squirrel.mac/vendor/ReactiveObjC": {
-                "fetcher": "fetchFromGitHub",
-                "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=",
-                "owner": "ReactiveCocoa",
-                "repo": "ReactiveObjC",
-                "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76"
+                "args": {
+                    "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=",
+                    "owner": "ReactiveCocoa",
+                    "repo": "ReactiveObjC",
+                    "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76"
+                },
+                "fetcher": "fetchFromGitHub"
             },
             "src/third_party/swiftshader": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-PSkIU8zC+4AVcYu0vaYo6I1SSykrHgcgGVMBJanux8o=",
-                "rev": "86cf34f50cbe5a9f35da7eedad0f4d4127fb8342",
-                "url": "https://swiftshader.googlesource.com/SwiftShader.git"
+                "args": {
+                    "hash": "sha256-PSkIU8zC+4AVcYu0vaYo6I1SSykrHgcgGVMBJanux8o=",
+                    "rev": "86cf34f50cbe5a9f35da7eedad0f4d4127fb8342",
+                    "url": "https://swiftshader.googlesource.com/SwiftShader.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=",
+                    "rev": "c036420683f672d685e27415de0a5f5e85bdc23f",
+                    "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/tflite/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-qXHENS/6NwHAr1/16eb079XzmwAnpLtVZuva8uGCf+8=",
-                "rev": "51c6eed226abcfeeb46864e837d01563cc5b907b",
-                "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git"
+                "args": {
+                    "hash": "sha256-qXHENS/6NwHAr1/16eb079XzmwAnpLtVZuva8uGCf+8=",
+                    "rev": "51c6eed226abcfeeb46864e837d01563cc5b907b",
+                    "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/ukey2/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=",
-                "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47",
-                "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git"
+                "args": {
+                    "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=",
+                    "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/vulkan-deps": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-9ebWETg/fsS4MYZg74XHs/Nz3nX6BXBNVRN2PmyWXWM=",
-                "rev": "2e4b45a53a0e2e66bcb6540ae384c53a517218d0",
-                "url": "https://chromium.googlesource.com/vulkan-deps"
+                "args": {
+                    "hash": "sha256-9ebWETg/fsS4MYZg74XHs/Nz3nX6BXBNVRN2PmyWXWM=",
+                    "rev": "2e4b45a53a0e2e66bcb6540ae384c53a517218d0",
+                    "url": "https://chromium.googlesource.com/vulkan-deps"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/vulkan-headers/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-twJJVBfnZbH/8Wn273h45K3BOnlAicqL2zJl6OfLm2E=",
-                "rev": "39f924b810e561fd86b2558b6711ca68d4363f68",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers"
+                "args": {
+                    "hash": "sha256-twJJVBfnZbH/8Wn273h45K3BOnlAicqL2zJl6OfLm2E=",
+                    "rev": "39f924b810e561fd86b2558b6711ca68d4363f68",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/vulkan-loader/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-QqFC3Iyhw9Pq6TwBHxa0Ss7SW0bHo0Uz5N18oxl2ROg=",
-                "rev": "0508dee4ff864f5034ae6b7f68d34cb2822b827d",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader"
+                "args": {
+                    "hash": "sha256-QqFC3Iyhw9Pq6TwBHxa0Ss7SW0bHo0Uz5N18oxl2ROg=",
+                    "rev": "0508dee4ff864f5034ae6b7f68d34cb2822b827d",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/vulkan-tools/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-nIzrishMMxWzOuD3aX8B6Iuq2kPsUF0Uuvz7GijTulY=",
-                "rev": "c52931f012cb7b48e42bbf2050a7fb2183b76406",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools"
+                "args": {
+                    "hash": "sha256-nIzrishMMxWzOuD3aX8B6Iuq2kPsUF0Uuvz7GijTulY=",
+                    "rev": "c52931f012cb7b48e42bbf2050a7fb2183b76406",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/vulkan-utility-libraries/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-zI3y5aoP4QcYp677Oxj5Ef7lJyJwOMdGsaRBe+X9vpI=",
-                "rev": "fe7a09b13899c5c77d956fa310286f7a7eb2c4ed",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries"
+                "args": {
+                    "hash": "sha256-zI3y5aoP4QcYp677Oxj5Ef7lJyJwOMdGsaRBe+X9vpI=",
+                    "rev": "fe7a09b13899c5c77d956fa310286f7a7eb2c4ed",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/vulkan-validation-layers/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-foa5hzqf1hPwOj3k57CloCe/j0qXW3zCQ4mwCT4epF4=",
-                "rev": "a30aa23cfaff4f28f039c025c159128a6c336a7e",
-                "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers"
+                "args": {
+                    "hash": "sha256-foa5hzqf1hPwOj3k57CloCe/j0qXW3zCQ4mwCT4epF4=",
+                    "rev": "a30aa23cfaff4f28f039c025c159128a6c336a7e",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=",
+                    "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21",
+                    "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/wasm_tts_engine/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-bV+1YFEtCyTeZujsZtZiexT/aUTN3MaVerR2UdkUPBY=",
-                "rev": "7a91dbfddd93afa096a69fb7d292e22d4afecad2",
-                "url": "https://chromium.googlesource.com/chromium/wasm-tts-engine"
+                "args": {
+                    "hash": "sha256-bV+1YFEtCyTeZujsZtZiexT/aUTN3MaVerR2UdkUPBY=",
+                    "rev": "7a91dbfddd93afa096a69fb7d292e22d4afecad2",
+                    "url": "https://chromium.googlesource.com/chromium/wasm-tts-engine"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=",
+                    "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0",
+                    "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=",
+                    "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e",
+                    "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-o/adWEXYSqWib6KoK7XMCWbojapcS4O/CEPxv7iFCw8=",
+                    "rev": "7d5a3a8b494ae44cd9651f9505e88a250082765e",
+                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-oK0Z8xO2ILuySGZS0m37ZF0MOyle2l8AXb0/6wai0/w=",
+                    "rev": "a156431ea66fe67d69c9fbba8a8ad34dabbab81c",
+                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/webdriver/pylib": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=",
-                "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04",
-                "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git"
+                "args": {
+                    "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=",
+                    "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04",
+                    "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/webgl/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-32r3BdmsNA89mo0k+vK1G3718AOjseE7cJlopZ/0pSw=",
-                "rev": "450cceb587613ac1469c5a131fac15935c99e0e7",
-                "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git"
+                "args": {
+                    "hash": "sha256-32r3BdmsNA89mo0k+vK1G3718AOjseE7cJlopZ/0pSw=",
+                    "rev": "450cceb587613ac1469c5a131fac15935c99e0e7",
+                    "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/webgpu-cts/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-tjY5ADd5tMFsYHk6xT+TXwsDYV5eI2oOywmyTjjAxYc=",
-                "rev": "fb2b951ac3c23e453335edf35c9b3bad431d9009",
-                "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git"
+                "args": {
+                    "hash": "sha256-tjY5ADd5tMFsYHk6xT+TXwsDYV5eI2oOywmyTjjAxYc=",
+                    "rev": "fb2b951ac3c23e453335edf35c9b3bad431d9009",
+                    "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/webpagereplay": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-KAkkFVxEfQxbSjD+55LO4UZYWWwmGK6B9ENFSPljNu0=",
-                "rev": "d812e180206934eb3b7ae411d82d61bc21c22f70",
-                "url": "https://chromium.googlesource.com/webpagereplay.git"
+                "args": {
+                    "hash": "sha256-KAkkFVxEfQxbSjD+55LO4UZYWWwmGK6B9ENFSPljNu0=",
+                    "rev": "d812e180206934eb3b7ae411d82d61bc21c22f70",
+                    "url": "https://chromium.googlesource.com/webpagereplay.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/webrtc": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-IsjTrEnxIqINYYjWJmDp7rlubl5dJ2YMpJf/DrG/mRM=",
-                "rev": "8d78f5de6c27b2c793039989ea381f1428fb0100",
-                "url": "https://webrtc.googlesource.com/src.git"
+                "args": {
+                    "hash": "sha256-IsjTrEnxIqINYYjWJmDp7rlubl5dJ2YMpJf/DrG/mRM=",
+                    "rev": "8d78f5de6c27b2c793039989ea381f1428fb0100",
+                    "url": "https://webrtc.googlesource.com/src.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=",
+                    "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7",
+                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "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"
+                "args": {
+                    "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=",
+                    "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8",
+                    "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/xdg-utils": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=",
-                "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44",
-                "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git"
+                "args": {
+                    "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=",
+                    "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44",
+                    "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/xnnpack/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-eb9B9lXPB2GiC4qehB/HOU36W1e9RZ0N2oEbIifyrHE=",
-                "rev": "0824e2965f6edc2297e55c8dff5a8ac4cb12aaad",
-                "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git"
+                "args": {
+                    "hash": "sha256-eb9B9lXPB2GiC4qehB/HOU36W1e9RZ0N2oEbIifyrHE=",
+                    "rev": "0824e2965f6edc2297e55c8dff5a8ac4cb12aaad",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/third_party/zstd/src": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-UJsuaSzR4V8alLdtxzpla1v9WYHPKPp13YrgA4Y6/yA=",
-                "rev": "ea0aa030cdf31f7897c5bfc153f0d36e92768095",
-                "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git"
+                "args": {
+                    "hash": "sha256-UJsuaSzR4V8alLdtxzpla1v9WYHPKPp13YrgA4Y6/yA=",
+                    "rev": "ea0aa030cdf31f7897c5bfc153f0d36e92768095",
+                    "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git"
+                },
+                "fetcher": "fetchFromGitiles"
             },
             "src/v8": {
-                "fetcher": "fetchFromGitiles",
-                "hash": "sha256-wpz9W/ZurpCT/dGIHGpmdkI3dsXbP8TPNeee2w9zBU8=",
-                "rev": "4f282ae4acae85cdcc8c167cbc296a86d24c1cf6",
-                "url": "https://chromium.googlesource.com/v8/v8.git"
+                "args": {
+                    "hash": "sha256-wpz9W/ZurpCT/dGIHGpmdkI3dsXbP8TPNeee2w9zBU8=",
+                    "rev": "4f282ae4acae85cdcc8c167cbc296a86d24c1cf6",
+                    "url": "https://chromium.googlesource.com/v8/v8.git"
+                },
+                "fetcher": "fetchFromGitiles"
             }
         },
         "electron_yarn_hash": "0l38rbmlrcrgkw7ggj33xszcs7arm601gzq4c8v0rn3m5zp6yr77",
         "modules": "133",
         "node": "22.14.0",
-        "version": "35.1.2"
+        "version": "35.1.4"
     }
 }
diff --git a/pkgs/development/tools/electron/update.py b/pkgs/development/tools/electron/update.py
index 6a136575a75b..e7747c73f957 100755
--- a/pkgs/development/tools/electron/update.py
+++ b/pkgs/development/tools/electron/update.py
@@ -1,9 +1,9 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i python -p python3.pkgs.joblib python3.pkgs.click python3.pkgs.click-log nix nix-prefetch-git nurl prefetch-yarn-deps prefetch-npm-deps
+#! nix-shell -i python -p python3.pkgs.joblib python3.pkgs.click python3.pkgs.click-log nix nix-prefetch-git prefetch-yarn-deps prefetch-npm-deps gclient2nix
 """
 electron updater
 
-A script for updating both binary and source hashes.
+A script for updating electron source hashes.
 
 It supports the following modes:
 
@@ -11,20 +11,15 @@ It supports the following modes:
 |------------- | ----------------------------------------------- |
 | `update`     | for updating a specific Electron release        |
 | `update-all` | for updating all electron releases at once      |
-| `eval`       | just print the necessary sources to fetch       |
 
-The `eval` and `update` commands accept an optional `--version` flag
-to restrict the mechanism only to a given major release.
+The `update` commands requires a `--version` flag
+to specify the major release to be updated.
+The `update-all command updates all non-eol major releases.
 
 The `update` and `update-all` commands accept an optional `--commit`
 flag to automatically commit the changes for you.
-
-The `update` and `update-all` commands accept optional `--bin-only`
-and `--source-only` flags to restict the update to binary or source
-releases.
 """
 import base64
-import csv
 import json
 import logging
 import os
@@ -33,52 +28,20 @@ import re
 import subprocess
 import sys
 import tempfile
-import traceback
 import urllib.request
-
-from abc import ABC
-from codecs import iterdecode
-from datetime import datetime
-from typing import Iterable, Optional, Tuple
-from urllib.request import urlopen
-
 import click
 import click_log
 
+from datetime import datetime
+from typing import Iterable, Tuple
+from urllib.request import urlopen
 from joblib import Parallel, delayed, Memory
-
-depot_tools_checkout = tempfile.TemporaryDirectory()
-subprocess.check_call(
-    [
-        "nix-prefetch-git",
-        "--builder",
-        "--quiet",
-        "--url",
-        "https://chromium.googlesource.com/chromium/tools/depot_tools",
-        "--out",
-        depot_tools_checkout.name,
-        "--rev",
-        "452fe3be37f78fbecefa1b4b0d359531bcd70d0d"
-    ]
-)
-sys.path.append(depot_tools_checkout.name)
-
-import gclient_eval
-import gclient_utils
+from update_util import *
 
 
 # Relative path to the electron-source info.json
 SOURCE_INFO_JSON = "info.json"
 
-# Relatice path to the electron-bin info.json
-BINARY_INFO_JSON = "binary/info.json"
-
-# Relative path the the electron-chromedriver info.json
-CHROMEDRIVER_INFO_JSON = "chromedriver/info.json"
-
-# Number of spaces used for each indentation level
-JSON_INDENT = 4
-
 os.chdir(os.path.dirname(__file__))
 
 memory: Memory = Memory("cache", verbose=0)
@@ -86,328 +49,39 @@ memory: Memory = Memory("cache", verbose=0)
 logger = logging.getLogger(__name__)
 click_log.basic_config(logger)
 
-nixpkgs_path = os.path.dirname(os.path.realpath(__file__)) + "/../../../.."
+
+def get_gclient_data(rev: str) -> any:
+    output = subprocess.check_output(
+        ["gclient2nix", "generate",
+         f"https://github.com/electron/electron@{rev}",
+         "--root", "src/electron"]
+    )
+
+    return json.loads(output)
 
 
-class Repo:
-    fetcher: str
-    args: dict
-
-    def __init__(self) -> None:
-        self.deps: dict = {}
-        self.hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
-
-    def get_deps(self, repo_vars: dict, path: str) -> None:
-        print(
-            "evaluating " + json.dumps(self, default=vars, sort_keys=True),
-            file=sys.stderr,
-        )
-
-        deps_file = self.get_file("DEPS")
-        evaluated = gclient_eval.Parse(deps_file, vars_override=repo_vars, filename="DEPS")
-
-        repo_vars = dict(evaluated.get("vars", {})) | repo_vars
-
-        prefix = f"{path}/" if evaluated.get("use_relative_paths", False) else ""
-
-        self.deps = {
-            prefix + dep_name: repo_from_dep(dep)
-            for dep_name, dep in evaluated.get("deps", {}).items()
-            if (
-                gclient_eval.EvaluateCondition(dep["condition"], repo_vars)
-                if "condition" in dep
-                else True
-            )
-            and repo_from_dep(dep) != None
-        }
-
-        for key in evaluated.get("recursedeps", []):
-            dep_path = prefix + key
-            if dep_path in self.deps and dep_path != "src/third_party/squirrel.mac":
-                self.deps[dep_path].get_deps(repo_vars, dep_path)
-
-    def prefetch(self) -> None:
-        self.hash = get_repo_hash(self.fetcher, self.args)
-
-    def prefetch_all(self) -> int:
-        return sum(
-            [dep.prefetch_all() for [_, dep] in self.deps.items()],
-            [delayed(self.prefetch)()],
-        )
-
-    def flatten_repr(self) -> dict:
-        return {"fetcher": self.fetcher, "hash": self.hash, **self.args}
-
-    def flatten(self, path: str) -> dict:
-        out = {path: self.flatten_repr()}
-        for dep_path, dep in self.deps.items():
-            out |= dep.flatten(dep_path)
-        return out
-
-    def get_file(self, filepath: str) -> str:
-        raise NotImplementedError
-
-
-class GitRepo(Repo):
-    def __init__(self, url: str, rev: str) -> None:
-        super().__init__()
-        self.fetcher = "fetchgit"
-        self.args = {
-            "url": url,
-            "rev": rev,
-        }
-
-
-class GitHubRepo(Repo):
-    def __init__(self, owner: str, repo: str, rev: str) -> None:
-        super().__init__()
-        self.fetcher = "fetchFromGitHub"
-        self.args = {
-            "owner": owner,
-            "repo": repo,
-            "rev": rev,
-        }
-
-    def get_file(self, filepath: str) -> str:
-        return (
-            urlopen(
-                f"https://raw.githubusercontent.com/{self.args['owner']}/{self.args['repo']}/{self.args['rev']}/{filepath}"
-            )
-            .read()
-            .decode("utf-8")
-        )
-
-
-class GitilesRepo(Repo):
-    def __init__(self, url: str, rev: str) -> None:
-        super().__init__()
-        self.fetcher = "fetchFromGitiles"
-        self.args = {
-            "url": url,
-            "rev": rev,
-        }
-
-        if url == "https://chromium.googlesource.com/chromium/src.git":
-            self.args["postFetch"] = "rm -r $out/third_party/blink/web_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; "
-            self.args["postFetch"] += "rm -r $out/media/test/data; "
-
-    def get_file(self, filepath: str) -> str:
-        return base64.b64decode(
-            urlopen(
-                f"{self.args['url']}/+/{self.args['rev']}/{filepath}?format=TEXT"
-            ).read()
+def get_chromium_file(chromium_rev: str, filepath: str) -> str:
+    return base64.b64decode(
+        urlopen(
+            f"https://chromium.googlesource.com/chromium/src.git/+/{chromium_rev}/{filepath}?format=TEXT"
+        ).read()
         ).decode("utf-8")
 
 
-class ElectronBinRepo(GitHubRepo):
-    def __init__(self, owner: str, repo: str, rev: str) -> None:
-        super().__init__(owner, repo, rev)
-        self.systems = {
-            "i686-linux": "linux-ia32",
-            "x86_64-linux": "linux-x64",
-            "armv7l-linux": "linux-armv7l",
-            "aarch64-linux": "linux-arm64",
-            "x86_64-darwin": "darwin-x64",
-            "aarch64-darwin": "darwin-arm64",
-        }
-
-    def get_shasums256(self, version: str) -> list:
-        """Returns the contents of SHASUMS256.txt"""
-        try:
-            called_process: subprocess.CompletedProcess = subprocess.run(
-                [
-                    "nix-prefetch-url",
-                    "--print-path",
-                    f"https://github.com/electron/electron/releases/download/v{version}/SHASUMS256.txt",
-                ],
-                capture_output=True,
-                check=True,
-                text=True,
-            )
-
-            hash_file_path = called_process.stdout.split("\n")[1]
-
-            with open(hash_file_path, "r") as f:
-                return f.read().split("\n")
-
-        except subprocess.CalledProcessError as err:
-            print(err.stderr)
-            sys.exit(1)
-
-    def get_headers(self, version: str) -> str:
-        """Returns the hash of the release headers tarball"""
-        try:
-            called_process: subprocess.CompletedProcess = subprocess.run(
-                [
-                    "nix-prefetch-url",
-                    f"https://artifacts.electronjs.org/headers/dist/v{version}/node-v{version}-headers.tar.gz",
-                ],
-                capture_output=True,
-                check=True,
-                text=True,
-            )
-            return called_process.stdout.split("\n")[0]
-        except subprocess.CalledProcessError as err:
-            print(err.stderr)
-            sys.exit(1)
-
-    def get_hashes(self, major_version: str) -> dict:
-        """Returns a dictionary of hashes for a given major version"""
-        m, _ = get_latest_version(major_version)
-        version: str = m["version"]
-
-        out = {}
-        out[major_version] = {
-            "hashes": {},
-            "version": version,
-        }
-
-        hashes: list = self.get_shasums256(version)
-
-        for nix_system, electron_system in self.systems.items():
-            filename = f"*electron-v{version}-{electron_system}.zip"
-            if any([x.endswith(filename) for x in hashes]):
-                out[major_version]["hashes"][nix_system] = [
-                    x.split(" ")[0] for x in hashes if x.endswith(filename)
-                ][0]
-                out[major_version]["hashes"]["headers"] = self.get_headers(version)
-
-        return out
-
-
-class ElectronChromedriverRepo(ElectronBinRepo):
-    def __init__(self, rev: str) -> None:
-        super().__init__("electron", "electron", rev)
-        self.systems = {
-            "i686-linux": "linux-ia32",
-            "x86_64-linux": "linux-x64",
-            "armv7l-linux": "linux-armv7l",
-            "aarch64-linux": "linux-arm64",
-            "x86_64-darwin": "darwin-x64",
-            "aarch64-darwin": "darwin-arm64",
-        }
-
-    def get_hashes(self, major_version: str) -> dict:
-        """Returns a dictionary of hashes for a given major version"""
-        m, _ = get_latest_version(major_version)
-        version: str = m["version"]
-
-        out = {}
-        out[major_version] = {
-            "hashes": {},
-            "version": version,
-        }
-
-        hashes: list = self.get_shasums256(version)
-
-        for nix_system, electron_system in self.systems.items():
-            filename = f"*chromedriver-v{version}-{electron_system}.zip"
-            if any([x.endswith(filename) for x in hashes]):
-                out[major_version]["hashes"][nix_system] = [
-                    x.split(" ")[0] for x in hashes if x.endswith(filename)
-                ][0]
-                out[major_version]["hashes"]["headers"] = self.get_headers(version)
-
-        return out
-
-
-# Releases that have reached end-of-life no longer receive any updates
-# and it is rather pointless trying to update those.
-#
-# https://endoflife.date/electron
-def supported_version_range() -> range:
-    """Returns a range of electron releases that have not reached end-of-life yet"""
-    releases_json = json.loads(
-        urlopen("https://endoflife.date/api/electron.json").read()
-    )
-    supported_releases = [
-        int(x["cycle"])
-        for x in releases_json
-        if x["eol"] == False
-        or datetime.strptime(x["eol"], "%Y-%m-%d") > datetime.today()
-    ]
-
-    return range(
-        min(supported_releases),  # incl.
-        # We have also packaged the beta release in nixpkgs,
-        # but it is not tracked by endoflife.date
-        max(supported_releases) + 2,  # excl.
-        1,
+def get_electron_file(electron_rev: str, filepath: str) -> str:
+    return (
+        urlopen(
+            f"https://raw.githubusercontent.com/electron/electron/{electron_rev}/{filepath}"
+        )
+        .read()
+        .decode("utf-8")
     )
 
 
 @memory.cache
-def get_repo_hash(fetcher: str, args: dict) -> str:
-    expr = f"with import {nixpkgs_path} {{}};{fetcher}{{"
-    for key, val in args.items():
-        expr += f'{key}="{val}";'
-    expr += "}"
-    cmd = ["nurl", "-H", "--expr", expr]
-    print(" ".join(cmd), file=sys.stderr)
-    out = subprocess.check_output(cmd)
-    return out.decode("utf-8").strip()
-
-
-@memory.cache
-def _get_yarn_hash(path: str) -> str:
-    print(f"prefetch-yarn-deps", file=sys.stderr)
-    with tempfile.TemporaryDirectory() as tmp_dir:
-        with open(tmp_dir + "/yarn.lock", "w") as f:
-            f.write(path)
-        return (
-            subprocess.check_output(["prefetch-yarn-deps", tmp_dir + "/yarn.lock"])
-            .decode("utf-8")
-            .strip()
-        )
-
-
-def get_yarn_hash(repo: Repo, yarn_lock_path: str = "yarn.lock") -> str:
-    return _get_yarn_hash(repo.get_file(yarn_lock_path))
-
-
-@memory.cache
-def _get_npm_hash(filename: str) -> str:
-    print(f"prefetch-npm-deps", file=sys.stderr)
-    with tempfile.TemporaryDirectory() as tmp_dir:
-        with open(tmp_dir + "/package-lock.json", "w") as f:
-            f.write(filename)
-        return (
-            subprocess.check_output(
-                ["prefetch-npm-deps", tmp_dir + "/package-lock.json"]
-            )
-            .decode("utf-8")
-            .strip()
-        )
-
-
-def get_npm_hash(repo: Repo, package_lock_path: str = "package-lock.json") -> str:
-    return _get_npm_hash(repo.get_file(package_lock_path))
-
-
-def repo_from_dep(dep: dict) -> Optional[Repo]:
-    if "url" in dep:
-        url, rev = gclient_utils.SplitUrlRevision(dep["url"])
-
-        search_object = re.search(r"https://github.com/(.+)/(.+?)(\.git)?$", url)
-        if search_object:
-            return GitHubRepo(search_object.group(1), search_object.group(2), rev)
-
-        if re.match(r"https://.+\.googlesource.com", url):
-            return GitilesRepo(url, rev)
-
-        return GitRepo(url, rev)
-    else:
-        # Not a git dependency; skip
-        return None
-
-
-def get_gn_source(repo: Repo) -> dict:
+def get_chromium_gn_source(chromium_rev: str) -> dict:
     gn_pattern = r"'gn_version': 'git_revision:([0-9a-f]{40})'"
-    gn_commit = re.search(gn_pattern, repo.get_file("DEPS")).group(1)
+    gn_commit = re.search(gn_pattern, get_chromium_file(chromium_rev, "DEPS")).group(1)
     gn_prefetch: bytes = subprocess.check_output(
         [
             "nix-prefetch-git",
@@ -427,70 +101,42 @@ def get_gn_source(repo: Repo) -> dict:
         }
     }
 
+@memory.cache
+def get_electron_yarn_hash(electron_rev: str) -> str:
+    print(f"prefetch-yarn-deps", file=sys.stderr)
+    with tempfile.TemporaryDirectory() as tmp_dir:
+        with open(tmp_dir + "/yarn.lock", "w") as f:
+            f.write(get_electron_file(electron_rev, "yarn.lock"))
+        return (
+            subprocess.check_output(["prefetch-yarn-deps", tmp_dir + "/yarn.lock"])
+            .decode("utf-8")
+            .strip()
+        )
 
-def get_latest_version(major_version: str) -> Tuple[str, str]:
-    """Returns the latest version for a given major version"""
-    electron_releases: dict = json.loads(
-        urlopen("https://releases.electronjs.org/releases.json").read()
-    )
-    major_version_releases = filter(
-        lambda item: item["version"].startswith(f"{major_version}."), electron_releases
-    )
-    m = max(major_version_releases, key=lambda item: item["date"])
-
-    rev = f"v{m['version']}"
-    return (m, rev)
+@memory.cache
+def get_chromium_npm_hash(chromium_rev: str) -> str:
+    print(f"prefetch-npm-deps", file=sys.stderr)
+    with tempfile.TemporaryDirectory() as tmp_dir:
+        with open(tmp_dir + "/package-lock.json", "w") as f:
+            f.write(get_chromium_file(chromium_rev, "third_party/node/package-lock.json"))
+        return (
+            subprocess.check_output(
+                ["prefetch-npm-deps", tmp_dir + "/package-lock.json"]
+            )
+            .decode("utf-8")
+            .strip()
+        )
 
 
-def get_electron_bin_info(major_version: str) -> Tuple[str, str, ElectronBinRepo]:
-    m, rev = get_latest_version(major_version)
+def get_update(major_version: str, m: str, gclient_data: any) -> Tuple[str, dict]:
 
-    electron_repo: ElectronBinRepo = ElectronBinRepo("electron", "electron", rev)
-    return (major_version, m, electron_repo)
-
-
-def get_electron_chromedriver_info(
-    major_version: str,
-) -> Tuple[str, str, ElectronChromedriverRepo]:
-    m, rev = get_latest_version(major_version)
-
-    electron_repo: ElectronChromedriverRepo = ElectronChromedriverRepo(rev)
-    return (major_version, m, electron_repo)
-
-
-def get_electron_info(major_version: str) -> Tuple[str, str, GitHubRepo]:
-    m, rev = get_latest_version(major_version)
-
-    electron_repo: GitHubRepo = GitHubRepo("electron", "electron", rev)
-    electron_repo.get_deps(
-        {
-            **{
-            f"checkout_{platform}": platform == "linux" or platform == "x64" or platform == "arm64" or platform == "arm"
-            for platform in ["ios", "chromeos", "android", "mac", "win", "linux"]
-            },
-            **{
-            f"checkout_{arch}": True
-            for arch in ["x64", "arm64", "arm", "x86", "mips", "mips64", "ppc"]
-            },
-        },
-        "src/electron",
-    )
-
-    return (major_version, m, electron_repo)
-
-
-def get_update(repo: Tuple[str, str, Repo]) -> Tuple[str, dict]:
-    (major_version, m, electron_repo) = repo
-
-    tasks = electron_repo.prefetch_all()
-    a = lambda: (("electron_yarn_hash", get_yarn_hash(electron_repo)))
+    tasks = []
+    a = lambda: (("electron_yarn_hash", get_electron_yarn_hash(gclient_data["src/electron"]["args"]["rev"])))
     tasks.append(delayed(a)())
     a = lambda: (
         (
             "chromium_npm_hash",
-            get_npm_hash(
-                electron_repo.deps["src"], "third_party/node/package-lock.json"
-            ),
+            get_chromium_npm_hash(gclient_data["src"]["args"]["rev"]),
         )
     )
     tasks.append(delayed(a)())
@@ -502,145 +148,76 @@ def get_update(repo: Tuple[str, str, Repo]) -> Tuple[str, dict]:
         if n != None
     }
 
-    tree = electron_repo.flatten("src/electron")
-
     return (
         f"{major_version}",
         {
-            "deps": tree,
+            "deps": gclient_data,
             **{key: m[key] for key in ["version", "modules", "chrome", "node"]},
             "chromium": {
                 "version": m["chrome"],
-                "deps": get_gn_source(electron_repo.deps["src"]),
+                "deps": get_chromium_gn_source(gclient_data["src"]["args"]["rev"]),
             },
             **task_results,
         },
     )
 
 
-def load_info_json(path: str) -> dict:
-    """Load the contents of a JSON file
-
-    Args:
-        path: The path to the JSON file
-
-    Returns: An empty dict if the path does not exist, otherwise the contents of the JSON file.
-    """
-    try:
-        with open(path, "r") as f:
-            return json.loads(f.read())
-    except:
-        return {}
-
-
-def save_info_json(path: str, content: dict) -> None:
-    """Saves the given info to a JSON file
-
-    Args:
-        path: The path where the info should be saved
-        content: The content to be saved as JSON.
-    """
-    with open(path, "w") as f:
-        f.write(json.dumps(content, indent=JSON_INDENT, default=vars, sort_keys=True))
-        f.write("\n")
-
-
-def update_bin(major_version: str, commit: bool) -> None:
-    """Update a given electron-bin release
-
-    Args:
-        major_version: The major version number, e.g. '27'
-        commit: Whether the updater should commit the result
-    """
-    package_name = f"electron_{major_version}-bin"
-    print(f"Updating {package_name}")
-
-    electron_bin_info = get_electron_bin_info(major_version)
-    (_major_version, _version, repo) = electron_bin_info
-
-    old_info = load_info_json(BINARY_INFO_JSON)
-    new_info = repo.get_hashes(major_version)
-
-    out = old_info | new_info
-
-    save_info_json(BINARY_INFO_JSON, out)
-
-    old_version = (
-        old_info[major_version]["version"] if major_version in old_info else None
-    )
-    new_version = new_info[major_version]["version"]
-    if old_version == new_version:
-        print(f"{package_name} is up-to-date")
-    elif commit:
-        commit_result(package_name, old_version, new_version, BINARY_INFO_JSON)
-
-
-def update_chromedriver(major_version: str, commit: bool) -> None:
-    """Update a given electron-chromedriver release
-
-    Args:
-        major_version: The major version number, e.g. '27'
-        commit: Whether the updater should commit the result
-    """
-    package_name = f"electron-chromedriver_{major_version}"
-    print(f"Updating {package_name}")
-
-    electron_chromedriver_info = get_electron_chromedriver_info(major_version)
-    (_major_version, _version, repo) = electron_chromedriver_info
-
-    old_info = load_info_json(CHROMEDRIVER_INFO_JSON)
-    new_info = repo.get_hashes(major_version)
-
-    out = old_info | new_info
-
-    save_info_json(CHROMEDRIVER_INFO_JSON, out)
-
-    old_version = (
-        old_info[major_version]["version"] if major_version in old_info else None
-    )
-    new_version = new_info[major_version]["version"]
-    if old_version == new_version:
-        print(f"{package_name} is up-to-date")
-    elif commit:
-        commit_result(package_name, old_version, new_version, CHROMEDRIVER_INFO_JSON)
-
-
-def update_source(major_version: str, commit: bool) -> None:
-    """Update a given electron-source release
-
-    Args:
-        major_version: The major version number, e.g. '27'
-        commit: Whether the updater should commit the result
-    """
-    package_name = f"electron-source.electron_{major_version}"
-    print(f"Updating electron-source.electron_{major_version}")
-
-    old_info = load_info_json(SOURCE_INFO_JSON)
-    old_version = (
-        old_info[str(major_version)]["version"]
-        if str(major_version) in old_info
-        else None
-    )
-
-    electron_source_info = get_electron_info(major_version)
-    new_info = get_update(electron_source_info)
-    out = old_info | {new_info[0]: new_info[1]}
-
-    save_info_json(SOURCE_INFO_JSON, out)
-
-    new_version = new_info[1]["version"]
-    if old_version == new_version:
-        print(f"{package_name} is up-to-date")
-    elif commit:
-        commit_result(package_name, old_version, new_version, SOURCE_INFO_JSON)
-
-
 def non_eol_releases(releases: Iterable[int]) -> Iterable[int]:
     """Returns a list of releases that have not reached end-of-life yet."""
     return tuple(filter(lambda x: x in supported_version_range(), releases))
 
 
-def update_all_source(commit: bool) -> None:
+def update_source(version: str, commit: bool) -> None:
+    """Update a given electron-source release
+
+    Args:
+        version: The major version number, e.g. '27'
+        commit: Whether the updater should commit the result
+    """
+    major_version = version
+
+    package_name = f"electron-source.electron_{major_version}"
+    print(f"Updating electron-source.electron_{major_version}")
+
+    old_info = load_info_json(SOURCE_INFO_JSON)
+    old_version = (
+        old_info[major_version]["version"]
+        if major_version in old_info
+        else None
+    )
+
+    m, rev = get_latest_version(major_version)
+    if old_version == m["version"]:
+        print(f"{package_name} is up-to-date")
+        return
+
+    gclient_data = get_gclient_data(rev)
+    new_info = get_update(major_version, m, gclient_data)
+    out = old_info | {new_info[0]: new_info[1]}
+
+    save_info_json(SOURCE_INFO_JSON, out)
+
+    new_version = new_info[1]["version"]
+    if commit:
+        commit_result(package_name, old_version, new_version, SOURCE_INFO_JSON)
+
+
+@click.group()
+def cli() -> None:
+    """A script for updating electron-source hashes"""
+    pass
+
+
+@cli.command("update", help="Update a single major release")
+@click.option("-v", "--version", required=True, type=str, help="The major version, e.g. '23'")
+@click.option("-c", "--commit", is_flag=True, default=False, help="Commit the result")
+def update(version: str, commit: bool) -> None:
+    update_source(version, commit)
+
+
+@cli.command("update-all", help="Update all releases at once")
+@click.option("-c", "--commit", is_flag=True, default=False, help="Commit the result")
+def update_all(commit: bool) -> None:
     """Update all eletron-source releases at once
 
     Args:
@@ -650,218 +227,8 @@ def update_all_source(commit: bool) -> None:
 
     filtered_releases = non_eol_releases(tuple(map(lambda x: int(x), old_info.keys())))
 
-    # This might take some time
-    repos = Parallel(n_jobs=2, require="sharedmem")(
-        delayed(get_electron_info)(major_version) for major_version in filtered_releases
-    )
-    new_info = {
-        n[0]: n[1]
-        for n in Parallel(n_jobs=2, require="sharedmem")(
-            delayed(get_update)(repo) for repo in repos
-        )
-    }
-
-    if commit:
-        for major_version in filtered_releases:
-            # Since the sources have been fetched at this point already,
-            # fetching them again will be much faster.
-            update_source(str(major_version), commit)
-    else:
-        out = old_info | {new_info[0]: new_info[1]}
-        save_info_json(SOURCE_INFO_JSON, out)
-
-
-def parse_cve_numbers(tag_name: str) -> Iterable[str]:
-    """Returns mentioned CVE numbers from a given release tag"""
-    cve_pattern = r"CVE-\d{4}-\d+"
-    url = f"https://api.github.com/repos/electron/electron/releases/tags/{tag_name}"
-    headers = {
-        "Accept": "application/vnd.github+json",
-        "X-GitHub-Api-Version": "2022-11-28",
-    }
-    request = urllib.request.Request(url=url, headers=headers)
-    release_note = ""
-    try:
-        with urlopen(request) as response:
-            release_note = json.loads(response.read().decode("utf-8"))["body"]
-    except:
-        print(
-            f"WARN: Fetching release note for {tag_name} from GitHub failed!",
-            file=sys.stderr,
-        )
-
-    return sorted(re.findall(cve_pattern, release_note))
-
-
-def commit_result(
-    package_name: str, old_version: Optional[str], new_version: str, path: str
-) -> None:
-    """Creates a git commit with a short description of the change
-
-    Args:
-        package_name: The package name, e.g. `electron-source.electron-{major_version}`
-            or `electron_{major_version}-bin`
-
-        old_version: Version number before the update.
-            Can be left empty when initializing a new release.
-
-        new_version: Version number after the update.
-
-        path: Path to the lockfile to be committed
-    """
-    assert (
-        isinstance(package_name, str) and len(package_name) > 0
-    ), "Argument `package_name` cannot be empty"
-    assert (
-        isinstance(new_version, str) and len(new_version) > 0
-    ), "Argument `new_version` cannot be empty"
-
-    if old_version != new_version:
-        major_version = new_version.split(".")[0]
-        cve_fixes_text = "\n".join(
-            list(
-                map(lambda cve: f"- Fixes {cve}", parse_cve_numbers(f"v{new_version}"))
-            )
-        )
-        init_msg = f"init at {new_version}"
-        update_msg = f"{old_version} -> {new_version}"
-        diff = (
-            f"- Diff: https://github.com/electron/electron/compare/refs/tags/v{old_version}...v{new_version}\n"
-            if old_version != None
-            else ""
-        )
-        commit_message = f"""{package_name}: {update_msg if old_version != None else init_msg}
-
-- Changelog: https://github.com/electron/electron/releases/tag/v{new_version}
-{diff}{cve_fixes_text}
-"""
-        subprocess.run(
-            [
-                "git",
-                "add",
-                path,
-            ]
-        )
-        subprocess.run(
-            [
-                "git",
-                "commit",
-                "-m",
-                commit_message,
-            ]
-        )
-
-
-@click.group()
-def cli() -> None:
-    """A script for updating electron-bin and electron-source hashes"""
-    pass
-
-
-@cli.command(
-    "eval", help="Print the necessary sources to fetch for a given major release"
-)
-@click.option("--version", help="The major version, e.g. '23'")
-def eval(version):
-    (_, _, repo) = electron_repo = get_electron_info(version)
-    tree = repo.flatten("src/electron")
-    print(json.dumps(tree, indent=JSON_INDENT, default=vars, sort_keys=True))
-
-
-@cli.command("update-chromedriver", help="Update a single major release")
-@click.option("-v", "--version", help="The major version, e.g. '23'")
-@click.option("-c", "--commit", is_flag=True, default=False, help="Commit the result")
-def update_chromedriver_cmd(version: str, commit: bool) -> None:
-    update_chromedriver(version, commit)
-
-
-@cli.command("update", help="Update a single major release")
-@click.option("-v", "--version", help="The major version, e.g. '23'")
-@click.option(
-    "-b",
-    "--bin-only",
-    is_flag=True,
-    default=False,
-    help="Only update electron-bin packages",
-)
-@click.option(
-    "-s",
-    "--source-only",
-    is_flag=True,
-    default=False,
-    help="Only update electron-source packages",
-)
-@click.option("-c", "--commit", is_flag=True, default=False, help="Commit the result")
-def update(version: str, bin_only: bool, source_only: bool, commit: bool) -> None:
-    assert isinstance(version, str) and len(version) > 0, "version must be non-empty"
-
-    if bin_only and source_only:
-        print(
-            "Error: Omit --bin-only and --source-only if you want to update both source and binary packages.",
-            file=sys.stderr,
-        )
-        sys.exit(1)
-
-    elif bin_only:
-        update_bin(version, commit)
-
-    elif source_only:
-        update_source(version, commit)
-
-    else:
-        update_bin(version, commit)
-        update_source(version, commit)
-
-    update_chromedriver(version, commit)
-
-
-@cli.command("update-all", help="Update all releases at once")
-@click.option(
-    "-b",
-    "--bin-only",
-    is_flag=True,
-    default=False,
-    help="Only update electron-bin packages",
-)
-@click.option(
-    "-s",
-    "--source-only",
-    is_flag=True,
-    default=False,
-    help="Only update electron-source packages",
-)
-@click.option("-c", "--commit", is_flag=True, default=False, help="Commit the result")
-def update_all(bin_only: bool, source_only: bool, commit: bool) -> None:
-    # Filter out releases that have reached end-of-life
-    filtered_bin_info = dict(
-        filter(
-            lambda entry: int(entry[0]) in supported_version_range(),
-            load_info_json(BINARY_INFO_JSON).items(),
-        )
-    )
-
-    if bin_only and source_only:
-        print(
-            "Error: omit --bin-only and --source-only if you want to update both source and binary packages.",
-            file=sys.stderr,
-        )
-        sys.exit(1)
-
-    elif bin_only:
-        for major_version, _ in filtered_bin_info.items():
-            update_bin(major_version, commit)
-
-    elif source_only:
-        update_all_source(commit)
-
-    else:
-        for major_version, _ in filtered_bin_info.items():
-            update_bin(major_version, commit)
-
-        update_all_source(commit)
-
-    for major_version, _ in filtered_bin_info.items():
-        update_chromedriver(major_version, commit)
+    for major_version in filtered_releases:
+        update_source(str(major_version), commit)
 
 
 if __name__ == "__main__":
diff --git a/pkgs/development/tools/electron/update_util.py b/pkgs/development/tools/electron/update_util.py
new file mode 100755
index 000000000000..4c3f652776da
--- /dev/null
+++ b/pkgs/development/tools/electron/update_util.py
@@ -0,0 +1,161 @@
+import json
+import re
+import sys
+import subprocess
+import urllib.request
+
+from typing import Iterable, Optional, Tuple
+from urllib.request import urlopen
+from datetime import datetime
+
+# Number of spaces used for each indentation level
+JSON_INDENT = 4
+
+releases_json = None
+
+# Releases that have reached end-of-life no longer receive any updates
+# and it is rather pointless trying to update those.
+#
+# https://endoflife.date/electron
+def supported_version_range() -> range:
+    """Returns a range of electron releases that have not reached end-of-life yet"""
+    global releases_json
+    if releases_json is None:
+        releases_json = json.loads(
+            urlopen("https://endoflife.date/api/electron.json").read()
+        )
+    supported_releases = [
+        int(x["cycle"])
+        for x in releases_json
+        if x["eol"] == False
+        or datetime.strptime(x["eol"], "%Y-%m-%d") > datetime.today()
+    ]
+
+    return range(
+        min(supported_releases),  # incl.
+        # We have also packaged the beta release in nixpkgs,
+        # but it is not tracked by endoflife.date
+        max(supported_releases) + 2,  # excl.
+        1,
+    )
+
+def get_latest_version(major_version: str) -> Tuple[str, str]:
+    """Returns the latest version for a given major version"""
+    electron_releases: dict = json.loads(
+        urlopen("https://releases.electronjs.org/releases.json").read()
+    )
+    major_version_releases = filter(
+        lambda item: item["version"].startswith(f"{major_version}."), electron_releases
+    )
+    m = max(major_version_releases, key=lambda item: item["date"])
+
+    rev = f"v{m['version']}"
+    return (m, rev)
+
+
+def load_info_json(path: str) -> dict:
+    """Load the contents of a JSON file
+
+    Args:
+        path: The path to the JSON file
+
+    Returns: An empty dict if the path does not exist, otherwise the contents of the JSON file.
+    """
+    try:
+        with open(path, "r") as f:
+            return json.loads(f.read())
+    except:
+        return {}
+
+
+def save_info_json(path: str, content: dict) -> None:
+    """Saves the given info to a JSON file
+
+    Args:
+        path: The path where the info should be saved
+        content: The content to be saved as JSON.
+    """
+    with open(path, "w") as f:
+        f.write(json.dumps(content, indent=JSON_INDENT, default=vars, sort_keys=True))
+        f.write("\n")
+
+
+def parse_cve_numbers(tag_name: str) -> Iterable[str]:
+    """Returns mentioned CVE numbers from a given release tag"""
+    cve_pattern = r"CVE-\d{4}-\d+"
+    url = f"https://api.github.com/repos/electron/electron/releases/tags/{tag_name}"
+    headers = {
+        "Accept": "application/vnd.github+json",
+        "X-GitHub-Api-Version": "2022-11-28",
+    }
+    request = urllib.request.Request(url=url, headers=headers)
+    release_note = ""
+    try:
+        with urlopen(request) as response:
+            release_note = json.loads(response.read().decode("utf-8"))["body"]
+    except:
+        print(
+            f"WARN: Fetching release note for {tag_name} from GitHub failed!",
+            file=sys.stderr,
+        )
+
+    return sorted(re.findall(cve_pattern, release_note))
+
+
+def commit_result(
+    package_name: str, old_version: Optional[str], new_version: str, path: str
+) -> None:
+    """Creates a git commit with a short description of the change
+
+    Args:
+        package_name: The package name, e.g. `electron-source.electron-{major_version}`
+            or `electron_{major_version}-bin`
+
+        old_version: Version number before the update.
+            Can be left empty when initializing a new release.
+
+        new_version: Version number after the update.
+
+        path: Path to the lockfile to be committed
+    """
+    assert (
+        isinstance(package_name, str) and len(package_name) > 0
+    ), "Argument `package_name` cannot be empty"
+    assert (
+        isinstance(new_version, str) and len(new_version) > 0
+    ), "Argument `new_version` cannot be empty"
+
+    if old_version != new_version:
+        major_version = new_version.split(".")[0]
+        cve_fixes_text = "\n".join(
+            list(
+                map(lambda cve: f"- Fixes {cve}", parse_cve_numbers(f"v{new_version}"))
+            )
+        )
+        init_msg = f"init at {new_version}"
+        update_msg = f"{old_version} -> {new_version}"
+        diff = (
+            f"- Diff: https://github.com/electron/electron/compare/refs/tags/v{old_version}...v{new_version}\n"
+            if old_version != None
+            else ""
+        )
+        commit_message = f"""{package_name}: {update_msg if old_version != None else init_msg}
+
+- Changelog: https://github.com/electron/electron/releases/tag/v{new_version}
+{diff}{cve_fixes_text}
+"""
+        subprocess.run(
+            [
+                "git",
+                "add",
+                path,
+            ]
+        )
+        subprocess.run(
+            [
+                "git",
+                "commit",
+                "-m",
+                commit_message,
+            ]
+        )
diff --git a/pkgs/os-specific/bsd/freebsd/default.nix b/pkgs/os-specific/bsd/freebsd/default.nix
index ac4809d7a2fe..91fbd2aa0b68 100644
--- a/pkgs/os-specific/bsd/freebsd/default.nix
+++ b/pkgs/os-specific/bsd/freebsd/default.nix
@@ -3,7 +3,7 @@
   generateSplicesForMkScope,
   callPackage,
   attributePathToSplice ? [ "freebsd" ],
-  branch ? "release/14.1.0",
+  branch ? "release/14.2.0",
 }:
 
 let
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/ath-hal-clang19.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/ath-hal-clang19.patch
deleted file mode 100644
index 09a64e1a3edd..000000000000
--- a/pkgs/os-specific/bsd/freebsd/patches/14.1/ath-hal-clang19.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-commit 36d486cc2ecdb9c290dba65bd5668b7e50d0d822
-Author: Dimitry Andric <dim@FreeBSD.org>
-Date:   Wed Jul 31 11:43:50 2024 +0200
-
-    Fix enum warning in ath_hal's ar9002
-    
-    This fixes a clang 19 warning:
-    
-        sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c:57:32: error: comparison of different enumeration types ('HAL_BOOL' and 'HAL_ANT_SETTING') [-Werror,-Wenum-compare]
-           57 |             (AH5212(ah)->ah_diversity != HAL_ANT_VARIABLE)) {
-              |              ~~~~~~~~~~~~~~~~~~~~~~~~ ^  ~~~~~~~~~~~~~~~~
-    
-    The `ah_diversity` field of `struct ath_hal_5212` is of type `HAL_BOOL`,
-    not the enum type `HAL_ANT_SETTING`. In other code, `ah_diversity` is
-    set to `AH_TRUE` whenever the related field `ah_antControl` is set to
-    `HAL_ANT_VARIABLE`.
-    
-    It is not entirely clear to me what the intended statement is here: the
-    test as it is written now compares the enum value 0 to `ah_diversity`,
-    so in effect it enables the following block whenever `ah_diversity` is
-    `AH_TRUE`. Write it like that, to avoid the compiler warning.
-    
-    MFC after:      3 days
-
-diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c b/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c
-index 01a224cbbfe9..fb2700771ffa 100644
---- a/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c
-+++ b/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c
-@@ -54,7 +54,7 @@ ar9285BTCoexAntennaDiversity(struct ath_hal *ah)
- 	    !! (ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ENABLE));
- 
- 	if ((ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ALLOW) ||
--	    (AH5212(ah)->ah_diversity != HAL_ANT_VARIABLE)) {
-+	    (AH5212(ah)->ah_diversity == AH_TRUE)) {
- 	if ((ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ENABLE) &&
- 	     (AH5212(ah)->ah_antControl == HAL_ANT_VARIABLE)) {
- 		/* Enable antenna diversity */
-commit 82246ac5d890e031c9978052e5a431e0960182d5
-Author: Dimitry Andric <dim@FreeBSD.org>
-Date:   Wed Jul 31 11:37:20 2024 +0200
-
-    Fix enum warnings in ath_hal's ar9300
-    
-    This fixes a number of clang 19 warnings:
-    
-        sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c:709:25: error: comparison of different enumeration types ('HAL_BOOL' and 'HAL_FREQ_BAND') [-Werror,-Wenum-compare]
-          709 |         freq_array[i] = FBIN2FREQ(p_freq_bin[i], is_2ghz);
-              |                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h:148:11: note: expanded from macro 'FBIN2FREQ'
-          148 |     (((y) == HAL_FREQ_BAND_2GHZ) ? (2300 + x) : (4800 + 5 * x))
-              |       ~~~ ^  ~~~~~~~~~~~~~~~~~~
-        sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c:745:25: error: comparison of different enumeration types ('HAL_BOOL' and 'HAL_FREQ_BAND') [-Werror,-Wenum-compare]
-          745 |         freq_array[i] = FBIN2FREQ(p_freq_bin[i], is_2ghz);
-              |                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h:148:11: note: expanded from macro 'FBIN2FREQ'
-          148 |     (((y) == HAL_FREQ_BAND_2GHZ) ? (2300 + x) : (4800 + 5 * x))
-              |       ~~~ ^  ~~~~~~~~~~~~~~~~~~
-        sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c:781:25: error: comparison of different enumeration types ('HAL_BOOL' and 'HAL_FREQ_BAND') [-Werror,-Wenum-compare]
-          781 |         freq_array[i] = FBIN2FREQ(p_freq_bin[i], is_2ghz);
-              |                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h:148:11: note: expanded from macro 'FBIN2FREQ'
-          148 |     (((y) == HAL_FREQ_BAND_2GHZ) ? (2300 + x) : (4800 + 5 * x))
-              |       ~~~ ^  ~~~~~~~~~~~~~~~~~~
-    
-    The `FBIN2FREQ()` and `FREQ2FBIN()` macros in `ar9300eep.h` are invoked
-    in most places around the `ath_hal` code with a (effectively) boolean
-    second argument, corresponding to "is this 2GHz?". But in the code that
-    is warned about, the value `HAL_FREQ_BAND_2GHZ` is of a different
-    non-boolean type, `HAL_FREQ_BAND`.
-    
-    Update the `FBIN2FREQ()` and `FREQ2FBIN()` macros to interpret the
-    second argument as boolean value, and rename the macro parameter names
-    to better describe their meaning.
-    
-    Reviewed by:    adrian, bz
-    MFC after:      3 days
-    Differential Revision: https://reviews.freebsd.org/D46201
-
-diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h
-index 9230fd57e2e4..b2a0862c7aee 100644
---- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h
-+++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h
-@@ -142,10 +142,10 @@ enum Ar9300EepromTemplate
- #define OSPREY_EEPMISC_WOW           0x02
- #define OSPREY_CUSTOMER_DATA_SIZE    20
- 
--#define FREQ2FBIN(x,y) \
--    (u_int8_t)(((y) == HAL_FREQ_BAND_2GHZ) ? ((x) - 2300) : (((x) - 4800) / 5))
--#define FBIN2FREQ(x,y) \
--    (((y) == HAL_FREQ_BAND_2GHZ) ? (2300 + x) : (4800 + 5 * x))
-+#define FREQ2FBIN(freq,is_2ghz) \
-+    (u_int8_t)((is_2ghz) ? ((freq) - 2300) : (((freq) - 4800) / 5))
-+#define FBIN2FREQ(freq,is_2ghz) \
-+    ((is_2ghz) ? (2300 + freq) : (4800 + 5 * freq))
- #define OSPREY_MAX_CHAINS            3
- #define OSPREY_ANT_16S               25
- #define OSPREY_FUTURE_MODAL_SZ       6
-commit 1bd66fac35ec27fa64d6158f82fdcbdc26098679
-Author: Dimitry Andric <dim@FreeBSD.org>
-Date:   Wed Jul 31 13:14:17 2024 +0200
-
-    Fix enum warning in isci
-    
-    This fixes a clang 19 warning:
-    
-        sys/dev/isci/scil/scif_sas_smp_remote_device.c:197:26: error: comparison of different enumeration types ('SCI_IO_STATUS' (aka 'enum _SCI_IO_STATUS') and 'enum _SCI_STATUS') [-Werror,-Wenum-compare]
-          197 |    if (completion_status == SCI_FAILURE_RETRY_REQUIRED)
-              |        ~~~~~~~~~~~~~~~~~ ^  ~~~~~~~~~~~~~~~~~~~~~~~~~~
-    
-    The `completion_status` variable is of type `SCI_IO_STATUS`, not
-    `SCI_STATUS`. In this case, we can seamlessly replace the value with
-    `SCI_IO_FAILURE_RETRY_REQUIRED`, which is numerically equal to
-    `SCI_FAILURE_RETRY_REQUIRED`.
-    
-    MFC after:      3 days
-
-diff --git a/sys/dev/isci/scil/scif_sas_smp_remote_device.c b/sys/dev/isci/scil/scif_sas_smp_remote_device.c
-index d6055adc13f9..c72402f66889 100644
---- a/sys/dev/isci/scil/scif_sas_smp_remote_device.c
-+++ b/sys/dev/isci/scil/scif_sas_smp_remote_device.c
-@@ -194,7 +194,7 @@ SCI_STATUS scif_sas_smp_remote_device_decode_smp_response(
- 
-    //if Core set the status of this io to be RETRY_REQUIRED, we should
-    //retry the IO without even decode the response.
--   if (completion_status == SCI_FAILURE_RETRY_REQUIRED)
-+   if (completion_status == SCI_IO_FAILURE_RETRY_REQUIRED)
-    {
-       scif_sas_smp_remote_device_continue_current_activity(
-          fw_device, fw_request, SCI_FAILURE_RETRY_REQUIRED
-commit 357378bbdedf24ce2b90e9bd831af4a9db3ec70a
-Author: Dimitry Andric <dim@FreeBSD.org>
-Date:   Wed Jul 31 14:21:25 2024 +0200
-
-    Fix enum warnings in qat
-    
-    This fixes a number of clang 19 warnings:
-    
-        sys/dev/qat/qat_api/common/compression/dc_session.c:154:15: error: comparison of different enumeration types ('enum _CpaBoolean' and 'icp_qat_hw_compression_delayed_match_t') [-Werror,-Wenum-compare]
-          154 |         if (CPA_TRUE == pService->comp_device_data.enableDmm) {
-              |             ~~~~~~~~ ^  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        sys/dev/qat/qat_api/common/compression/dc_session.c:285:17: error: comparison of different enumeration types ('enum _CpaBoolean' and 'icp_qat_hw_compression_delayed_match_t') [-Werror,-Wenum-compare]
-          285 |                     (CPA_TRUE == pService->comp_device_data.enableDmm) ?
-              |                      ~~~~~~~~ ^  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    
-    The `enableDmm` field of variable `comp_device_data` is of type
-    `icp_qat_hw_compression_delayed_match_t`, not `CpaBoolean`. In this
-    case, we can seamlessly replace the value with
-    `ICP_QAT_HW_COMPRESSION_DELAYED_MATCH_ENABLED`, which is numerically
-    equal to `CPA_TRUE`.
-    
-    MFC after:      3 days
-
-diff --git a/sys/dev/qat/qat_api/common/compression/dc_session.c b/sys/dev/qat/qat_api/common/compression/dc_session.c
-index c92d6eebdc47..60f4410dac32 100644
---- a/sys/dev/qat/qat_api/common/compression/dc_session.c
-+++ b/sys/dev/qat/qat_api/common/compression/dc_session.c
-@@ -151,7 +151,8 @@ dcCompHwBlockPopulate(sal_compression_service_t *pService,
- 	}
- 
- 	/* Set delay match mode */
--	if (CPA_TRUE == pService->comp_device_data.enableDmm) {
-+	if (ICP_QAT_HW_COMPRESSION_DELAYED_MATCH_ENABLED ==
-+	    pService->comp_device_data.enableDmm) {
- 		dmm = ICP_QAT_HW_COMPRESSION_DELAYED_MATCH_ENABLED;
- 	} else {
- 		dmm = ICP_QAT_HW_COMPRESSION_DELAYED_MATCH_DISABLED;
-@@ -282,7 +283,8 @@ dcCompHwBlockPopulateGen4(sal_compression_service_t *pService,
- 		hw_comp_lower_csr.hash_update =
- 		    ICP_QAT_HW_COMP_20_SKIP_HASH_UPDATE_DONT_ALLOW;
- 		hw_comp_lower_csr.edmm =
--		    (CPA_TRUE == pService->comp_device_data.enableDmm) ?
-+		    (ICP_QAT_HW_COMPRESSION_DELAYED_MATCH_ENABLED ==
-+			pService->comp_device_data.enableDmm) ?
- 		    ICP_QAT_HW_COMP_20_EXTENDED_DELAY_MATCH_MODE_EDMM_ENABLED :
- 		    ICP_QAT_HW_COMP_20_EXTENDED_DELAY_MATCH_MODE_EDMM_DISABLED;
- 
-commit 67be1e195acfaec99ce4fffeb17111ce085755f7
-Author: Dimitry Andric <dim@FreeBSD.org>
-Date:   Wed Jul 31 13:01:20 2024 +0200
-
-    Fix enum warning in iavf
-    
-    This fixes a clang 19 warning:
-    
-        sys/dev/iavf/iavf_lib.c:514:39: error: comparison of different enumeration types ('enum virtchnl_vsi_type' and 'enum iavf_vsi_type') [-Werror,-Wenum-compare]
-          514 |                 if (sc->vf_res->vsi_res[i].vsi_type == IAVF_VSI_SRIOV)
-              |                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^  ~~~~~~~~~~~~~~
-    
-    The `vsi_type` field of `struct virtchnl_vsi_resource` is of type `enum
-    virtchnl_vsi_type`, not `enum iavf_vsi_type`. In this case, we can
-    seamlessly replace the value with `VIRTCHNL_VSI_SRIOV`, which is
-    numerically equal to `IAVF_VSI_SRIOV`.
-    
-    MFC after:      3 days
-
-diff --git a/sys/dev/iavf/iavf_lib.c b/sys/dev/iavf/iavf_lib.c
-index 883a722b3a03..f80e3765448f 100644
---- a/sys/dev/iavf/iavf_lib.c
-+++ b/sys/dev/iavf/iavf_lib.c
-@@ -511,7 +511,7 @@ iavf_get_vsi_res_from_vf_res(struct iavf_sc *sc)
- 
- 	for (int i = 0; i < sc->vf_res->num_vsis; i++) {
- 		/* XXX: We only use the first VSI we find */
--		if (sc->vf_res->vsi_res[i].vsi_type == IAVF_VSI_SRIOV)
-+		if (sc->vf_res->vsi_res[i].vsi_type == VIRTCHNL_VSI_SRIOV)
- 			sc->vsi_res = &sc->vf_res->vsi_res[i];
- 	}
- 	if (!sc->vsi_res) {
-commit 6f25b46721a18cf4f036d041e7e5d275800a00b3
-Author: Dimitry Andric <dim@FreeBSD.org>
-Date:   Tue Jul 30 20:31:47 2024 +0200
-
-    Fix enum warning in heimdal
-    
-    This fixes a clang 19 warning:
-    
-    crypto/heimdal/lib/krb5/deprecated.c:75:17: error: comparison of different enumeration types ('krb5_keytype' (aka 'enum ENCTYPE') and 'enum krb5_keytype_old') [-Werror,-Wenum-compare]
-       75 |     if (keytype != KEYTYPE_DES || context->etypes_des == NULL)
-          |         ~~~~~~~ ^  ~~~~~~~~~~~
-    
-    In https://github.com/heimdal/heimdal/commit/3bebbe5323 this was solved
-    by adding a cast. That commit is rather large, so I'm only applying the
-    one-liner here.
-    
-    MFC after:      3 days
-
-diff --git a/crypto/heimdal/lib/krb5/deprecated.c b/crypto/heimdal/lib/krb5/deprecated.c
-index e7c0105ebf7f..02cf7614f932 100644
---- a/crypto/heimdal/lib/krb5/deprecated.c
-+++ b/crypto/heimdal/lib/krb5/deprecated.c
-@@ -72,7 +72,7 @@ krb5_keytype_to_enctypes_default (krb5_context context,
-     unsigned int i, n;
-     krb5_enctype *ret;
- 
--    if (keytype != KEYTYPE_DES || context->etypes_des == NULL)
-+    if (keytype != (krb5_keytype)KEYTYPE_DES || context->etypes_des == NULL)
- 	return krb5_keytype_to_enctypes (context, keytype, len, val);
- 
-     for (n = 0; context->etypes_des[n]; ++n)
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/mk-werror-clang19.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/mk-werror-clang19.patch
deleted file mode 100644
index 5bc224eaa97e..000000000000
--- a/pkgs/os-specific/bsd/freebsd/patches/14.1/mk-werror-clang19.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit d575077527d448ee45b923fa8c6b0cb7216ca5c5
-Author: Dimitry Andric <dim@FreeBSD.org>
-Date:   Tue Jul 30 20:28:51 2024 +0200
-
-    bsd.sys.mk: for clang >= 19, similar to gcc >= 8.1, turn off -Werror for
-    -Wcast-function-type-mismatch.
-    
-    PR:             280562
-    MFC after:      1 month
-
-diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
-index 52c3d07746c7..1934a79a5427 100644
---- a/share/mk/bsd.sys.mk
-+++ b/share/mk/bsd.sys.mk
-@@ -88,6 +88,10 @@ CWARNFLAGS.clang+=	-Wno-unused-const-variable
- .if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150000
- CWARNFLAGS.clang+=	-Wno-error=unused-but-set-parameter
- .endif
-+.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 190000
-+# Similar to gcc >= 8.1 -Wno-error=cast-function-type below
-+CWARNFLAGS.clang+=	-Wno-error=cast-function-type-mismatch
-+.endif
- .endif # WARNS <= 6
- .if ${WARNS} <= 3
- CWARNFLAGS.clang+=	-Wno-tautological-compare -Wno-unused-value\
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/sys-cdefs-static-assert.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/sys-cdefs-static-assert.patch
deleted file mode 100644
index b5a054f124d3..000000000000
--- a/pkgs/os-specific/bsd/freebsd/patches/14.1/sys-cdefs-static-assert.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 22cdafe197ac960c5ce839ef6ec699b59f4b0080 Mon Sep 17 00:00:00 2001
-From: Warner Losh <imp@FreeBSD.org>
-Date: Sat, 20 Jul 2024 09:57:53 -0600
-Subject: cdefs.h: Don't define fallback for _Static_assert
-
-Remove pre 4.6 code to define _Static_assert in terms of _COUNTER.  We
-no longer need to support compilers this old (in fact support for all
-pre gcc 10 compilers has been removed in -current). This is a partial
-MFC of that work because removing this fixes a bug that's oft reported
-with -pedantic-errors and C++98 compilations.
-
-PR: 280382, 276738
-Sponsored by:		Netflix
-
-This is a direct commit to stable/14.
----
- sys/sys/cdefs.h | 9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h
-index 19b7d8fe427d..a52864c5db9d 100644
---- a/sys/sys/cdefs.h
-+++ b/sys/sys/cdefs.h
-@@ -277,15 +277,6 @@
- #if (defined(__cplusplus) && __cplusplus >= 201103L) || \
-     __has_extension(cxx_static_assert)
- #define	_Static_assert(x, y)	static_assert(x, y)
--#elif __GNUC_PREREQ__(4,6) && !defined(__cplusplus)
--/* Nothing, gcc 4.6 and higher has _Static_assert built-in */
--#elif defined(__COUNTER__)
--#define	_Static_assert(x, y)	__Static_assert(x, __COUNTER__)
--#define	__Static_assert(x, y)	___Static_assert(x, y)
--#define	___Static_assert(x, y)	typedef char __assert_ ## y[(x) ? 1 : -1] \
--				__unused
--#else
--#define	_Static_assert(x, y)	struct __hack
- #endif
- #endif
- 
--- 
-cgit v1.2.3
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/bmake-no-compiler-rt.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/bmake-no-compiler-rt.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.1/bmake-no-compiler-rt.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.2/bmake-no-compiler-rt.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/compat-fix-typedefs-locations.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/compat-fix-typedefs-locations.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.1/compat-fix-typedefs-locations.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.2/compat-fix-typedefs-locations.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/compat-install-dirs.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/compat-install-dirs.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.1/compat-install-dirs.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.2/compat-install-dirs.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/fsck-path.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/fsck-path.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.1/fsck-path.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.2/fsck-path.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/install-bootstrap-Makefile.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/install-bootstrap-Makefile.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.1/install-bootstrap-Makefile.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.2/install-bootstrap-Makefile.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/jail-use-path.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/jail-use-path.patch
similarity index 97%
rename from pkgs/os-specific/bsd/freebsd/patches/14.1/jail-use-path.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.2/jail-use-path.patch
index 4dc65933e375..5e254becd142 100644
--- a/pkgs/os-specific/bsd/freebsd/patches/14.1/jail-use-path.patch
+++ b/pkgs/os-specific/bsd/freebsd/patches/14.2/jail-use-path.patch
@@ -2,7 +2,7 @@ In a NixOS-like system, it doesn't make sense to hardcode these absolute paths.
 They even already use execvp!
 
 diff --git a/usr.sbin/jail/command.c b/usr.sbin/jail/command.c
-index 9eabcc5ff53c..2024f6bfb97a 100644
+index 9004b4729fec..669e85ed847e 100644
 --- a/usr.sbin/jail/command.c
 +++ b/usr.sbin/jail/command.c
 @@ -363,7 +363,7 @@ run_command(struct cfjail *j)
@@ -107,6 +107,6 @@ index 9eabcc5ff53c..2024f6bfb97a 100644
  		setenv("SHELL",
 -		    *pwd->pw_shell ? pwd->pw_shell : _PATH_BSHELL, 1);
 +		    *pwd->pw_shell ? pwd->pw_shell : "sh", 1);
- 		if (clean && chdir(pwd->pw_dir) < 0) {
+ 		if (clean && username && chdir(pwd->pw_dir) < 0) {
  			jail_warnx(j, "chdir %s: %s",
  			    pwd->pw_dir, strerror(errno));
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/libc-msun-arch-subdir.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/libc-msun-arch-subdir.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.1/libc-msun-arch-subdir.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.2/libc-msun-arch-subdir.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/libc-no-force--lcompiler-rt.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/libc-no-force--lcompiler-rt.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.1/libc-no-force--lcompiler-rt.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.2/libc-no-force--lcompiler-rt.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/libcxxrt-headers.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/libcxxrt-headers.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.1/libcxxrt-headers.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.2/libcxxrt-headers.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/libelf-bootstrapping.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/libelf-bootstrapping.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.1/libelf-bootstrapping.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.2/libelf-bootstrapping.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/libifconfig-no-internal.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/libifconfig-no-internal.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.1/libifconfig-no-internal.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.2/libifconfig-no-internal.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/libnetbsd-do-install.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/libnetbsd-do-install.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.1/libnetbsd-do-install.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.2/libnetbsd-do-install.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/librpcsvc-include-subdir.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/librpcsvc-include-subdir.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.1/librpcsvc-include-subdir.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.2/librpcsvc-include-subdir.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/localedef.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/localedef.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.1/localedef.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.2/localedef.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/makefs-rdev.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/makefs-rdev.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.1/makefs-rdev.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.2/makefs-rdev.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/mk.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/mk.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.1/mk.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.2/mk.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/mkimg-openbsd.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/mkimg-openbsd.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.1/mkimg-openbsd.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.2/mkimg-openbsd.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/mount-use-path.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/mount-use-path.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.1/mount-use-path.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.2/mount-use-path.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/mtree-Makefile.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/mtree-Makefile.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.1/mtree-Makefile.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.2/mtree-Makefile.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/no-perms-BSD.include.dist.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/no-perms-BSD.include.dist.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.1/no-perms-BSD.include.dist.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.2/no-perms-BSD.include.dist.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/rc-user.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/rc-user.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.1/rc-user.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.2/rc-user.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/rtld-elf-symlink.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/rtld-elf-symlink.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.1/rtld-elf-symlink.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.2/rtld-elf-symlink.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/rtld-no-force--lcompiler-rt.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/rtld-no-force--lcompiler-rt.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.1/rtld-no-force--lcompiler-rt.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.2/rtld-no-force--lcompiler-rt.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/sys-gnu-date.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/sys-gnu-date.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.1/sys-gnu-date.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.2/sys-gnu-date.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/sys-no-explicit-intrinsics-dep.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/sys-no-explicit-intrinsics-dep.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.1/sys-no-explicit-intrinsics-dep.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.2/sys-no-explicit-intrinsics-dep.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/tinfo-host-cc.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/tinfo-host-cc.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.1/tinfo-host-cc.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.2/tinfo-host-cc.patch
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix
index 963c49ea1952..f8b4859a68eb 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix
@@ -15,6 +15,8 @@ mkDerivation {
     export MAKEOBJDIRPREFIX=$TMP/obj
   '';
 
+  alwaysKeepStatic = true;
+
   meta = with lib; {
     platform = platforms.freebsd;
     license = licenses.cddl;
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/source.nix b/pkgs/os-specific/bsd/freebsd/pkgs/source.nix
index c14d26559047..9e1c4032ad61 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/source.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/source.nix
@@ -7,4 +7,10 @@ fetchFromGitHub {
   owner = "freebsd";
   repo = "freebsd-src";
   inherit (sourceData) rev hash;
+
+  # The GitHub export excludes some files in the git source
+  # that were marked `export-ignore`.
+  # A normal git checkout will keep those files,
+  # matching the update script
+  forceFetchGit = true;
 }
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/uudecode.nix b/pkgs/os-specific/bsd/freebsd/pkgs/uudecode.nix
deleted file mode 100644
index 7e2341913dc0..000000000000
--- a/pkgs/os-specific/bsd/freebsd/pkgs/uudecode.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ mkDerivation }:
-
-mkDerivation {
-  path = "usr.bin/uudecode";
-  MK_TESTS = "no";
-}
diff --git a/pkgs/os-specific/bsd/freebsd/versions.json b/pkgs/os-specific/bsd/freebsd/versions.json
index 198b99957864..e8c3c7ec80c5 100644
--- a/pkgs/os-specific/bsd/freebsd/versions.json
+++ b/pkgs/os-specific/bsd/freebsd/versions.json
@@ -1,15 +1,15 @@
 {
   "main": {
-    "hash": "sha256-jQpuNjo7n5b4yXGgXR9ggTkrb4r4pFPXdunBipetw+c=",
+    "hash": "sha256-xsgY5Ex/B5ngOTa5OZRauSaSYvET5lWI7veJRrSq1oY=",
     "ref": "main",
     "refType": "branch",
-    "rev": "82283cad12a417abfb1469d899b2d7cfb1d38f77",
+    "rev": "c5773d366ecc5271b9bd6e5506c00fb3520f19ae",
     "supported": false,
     "version": {
       "branch": "CURRENT",
       "major": 15,
       "minor": 0,
-      "reldate": "1500021",
+      "reldate": "1500035",
       "release": "15.0-CURRENT",
       "revision": "15.0",
       "type": "FreeBSD",
@@ -88,6 +88,42 @@
       "version": "FreeBSD 13.3-RELEASE"
     }
   },
+  "release/13.4.0": {
+    "hash": "sha256-ztmoDr8Y4ZpMBT7E1hen5hf3H7na/cydvpjNmuUDmjs=",
+    "ref": "release/13.4.0",
+    "refType": "tag",
+    "rev": "58066db597befb899b2fe59031b2a32fb9183f0f",
+    "supported": false,
+    "version": {
+      "branch": "RELEASE",
+      "major": 13,
+      "minor": 4,
+      "patch": 0,
+      "reldate": "1304000",
+      "release": "13.4-RELEASE",
+      "revision": "13.4",
+      "type": "FreeBSD",
+      "version": "FreeBSD 13.4-RELEASE"
+    }
+  },
+  "release/13.5.0": {
+    "hash": "sha256-53q7qR3ij5v3QAHx6Wa84F3yRSwFrBaey0NxVcNLMEk=",
+    "ref": "release/13.5.0",
+    "refType": "tag",
+    "rev": "882b9f3f2218b50fc1d2d31ee71b7765c7f09f85",
+    "supported": false,
+    "version": {
+      "branch": "RELEASE",
+      "major": 13,
+      "minor": 5,
+      "patch": 0,
+      "reldate": "1305000",
+      "release": "13.5-RELEASE",
+      "revision": "13.5",
+      "type": "FreeBSD",
+      "version": "FreeBSD 13.5-RELEASE"
+    }
+  },
   "release/14.0.0": {
     "hash": "sha256-eBKwCYcOG9Lg7gBA2gZqxQFO/3uMMrcQGtgqi8se6zA=",
     "ref": "release/14.0.0",
@@ -124,6 +160,24 @@
       "version": "FreeBSD 14.1-RELEASE"
     }
   },
+  "release/14.2.0": {
+    "hash": "sha256-qZkeuUZbuPOvXZBgP5x6Hii1YN7XdDJzwZeYacIR5BI=",
+    "ref": "release/14.2.0",
+    "refType": "tag",
+    "rev": "c8918d6c7412fce87922e9bd7e4f5c7d7ca96eb7",
+    "supported": false,
+    "version": {
+      "branch": "RELEASE",
+      "major": 14,
+      "minor": 2,
+      "patch": 0,
+      "reldate": "1402000",
+      "release": "14.2-RELEASE",
+      "revision": "14.2",
+      "type": "FreeBSD",
+      "version": "FreeBSD 14.2-RELEASE"
+    }
+  },
   "releng/13.0": {
     "hash": "sha256-7PrqTb2o21IQgQ2N+zjavlzX/ju60Rw+MXjMRICmQi0=",
     "ref": "releng/13.0",
@@ -179,91 +233,144 @@
     }
   },
   "releng/13.3": {
-    "hash": "sha256-jvXIrlNmaGe4gyYCK/3wjm9JWBQOU0sD1LPxWykNddI=",
+    "hash": "sha256-mVEt1wGvQ2xFRsEzVf+GDfroF8sxUAVooIr0yU/80Yg=",
     "ref": "releng/13.3",
     "refType": "branch",
-    "rev": "deb948cd8dc2efb341ce96e1b7a56c9fbc662ba1",
+    "rev": "72aa3d55e9ff8634edf8a28162470969133ea7ca",
+    "supported": false,
+    "version": {
+      "branch": "RELEASE-p8",
+      "major": 13,
+      "minor": 3,
+      "patch": "8",
+      "reldate": "1303001",
+      "release": "13.3-RELEASE-p8",
+      "revision": "13.3",
+      "type": "FreeBSD",
+      "version": "FreeBSD 13.3-RELEASE-p8"
+    }
+  },
+  "releng/13.4": {
+    "hash": "sha256-y61CplXIRVDkGRtbH2TX9AKr0kiaNaqAT/+fXdkvy6g=",
+    "ref": "releng/13.4",
+    "refType": "branch",
+    "rev": "27f132c05c39138b375591d2bf9f73f680997de3",
     "supported": true,
     "version": {
       "branch": "RELEASE-p4",
       "major": 13,
-      "minor": 3,
+      "minor": 4,
       "patch": "4",
-      "reldate": "1303001",
-      "release": "13.3-RELEASE-p4",
-      "revision": "13.3",
+      "reldate": "1304000",
+      "release": "13.4-RELEASE-p4",
+      "revision": "13.4",
       "type": "FreeBSD",
-      "version": "FreeBSD 13.3-RELEASE-p4"
+      "version": "FreeBSD 13.4-RELEASE-p4"
+    }
+  },
+  "releng/13.5": {
+    "hash": "sha256-53q7qR3ij5v3QAHx6Wa84F3yRSwFrBaey0NxVcNLMEk=",
+    "ref": "releng/13.5",
+    "refType": "branch",
+    "rev": "882b9f3f2218b50fc1d2d31ee71b7765c7f09f85",
+    "supported": true,
+    "version": {
+      "branch": "RELEASE",
+      "major": 13,
+      "minor": 5,
+      "reldate": "1305000",
+      "release": "13.5-RELEASE",
+      "revision": "13.5",
+      "type": "FreeBSD",
+      "version": "FreeBSD 13.5-RELEASE"
     }
   },
   "releng/14.0": {
-    "hash": "sha256-kQ3r/bnBiOZ6kpnouFLKWdpSiJe3FGWJ/XA6VRNFzEc=",
+    "hash": "sha256-7FjXduO4JCAnrYCR34J7a6WjDQaT/MWufPnUKT9IBr0=",
     "ref": "releng/14.0",
     "refType": "branch",
-    "rev": "5e23806790ef4825ac09b458d3df941748599fbb",
+    "rev": "f10e328cb1921d2f5f0253565f38e0daa667db69",
+    "supported": false,
+    "version": {
+      "branch": "RELEASE-p11",
+      "major": 14,
+      "minor": 0,
+      "patch": "11",
+      "reldate": "1400097",
+      "release": "14.0-RELEASE-p11",
+      "revision": "14.0",
+      "type": "FreeBSD",
+      "version": "FreeBSD 14.0-RELEASE-p11"
+    }
+  },
+  "releng/14.1": {
+    "hash": "sha256-GOLMbuRAdIFB4fQxyrFokhU1/kmDfw7S2zvt8BVTQeM=",
+    "ref": "releng/14.1",
+    "refType": "branch",
+    "rev": "f389e68ca980b7e053a34d9eddde89b4c2a1ee6c",
     "supported": true,
     "version": {
       "branch": "RELEASE-p8",
       "major": 14,
-      "minor": 0,
+      "minor": 1,
       "patch": "8",
-      "reldate": "1400097",
-      "release": "14.0-RELEASE-p8",
-      "revision": "14.0",
+      "reldate": "1401000",
+      "release": "14.1-RELEASE-p8",
+      "revision": "14.1",
       "type": "FreeBSD",
-      "version": "FreeBSD 14.0-RELEASE-p8"
+      "version": "FreeBSD 14.1-RELEASE-p8"
     }
   },
-  "releng/14.1": {
-    "hash": "sha256-rURDGcnMzUhz2I873d5ro+wGY+i8IOmiPJ5T+w4TcPA=",
-    "ref": "releng/14.1",
+  "releng/14.2": {
+    "hash": "sha256-XP8BFnXvziaC9wOJj8q31UZXFqCUE7WQ5FdJHEZWGbg=",
+    "ref": "releng/14.2",
     "refType": "branch",
-    "rev": "dcdea9e8623e83e3aef15fff0d6ead05382ad138",
+    "rev": "ac2cbb46b5f1efa7f7b5d4eb15631337329ec5b2",
     "supported": true,
     "version": {
       "branch": "RELEASE-p2",
       "major": 14,
-      "minor": 1,
+      "minor": 2,
       "patch": "2",
-      "reldate": "1401000",
-      "release": "14.1-RELEASE-p2",
-      "revision": "14.1",
+      "reldate": "1402000",
+      "release": "14.2-RELEASE-p2",
+      "revision": "14.2",
       "type": "FreeBSD",
-      "version": "FreeBSD 14.1-RELEASE-p2"
+      "version": "FreeBSD 14.2-RELEASE-p2"
     }
   },
   "stable/13": {
-    "hash": "sha256-kbz6dpkCVYrTcPNJtKvX0TVQ4qULaOJ/WzCeQ4MYrFU=",
+    "hash": "sha256-J9SJKeR6Den3Sep2o4r0cqIDd2V5gbY0Ow9eP69Ny0o=",
     "ref": "stable/13",
     "refType": "branch",
-    "rev": "8d87e47b8d1093a264ca954620b9e58b81fb9b34",
+    "rev": "a8431b47adae8f8b731206dc38d82b2245ad245e",
     "supported": true,
     "version": {
-      "branch": "PRERELEASE",
+      "branch": "STABLE",
       "major": 13,
-      "minor": 4,
-      "reldate": "1303503",
-      "release": "13.4-PRERELEASE",
-      "revision": "13.4",
+      "minor": 5,
+      "reldate": "1305500",
+      "release": "13.5-STABLE",
+      "revision": "13.5",
       "type": "FreeBSD",
-      "version": "FreeBSD 13.4-PRERELEASE"
+      "version": "FreeBSD 13.5-STABLE"
     }
   },
   "stable/14": {
-    "hash": "sha256-ImSKU2m2Ecss1A4uTGvh0Z4ZyhN2jem0If9jlan9tM0=",
+    "hash": "sha256-tleB6J5Cg1SIN2LCfvV3Cfp4Lxx65UHmiILpin6UYGY=",
     "ref": "stable/14",
     "refType": "branch",
-    "rev": "2c75d993783ca4b0d1bf8dcdf424643781326e4b",
+    "rev": "6e510d8fbaf8d91da235fe28250cd48124edda9f",
     "supported": true,
     "version": {
       "branch": "STABLE",
       "major": 14,
-      "minor": 1,
-      "reldate": "1401501",
-      "release": "14.1-STABLE",
-      "revision": "14.1",
+      "minor": 2,
+      "reldate": "1402504",
+      "release": "14.2-STABLE",
+      "revision": "14.2",
       "type": "FreeBSD",
-      "version": "FreeBSD 14.1-STABLE"
+      "version": "FreeBSD 14.2-STABLE"
     }
   }
 }
diff --git a/pkgs/os-specific/linux/digimend/default.nix b/pkgs/os-specific/linux/digimend/default.nix
index a81dc28b948b..926e024d9e3e 100644
--- a/pkgs/os-specific/linux/digimend/default.nix
+++ b/pkgs/os-specific/linux/digimend/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     description = "DIGImend graphics tablet drivers for the Linux kernel";
     homepage = "https://digimend.github.io/";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ PuercoPop ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix
index 48282fee1183..0bf66462f9d6 100644
--- a/pkgs/os-specific/linux/guvcview/default.nix
+++ b/pkgs/os-specific/linux/guvcview/default.nix
@@ -16,18 +16,16 @@
   libpng,
   sfml_2,
   pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux,
-  libpulseaudio ? null,
+  libpulseaudio,
   useQt ? false,
   qtbase ? null,
   wrapQtAppsHook ? null,
   # can be turned off if used as a library
   useGtk ? true,
-  gtk3 ? null,
+  gtk3,
   wrapGAppsHook3 ? null,
 }:
 
-assert pulseaudioSupport -> libpulseaudio != null;
-
 stdenv.mkDerivation (finalAttrs: {
   version = "2.1.0";
   pname = "guvcview";
@@ -42,8 +40,8 @@ stdenv.mkDerivation (finalAttrs: {
       intltool
       pkg-config
     ]
-    ++ lib.optionals (useGtk) [ wrapGAppsHook3 ]
-    ++ lib.optionals (useQt) [ wrapQtAppsHook ];
+    ++ lib.optionals useGtk [ wrapGAppsHook3 ]
+    ++ lib.optionals useQt [ wrapQtAppsHook ];
 
   buildInputs =
     [
@@ -58,17 +56,18 @@ stdenv.mkDerivation (finalAttrs: {
       libpng
       sfml_2
     ]
-    ++ lib.optionals (pulseaudioSupport) [ libpulseaudio ]
-    ++ lib.optionals (useGtk) [ gtk3 ]
-    ++ lib.optionals (useQt) [
+    ++ lib.optionals pulseaudioSupport [ libpulseaudio ]
+    ++ lib.optionals useGtk [ gtk3 ]
+    ++ lib.optionals useQt [
       qtbase
     ];
+
   configureFlags =
     [
       "--enable-sfml"
     ]
-    ++ lib.optionals (useGtk) [ "--enable-gtk3" ]
-    ++ lib.optionals (useQt) [ "--enable-qt5" ];
+    ++ lib.optionals useGtk [ "--enable-gtk3" ]
+    ++ lib.optionals useQt [ "--enable-qt5" ];
 
   meta = {
     description = "Simple interface for devices supported by the linux UVC driver";
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 66427fc8b852..a698422da543 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -11,13 +11,13 @@
 
 buildDotnetModule rec {
   pname = "jackett";
-  version = "0.22.1512";
+  version = "0.22.1705";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    hash = "sha512-gNsEDFBZPByRt2/twSCBvYZtZjXmqBMJPmBKSO4j/irxlhvWpq8SgeDgICpQ9Kf4S5eROPxcKH5V50doWBJndg==";
+    hash = "sha512-AnyCT52wZR+2rhUXg3BOaWo7ESZUQNMLtaiVld2c2vYw7atq78N+uDFUIYfsvxemDAStB5tjw1mdwdLevzCkTA==";
   };
 
   projectFile = "src/Jackett.Server/Jackett.Server.csproj";
diff --git a/pkgs/servers/jackett/deps.json b/pkgs/servers/jackett/deps.json
index 5fc714ca5705..286e4692e6d0 100644
--- a/pkgs/servers/jackett/deps.json
+++ b/pkgs/servers/jackett/deps.json
@@ -1,8 +1,8 @@
 [
   {
     "pname": "AngleSharp",
-    "version": "1.1.2",
-    "hash": "sha256-LvJDD+C/NiPLVjEnIWkR+39UkzoeWgPd7BBXakij0WU="
+    "version": "1.2.0",
+    "hash": "sha256-l8+Var9o773VL6Ybih3boaFf9sYjS7eqtLGd8DCIPsk="
   },
   {
     "pname": "AngleSharp.Xml",
@@ -66,33 +66,33 @@
   },
   {
     "pname": "Microsoft.AspNetCore.Http",
-    "version": "2.2.2",
-    "hash": "sha256-iIlNsdylaZUyVsc1+VmcjhrSs0oUP7ta+tT7hu+WryY="
+    "version": "2.3.0",
+    "hash": "sha256-ubPGvFwMjXbydY1gzo/m31pWq5/SsS/tGRtOotHFfBU="
   },
   {
     "pname": "Microsoft.AspNetCore.Http.Abstractions",
-    "version": "2.2.0",
-    "hash": "sha256-y3j3Wo9Xl7kUdGkfnUc8Wexwbc2/vgxy7c3fJk1lSI8="
+    "version": "2.3.0",
+    "hash": "sha256-NrAFzk5IcxmeRk3Zu+rLcq0+KKiAYfygJbAdIt2Zpfk="
   },
   {
     "pname": "Microsoft.AspNetCore.Http.Features",
-    "version": "2.2.0",
-    "hash": "sha256-odvntHm669YtViNG5fJIxU4B+akA2SL8//DvYCLCNHc="
+    "version": "2.3.0",
+    "hash": "sha256-QkNFS3ScDLyt0XppATSogbF1raSQJN+wStcnAsSoUJw="
   },
   {
     "pname": "Microsoft.AspNetCore.JsonPatch",
-    "version": "8.0.11",
-    "hash": "sha256-7n0O/CWYMjWyicwPZgUUh+YTmdNNZA02rWhBHAzPDPU="
+    "version": "8.0.14",
+    "hash": "sha256-YebSEuvvA1zzBkwknK4w3hF6ToDD3ewMT8Iw2mUWEAE="
   },
   {
     "pname": "Microsoft.AspNetCore.Mvc.NewtonsoftJson",
-    "version": "8.0.11",
-    "hash": "sha256-oaSZize0xvrX1qf45gjMmXHipD21tBGTp2pkr7ReS5U="
+    "version": "8.0.14",
+    "hash": "sha256-/tI0qt8DWt9qZBNpV3H4NHvR4uR48s5MR+B+wNnhMCo="
   },
   {
     "pname": "Microsoft.AspNetCore.WebUtilities",
-    "version": "2.2.0",
-    "hash": "sha256-UdfOwSWqOUXdb0mGrSMx6Z+d536/P+v5clSRZyN5QTM="
+    "version": "2.3.0",
+    "hash": "sha256-oJMEP44Q9ClhbyZUPtSb9jqQyJJ/dD4DHElRvkYpIOo="
   },
   {
     "pname": "Microsoft.Bcl.AsyncInterfaces",
@@ -139,11 +139,6 @@
     "version": "8.0.0",
     "hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ="
   },
-  {
-    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "2.2.0",
-    "hash": "sha256-pf+UQToJnhAe8VuGjxyCTvua1nIX8n5NHzAUk3Jz38s="
-  },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
     "version": "8.0.0",
@@ -186,13 +181,8 @@
   },
   {
     "pname": "Microsoft.Extensions.ObjectPool",
-    "version": "2.2.0",
-    "hash": "sha256-P+QUM50j/V8f45zrRqat8fz6Gu3lFP+hDjESwTZNOFg="
-  },
-  {
-    "pname": "Microsoft.Extensions.Options",
-    "version": "2.2.0",
-    "hash": "sha256-YBtPoWBEs+dlHPQ7qOmss+U9gnvG0T1irZY8NwD0QKw="
+    "version": "8.0.11",
+    "hash": "sha256-xutYzUA86hOg0NfLcs/NPylKvNcNohucY1LpSEkkaps="
   },
   {
     "pname": "Microsoft.Extensions.Options",
@@ -204,11 +194,6 @@
     "version": "8.0.2",
     "hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys="
   },
-  {
-    "pname": "Microsoft.Extensions.Primitives",
-    "version": "2.2.0",
-    "hash": "sha256-DMCTC3HW+sHaRlh/9F1sDwof+XgvVp9IzAqzlZWByn4="
-  },
   {
     "pname": "Microsoft.Extensions.Primitives",
     "version": "8.0.0",
@@ -216,8 +201,8 @@
   },
   {
     "pname": "Microsoft.Net.Http.Headers",
-    "version": "2.2.0",
-    "hash": "sha256-pb8AoacSvy8hGNGodU6Lhv1ooWtUSCZwjmwd89PM1HA="
+    "version": "2.3.0",
+    "hash": "sha256-XY3OyhKTzUVbmMnegp0IxApg8cw97RD9eXC2XenrOqE="
   },
   {
     "pname": "Microsoft.NET.Test.Sdk",
@@ -296,18 +281,18 @@
   },
   {
     "pname": "NLog",
-    "version": "5.3.4",
-    "hash": "sha256-Cwr1Wu9VbOcRz3GdVKkt7lIpNwC1E4Hdb0g+qEkEr3k="
+    "version": "5.4.0",
+    "hash": "sha256-l2R0UHHCL02KPMC96e62AL2ONFD0PAty619y9UnD25A="
   },
   {
     "pname": "NLog.Extensions.Logging",
-    "version": "5.3.15",
-    "hash": "sha256-otzOJncsEmzeGkJ9yxuwQgYFlKIG9ALX+DaKJ/Jhux4="
+    "version": "5.4.0",
+    "hash": "sha256-9pVBguAKnjmbtKM3wBVBEzovXkoEXgqvB4IhiayAkVo="
   },
   {
     "pname": "NLog.Web.AspNetCore",
-    "version": "5.3.15",
-    "hash": "sha256-JaxCAfsgYM8N7bmAciDowSdOxtMS3eoMszODqWPcqao="
+    "version": "5.4.0",
+    "hash": "sha256-tDCsOqYNVg+dNBk85HjNgbZuQwMgGPIdsMqoPhhPROk="
   },
   {
     "pname": "NUnit",
@@ -326,39 +311,39 @@
   },
   {
     "pname": "Polly",
-    "version": "8.5.0",
-    "hash": "sha256-oXIqYMkFXoF/9y704LJSX5Non9mry19OSKA7JFviu5Q="
+    "version": "8.5.2",
+    "hash": "sha256-IrN06ddOIJ0VYuVefe3LvfW0kX20ATRQkEBg9CBomRA="
   },
   {
     "pname": "Polly.Core",
-    "version": "8.5.0",
-    "hash": "sha256-vN/OoQi5F8+oKNO46FwjPcKrgfhGMGjAQ2yCQUlHtOc="
+    "version": "8.5.2",
+    "hash": "sha256-PAwsWqrCieCf/7Y87fV7XMKoaY2abCQNtI+4oyyMifk="
   },
   {
     "pname": "SharpZipLib",
     "version": "1.4.2",
     "hash": "sha256-/giVqikworG2XKqfN9uLyjUSXr35zBuZ2FX2r8X/WUY="
   },
-  {
-    "pname": "System.Buffers",
-    "version": "4.4.0",
-    "hash": "sha256-KTxAhYawFG2V5VX1jw3pzx3IrQXRgn1TsvgjPgxAbqA="
-  },
-  {
-    "pname": "System.Buffers",
-    "version": "4.5.0",
-    "hash": "sha256-THw2znu+KibfJRfD7cE3nRYHsm7Fyn5pjOOZVonFjvs="
-  },
   {
     "pname": "System.Buffers",
     "version": "4.5.1",
     "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="
   },
+  {
+    "pname": "System.Buffers",
+    "version": "4.6.0",
+    "hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc="
+  },
   {
     "pname": "System.ComponentModel.Annotations",
     "version": "4.5.0",
     "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="
   },
+  {
+    "pname": "System.ComponentModel.Annotations",
+    "version": "5.0.0",
+    "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="
+  },
   {
     "pname": "System.Configuration.ConfigurationManager",
     "version": "4.4.0",
@@ -389,11 +374,6 @@
     "version": "5.0.1",
     "hash": "sha256-2zT5uBiyYm+jLIoJppIKJttTtpcMNKxd7Li0QEVjbv8="
   },
-  {
-    "pname": "System.Memory",
-    "version": "4.5.1",
-    "hash": "sha256-7JhQNSvE6JigM1qmmhzOX3NiZ6ek82R4whQNb+FpBzg="
-  },
   {
     "pname": "System.Memory",
     "version": "4.5.3",
@@ -419,11 +399,6 @@
     "version": "1.6.0",
     "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="
   },
-  {
-    "pname": "System.Runtime.CompilerServices.Unsafe",
-    "version": "4.5.1",
-    "hash": "sha256-Lucrfpuhz72Ns+DOS7MjuNT2KWgi+m4bJkg87kqXmfU="
-  },
   {
     "pname": "System.Runtime.CompilerServices.Unsafe",
     "version": "4.5.2",
@@ -479,11 +454,6 @@
     "version": "8.0.0",
     "hash": "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE="
   },
-  {
-    "pname": "System.Text.Encodings.Web",
-    "version": "4.5.0",
-    "hash": "sha256-o+jikyFOG30gX57GoeZztmuJ878INQ5SFMmKovYqLWs="
-  },
   {
     "pname": "System.Text.Encodings.Web",
     "version": "8.0.0",
diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix
index 09739ae21ad0..2f87a3e928ad 100644
--- a/pkgs/servers/klipper/default.nix
+++ b/pkgs/servers/klipper/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "klipper";
-  version = "0.12.0-unstable-2025-03-12";
+  version = "0.12.0-unstable-2025-03-25";
 
   src = fetchFromGitHub {
     owner = "KevinOConnor";
     repo = "klipper";
-    rev = "d886c1761bbdfd23833996489afba6b75f312a4a";
-    sha256 = "sha256-I8Epwh0NcWtz2T2qAuKOv6iXBO8GmNdCR86HOgUPKCU=";
+    rev = "68dbbc8d411d0d4961fd0837b00244a6bba1eefd";
+    sha256 = "sha256-H9zoytYqmQmKevAiE8Y/gFcfIcC/zypBF8bH6yEi8m0=";
   };
 
   sourceRoot = "${src.name}/klippy";
diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix
index d8a71e8ef708..2317105dd130 100644
--- a/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -46,7 +46,7 @@ postgresqlBuildExtension (finalAttrs: {
   src = fetchFromGitHub {
     owner = "postgis";
     repo = "postgis";
-    tag = "${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-1kOLtG6AMavbWQ1lHG2ABuvIcyTYhgcbjuVmqMR4X+g=";
   };
 
diff --git a/pkgs/tools/admin/turbovnc/default.nix b/pkgs/tools/admin/turbovnc/default.nix
index 589ebbcdc279..6fa866e6bd11 100644
--- a/pkgs/tools/admin/turbovnc/default.nix
+++ b/pkgs/tools/admin/turbovnc/default.nix
@@ -32,13 +32,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "turbovnc";
-  version = "3.1.3";
+  version = "3.1.4";
 
   src = fetchFromGitHub {
     owner = "TurboVNC";
     repo = "turbovnc";
     rev = finalAttrs.version;
-    hash = "sha256-Bq9Kaz6m8twOjX0Y05TXPpYYQJqKe86WxhBmNEHAOfA=";
+    hash = "sha256-Qt9yGyGWKFBppO91D+hUfmN7CMg0I66rAXyRoCYUOEA=";
   };
 
   # TODO:
diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix
index e528e5e4e72a..3146aac36700 100644
--- a/pkgs/tools/backup/bacula/default.nix
+++ b/pkgs/tools/backup/bacula/default.nix
@@ -17,11 +17,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bacula";
-  version = "15.0.2";
+  version = "15.0.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/bacula/${pname}-${version}.tar.gz";
-    sha256 = "sha256-VVFcKmavmoa5VdrqQIk3i4ZNBRsubjA4O+825pOs6no=";
+    sha256 = "sha256-KUr9PS651bccPQ6I/fGetRO/24Q7KNNcBVLkrgYoJ6E=";
   };
 
   # libtool.m4 only matches macOS 10.*
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index d28d2dcb4910..14ef652e076e 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -197,6 +197,20 @@ lib.makeExtensible (
 
       nix_2_27 = addTests "nix_2_27" self.nixComponents_2_27.nix-everything;
 
+      nixComponents_2_28 = nixDependencies.callPackage ./modular/packages.nix {
+        version = "2.28.1pre";
+        inherit (self.nix_2_24.meta) maintainers;
+        otherSplices = generateSplicesForNixComponents "nixComponents_2_28";
+        src = fetchFromGitHub {
+          owner = "NixOS";
+          repo = "nix";
+          rev = "9cdf72beaa77f1e6c0faed44872b83783051f20d";
+          hash = "sha256-0sk7cGOdfUA6/AamSsuURHdILxSyw+s2zl7CDaSsawo=";
+        };
+      };
+
+      nix_2_28 = addTests "nix_2_28" self.nixComponents_2_28.nix-everything;
+
       latest = self.nix_2_26;
 
       # The minimum Nix version supported by Nixpkgs
diff --git a/pkgs/tools/package-management/nix/modular/src/libmain/package.nix b/pkgs/tools/package-management/nix/modular/src/libmain/package.nix
index 6cf7e87f51d0..08b6d4e1e400 100644
--- a/pkgs/tools/package-management/nix/modular/src/libmain/package.nix
+++ b/pkgs/tools/package-management/nix/modular/src/libmain/package.nix
@@ -6,6 +6,7 @@
 
   nix-util,
   nix-store,
+  nix-expr,
 
   # Configuration Options
 
@@ -18,11 +19,15 @@ mkMesonLibrary (finalAttrs: {
 
   workDir = ./.;
 
-  propagatedBuildInputs = [
-    nix-util
-    nix-store
-    openssl
-  ];
+  propagatedBuildInputs =
+    lib.optionals (lib.versionAtLeast version "2.28") [
+      nix-expr
+    ]
+    ++ [
+      nix-util
+      nix-store
+      openssl
+    ];
 
   meta = {
     platforms = lib.platforms.unix ++ lib.platforms.windows;
diff --git a/pkgs/tools/system/nvtop/build-nvtop.nix b/pkgs/tools/system/nvtop/build-nvtop.nix
index c63e4d9a18d6..7caac445a33d 100644
--- a/pkgs/tools/system/nvtop/build-nvtop.nix
+++ b/pkgs/tools/system/nvtop/build-nvtop.nix
@@ -19,6 +19,8 @@
   panfrost ? false,
   panthor ? false,
   ascend ? false,
+  v3d ? false,
+  tpu ? false,
 }:
 
 let
@@ -34,17 +36,19 @@ let
       }" \
       $out/bin/nvtop
   '';
-  needDrm = (amd || msm || panfrost || panthor);
+  needDrm = (amd || msm || panfrost || panthor || intel);
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "nvtop";
-  version = "3.1.0";
+  version = "3.2.0";
 
+  # between generation of multiple update PRs for each package flavor and manual updates I choose manual updates
+  # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "Syllo";
     repo = "nvtop";
     rev = finalAttrs.version;
-    hash = "sha256-MkkBY2PR6FZnmRMqv9MWqwPWRgixfkUQW5TWJtHEzwA=";
+    hash = "sha256-8iChT55L2NSnHg8tLIry0rgi/4966MffShE0ib+2ywc=";
   };
 
   cmakeFlags = with lib.strings; [
@@ -58,11 +62,17 @@ stdenv.mkDerivation (finalAttrs: {
     (cmakeBool "PANFROST_SUPPORT" panfrost)
     (cmakeBool "PANTHOR_SUPPORT" panthor)
     (cmakeBool "ASCEND_SUPPORT" ascend)
+    (cmakeBool "V3D_SUPPORT" v3d)
+    (cmakeBool "TPU_SUPPORT" tpu) # requires libtpuinfo which is not packaged yet
   ];
-  nativeBuildInputs = [
-    cmake
-    gtest
-  ] ++ lib.optional nvidia addDriverRunpath;
+  nativeBuildInputs =
+    [
+      cmake
+    ]
+    ++ lib.optionals finalAttrs.doCheck [
+      gtest
+    ]
+    ++ lib.optional nvidia addDriverRunpath;
 
   buildInputs =
     [ ncurses ]
@@ -79,7 +89,8 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.optionalString needDrm drm-postFixup)
     + (lib.optionalString nvidia "addDriverRunpath $out/bin/nvtop");
 
-  doCheck = true;
+  # https://github.com/Syllo/nvtop/commit/33ec008e26a00227a666ccb11321e9971a50daf8
+  doCheck = !stdenv.hostPlatform.isDarwin;
 
   passthru = {
     tests.version = testers.testVersion {
diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix
index 7e9653102bef..d9eb3f973dca 100644
--- a/pkgs/tools/system/nvtop/default.nix
+++ b/pkgs/tools/system/nvtop/default.nix
@@ -10,10 +10,14 @@ let
     "nvidia"
     "panfrost"
     "panthor"
+    "v3d"
   ];
   # these GPU families are partially supported upstream, they are also tricky to build in nixpkgs
   # volunteers with specific hardware needed to build and test these package variants
-  additionalGPUFamilies = [ "ascend" ];
+  additionalGPUFamilies = [
+    "ascend"
+    "tpu"
+  ];
   defaultSupport = builtins.listToAttrs (
     # apple can only build on darwin, and it can't build everything else, and vice versa
     builtins.map (gpu: {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index dcf72c4d5923..f218415ab6b6 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -515,6 +515,7 @@ mapAliases {
   dotnet-sdk_3 = throw "'dotnet-sdk_3' has been renamed to/replaced by 'dotnetCorePackages.sdk_3_1'"; # Converted to throw 2024-10-17
   dotnet-sdk_5 = throw "'dotnet-sdk_5' has been renamed to/replaced by 'dotnetCorePackages.sdk_5_0'"; # Converted to throw 2024-10-17
   downonspot = throw "'downonspot' was removed because upstream has been taken down by a cease and desist"; # Added 2025-01-25
+  dozenal = throw "dozenal has been removed because it does not compile and only minimal functionality"; # Added 2025-03-30
   dstat = throw "'dstat' has been removed because it has been unmaintained since 2020. Use 'dool' instead."; # Added 2025-01-21
   drush = throw "drush as a standalone package has been removed because it's no longer supported as a standalone tool";
   dtv-scan-tables_linuxtv = dtv-scan-tables; # Added 2023-03-03
@@ -1248,11 +1249,6 @@ mapAliases {
   nux = throw "nux has been removed because it has been abandoned for 4 years"; # Added 2025-03-22
   nvidia-podman = throw "podman should use the Container Device Interface (CDI) instead. See https://web.archive.org/web/20240729183805/https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/install-guide.html#configuring-podman"; # Added 2024-08-02
   nvidia-thrust = throw "nvidia-thrust has been removed because the project was deprecated; use cudaPackages.cuda_cccl";
-  nvtop = lib.warnOnInstantiate "nvtop has been renamed to nvtopPackages.full" nvtopPackages.full; # Added 2024-02-25
-  nvtop-amd = lib.warnOnInstantiate "nvtop-amd has been renamed to nvtopPackages.amd" nvtopPackages.amd; # Added 2024-02-25
-  nvtop-nvidia = lib.warnOnInstantiate "nvtop-nvidia has been renamed to nvtopPackages.nvidia" nvtopPackages.nvidia; # Added 2024-02-25
-  nvtop-intel = lib.warnOnInstantiate "nvtop-intel has been renamed to nvtopPackages.intel" nvtopPackages.intel; # Added 2024-02-25
-  nvtop-msm = lib.warnOnInstantiate "nvtop-msm has been renamed to nvtopPackages.msm" nvtopPackages.msm; # Added 2024-02-25
 
   ### O ###
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46c3a952e621..a2fe2d63cb81 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7916,8 +7916,6 @@ with pkgs;
 
   ansible-builder = with python3Packages; toPythonApplication ansible-builder;
 
-  ansible-doctor = callPackage ../tools/admin/ansible/doctor.nix { };
-
   yakut = python3Packages.callPackage ../development/tools/misc/yakut { };
 
   ### DEVELOPMENT / TOOLS / LANGUAGE-SERVERS
@@ -7930,10 +7928,6 @@ with pkgs;
 
   inherit (callPackages ../development/tools/language-servers/nixd { }) nixf nixt nixd;
 
-  ansible-later = callPackage ../tools/admin/ansible/later.nix { };
-
-  ansible-lint = callPackage ../tools/admin/ansible/lint.nix { };
-
   antlr2 = callPackage ../development/tools/parsing/antlr/2.7.7.nix { };
   antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { };
   antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { };