Merge d0fabf48ff into haskell-updates

2026-09-18 13:50:04 +00:00 · 2025-03-10 00:16:27 +00:00
parent 027716bddd d0fabf48ff
commit 0a65db06ec
267 changed files with 5423 additions and 21652 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9101,6 +9101,12 @@
    github = "gytis-ivaskevicius";
    githubId = 23264966;
  };
+  h3cth0r = {
+    name = "Hector Miranda";
+    email = "hector.miranda@tec.mx";
+    github = "h3cth0r";
+    githubId = 43997408;
+  };
  h7x4 = {
    name = "h7x4";
    email = "h7x4@nani.wtf";
@@ -9228,6 +9234,12 @@
    githubId = 33523827;
    name = "Harrison Thorne";
  };
+  harryposner = {
+    email = "nixpkgs@harryposner.com";
+    github = "harryposner";
+    githubId = 23534120;
+    name = "Harry Posner";
+  };
  haruki7049 = {
    email = "tontonkirikiri@gmail.com";
    github = "haruki7049";
@@ -13359,6 +13371,12 @@
    githubId = 54590679;
    name = "Liam Murphy";
  };
+  Liamolucko = {
+    name = "Liam Murphy";
+    email = "liampm32@gmail.com";
+    github = "Liamolucko";
+    githubId = 43807659;
+  };
  liarokapisv = {
    email = "liarokapis.v@gmail.com";
    github = "liarokapisv";
@@ -14408,6 +14426,13 @@
    githubId = 30194994;
    name = "Felix Nilles";
  };
+  marcin-serwin = {
+    name = "Marcin Serwin";
+    github = "marcin-serwin";
+    githubId = 12128106;
+    email = "marcin@serwin.dev";
+    keys = [ { fingerprint = "F311 FA15 1A66 1875 0C4D  A88D 82F5 C70C DC49 FD1D"; } ];
+  };
  marcovergueira = {
    email = "vergueira.marco@gmail.com";
    github = "marcovergueira";
@@ -23344,6 +23369,12 @@
    githubId = 7060816;
    name = "Thao-Tran Le-Phuong";
  };
+  thardin = {
+    email = "th020394@gmail.com";
+    github = "Tyler-Hardin";
+    githubId = 5404976;
+    name = "Tyler Hardin";
+  };
  thblt = {
    name = "Thibault Polge";
    email = "thibault@thb.lt";
--- a/nixos/doc/manual/configuration/gpu-accel.chapter.md
+++ b/nixos/doc/manual/configuration/gpu-accel.chapter.md
@@ -64,15 +64,14 @@ enables OpenCL support:

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

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

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

 ```nix
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -87,6 +87,8 @@

 ## New Modules {#sec-release-24.11-new-modules}

+- [hardware.block](options.html#hardware-block.defaultScheduler) allows configuration of I/O schedulers for block devices.
+
 - [KMonad](https://github.com/kmonad/kmonad), an advanced keyboard remapping utility. Available as [services.kmonad](#opt-services.kmonad.enable).

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

+- The `intel-compute-runtime` package dropped support for older GPUs, and only supports 12th Gen and newer from now on.
+  Intel GPUs from Gen 8,9 and 11 need to use the `intel-compute-runtime-legacy1` package in `hardware.graphics.extraPackages`.
+
 - The `(buildPythonPackage { ... }).override` and `(buildPythonPackage { ... }).overrideDerivation` attributes is now deprecated and removed in favour of `overridePythonAttrs` and `lib.overrideDerivation`.
  This change does not affect the override interface of most Python packages, as [`<pkg>.override`](https://nixos.org/manual/nixpkgs/unstable/#sec-pkg-override) provided by `callPackage` shadows such a locally-defined `override` attribute.
  The `<pkg>.overrideDerivation` attribute of Python packages called with `callPackage` will also remain available after this change.
--- a/nixos/modules/hardware/iosched.nix
+++ b/nixos/modules/hardware/iosched.nix
@@ -6,24 +6,53 @@
 }:

 let
+  inherit (lib)
+    concatLines
+    concatStringsSep
+    mapAttrsToList
+    optional
+    optionals
+
+    mkIf
+    mkOption
+    types
+    ;
+
  cfg = config.hardware.block;
  escape = lib.strings.escape [ ''"'' ];
+
  udevValue = types.addCheck types.nonEmptyStr (x: builtins.match "[^\n\r]*" x != null) // {
    name = "udevValue";
    description = "udev rule value";
    descriptionClass = "noun";
  };

-  inherit (lib)
-    mkIf
-    mkOption
-    types
-
-    concatLines
-    concatStringsSep
-    mapAttrsToList
-    optional
-    ;
+  udevRule =
+    {
+      rotational ? null,
+      include ? null,
+      exclude ? null,
+      scheduler,
+    }:
+    concatStringsSep ", " (
+      [
+        ''SUBSYSTEM=="block"''
+        ''ACTION=="add|change"''
+        ''TEST=="queue/scheduler"''
+      ]
+      ++ optionals (rotational != null) [
+        ''ATTR{queue/rotational}=="${if rotational then "1" else "0"}"''
+      ]
+      ++ optionals (include != null) [
+        ''KERNEL=="${escape include}"''
+      ]
+      ++ optionals (exclude != null) [
+        ''KERNEL!="${escape exclude}"''
+      ]
+      ++ [
+        ''ATTR{queue/scheduler}="${escape scheduler}"''
+      ]
+    );
 in
 {
  options.hardware.block = {
@@ -54,6 +83,22 @@ in
      example = "bfq";
    };

+    defaultSchedulerExclude = mkOption {
+      type = types.nullOr udevValue;
+      default = "loop[0-9]*";
+      description = ''
+        Device name pattern to exclude from default scheduler assignment
+        through {option}`config.hardware.block.defaultScheduler` and
+        {option}`config.hardware.block.defaultSchedulerRotational`.
+
+        By default this excludes loop devices which generally do not benefit
+        from extra I/O scheduling in addition to the scheduling already
+        performed for their backing devices.
+
+        This setting does not affect {option}`config.hardware.block.scheduler`.
+      '';
+    };
+
    scheduler = mkOption {
      type = types.attrsOf udevValue;
      default = { };
@@ -120,27 +165,21 @@ in
        services.udev.packages = [
          (pkgs.writeTextDir "etc/udev/rules.d/98-block-io-scheduler.rules" (
            concatLines (
-              map (concatStringsSep ", ") (
-                optional (cfg.defaultScheduler != null) [
-                  ''SUBSYSTEM=="block"''
-                  ''ACTION=="add|change"''
-                  ''TEST=="queue/scheduler"''
-                  ''ATTR{queue/scheduler}="${escape cfg.defaultScheduler}"''
-                ]
-                ++ optional (cfg.defaultSchedulerRotational != null) [
-                  ''SUBSYSTEM=="block"''
-                  ''ACTION=="add|change"''
-                  ''ATTR{queue/rotational}=="1"''
-                  ''TEST=="queue/scheduler"''
-                  ''ATTR{queue/scheduler}="${escape cfg.defaultSchedulerRotational}"''
-                ]
-                ++ mapAttrsToList (name: sched: [
-                  ''SUBSYSTEM=="block"''
-                  ''ACTION=="add|change"''
-                  ''KERNEL=="${escape name}"''
-                  ''ATTR{queue/scheduler}="${escape sched}"''
-                ]) cfg.scheduler
-              )
+              optional (cfg.defaultScheduler != null) (udevRule {
+                exclude = cfg.defaultSchedulerExclude;
+                scheduler = cfg.defaultScheduler;
+              })
+              ++ optional (cfg.defaultSchedulerRotational != null) (udevRule {
+                rotational = true;
+                exclude = cfg.defaultSchedulerExclude;
+                scheduler = cfg.defaultSchedulerRotational;
+              })
+              ++ mapAttrsToList (
+                include: scheduler:
+                udevRule {
+                  inherit include scheduler;
+                }
+              ) cfg.scheduler
            )
          ))
        ];
--- a/nixos/modules/programs/regreet.nix
+++ b/nixos/modules/programs/regreet.nix
@@ -167,10 +167,15 @@ in
          group = config.users.users.${config.services.greetd.settings.default_session.user}.group;
          mode = "0755";
        };
+        dataDir =
+          if lib.versionAtLeast (cfg.package.version) "0.2.0" then
+            { "/var/lib/regreet".d = defaultConfig; }
+          else
+            { "/var/cache/regreet".d = defaultConfig; };
      in
      {
        "/var/log/regreet".d = defaultConfig;
-        "/var/cache/regreet".d = defaultConfig;
-      };
+      }
+      // dataDir;
  };
 }
--- a/nixos/modules/programs/xonsh.nix
+++ b/nixos/modules/programs/xonsh.nix
@@ -6,6 +6,7 @@ let

  cfg = config.programs.xonsh;
  package = cfg.package.override { inherit (cfg) extraPackages; };
+  bashCompletionPath = "${cfg.bashCompletion.package}/share/bash-completion/bash_completion";
 in

 {
@@ -49,6 +50,13 @@ in
          Xontribs and extra Python packages to be available in xonsh.
        '';
      };
+
+      bashCompletion = {
+        enable = lib.mkEnableOption "bash completions for xonsh" // {
+          default = true;
+        };
+        package = lib.mkPackageOption pkgs "bash-completion" { };
+      };
    };

  };
@@ -78,6 +86,8 @@ in
              aliases['ls'] = _ls_alias
          del _ls_alias

+      ${lib.optionalString cfg.bashCompletion.enable "$BASH_COMPLETIONS = '${bashCompletionPath}'"}
+
      ${cfg.config}
    '';

--- a/nixos/modules/services/home-automation/matter-server.nix
+++ b/nixos/modules/services/home-automation/matter-server.nix
@@ -58,6 +58,15 @@ in
      serviceConfig = {
        ExecStart = (
          lib.concatStringsSep " " [
+            # `python-matter-server` writes to /data even when a storage-path
+            # is specified. This symlinks /data at the systemd-managed
+            # /var/lib/matter-server, so all files get dropped into the state
+            # directory.
+            "${pkgs.bash}/bin/sh"
+            "-c"
+            "'"
+            "${pkgs.coreutils}/bin/ln -s %S/matter-server/ %t/matter-server/root/data"
+            "&&"
            "${cfg.package}/bin/matter-server"
            "--port"
            (toString cfg.port)
@@ -68,22 +77,21 @@ in
            "--log-level"
            "${cfg.logLevel}"
            "${lib.escapeShellArgs cfg.extraArgs}"
+            "'"
          ]
        );
        # Start with a clean root filesystem, and allowlist what the container
        # is permitted to access.
-        TemporaryFileSystem = "/";
+        # See https://discourse.nixos.org/t/hardening-systemd-services/17147/14.
+        RuntimeDirectory = [ "matter-server/root" ];
+        RootDirectory = "%t/matter-server/root";
+
        # Allowlist /nix/store (to allow the binary to find its dependencies)
        # and dbus.
-        ReadOnlyPaths = "/nix/store /run/dbus";
+        BindReadOnlyPaths = "/nix/store /run/dbus";
        # Let systemd manage `/var/lib/matter-server` for us inside the
        # ephemeral TemporaryFileSystem.
        StateDirectory = storageDir;
-        # `python-matter-server` writes to /data even when a storage-path is
-        # specified. This bind-mount points /data at the systemd-managed
-        # /var/lib/matter-server, so all files get dropped into the state
-        # directory.
-        BindPaths = "${storagePath}:/data";

        # Hardening bits
        AmbientCapabilities = "";
--- a/nixos/modules/services/web-servers/h2o/default.nix
+++ b/nixos/modules/services/web-servers/h2o/default.nix
@@ -230,6 +230,9 @@ let
                    ssl = (lib.recursiveUpdate tlsRecAttrs value.tls.extraSettings) // {
                      inherit identity;
                    };
+                  }
+                  // lib.optionalAttrs (value.host != null) {
+                    host = value.host;
                  };
              };
          };
@@ -302,6 +305,22 @@ in
        type = settingsFormat.type;
        default = { };
        description = "Configuration for H2O (see <https://h2o.examp1e.net/configure.html>)";
+        example =
+          literalExpression
+            # nix
+            ''
+              {
+                compress = "ON";
+                ssl-offload = "kernel";
+                http2-reprioritize-blocking-assets = "ON";
+                "file.mime.addtypes" = {
+                  "text/x-rst" = {
+                    extensions = [ ".rst" ];
+                    is_compressible = "YES";
+                  };
+                };
+              }
+            '';
      };

      hosts = mkOption {
--- a/nixos/modules/services/web-servers/h2o/vhost-options.nix
+++ b/nixos/modules/services/web-servers/h2o/vhost-options.nix
@@ -33,7 +33,18 @@ in
        "example.org"
      ];
      description = ''
-        Additional names of virtual hosts served by this virtual host configuration.
+        Additional names of virtual hosts served by this virtual host
+        configuration.
+      '';
+    };
+
+    host = mkOption {
+      type = types.nullOr types.nonEmptyStr;
+      default = null;
+      example = "127.0.0.1";
+      description = ''
+        Set the host address for this virtual host. If unset, the default is to
+        listen on all network interfaces.
      '';
    };

@@ -70,7 +81,7 @@ in
                config.services.h2o.defaultTLSListenPort
              '';
              description = ''
-                Override the default TLS port for this virtual host.";
+                Override the default TLS port for this virtual host.
              '';
              example = 8443;
            };
@@ -105,11 +116,17 @@ in
                  options = {
                    key-file = mkOption {
                      type = types.path;
-                      description = "Path to key file";
+                      description = ''
+                        Path to key file. See
+                        <https://h2o.examp1e.net/configure/base_directives.html#key-file>.
+                      '';
                    };
                    certificate-file = mkOption {
                      type = types.path;
-                      description = "Path to certificate file";
+                      description = ''
+                        Path to certificate file. See
+                        <https://h2o.examp1e.net/configure/base_directives.html#certificate-file>.
+                      '';
                    };
                  };
                }
@@ -139,7 +156,8 @@ in
              type = types.attrs;
              default = { };
              description = ''
-                Additional TLS/SSL-related configuration options.
+                Additional TLS/SSL-related configuration options. See
+                <https://h2o.examp1e.net/configure/base_directives.html#listen-ssl>.
              '';
              example =
                literalExpression
@@ -205,7 +223,8 @@ in
      default = { };
      description = ''
        Attrset to be transformed into YAML for host config. Note that the HTTP
-        / TLS configurations will override these config values.
+        / TLS configurations will override these config values. See
+        <https://h2o.examp1e.net/configure/base_directives.html#hosts>.
      '';
    };
  };
--- a/nixos/modules/services/x11/desktop-managers/phosh.nix
+++ b/nixos/modules/services/x11/desktop-managers/phosh.nix
@@ -157,7 +157,6 @@ in
  };

  config = lib.mkIf cfg.enable {
-    systemd.defaultUnit = "graphical.target";
    # Inspired by https://gitlab.gnome.org/World/Phosh/phosh/-/blob/main/data/phosh.service
    systemd.services.phosh = {
      wantedBy = [ "graphical.target" ];
@@ -213,7 +212,7 @@ in

    security.pam.services.phosh = {};

-    hardware.graphics.enable = lib.mkDefault true;
+    services.graphical-desktop.enable = true;

    services.gnome.core-shell.enable = true;
    services.gnome.core-os-services.enable = true;
--- a/nixos/tests/iosched.nix
+++ b/nixos/tests/iosched.nix
@@ -63,6 +63,9 @@ import ./make-test-python.nix (
      check_scheduler("sdb", "mq-deadline")
      check_scheduler("nvme0n1", "kyber")
      check_scheduler("mmcblk0", "bfq")
+
+      machine.succeed("tmp=\"$(mktemp)\"; losetup /dev/loop0 \"$tmp\"")
+      check_scheduler("loop0", "none")
    '';
  }
 )
--- a/nixos/tests/matter-server.nix
+++ b/nixos/tests/matter-server.nix
@@ -8,6 +8,7 @@ import ./make-test-python.nix (
  {
    name = "matter-server";
    meta.maintainers = with lib.maintainers; [ leonm1 ];
+    meta.timeout = 120; # Timeout after two minutes

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

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

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

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

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

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

-        with subtest("Check storage directory is created"):
-            machine.succeed("ls /var/lib/matter-server/chip.json")
-
-        with subtest("Check systemd hardening"):
-            _, output = machine.execute("systemd-analyze security matter-server.service | grep -v '✓'")
-            machine.log(output)
+          with subtest("Check systemd hardening"):
+              _, output = machine.execute("systemd-analyze security matter-server.service | grep -v '✓'")
+              machine.log(output)
      '';
  }
 )
--- a/nixos/tests/shadps4.nix
+++ b/nixos/tests/shadps4.nix
@@ -42,6 +42,8 @@
          TRACY_NO_INVARIANT_CHECK = "1";
        };
      };
+
+      virtualisation.memorySize = 2048;
    };

  enableOCR = true;
@@ -51,8 +53,8 @@
    import tempfile
    import subprocess

-    selectionColor: str = "#2A82DA"
-    openorbisColor: str = "#336081"
+    selectionColor: str = "#354953"
+    openorbisColor: str = "#306082"

    # Based on terminal-emulators.nix' check_for_pink
    def check_for_color(color: str) -> Callable[[bool], bool]:
--- a/pkgs/applications/audio/mopidy/local.nix
+++ b/pkgs/applications/audio/mopidy/local.nix
@@ -8,22 +8,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "Mopidy-Local";
-  version = "3.2.1";
+  version = "3.3.0";

  src = fetchPypi {
-    inherit pname version;
-    sha256 = "18w39mxpv8p17whd6zfw5653d21q138f8xd6ili6ks2g2dbm25i9";
+    inherit version;
+    pname = "mopidy_local";
+    hash = "sha256-y6btbGk5UiVan178x7d9jq5OTnKMbuliHv0aRxuZK3o=";
  };

-  patches = [
-    # Fix tests with newer Mopidy versions >=3.4.0 -- mopidy/mopidy-local#69
-    (fetchpatch {
-      name = "update-tests-for-mopidy-3.4.0.patch";
-      url = "https://github.com/mopidy/mopidy-local/commit/f2c198f8eb253f62100afc58f652e73a76d5a090.patch";
-      hash = "sha256-jrlZc/pd00S5q9nOfV1OXu+uP/SvH+Xbi7U52aZajj4=";
-    })
-  ];
-
  propagatedBuildInputs = [
    mopidy
    python3Packages.uritools
--- a/pkgs/applications/audio/qpwgraph/default.nix
+++ b/pkgs/applications/audio/qpwgraph/default.nix
@@ -14,14 +14,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "qpwgraph";
-  version = "0.8.1";
+  version = "0.8.2";

  src = fetchFromGitLab {
    domain = "gitlab.freedesktop.org";
    owner = "rncbc";
    repo = "qpwgraph";
    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-yvPV3Npne9oFvA6X49/aMgn7DrN2gCrPha3lJVKwcQ0=";
+    sha256 = "sha256-BU57Iprz+kQXybKtR26Qi+3gsLv761hlg4HAnay6hIA=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -27,12 +27,12 @@
  };
  angular = buildGrammar {
    language = "angular";
-    version = "0.0.0+rev=745d3c6";
+    version = "0.0.0+rev=cba2889";
    src = fetchFromGitHub {
      owner = "dlvandenberg";
      repo = "tree-sitter-angular";
-      rev = "745d3c65c2294aca1110b6b6ad6805124be605c9";
-      hash = "sha256-4i1B4r+V5QgBIPVJepQ7V2pJDQfafLxRG1sk4XZVrco=";
+      rev = "cba288924f4832abb619c627539f111004ff22e5";
+      hash = "sha256-ZYBmTu6wNDBMBE/nFrNZdNX2o4uG+4wFIA1XBT4rgCA=";
    };
    meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular";
  };
@@ -270,12 +270,12 @@
  };
  cmake = buildGrammar {
    language = "cmake";
-    version = "0.0.0+rev=e409ae3";
+    version = "0.0.0+rev=cd00bbc";
    src = fetchFromGitHub {
      owner = "uyha";
      repo = "tree-sitter-cmake";
-      rev = "e409ae33f00e04cde30f2bcffb979caf1a33562a";
-      hash = "sha256-+DiM/deIBx4AyJOF86S5tbKkg93+1fg4r8kDnlyfU+w=";
+      rev = "cd00bbcb77fe31283ca79b0038387ec7411759ae";
+      hash = "sha256-Lz2K+/GvmNsQAm1g4TCDdHs+Vebu8fERzTvlVAsA40U=";
    };
    meta.homepage = "https://github.com/uyha/tree-sitter-cmake";
  };
@@ -414,12 +414,12 @@
  };
  dart = buildGrammar {
    language = "dart";
-    version = "0.0.0+rev=e81af6a";
+    version = "0.0.0+rev=80e23c0";
    src = fetchFromGitHub {
      owner = "UserNobody14";
      repo = "tree-sitter-dart";
-      rev = "e81af6ab94a728ed99c30083be72d88e6d56cf9e";
-      hash = "sha256-nguzW8cADqJsdxnE57IrHXKHCvveX1t3rDJcUuc2hH4=";
+      rev = "80e23c07b64494f7e21090bb3450223ef0b192f4";
+      hash = "sha256-bMFBSVAHTGstvalL5vZGahA5gL95IZQmJfBOE+trnwM=";
    };
    meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart";
  };
@@ -480,12 +480,12 @@
  };
  djot = buildGrammar {
    language = "djot";
-    version = "0.0.0+rev=67e6e23";
+    version = "0.0.0+rev=eb31845";
    src = fetchFromGitHub {
      owner = "treeman";
      repo = "tree-sitter-djot";
-      rev = "67e6e23ba7be81a4373e0f49e21207bdc32d12a5";
-      hash = "sha256-Mp2y2YaaSPptZnc84GKiMQh4gHrJofm7SgPOMwYRx7w=";
+      rev = "eb31845d59b9ee8c1b2098e78e9ca72004bd1579";
+      hash = "sha256-7qwBdueO33SdOp5KY12WMIkDgjS5Psz2eF804wn/aLk=";
    };
    meta.homepage = "https://github.com/treeman/tree-sitter-djot";
  };
@@ -524,12 +524,12 @@
  };
  dtd = buildGrammar {
    language = "dtd";
-    version = "0.0.0+rev=26e95de";
+    version = "0.0.0+rev=2128a0b";
    src = fetchFromGitHub {
      owner = "tree-sitter-grammars";
      repo = "tree-sitter-xml";
-      rev = "26e95de449d772bc2dd4f0382580f84e2a0754d6";
-      hash = "sha256-lUFjL9QxjEBaBOOnEmabo1GNJ6bgPpeglKXNvmJlfPY=";
+      rev = "2128a0b249263e238d88cb894dad00c3168fea37";
+      hash = "sha256-qGMRslGqMEZpTMHmmB0sOWNHzpOBJgVhX+oPnphLxUc=";
    };
    location = "dtd";
    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml";
@@ -592,12 +592,12 @@
  };
  elixir = buildGrammar {
    language = "elixir";
-    version = "0.0.0+rev=86ec2ed";
+    version = "0.0.0+rev=450a819";
    src = fetchFromGitHub {
      owner = "elixir-lang";
      repo = "tree-sitter-elixir";
-      rev = "86ec2ed45d6d9433b4e0b88cd3d96796bd45625f";
-      hash = "sha256-9M/DpqpGivDtgGt3ojU/kHR51sla59+KtZ/95hT6IIo=";
+      rev = "450a8194f5a66561135962cfc8d7545a27b61c4c";
+      hash = "sha256-4cL8E7if7j5NeuMH/5IEgudHu2kcerpdTj4pVoYM0Ao=";
    };
    meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir";
  };
@@ -757,12 +757,12 @@
  };
  fortran = buildGrammar {
    language = "fortran";
-    version = "0.0.0+rev=765d82a";
+    version = "0.0.0+rev=21b7408";
    src = fetchFromGitHub {
      owner = "stadelmanma";
      repo = "tree-sitter-fortran";
-      rev = "765d82ad913e75abfffdd57837217e96f4774fba";
-      hash = "sha256-+vLs5nHWDiusMYbRjOWIvTCTkK6fdWqn61HAjfCq5uE=";
+      rev = "21b740801794b6570a0380f8aef22bb67214ea65";
+      hash = "sha256-/PEl7Cl/SIbwEo88gFppPCBjBU/dfovN5J7PXNu7CBw=";
    };
    meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
  };
@@ -779,12 +779,12 @@
  };
  fsharp = buildGrammar {
    language = "fsharp";
-    version = "0.0.0+rev=9308e58";
+    version = "0.0.0+rev=02929f0";
    src = fetchFromGitHub {
      owner = "ionide";
      repo = "tree-sitter-fsharp";
-      rev = "9308e58bec0394232a8d4abdd92eeaa387aefc89";
-      hash = "sha256-Zzzm9flwRuVV4aKVF8bBGtSf532a94R4T+EvFjV+jrA=";
+      rev = "02929f084726db969e5b916d144436f248146824";
+      hash = "sha256-64MF/777+pY+wcoyg4WMaKUlDRiz8VqwLO55TNotVbE=";
    };
    location = "fsharp";
    meta.homepage = "https://github.com/ionide/tree-sitter-fsharp";
@@ -912,12 +912,12 @@
  };
  gleam = buildGrammar {
    language = "gleam";
-    version = "0.0.0+rev=af60434";
+    version = "0.0.0+rev=e01c884";
    src = fetchFromGitHub {
      owner = "gleam-lang";
      repo = "tree-sitter-gleam";
-      rev = "af6043419f5aa0f8b6c2a26db0187aefa46c7f5f";
-      hash = "sha256-6OVt35LcFMDu3y2eWMPenxZldwBu1L93jToJdaAS8yw=";
+      rev = "e01c88449b53e2ee5dad222d4020cc7006c5b700";
+      hash = "sha256-clkf5DxLvvDJDcNYQgAPLQYw+hz05UBdOmPK8kjlVDA=";
    };
    meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam";
  };
@@ -1408,24 +1408,24 @@
  };
  jinja = buildGrammar {
    language = "jinja";
-    version = "0.0.0+rev=41b17a3";
+    version = "0.0.0+rev=07a62ad";
    src = fetchFromGitHub {
      owner = "cathaysia";
      repo = "tree-sitter-jinja";
-      rev = "41b17a33f335130ce9861fd21bffeb88fd768ef4";
-      hash = "sha256-3ffp5uoJqXXwCHcyU9BYDKo90UiwmRe4N4v1RE8GZow=";
+      rev = "07a62adf99c0f41e0cab7ab523541309a8d73dc4";
+      hash = "sha256-6m6WTOWEl9r343vNDfEsVp4ofK/+06mRm72yETt/I1k=";
    };
    location = "tree-sitter-jinja";
    meta.homepage = "https://github.com/cathaysia/tree-sitter-jinja";
  };
  jinja_inline = buildGrammar {
    language = "jinja_inline";
-    version = "0.0.0+rev=41b17a3";
+    version = "0.0.0+rev=07a62ad";
    src = fetchFromGitHub {
      owner = "cathaysia";
      repo = "tree-sitter-jinja";
-      rev = "41b17a33f335130ce9861fd21bffeb88fd768ef4";
-      hash = "sha256-3ffp5uoJqXXwCHcyU9BYDKo90UiwmRe4N4v1RE8GZow=";
+      rev = "07a62adf99c0f41e0cab7ab523541309a8d73dc4";
+      hash = "sha256-6m6WTOWEl9r343vNDfEsVp4ofK/+06mRm72yETt/I1k=";
    };
    location = "tree-sitter-jinja_inline";
    meta.homepage = "https://github.com/cathaysia/tree-sitter-jinja";
@@ -1798,23 +1798,23 @@
  };
  meson = buildGrammar {
    language = "meson";
-    version = "0.0.0+rev=c5fffb8";
+    version = "0.0.0+rev=742a21e";
    src = fetchFromGitHub {
      owner = "Decodetalkers";
      repo = "tree-sitter-meson";
-      rev = "c5fffb8edd39f22644084ab3f73a924a75721ee3";
-      hash = "sha256-Q+5sCO+1CAbnaE7nq7vl/CxUpydxEHVtmPXIAUGJiOE=";
+      rev = "742a21e11e914096e0172dad2f0b85e7554c95ff";
+      hash = "sha256-XwGCwwLM6sdLLNAVK8TGc6XMJ3eXFq6Ayk4dj0FmJmQ=";
    };
    meta.homepage = "https://github.com/Decodetalkers/tree-sitter-meson";
  };
  mlir = buildGrammar {
    language = "mlir";
-    version = "0.0.0+rev=ad38178";
+    version = "0.0.0+rev=c7c62f3";
    src = fetchFromGitHub {
      owner = "artagnon";
      repo = "tree-sitter-mlir";
-      rev = "ad381783044e107ce144af3c36342cc34183d5b4";
-      hash = "sha256-meE+FKpw3dFX6PpaKRUErgMTUeGMCFHlVMn9smVlIog=";
+      rev = "c7c62f37a8612a897d25906d93363fec36c1591c";
+      hash = "sha256-SFMJoAjofemUqPy+Spu4mibGXLShXPqDvpl7gJeZQJg=";
    };
    generate = true;
    meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
@@ -1931,12 +1931,12 @@
  };
  nu = buildGrammar {
    language = "nu";
-    version = "0.0.0+rev=a073ba8";
+    version = "0.0.0+rev=b99dc3b";
    src = fetchFromGitHub {
      owner = "nushell";
      repo = "tree-sitter-nu";
-      rev = "a073ba8cd854318ca5d56e97279fc330f194be8a";
-      hash = "sha256-PuoSH6MV9xWF9wm2xJZN4PBJvvUnvc3mWPU3t6URkEI=";
+      rev = "b99dc3b7b26337d84f95c0de4dda81077b03e5c7";
+      hash = "sha256-w1zG976wp0PE3SpbZnh0GKS/WiRyXEif7jNjKMwfcvY=";
    };
    meta.homepage = "https://github.com/nushell/tree-sitter-nu";
  };
@@ -1964,24 +1964,24 @@
  };
  ocaml = buildGrammar {
    language = "ocaml";
-    version = "0.0.0+rev=91e4d91";
+    version = "0.0.0+rev=6921a83";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-ocaml";
-      rev = "91e4d9106f5da8199ab5158ba65e02da3e664597";
-      hash = "sha256-AJs6GJOIV69sFMKVGHxcyAeC8PEq8I3upEsup+lF2sw=";
+      rev = "6921a831d79d515d64400a9e022cf30e68a2a3dd";
+      hash = "sha256-hD4OOMpwIdUTGPJoQFple5oDdpbXJa+i4x3eaAArSAw=";
    };
    location = "grammars/ocaml";
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
  };
  ocaml_interface = buildGrammar {
    language = "ocaml_interface";
-    version = "0.0.0+rev=91e4d91";
+    version = "0.0.0+rev=6921a83";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-ocaml";
-      rev = "91e4d9106f5da8199ab5158ba65e02da3e664597";
-      hash = "sha256-AJs6GJOIV69sFMKVGHxcyAeC8PEq8I3upEsup+lF2sw=";
+      rev = "6921a831d79d515d64400a9e022cf30e68a2a3dd";
+      hash = "sha256-hD4OOMpwIdUTGPJoQFple5oDdpbXJa+i4x3eaAArSAw=";
    };
    location = "grammars/interface";
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
@@ -2145,12 +2145,12 @@
  };
  powershell = buildGrammar {
    language = "powershell";
-    version = "0.0.0+rev=32fe49c";
+    version = "0.0.0+rev=e904962";
    src = fetchFromGitHub {
      owner = "airbus-cert";
      repo = "tree-sitter-powershell";
-      rev = "32fe49cc5d4a2d5a976dacafc0da16d98787866b";
-      hash = "sha256-KweKsz/9X9HHvqZDhXb5qVVRMjwUSKNkiTYg5OcIiS0=";
+      rev = "e904962e25858b7e8e19c653e737ad3b7d1c55bd";
+      hash = "sha256-RlzGW09DE6gLM1G+y57gkEDPzMHc5Vi1jTHROUxMOt8=";
    };
    meta.homepage = "https://github.com/airbus-cert/tree-sitter-powershell";
  };
@@ -2467,12 +2467,12 @@
  };
  requirements = buildGrammar {
    language = "requirements";
-    version = "0.0.0+rev=5ad9b75";
+    version = "0.0.0+rev=7289100";
    src = fetchFromGitHub {
      owner = "ObserverOfTime";
      repo = "tree-sitter-requirements";
-      rev = "5ad9b7581b3334f6ad492847d007f2fac6e6e5f2";
-      hash = "sha256-L3PF6B+d+v/pjAQGVwkc7hCKrhbAB7u/BdXOpEum08w=";
+      rev = "728910099ddea7f1f94ea95a35a70d1ea76a1639";
+      hash = "sha256-IiIvU4iyqlP9px6qCivmQXusp/vuhOJBfWqMfcdKN7s=";
    };
    meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-requirements";
  };
@@ -2577,23 +2577,23 @@
  };
  rust = buildGrammar {
    language = "rust";
-    version = "0.0.0+rev=6e883a2";
+    version = "0.0.0+rev=e86119b";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-rust";
-      rev = "6e883a2adea9414799300699e78c0d2f032b5c46";
-      hash = "sha256-vvB5xswHwBCjYObyaZ4SHYFPuIPF1bAjZ2Xl5zsQB2Q=";
+      rev = "e86119bdb4968b9799f6a014ca2401c178d54b5f";
+      hash = "sha256-zJHUx5ZQVJ80hWWWh/PlO0jrOcCHDm9EPUTmZChab6g=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust";
  };
  scala = buildGrammar {
    language = "scala";
-    version = "0.0.0+rev=d67fe3b";
+    version = "0.0.0+rev=ed939ed";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-scala";
-      rev = "d67fe3ba3879bd7ba74bd7f56c9a38fed241ba25";
-      hash = "sha256-jyWnFyjbgmmshsZ+/NUqHfxXJN1EYgzZrrDnHECnoOY=";
+      rev = "ed939ed550ebff7d4ad8aafb4d5aad44de69965d";
+      hash = "sha256-OR0GIC7bDOkUZZvbvd1XdyOdYnjUAXhbYnOhNddH8wU=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
  };
@@ -2656,12 +2656,12 @@
  };
  slim = buildGrammar {
    language = "slim";
-    version = "0.0.0+rev=a0f08e8";
+    version = "0.0.0+rev=546e3aa";
    src = fetchFromGitHub {
      owner = "theoo";
      repo = "tree-sitter-slim";
-      rev = "a0f08e85b787248219ea645423c5916c8d620ef6";
-      hash = "sha256-b+V56Csa+byGvTieN+cAvoVy8UpFzS8/SSdYeW3cjts=";
+      rev = "546e3aa1af8a3b355c7734efccd9a759ffc0b43a";
+      hash = "sha256-G9+9TdEDqIDt3HvXWxMrjKixtgey7qkFNNp9fWx7Uec=";
    };
    meta.homepage = "https://github.com/theoo/tree-sitter-slim";
  };
@@ -2845,12 +2845,12 @@
  };
  superhtml = buildGrammar {
    language = "superhtml";
-    version = "0.0.0+rev=9266b31";
+    version = "0.0.0+rev=15ff939";
    src = fetchFromGitHub {
      owner = "kristoff-it";
      repo = "superhtml";
-      rev = "9266b3131bbcc0705b3b752bcb7478871a143740";
-      hash = "sha256-WjMydZZPgGuk2Syuy+PIsBfoRT4IIy4G7Ia8SZVxckY=";
+      rev = "15ff939100f9d52342445407973f3ce125a8437e";
+      hash = "sha256-fM+zhRvEwjMIq9RtgbMBF9GlybIWdO53ln6qZv+xHJs=";
    };
    location = "tree-sitter-superhtml";
    meta.homepage = "https://github.com/kristoff-it/superhtml";
@@ -3193,12 +3193,12 @@
  };
  unison = buildGrammar {
    language = "unison";
-    version = "0.0.0+rev=3c97db7";
+    version = "0.0.0+rev=169e7f7";
    src = fetchFromGitHub {
      owner = "kylegoetz";
      repo = "tree-sitter-unison";
-      rev = "3c97db76d3cdbd002dfba493620c2d5df2fd6fa9";
-      hash = "sha256-xveOQpCCkYdeiPkRbFlPNfXOpWW0lzCxfQbxXz+eurM=";
+      rev = "169e7f748a540ec360c0cb086b448faad012caa4";
+      hash = "sha256-0HOLtLh1zRdaGQqchT5zFegWKJHkQe9r7DGKL6sSkPo=";
    };
    generate = true;
    meta.homepage = "https://github.com/kylegoetz/tree-sitter-unison";
@@ -3272,12 +3272,12 @@
  };
  vhdl = buildGrammar {
    language = "vhdl";
-    version = "0.0.0+rev=f3a8d69";
+    version = "0.0.0+rev=db1d744";
    src = fetchFromGitHub {
      owner = "jpt13653903";
      repo = "tree-sitter-vhdl";
-      rev = "f3a8d69a96656bb81d803f7e6ec24fbe1aa2c313";
-      hash = "sha256-8cWDG3nqYwFlFSL1eLAR/B7aAkLlOlAuT20WhgGCRy0=";
+      rev = "db1d7446bd07d811981734cd501fe1994cbad99d";
+      hash = "sha256-0lNyEc6MS+k+vJvegQDI6/nlsx47xwLSro2ZGcaoADM=";
    };
    meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl";
  };
@@ -3393,12 +3393,12 @@
  };
  xml = buildGrammar {
    language = "xml";
-    version = "0.0.0+rev=26e95de";
+    version = "0.0.0+rev=2128a0b";
    src = fetchFromGitHub {
      owner = "tree-sitter-grammars";
      repo = "tree-sitter-xml";
-      rev = "26e95de449d772bc2dd4f0382580f84e2a0754d6";
-      hash = "sha256-lUFjL9QxjEBaBOOnEmabo1GNJ6bgPpeglKXNvmJlfPY=";
+      rev = "2128a0b249263e238d88cb894dad00c3168fea37";
+      hash = "sha256-qGMRslGqMEZpTMHmmB0sOWNHzpOBJgVhX+oPnphLxUc=";
    };
    location = "xml";
    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml";
@@ -3471,24 +3471,24 @@
  };
  ziggy = buildGrammar {
    language = "ziggy";
-    version = "0.0.0+rev=acf2b6b";
+    version = "0.0.0+rev=af41bdb";
    src = fetchFromGitHub {
      owner = "kristoff-it";
      repo = "ziggy";
-      rev = "acf2b6b5aa8b9ce93f4a1ef1adf4e95c06db7831";
-      hash = "sha256-ovHM91WXDOrp4d5pO6dg0LM+FN/5WrwcJZmSlQMZvbw=";
+      rev = "af41bdb5b1d64404c2ec7eb1d9de01083c0d2596";
+      hash = "sha256-crL9qmSq2XzaYdjinXQ2frZ8GHArRGlU1EId8dFwVGs=";
    };
    location = "tree-sitter-ziggy";
    meta.homepage = "https://github.com/kristoff-it/ziggy";
  };
  ziggy_schema = buildGrammar {
    language = "ziggy_schema";
-    version = "0.0.0+rev=acf2b6b";
+    version = "0.0.0+rev=af41bdb";
    src = fetchFromGitHub {
      owner = "kristoff-it";
      repo = "ziggy";
-      rev = "acf2b6b5aa8b9ce93f4a1ef1adf4e95c06db7831";
-      hash = "sha256-ovHM91WXDOrp4d5pO6dg0LM+FN/5WrwcJZmSlQMZvbw=";
+      rev = "af41bdb5b1d64404c2ec7eb1d9de01083c0d2596";
+      hash = "sha256-crL9qmSq2XzaYdjinXQ2frZ8GHArRGlU1EId8dFwVGs=";
    };
    location = "tree-sitter-ziggy-schema";
    meta.homepage = "https://github.com/kristoff-it/ziggy";
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -612,7 +612,6 @@ https://github.com/echasnovski/mini.starter/,HEAD,
 https://github.com/echasnovski/mini.statusline/,HEAD,
 https://github.com/echasnovski/mini.surround/,HEAD,
 https://github.com/echasnovski/mini.tabline/,HEAD,
-https://github.com/echasnovski/mini.test/,HEAD,
 https://github.com/echasnovski/mini.trailspace/,HEAD,
 https://github.com/echasnovski/mini.visits/,HEAD,
 https://github.com/wfxr/minimap.vim/,,
--- a/pkgs/applications/emulators/mame/default.nix
+++ b/pkgs/applications/emulators/mame/default.nix
@@ -40,14 +40,14 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "mame";
-  version = "0.274";
+  version = "0.275";
  srcVersion = builtins.replaceStrings [ "." ] [ "" ] version;

  src = fetchFromGitHub {
    owner = "mamedev";
    repo = "mame";
    rev = "mame${srcVersion}";
-    hash = "sha256-fZ2mjwP45qpFB0VaIHBccjkDPKyDmxqaXcZg3TFSAlY=";
+    hash = "sha256-VD0T+zoR8fPZqRwTVrk2k5ui3tLQumEg1Fd64SJdszU=";
  };

  outputs = [
--- a/pkgs/applications/gis/grass/default.nix
+++ b/pkgs/applications/gis/grass/default.nix
@@ -39,13 +39,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "grass";
-  version = "8.4.0";
+  version = "8.4.1";

  src = fetchFromGitHub {
    owner = "OSGeo";
    repo = "grass";
    rev = finalAttrs.version;
-    hash = "sha256-NKMshd6pr2O62ZjmQ/oPttmeVBYVD0Nqhh3SwQrhZf8=";
+    hash = "sha256-q1jOimQi+24I1ZBf6Z0cvAyXcBFBpT5aWSNeG6n6y0k=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/trenchbroom/default.nix
+++ b/pkgs/applications/misc/trenchbroom/default.nix
@@ -22,24 +22,23 @@
  miniz,
  tinyxml-2,
  xorg,
-  qtbase,
-  qtwayland,
-  wrapQtAppsHook,
+  qt6,
  copyDesktopItems,
  makeDesktopItem,
 }:

 stdenv.mkDerivation rec {
  pname = "TrenchBroom";
-  version = "2024.1";
+  version = "2025.2";

  src = fetchFromGitHub {
    owner = "TrenchBroom";
    repo = "TrenchBroom";
-    rev = "v${version}";
-    hash = "sha256-HNK/gLbew7MKN6GVStxDb2tyMgyw2l1+dhPr6fSaZ4A=";
+    tag = "v${version}";
+    hash = "sha256-aOHhL0yBDgFTMcDY7RKZXRrReRiThcQdf7QMHEpRuks=";
    fetchSubmodules = true;
  };
+
  # Manually simulate a vcpkg installation so that it can link the libraries
  # properly.
  postUnpack =
@@ -87,13 +86,14 @@ stdenv.mkDerivation rec {
      ln -s ${miniz}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
      ln -s ${tinyxml-2}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
    '';
+
  postPatch = ''
    substituteInPlace common/src/Version.h.in \
      --subst-var-by APP_VERSION_YEAR ${lib.versions.major version} \
      --subst-var-by APP_VERSION_NUMBER ${lib.versions.minor version} \
      --subst-var-by GIT_DESCRIBE v${version}
    substituteInPlace app/CMakeLists.txt \
-      --replace 'set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")' 'set(CPACK_PACKAGING_INSTALL_PREFIX "'$out'")'
+      --replace-fail 'set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")' 'set(CPACK_PACKAGING_INSTALL_PREFIX "'$out'")'
  '';

  nativeBuildInputs = [
@@ -102,12 +102,13 @@ stdenv.mkDerivation rec {
    curl
    git
    pandoc
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
    copyDesktopItems
    pkg-config
    unzip
    zip
  ];
+
  buildInputs = [
    libGL
    libGLU
@@ -115,8 +116,9 @@ stdenv.mkDerivation rec {
    xorg.libSM
    freeimage
    freetype
-    qtbase
-    qtwayland
+    qt6.qtbase
+    qt6.qtwayland
+    qt6.qtsvg
    catch2
    fmt
    glew
@@ -124,7 +126,9 @@ stdenv.mkDerivation rec {
    tinyxml-2
    assimp
  ];
-  QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}";
+
+  QT_PLUGIN_PATH = "${qt6.qtbase}/${qt6.qtbase.qtPluginPrefix}";
+
  QT_QPA_PLATFORM = "offscreen";

  cmakeFlags = [
@@ -134,6 +138,7 @@ stdenv.mkDerivation rec {
    # https://github.com/TrenchBroom/TrenchBroom/issues/4002#issuecomment-1125390780
    "-DCMAKE_PREFIX_PATH=cmake/packages"
  ];
+
  ninjaFlags = [
    "TrenchBroom"
  ];
@@ -162,12 +167,12 @@ stdenv.mkDerivation rec {
    })
  ];

-  meta = with lib; {
+  meta = {
    homepage = "https://trenchbroom.github.io/";
    changelog = "https://github.com/TrenchBroom/TrenchBroom/releases/tag/v${version}";
    description = "Level editor for Quake-engine based games";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ astro ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ astro ];
    platforms = [ "x86_64-linux" ];
  };
 }
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -623,7 +623,7 @@ let
      ''
      + ''
        # Link to our own Node.js and Java (required during the build):
-        mkdir -p third_party/node/linux/node-linux-x64/bin
+        mkdir -p third_party/node/linux/node-linux-x64/bin${lib.optionalString ungoogled " third_party/jdk/current/bin/"}
        ln -sf "${pkgsBuildHost.nodejs}/bin/node" third_party/node/linux/node-linux-x64/bin/node
        ln -s "${pkgsBuildHost.jdk17_headless}/bin/java" third_party/jdk/current/bin/

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

  meta = {
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
@@ -10,13 +10,13 @@
 buildMozillaMach rec {
  pname = "firefox-devedition";
  binaryName = pname;
-  version = "135.0b9";
+  version = "137.0b2";
  applicationName = "Firefox Developer Edition";
  requireSigning = false;
  branding = "browser/branding/aurora";
  src = fetchurl {
    url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "bf09f999b347492b841a26fcbcfb4d37e5f74528a05ffab47572dcaae01cb43e70baf58e83cc5153498a6a6ad2cb69507b628fba840090c91f4dbca62717a435";
+    sha512 = "a15eded14d6a4ddeb3798ac7bb72a9e8a6541a3ee76dc9051cf6865816079f8794e6defe2f9299f327976eefc1f4ea957d972b56d1f03816296b25f0c0173a12";
  };

  meta = {
--- a/pkgs/applications/networking/browsers/lagrange/default.nix
+++ b/pkgs/applications/networking/browsers/lagrange/default.nix
@@ -22,13 +22,13 @@

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

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

  nativeBuildInputs = [
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1255,13 +1255,13 @@
    "vendorHash": "sha256-YdWs2orKhbwAZSQYC73t4e/vvVxk8LrBPG9ZC38VcZE="
  },
  "sysdig": {
-    "hash": "sha256-KoqAx3l03Q6FNu6/9QiDJZqVYumlq4JW1uQHCePuqqM=",
+    "hash": "sha256-TzwrfI4P3C7jIm7LHk00IOrKXSfZ1MOTw/gq9vVtcHw=",
    "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig",
    "owner": "sysdiglabs",
    "repo": "terraform-provider-sysdig",
-    "rev": "v1.46.0",
+    "rev": "v1.47.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-eZl/UKvLG1Yi59oRl70CvrAIyLoyPW0ILWmFMzdUdDQ="
+    "vendorHash": "sha256-L+XwC7c4ph4lM0+BhHB9oi1R/Av8jlDcqHewOmtPU1s="
  },
  "tailscale": {
    "hash": "sha256-b2ZzXvlzlE+zv3Ufu4M5mcuLhyDkBbMznyM7NbiXAQs=",
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
--- a/pkgs/applications/radio/svxlink/default.nix
+++ b/pkgs/applications/radio/svxlink/default.nix
@@ -20,6 +20,7 @@
  tcl,
  doxygen,
  groff,
+  jsoncpp,
 }:

 let
@@ -39,13 +40,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "svxlink";
-  version = "19.09.2";
+  version = "24.02";

  src = fetchFromGitHub {
    owner = "sm0svx";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-riyFEuEmJ7+jYT3UoTTsMUwFdO3y5mjo4z0fcC3O8gY=";
+    repo = "svxlink";
+    tag = version;
+    hash = "sha256-QNm3LQ9RY24F/wmRuP+D2G5of1490YpZD9bp6dZErU0=";
  };

  cmakeFlags = [
@@ -54,6 +55,7 @@ stdenv.mkDerivation rec {
    "-DRTLSDR_INCLUDE_DIRS=${rtl-sdr}/include"
    "../src"
  ];
+
  dontWrapQtApps = true;

  nativeBuildInputs = [
@@ -77,25 +79,24 @@ stdenv.mkDerivation rec {
    rtl-sdr
    speex
    tcl
+    jsoncpp
  ];

  postInstall = ''
-    rm -f $out/share/applications/*
-    cp -v ${desktopItem}/share/applications/* $out/share/applications
-    mv $out/share/icons/link.xpm $out/share/icons/qtel.xpm
-
+    rm -rf $out/share/applications
+    ln -s ${desktopItem}/share/applications $out/share/applications
    wrapQtApp $out/bin/qtel
  '';

-  meta = with lib; {
+  meta = {
    description = "Advanced repeater controller and EchoLink software";
    longDescription = ''
      Advanced repeater controller and EchoLink software for Linux including a
      GUI, Qtel - The Qt EchoLink client
    '';
    homepage = "http://www.svxlink.org/";
-    license = with licenses; [ gpl2 ];
-    maintainers = with maintainers; [ zaninime ];
-    platforms = platforms.linux;
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = with lib.maintainers; [ zaninime ];
+    platforms = lib.platforms.linux;
  };
 }
--- a/pkgs/applications/science/machine-learning/shogun/default.nix
+++ b/pkgs/applications/science/machine-learning/shogun/default.nix
@@ -184,7 +184,7 @@ stdenv.mkDerivation (finalAttrs: {
      (lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_TFLogger" true)
      (lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_ViennaCL" true)
      (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'${excludeTestsRegex}'")
-      (lib.cmakeBool "ENABLE_TESTING" finalAttrs.doCheck)
+      (lib.cmakeBool "ENABLE_TESTING" finalAttrs.finalPackage.doCheck)
      (lib.cmakeBool "DISABLE_META_INTEGRATION_TESTS" true)
      (lib.cmakeBool "TRAVIS_DISABLE_META_CPP" true)
      (lib.cmakeBool "INTERFACE_PYTHON" pythonSupport)
--- a/pkgs/applications/version-management/lucky-commit/default.nix
+++ b/pkgs/applications/version-management/lucky-commit/default.nix
@@ -10,17 +10,17 @@

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

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

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

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

--- a/pkgs/applications/video/mpv/scripts/mpvacious.nix
+++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix
@@ -10,13 +10,13 @@

 buildLua rec {
  pname = "mpvacious";
-  version = "0.37";
+  version = "0.38";

  src = fetchFromGitHub {
    owner = "Ajatt-Tools";
    repo = "mpvacious";
    rev = "v${version}";
-    sha256 = "sha256-sT74uDGtEUSDMJqSTJ6bI9XvdpRnQDNvKebWMx0CRcE=";
+    sha256 = "sha256-x0ZljJSNlkIszUJy2FUCZMd6Vud08YnCJs7DmT4o/fA=";
  };
  passthru.updateScript = gitUpdater { rev-prefix = "v"; };

--- a/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix
+++ b/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix
@@ -3,36 +3,96 @@
  buildNpmPackage,
  fetchFromGitHub,
  gitUpdater,
-  nodejs_20,
-  python3,
+  nodejs,
+  cmake,
+  pkg-config,
+  openssl,
+  libdatachannel,
+  plog,
 }:

+let
+  # Modified from pkgs/by-name/ht/httptoolkit-server/package.nix
+  nodeDatachannel = buildNpmPackage {
+    pname = "node-datachannel";
+    version = "0.10.1";
+
+    src = fetchFromGitHub {
+      owner = "murat-dogan";
+      repo = "node-datachannel";
+      rev = "refs/tags/v${nodeDatachannel.version}";
+      hash = "sha256-r5tBg645ikIWm+RU7Muw/JYyd7AMpkImD0Xygtm1MUk=";
+    };
+
+    npmFlags = [ "--ignore-scripts" ];
+
+    makeCacheWritable = true;
+
+    npmDepsHash = "sha256-1ZJd0Y45B3CT2YPXDYfCuFMBo5uggWRuDH11eCobyyY=";
+
+    nativeBuildInputs = [
+      cmake
+      pkg-config
+    ];
+
+    buildInputs = [
+      openssl
+      libdatachannel
+      plog
+    ];
+
+    dontUseCmakeConfigure = true;
+
+    env.NIX_CFLAGS_COMPILE = "-I${nodejs}/include/node";
+
+    preBuild = ''
+      # don't use static libs and don't use FetchContent
+      substituteInPlace CMakeLists.txt \
+          --replace-fail 'OPENSSL_USE_STATIC_LIBS TRUE' 'OPENSSL_USE_STATIC_LIBS FALSE' \
+          --replace-fail 'if(NOT libdatachannel)' 'if(false)' \
+          --replace-fail 'datachannel-static' 'datachannel'
+      sed -i '2ifind_package(plog)' CMakeLists.txt
+
+      # don't fetch node headers
+      substituteInPlace node_modules/cmake-js/lib/dist.js \
+          --replace-fail '!this.downloaded' 'false'
+    '';
+
+    installPhase = ''
+      runHook preInstall
+      install -Dm755 build/Release/*.node -t $out/build/Release
+      runHook postInstall
+    '';
+  };
+in
+
 buildNpmPackage rec {
  pname = "webtorrent-mpv-hook";
-  version = "1.4.1";
+  version = "1.4.4";

  src = fetchFromGitHub {
    owner = "mrxdst";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-/dMtXcIyfAs++Zgz2CxRW0tkzn5QjS+WVGChlCyrU0U=";
+    hash = "sha256-qFeQBVPZZFKkxz1fhK3+ah3TPDovklhhQwtv09TiSqo=";
  };
  passthru.updateScript = gitUpdater { rev-prefix = "v"; };

  postPatch = ''
-    substituteInPlace src/webtorrent.ts --replace-fail "node_path: 'node'" "node_path: '${lib.getExe nodejs_20}'"
+    substituteInPlace src/webtorrent.ts --replace-fail "node_path: 'node'" "node_path: '${lib.getExe nodejs}'"
    # This executable is just for telling non-Nix users how to install
    substituteInPlace package.json --replace-fail '"bin": "build/bin.mjs",' ""
    rm -rf src/bin.ts
  '';

-  npmDepsHash = "sha256-EqHPBoYyBuW9elxQH/XVTZoPkKHC6+7aksYo60t7WA4=";
+  npmDepsHash = "sha256-fKzXdbtxC2+63/GZdvPOxvBpQ5rzgvfseigOgpP1n5I=";
  makeCacheWritable = true;
+  npmFlags = [ "--ignore-scripts" ];

-  nativeBuildInputs = [
-    python3 # Fixes node-gyp on aarch64-linux
-  ];
-
+  postConfigure = ''
+    # manually place our prebuilt `node-datachannel` binary into its place, since we used '--ignore-scripts'
+    ln -s ${nodeDatachannel}/build node_modules/node-datachannel/build
+  '';
  postInstall = ''
    mkdir -p $out/share/mpv/scripts/
    ln -s $out/lib/node_modules/webtorrent-mpv-hook/build/webtorrent.js $out/share/mpv/scripts/
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
  # xvfb-run is available only on Linux
  doCheck = stdenv.hostPlatform.isLinux;

-  nativeCheckInputs = lib.optionals finalAttrs.doCheck [
+  nativeCheckInputs = lib.optionals finalAttrs.finalPackage.doCheck [
    xorgserver
    xvfb-run
    xdotool
--- a/pkgs/by-name/ac/accerciser/package.nix
+++ b/pkgs/by-name/ac/accerciser/package.nix
@@ -19,13 +19,13 @@

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

  format = "other";

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

  nativeBuildInputs = [
--- a/pkgs/by-name/ai/aisleriot/package.nix
+++ b/pkgs/by-name/ai/aisleriot/package.nix
@@ -1,8 +1,7 @@
 {
  stdenv,
  lib,
-  fetchFromGitLab,
-  gitUpdater,
+  fetchurl,
  pkg-config,
  itstool,
  gtk3,
@@ -15,18 +14,16 @@
  libcanberra-gtk3,
  ninja,
  yelp-tools,
+  gnome,
 }:

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

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

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

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

  meta = with lib; {
--- a/pkgs/by-name/al/alacritty-theme/package.nix
+++ b/pkgs/by-name/al/alacritty-theme/package.nix
@@ -8,13 +8,13 @@

 stdenvNoCC.mkDerivation (self: {
  pname = "alacritty-theme";
-  version = "0-unstable-2025-02-16";
+  version = "0-unstable-2025-02-20";

  src = fetchFromGitHub {
    owner = "alacritty";
    repo = "alacritty-theme";
-    rev = "082983da8e4811f3a6ddc0c54a161f2a89011c8e";
-    hash = "sha256-FeZdkmYEHihTWWPhvDq257r91L9iVU0heIZXAOp3XQo=";
+    rev = "687675f3f2245c80ff8bfe8180b0eb40dfc0bc86";
+    hash = "sha256-kxOPURbK/tzHSO7eZRCV2l4XOj7BNT5bCTc0Qcifuww=";
    sparseCheckout = [ "themes" ];
  };

--- a/pkgs/by-name/al/aldente/package.nix
+++ b/pkgs/by-name/al/aldente/package.nix
@@ -8,11 +8,11 @@

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

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

  dontBuild = true;
--- a/pkgs/by-name/am/amber-lang/package.nix
+++ b/pkgs/by-name/am/amber-lang/package.nix
@@ -12,17 +12,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "amber-lang";
-  version = "0.3.5-alpha";
+  version = "0.4.0-alpha";

  src = fetchFromGitHub {
    owner = "amber-lang";
    repo = "amber";
    rev = version;
-    hash = "sha256-wf0JNWNliDGNvlbWoatPqDKmVaBzHeCKOvJWuE9PnpQ=";
+    hash = "sha256-N9G/2G8+vrpr1/K7XLwgW+X2oAyAaz4qvN+EbLOCU1Q=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-OhrSK+bvdQP1bAcEbS2foHxY4BEYoJ9SQaE7Rj9od0Y=";
+  cargoHash = "sha256-e5+L7Qgd6hyqT1Pb9X7bVtRr+xm428Z5J4hhsYNnGtU=";

  preConfigure = ''
    substituteInPlace src/compiler.rs \
@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec {
  passthru = {
    updateScript = nix-update-script { };
    tests.run = runCommand "amber-lang-eval-test" { nativeBuildInputs = [ amber-lang ]; } ''
-      diff -U3 --color=auto <(amber -e 'echo "Hello, World"') <(echo 'Hello, World')
+      diff -U3 --color=auto <(amber eval 'echo "Hello, World"') <(echo 'Hello, World')
      touch $out
    '';
  };
--- 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.25";
+  version = "2.9.31";

  src = fetchFromGitLab {
    domain = "salsa.debian.org";
    owner = "apt-team";
    repo = "apt";
    rev = finalAttrs.version;
-    hash = "sha256-YVMqqWF4heSF11b0uKD/EUUBPPzkTtGP3QxnLVY6/l8=";
+    hash = "sha256-9YamO7niRXULnxiaRYB0BlzDitNtkKMe0Rw7KxDOOSM=";
  };

  # cycle detection; lib can't be split
--- a/pkgs/by-name/ar/arpack/package.nix
+++ b/pkgs/by-name/ar/arpack/package.nix
@@ -53,11 +53,11 @@ stdenv.mkDerivation (finalAttrs: {
  cmakeFlags = [
    (lib.cmakeBool "BUILD_SHARED_LIBS" stdenv.hostPlatform.hasSharedLibraries)
    (lib.cmakeBool "EIGEN" true)
-    (lib.cmakeBool "EXAMPLES" finalAttrs.doCheck)
+    (lib.cmakeBool "EXAMPLES" finalAttrs.finalPackage.doCheck)
    (lib.cmakeBool "ICB" true)
    (lib.cmakeBool "INTERFACE64" (!useAccel && blas.isILP64))
    (lib.cmakeBool "MPI" useMpi)
-    (lib.cmakeBool "TESTS" finalAttrs.doCheck)
+    (lib.cmakeBool "TESTS" finalAttrs.finalPackage.doCheck)
  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
    "-DBLA_VENDOR=${if useAccel then "Apple" else "Generic"}"
  ];
--- a/pkgs/by-name/az/azure-cli/extensions-manual.nix
+++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix
@@ -83,9 +83,9 @@

  containerapp = mkAzExtension rec {
    pname = "containerapp";
-    version = "1.1.0b2";
+    version = "1.1.0b3";
    url = "https://azcliprod.blob.core.windows.net/cli-extensions/containerapp-${version}-py2.py3-none-any.whl";
-    hash = "sha256-+2iP6+jsuO3NKJzKUUdLuBCpscn0w/Gx+pqBagyv4rE=";
+    hash = "sha256-BPChKCEU89/+KWIlt4ocU37gLwyDUfGBO3QCqkFQhjI=";
    description = "Microsoft Azure Command-Line Tools Containerapp Extension";
    propagatedBuildInputs = with python3Packages; [
      docker
--- a/pkgs/by-name/be/beecrypt/package.nix
+++ b/pkgs/by-name/be/beecrypt/package.nix
@@ -5,22 +5,30 @@
  m4,
 }:

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

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

  meta = {
+    description = "Strong and fast cryptography toolkit library";
    platforms = lib.platforms.linux;
    license = lib.licenses.lgpl2;
+    maintainers = [ ];
  };
-}
+})
--- a/pkgs/by-name/be/bender/package.nix
+++ b/pkgs/by-name/be/bender/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  gitMinimal,
+}:
+let
+  target = stdenv.hostPlatform.rust.cargoShortTarget;
+in
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "bender";
+  version = "0.28.1";
+
+  src = fetchFromGitHub {
+    owner = "pulp-platform";
+    repo = "bender";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-eC4BY3ri73vgEtcXoPQ5NDknjZcPrKOzLo2vXWj4Adg=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-fV4pWSRNlXCdnpeDgg3QW8s1Ixd1LEY8qP/Pb4t5xdc=";
+
+  nativeCheckInputs = [ gitMinimal ];
+  postCheck = ''
+    patchShebangs --build tests
+    BENDER="target/${target}/$cargoBuildType/bender" tests/run_all.sh
+  '';
+
+  meta = {
+    description = "Dependency management tool for hardware projects";
+    homepage = "https://github.com/pulp-platform/bender";
+    changelog = "https://github.com/pulp-platform/bender/releases/tag/${finalAttrs.src.rev}";
+    license = with lib.licenses; [
+      asl20
+      mit
+    ];
+    maintainers = with lib.maintainers; [ Liamolucko ];
+    mainProgram = "bender";
+    platforms = lib.platforms.all;
+  };
+})
--- a/pkgs/by-name/be/beszel/package.nix
+++ b/pkgs/by-name/be/beszel/package.nix
@@ -1,21 +1,20 @@
 {
-  buildGoModule,
+  buildGo124Module,
  lib,
  fetchFromGitHub,
  nix-update-script,
  buildNpmPackage,
-  fetchpatch,
 }:

-buildGoModule rec {
+buildGo124Module rec {
  pname = "beszel";
-  version = "0.9.1";
+  version = "0.10.1";

  src = fetchFromGitHub {
    owner = "henrygd";
    repo = "beszel";
    tag = "v${version}";
-    hash = "sha256-tZLv/YwamQpZDo2Ha86z3lpDdLl7PVarBiAXJtCn1UE=";
+    hash = "sha256-4RuYZcBR7X9Ug6l91N/FtyfT38HlW2guputzo4kF8YU=";
  };

  webui = buildNpmPackage {
@@ -49,12 +48,12 @@ buildGoModule rec {

    sourceRoot = "${src.name}/beszel/site";

-    npmDepsHash = "sha256-ObLulUnCCcKetDW6XKdC8u0NuKBLVUl37jebCGloGoE=";
+    npmDepsHash = "sha256-UKOS7QyGsdKosjhxVhZErFkXhnfrFxdX0ozBUJGsNII=";
  };

  sourceRoot = "${src.name}/beszel";

-  vendorHash = "sha256-h4JgRzjpG17kKXEchX+OtLBnjjd0C3D37jUCvOqQXP0=";
+  vendorHash = "sha256-VX9mil0Hdmb85Zd9jfvm5Zz2pPQx+oAGHY+BI04bYQY=";

  preBuild = ''
    mkdir -p site/dist
--- a/pkgs/by-name/bl/blackvoxel/package.nix
+++ b/pkgs/by-name/bl/blackvoxel/package.nix
@@ -0,0 +1,84 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  makeDesktopItem,
+  imagemagick,
+  glew110,
+  SDL_compat,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "blackvoxel";
+  version = "2.5";
+
+  src = fetchFromGitHub {
+    owner = "Blackvoxel";
+    repo = "Blackvoxel";
+    tag = finalAttrs.version;
+    hash = "sha256-Uj3TfxAsLddsPiWDcLKjpduqvgVjnESZM4YPHT90YYY=";
+  };
+
+  nativeBuildInputs = [ imagemagick ];
+
+  buildInputs = [
+    glew110
+    SDL_compat
+  ];
+
+  enableParallelBuilding = true;
+
+  postPatch = ''
+    substituteInPlace src/sc_Squirrel3/sq/Makefile --replace-fail " -m64" ""
+    substituteInPlace src/sc_Squirrel3/sqstdlib/Makefile --replace-fail " -m64" ""
+    substituteInPlace src/sc_Squirrel3/squirrel/Makefile --replace-fail " -m64" ""
+  '';
+
+  buildFlags = [ "BV_DATA_LOCATION_DIR=${placeholder "out"}/data" ];
+
+  # data/gui/gametype_back.bmp isn't exactly the official icon but since
+  # there is no official icon we use that one
+  postBuild = ''
+    convert gui/gametype_back.bmp blackvoxel.png
+  '';
+
+  installFlags = [
+    "doinstall=true"
+    "BV_DATA_INSTALL_DIR=${placeholder "out"}/data"
+    "BV_BINARY_INSTALL_DIR=${placeholder "out"}/bin"
+  ];
+
+  postInstall = ''
+    install -Dm644 blackvoxel.png $out/share/icons/hicolor/1024x1024/apps/blackvoxel.png
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "blackvoxel";
+      desktopName = "Blackvoxel";
+      exec = "blackvoxel";
+      icon = "blackvoxel";
+      categories = [ "Game" ];
+    })
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "A Sci-Fi game with industry and automation";
+    homepage = "https://www.blackvoxel.com";
+    changelog = "https://github.com/Blackvoxel/Blackvoxel/releases/tag/${finalAttrs.version}";
+    license = with lib.licenses; [
+      # blackvoxel
+      gpl3Plus
+      # Squirrel
+      mit
+    ];
+    maintainers = with lib.maintainers; [
+      ethancedwards8
+      marcin-serwin
+    ];
+    platforms = lib.platforms.linux;
+  };
+})
--- a/pkgs/by-name/bl/blasfeo/package.nix
+++ b/pkgs/by-name/bl/blasfeo/package.nix
@@ -8,13 +8,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "blasfeo";
-  version = "0.1.4.1";
+  version = "0.1.4.2";

  src = fetchFromGitHub {
    owner = "giaf";
    repo = "blasfeo";
    rev = finalAttrs.version;
-    hash = "sha256-peopXTJejgqS/DL4h52h1vVJe6jjWPQb6x/9SPvFl6k=";
+    hash = "sha256-p1pxqJ38h6RKXMg1t+2RHlfmRKPuM18pbUarUx/w9lw=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/by-name/bl/blobdrop/package.nix
+++ b/pkgs/by-name/bl/blobdrop/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
    ];

  cmakeFlags = [
-    (lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck)
+    (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
  ];

  doCheck = true;
--- a/pkgs/by-name/bo/boxflat/package.nix
+++ b/pkgs/by-name/bo/boxflat/package.nix
@@ -13,14 +13,14 @@

 python3Packages.buildPythonPackage rec {
  pname = "boxflat";
-  version = "1.27.1";
+  version = "1.28.4";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "Lawstorant";
    repo = "boxflat";
    tag = "v${version}";
-    hash = "sha256-W+pnoSyTJS+ORb8vHX4QXOxkDskTb7X2cv6WyU3ctGQ=";
+    hash = "sha256-szKGrP+z0HsCV/FhhKPlOMcb6LkQhOA1pZfwR86xa3Y=";
  };

  build-system = [ python3Packages.setuptools ];
--- a/pkgs/by-name/bp/bpftune/package.nix
+++ b/pkgs/by-name/bp/bpftune/package.nix
@@ -14,13 +14,13 @@

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

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

  postPatch = ''
--- a/pkgs/by-name/bt/btcpayserver/deps.json
+++ b/pkgs/by-name/bt/btcpayserver/deps.json
--- a/pkgs/by-name/bt/btcpayserver/package.nix
+++ b/pkgs/by-name/bt/btcpayserver/package.nix
@@ -6,13 +6,13 @@

 buildDotnetModule rec {
  pname = "btcpayserver";
-  version = "1.13.7";
+  version = "2.0.7";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-NYeAa8F8LpLWVMW0M/KPVt1XCFOJP50Aug11dxLkSGw=";
+    sha256 = "sha256-LOyGNdlU8wvDFmYQ2v1H3Z12++ChVrGM53zBTWCCiCk=";
  };

  projectFile = "BTCPayServer/BTCPayServer.csproj";
--- a/pkgs/by-name/bv/bviplus/package.nix
+++ b/pkgs/by-name/bv/bviplus/package.nix
@@ -6,13 +6,13 @@
  ncurses,
 }:

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

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

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

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

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

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

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

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

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

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/by-name/ci/cirrus-cli/package.nix
+++ b/pkgs/by-name/ci/cirrus-cli/package.nix
@@ -7,13 +7,13 @@

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

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

  vendorHash = "sha256-GjCwH0Xe9wyacfokI5EzF2TKUnSMKCdOljahChPBlso=";
--- a/pkgs/by-name/cl/clojure-lsp/package.nix
+++ b/pkgs/by-name/cl/clojure-lsp/package.nix
@@ -10,18 +10,18 @@

 buildGraalvmNativeImage rec {
  pname = "clojure-lsp";
-  version = "2024.11.08-17.49.29";
+  version = "2025.02.07-16.11.24";

  src = fetchFromGitHub {
    owner = "clojure-lsp";
    repo = "clojure-lsp";
    rev = version;
-    hash = "sha256-pvIfW96RaJXMIDPKHfJjds9dU6IuC2f1TwdI8X/JTw0=";
+    hash = "sha256-QGYcLqhQ/5vtrJKIl3au24cYcXILjiY13uRa+8K62fM=";
  };

  jar = fetchurl {
    url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar";
-    hash = "sha256-QMc62p6qFTh+y4C5aBGuZX/pQZQSywbYCFA1nYIY/80=";
+    hash = "sha256-6Qe2uPgIZ+E+GRjKGyivGHv08ZbzaOIdKeW0bnJP0Gk=";
  };

  extraNativeImageBuildArgs = [
--- a/pkgs/by-name/co/convmv/package.nix
+++ b/pkgs/by-name/co/convmv/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
  doCheck = !stdenv.hostPlatform.isDarwin;

  prePatch =
-    lib.optionalString finalAttrs.doCheck ''
+    lib.optionalString finalAttrs.finalPackage.doCheck ''
      tar -xf testsuite.tar
    ''
    + ''
--- a/pkgs/by-name/co/cosmic-files/package.nix
+++ b/pkgs/by-name/co/cosmic-files/package.nix
@@ -3,51 +3,40 @@
  stdenv,
  fetchFromGitHub,
  rustPlatform,
-  makeBinaryWrapper,
-  cosmic-icons,
  just,
-  pkg-config,
+  libcosmicAppHook,
  glib,
-  libxkbcommon,
-  wayland,
-  xorg,
+  nix-update-script,
 }:

-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-files";
-  version = "1.0.0-alpha.1";
+  version = "1.0.0-alpha.6";

  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-files";
-    rev = "epoch-${version}";
-    hash = "sha256-UwQwZRzOyMvLRRmU2noxGrqblezkR8J2PNMVoyG0M0w=";
+    tag = "epoch-${finalAttrs.version}";
+    hash = "sha256-i1CVhfieexeiKPwp0y29QyrKspzEFkp1+zwIaM9D/Qc=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-me/U4LtnvYtf77qxF2Z1ncHRVOLp3inDVlwnCjwlj08=";
+  cargoHash = "sha256-I5WRuEogMwa0dB6wxhWDxivqhCdUugvsPrwUvjjDnt8=";

-  # COSMIC applications now uses vergen for the About page
-  # Update the COMMIT_DATE to match when the commit was made
-  env.VERGEN_GIT_COMMIT_DATE = "2024-08-05";
-  env.VERGEN_GIT_SHA = src.rev;
-
-  postPatch = ''
-    substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)"
-  '';
+  env = {
+    VERGEN_GIT_COMMIT_DATE = "2025-02-21";
+    VERGEN_GIT_SHA = finalAttrs.src.tag;
+  };

  nativeBuildInputs = [
    just
-    pkg-config
-    makeBinaryWrapper
-  ];
-  buildInputs = [
-    glib
-    libxkbcommon
-    wayland
+    libcosmicAppHook
  ];

+  buildInputs = [ glib ];
+
  dontUseJustBuild = true;
+  dontUseJustCheck = true;

  justFlags = [
    "--set"
@@ -56,31 +45,60 @@ rustPlatform.buildRustPackage rec {
    "--set"
    "bin-src"
    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-files"
+    "--set"
+    "applet-src"
+    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-files-applet"
  ];

-  # LD_LIBRARY_PATH can be removed once tiny-xlib is bumped above 0.2.2
-  postInstall = ''
-    wrapProgram "$out/bin/cosmic-files" \
-      --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \
-      --prefix LD_LIBRARY_PATH : ${
-        lib.makeLibraryPath [
-          xorg.libX11
-          xorg.libXcursor
-          xorg.libXrandr
-          xorg.libXi
-          wayland
-        ]
-      }
+  # This is needed since by setting cargoBuildFlags, it would build both the applet and the main binary
+  # at the same time, which would cause problems with the desktop items applet
+  buildPhase = ''
+    runHook preBuild
+
+    defaultCargoBuildFlags="$cargoBuildFlags"
+
+    cargoBuildFlags="$defaultCargoBuildFlags --package cosmic-files"
+    runHook cargoBuildHook
+
+    cargoBuildFlags="$defaultCargoBuildFlags --package cosmic-files-applet"
+    runHook cargoBuildHook
+
+    runHook postBuild
  '';

-  meta = with lib; {
+  checkPhase = ''
+    runHook preCheck
+
+    defaultCargoTestFlags="$cargoTestFlags"
+
+    cargoTestFlags="$defaultCargoTestFlags --package cosmic-files"
+    runHook cargoCheckHook
+
+    cargoTestFlags="$defaultCargoTestFlags --package cosmic-files-applet"
+    runHook cargoCheckHook
+
+    runHook postCheck
+  '';
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version"
+      "unstable"
+      "--version-regex"
+      "epoch-(.*)"
+    ];
+  };
+
+  meta = {
    homepage = "https://github.com/pop-os/cosmic-files";
    description = "File Manager for the COSMIC Desktop Environment";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Only;
+    mainProgram = "cosmic-files";
+    maintainers = with lib.maintainers; [
      ahoneybun
      nyabinary
+      HeitorAugustoLN
    ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
  };
-}
+})
--- a/pkgs/by-name/dp/dpp/package.nix
+++ b/pkgs/by-name/dp/dpp/package.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "dpp";
-  version = "10.1.0";
+  version = "10.1.1";

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

  nativeBuildInputs = [
--- a/pkgs/by-name/du/dub/package.nix
+++ b/pkgs/by-name/du/dub/package.nix
@@ -10,7 +10,7 @@

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

  enableParallelBuilding = true;

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

  postPatch = ''
--- a/pkgs/by-name/ea/earbuds/Cargo.lock
+++ b/pkgs/by-name/ea/earbuds/Cargo.lock
--- a/pkgs/by-name/ea/earbuds/package.nix
+++ b/pkgs/by-name/ea/earbuds/package.nix
@@ -26,13 +26,8 @@ rustPlatform.buildRustPackage {
    ./fix-daemon.patch
  ];

-  # git dependencies are currently not supported in the fixed-output derivation fetcher.
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "galaxy_buds_rs-0.2.10" = "sha256-95PBmGwHJiXi72Rir8KK7as+i9yjs5nf45SaBhj1geg=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-Y1pMmWxfXGcEFPj05/BpXQvd199O5l6hJmePNxMQc/Y=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/by-name/es/espanso/Cargo.lock
+++ b/pkgs/by-name/es/espanso/Cargo.lock
--- a/pkgs/by-name/es/espanso/package.nix
+++ b/pkgs/by-name/es/espanso/package.nix
@@ -40,12 +40,8 @@ rustPlatform.buildRustPackage {
    hash = "sha256-4MArENBmX6tDVLZE1O8cuJe7A0R+sLZoxBkDvIwIVZ4=";
  };

-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "yaml-rust-0.4.6" = "sha256-wXFy0/s4y6wB3UO19jsLwBdzMy7CGX4JoUt5V6cU7LU=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-2Hf492/xZ/QGqDYbjiZep/FX8bPyEuoxkMJ4qnMqu+c=";

  nativeBuildInputs = [
    extra-cmake-modules
--- a/pkgs/by-name/ev/evcc/package.nix
+++ b/pkgs/by-name/ev/evcc/package.nix
@@ -17,13 +17,13 @@
 }:

 let
-  version = "0.200.7";
+  version = "0.200.8";

  src = fetchFromGitHub {
    owner = "evcc-io";
    repo = "evcc";
    tag = version;
-    hash = "sha256-+bCFAZZPcQx3aj+YnNQN0hgAJdntjD5/eKLedW1GxYw=";
+    hash = "sha256-2a43QrmCvLQLuWYufsUC1IE6j6uilLQkcbgCMD3hPkY=";
  };

  vendorHash = "sha256-zWHysXjBNAAZfrVGzn39pdDqQrLUc1uYVLO/U7q0g04=";
--- a/pkgs/by-name/ev/evebox/Cargo.lock
+++ b/pkgs/by-name/ev/evebox/Cargo.lock
--- a/pkgs/by-name/ev/evebox/package.nix
+++ b/pkgs/by-name/ev/evebox/package.nix
@@ -16,12 +16,8 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-vakCBDyL/Su55tkn/SJ5ShZcYC8l+p2acpve/fTN0uI=";
  };

-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "suricatax-rule-parser-0.1.0" = "sha256-qwkZFmvgfXrH0zHPq/dVfxpWkulPDT+CzPQQHfeBotg=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-b3PQQlSRt1ysnJIkBXdG1KRUdEJ8h1WLzbmZXx9VjqU=";

  meta = {
    description = "Web Based Event Viewer (GUI) for Suricata EVE Events in Elastic Search";
--- a/pkgs/by-name/fi/file-roller/package.nix
+++ b/pkgs/by-name/fi/file-roller/package.nix
@@ -24,11 +24,11 @@

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

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

  nativeBuildInputs = [
--- a/pkgs/by-name/fi/fileshare/package.nix
+++ b/pkgs/by-name/fi/fileshare/package.nix
@@ -1,7 +1,7 @@
 {
  stdenv,
  lib,
-  fetchgit,
+  fetchFromGitea,
  pkg-config,
  git,
  libmicrohttpd,
@@ -11,16 +11,23 @@ stdenv.mkDerivation rec {
  pname = "fileshare";
  version = "0.2.4";

-  src = fetchgit {
-    url = "https://git.tkolb.de/Public/fileshare.git";
+  src = fetchFromGitea {
+    domain = "git.tkolb.de";
+    owner = "Public";
+    repo = "fileshare";
    rev = "v${version}";
-    sha256 = "03jrhk4vj6bc2w3lsrfjpfflb4laihysgs5i4cv097nr5cz32hyk";
+    sha256 = "sha256-00MxPivZngQ2I7Hopz2MipJFnbvSZU0HF2wZucmEWQ4=";
  };

  postPatch = ''
    sed -i 's,$(shell git rev-parse --short HEAD),/${version},g' Makefile
+    substituteInPlace Makefile \
+      --replace-fail pkg-config "${stdenv.cc.targetPrefix}pkg-config" \
+      --replace-fail gcc "${stdenv.cc.targetPrefix}cc"
  '';

+  env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+
  nativeBuildInputs = [
    pkg-config
    git
--- a/pkgs/by-name/fl/flips/package.nix
+++ b/pkgs/by-name/fl/flips/package.nix
@@ -10,13 +10,13 @@

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

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

  nativeBuildInputs = [
--- a/pkgs/by-name/fu/fum/package.nix
+++ b/pkgs/by-name/fu/fum/package.nix
@@ -11,17 +11,17 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "fum";
-  version = "1.2.0";
+  version = "1.3.1";

  src = fetchFromGitHub {
    owner = "qxb3";
    repo = "fum";
    tag = "v${version}";
-    hash = "sha256-v/MEqfDMrEVGr2tt3I2R1xPduZSxtiSHDxcp8GBHE+U=";
+    hash = "sha256-qZGbJGotxJCxlMIRPS/hw/cfz/k8PFdVKoJtqWKXD6s=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-1dtCcVtl0ztsrr9LPYgEi51vkAnhdE1HEEvhEOzgLwA=";
+  cargoHash = "sha256-g6Nn3teRHMdlKReX3j0jkhfJEHOigDF4ghSfSYU33o8=";

  nativeBuildInputs = [
    autoPatchelfHook
--- a/pkgs/by-name/ga/gallery-dl/package.nix
+++ b/pkgs/by-name/ga/gallery-dl/package.nix
@@ -8,7 +8,7 @@

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

  build-system = [ python3Packages.setuptools ];
--- a/pkgs/by-name/gd/gdevelop/package.nix
+++ b/pkgs/by-name/gd/gdevelop/package.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  appimageTools,
+}:
+let
+  version = "5.5.224";
+  pname = "gdevelop";
+
+  src =
+    if stdenv.hostPlatform.system == "x86_64-linux" then
+      fetchurl {
+        url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage";
+        sha256 = "sha256-/o7Yyu5BjRfpg4Tl0ZwN6/KD9Kg4LcEmUqlO7NE/dew=";
+      }
+    else
+      throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
+
+  appimageContents = appimageTools.extractType2 { inherit pname src; };
+
+  dontPatchELF = true;
+
+in
+appimageTools.wrapType2 rec {
+  inherit pname version src;
+
+  meta = {
+    description = "Graphical Game Development Studio";
+    homepage = "https://gdevelop.io/";
+    downloadPage = "https://github.com/4ian/GDevelop/releases";
+    license = lib.licenses.mit;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with lib.maintainers; [ tombert ];
+    platforms = [ "x86_64-linux" ];
+  };
+
+}
--- a/pkgs/by-name/ge/gemrb/package.nix
+++ b/pkgs/by-name/ge/gemrb/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
  nativeBuildInputs = [
    cmake
    pkg-config
-  ] ++ lib.optionals (finalAttrs.doCheck or false) [ gtest ];
+  ] ++ lib.optionals (finalAttrs.finalPackage.doCheck or false) [ gtest ];

  cmakeFlags = [
    (lib.cmakeFeature "DATA_DIR" "${placeholder "out"}/share/gemrb")
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
    (lib.cmakeFeature "LAYOUT" "opt")
    (lib.cmakeFeature "OPENGL_BACKEND" backend)
    (lib.cmakeFeature "OpenGL_GL_PREFERENCE" "GLVND")
-    (lib.cmakeBool "USE_TESTS" (finalAttrs.doCheck or false))
+    (lib.cmakeBool "USE_TESTS" (finalAttrs.finalPackage.doCheck or false))
  ];

  postInstall = ''
--- a/pkgs/by-name/gi/ginkgo/package.nix
+++ b/pkgs/by-name/gi/ginkgo/package.nix
@@ -8,15 +8,15 @@

 buildGoModule rec {
  pname = "ginkgo";
-  version = "2.22.2";
+  version = "2.23.0";

  src = fetchFromGitHub {
    owner = "onsi";
    repo = "ginkgo";
    rev = "v${version}";
-    sha256 = "sha256-mm6ZP+NtXp/BfiQuvBOk9VBDiFPfJ636EoAklnsRGSs=";
+    sha256 = "sha256-ku3pB9LLlDjwEEzJEVgCK+ar+L+beyMrjDtASfBWqLM=";
  };
-  vendorHash = "sha256-lX/rt2XWAojWBBwGHQk9ZzE6sZU5TZke5pRmOiD3rLw=";
+  vendorHash = "sha256-uqpib3k5PtQOsndic0GV1rYBeVlY5Tpg931yHfU6dWI=";

  # integration tests expect more file changes
  # types tests are missing CodeLocation
--- a/pkgs/by-name/gi/git-cola/package.nix
+++ b/pkgs/by-name/gi/git-cola/package.nix
@@ -12,14 +12,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "git-cola";
-  version = "4.11.0";
+  version = "4.12.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "git-cola";
    repo = "git-cola";
    tag = "v${version}";
-    hash = "sha256-aFdjkuQrVYgYALTnupdwVL58kSsp4SC6xsXefA1NnKI=";
+    hash = "sha256-1y/fYqvsPpgCEakL7XepI9SVPFgmk1m795uMPv1WgNc=";
  };

  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ qt5.qtwayland ];
--- a/pkgs/by-name/gl/glog/package.nix
+++ b/pkgs/by-name/gl/glog/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: rec {
    sha256 = "sha256-+nwWP6VBmhgU7GCPSEGUzvUSCc48wXME181WpJ5ABP4=";
  };

-  postPatch = lib.optionalString finalAttrs.doCheck ''
+  postPatch = lib.optionalString finalAttrs.finalPackage.doCheck ''
    substituteInPlace src/logging_unittest.cc \
      --replace-warn "/usr/bin/true" "${pkgsBuildHost.coreutils}/bin/true"
  '';
--- a/pkgs/by-name/gl/glycin-loaders/package.nix
+++ b/pkgs/by-name/gl/glycin-loaders/package.nix
@@ -23,11 +23,11 @@

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

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

  patches = [
--- a/pkgs/by-name/gn/gnome-shell/package.nix
+++ b/pkgs/by-name/gn/gnome-shell/package.nix
@@ -190,6 +190,13 @@ stdenv.mkDerivation (finalAttrs: {
    rm data/theme/gnome-shell-{light,dark}.css
  '';

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

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

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

  nativeBuildInputs = [
--- a/pkgs/by-name/gn/gnumeric/package.nix
+++ b/pkgs/by-name/gn/gnumeric/package.nix
@@ -22,13 +22,13 @@
 let
  inherit (python3Packages) python pygobject3;
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "gnumeric";
-  version = "1.12.57";
+  version = "1.12.59";

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

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

  passthru = {
    updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "gnumeric";
      versionPolicy = "odd-unstable";
    };
  };
@@ -82,4 +82,4 @@ stdenv.mkDerivation rec {
    platforms = platforms.unix;
    maintainers = [ maintainers.vcunat ];
  };
-}
+})
--- a/pkgs/by-name/go/gocatcli/package.nix
+++ b/pkgs/by-name/go/gocatcli/package.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  stdenv,
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+buildGoModule rec {
+  pname = "gocatcli";
+  version = "1.0.6";
+
+  src = fetchFromGitHub {
+    owner = "deadc0de6";
+    repo = "gocatcli";
+    tag = "v${version}";
+    hash = "sha256-qB7BDPDGcngPhd82V4FrsycFd7CNb6hPaHJQ+ECmo48=";
+  };
+
+  vendorHash = "sha256-gJfqnxCTKXmTH8L4qjSXzTr+LsP+jzzivfQOplRkfao=";
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd gocatcli \
+      --bash <($out/bin/gocatcli completion bash) \
+      --fish <($out/bin/gocatcli completion fish) \
+      --zsh <($out/bin/gocatcli completion zsh)
+  '';
+
+  nativeCheckInputs = [ versionCheckHook ];
+  doCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    homepage = "https://github.com/deadc0de6/gocatcli";
+    changelog = "https://github.com/deadc0de6/gocatcli/releases/tag/v${version}";
+    description = "The command line catalog tool for your offline data";
+    longDescription = ''
+      gocatcli is a catalog tool for your offline data. It indexes external
+      media in a catalog file and allows to quickly find specific files or even
+      navigate in the catalog as if it was a mounted drive
+    '';
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
+      nadir-ishiguro
+    ];
+    mainProgram = "gocatcli";
+  };
+}
--- a/pkgs/by-name/go/godot_4-mono/package.nix
+++ b/pkgs/by-name/go/godot_4-mono/package.nix
@@ -1,6 +0,0 @@
-{
-  godot_4,
-}:
-godot_4.override {
-  withMono = true;
-}
--- a/pkgs/by-name/go/goffice/package.nix
+++ b/pkgs/by-name/go/goffice/package.nix
@@ -16,11 +16,12 @@
  gnome,
  autoreconfHook,
  gtk-doc,
+  gnumeric,
 }:

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

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

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

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

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

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

    platforms = lib.platforms.unix;
  };
-}
+})
--- a/pkgs/by-name/go/goperf/package.nix
+++ b/pkgs/by-name/go/goperf/package.nix
@@ -9,15 +9,15 @@

 buildGoModule rec {
  pname = "goperf";
-  version = "0-unstable-2025-02-14";
+  version = "0-unstable-2025-03-05";

  src = fetchgit {
    url = "https://go.googlesource.com/perf";
-    rev = "c95ad7d5b636f67d322a7e4832e83103d0fdd292";
-    hash = "sha256-FKQDuXxTsJnlsggmrtcUaWAZsLmayiou9zxNU59W2rM=";
+    rev = "02a15fd477bac975be19f213ea665ad854766179";
+    hash = "sha256-8v26SVtBbUNrBhBjcLM1RKVcgXmC9CFWWOBZ5pc1RfM=";
  };

-  vendorHash = "sha256-sUtjJc5VBrzPNbK7NiDIKprUN1xzACSKQtJ4h1MRaL8=";
+  vendorHash = "sha256-3ocSlOVE1hskLqshBeseoB+Wjuu9QJhhzshQUuygcQ0=";

  passthru.updateScript = writeShellScript "update-goperf" ''
    export UPDATE_NIX_ATTR_PATH=goperf
--- a/pkgs/by-name/gr/grimblast/package.nix
+++ b/pkgs/by-name/gr/grimblast/package.nix
@@ -18,13 +18,13 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "grimblast";
-  version = "0.1-unstable-2025-02-13";
+  version = "0.1-unstable-2025-03-06";

  src = fetchFromGitHub {
    owner = "hyprwm";
    repo = "contrib";
-    rev = "59178a657b7e09ddf82b9e79681f482b6c2f378b";
-    hash = "sha256-kXdVW89VJoG+W6N1u0m8hgK2VIWUAweQVzehRZwdNSo=";
+    rev = "0e40ccfc2d6772f9b7d5e1b50c56fb5e468a18fb";
+    hash = "sha256-inSG4OUSdCHXSJZhLNcCUA1s0Ebomr5+v4x3FE/XQ3M=";
  };

  strictDeps = true;
--- a/pkgs/by-name/gt/gthumb/package.nix
+++ b/pkgs/by-name/gt/gthumb/package.nix
@@ -36,13 +36,13 @@
  webkitgtk_4_0,
 }:

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

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

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

  passthru = {
    updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "gthumb";
      versionPolicy = "odd-unstable";
    };
  };
@@ -117,4 +117,4 @@ stdenv.mkDerivation rec {
    license = licenses.gpl2Plus;
    maintainers = [ maintainers.mimame ];
  };
-}
+})
--- a/pkgs/by-name/gt/gtk4-layer-shell/package.nix
+++ b/pkgs/by-name/gt/gtk4-layer-shell/package.nix
@@ -18,7 +18,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gtk4-layer-shell";
-  version = "1.0.4";
+  version = "1.1.0";

  outputs = [
    "out"
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "wmww";
    repo = "gtk4-layer-shell";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-0Ya3NVTSO/urU8H+h6SVZBkcvdnqwr06rNWyBtwhQ8E=";
+    hash = "sha256-UGhFeaBBIfC4ToWdyoX+oUzLlqJsjF++9U7mtszE0y0=";
  };

  strictDeps = true;
--- a/pkgs/by-name/hd/hdf4/package.nix
+++ b/pkgs/by-name/hd/hdf4/package.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
      (lib.cmakeBool "HDF4_ENABLE_SZIP_SUPPORT" szipSupport)
      (lib.cmakeBool "HDF4_ENABLE_SZIP_ENCODING" szipSupport)
      (lib.cmakeBool "HDF4_BUILD_JAVA" javaSupport)
-      (lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck)
+      (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
    ]
    ++ lib.optionals javaSupport [
      (lib.cmakeFeature "JAVA_HOME" "${jdk}")
--- a/pkgs/by-name/ho/holos/package.nix
+++ b/pkgs/by-name/ho/holos/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  testers,
+  holos,
+  kubectl,
+  kustomize,
+  kubernetes-helm,
+}:
+buildGoModule rec {
+  pname = "holos";
+  version = "0.104.1";
+
+  src = fetchFromGitHub {
+    owner = "holos-run";
+    repo = "holos";
+    rev = "v${version}";
+    hash = "sha256-4LCNKPf+b7O9DHCmOzaI8clCbmikyAAG+6C3I0aQdMg=";
+  };
+
+  vendorHash = "sha256-FR3H2NS4sEYjGmzIyaUglby98AgDAgbIzl9de8h/cj8=";
+
+  ldflags = [
+    "-w"
+    "-X github.com/holos-run/holos/version.GitDescribe=v${version}"
+    "-X github.com/holos-run/holos/version.GitCommit=${src.rev}"
+    "-X github.com/holos-run/holos/version.GitTreeState=clean"
+    # fix time for deterministic builds
+    "-X github.com/holos-run/holos/version.BuildDate=1970-01-01T00:00:00Z"
+  ];
+
+  subPackages = [ "cmd/holos" ];
+
+  nativeCheckInputs = [
+    kubernetes-helm
+    kubectl
+    kustomize
+  ];
+
+  passthru.tests.version = testers.testVersion {
+    package = holos;
+    command = "holos --version || true";
+    version = "${version}";
+  };
+
+  meta = with lib; {
+    description = "Holos CLI tool";
+    homepage = "https://github.com/holos-run/holos";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ cameronraysmith ];
+    mainProgram = "holos";
+  };
+}
--- a/pkgs/by-name/hr/hr/package.nix
+++ b/pkgs/by-name/hr/hr/package.nix
@@ -6,13 +6,13 @@

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

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

  dontBuild = true;
--- a/pkgs/by-name/hy/hydralauncher/package.nix
+++ b/pkgs/by-name/hy/hydralauncher/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  fetchurl,
+  appimageTools,
+  nix-update-script,
+}:
+let
+  pname = "hydralauncher";
+  version = "3.2.3";
+  src = fetchurl {
+    url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage";
+    hash = "sha256-iQL/xEyVgNfAeiz41sos8nbrGRxzQWR618EikPLS/Ig=";
+  };
+
+  appimageContents = appimageTools.extractType2 { inherit pname src version; };
+in
+appimageTools.wrapType2 {
+  inherit pname src version;
+
+  extraInstallCommands = ''
+    install -Dm644 ${appimageContents}/usr/share/icons/hicolor/512x512/apps/hydralauncher.png \
+      $out/share/icons/hicolor/512x512/apps/hydralauncher.png
+
+    install -Dm644 ${appimageContents}/hydralauncher.desktop \
+      $out/share/applications/hydralauncher.desktop
+    substituteInPlace $out/share/applications/hydralauncher.desktop \
+      --replace-fail 'Exec=AppRun' 'Exec=${placeholder "out"}/bin/hydralauncher'
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Game launcher with its own embedded bittorrent client";
+    homepage = "https://github.com/hydralauncher/hydra";
+    changelog = "https://github.com/hydralauncher/hydra/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ HeitorAugustoLN ];
+    mainProgram = "hydralauncher";
+    platforms = lib.platforms.linux;
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+  };
+}
--- a/pkgs/by-name/hy/hyperscan/package.nix
+++ b/pkgs/by-name/hy/hyperscan/package.nix
@@ -58,6 +58,12 @@ stdenv.mkDerivation (finalAttrs: {
    substituteInPlace libhs.pc.in \
      --replace-fail "libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@" "libdir=@CMAKE_INSTALL_LIBDIR@" \
      --replace-fail "includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@"
+
+    substituteInPlace cmake/pcre.cmake --replace-fail 'CHECK_C_SOURCE_COMPILES("#include <pcre.h.generic>
+        #if PCRE_MAJOR != ''${PCRE_REQUIRED_MAJOR_VERSION} || PCRE_MINOR < ''${PCRE_REQUIRED_MINOR_VERSION}
+        #error Incorrect pcre version
+        #endif
+        main() {}" CORRECT_PCRE_VERSION)' 'set(CORRECT_PCRE_VERSION TRUE)'
  '';

  doCheck = true;
--- a/pkgs/by-name/im/imgpkg/package.nix
+++ b/pkgs/by-name/im/imgpkg/package.nix
@@ -6,13 +6,13 @@

 buildGoModule rec {
  pname = "imgpkg";
-  version = "0.44.0";
+  version = "0.44.2";

  src = fetchFromGitHub {
    owner = "carvel-dev";
    repo = "imgpkg";
    rev = "v${version}";
-    hash = "sha256-M8OUeB2aigwlvGznByVEsDZnSQb0ggqQA73lXFwbY2c=";
+    hash = "sha256-UZhmuSUqm8EPCSc0CONgpISINgMJh3uNUx0v52eQNIc=";
  };

  vendorHash = null;
--- a/pkgs/by-name/in/intel-compute-runtime-legacy1/package.nix
+++ b/pkgs/by-name/in/intel-compute-runtime-legacy1/package.nix
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
  };

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

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

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

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

  meta = {
    description = "Interactive HTML BOM generation for KiCad, EasyEDA, Eagle, Fusion360 and Allegro PCB designer";
--- a/pkgs/by-name/iw/iwe/package.nix
+++ b/pkgs/by-name/iw/iwe/package.nix
@@ -5,19 +5,19 @@
  versionCheckHook,
  nix-update-script,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
  pname = "iwe";
-  version = "0.0.17";
+  version = "0.0.27";

  src = fetchFromGitHub {
    owner = "iwe-org";
    repo = "iwe";
-    tag = "iwe-v${version}";
-    hash = "sha256-eE84KzYJTJ39UDQt3VZpSIba/P+7VFR9K6+MSMlg0Wc=";
+    tag = "iwe-v${finalAttrs.version}";
+    hash = "sha256-4qKZnJa7rBMReWJO7iutp9SOKKL5BrxbZQySdogD03s=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-K8RxVYHh0pStQyHMiLLeUakAoK1IMoUtCNg70/NfDiI=";
+  cargoHash = "sha256-pakgzQ268WNjIM0ykKm9s3x0uCj4Z+H3/c9+2hWjx10=";

  cargoBuildFlags = [
    "--package=iwe"
@@ -28,13 +28,21 @@ rustPlatform.buildRustPackage rec {
  versionCheckProgramArg = "--version";
  doInstallCheck = true;

-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "^iwe-v(.*)$"
+    ];
+  };

  meta = {
    description = "Personal knowledge management system (editor plugin & command line utility)";
    homepage = "https://iwe.md/";
    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ phrmendes ];
+    maintainers = with lib.maintainers; [
+      phrmendes
+      HeitorAugustoLN
+    ];
    mainProgram = "iwe";
  };
-}
+})
--- a/pkgs/by-name/jo/jotta-cli/package.nix
+++ b/pkgs/by-name/jo/jotta-cli/package.nix
@@ -3,40 +3,45 @@
  stdenv,
  fetchzip,
  nixosTests,
+  installShellFiles,
 }:

-let
-  arch = "amd64";
-in
 stdenv.mkDerivation rec {
  pname = "jotta-cli";
-  version = "0.15.107955";
+  version = "0.16.129390";
+
  src = fetchzip {
-    url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz";
-    sha256 = "sha256-qCG3yi0ACmqOnn+gaCN8GedciUobpOww50Kz5AdknqU=";
+    url = "https://repo.jotta.us/archives/linux/amd64/jotta-cli-${version}_linux_amd64.tar.gz";
+    hash = "sha256-iw8OZ6clpK+CnBFNK5jOSGQ3ReU4pnOQSJFE2LTJNxE=";
    stripRoot = false;
  };

-  installPhase = ''
-    install -D usr/bin/jotta-cli usr/bin/jottad -t $out/bin/
-    mkdir -p $out/share/bash-completion/completions
-  '';
+  nativeBuildInputs = [ installShellFiles ];

-  postFixup = ''
-    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/jotta-cli
-    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/jottad
-    $out/bin/jotta-cli completion bash > $out/share/bash-completion/completions/jotta-cli.bash
-  '';
+  installPhase =
+    ''
+      runHook preInstall
+
+      install -Dm0755 usr/bin/jotta-cli usr/bin/jottad -t $out/bin/
+
+      runHook postInstall
+    ''
+    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+      installShellCompletion --cmd jotta-cli \
+        --bash <($out/bin/jotta-cli completion bash) \
+        --fish <($out/bin/jotta-cli completion fish) \
+        --zsh <($out/bin/jotta-cli completion zsh)
+    '';

  passthru.tests = { inherit (nixosTests) jotta-cli; };

-  meta = with lib; {
+  meta = {
    description = "Jottacloud CLI";
    homepage = "https://www.jottacloud.com/";
    downloadPage = "https://repo.jotta.us/archives/linux/";
-    maintainers = with maintainers; [ evenbrenden ];
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
+    maintainers = with lib.maintainers; [ evenbrenden ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.unfree;
    platforms = [ "x86_64-linux" ];
  };
 }
--- a/pkgs/by-name/li/lib2geom/package.nix
+++ b/pkgs/by-name/li/lib2geom/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
  cmakeFlags = [
    "-D2GEOM_BUILD_SHARED=ON"
    # For cross compilation.
-    (lib.cmakeBool "2GEOM_TESTING" finalAttrs.doCheck)
+    (lib.cmakeBool "2GEOM_TESTING" finalAttrs.finalPackage.doCheck)
  ];

  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
--- a/Show More
+++ b/Show More