Merge staging-next into staging

2025-06-10 19:55:41 +03:00 · 2024-11-25 01:59:29 +00:00 · 2024-11-25 01:59:29 +00:00 · 382ef6cd88
commit 382ef6cd88
parent 38eefea476 28739cf8f8
196 changed files with 3394 additions and 10392 deletions
--- a/ci/OWNERS
+++ b/ci/OWNERS
@ -218,6 +218,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /doc/languages-frameworks/java.section.md @NixOS/java
 /doc/languages-frameworks/gradle.section.md @NixOS/java
 /doc/languages-frameworks/maven.section.md @NixOS/java
+/nixos/modules/programs/java.nix @NixOS/java
 /pkgs/top-level/java-packages.nix @NixOS/java

 # Jetbrains
--- a/doc/build-helpers/trivial-build-helpers.chapter.md
+++ b/doc/build-helpers/trivial-build-helpers.chapter.md
@ -754,10 +754,6 @@ This creates a derivation with a directory structure like the following:
 ...
 ```

-## `writeReferencesToFile` {#trivial-builder-writeReferencesToFile}
-
-Deprecated. Use [`writeClosure`](#trivial-builder-writeClosure) instead.
-
 ## `writeClosure` {#trivial-builder-writeClosure}

 Given a list of [store paths](https://nixos.org/manual/nix/stable/glossary#gloss-store-path) (or string-like expressions coercible to store paths), write their collective [closure](https://nixos.org/manual/nix/stable/glossary#gloss-closure) to a text file.
--- a/doc/redirects.json
+++ b/doc/redirects.json
@ -1421,11 +1421,9 @@
  "trivial-builder-symlinkJoin": [
    "index.html#trivial-builder-symlinkJoin"
  ],
-  "trivial-builder-writeReferencesToFile": [
-    "index.html#trivial-builder-writeReferencesToFile"
-  ],
  "trivial-builder-writeClosure": [
-    "index.html#trivial-builder-writeClosure"
+    "index.html#trivial-builder-writeClosure",
+    "index.html#trivial-builder-writeReferencesToFile"
  ],
  "trivial-builder-writeDirectReferencesToFile": [
    "index.html#trivial-builder-writeDirectReferencesToFile"
--- a/lib/default.nix
+++ b/lib/default.nix
@ -152,7 +152,7 @@ let
      scrubOptionValue literalExpression literalExample
      showOption showOptionWithDefLocs showFiles
      unknownModule mkOption mkPackageOption mkPackageOptionMD
-      mdDoc literalMD;
+      literalMD;
    inherit (self.types) isType setType defaultTypeMerge defaultFunctor
      isOptionType mkOptionType;
    inherit (self.asserts)
--- a/lib/options.nix
+++ b/lib/options.nix
@ -399,13 +399,6 @@ rec {

  literalExample = lib.warn "lib.literalExample is deprecated, use lib.literalExpression instead, or use lib.literalMD for a non-Nix description." literalExpression;

-  /* Transition marker for documentation that's already migrated to markdown
-     syntax. Has been a no-op for some while and been removed from nixpkgs.
-     Kept here to alert downstream users who may not be aware of the migration's
-     completion that it should be removed from modules.
-  */
-  mdDoc = lib.warn "lib.mdDoc will be removed from nixpkgs in 24.11. Option descriptions are now in Markdown by default; you can remove any remaining uses of lib.mdDoc.";
-
  /* For use in the `defaultText` and `example` option attributes. Causes the
     given MD text to be inserted verbatim in the documentation, for when
     a `literalExpression` would be too hard to read.
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -4987,8 +4987,7 @@
    githubId = 28595242;
    name = "DataHearth";
    keys = [
-      { fingerprint = "A129 2547 0298 BFEE 7EE0 92B3 946E 2D0C 410C 7B3D"; }
-      { fingerprint = "FFC4 92C1 5320 B05D 0F8D 7D58 ABF6 737C 6339 6D35"; }
+      { fingerprint = "E8F9 0B80 908E 723D 0EDF  0916 5803 CDA5 9C26 A96A"; }
    ];
  };
  davegallant = {
@ -11433,6 +11432,12 @@
    githubId = 15373888;
    name = "Claudius Holeksa";
  };
+  keller00 = {
+    name = "Mark Keller";
+    email = "markooo.keller@gmail.com";
+    github = "keller00";
+    githubId = 8452750;
+  };
  kennyballou = {
    email = "kb@devnulllabs.io";
    github = "kennyballou";
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@ -767,6 +767,8 @@
  rather than dotnet 6. For packages that still need dotnet 6, use
  `dotnet-sdk_6`, etc.

+- torq has been removed because upstreamed went closed source.
+
 ## Other Notable Changes {#sec-release-24.11-notable-changes}

 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
@ -867,6 +869,8 @@

 - The `shadowstack` hardening flag has been added, though disabled by default.

+- `writeReferencesToFile` has been removed after its deprecation in 24.05. Use the trivial build helper `writeClosure` instead.
+
 - `xxd` is now provided by the `tinyxxd` package rather than `vim.xxd` to reduce closure size and vulnerability impact. Since it has the same options and semantics as Vim's `xxd` utility, there is no user impact. Vim's `xxd` remains available as the `vim.xxd` package.

 - `restic` module now has an option for inhibiting system sleep while backups are running, defaulting to off (not inhibiting sleep). Available as [`services.restic.backups.<name>.inhibitsSleep`](#opt-services.restic.backups._name_.inhibitsSleep).
--- a/nixos/lib/make-options-doc/default.nix
+++ b/nixos/lib/make-options-doc/default.nix
@ -39,10 +39,6 @@
  }
  ```

-  ## optionsDocBook
-
-  deprecated since 23.11 and will be removed in 24.05.
-
  ## optionsAsciiDoc

  Documentation rendered as AsciiDoc. This is useful for e.g. man pages.
@ -111,18 +107,8 @@
 # instead of printing warnings for eg options with missing descriptions (which may be lost
 # by nix build unless -L is given), emit errors instead and fail the build
 , warningsAreErrors ? true
-# allow docbook option docs if `true`. only markdown documentation is allowed when set to
-# `false`, and a different renderer may be used with different bugs and performance
-# characteristics but (hopefully) indistinguishable output.
-# deprecated since 23.11.
-# TODO remove in a while.
-, allowDocBook ? false
-# TODO remove in a while (see https://github.com/NixOS/nixpkgs/issues/300735)
-, markdownByDefault ? true
 }:

-assert markdownByDefault && ! allowDocBook;
-
 let
  rawOpts = lib.optionAttrSetToDocList options;
  transformedOpts = map transformOptions rawOpts;
@ -229,6 +215,4 @@ in rec {
      echo "file json $dst/options.json" >> $out/nix-support/hydra-build-products
      echo "file json-br $dst/options.json.br" >> $out/nix-support/hydra-build-products
    '';
-
-  optionsDocBook = throw "optionsDocBook has been removed in 24.05";
 }
--- a/nixos/modules/programs/java.nix
+++ b/nixos/modules/programs/java.nix
@ -1,7 +1,12 @@
 # This module provides JAVA_HOME, with a different way to install java
 # system-wide.

-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:

 let
  cfg = config.programs.java;
@ -28,9 +33,7 @@ in
        '';
      };

-      package = lib.mkPackageOption pkgs "jdk" {
-        example = "jre";
-      };
+      package = lib.mkPackageOption pkgs "jdk" { example = "jre"; };

      binfmt = lib.mkEnableOption "binfmt to execute java jar's and classes";

--- a/nixos/modules/programs/screen.nix
+++ b/nixos/modules/programs/screen.nix
@ -24,15 +24,6 @@ in
  };

  config = lib.mkMerge [
-    {
-      # TODO: Added in 24.05, remove before 24.11
-      assertions = [
-        {
-          assertion = cfg.screenrc != "" -> cfg.enable;
-          message = "`programs.screen.screenrc` has been configured, but `programs.screen.enable` is not true";
-        }
-      ];
-    }
    (lib.mkIf cfg.enable {
      environment.etc.screenrc = {
        text = cfg.screenrc;
--- a/nixos/modules/services/audio/mopidy.nix
+++ b/nixos/modules/services/audio/mopidy.nix
@ -1,24 +1,20 @@
 { config, lib, pkgs, ... }:
-
-with pkgs;
-with lib;
-
 let
  uid = config.ids.uids.mopidy;
  gid = config.ids.gids.mopidy;
  cfg = config.services.mopidy;

-  mopidyConf = writeText "mopidy.conf" cfg.configuration;
+  mopidyConf = pkgs.writeText "mopidy.conf" cfg.configuration;

-  mopidyEnv = buildEnv {
-    name = "mopidy-with-extensions-${mopidy.version}";
+  mopidyEnv = pkgs.buildEnv {
+    name = "mopidy-with-extensions-${pkgs.mopidy.version}";
    ignoreCollisions = true;
-    paths = closePropagation cfg.extensionPackages;
-    pathsToLink = [ "/${mopidyPackages.python.sitePackages}" ];
-    nativeBuildInputs = [ makeWrapper ];
+    paths = lib.closePropagation cfg.extensionPackages;
+    pathsToLink = [ "/${pkgs.mopidyPackages.python.sitePackages}" ];
+    nativeBuildInputs = [ pkgs.makeWrapper ];
    postBuild = ''
-      makeWrapper ${mopidy}/bin/mopidy $out/bin/mopidy \
-        --prefix PYTHONPATH : $out/${mopidyPackages.python.sitePackages}
+      makeWrapper ${lib.getExe pkgs.mopidy} $out/bin/mopidy \
+        --prefix PYTHONPATH : $out/${pkgs.mopidyPackages.python.sitePackages}
    '';
  };
 in {
@ -27,49 +23,47 @@ in {

    services.mopidy = {

-      enable = mkEnableOption "Mopidy, a music player daemon";
+      enable = lib.mkEnableOption "Mopidy, a music player daemon";

-      dataDir = mkOption {
+      dataDir = lib.mkOption {
        default = "/var/lib/mopidy";
-        type = types.str;
+        type = lib.types.str;
        description = ''
          The directory where Mopidy stores its state.
        '';
      };

-      extensionPackages = mkOption {
+      extensionPackages = lib.mkOption {
        default = [];
-        type = types.listOf types.package;
-        example = literalExpression "[ pkgs.mopidy-spotify ]";
+        type = lib.types.listOf lib.types.package;
+        example = lib.literalExpression "[ pkgs.mopidy-spotify ]";
        description = ''
          Mopidy extensions that should be loaded by the service.
        '';
      };

-      configuration = mkOption {
+      configuration = lib.mkOption {
        default = "";
-        type = types.lines;
+        type = lib.types.lines;
        description = ''
          The configuration that Mopidy should use.
        '';
      };

-      extraConfigFiles = mkOption {
+      extraConfigFiles = lib.mkOption {
        default = [];
-        type = types.listOf types.str;
+        type = lib.types.listOf lib.types.str;
        description = ''
          Extra config file read by Mopidy when the service starts.
          Later files in the list overrides earlier configuration.
        '';
      };
-
    };
-
  };

  ###### implementation

-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {

    systemd.tmpfiles.settings."10-mopidy".${cfg.dataDir}.d = {
      user = "mopidy";
@ -82,7 +76,7 @@ in {
      wants = [ "network-online.target" ];
      description = "mopidy music player daemon";
      serviceConfig = {
-        ExecStart = "${mopidyEnv}/bin/mopidy --config ${concatStringsSep ":" ([mopidyConf] ++ cfg.extraConfigFiles)}";
+        ExecStart = "${mopidyEnv}/bin/mopidy --config ${lib.concatStringsSep ":" ([mopidyConf] ++ cfg.extraConfigFiles)}";
        User = "mopidy";
      };
    };
@ -90,7 +84,7 @@ in {
    systemd.services.mopidy-scan = {
      description = "mopidy local files scanner";
      serviceConfig = {
-        ExecStart = "${mopidyEnv}/bin/mopidy --config ${concatStringsSep ":" ([mopidyConf] ++ cfg.extraConfigFiles)} local scan";
+        ExecStart = "${mopidyEnv}/bin/mopidy --config ${lib.concatStringsSep ":" ([mopidyConf] ++ cfg.extraConfigFiles)} local scan";
        User = "mopidy";
        Type = "oneshot";
      };
@ -105,7 +99,5 @@ in {
    };

    users.groups.mopidy.gid = gid;
-
  };
-
 }
--- a/nixos/modules/services/databases/victoriametrics.nix
+++ b/nixos/modules/services/databases/victoriametrics.nix
@ -31,7 +31,15 @@ let
 in
 {
  options.services.victoriametrics = {
-    enable = mkEnableOption "VictoriaMetrics is a fast, cost-effective and scalable monitoring solution and time series database.";
+    enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Whether to enable VictoriaMetrics in single-node mode.
+
+        VictoriaMetrics is a fast, cost-effective and scalable monitoring solution and time series database.
+      '';
+    };
    package = mkPackageOption pkgs "victoriametrics" { };

    listenAddress = mkOption {
--- a/nixos/modules/services/desktops/pipewire/pipewire.nix
+++ b/nixos/modules/services/desktops/pipewire/pipewire.nix
@ -344,7 +344,7 @@ in {
                )
                config.environment.etc
            )) == 1;
-        message = "Using `environment.etc.\"pipewire<...>\"` directly is no longer supported in 24.05. Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` instead.";
+        message = "Using `environment.etc.\"pipewire<...>\"` directly is no longer supported. Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` instead.";
      }
    ];

--- a/nixos/modules/services/games/archisteamfarm.nix
+++ b/nixos/modules/services/games/archisteamfarm.nix
@ -164,9 +164,6 @@ in
  };

  config = lib.mkIf cfg.enable {
-    # TODO: drop with 24.11
-    services.archisteamfarm.dataDir = lib.mkIf (lib.versionAtLeast config.system.stateVersion "24.05") (lib.mkDefault "/var/lib/asf");
-
    users = {
      users.archisteamfarm = {
        home = cfg.dataDir;
--- a/nixos/modules/services/hardware/monado.nix
+++ b/nixos/modules/services/hardware/monado.nix
@ -16,6 +16,7 @@ let

  cfg = config.services.monado;

+  runtimeManifest = "${cfg.package}/share/openxr/1/openxr_monado.json";
 in
 {
  options.services.monado = {
@ -35,6 +36,19 @@ in
      example = true;
    };

+    forceDefaultRuntime = mkOption {
+      type = types.bool;
+      description = ''
+        Whether to ensure that Monado is the active runtime set for the current
+        user.
+
+        This replaces the file `XDG_CONFIG_HOME/openxr/1/active_runtime.json`
+        when starting the service.
+      '';
+      default = false;
+      example = true;
+    };
+
    highPriority =
      mkEnableOption "high priority capability for monado-service"
      // mkOption { default = true; };
@ -68,6 +82,16 @@ in
          IPC_EXIT_ON_DISCONNECT = mkDefault "off";
        };

+        preStart = mkIf cfg.forceDefaultRuntime ''
+          XDG_CONFIG_HOME="''${XDG_CONFIG_HOME:-$HOME/.config}"
+          targetDir="$XDG_CONFIG_HOME/openxr/1"
+          activeRuntimePath="$targetDir/active_runtime.json"
+
+          echo "Note: Replacing active runtime at '$activeRuntimePath'"
+          mkdir --parents "$targetDir"
+          ln --symbolic --force ${runtimeManifest} "$activeRuntimePath"
+        '';
+
        serviceConfig = {
          ExecStart =
            if cfg.highPriority then
@ -106,7 +130,7 @@ in
    hardware.graphics.extraPackages = [ pkgs.monado-vulkan-layers ];

    environment.etc."xdg/openxr/1/active_runtime.json" = mkIf cfg.defaultRuntime {
-      source = "${cfg.package}/share/openxr/1/openxr_monado.json";
+      source = runtimeManifest;
    };
  };

--- a/nixos/modules/services/home-automation/zigbee2mqtt.nix
+++ b/nixos/modules/services/home-automation/zigbee2mqtt.nix
@ -10,8 +10,7 @@ in
  meta.maintainers = with lib.maintainers; [ sweber hexa ];

  imports = [
-    # Remove warning before the 21.11 release
-    (lib.mkRenamedOptionModule [ "services" "zigbee2mqtt" "config" ] [ "services" "zigbee2mqtt" "settings" ])
+    (lib.mkRemovedOptionModule [ "services" "zigbee2mqtt" "config" ] "The option services.zigbee2mqtt.config was renamed to services.zigbee2mqtt.settings.")
  ];

  options.services.zigbee2mqtt = {
--- a/nixos/modules/services/misc/redlib.nix
+++ b/nixos/modules/services/misc/redlib.nix
@ -1,18 +1,44 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:

 let
+  inherit (lib)
+    concatStringsSep
+    isBool
+    mapAttrs
+    mkEnableOption
+    mkIf
+    mkOption
+    mkPackageOption
+    mkRenamedOptionModule
+    types
+    ;
+
  cfg = config.services.redlib;

  args = concatStringsSep " " ([
    "--port ${toString cfg.port}"
    "--address ${cfg.address}"
  ]);
+
+  boolToString' = b: if b then "on" else "off";
 in
 {
  imports = [
-    (mkRenamedOptionModule [ "services" "libreddit" ] [ "services" "redlib" ])
+    (mkRenamedOptionModule
+      [
+        "services"
+        "libreddit"
+      ]
+      [
+        "services"
+        "redlib"
+      ]
+    )
  ];

  options = {
@ -24,7 +50,7 @@ in
      address = mkOption {
        default = "0.0.0.0";
        example = "127.0.0.1";
-        type =  types.str;
+        type = types.str;
        description = "The address to listen on";
      };

@ -41,50 +67,60 @@ in
        description = "Open ports in the firewall for the redlib web interface";
      };

+      settings = lib.mkOption {
+        type = lib.types.submodule {
+          freeformType =
+            with types;
+            attrsOf (
+              nullOr (oneOf [
+                bool
+                int
+                str
+              ])
+            );
+          options = { };
+        };
+        default = { };
+        description = ''
+          See [GitHub](https://github.com/redlib-org/redlib/tree/main?tab=readme-ov-file#configuration) for available settings.
+        '';
+      };
    };
  };

  config = mkIf cfg.enable {
+    systemd.packages = [ cfg.package ];
    systemd.services.redlib = {
-        description = "Private front-end for Reddit";
-        wantedBy = [ "multi-user.target" ];
-        after = [ "network.target" ];
-        serviceConfig = {
-          DynamicUser = true;
-          ExecStart = "${lib.getExe cfg.package} ${args}";
-          AmbientCapabilities = lib.mkIf (cfg.port < 1024) [ "CAP_NET_BIND_SERVICE" ];
-          Restart = "on-failure";
-          RestartSec = "2s";
-          # Hardening
-          CapabilityBoundingSet = if (cfg.port < 1024) then [ "CAP_NET_BIND_SERVICE" ] else [ "" ];
-          DeviceAllow = [ "" ];
-          LockPersonality = true;
-          MemoryDenyWriteExecute = true;
-          PrivateDevices = true;
-          # A private user cannot have process capabilities on the host's user
-          # namespace and thus CAP_NET_BIND_SERVICE has no effect.
-          PrivateUsers = (cfg.port >= 1024);
-          ProcSubset = "pid";
-          ProtectClock = true;
-          ProtectControlGroups = true;
-          ProtectHome = true;
-          ProtectHostname = true;
-          ProtectKernelLogs = true;
-          ProtectKernelModules = true;
-          ProtectKernelTunables = true;
-          ProtectProc = "invisible";
-          RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
-          RestrictNamespaces = true;
-          RestrictRealtime = true;
-          RestrictSUIDSGID = true;
-          SystemCallArchitectures = "native";
-          SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ];
-          UMask = "0077";
-        };
+      wantedBy = [ "default.target" ];
+      environment = mapAttrs (_: v: if isBool v then boolToString' v else toString v) cfg.settings;
+      serviceConfig =
+        {
+          ExecStart = [
+            ""
+            "${lib.getExe cfg.package} ${args}"
+          ];
+        }
+        // (
+          if (cfg.port < 1024) then
+            {
+              AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
+              CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
+            }
+          else
+            {
+              # A private user cannot have process capabilities on the host's user
+              # namespace and thus CAP_NET_BIND_SERVICE has no effect.
+              PrivateUsers = true;
+            }
+        );
    };

    networking.firewall = mkIf cfg.openFirewall {
      allowedTCPPorts = [ cfg.port ];
    };
  };
+
+  meta = {
+    maintainers = with lib.maintainers; [ Guanran928 ];
+  };
 }
--- a/nixos/modules/services/monitoring/vmagent.nix
+++ b/nixos/modules/services/monitoring/vmagent.nix
@ -2,7 +2,32 @@

 let
  cfg = config.services.vmagent;
-  settingsFormat = pkgs.formats.json { };
+  settingsFormat = pkgs.formats.yaml {};
+
+  startCLIList =
+    [
+      "${cfg.package}/bin/vmagent"
+    ]
+    ++ lib.optionals (cfg.remoteWrite.url != null) [
+      "-remoteWrite.url=${cfg.remoteWrite.url}"
+      "-remoteWrite.tmpDataPath=%C/vmagent/remote_write_tmp"
+    ]
+    ++ lib.optional (
+      cfg.remoteWrite.basicAuthUsername != null
+    ) "-remoteWrite.basicAuth.username=${cfg.remoteWrite.basicAuthUsername}"
+    ++ lib.optional (
+      cfg.remoteWrite.basicAuthPasswordFile != null
+    ) "-remoteWrite.basicAuth.passwordFile=\${CREDENTIALS_DIRECTORY}/remote_write_basic_auth_password"
+    ++ cfg.extraArgs;
+  prometheusConfigYml = checkedConfig (
+    settingsFormat.generate "prometheusConfig.yaml" cfg.prometheusConfig
+  );
+
+  checkedConfig = file:
+    pkgs.runCommand "checked-config" {nativeBuildInputs = [cfg.package];} ''
+      ln -s ${file} $out
+      ${lib.escapeShellArgs startCLIList} -promscrape.config=${file} -dryRun
+    '';
 in {
  imports = [
    (lib.mkRemovedOptionModule [ "services" "vmagent" "dataDir" ] "dataDir has been deprecated in favor of systemd provided CacheDirectory")
@ -12,7 +37,15 @@ in {
  ];

  options.services.vmagent = {
-    enable = lib.mkEnableOption "vmagent";
+    enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Whether to enable VictoriaMetrics's `vmagent`.
+
+        `vmagent` efficiently scrape metrics from Prometheus-compatible exporters
+      '';
+    };

    package = lib.mkPackageOption pkgs "vmagent" { };

@ -69,18 +102,7 @@ in {
  config = lib.mkIf cfg.enable {
    networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ 8429 ];

-    systemd.services.vmagent = let
-      prometheusConfig = settingsFormat.generate "prometheusConfig.yaml" cfg.prometheusConfig;
-      startCommandLine = lib.concatStringsSep " " ([
-        "${cfg.package}/bin/vmagent"
-        "-promscrape.config=${prometheusConfig}"
-      ] ++ cfg.extraArgs
-        ++ lib.optionals (cfg.remoteWrite.url != null) [
-        "-remoteWrite.url=${cfg.remoteWrite.url}"
-        "-remoteWrite.tmpDataPath=%C/vmagent/remote_write_tmp"
-      ] ++ lib.optional (cfg.remoteWrite.basicAuthUsername != null) "-remoteWrite.basicAuth.username=${cfg.remoteWrite.basicAuthUsername}"
-        ++ lib.optional (cfg.remoteWrite.basicAuthPasswordFile != null) "-remoteWrite.basicAuth.passwordFile=\${CREDENTIALS_DIRECTORY}/remote_write_basic_auth_password");
-    in {
+    systemd.services.vmagent = {
      wantedBy = [ "multi-user.target" ];
      after = [ "network.target" ];
      description = "vmagent system service";
@ -91,7 +113,10 @@ in {
        Type = "simple";
        Restart = "on-failure";
        CacheDirectory = "vmagent";
-        ExecStart = startCommandLine;
+        ExecStart = lib.escapeShellArgs (
+          startCLIList
+          ++ lib.optionals (cfg.prometheusConfig != null) ["-promscrape.config=${prometheusConfigYml}"]
+        );
        LoadCredential = lib.optional (cfg.remoteWrite.basicAuthPasswordFile != null) [
          "remote_write_basic_auth_password:${cfg.remoteWrite.basicAuthPasswordFile}"
        ];
--- a/nixos/modules/services/monitoring/vmalert.nix
+++ b/nixos/modules/services/monitoring/vmalert.nix
@ -20,7 +20,15 @@ in
 {
  # interface
  options.services.vmalert = {
-    enable = mkEnableOption "vmalert";
+    enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Wether to enable VictoriaMetrics's `vmalert`.
+
+        `vmalert` evaluates alerting and recording rules against a data source, sends notifications via Alertmanager.
+      '';
+    };

    package = mkPackageOption pkgs "victoriametrics" { };

--- a/nixos/modules/services/security/haka.nix
+++ b/nixos/modules/services/security/haka.nix
@ -124,7 +124,7 @@ in
      { assertion = cfg.pcap != cfg.nfqueue;
        message = "either pcap or nfqueue can be enabled, not both.";
      }
-      { assertion = cfg.nfqueue -> !dump.enable;
+      { assertion = cfg.nfqueue -> !cfg.dump.enable;
        message = "dump can only be used with nfqueue.";
      }
      { assertion = cfg.interfaces != [];
--- a/nixos/modules/services/web-servers/garage.nix
+++ b/nixos/modules/services/web-servers/garage.nix
@ -93,46 +93,6 @@ in
  };

  config = mkIf cfg.enable {
-
-    assertions = [
-      # We removed our module-level default for replication_mode. If a user upgraded
-      # to garage 1.0.0 while relying on the module-level default, they would be left
-      # with a config which evaluates and builds, but then garage refuses to start
-      # because either replication_factor or replication_mode is required.
-      # The replication_factor option also was `toString`'ed before, which is
-      # now not possible anymore, so we prompt the user to change it to a string
-      # if present.
-      # These assertions can be removed in NixOS 24.11, when all users have been
-      # warned once.
-      {
-        assertion =
-          (cfg.settings ? replication_factor || cfg.settings ? replication_mode)
-          || lib.versionOlder cfg.package.version "1.0.0";
-        message = ''
-          Garage 1.0.0 requires an explicit replication factor to be set.
-          Please set replication_factor to 1 explicitly to preserve the previous behavior.
-          https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v1.0.0/doc/book/reference-manual/configuration.md#replication_factor
-
-        '';
-      }
-      {
-        assertion = lib.isString (cfg.settings.replication_mode or "");
-        message = ''
-          The explicit `replication_mode` option in `services.garage.settings`
-          has been removed and is now handled by the freeform settings in order
-          to allow it being completely absent (for Garage 1.x).
-          That module option previously `toString`'ed the value it's configured
-          with, which is now no longer possible.
-
-          You're still using a non-string here, please manually set it to
-          a string, or migrate to the separate setting keys introduced in 1.x.
-
-          Refer to https://garagehq.deuxfleurs.fr/documentation/working-documents/migration-1/
-          for the migration guide.
-        '';
-      }
-    ];
-
    environment.etc."garage.toml" = {
      source = configFile;
    };
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@ -619,6 +619,7 @@ in {
  mongodb = handleTest ./mongodb.nix {};
  moodle = handleTest ./moodle.nix {};
  moonraker = handleTest ./moonraker.nix {};
+  mopidy = handleTest ./mopidy.nix {};
  morph-browser = handleTest ./morph-browser.nix { };
  morty = handleTest ./morty.nix {};
  mosquitto = handleTest ./mosquitto.nix {};
@ -1106,7 +1107,7 @@ in {
  vaultwarden = discoverTests (import ./vaultwarden.nix);
  vector = handleTest ./vector {};
  vengi-tools = handleTest ./vengi-tools.nix {};
-  victoriametrics = handleTest ./victoriametrics.nix {};
+  victoriametrics = handleTest ./victoriametrics {};
  vikunja = handleTest ./vikunja.nix {};
  virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {};
  vscode-remote-ssh = handleTestOn ["x86_64-linux"] ./vscode-remote-ssh.nix {};
--- a/nixos/tests/monado.nix
+++ b/nixos/tests/monado.nix
@ -1,39 +1,51 @@
-import ./make-test-python.nix ({ pkgs, ... }: {
-  name = "monado";
+import ./make-test-python.nix (
+  { ... }:
+  {
+    name = "monado";

-  nodes.machine =
-    { pkgs, ... }:
+    nodes.machine =
+      { pkgs, ... }:

-    {
-      hardware.graphics.enable = true;
-      users.users.alice = {
-        isNormalUser = true;
-        uid = 1000;
+      {
+        hardware.graphics.enable = true;
+        users.users.alice = {
+          isNormalUser = true;
+          uid = 1000;
+        };
+
+        services.monado = {
+          enable = true;
+          defaultRuntime = true;
+
+          forceDefaultRuntime = true;
+        };
+        # Stop Monado from probing for any hardware
+        systemd.user.services.monado.environment.SIMULATED_ENABLE = "1";
+
+        environment.systemPackages = with pkgs; [ openxr-loader ];
      };

-      services.monado = {
-        enable = true;
-        defaultRuntime = true;
-      };
-      # Stop Monado from probing for any hardware
-      systemd.user.services.monado.environment.SIMULATED_ENABLE = "1";
+    testScript =
+      { nodes, ... }:
+      let
+        userId = toString nodes.machine.users.users.alice.uid;
+        runtimePath = "/run/user/${userId}";
+      in
+      ''
+        # for defaultRuntime
+        machine.succeed("stat /etc/xdg/openxr/1/active_runtime.json")

-      environment.systemPackages = with pkgs; [ openxr-loader ];
-    };
+        machine.succeed("loginctl enable-linger alice")
+        machine.wait_for_unit("user@${userId}.service")

-  testScript = { nodes, ... }:
-    let
-      userId = toString nodes.machine.users.users.alice.uid;
-      runtimePath = "/run/user/${userId}";
-    in
-    ''
-      machine.succeed("loginctl enable-linger alice")
-      machine.wait_for_unit("user@${userId}.service")
+        machine.wait_for_unit("monado.socket", "alice")
+        machine.systemctl("start monado.service", "alice")
+        machine.wait_for_unit("monado.service", "alice")

-      machine.wait_for_unit("monado.socket", "alice")
-      machine.systemctl("start monado.service", "alice")
-      machine.wait_for_unit("monado.service", "alice")
+        # for forceDefaultRuntime
+        machine.succeed("stat /home/alice/.config/openxr/1/active_runtime.json")

-      machine.succeed("su -- alice -c env XDG_RUNTIME_DIR=${runtimePath} openxr_runtime_list")
-    '';
-})
+        machine.succeed("su -- alice -c env XDG_RUNTIME_DIR=${runtimePath} openxr_runtime_list")
+      '';
+  }
+)
--- a/nixos/tests/mopidy.nix
+++ b/nixos/tests/mopidy.nix
@ -0,0 +1,17 @@
+import ./make-test-python.nix (
+  { pkgs, ... }:
+  {
+    name = "mopidy";
+
+    nodes.machine =
+      { ... }:
+      {
+        services.mopidy.enable = true;
+      };
+
+    testScript = ''
+      machine.wait_for_unit("mopidy")
+      machine.wait_for_open_port(6680)
+    '';
+  }
+)
--- a/nixos/tests/redlib.nix
+++ b/nixos/tests/redlib.nix
@ -1,20 +1,31 @@
-import ./make-test-python.nix ({ lib, pkgs, ... }: {
-  name = "redlib";
-  meta.maintainers = with lib.maintainers; [ soispha ];
+import ./make-test-python.nix (
+  { lib, pkgs, ... }:
+  {
+    name = "redlib";
+    meta.maintainers = with lib.maintainers; [
+      soispha
+      Guanran928
+    ];

-  nodes.machine = {
-    services.redlib = {
-      package = pkgs.redlib;
-      enable = true;
-      # Test CAP_NET_BIND_SERVICE
-      port = 80;
+    nodes.machine = {
+      services.redlib = {
+        package = pkgs.redlib;
+        enable = true;
+        # Test CAP_NET_BIND_SERVICE
+        port = 80;
+
+        settings = {
+          REDLIB_DEFAULT_USE_HLS = true;
+        };
+      };
    };
-  };

-  testScript = ''
-    machine.wait_for_unit("redlib.service")
-    machine.wait_for_open_port(80)
-    # Query a page that does not require Internet access
-    machine.succeed("curl --fail http://localhost:80/settings")
-  '';
-})
+    testScript = ''
+      machine.wait_for_unit("redlib.service")
+      machine.wait_for_open_port(80)
+      # Query a page that does not require Internet access
+      machine.succeed("curl --fail http://localhost:80/settings")
+      machine.succeed("curl --fail http://localhost:80/info | grep '<tr><td>Use HLS</td><td>on</td></tr>'")
+    '';
+  }
+)
--- a/nixos/tests/victoriametrics.nix
+++ b/nixos/tests/victoriametrics.nix
@ -1,41 +0,0 @@
-# This test runs victoriametrics and checks if victoriametrics is able to write points and run simple query
-
-import ./make-test-python.nix (
-  { pkgs, ... }:
-  {
-    name = "victoriametrics";
-    meta = with pkgs.lib.maintainers; {
-      maintainers = [
-        yorickvp
-        ryan4yin
-      ];
-    };
-
-    nodes = {
-      one =
-        { ... }:
-        {
-          services.victoriametrics.enable = true;
-        };
-    };
-
-    testScript = ''
-      start_all()
-
-      one.wait_for_unit("victoriametrics.service")
-
-      # write some points and run simple query
-      out = one.succeed(
-          "curl -f -d 'measurement,tag1=value1,tag2=value2 field1=123,field2=1.23' -X POST 'http://localhost:8428/write'"
-      )
-      cmd = (
-          """curl -f -s -G 'http://localhost:8428/api/v1/export' -d 'match={__name__!=""}'"""
-      )
-      # data takes a while to appear
-      one.wait_until_succeeds(f"[[ $({cmd} | wc -l) -ne 0 ]]")
-      out = one.succeed(cmd)
-      assert '"values":[123]' in out
-      assert '"values":[1.23]' in out
-    '';
-  }
-)
--- a/nixos/tests/victoriametrics/default.nix
+++ b/nixos/tests/victoriametrics/default.nix
@ -0,0 +1,10 @@
+{
+  system ? builtins.currentSystem,
+  config ? { },
+  pkgs ? import ../../.. { inherit system config; },
+}:
+
+{
+  remote-write = import ./remote-write.nix { inherit system pkgs; };
+  vmalert = import ./vmalert.nix { inherit system pkgs; };
+}
--- a/nixos/tests/victoriametrics/remote-write.nix
+++ b/nixos/tests/victoriametrics/remote-write.nix
@ -0,0 +1,103 @@
+# Primarily reference the implementation of <nixos/tests/prometheus/remote-write.nix>
+import ../make-test-python.nix (
+  {
+    lib,
+    pkgs,
+    ...
+  }:
+  let
+    username = "vmtest";
+    password = "fsddfy8233rb"; # random string
+    passwordFile = pkgs.writeText "password-file" password;
+  in
+  {
+    name = "victoriametrics-remote-write";
+    meta = with pkgs.lib.maintainers; {
+      maintainers = [
+        yorickvp
+        ryan4yin
+      ];
+    };
+
+    nodes = {
+      victoriametrics =
+        {
+          config,
+          pkgs,
+          ...
+        }:
+        {
+          environment.systemPackages = [ pkgs.jq ];
+          networking.firewall.allowedTCPPorts = [ 8428 ];
+          services.victoriametrics = {
+            enable = true;
+            extraOptions = [
+              "-httpAuth.username=${username}"
+              "-httpAuth.password=file://${toString passwordFile}"
+            ];
+          };
+        };
+
+      vmagent =
+        {
+          config,
+          pkgs,
+          ...
+        }:
+        {
+          environment.systemPackages = [ pkgs.jq ];
+          services.vmagent = {
+            enable = true;
+            remoteWrite = {
+              url = "http://victoriametrics:8428/api/v1/write";
+              basicAuthUsername = username;
+              basicAuthPasswordFile = toString passwordFile;
+            };
+
+            prometheusConfig = {
+              global = {
+                scrape_interval = "2s";
+              };
+              scrape_configs = [
+                {
+                  job_name = "node";
+                  static_configs = [
+                    {
+                      targets = [
+                        "node:${toString config.services.prometheus.exporters.node.port}"
+                      ];
+                    }
+                  ];
+                }
+              ];
+            };
+          };
+        };
+
+      node =
+        { ... }:
+        {
+          services.prometheus.exporters.node = {
+            enable = true;
+            openFirewall = true;
+          };
+        };
+    };
+
+    testScript = ''
+      node.wait_for_unit("prometheus-node-exporter")
+      node.wait_for_open_port(9100)
+
+      victoriametrics.wait_for_unit("victoriametrics")
+      victoriametrics.wait_for_open_port(8428)
+
+      vmagent.wait_for_unit("vmagent")
+
+      # check remote write
+      victoriametrics.wait_until_succeeds(
+        "curl --user '${username}:${password}' -sf 'http://localhost:8428/api/v1/query?query=node_exporter_build_info\{instance=\"node:9100\"\}' | "
+        + "jq '.data.result[0].value[1]' | grep '\"1\"'"
+      )
+    '';
+  }
+)
--- a/nixos/tests/victoriametrics/vmalert.nix
+++ b/nixos/tests/victoriametrics/vmalert.nix
@ -0,0 +1,179 @@
+# Primarily reference the implementation of <nixos/tests/prometheus/alertmanager.nix>
+import ../make-test-python.nix (
+  {
+    lib,
+    pkgs,
+    ...
+  }:
+  {
+    name = "victoriametrics-vmalert";
+    meta = with pkgs.lib.maintainers; {
+      maintainers = [
+        yorickvp
+        ryan4yin
+      ];
+    };
+
+    nodes = {
+      victoriametrics =
+        {
+          config,
+          pkgs,
+          ...
+        }:
+        {
+          environment.systemPackages = [ pkgs.jq ];
+          networking.firewall.allowedTCPPorts = [ 8428 ];
+          services.victoriametrics = {
+            enable = true;
+            prometheusConfig = {
+              global = {
+                scrape_interval = "2s";
+              };
+              scrape_configs = [
+                {
+                  job_name = "alertmanager";
+                  static_configs = [
+                    {
+                      targets = [
+                        "alertmanager:${toString config.services.prometheus.alertmanager.port}"
+                      ];
+                    }
+                  ];
+                }
+                {
+                  job_name = "node";
+                  static_configs = [
+                    {
+                      targets = [
+                        "node:${toString config.services.prometheus.exporters.node.port}"
+                      ];
+                    }
+                  ];
+                }
+              ];
+            };
+          };
+
+          services.vmalert = {
+            enable = true;
+            settings = {
+              "datasource.url" = "http://localhost:8428"; # victoriametrics' api
+              "notifier.url" = [
+                "http://alertmanager:${toString config.services.prometheus.alertmanager.port}"
+              ]; # alertmanager's api
+              rule = [
+                (pkgs.writeText "instance-down.yml" ''
+                  groups:
+                    - name: test
+                      rules:
+                        - alert: InstanceDown
+                          expr: up == 0
+                          for: 5s
+                          labels:
+                            severity: page
+                          annotations:
+                            summary: "Instance {{ $labels.instance }} down"
+                '')
+              ];
+            };
+          };
+        };
+
+      alertmanager =
+        {
+          config,
+          pkgs,
+          ...
+        }:
+        {
+          services.prometheus.alertmanager = {
+            enable = true;
+            openFirewall = true;
+
+            configuration = {
+              global = {
+                resolve_timeout = "1m";
+              };
+
+              route = {
+                # Root route node
+                receiver = "test";
+                group_by = [ "..." ];
+                continue = false;
+                group_wait = "1s";
+                group_interval = "15s";
+                repeat_interval = "24h";
+              };
+
+              receivers = [
+                {
+                  name = "test";
+                  webhook_configs = [
+                    {
+                      url = "http://logger:6725";
+                      send_resolved = true;
+                      max_alerts = 0;
+                    }
+                  ];
+                }
+              ];
+            };
+          };
+        };
+
+      logger =
+        {
+          config,
+          pkgs,
+          ...
+        }:
+        {
+          networking.firewall.allowedTCPPorts = [ 6725 ];
+
+          services.prometheus.alertmanagerWebhookLogger.enable = true;
+        };
+    };
+
+    testScript = ''
+      alertmanager.wait_for_unit("alertmanager")
+      alertmanager.wait_for_open_port(9093)
+      alertmanager.wait_until_succeeds("curl -s http://127.0.0.1:9093/-/ready")
+
+      logger.wait_for_unit("alertmanager-webhook-logger")
+      logger.wait_for_open_port(6725)
+
+      victoriametrics.wait_for_unit("victoriametrics")
+      victoriametrics.wait_for_unit("vmalert")
+      victoriametrics.wait_for_open_port(8428)
+
+      victoriametrics.wait_until_succeeds(
+        "curl -sf 'http://127.0.0.1:8428/api/v1/query?query=count(up\{job=\"alertmanager\"\}==1)' | "
+        + "jq '.data.result[0].value[1]' | grep '\"1\"'"
+      )
+
+      victoriametrics.wait_until_succeeds(
+        "curl -sf 'http://127.0.0.1:8428/api/v1/query?query=sum(alertmanager_build_info)%20by%20(version)' | "
+        + "jq '.data.result[0].metric.version' | grep '\"${pkgs.prometheus-alertmanager.version}\"'"
+      )
+
+      victoriametrics.wait_until_succeeds(
+        "curl -sf 'http://127.0.0.1:8428/api/v1/query?query=count(up\{job=\"node\"\}!=1)' | "
+        + "jq '.data.result[0].value[1]' | grep '\"1\"'"
+      )
+
+      victoriametrics.wait_until_succeeds(
+        "curl -sf 'http://127.0.0.1:8428/api/v1/query?query=alertmanager_notifications_total\{integration=\"webhook\"\}' | "
+        + "jq '.data.result[0].value[1]' | grep -v '\"0\"'"
+      )
+
+      logger.wait_until_succeeds(
+        "journalctl -o cat -u alertmanager-webhook-logger.service | grep '\"alertname\":\"InstanceDown\"'"
+      )
+
+      logger.log(logger.succeed("systemd-analyze security alertmanager-webhook-logger.service | grep -v '✓'"))
+
+      alertmanager.log(alertmanager.succeed("systemd-analyze security alertmanager.service | grep -v '✓'"))
+    '';
+  }
+)
--- a/pkgs/applications/audio/mopidy/mopidy.nix
+++ b/pkgs/applications/audio/mopidy/mopidy.nix
@ -8,6 +8,7 @@
  glib-networking,
  gobject-introspection,
  pipewire,
+  nixosTests,
 }:

 pythonPackages.buildPythonApplication rec {
@ -34,9 +35,7 @@ pythonPackages.buildPythonApplication rec {
  ];

  propagatedBuildInputs =
-    [
-      gobject-introspection
-    ]
+    [ gobject-introspection ]
    ++ (
      with pythonPackages;
      [
@ -50,13 +49,15 @@ pythonPackages.buildPythonApplication rec {
      ++ lib.optional (!stdenv.hostPlatform.isDarwin) dbus-python
    );

-  propagatedNativeBuildInputs = [
-    gobject-introspection
-  ];
+  propagatedNativeBuildInputs = [ gobject-introspection ];

  # There are no tests
  doCheck = false;

+  passthru.tests = {
+    inherit (nixosTests) mopidy;
+  };
+
  meta = with lib; {
    homepage = "https://www.mopidy.com/";
    description = "Extensible music server that plays music from local disk, Spotify, SoundCloud, and more";
--- a/pkgs/applications/editors/neovim/tests/default.nix
+++ b/pkgs/applications/editors/neovim/tests/default.nix
@ -80,7 +80,12 @@ let
    sha256 = "1ykcvyx82nhdq167kbnpgwkgjib8ii7c92y3427v986n2s5lsskc";
  };

-  # neovim-drv must be a wrapped neovim
+  /* neovim-drv must be a wrapped neovim
+    - exposes lua config in $luarcGeneric
+    - exposes vim config in $vimrcGeneric
+
+  */
+
  runTest = neovim-drv: buildCommand:
    runCommandLocal "test-${neovim-drv.name}" ({
      nativeBuildInputs = [ ];
@ -164,6 +169,13 @@ in
    ${nvim_with_plug}/bin/nvim -V3log.txt -i NONE -c 'color base16-tomorrow-night'  +quit! -e
  '';

+  nvim_with_autoconfigure = pkgs.neovim.overrideAttrs(oa: {
+    plugins = [ vimPlugins.unicode-vim ];
+    autoconfigure = true;
+    # legacy wrapper sets it to false
+    wrapRc = true;
+  });
+
  nvim_with_ftplugin = let
    # this plugin checks that it's ftplugin/vim.tex is loaded before $VIMRUNTIME/ftplugin/vim.tex
    # $VIMRUNTIME/ftplugin/vim.tex sources $VIMRUNTIME/ftplugin/initex.vim which sets b:did_ftplugin
@ -324,6 +336,12 @@ in

  inherit nvim-with-luasnip;

+  autoconfigure = runTest nvim_with_autoconfigure ''
+      assertFileContains \
+        "$luarc" \
+        '${vimPlugins.unicode-vim.passthru.initLua}'
+  '';
+
  # check that bringing in one plugin with lua deps makes those deps visible from wrapper
  # for instance luasnip has a dependency on jsregexp
  can_require_transitive_deps =
--- a/pkgs/applications/editors/neovim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/wrapper.nix
@ -20,6 +20,10 @@ let

  wrapper = {
      extraName ? ""
+    # certain plugins need a custom configuration (available in passthru.initLua)
+    # to work with nix.
+    # if true, the wrapper automatically appends those snippets when necessary
+    , autoconfigure ? false
    # should contain all args but the binary. Can be either a string or list
    , wrapperArgs ? []
    , withPython2 ? false
@ -87,11 +91,19 @@ let
    packpathDirs.myNeovimPackages = myVimPackage;
    finalPackdir = neovimUtils.packDir packpathDirs;

+    luaPluginRC = let
+      op = acc: normalizedPlugin:
+           acc ++ lib.optional (finalAttrs.autoconfigure && normalizedPlugin.plugin.passthru ? initLua) normalizedPlugin.plugin.passthru.initLua;
+      in
+        lib.foldl' op [] pluginsNormalized;
+
    rcContent = ''
      ${luaRcContent}
    '' + lib.optionalString (neovimRcContent' != null) ''
      vim.cmd.source "${writeText "init.vim" neovimRcContent'}"
-    '';
+    '' +
+      lib.concatStringsSep "\n" luaPluginRC
+    ;

    getDeps = attrname: map (plugin: plugin.${attrname} or (_: [ ]));

@ -155,7 +167,7 @@ let
      __structuredAttrs = true;
      dontUnpack = true;
      inherit viAlias vimAlias withNodeJs withPython3 withPerl withRuby;
-      inherit wrapRc providerLuaRc packpathDirs;
+      inherit autoconfigure wrapRc providerLuaRc packpathDirs;
      inherit python3Env rubyEnv;
      inherit wrapperArgs generatedWrapperArgs;
      luaRcContent = rcContent;
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -9078,6 +9078,18 @@ final: prev:
    meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
  };

+  nvim-lsp-file-operations = buildVimPlugin {
+    pname = "nvim-lsp-file-operations";
+    version = "2024-10-24";
+    src = fetchFromGitHub {
+      owner = "antosha417";
+      repo = "nvim-lsp-file-operations";
+      rev = "9744b738183a5adca0f916527922078a965515ed";
+      sha256 = "0xmcvg5ks9n44aldk6aywvx4jshsdwxrsq44y0wph0wd9v88v7kk";
+    };
+    meta.homepage = "https://github.com/antosha417/nvim-lsp-file-operations/";
+  };
+
  nvim-lsp-notify = buildVimPlugin {
    pname = "nvim-lsp-notify";
    version = "2023-12-07";
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@ -1827,6 +1827,11 @@ in
    ];
  };

+  nvim-lsp-file-operations = super.nvim-lsp-file-operations.overrideAttrs {
+    dependencies = [ self.plenary-nvim ];
+    nvimRequireCheck = "lsp-file-operations";
+  };
+
  nvim-lsputils = super.nvim-lsputils.overrideAttrs {
    dependencies = with self; [ popfix ];
    nvimRequireCheck = "lsputil.codeAction";
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -754,6 +754,7 @@ https://github.com/kosayoda/nvim-lightbulb/,,
 https://github.com/josa42/nvim-lightline-lsp/,,
 https://github.com/martineausimon/nvim-lilypond-suite/,HEAD,
 https://github.com/mfussenegger/nvim-lint/,,
+https://github.com/antosha417/nvim-lsp-file-operations/,HEAD,
 https://github.com/mrded/nvim-lsp-notify/,HEAD,
 https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/,,
 https://github.com/neovim/nvim-lspconfig/,,
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@ -31,21 +31,21 @@ let
  archive_fmt = if stdenv.hostPlatform.isDarwin then "zip" else "tar.gz";

  sha256 = {
-    x86_64-linux = "1d99kbvbd17h02m85gd8dircb39jsbifdk61w1hsvhri6dbfah8f";
-    x86_64-darwin = "1bay90s0asfms4cg4hng9f4bpjyg5d884ffjrqy6mdxwyqmjyzb1";
-    aarch64-linux = "0g1v26qax14fghawjqb9xbkr8kwhzwh52qz30jg3pfsixw5q5kkx";
-    aarch64-darwin = "0m7b6dnfwqal20iq6nwwzvd23l5alqgbc02ih2pjflzk794fj2mf";
-    armv7l-linux = "04jbcqwpbp7d89van8dq5zilfcalxwbx62yzipdzsjlmfnxf65vy";
+    x86_64-linux = "0ijv2y2brc05m45slsy24dp8r0733d89f082l3mbs64vkz76s748";
+    x86_64-darwin = "012lkaxq5cqcby6lzmgwxbhgr36mk5szqvnxkw9xf5bjcpmxllfz";
+    aarch64-linux = "1975pvzg9hvbwqri80sbzbrgr96h85fi22x1walgqw4px74lsa1d";
+    aarch64-darwin = "023an5g5lgjizdppv52lpsah8kr0y40dm2kl7rq7byvsfxjga0gy";
+    armv7l-linux = "1f871lafkfyjw57iwz5gzl3bjjhqdac32akj0n26lkl3zq86p417";
  }.${system} or throwSystem;
 in
  callPackage ./generic.nix rec {
    # Please backport all compatible updates to the stable release.
    # This is important for the extension ecosystem.
-    version = "1.95.2";
+    version = "1.95.3";
    pname = "vscode" + lib.optionalString isInsiders "-insiders";

    # This is used for VS Code - Remote SSH test
-    rev = "e8653663e8840adaf45af01eab5c627a5af81807";
+    rev = "f1a4fb101478ce6ec82fe9627c43efbf9e98c813";

    executableName = "code" + lib.optionalString isInsiders "-insiders";
    longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@ -69,7 +69,7 @@ in
      src = fetchurl {
        name = "vscode-server-${rev}.tar.gz";
        url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-        sha256 = "14vfylcx3gcx5vjdp861mjr98wq2f3242ysygpa3r5xnl8941wki";
+        sha256 = "1ij7qfp5z801ny3n397801fv3hw5yvss1wxl9cyjgmjxmi6id7c1";
      };
      stdenv = stdenvNoCC;
    };
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@ -417,11 +417,11 @@
    "vendorHash": "sha256-D08K1+0m5HcLTr6VfP0adMdTBh6st4cQyWf95fd6GlY="
  },
  "exoscale": {
-    "hash": "sha256-fS7ZK+d7paUoaPuxXh6N6Sw38dzlxOAVCHgsHUL2Gz8=",
+    "hash": "sha256-5hhq+ecaTR4kz+23xObDGjyreJ3UuHYBRMoBl7bxnJw=",
    "homepage": "https://registry.terraform.io/providers/exoscale/exoscale",
    "owner": "exoscale",
    "repo": "terraform-provider-exoscale",
-    "rev": "v0.61.0",
+    "rev": "v0.62.0",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@ -994,13 +994,13 @@
    "vendorHash": "sha256-Koojva0MAw5WC942VbxZ6d1Pf1VwFvJMmp16TsHRS3w="
  },
  "porkbun": {
-    "hash": "sha256-YWUccesHNy8mdP5iWtXP1macOLGRKqqla6dWGYihJAo=",
+    "hash": "sha256-Vi73nRH32fJEUXGGV+RKaGNpsIv6PuPY0HqIkYDdcBY=",
    "homepage": "https://registry.terraform.io/providers/cullenmcdermott/porkbun",
    "owner": "cullenmcdermott",
    "repo": "terraform-provider-porkbun",
-    "rev": "v0.2.5",
+    "rev": "v0.3.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-pbJk35O8EowCa2dgLCrPDgakR0EJVaAnEvePGnrl/YQ="
+    "vendorHash": "sha256-vT1n4FN0s9rQFj4HuXPm6lvNdzWZMyrzeWAanHOQqCg="
  },
  "postgresql": {
    "hash": "sha256-ldiMHcA0uJa7z5qx8ATuu7wn6W7HTLXEw3CG9rGnU/4=",
--- a/pkgs/applications/virtualization/singularity/generic.nix
+++ b/pkgs/applications/virtualization/singularity/generic.nix
@ -76,14 +76,6 @@ in
  # inside the upstream source code.
  # Include "/run/wrappers/bin" by default for the convenience of NixOS users.
  systemBinPaths ? [ "/run/wrappers/bin" ],
-  # Path to SUID-ed newuidmap executable
-  # Deprecated in favour of systemBinPaths
-  # TODO(@ShamrockLee): Remove after Nixpkgs 24.05 branch-off
-  newuidmapPath ? null,
-  # Path to SUID-ed newgidmap executable
-  # Deprecated in favour of systemBinPaths
-  # TODO(@ShamrockLee): Remove after Nixpkgs 24.05 branch-off
-  newgidmapPath ? null,
  # External LOCALSTATEDIR
  externalLocalStateDir ? null,
  # Remove the symlinks to `singularity*` when projectName != "singularity"
@ -110,28 +102,6 @@ in
 }@args:

 let
-  # Backward compatibility for privileged-un-utils.
-  # TODO(@ShamrockLee): Remove after Nixpkgs 24.05 branch-off.
-  privileged-un-utils =
-    if ((newuidmapPath == null) && (newgidmapPath == null)) then
-      null
-    else
-      lib.warn
-        "${pname}: arguments newuidmapPath and newgidmapPath is deprecated in favour of systemBinPaths."
-        (
-          runCommandLocal "privileged-un-utils" { } ''
-            mkdir -p "$out/bin"
-            ln -s ${lib.escapeShellArg newuidmapPath} "$out/bin/newuidmap"
-            ln -s ${lib.escapeShellArg newgidmapPath} "$out/bin/newgidmap"
-          ''
-        );
-
-  # Backward compatibility for privileged-un-utils.
-  # TODO(@ShamrockLee): Remove after Nixpkgs 24.05 branch-off.
-  systemBinPaths =
-    lib.optional (privileged-un-utils != null) (lib.makeBinPath [ privileged-un-utils ])
-    ++ args.systemBinPaths or [ "/run/wrappers/bin" ];
-
  concatMapStringAttrsSep =
    sep: f: attrs:
    lib.concatMapStringsSep sep (name: f name attrs.${name}) (lib.attrNames attrs);
--- a/pkgs/build-support/singularity-tools/default.nix
+++ b/pkgs/build-support/singularity-tools/default.nix
@ -99,7 +99,6 @@ lib.makeExtensible (final: {
            inherit memSize;
          }
          ''
-            rmdir "$out"
            mkdir workspace
            mkfs -t ext3 -b 4096 /dev/${vmTools.hd}
            mount /dev/${vmTools.hd} workspace
--- a/pkgs/build-support/trivial-builders/default.nix
+++ b/pkgs/build-support/trivial-builders/default.nix
@ -607,7 +607,6 @@ rec {
  # See https://nixos.org/manual/nixpkgs/unstable/#sec-pkgs.makeSetupHook
  makeSetupHook =
    { name ? lib.warn "calling makeSetupHook without passing a name is deprecated." "hook"
-    , deps ? [ ]
      # hooks go in nativeBuildInputs so these will be nativeBuildInputs
    , propagatedBuildInputs ? [ ]
      # these will be buildInputs
@ -625,11 +624,7 @@ rec {
        __structuredAttrs = false;
        inherit meta;
        inherit depsTargetTargetPropagated;
-        propagatedBuildInputs =
-          # remove list conditionals before 23.11
-          lib.warnIf (!lib.isList deps) "'deps' argument to makeSetupHook must be a list. content of deps: ${toString deps}"
-            (lib.warnIf (deps != [ ]) "'deps' argument to makeSetupHook is deprecated and will be removed in release 23.11., Please use propagatedBuildInputs instead. content of deps: ${toString deps}"
-              propagatedBuildInputs ++ (if lib.isList deps then deps else [ deps ]));
+        inherit propagatedBuildInputs;
        strictDeps = true;
        # TODO 2023-01, no backport: simplify to inherit passthru;
        passthru = passthru
@ -645,13 +640,8 @@ rec {
        substituteAll ${script} $out/nix-support/setup-hook
      '');

-
-  # Docs in doc/build-helpers/trivial-build-helpers.chapter.md
-  # See https://nixos.org/manual/nixpkgs/unstable/#trivial-builder-writeReferencesToFile
-  # TODO: Convert to throw after Nixpkgs 24.05 branch-off.
-  writeReferencesToFile = (if config.allowAliases then lib.warn else throw)
-    "writeReferencesToFile is deprecated in favour of writeClosure"
-    (path: writeClosure [ path ]);
+  # Remove after 25.05 branch-off
+  writeReferencesToFile = throw "writeReferencesToFile has been removed. Use writeClosure instead.";

  # Docs in doc/build-helpers/trivial-build-helpers.chapter.md
  # See https://nixos.org/manual/nixpkgs/unstable/#trivial-builder-writeClosure
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@ -240,6 +240,10 @@ rec {


  vmRunCommand = qemuCommand: writeText "vm-run" ''
+    if [ -f "''${NIX_ATTRS_SH_FILE-}" ]; then
+      source "$NIX_ATTRS_SH_FILE"
+    fi
+    source $stdenv/setup
    export > saved-env

    PATH=${coreutils}/bin
--- a/pkgs/by-name/aa/aactivator/package.nix
+++ b/pkgs/by-name/aa/aactivator/package.nix
@ -0,0 +1,41 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3Packages,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "aactivator";
+  version = "2.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Yelp";
+    repo = "aactivator";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-vnBDtLEvU1jHbb5/MXAulXaBaugdCZdLQSP2b8P6SiQ=";
+  };
+
+  build-system = with python3Packages; [
+    setuptools
+    wheel
+  ];
+
+  nativeCheckInputs = with python3Packages; [
+    pytestCheckHook
+    pexpect
+  ];
+
+  disabledTestPaths = [
+    # presumably because of shell manipulations
+    "tests/integration_test.py"
+  ];
+
+  meta = {
+    description = "Automatically activate Python virtualenvs (and other environments)";
+    homepage = "https://github.com/Yelp/aactivator";
+    license = lib.licenses.mit;
+    mainProgram = "aactivator";
+    maintainers = with lib.maintainers; [ keller00 ];
+  };
+}
--- a/pkgs/by-name/ad/adwsteamgtk/package.nix
+++ b/pkgs/by-name/ad/adwsteamgtk/package.nix
@ -12,7 +12,7 @@

 python3Packages.buildPythonApplication rec {
  pname = "adwsteamgtk";
-  version = "0.7.1";
+  version = "0.7.2";
  # built with meson, not a python format
  format = "other";

@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
    owner = "Foldex";
    repo = "AdwSteamGtk";
    rev = "refs/tags/v${version}";
-    hash = "sha256-/1fiiQBmQ9rvJ6KyImFkdxOjqfCZ/0nO3iRpggzNocs=";
+    hash = "sha256-DI5WK8CtoyH8hSogQx5/oDCrGoLxE06cy63ubU+e3bQ=";
  };

  buildInputs = [
--- a/pkgs/by-name/am/ams-lv2/package.nix
+++ b/pkgs/by-name/am/ams-lv2/package.nix
@ -29,5 +29,7 @@ stdenv.mkDerivation  rec {
    platforms = platforms.linux;
    # Build uses `-msse` and `-mfpmath=sse`
    badPlatforms = [ "aarch64-linux" ];
+    # `ModuleNotFoundError: No module named 'imp'`
+    broken = true;
  };
 }
--- a/pkgs/by-name/as/astyle/package.nix
+++ b/pkgs/by-name/as/astyle/package.nix
@ -1,12 +1,19 @@
-{ stdenv, lib, fetchurl, cmake, asLibrary ? false }:
+{
+  stdenv,
+  lib,
+  fetchurl,
+  cmake,
+  versionCheckHook,
+  asLibrary ? false,
+}:

 stdenv.mkDerivation rec {
  pname = "astyle";
-  version = "3.6.3";
+  version = "3.6.4";

  src = fetchurl {
    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
-    hash = "sha256-EO18j5dOzONcF3jxYW8EypPD07/BoBeqJROWBBtnDvw=";
+    hash = "sha256-HpS2T08GRh+QOdCUrv6dSyjGbTSRayekVgVefWLXNwI=";
  };

  nativeBuildInputs = [ cmake ];
@ -22,6 +29,10 @@ stdenv.mkDerivation rec {
    install -Dm444 ../src/astyle.h $out/include/astyle.h
  '';

+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = !asLibrary;
+
  meta = with lib; {
    description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java";
    mainProgram = "astyle";
--- a/pkgs/by-name/ba/bash-env-json/package.nix
+++ b/pkgs/by-name/ba/bash-env-json/package.nix
@ -0,0 +1,55 @@
+{
+  stdenvNoCC,
+  lib,
+  makeWrapper,
+  fetchFromGitHub,
+  coreutils,
+  gnused,
+  jq,
+  nix-update-script,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "bash-env-json";
+  version = "0.9.1";
+
+  src = fetchFromGitHub {
+    owner = "tesujimath";
+    repo = "bash-env-json";
+    rev = finalAttrs.version;
+    hash = "sha256-cZEkYOr9z6yLPA4PSo6+hogaqb1vhWaYi/rp4asfsbM=";
+  };
+
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 bash-env-json -t $out/bin
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    wrapProgram $out/bin/bash-env-json --prefix PATH : ${
+      lib.makeBinPath [
+        coreutils
+        gnused
+        jq
+      ]
+    }
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Export Bash environment as JSON for import into modern shells like Elvish and Nushell";
+    homepage = "https://github.com/tesujimath/bash-env-json";
+    mainProgram = "bash-env-json";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jaredmontoya ];
+    platforms = lib.platforms.all;
+  };
+})
--- a/pkgs/by-name/be/bearer/package.nix
+++ b/pkgs/by-name/be/bearer/package.nix
@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "bearer";
-  version = "1.46.2";
+  version = "1.47.0";

  src = fetchFromGitHub {
    owner = "bearer";
    repo = "bearer";
    rev = "refs/tags/v${version}";
-    hash = "sha256-weEsgueE2d8dV811u+cmk4urTUL3K1yjVBhU8XmqBi8=";
+    hash = "sha256-yr5ik+DxOcW3UFK6KiPvheGlDdwSz2s7DKm2vAsSwG0=";
  };

-  vendorHash = "sha256-dKIpbs68XsRu7yFHTQt4k/gKmiT1wewpSQAzz9xrByg=";
+  vendorHash = "sha256-A0zy5O2+afhn6jAfLd/k7wvL3z1PVI0e6bO39cnYrhM=";

  subPackages = [ "cmd/bearer" ];

--- a/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix
+++ b/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix
@ -0,0 +1,50 @@
+{
+  lib,
+  bign-handheld-thumbnailer,
+  fetchFromGitHub,
+  glib,
+  nix-update-script,
+  pkg-config,
+  rustPlatform,
+  testers,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "bign-handheld-thumbnailer";
+  version = "1.1.1";
+
+  src = fetchFromGitHub {
+    owner = "MateusRodCosta";
+    repo = "bign-handheld-thumbnailer";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-rRKMIkeTBb16GF8DgQ36Vdx/1I6zuzpuL/jusFJ0OZw=";
+  };
+
+  cargoHash = "sha256-e6KuE6tlBfTfqTW4oyNIchB3/1tsl8CbR0x4ZUTKDVA=";
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ glib ];
+
+  passthru = {
+    tests.version = testers.testVersion {
+      package = bign-handheld-thumbnailer;
+      version = "v${version}";
+    };
+
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Thumbnailer for Nintendo handheld systems (Nintendo DS and 3DS) roms and files";
+    homepage = "https://github.com/MateusRodCosta/bign-handheld-thumbnailer";
+    changelog = "https://github.com/MateusRodCosta/bign-handheld-thumbnailer/releases/tag/v${version}";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ getchoo ];
+    mainProgram = "bign-handheld-thumbnailer";
+    # This is based on GIO
+    inherit (glib.meta) platforms;
+  };
+}
--- a/pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch
+++ b/pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch
@ -1,7 +1,7 @@
-diff --git a/apps/desktop/src/platform/main/biometric/biometric.unix.main.ts b/apps/desktop/src/platform/main/biometric/biometric.unix.main.ts
-index e2428d9d12..de4e9e1e62 100644
--- a/apps/desktop/src/platform/main/biometric/biometric.unix.main.ts
-+++ b/apps/desktop/src/platform/main/biometric/biometric.unix.main.ts
+diff --git a/apps/desktop/src/key-management/biometrics/biometric.unix.main.ts b/apps/desktop/src/key-management/biometrics/biometric.unix.main.ts
+index 8962e7f3ec..a7291420f2 100644
+--- a/apps/desktop/src/key-management/biometrics/biometric.unix.main.ts
+++ b/apps/desktop/src/key-management/biometrics/biometric.unix.main.ts
@@ -109,7 +109,7 @@ export default class BiometricUnixMain implements OsBiometricService {
     // The user needs to manually set up the polkit policy outside of the sandbox
     // since we allow access to polkit via dbus for the sandboxed clients, the authentication works from
--- a/pkgs/by-name/bi/bitwarden-desktop/package.nix
+++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix
@ -35,19 +35,20 @@ let

 in buildNpmPackage rec {
  pname = "bitwarden-desktop";
-  version = "2024.9.0";
+  version = "2024.11.1";

  src = fetchFromGitHub {
    owner = "bitwarden";
    repo = "clients";
    rev = "desktop-v${version}";
-    hash = "sha256-o5nRG2j73qheDOyeFfSga64D8HbTn1EUrCiN0W+Xn0w=";
+    hash = "sha256-4QTQgW8k3EMf07Xqs2B+VXQOUPzoOgaNvoC02x4zvu8=";
  };

  patches = [
    ./electron-builder-package-lock.patch
    ./dont-auto-setup-biometrics.patch
    ./set-exe-path.patch # ensures `app.getPath("exe")` returns our wrapper, not ${electron}/bin/electron
+    ./skip-afterpack.diff # this modifies bin/electron etc., but we wrap read-only bin/electron ourselves
  ];

  postPatch = ''
@ -62,7 +63,7 @@ in buildNpmPackage rec {
  makeCacheWritable = true;
  npmFlags = [ "--engine-strict" "--legacy-peer-deps" ];
  npmWorkspace = "apps/desktop";
-  npmDepsHash = "sha256-L7/frKCNlq0xr6T+aSqyEQ44yrIXwcpdU/djrhCJNNk=";
+  npmDepsHash = "sha256-YzhCyNMvfXGmgOpl3qWj1Pqd1hY8CJ9QLwQds5ZMnqg=";

  cargoDeps = rustPlatform.fetchCargoTarball {
    name = "${pname}-${version}";
@ -78,7 +79,7 @@ in buildNpmPackage rec {
      patches;
    patchFlags = [ "-p4" ];
    sourceRoot = "${src.name}/${cargoRoot}";
-    hash = "sha256-y+6vaESiOeVrFJpZoOJ75onOpldqSsT2kqkMMzTDUmM=";
+    hash = "sha256-aurjpVzWET30O+ysyE4ZzauMe8kHjOL169tfKUR1Vpg=";
  };
  cargoRoot = "apps/desktop/desktop_native";

@ -103,20 +104,6 @@ in buildNpmPackage rec {
    libsecret
  ];

-  # node-argon2 builds with LTO, but that causes missing symbols. So disable it
-  # and rebuild. Then we need to copy it into the build output for
-  # electron-builder, as `apps/desktop/src/package.json` specifies `argon2` as
-  # a dependency and electron-builder will otherwise install a fresh (and
-  # broken) argon2. See https://github.com/ranisalt/node-argon2/pull/415
-  preConfigure = ''
-    pushd node_modules/argon2
-    substituteInPlace binding.gyp --replace-fail '"-flto", ' ""
-    "$npm_config_node_gyp" rebuild
-    popd
-    mkdir -p apps/desktop/build/node_modules
-    cp -r ./{,apps/desktop/build/}node_modules/argon2
-  '';
-
  preBuild = ''
    if [[ $(jq --raw-output '.devDependencies.electron' < package.json | grep -E --only-matching '^[0-9]+') != ${lib.escapeShellArg (lib.versions.major electron.version)} ]]; then
      echo 'ERROR: electron version mismatch'
@ -181,7 +168,7 @@ in buildNpmPackage rec {
    # Extract the polkit policy file from the multiline string in the source code.
    # This may break in the future but its better than copy-pasting it manually.
    mkdir -p $out/share/polkit-1/actions/
-    pushd apps/desktop/src/platform/main/biometric
+    pushd apps/desktop/src/key-management/biometrics
    awk '/const polkitPolicy = `/{gsub(/^.*`/, ""); print; str=1; next} str{if (/`;/) str=0; gsub(/`;/, ""); print}' biometric.unix.main.ts > $out/share/polkit-1/actions/com.bitwarden.Bitwarden.policy
    popd

--- a/pkgs/by-name/bi/bitwarden-desktop/skip-afterpack.diff
+++ b/pkgs/by-name/bi/bitwarden-desktop/skip-afterpack.diff
@ -0,0 +1,39 @@
+diff --git a/apps/desktop/scripts/after-pack.js b/apps/desktop/scripts/after-pack.js
+index fd16cd5ffb..05a2325ee1 100644
+--- a/apps/desktop/scripts/after-pack.js
+++ b/apps/desktop/scripts/after-pack.js
+@@ -13,25 +13,6 @@ async function run(context) {
+   console.log("## After pack");
+   // console.log(context);
+ 
+-  if (context.packager.platform.nodeName !== "darwin" || context.arch === builder.Arch.universal) {
+-    await addElectronFuses(context);
+-  }
+-
+-  if (context.electronPlatformName === "linux") {
+-    console.log("Creating memory-protection wrapper script");
+-    const appOutDir = context.appOutDir;
+-    const oldBin = path.join(appOutDir, context.packager.executableName);
+-    const newBin = path.join(appOutDir, "bitwarden-app");
+-    fse.moveSync(oldBin, newBin);
+-    console.log("Moved binary to bitwarden-app");
+-
+-    const wrapperScript = path.join(__dirname, "../resources/memory-dump-wrapper.sh");
+-    const wrapperBin = path.join(appOutDir, context.packager.executableName);
+-    fse.copyFileSync(wrapperScript, wrapperBin);
+-    fse.chmodSync(wrapperBin, "755");
+-    console.log("Copied memory-protection wrapper script");
+-  }
+-
+   if (["darwin", "mas"].includes(context.electronPlatformName)) {
+     const is_mas = context.electronPlatformName === "mas";
+     const is_mas_dev = context.targets.some((e) => e.name === "mas-dev");
+@@ -140,6 +121,8 @@ function getIdentities() {
+  * @param {import("electron-builder").AfterPackContext} context
+  */
+ async function addElectronFuses(context) {
+  return;
+
+   const platform = context.packager.platform.nodeName;
+ 
+   const ext = {
--- a/pkgs/by-name/br/brave/package.nix
+++ b/pkgs/by-name/br/brave/package.nix
@ -3,24 +3,24 @@

 let
  pname = "brave";
-  version = "1.73.89";
+  version = "1.73.91";

  allArchives = {
    aarch64-linux = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-qpWKu0hmFs8LXkSrrcSOpS9BsgkO1WPOItpPc/InBLY=";
+      hash = "sha256-q1Bb44JT6J/KX5zAfphH42s41ZyVkhUlypmd64G+1bs=";
    };
    x86_64-linux = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-9e0zMS5kcTMdxkvvq248kZDQpBz/Hf4OMUdZ4lgmDV8=";
+      hash = "sha256-Q0vM9CRuRl9G+L0G+1PT/HXXFm0qT+j6DduojPwjqtI=";
    };
    aarch64-darwin = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-LOSm4IbdmrpxzDf9yzbKhkBlp8452R9tInYOP4dMfzo=";
+      hash = "sha256-aZcu5acrNAbOK7qs+ZUfLSCbj1F/L7ZU38udQnnYcu8=";
    };
    x86_64-darwin = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-VWobettpSvMCCENg/b9VkH+cwNOrYF/n6d3Ebdq00Lc=";
+      hash = "sha256-MpclUk3uZd2OJ5+jlznAiQSYxjkphsRjZ7FbmIcX9tI=";
    };
  };

--- a/pkgs/by-name/bt/btrfs-list/package.nix
+++ b/pkgs/by-name/bt/btrfs-list/package.nix
@ -0,0 +1,47 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  makeWrapper,
+  btrfs-progs,
+  coreutils,
+  ncurses,
+  perl,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "btrfs-list";
+  version = "2.3";
+
+  src = fetchFromGitHub {
+    owner = "speed47";
+    repo = "btrfs-list";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-cWzDRop0cyrjVIJzuZxTqELgec66GiPAUJY1xIBr3OY=";
+  };
+
+  buildInputs = [ perl ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    install -D -t $out/bin btrfs-list
+
+    wrapProgram $out/bin/btrfs-list \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          coreutils # uses readlink
+          ncurses # uses tput
+          btrfs-progs
+        ]
+      }
+  '';
+
+  meta = {
+    description = "Get a nice tree-style view of your btrfs subvolumes/snapshots, including their size, à la 'zfs list'";
+    homepage = "https://github.com/speed47/btrfs-list";
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ asymmetric ];
+    mainProgram = "btrfs-list";
+    platforms = lib.platforms.linux;
+  };
+})
--- a/pkgs/by-name/ch/chirpstack-concentratord/package.nix
+++ b/pkgs/by-name/ch/chirpstack-concentratord/package.nix
@ -0,0 +1,45 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+  protobuf,
+  libloragw-2g4,
+  libloragw-sx1301,
+  libloragw-sx1302,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "chirpstack-concentratord";
+  version = "4.4.2";
+
+  src = fetchFromGitHub {
+    owner = "chirpstack";
+    repo = "chirpstack-concentratord";
+    rev = "v${version}";
+    hash = "sha256-UbUtNJuz8zfhHzyOiT/mRNtNRmdoNnuszrVSbLoVGK8=";
+  };
+
+  cargoHash = "sha256-JXIyrbBRGJR9mjvawU46mBfGYxZPpYl9aB9k3WBA/co=";
+
+  buildInputs = [
+    libloragw-2g4
+    libloragw-sx1301
+    libloragw-sx1302
+  ];
+
+  nativeBuildInputs = [
+    protobuf
+    rustPlatform.bindgenHook
+  ];
+
+  updateScript = nix-update-script { };
+
+  meta = {
+    description = "Concentrator HAL daemon for LoRa gateways";
+    homepage = "https://www.chirpstack.io/";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.stv0g ];
+    platforms = lib.platforms.linux;
+    mainProgram = "chirpstack-concentratord";
+  };
+}
--- a/pkgs/by-name/ch/chirpstack-fuota-server/package.nix
+++ b/pkgs/by-name/ch/chirpstack-fuota-server/package.nix
@ -0,0 +1,46 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+}:
+buildGoModule rec {
+  pname = "chirpstack-fuota-server";
+  version = "3.0.0-test.4-unstable-2024-04-02";
+
+  src = fetchFromGitHub {
+    owner = "chirpstack";
+    repo = "chirpstack-fuota-server";
+    rev = "6e014688cb4b2a5dc658bf7876df69a1cf3e2176";
+    hash = "sha256-ShpBUnDGaW8vbt5y1wZbedwFHPJaggPuij71l2p0a6o=";
+  };
+
+  vendorHash = "sha256-dTmHkauFelqMo5MpB/TyK5yVax5d4/+g9twjmsRG3e0=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.version=${version}"
+  ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgramArg = "version";
+
+  checkFlags = [
+    "-skip=TestStorage" # Depends on external database server
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "FUOTA server which can be used together with ChirpStack Application Server";
+    homepage = "https://www.chirpstack.io/";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.stv0g ];
+    mainProgram = "chirpstack-fuota-server";
+  };
+}
--- a/pkgs/by-name/ch/chirpstack-gateway-bridge/package.nix
+++ b/pkgs/by-name/ch/chirpstack-gateway-bridge/package.nix
@ -0,0 +1,46 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+  versionCheckHook,
+}:
+buildGoModule rec {
+  pname = "chirpstack-gateway-bridge";
+  version = "4.0.11";
+
+  src = fetchFromGitHub {
+    owner = "chirpstack";
+    repo = "chirpstack-gateway-bridge";
+    rev = "v${version}";
+    hash = "sha256-nVrYyvoN6jayXAwivwxhijNeLEcGICTWJ4T9EBs5uaI=";
+  };
+
+  vendorHash = "sha256-PX5Jd8fUFEOOd38NNqbV15jbEIcDQRYGk0l1MhtLiTk=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.version=v${version}"
+  ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgramArg = "version";
+
+  checkFlags = [
+    "-skip=TestMQTTBackend" # Depends on external MQTT broker
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Gateway Bridge abstracts Packet Forwarder protocols into Protobuf or JSON over MQTT";
+    homepage = "https://www.chirpstack.io/";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.stv0g ];
+    mainProgram = "chirpstack-gateway-bridge";
+  };
+}
--- a/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix
+++ b/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix
@ -0,0 +1,43 @@
+{
+  lib,
+  stdenv,
+  darwin,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+  versionCheckHook,
+  protobuf,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "chirpstack-mqtt-forwarder";
+  version = "4.3.1";
+
+  src = fetchFromGitHub {
+    owner = "chirpstack";
+    repo = "chirpstack-mqtt-forwarder";
+    rev = "v${version}";
+    hash = "sha256-jbu8O1Wag6KpN49VyXsYO8os95ctZjzuxKXoDMLyiKU=";
+  };
+
+  cargoHash = "sha256-1tAZjsjoVKUkrF0WAqxs9d+1w8/AqFGDfpFGAHvf+D0=";
+
+  nativeBuildInputs = [ protobuf ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  # Skip tests depending on internet connectivity
+  checkFlags = [ "--skip=end_to_end" ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Forwarder which can be installed on the gateway to forward LoRa data over MQTT";
+    homepage = "https://www.chirpstack.io/";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.stv0g ];
+    mainProgram = "chirpstack-mqtt-forwarder";
+  };
+}
--- a/pkgs/by-name/ch/chirpstack-rest-api/package.nix
+++ b/pkgs/by-name/ch/chirpstack-rest-api/package.nix
@ -0,0 +1,34 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+buildGoModule rec {
+  pname = "chirpstack-rest-api";
+  version = "4.10.1";
+
+  src = fetchFromGitHub {
+    owner = "chirpstack";
+    repo = "chirpstack-rest-api";
+    rev = "v${version}";
+    hash = "sha256-Rqxayn5vcCsvdztfElhRrdxxO3l5SgtckmWQMYey9MA=";
+  };
+
+  vendorHash = "sha256-7Qcd7AQjIdp5j7/i7wEZslMiOR5/rJ0HGbo8o7Q035U=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "gRPC API to REST proxy for Chirpstack";
+    homepage = "https://www.chirpstack.io/";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.stv0g ];
+    mainProgram = "chirpstack-rest-api";
+  };
+}
--- a/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix
+++ b/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix
@ -0,0 +1,41 @@
+{
+  lib,
+  stdenv,
+  darwin,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+  versionCheckHook,
+  protobuf,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "chirpstack-udp-forwarder";
+  version = "4.1.8";
+
+  src = fetchFromGitHub {
+    owner = "chirpstack";
+    repo = "chirpstack-udp-forwarder";
+    rev = "v${version}";
+    hash = "sha256-Snj5nKyFsq8WJJNw1d8O/YX/dZ/tCTVBw5R8kXJvsa4=";
+  };
+
+  cargoHash = "sha256-7ugrIVT4SYrqPqF0CrLU+/Ep/p9H7/on3hkZ5JzY9AE=";
+
+  nativeBuildInputs = [ protobuf ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "UDP packet-forwarder for the ChirpStack Concentratord";
+    homepage = "https://www.chirpstack.io/";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.stv0g ];
+    mainProgram = "chirpstack-udp-forwarder";
+  };
+}
--- a/pkgs/by-name/cl/clifm/package.nix
+++ b/pkgs/by-name/cl/clifm/package.nix
@ -11,13 +11,13 @@

 stdenv.mkDerivation rec {
  pname = "clifm";
-  version = "1.21";
+  version = "1.22";

  src = fetchFromGitHub {
    owner = "leo-arch";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-x7Mdt8XcTtqxaHo28jrpyYPHZ/X1g9h4aulrW3YIXGQ=";
+    hash = "sha256-keoQUfRQA77+1ArVRKYiWGACXAi505jLXSVXUpuMlMc=";
  };

  buildInputs = [
--- a/pkgs/by-name/cn/cnquery/package.nix
+++ b/pkgs/by-name/cn/cnquery/package.nix
@ -6,18 +6,18 @@

 buildGoModule rec {
  pname = "cnquery";
-  version = "11.19.1";
+  version = "11.31.1";

  src = fetchFromGitHub {
    owner = "mondoohq";
    repo = "cnquery";
    rev = "refs/tags/v${version}";
-    hash = "sha256-PeEnQSpwasgAnm6sHzNcqYOcRRH2DYAvcd0lwda5zdk=";
+    hash = "sha256-wP6MburjIRevE2nfO6p7hPAmJ390v7y7r/DgVpwkVlo=";
  };

  subPackages = [ "apps/cnquery" ];

-  vendorHash = "sha256-mS+79EvNCQJeE90WZDLvj2akMWtarVAolAralZHsZuU=";
+  vendorHash = "sha256-OxvC/JUXu5DLMv3VrcbJbfgEkkzTJEPR2ig/8YCff9U=";

  ldflags = [
    "-w"
--- a/pkgs/by-name/co/code-cursor/package.nix
+++ b/pkgs/by-name/co/code-cursor/package.nix
@ -8,11 +8,11 @@
 }:
 let
  pname = "cursor";
-  version = "0.42.5";
+  version = "0.43.0";
  appKey = "230313mzl4w4u92";
  src = fetchurl {
-    url = "https://download.todesktop.com/230313mzl4w4u92/cursor-0.42.5-build-24111460bf2loz1-x86_64.AppImage";
-    hash = "sha256-fr2P4Na6Jvmhh7FA5JILxrmm8wfI7Ad2+IFeJrxCtmI=";
+    url = "https://download.todesktop.com/230313mzl4w4u92/cursor-0.43.0-build-24112423a8e6ct7-x86_64.AppImage";
+    hash = "sha256-IcAUXGSMHxGd5Ak4cYA9/2YYg8UA+cRBGgnOupDuRXs=";
  };
  appimageContents = appimageTools.extractType2 { inherit version pname src; };
 in
--- a/pkgs/by-name/cr/crawley/package.nix
+++ b/pkgs/by-name/cr/crawley/package.nix
@ -6,18 +6,18 @@

 buildGoModule rec {
  pname = "crawley";
-  version = "1.7.8";
+  version = "1.7.10";

  src = fetchFromGitHub {
    owner = "s0rg";
    repo = "crawley";
    rev = "v${version}";
-    hash = "sha256-Sw9FZVVar8aG0+RO64cYzJ2OZb80cgHw2we+e+BV9QY=";
+    hash = "sha256-vc3HHkX0BFVSJi1Ll9T8IgYh5P6rzi4FowE7Jdy/tO8=";
  };

  nativeBuildInputs = [ installShellFiles ];

-  vendorHash = "sha256-w/TLGJvHVbuv+wrOI+RQnZl3I62QYbqd9W1hcUbz2b0=";
+  vendorHash = "sha256-jj8FNZs/bkFQxveOkqmGVO3MNPPv5O9ebodoi7hhzIs=";

  ldflags = [ "-w" "-s" ];

--- a/pkgs/by-name/do/dovecot_fts_xapian/package.nix
+++ b/pkgs/by-name/do/dovecot_fts_xapian/package.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "dovecot-fts-xapian";
-  version = "1.7.14";
+  version = "1.8";

  src = fetchFromGitHub {
    owner = "grosjo";
    repo = "fts-xapian";
    rev = version;
-    hash = "sha256-cLOkXA4kQ15M5TheXy9qZq2je05iY9jwf3tHw20l1Pw=";
+    hash = "sha256-WKUHy9/PpaDSgZYyydCm5odo3kAb2M/50oVdLjGRQ6I=";
  };

  buildInputs = [ xapian icu sqlite ];
--- a/pkgs/by-name/et/etherguard/package.nix
+++ b/pkgs/by-name/et/etherguard/package.nix
@ -0,0 +1,26 @@
+{
+  fetchFromGitHub,
+  buildGoModule,
+  lib,
+}:
+buildGoModule rec {
+  pname = "etherguard";
+  version = "0.3.5-f5";
+  src = fetchFromGitHub {
+    owner = "KusakabeShi";
+    repo = "EtherGuard-VPN";
+    rev = "v${version}";
+    hash = "sha256-67ocXHf+AN3nyPt4636ZJHGRqWSjkpTiDvU5243urBw=";
+  };
+
+  vendorHash = "sha256-9+zpQ/AhprMMfC4Om64GfQLgms6eluTOB6DdnSTNOlk=";
+
+  meta = {
+    mainProgram = "EtherGuard-VPN";
+    maintainers = with lib.maintainers; [ xddxdd ];
+    description = "Layer 2 version of WireGuard with Floyd Warshall implementation in Go";
+    homepage = "https://github.com/KusakabeShi/EtherGuard-VPN";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+  };
+}
--- a/pkgs/by-name/fl/flclash/package.nix
+++ b/pkgs/by-name/fl/flclash/package.nix
@ -10,13 +10,13 @@
 }:
 let
  pname = "flclash";
-  version = "0.8.66";
+  version = "0.8.68";
  src =
    (fetchFromGitHub {
      owner = "chen08209";
      repo = "FlClash";
      rev = "v${version}";
-      hash = "sha256-LkaAALJcP3DGXBMZ3QWLUiyT9Kr4yTxKIRqYhrW1WOw=";
+      hash = "sha256-0S3sNmOxM5SpRLpYzi4br5/PJnxDklFHsEAKiHd0vOM=";
      fetchSubmodules = true;
    }).overrideAttrs
      (_: {
@ -27,13 +27,23 @@ let
  libclash = buildGoModule {
    inherit pname version src;
    modRoot = "./core";
-    vendorHash = "sha256-K+PrLFvDHyaxf1NKzcqf0qmfQwT8rctScv1CN+TxY0M=";
+    vendorHash = "sha256-BpZB+0r7x7Ntldimo/nHXIu98jwhcA53l3kMav9lHkA=";
    buildPhase = ''
      runHook preBuild
+
      mkdir -p $out/lib
      go build -ldflags="-w -s" -tags=with_gvisor -buildmode=c-shared -o $out/lib/libclash.so
+
      runHook postBuild
    '';
+
+    meta = {
+      description = "Multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free";
+      homepage = "https://github.com/chen08209/FlClash";
+      license = with lib.licenses; [ gpl3Plus ];
+      maintainers = with lib.maintainers; [ aucub ];
+      platforms = lib.platforms.linux;
+    };
  };
 in
 flutter.buildFlutterApplication {
@ -58,10 +68,9 @@ flutter.buildFlutterApplication {
    })
  ];

-  patchPhase = ''
-    runHook prePatch
-    substituteInPlace lib/clash/core.dart --replace-fail 'DynamicLibrary.open("libclash.so")' 'DynamicLibrary.open("${libclash}/lib/libclash.so")'
-    runHook postPatch
+  postPatch = ''
+    substituteInPlace lib/clash/core.dart \
+      --replace-fail 'DynamicLibrary.open("libclash.so")' 'DynamicLibrary.open("${libclash}/lib/libclash.so")'
  '';

  preBuild = ''
--- a/pkgs/by-name/fl/flclash/pubspec.lock.json
+++ b/pkgs/by-name/fl/flclash/pubspec.lock.json
@ -4,21 +4,27 @@
      "dependency": "transitive",
      "description": {
        "name": "_fe_analyzer_shared",
-        "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7",
+        "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "67.0.0"
+      "version": "72.0.0"
+    },
+    "_macros": {
+      "dependency": "transitive",
+      "description": "dart",
+      "source": "sdk",
+      "version": "0.3.2"
    },
    "analyzer": {
      "dependency": "transitive",
      "description": {
        "name": "analyzer",
-        "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d",
+        "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "6.4.1"
+      "version": "6.7.0"
    },
    "animations": {
      "dependency": "direct main",
@ -54,11 +60,11 @@
      "dependency": "direct dev",
      "description": {
        "name": "args",
-        "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a",
+        "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.5.0"
+      "version": "2.6.0"
    },
    "async": {
      "dependency": "transitive",
@ -124,21 +130,21 @@
      "dependency": "direct dev",
      "description": {
        "name": "build_runner",
-        "sha256": "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7",
+        "sha256": "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.4.11"
+      "version": "2.4.13"
    },
    "build_runner_core": {
      "dependency": "transitive",
      "description": {
        "name": "build_runner_core",
-        "sha256": "e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe",
+        "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "7.3.1"
+      "version": "7.3.2"
    },
    "built_collection": {
      "dependency": "transitive",
@ -224,11 +230,11 @@
      "dependency": "transitive",
      "description": {
        "name": "cli_util",
-        "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19",
+        "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.4.1"
+      "version": "0.4.2"
    },
    "clock": {
      "dependency": "transitive",
@ -244,11 +250,11 @@
      "dependency": "transitive",
      "description": {
        "name": "code_builder",
-        "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37",
+        "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "4.10.0"
+      "version": "4.10.1"
    },
    "collection": {
      "dependency": "direct main",
@ -260,15 +266,35 @@
      "source": "hosted",
      "version": "1.18.0"
    },
+    "connectivity_plus": {
+      "dependency": "direct main",
+      "description": {
+        "name": "connectivity_plus",
+        "sha256": "876849631b0c7dc20f8b471a2a03142841b482438e3b707955464f5ffca3e4c3",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.1.0"
+    },
+    "connectivity_plus_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "connectivity_plus_platform_interface",
+        "sha256": "42657c1715d48b167930d5f34d00222ac100475f73d10162ddf43e714932f204",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.1"
+    },
    "convert": {
      "dependency": "transitive",
      "description": {
        "name": "convert",
-        "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592",
+        "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.1.1"
+      "version": "3.1.2"
    },
    "cross_file": {
      "dependency": "transitive",
@ -284,21 +310,31 @@
      "dependency": "transitive",
      "description": {
        "name": "crypto",
-        "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27",
+        "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.0.5"
+      "version": "3.0.6"
    },
    "dart_style": {
      "dependency": "transitive",
      "description": {
        "name": "dart_style",
-        "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9",
+        "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.3.6"
+      "version": "2.3.7"
+    },
+    "dbus": {
+      "dependency": "transitive",
+      "description": {
+        "name": "dbus",
+        "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.7.10"
    },
    "device_info_plus": {
      "dependency": "direct main",
@ -384,21 +420,21 @@
      "dependency": "direct dev",
      "description": {
        "name": "ffigen",
-        "sha256": "dead012f29db2be71ea152458f5eab600de98fbc244e01088ae6bf2616bceca7",
+        "sha256": "a0ca4853028c6a9e4d9a0a40bb744fceb898c89d75931d08e87b3987d0087060",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "11.0.0"
+      "version": "15.0.0"
    },
    "file": {
      "dependency": "transitive",
      "description": {
        "name": "file",
-        "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c",
+        "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "7.0.0"
+      "version": "7.0.1"
    },
    "file_picker": {
      "dependency": "direct main",
@ -454,11 +490,11 @@
      "dependency": "transitive",
      "description": {
        "name": "fixnum",
-        "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1",
+        "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.1.1"
    },
    "flutter": {
      "dependency": "direct main",
@ -480,11 +516,11 @@
      "dependency": "direct dev",
      "description": {
        "name": "flutter_lints",
-        "sha256": "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1",
+        "sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.0.2"
+      "version": "5.0.0"
    },
    "flutter_localizations": {
      "dependency": "direct main",
@ -496,11 +532,11 @@
      "dependency": "transitive",
      "description": {
        "name": "flutter_plugin_android_lifecycle",
-        "sha256": "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda",
+        "sha256": "9b78450b89f059e96c9ebb355fa6b3df1d6b330436e0b885fb49594c41721398",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.0.22"
+      "version": "2.0.23"
    },
    "flutter_test": {
      "dependency": "direct dev",
@ -518,11 +554,11 @@
      "dependency": "direct dev",
      "description": {
        "name": "freezed",
-        "sha256": "a434911f643466d78462625df76fd9eb13e57348ff43fe1f77bbe909522c67a1",
+        "sha256": "44c19278dd9d89292cf46e97dc0c1e52ce03275f40a97c5a348e802a924bf40e",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.5.2"
+      "version": "2.5.7"
    },
    "freezed_annotation": {
      "dependency": "direct main",
@ -658,11 +694,11 @@
      "dependency": "direct main",
      "description": {
        "name": "image",
-        "sha256": "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8",
+        "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "4.2.0"
+      "version": "4.3.0"
    },
    "image_picker": {
      "dependency": "direct main",
@ -678,31 +714,31 @@
      "dependency": "transitive",
      "description": {
        "name": "image_picker_android",
-        "sha256": "8c5abf0dcc24fe6e8e0b4a5c0b51a5cf30cefdf6407a3213dae61edc75a70f56",
+        "sha256": "8faba09ba361d4b246dc0a17cb4289b3324c2b9f6db7b3d457ee69106a86bd32",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.8.12+12"
+      "version": "0.8.12+17"
    },
    "image_picker_for_web": {
      "dependency": "transitive",
      "description": {
        "name": "image_picker_for_web",
-        "sha256": "65d94623e15372c5c51bebbcb820848d7bcb323836e12dfdba60b5d3a8b39e50",
+        "sha256": "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.0.5"
+      "version": "3.0.6"
    },
    "image_picker_ios": {
      "dependency": "transitive",
      "description": {
        "name": "image_picker_ios",
-        "sha256": "6703696ad49f5c3c8356d576d7ace84d1faf459afb07accbb0fae780753ff447",
+        "sha256": "4f0568120c6fcc0aaa04511cb9f9f4d29fc3d0139884b1d06be88dcec7641d6b",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.8.12"
+      "version": "0.8.12+1"
    },
    "image_picker_linux": {
      "dependency": "transitive",
@ -858,21 +894,21 @@
      "dependency": "transitive",
      "description": {
        "name": "lints",
-        "sha256": "cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290",
+        "sha256": "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.0.0"
+      "version": "5.0.0"
    },
    "logging": {
      "dependency": "transitive",
      "description": {
        "name": "logging",
-        "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340",
+        "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.2.0"
+      "version": "1.3.0"
    },
    "lpinyin": {
      "dependency": "direct main",
@ -884,6 +920,16 @@
      "source": "hosted",
      "version": "2.0.3"
    },
+    "macros": {
+      "dependency": "transitive",
+      "description": {
+        "name": "macros",
+        "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.2-main.4"
+    },
    "matcher": {
      "dependency": "transitive",
      "description": {
@ -928,21 +974,21 @@
      "dependency": "transitive",
      "description": {
        "name": "mime",
-        "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a",
+        "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.0.6"
+      "version": "2.0.0"
    },
    "mobile_scanner": {
      "dependency": "direct main",
      "description": {
        "name": "mobile_scanner",
-        "sha256": "d234581c090526676fd8fab4ada92f35c6746e3fb4f05a399665d75a399fb760",
+        "sha256": "728828a798d1a2ee506beb652ca23d974c542c96ed03dcbd5eaf97bef96cdaad",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "5.2.3"
+      "version": "6.0.2"
    },
    "nested": {
      "dependency": "transitive",
@ -954,6 +1000,16 @@
      "source": "hosted",
      "version": "1.0.0"
    },
+    "nm": {
+      "dependency": "transitive",
+      "description": {
+        "name": "nm",
+        "sha256": "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.5.0"
+    },
    "octo_image": {
      "dependency": "transitive",
      "description": {
@ -978,11 +1034,11 @@
      "dependency": "direct main",
      "description": {
        "name": "package_info_plus",
-        "sha256": "2c582551839386fa7ddbc7770658be7c0f87f388a4bff72066478f597c34d17f",
+        "sha256": "da8d9ac8c4b1df253d1a328b7bf01ae77ef132833479ab40763334db13b91cce",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "7.0.0"
+      "version": "8.1.1"
    },
    "package_info_plus_platform_interface": {
      "dependency": "transitive",
@ -1008,21 +1064,21 @@
      "dependency": "direct main",
      "description": {
        "name": "path_provider",
-        "sha256": "fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378",
+        "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.1.5"
    },
    "path_provider_android": {
      "dependency": "transitive",
      "description": {
        "name": "path_provider_android",
-        "sha256": "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7",
+        "sha256": "c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.2.10"
+      "version": "2.2.12"
    },
    "path_provider_foundation": {
      "dependency": "transitive",
@ -1078,11 +1134,11 @@
      "dependency": "transitive",
      "description": {
        "name": "platform",
-        "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65",
+        "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.1.5"
+      "version": "3.1.6"
    },
    "plugin_platform_interface": {
      "dependency": "transitive",
@ -1108,11 +1164,11 @@
      "dependency": "direct main",
      "description": {
        "name": "process_run",
-        "sha256": "c917dfb5f7afad4c7485bc00a4df038621248fce046105020cea276d1a87c820",
+        "sha256": "5736140acb1c54a11bd4c1e8d4821bfd684de69a4bf88835316cb05e596d8091",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.2.2"
    },
    "provider": {
      "dependency": "direct main",
@ -1167,11 +1223,11 @@
      "dependency": "direct main",
      "description": {
        "name": "re_editor",
-        "sha256": "abae2b015799c936b9f9b68888e2c55007dd159b4654a85da22ce1af84efbd17",
+        "sha256": "2169c114c7877bcaae72d6e8b69cdaa2a9cded69a51e3cf26209dad4a3ed2b9c",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.3.1"
+      "version": "0.6.0"
    },
    "re_highlight": {
      "dependency": "direct main",
@ -1197,31 +1253,71 @@
      "dependency": "transitive",
      "description": {
        "name": "screen_retriever",
-        "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90",
+        "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.1.9"
+      "version": "0.2.0"
+    },
+    "screen_retriever_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_linux",
+        "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_macos": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_macos",
+        "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_platform_interface",
+        "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_windows",
+        "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
    },
    "shared_preferences": {
      "dependency": "direct main",
      "description": {
        "name": "shared_preferences",
-        "sha256": "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051",
+        "sha256": "95f9997ca1fb9799d494d0cb2a780fd7be075818d59f00c43832ed112b158a82",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.3.2"
+      "version": "2.3.3"
    },
    "shared_preferences_android": {
      "dependency": "transitive",
      "description": {
        "name": "shared_preferences_android",
-        "sha256": "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e",
+        "sha256": "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.3.2"
+      "version": "2.3.3"
    },
    "shared_preferences_foundation": {
      "dependency": "transitive",
@ -1353,21 +1449,51 @@
      "dependency": "transitive",
      "description": {
        "name": "sqflite",
-        "sha256": "a43e5a27235518c03ca238e7b4732cf35eabe863a369ceba6cbefa537a66f16d",
+        "sha256": "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.3.3+1"
+      "version": "2.4.1"
+    },
+    "sqflite_android": {
+      "dependency": "transitive",
+      "description": {
+        "name": "sqflite_android",
+        "sha256": "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.0"
    },
    "sqflite_common": {
      "dependency": "transitive",
      "description": {
        "name": "sqflite_common",
-        "sha256": "3da423ce7baf868be70e2c0976c28a1bb2f73644268b7ffa7d2e08eab71f16a4",
+        "sha256": "4468b24876d673418a7b7147e5a08a715b4998a7ae69227acafaab762e0e5490",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.5.4"
+      "version": "2.5.4+5"
+    },
+    "sqflite_darwin": {
+      "dependency": "transitive",
+      "description": {
+        "name": "sqflite_darwin",
+        "sha256": "96a698e2bc82bd770a4d6aab00b42396a7c63d9e33513a56945cbccb594c2474",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.1"
+    },
+    "sqflite_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "sqflite_platform_interface",
+        "sha256": "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.0"
    },
    "stack_trace": {
      "dependency": "transitive",
@ -1413,11 +1539,11 @@
      "dependency": "transitive",
      "description": {
        "name": "synchronized",
-        "sha256": "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558",
+        "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.1.0+1"
+      "version": "3.3.0+3"
    },
    "term_glyph": {
      "dependency": "transitive",
@ -1463,11 +1589,11 @@
      "dependency": "transitive",
      "description": {
        "name": "typed_data",
-        "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c",
+        "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.3.2"
+      "version": "1.4.0"
    },
    "uni_platform": {
      "dependency": "direct main",
@ -1483,21 +1609,21 @@
      "dependency": "direct main",
      "description": {
        "name": "url_launcher",
-        "sha256": "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3",
+        "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "6.3.0"
+      "version": "6.3.1"
    },
    "url_launcher_android": {
      "dependency": "transitive",
      "description": {
        "name": "url_launcher_android",
-        "sha256": "f0c73347dfcfa5b3db8bc06e1502668265d39c08f310c29bff4e28eea9699f79",
+        "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "6.3.9"
+      "version": "6.3.14"
    },
    "url_launcher_ios": {
      "dependency": "transitive",
@ -1553,11 +1679,11 @@
      "dependency": "transitive",
      "description": {
        "name": "url_launcher_windows",
-        "sha256": "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185",
+        "sha256": "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.1.2"
+      "version": "3.1.3"
    },
    "uuid": {
      "dependency": "transitive",
@ -1643,11 +1769,11 @@
      "dependency": "direct main",
      "description": {
        "name": "win32",
-        "sha256": "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a",
+        "sha256": "84ba388638ed7a8cb3445a320c8273136ab2631cd5f2c57888335504ddab1bc2",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "5.5.4"
+      "version": "5.8.0"
    },
    "win32_registry": {
      "dependency": "direct main",
@ -1672,11 +1798,11 @@
      "dependency": "direct main",
      "description": {
        "name": "window_manager",
-        "sha256": "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf",
+        "sha256": "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.3.9"
+      "version": "0.4.3"
    },
    "windows_single_instance": {
      "dependency": "direct main",
@ -1740,7 +1866,7 @@
    }
  },
  "sdks": {
-    "dart": ">=3.4.4 <4.0.0",
-    "flutter": ">=3.22.0"
+    "dart": ">=3.5.0 <4.0.0",
+    "flutter": ">=3.24.0"
  }
 }
--- a/pkgs/by-name/gf/gfortran7/package.nix
+++ b/pkgs/by-name/gf/gfortran7/package.nix
@ -1,10 +0,0 @@
-{ wrapCC, gcc7 }:
-wrapCC (
-  gcc7.cc.override {
-    name = "gfortran";
-    langFortran = true;
-    langCC = false;
-    langC = false;
-    profiledCompiler = false;
-  }
-)
--- a/pkgs/by-name/gf/gfortran8/package.nix
+++ b/pkgs/by-name/gf/gfortran8/package.nix
@ -1,10 +0,0 @@
-{ wrapCC, gcc8 }:
-wrapCC (
-  gcc8.cc.override {
-    name = "gfortran";
-    langFortran = true;
-    langCC = false;
-    langC = false;
-    profiledCompiler = false;
-  }
-)
--- a/pkgs/by-name/gh/ghstack/package.nix
+++ b/pkgs/by-name/gh/ghstack/package.nix
@ -6,14 +6,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "ghstack";
-  version = "0.9.3";
+  version = "0.9.4";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "ezyang";
    repo = "ghstack";
-    rev = "0c412bf0d9515e11b58cddaeb1b1d9f0b17a5295";
-    hash = "sha256-VDsYIeFL8U5anUJ9KtWhEUeuoaO2qu5K7lSnGTjxNGs=";
+    rev = "fa7e7023d798aad6b115b88c5ad67ce88a4fc2a6";
+    hash = "sha256-Ywwjeupa8eE/vkrbl5SIbvQs53xaLnq9ieWRFwzmuuc=";
  };

  build-system = [ python3.pkgs.poetry-core ];
--- a/pkgs/by-name/gi/git-cola/package.nix
+++ b/pkgs/by-name/gi/git-cola/package.nix
@ -10,14 +10,14 @@

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

  src = fetchFromGitHub {
    owner = "git-cola";
    repo = "git-cola";
    rev = "v${version}";
-    hash = "sha256-8OErZ6uKTWE245BoBu9lQyTLA43DfWaYDv3wbPWaufg=";
+    hash = "sha256-pEl9kMdKGGKeca7xrb9KW5hVvjRBqqG7ktYXbJgc4YE=";
  };

  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
--- a/pkgs/by-name/gi/github-runner/patches/test-getsrcpath.patch
+++ b/pkgs/by-name/gi/github-runner/patches/test-getsrcpath.patch
@ -1,11 +1,14 @@
 --- a/src/Test/L0/TestUtil.cs
 +++ b/src/Test/L0/TestUtil.cs
-@@ -29,7 +29,7 @@
+@@ -27,11 +27,8 @@
+
+         public static string GetSrcPath()
         {
-             string L0dir = Path.GetDirectoryName(GetTestFilePath());
-             string testDir = Path.GetDirectoryName(L0dir);
+-            string L0dir = Path.GetDirectoryName(GetTestFilePath());
+-            string testDir = Path.GetDirectoryName(L0dir);
 -            string srcDir = Path.GetDirectoryName(testDir);
-+            string srcDir = "/build/src" + Path.GetDirectoryName(testDir).Substring(2);
+            string srcDir = "../../../../..";
             ArgUtil.Directory(srcDir, nameof(srcDir));
-             Assert.Equal(Src, Path.GetFileName(srcDir));
+-            Assert.Equal(Src, Path.GetFileName(srcDir));
             return srcDir;
+         }
--- a/pkgs/by-name/gs/gscreenshot/package.nix
+++ b/pkgs/by-name/gs/gscreenshot/package.nix
@ -18,13 +18,13 @@

 python3Packages.buildPythonApplication rec {
  pname = "gscreenshot";
-  version = "3.6.3";
+  version = "3.7.0";

  src = fetchFromGitHub {
    owner = "thenaterhood";
    repo = "${pname}";
    rev = "refs/tags/v${version}";
-    sha256 = "sha256-fpxKhgLpXbuUhALzF6n4v3FLcLaqbqLLxwQJE/wJrAY=";
+    sha256 = "sha256-2HEpuxj1HP2nkA31uZoys1svorPD1U2oprbAs+cUNH4=";
  };

  # needed for wrapGAppsHook3 to function
--- a/pkgs/by-name/hc/hcloud/package.nix
+++ b/pkgs/by-name/hc/hcloud/package.nix
@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "hcloud";
-  version = "1.48.0";
+  version = "1.49.0";

  src = fetchFromGitHub {
    owner = "hetznercloud";
    repo = "cli";
    rev = "refs/tags/v${version}";
-    hash = "sha256-fD+aEt3jakfdrh68Ok0SiehOy3Sg+B+3HUGO8gSSxTQ=";
+    hash = "sha256-Va6OWoBSEO+u1J1jYG6O0u7urnNkAPqXPBCFCHYO7VU=";
  };

-  vendorHash = "sha256-QO7K7nwFIYyJ5wGwuACWxzVf8mSX7JMsrbWqm6g5RCs=";
+  vendorHash = "sha256-dwuxywNtXeup1hF4XyOLzhA6c1l1HG+JZGG7naZA75E=";

  ldflags = [
    "-s"
@ -23,6 +23,8 @@ buildGoModule rec {
    "-X=github.com/hetznercloud/cli/internal/version.Version=${version}"
  ];

+  subPackages = [ "cmd/hcloud" ];
+
  nativeBuildInputs = [ installShellFiles ];

  postInstall = ''
--- a/pkgs/by-name/he/heptabase/package.nix
+++ b/pkgs/by-name/he/heptabase/package.nix
@ -5,10 +5,10 @@
 }:
 let
  pname = "heptabase";
-  version = "1.41.1";
+  version = "1.46.1";
  src = fetchurl {
    url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage";
-    hash = "sha256-MX5lKTSJFBhtUMPlefSWvVayFYt0ydZ7lToUDdDUsT4=";
+    hash = "sha256-JOjh9OHV+E7QuyWwsppLnRMpucTjq7X0upQDvZwYnJI=";
  };

  appimageContents = appimageTools.extractType2 { inherit pname version src; };
--- a/pkgs/by-name/ka/kazumi/package.nix
+++ b/pkgs/by-name/ka/kazumi/package.nix
@ -12,17 +12,18 @@
  at-spi2-atk,
 }:
 let
-  version = "1.4.3";
-  src = fetchFromGitHub {
-    owner = "Predidit";
-    repo = "Kazumi";
-    rev = version;
-    hash = "sha256-pLrpDTGA4qdTqxkNWmChknMklE/0Chd3NhysaUqpUfs=";
-  };
+  version = "1.4.4";
 in
 flutter.buildFlutterApplication {
  pname = "kazumi";
-  inherit version src;
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "Predidit";
+    repo = "Kazumi";
+    rev = "refs/tags/${version}";
+    hash = "sha256-p5eFabIa04io180tBNCMRs2pX7HU8b+PdyBwZohmKR8=";
+  };

  pubspecLock = lib.importJSON ./pubspec.lock.json;

--- a/pkgs/by-name/ka/kazumi/pubspec.lock.json
+++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json
@ -1517,6 +1517,16 @@
      "source": "hosted",
      "version": "1.2.0"
    },
+    "styled_text": {
+      "dependency": "direct main",
+      "description": {
+        "name": "styled_text",
+        "sha256": "fd624172cf629751b4f171dd0ecf9acf02a06df3f8a81bb56c0caa4f1df706c3",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "8.1.0"
+    },
    "synchronized": {
      "dependency": "transitive",
      "description": {
@ -1918,6 +1928,16 @@
      "source": "hosted",
      "version": "6.5.0"
    },
+    "xmlstream": {
+      "dependency": "transitive",
+      "description": {
+        "name": "xmlstream",
+        "sha256": "cfc14e3f256997897df9481ae630d94c2d85ada5187ebeb868bb1aabc2c977b4",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.1"
+    },
    "xpath_selector": {
      "dependency": "direct main",
      "description": {
--- a/pkgs/by-name/kp/kpt/package.nix
+++ b/pkgs/by-name/kp/kpt/package.nix
@ -1,28 +1,35 @@
-{ buildGoModule, fetchFromGitHub, lib, stdenv }:
+{
+  buildGoModule,
+  fetchFromGitHub,
+  lib,
+}:

 buildGoModule rec {
  pname = "kpt";
-  version = "0.39.3";
+  version = "1.0.0-beta.55";

  src = fetchFromGitHub {
-    owner = "GoogleContainerTools";
+    owner = "kptdev";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-vidrKfmP0Lw6EYYufLDxh3ROOJ3hPIusDTI/Hr73NYM=";
+    hash = "sha256-MVrJUsMpt1L56ezy2b2G6Aac9kpe4QgfSosR+PeTuBQ=";
  };

-  vendorHash = "sha256-CoXlUX9hkP8gijA/vg19AS9030w95A2oKGD1wjzO8ak=";
+  vendorHash = "sha256-2jJCvBtTiIYmpxA92p8eZnKl1UO74pKr1YFRH14keZY=";

  subPackages = [ "." ];

-  ldflags = [ "-s" "-w" "-X github.com/GoogleContainerTools/kpt/run.version=${version}" ];
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/kptdev/kpt/run.version=${version}"
+  ];

-  meta = with lib; {
-    description = "Toolkit to help you manage, manipulate, customize, and apply Kubernetes Resource configuration data files";
+  meta = {
+    description = "Automate Kubernetes Configuration Editing";
    mainProgram = "kpt";
-    homepage = "https://googlecontainertools.github.io/kpt/";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ mikefaille ];
-    broken = stdenv.hostPlatform.isDarwin;
+    homepage = "https://github.com/kptdev/kpt";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ mikefaille ];
  };
 }
--- a/pkgs/by-name/ku/kubesec/package.nix
+++ b/pkgs/by-name/ku/kubesec/package.nix
@ -1,27 +1,29 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
-, installShellFiles
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
 }:

 buildGoModule rec {
  pname = "kubesec";
-  version = "2.14.1";
+  version = "2.14.2";

  src = fetchFromGitHub {
    owner = "controlplaneio";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-FYYMCouZuG0EqvganPLSrLgaDZ+JowUcYXTnKMJ+6Us=";
+    repo = "kubesec";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-4jVRd6XQekL4wMZ+Icoa2DEsTGzBISK2QPO+gu890kA=";
  };
-  vendorHash = "sha256-KTmsCbFRHMd1KnBYxwWWuETaTP0G3NYCK/ttgrFy59I=";
+
+  vendorHash = "sha256-6jXGc9tkqRTjzEiug8lGursPm9049THWlk8xY3pyVgo=";

  nativeBuildInputs = [ installShellFiles ];

  ldflags = [
    "-s"
    "-w"
-    "-X github.com/controlplaneio/kubesec/v${lib.versions.major version}/cmd.version=v${version}"
+    "-X=github.com/controlplaneio/kubesec/v${lib.versions.major version}/cmd.version=v${version}"
  ];

  # Tests wants to download the kubernetes schema for use with kubeval
@ -50,6 +52,9 @@ buildGoModule rec {
    homepage = "https://github.com/controlplaneio/kubesec";
    changelog = "https://github.com/controlplaneio/kubesec/blob/v${version}/CHANGELOG.md";
    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ fab jk ];
+    maintainers = with maintainers; [
+      fab
+      jk
+    ];
  };
 }
--- a/pkgs/by-name/la/lammps/package.nix
+++ b/pkgs/by-name/la/lammps/package.nix
@ -70,9 +70,6 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  passthru = {
-    # Remove these at some point - perhaps after release 23.11. See discussion at:
-    # https://github.com/NixOS/nixpkgs/pull/238771#discussion_r1235459961
-    mpi = throw "`lammps-mpi.passthru.mpi` was removed in favor of `extraBuildInputs`";
    inherit packages;
    inherit extraCmakeFlags;
    inherit extraBuildInputs;
--- a/pkgs/by-name/la/lazydocker/package.nix
+++ b/pkgs/by-name/la/lazydocker/package.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "lazydocker";
-  version = "0.23.3";
+  version = "0.24.1";

  src = fetchFromGitHub {
    owner = "jesseduffield";
    repo = "lazydocker";
    rev = "v${version}";
-    sha256 = "sha256-1nw0X8sZBtBsxlEUDVYMAinjMEMlIlzjJ4s+WApeE6o=";
+    sha256 = "sha256-cVjDdrxmGt+hj/WWP9B3BT739k9SSr4ryye5qWb3XNM=";
  };

  vendorHash = null;
--- a/pkgs/by-name/li/libloragw-2g4/package.nix
+++ b/pkgs/by-name/li/libloragw-2g4/package.nix
@ -0,0 +1,49 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  gitUpdater,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libloragw-2g4";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "Lora-net";
+    repo = "gateway_2g4_hal";
+    rev = "refs/tags/V${finalAttrs.version}";
+    hash = "sha256-EvsYCkZ55nEdZXhxp7AjCw954+uUIoi2Fc3xhaIjZys=";
+  };
+
+  passthru.updateScript = gitUpdater { rev-prefix = "V"; };
+
+  makeFlags = [
+    "-e"
+    "-C"
+    "libloragw"
+  ];
+
+  preBuild = ''
+    make -C libtools
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/{lib,include/libloragw-2g4}
+    cp libloragw/libloragw.a $out/lib/libloragw-2g4.a
+    cp libloragw/inc/* $out/include/libloragw-2g4
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "LoRa 2.4Ghz Gateway - Linux host Hardware Abstraction Layer, and tools (Packet Forwarder...)";
+    license = [
+      lib.licenses.bsd3
+      lib.licenses.mit
+    ];
+    maintainers = [ lib.maintainers.stv0g ];
+    platforms = lib.platforms.linux;
+  };
+})
--- a/pkgs/by-name/li/libloragw-sx1301/package.nix
+++ b/pkgs/by-name/li/libloragw-sx1301/package.nix
@ -0,0 +1,45 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  gitUpdater,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libloragw-sx1301";
+  version = "5.0.1r4";
+
+  src = fetchFromGitHub {
+    owner = "brocaar";
+    repo = "lora_gateway";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-YxnFWJhH5iUR+6zA0Pf7a+VxFwYkw84CeoQmd01efqU=";
+  };
+
+  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
+
+  makeFlags = [
+    "-e"
+    "-C"
+    "libloragw"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/{lib,include/libloragw-sx1301}
+    cp libloragw/libloragw.a $out/lib/libloragw-sx1301.a
+    cp libloragw/inc/* $out/include/libloragw-sx1301
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Driver/HAL to build a gateway using a concentrator board based on Semtech SX1301 multi-channel modem and SX1257/SX1255 RF transceivers";
+    license = [
+      lib.licenses.bsd3
+      lib.licenses.mit
+    ];
+    maintainers = [ lib.maintainers.stv0g ];
+    platforms = lib.platforms.linux;
+  };
+})
--- a/pkgs/by-name/li/libloragw-sx1302/package.nix
+++ b/pkgs/by-name/li/libloragw-sx1302/package.nix
@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  gitUpdater,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libloragw-sx1302";
+  version = "2.1.0r9";
+
+  src = fetchFromGitHub {
+    owner = "brocaar";
+    repo = "sx1302_hal";
+    rev = "refs/tags/V${finalAttrs.version}";
+    hash = "sha256-NYu54UpMn2OZfGihBH9Kbp2kUcEy0epH1Tt5I3r6jTs=";
+  };
+
+  passthru.updateScript = gitUpdater { rev-prefix = "V"; };
+
+  makeFlags = [
+    "-e"
+    "-C"
+    "libloragw"
+  ];
+
+  preBuild = ''
+    make -C libtools
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/{lib,include/libloragw-sx1302}
+    cp libloragw/libloragw.a $out/lib/libloragw-sx1302.a
+    cp libloragw/inc/* $out/include/libloragw-sx1302
+    cp libtools/*.a $out/lib/
+    cp libtools/inc/* $out/include/
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "SX1302 Hardware Abstraction Layer and Tools (packet forwarder...)";
+    license = [
+      lib.licenses.bsd3
+      lib.licenses.mit
+    ];
+    maintainers = [ lib.maintainers.stv0g ];
+    platforms = lib.platforms.linux;
+  };
+})
--- a/pkgs/by-name/li/librenms/package.nix
+++ b/pkgs/by-name/li/librenms/package.nix
@ -24,13 +24,13 @@ let
  phpPackage = php82.withExtensions ({ enabled, all }: enabled ++ [ all.memcached ]);
 in phpPackage.buildComposerProject rec {
  pname = "librenms";
-  version = "24.9.1";
+  version = "24.10.1";

  src = fetchFromGitHub {
    owner = "librenms";
    repo = pname;
    rev = "${version}";
-    sha256 = "sha256-6LNhMtw2U7/31Qsd1C8u+iT99CCdoz3qQh0hjsDM+9A=";
+    sha256 = "sha256-Rs6eoCXjocCP6MxTH1HEZBV7jNFZ5d6cPfvtWzGWSb8=";
  };

  vendorHash = "sha256-VWf1gN2VczS/4+aO+QFjBMjeritO/3dF6oeaOfSQibo=";
@ -123,7 +123,7 @@ in phpPackage.buildComposerProject rec {
    description = "Auto-discovering PHP/MySQL/SNMP based network monitoring";
    homepage    = "https://www.librenms.org/";
    license     = licenses.gpl3Only;
-    maintainers = teams.wdz.members;
+    maintainers = with maintainers; [ netali ] ++ teams.wdz.members;
    platforms   = platforms.linux;
  };
 }
--- a/pkgs/by-name/mi/mission-center/Cargo.lock
+++ b/pkgs/by-name/mi/mission-center/Cargo.lock
--- a/pkgs/by-name/mi/mission-center/gatherer-Cargo.lock
+++ b/pkgs/by-name/mi/mission-center/gatherer-Cargo.lock
--- a/pkgs/by-name/mi/mission-center/package.nix
+++ b/pkgs/by-name/mi/mission-center/package.nix
@ -45,11 +45,10 @@
 # 1) Get the nvtop commit hash (`source-url` in `nvtop.json`):
 #     https://gitlab.com/mission-center-devs/mission-center/-/blob/v<VERSION>/src/sys_info_v2/gatherer/3rdparty/nvtop/nvtop.json?ref_type=tags
 # 2) Update the version of the main derivation
-# 3) Get the main `Cargo.lock` and copy it to `Cargo.lock`:
-#     https://gitlab.com/mission-center-devs/mission-center/-/blob/v<VERSION>/Cargo.lock?ref_type=tags
-# 4) Get the gatherer `Cargo.lock` and copy it to `gatherer-Cargo.lock`:
-#     https://gitlab.com/mission-center-devs/mission-center/-/blob/v<VERSION>/src/sys_info_v2/gatherer/Cargo.lock?ref_type=tags
-# 5) Refresh both the `nvtop` and `src` hashes
+# 3) Refresh all hashes:
+#   - main `src`
+#   - `nvtop` (if needed)
+#   - **both** CargoDeps hashes

 let
  nvtop = fetchFromGitHub {
@ -73,8 +72,15 @@ stdenv.mkDerivation rec {
  cargoDeps = symlinkJoin {
    name = "cargo-vendor-dir";
    paths = [
-      (rustPlatform.importCargoLock { lockFile = ./Cargo.lock; })
-      (rustPlatform.importCargoLock { lockFile = ./gatherer-Cargo.lock; })
+      (rustPlatform.fetchCargoVendor {
+        inherit pname version src;
+        hash = "sha256-Yd6PlsSo8/yHMF4YdYz1Io4uGniAMyIj2RKy3yK4byU=";
+      })
+      (rustPlatform.fetchCargoVendor {
+        inherit pname version src;
+        sourceRoot = "${src.name}/src/sys_info_v2/gatherer";
+        hash = "sha256-oUAPJWNElj08jfmsdXz/o2bgzeBQsbm6nWHC8jGN2n0=";
+      })
    ];
  };

--- a/pkgs/by-name/mo/monado/package.nix
+++ b/pkgs/by-name/mo/monado/package.nix
@ -1,64 +1,66 @@
-{ lib
-, stdenv
-, fetchFromGitLab
-, writeText
-, bluez
-, cjson
-, cmake
-, config
-, dbus
-, doxygen
-, eigen
-, elfutils
-, glslang
-, gst-plugins-base
-, gstreamer
-, hidapi
-, libbsd
-, libdrm
-, libffi
-, libGL
-, libjpeg
-, librealsense
-, libsurvive
-, libunwind
-, libusb1
-, libuv
-, libuvc
-, libv4l
-, libXau
-, libxcb
-, libXdmcp
-, libXext
-, libXrandr
-, nix-update-script
-, onnxruntime
-, opencv4
-, openhmd
-, openvr
-, orc
-, pcre2
-, pkg-config
-, python3
-, SDL2
-, shaderc
-, tracy
-, udev
-, vulkan-headers
-, vulkan-loader
-, wayland
-, wayland-protocols
-, wayland-scanner
-, zlib
-, zstd
-, nixosTests
-, cudaPackages
-, enableCuda ? config.cudaSupport
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  writeText,
+  bluez,
+  cjson,
+  cmake,
+  config,
+  dbus,
+  doxygen,
+  eigen,
+  elfutils,
+  fetchpatch2,
+  glslang,
+  gst-plugins-base,
+  gstreamer,
+  hidapi,
+  libbsd,
+  libdrm,
+  libffi,
+  libGL,
+  libjpeg,
+  librealsense,
+  libsurvive,
+  libunwind,
+  libusb1,
+  libuv,
+  libuvc,
+  libv4l,
+  libXau,
+  libxcb,
+  libXdmcp,
+  libXext,
+  libXrandr,
+  nix-update-script,
+  onnxruntime,
+  opencv4,
+  openhmd,
+  openvr,
+  orc,
+  pcre2,
+  pkg-config,
+  python3,
+  SDL2,
+  shaderc,
+  tracy,
+  udev,
+  vulkan-headers,
+  vulkan-loader,
+  wayland,
+  wayland-protocols,
+  wayland-scanner,
+  zlib,
+  zstd,
+  nixosTests,
+  cudaPackages,
+  enableCuda ? config.cudaSupport,
  # Set as 'false' to build monado without service support, i.e. allow VR
  # applications linking against libopenxr_monado.so to use OpenXR standalone
  # instead of via the monado-service program. For more information see:
  # https://gitlab.freedesktop.org/monado/monado/-/blob/master/doc/targets.md#xrt_feature_service-disabled
-, serviceSupport ? true
+  serviceSupport ? true,
 }:

 stdenv.mkDerivation (finalAttrs: {
@ -81,14 +83,11 @@ stdenv.mkDerivation (finalAttrs: {
    python3
  ];

-  cmakeFlags = [
-    (lib.cmakeBool "XRT_FEATURE_SERVICE" serviceSupport)
-    (lib.cmakeBool "XRT_OPENXR_INSTALL_ABSOLUTE_RUNTIME_PATH" true)
-    (lib.cmakeBool "XRT_HAVE_TRACY" true)
-    (lib.cmakeBool "XRT_FEATURE_TRACING" true)
-    (lib.cmakeBool "XRT_HAVE_STEAM" true)
-    (lib.optionals enableCuda "-DCUDA_TOOLKIT_ROOT_DIR=${cudaPackages.cudatoolkit}")
-  ];
+  # known disabled drivers/features:
+  #  - DRIVER_DEPTHAI - Needs depthai-core https://github.com/luxonis/depthai-core (See https://github.com/NixOS/nixpkgs/issues/292618)
+  #  - DRIVER_ILLIXR - needs ILLIXR headers https://github.com/ILLIXR/ILLIXR (See https://github.com/NixOS/nixpkgs/issues/292661)
+  #  - DRIVER_ULV2 - Needs proprietary Leapmotion SDK https://api.leapmotion.com/documentation/v2/unity/devguide/Leap_SDK_Overview.html (See https://github.com/NixOS/nixpkgs/issues/292624)
+  #  - DRIVER_ULV5 - Needs proprietary Leapmotion SDK https://api.leapmotion.com/documentation/v2/unity/devguide/Leap_SDK_Overview.html (See https://github.com/NixOS/nixpkgs/issues/292624)

  buildInputs = [
    bluez
@ -135,11 +134,24 @@ stdenv.mkDerivation (finalAttrs: {
    zstd
  ];

-  # known disabled drivers/features:
-  #  - DRIVER_DEPTHAI - Needs depthai-core https://github.com/luxonis/depthai-core (See https://github.com/NixOS/nixpkgs/issues/292618)
-  #  - DRIVER_ILLIXR - needs ILLIXR headers https://github.com/ILLIXR/ILLIXR (See https://github.com/NixOS/nixpkgs/issues/292661)
-  #  - DRIVER_ULV2 - Needs proprietary Leapmotion SDK https://api.leapmotion.com/documentation/v2/unity/devguide/Leap_SDK_Overview.html (See https://github.com/NixOS/nixpkgs/issues/292624)
-  #  - DRIVER_ULV5 - Needs proprietary Leapmotion SDK https://api.leapmotion.com/documentation/v2/unity/devguide/Leap_SDK_Overview.html (See https://github.com/NixOS/nixpkgs/issues/292624)
+  patches = [
+    # Remove this patch on the next update
+    # https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2338
+    (fetchpatch2 {
+      name = "improve-reproducibility.patch";
+      url = "https://gitlab.freedesktop.org/monado/monado/-/commit/9819fb6dd61d2af5b2d993ed37b976760002b055.patch";
+      hash = "sha256-qpTF1Q64jl8ZnJzMtflrpHLahCqfde2DXA9/Avlc18I=";
+    })
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "XRT_FEATURE_SERVICE" serviceSupport)
+    (lib.cmakeBool "XRT_OPENXR_INSTALL_ABSOLUTE_RUNTIME_PATH" true)
+    (lib.cmakeBool "XRT_HAVE_TRACY" true)
+    (lib.cmakeBool "XRT_FEATURE_TRACING" true)
+    (lib.cmakeBool "XRT_HAVE_STEAM" true)
+    (lib.optionals enableCuda "-DCUDA_TOOLKIT_ROOT_DIR=${cudaPackages.cudatoolkit}")
+  ];

  # Help openxr-loader find this runtime
  setupHook = writeText "setup-hook" ''
@ -151,12 +163,15 @@ stdenv.mkDerivation (finalAttrs: {
    tests.basic-service = nixosTests.monado;
  };

-  meta = with lib; {
+  meta = {
    description = "Open source XR runtime";
    homepage = "https://monado.freedesktop.org/";
-    license = licenses.boost;
-    maintainers = with maintainers; [ Scrumplex prusnak ];
-    platforms = platforms.linux;
+    license = lib.licenses.boost;
+    maintainers = with lib.maintainers; [
+      Scrumplex
+      prusnak
+    ];
+    platforms = lib.platforms.linux;
    mainProgram = "monado-cli";
  };
 })
--- a/pkgs/by-name/mp/mpris-timer/package.nix
+++ b/pkgs/by-name/mp/mpris-timer/package.nix
@ -0,0 +1,67 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  pkg-config,
+  glib,
+  wrapGAppsHook4,
+  alsa-lib,
+  gobject-introspection,
+  gtk4,
+  libadwaita,
+}:
+
+buildGoModule rec {
+  pname = "mpris-timer";
+  version = "1.1.1";
+
+  src = fetchFromGitHub {
+    owner = "efogdev";
+    repo = "mpris-timer";
+    rev = "refs/tags/${version}";
+    hash = "sha256-Ak9DASAfW+dOhfbQDRAZJ1YD8j5Fcpz05jlXlUG1ydo=";
+  };
+  vendorHash = "sha256-APcQgNEn7ULIjBk7f4q6MMSX9k58+F7vzgUDiIZ3Jxc=";
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    glib
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    alsa-lib
+    gobject-introspection
+    gtk4
+    libadwaita
+  ];
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+  tags = [
+    "wayland"
+  ];
+
+  postInstall = ''
+    install -Dm644 internal/ui/res/icon.svg $out/share/icons/hicolor/scalable/apps/io.github.efogdev.mpris-timer.svg
+    install -Dm644 misc/io.github.efogdev.mpris-timer.desktop -t $out/share/applications
+    install -Dm644 misc/io.github.efogdev.mpris-timer.metainfo.xml -t $out/share/metainfo
+    install -Dm644 misc/io.github.efogdev.mpris-timer.gschema.xml -t $out/share/glib-2.0/schemas
+    glib-compile-schemas $out/share/glib-2.0/schemas
+  '';
+
+  meta = {
+    description = "Timer app with seamless GNOME integration";
+    homepage = "https://github.com/efogdev/mpris-timer";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      stunkymonkey
+      getchoo
+    ];
+    mainProgram = "mpris-timer";
+  };
+}
--- a/pkgs/by-name/mu/multiviewer-for-f1/package.nix
+++ b/pkgs/by-name/mu/multiviewer-for-f1/package.nix
@ -23,15 +23,15 @@
 , xorg
 }:
 let
-  id = "180492850";
+  id = "203624820";
 in
 stdenvNoCC.mkDerivation rec {
  pname = "multiviewer-for-f1";
-  version = "1.35.2";
+  version = "1.36.2";

  src = fetchurl {
    url = "https://releases.multiviewer.dev/download/${id}/multiviewer-for-f1_${version}_amd64.deb";
-    sha256 = "sha256-V1+kMgfbgDS47YNIotmzrh2Hry5pvdQvrzWwuKJY1oM=";
+    sha256 = "sha256-b9Sx5Zcn+zQ9yFwrosHp1bTENByhBUU3VJfZA2HPoPU=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ne/nerdfix/package.nix
+++ b/pkgs/by-name/ne/nerdfix/package.nix
@ -5,16 +5,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "nerdfix";
-  version = "0.4.1";
+  version = "0.4.2";

  src = fetchFromGitHub {
    owner = "loichyan";
    repo = "nerdfix";
    rev = "v${version}";
-    hash = "sha256-5pUFj3K4yH/M8F+ZpCHFO3gEfxQ4pwxRa6uJbejrQxQ=";
+    hash = "sha256-Mp8QFzMQXJEFIzkrmiW/wxMy/+WC4VqbPtWzE92z9Gc=";
  };

-  cargoHash = "sha256-6S6NyX2hmkekgpuLaBjBxoybnqJpJXtqelJ+6YzxA0I=";
+  cargoHash = "sha256-g3Y9yGvWoXPcthDX2/nfWVmNW5mJYILgrJc+Oy+M2fk=";

  meta = with lib; {
    description = "Nerdfix helps you to find/fix obsolete nerd font icons in your project";
--- a/pkgs/by-name/om/omnom/package.nix
+++ b/pkgs/by-name/om/omnom/package.nix
@ -3,17 +3,21 @@
  buildGoModule,
  fetchFromGitHub,
  makeWrapper,
+
+  # for addons
+  buildNpmPackage,
+  zip,
 }:

-buildGoModule {
+buildGoModule rec {
  pname = "omnom";
-  version = "0-unstable-2024-08-29";
+  version = "0-unstable-2024-11-20";

  src = fetchFromGitHub {
    owner = "asciimoo";
    repo = "omnom";
-    rev = "1fcd7787886503f703bbcd31b193d4c93acc5610";
-    hash = "sha256-o/n8rgngQkYEn8J0aFpCiD4qrWVFaaa305OxiscU6+8=";
+    rev = "dbf40c9c50b74335286faea7c5070bba11dced83";
+    hash = "sha256-dl0jfFwn+Fd8/aQNhXFNEoDIMgMia2MHZntp0EKhimg=";
    fetchSubmodules = true;
  };

@ -28,24 +32,46 @@ buildGoModule {
    "-w"
  ];

-  postPatch = ''
-    # For the default config to work, we have to put `static/data` and
-    # `db.sqlite3` in a temporary directory since they need to be writeable.
-    #
-    # NOTE: Currently, `static/data` only holds the snapshots directory.
-    substituteInPlace config.yml \
-      --replace-fail 'root: "./static/data"' 'root: "/tmp/omnom/static/data"' \
-      --replace-fail 'connection: "./db.sqlite3"' 'connection: "/tmp/omnom/db.sqlite3"' \
-      --replace-fail 'debug: true' 'debug: false'
-  '';
+  postBuild =
+    let
+      omnom-addons = buildNpmPackage {
+        pname = "omnom-addons";
+        inherit version src;
+
+        npmDepsHash = "sha256-sUn5IvcHWJ/yaqeGz9SGvGx9HHAlrcnS0lJxIxUVS6M=";
+        sourceRoot = "${src.name}/ext";
+        npmPackFlags = [ "--ignore-scripts" ];
+
+        nativeBuildInputs = [ zip ];
+
+        postBuild = ''
+          mkdir -p $out
+
+          zip -r "$out/omnom_ext_src.zip" README.md src utils package* webpack.config.js
+
+          pushd build
+            zip "$out/omnom_ext_chrome.zip" ./* icons/* -x manifest_ff.json
+            zip "$out/omnom_ext_firefox.zip" ./* icons/* -x manifest_ff.json
+          popd
+        '';
+
+        postCheck = ''
+          npm run build-test
+        '';
+      };
+    in
+    ''
+      mkdir -p $out/share/addons
+
+      # Copy Firefox and Chrome addons
+      cp -r ${omnom-addons}/*.zip $out/share/addons
+    '';

  postInstall = ''
-    mkdir -p $out/share
-    cp -r config.yml static templates $out/share
+    mkdir -p $out/share/examples

-    wrapProgram $out/bin/omnom \
-      --chdir $out/share \
-      --set-default GIN_MODE release
+    cp -r static templates $out/share
+    cp config.yml_sample $out/share/examples/config.yml
  '';

  meta = {
--- a/pkgs/by-name/on/onefetch/package.nix
+++ b/pkgs/by-name/on/onefetch/package.nix
@ -1,39 +1,48 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, cmake
-, installShellFiles
-, pkg-config
-, zstd
-, stdenv
-, CoreFoundation
-, libresolv
-, Security
-, git
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  cmake,
+  installShellFiles,
+  pkg-config,
+  zstd,
+  stdenv,
+  darwin,
+  git,
 }:

+let
+  inherit (darwin) libresolv;
+in
 rustPlatform.buildRustPackage rec {
  pname = "onefetch";
-  version = "2.21.0";
+  version = "2.22.0";

  src = fetchFromGitHub {
    owner = "o2sh";
    repo = pname;
    rev = version;
-    hash = "sha256-KQs7b+skXQhHbfHIJkgowNY2FB6oS2V8TQFdkmElC/k=";
+    hash = "sha256-Gk1hoC6qsLYm7DbbaRSur6GdC9yXQe+mYLUJklXIwZ4=";
  };

-  cargoHash = "sha256-gKA1MMahoaDFia8LR33GG3jRttZzHwpUpFawlCQcy7g=";
+  cargoHash = "sha256-4YB10uj4ULhvhn+Yv0dRZO8fRxwm3lEAZ5v+MYHO7lI=";

  cargoPatches = [
    # enable pkg-config feature of zstd
    ./zstd-pkg-config.patch
  ];

-  nativeBuildInputs = [ cmake installShellFiles pkg-config ];
+  nativeBuildInputs = [
+    cmake
+    installShellFiles
+    pkg-config
+  ];

-  buildInputs = [ zstd ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation libresolv Security ];
+  buildInputs =
+    [ zstd ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      libresolv
+    ];

  nativeCheckInputs = [
    git
@ -59,7 +68,11 @@ rustPlatform.buildRustPackage rec {
    homepage = "https://github.com/o2sh/onefetch";
    changelog = "https://github.com/o2sh/onefetch/blob/v${version}/CHANGELOG.md";
    license = licenses.mit;
-    maintainers = with maintainers; [ Br1ght0ne figsoda kloenk ];
+    maintainers = with maintainers; [
+      Br1ght0ne
+      figsoda
+      kloenk
+    ];
    mainProgram = "onefetch";
  };
 }
--- a/pkgs/by-name/on/onefetch/zstd-pkg-config.patch
+++ b/pkgs/by-name/on/onefetch/zstd-pkg-config.patch
@ -17,7 +17,6 @@ index a0a2777..ad146cb 100644
@@ -65,6 +65,7 @@ time-humanize = { version = "0.1.3", features = ["time"] }
 tokei = "12.1.2"
 typetag = "0.2"
- parking_lot = "0.12"
 +zstd = { version = "*", features = ["pkg-config"] }
 
 [dev-dependencies]
--- a/pkgs/by-name/op/openscad-unstable/package.nix
+++ b/pkgs/by-name/op/openscad-unstable/package.nix
@ -43,12 +43,12 @@
 # clang consume much less RAM than GCC
 clangStdenv.mkDerivation rec {
  pname = "openscad-unstable";
-  version = "2024-11-10";
+  version = "2024-11-18";
  src = fetchFromGitHub {
    owner = "openscad";
    repo = "openscad";
-    rev = "681fff1cdcd5f67253958c39d9fefdc3762b38d8";
-    hash = "sha256-aFrlFFbpEBt4JJ3HCZLmaptomZBpCTqLD7vKIspDX74=";
+    rev = "d65040e820ace5685554c40a7e584125b7df409e";
+    hash = "sha256-dIZhye1tycDMpJxjIUPioeTah2XS95jkr8HgGgZc5CU=";
    fetchSubmodules = true;  # Only really need sanitizers-cmake and MCAD
  };

--- a/pkgs/by-name/pi/piped/package.nix
+++ b/pkgs/by-name/pi/piped/package.nix
@ -0,0 +1,43 @@
+{
+  lib,
+  buildNpmPackage,
+  pnpm,
+  fetchFromGitHub,
+  unstableGitUpdater,
+}:
+
+buildNpmPackage rec {
+  pname = "piped";
+  version = "0-unstable-2024-11-04";
+
+  src = fetchFromGitHub {
+    owner = "TeamPiped";
+    repo = "piped";
+    rev = "7866c06801baef16ce94d6f4dd0f8c1b8bc88153";
+    hash = "sha256-o3TwE0s5rim+0VKR+oW9Rv3/eQRf2dgRQK4xjZ9pqCE=";
+  };
+
+  npmConfigHook = pnpm.configHook;
+
+  installPhase = ''
+    runHook preInstall
+    cp dist $out -r
+    runHook postInstall
+  '';
+
+  npmDeps = pnpmDeps;
+  pnpmDeps = pnpm.fetchDeps {
+    inherit pname version src;
+    hash = "sha256-WtZfRZFRV9I1iBlAoV69GGFjdiQhTSBG/iiEadPVcys=";
+  };
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    homepage = "https://github.com/TeamPiped/Piped";
+    description = "Efficient and privacy-friendly YouTube frontend";
+    maintainers = [ lib.maintainers.lucasew ];
+    license = [ lib.licenses.agpl3Plus ];
+  };
+
+}
--- a/pkgs/by-name/pr/protoc-gen-go/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-go/package.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "protoc-gen-go";
-  version = "1.35.1";
+  version = "1.35.2";

  src = fetchFromGitHub {
    owner = "protocolbuffers";
    repo = "protobuf-go";
    rev = "v${version}";
-    hash = "sha256-SYSGC7LtKHdGuEQnjTzqRo8NxyxYXs4nMMflztRwJok=";
+    hash = "sha256-mgAMO7B9lYAtgcW5RjDzyjRzQL+v8jqvgo0eTswamHE=";
  };

  vendorHash = "sha256-nGI/Bd6eMEoY0sBwWEtyhFowHVvwLKjbT4yfzFz6Z3E=";
--- a/pkgs/by-name/qm/qmk/package.nix
+++ b/pkgs/by-name/qm/qmk/package.nix
@ -45,7 +45,7 @@ python3.pkgs.buildPythonApplication rec {
    gnumake
    pkgsCross.avr.buildPackages.binutils
    pkgsCross.avr.buildPackages.binutils.bintools
-    pkgsCross.avr.buildPackages.gcc8
+    pkgsCross.avr.buildPackages.gcc
    pkgsCross.avr.libcCross
  ];

--- a/pkgs/by-name/qu/quake-injector/deps.json
+++ b/pkgs/by-name/qu/quake-injector/deps.json
@ -0,0 +1,190 @@
+{
+ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
+ "!version": 1,
+ "https://github.com": {
+  "adoptium/temurin17-binaries/releases/download/jdk-17.0.10%2B7/OpenJDK17U-jdk_x86-32_windows_hotspot_17.0.10_7": {
+   "zip": "sha256-EWZ+nnu8uYBDDWzGMFUxYqDBikI4xLBAu2cc2AYHcQY="
+  }
+ },
+ "https://jcenter.bintray.com": {
+  "com/github/spotbugs#spotbugs-annotations/4.2.2": {
+   "jar": "sha256-VlfEgKMYg88/xtEuauUiyfzJpjA7RZOe5Cyi4Mz07QQ=",
+   "module": "sha256-yjYif6H3bmbT7boJ5N9R38nyrfkyttH6EjT+Lx0KB5s=",
+   "pom": "sha256-vz9CdawvbTnQq1gV28D2/yYBUoRztjtpkGdM3uuuRaM="
+  },
+  "com/github/spotbugs#spotbugs/4.2.2": {
+   "jar": "sha256-JO9T3cYiZAe+ndgHzFy5ZFQwKG91Bb0yK24Cc9Bz8DY=",
+   "module": "sha256-vRozvig14GQmmfibS3VeJ1iNrYu5vbuAYxT6LdWECRQ=",
+   "pom": "sha256-M2abH/xQYg2pZA2xlZepdre64Cab/05yd7Gg3D1qUNA="
+  },
+  "com/google/code/findbugs#jsr305/3.0.2": {
+   "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=",
+   "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4="
+  },
+  "com/google/code/gson#gson-parent/2.8.6": {
+   "pom": "sha256-NzZGOFnsGSZyleiUlAroKo9oRBMDESL+Nc58/34wp3Q="
+  },
+  "com/google/code/gson#gson/2.8.6": {
+   "jar": "sha256-yPtIOQVNKAswM/gA0fWpfeLwKOuLoutFitKH5Tbz8l8=",
+   "pom": "sha256-IXRBWmRzMtMP2gS9HPxwij7MhOr3UX9ZYYjYJE4QORE="
+  },
+  "edu/stanford/ejalbert#BrowserLauncher2/1.3": {
+   "jar": "sha256-pt7rHbhm7S+cyE7uu4kIgOfOAgptYS9pnpBAOuP371o=",
+   "pom": "sha256-zcuMk+OUxzYg8zUs1ALIN0rF3wI7bJArOhDST1SUeG0="
+  },
+  "jaxen#jaxen/1.2.0": {
+   "jar": "sha256-cP7vndda0GTe8Fo86Jda66UV7n0b4UbRIZnIgopkF0w=",
+   "pom": "sha256-zEgr+qIqVQepb6WzorYVkRRDrT9zZOAgBNGQsGfzsH8="
+  },
+  "net/jcip#jcip-annotations/1.0": {
+   "jar": "sha256-vlgFOSBgxxR0v2yaZ6CZRxJ00wuD7vhL/E4IiaTx3MA=",
+   "pom": "sha256-XBnmhIzFUKlWZPsIIwS8X5/Pe2cvrwOvFjXw6TwmgXc="
+  },
+  "net/sf/launch4j#launch4j/3.14": {
+   "pom": "sha256-xEYpdod2nJWyb2Qg9zsr0qKd90TYllTAdKhVb2Is+Vs="
+  },
+  "net/sf/launch4j#launch4j/3.14/workdir-linux64": {
+   "jar": "sha256-mphFGb9E6CWlsEFZfgVPi/qy+Tpm+na30aM79JIcNUY="
+  },
+  "net/sf/saxon#Saxon-HE/10.3": {
+   "jar": "sha256-ZgqJFipXfP1zvD2zxTy+x+gtSrIFEkfzGSfxNa/3yQg=",
+   "pom": "sha256-FfRI8O2fblTGre47tov582btryOPYW33hB8dzXc3hpg="
+  },
+  "org/apache#apache/21": {
+   "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A="
+  },
+  "org/apache#apache/23": {
+   "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw="
+  },
+  "org/apache/bcel#bcel/6.5.0": {
+   "jar": "sha256-ves4HQ0ZmZ4iHmoPjYv0T1sZwuV+q/aLcNwJhlKu+vU=",
+   "pom": "sha256-/B6eb17UvSAMsGYghsiYwAAmOGoutKY0hBH34OBotcU="
+  },
+  "org/apache/commons#commons-lang3/3.12.0": {
+   "jar": "sha256-2RnZBEhsA3+NGTQS2gyS4iqfokIwudZ6V4VcXDHH6U4=",
+   "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo="
+  },
+  "org/apache/commons#commons-parent/50": {
+   "pom": "sha256-e3ots/dHB0tYZ/VT1e/IByvibt4yh50FLDR+fIERfwY="
+  },
+  "org/apache/commons#commons-parent/51": {
+   "pom": "sha256-m3edGLItjeVZYFVY57sKCjGz8Awqu5yHgRfDmKrKvso="
+  },
+  "org/apache/commons#commons-parent/52": {
+   "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4="
+  },
+  "org/apache/commons#commons-text/1.9": {
+   "jar": "sha256-CBLyhKxd0NYXRh2aKrasaBETfyUSLf/9R4ikhx5zLQA=",
+   "pom": "sha256-n5IWz8lE3KeC5jEdYnV/13Fk/mfaKbWPAVaH+gn0QFA="
+  },
+  "org/dom4j#dom4j/2.1.3": {
+   "jar": "sha256-VJ8wB8YpD2qQHlfR0zG07Q5r9zhPeL8QMW/87sqDTeY=",
+   "module": "sha256-3sfF/Y1SDa+1exXi87a+LxgFYTQqP0Ub7u6QVUO8FwM=",
+   "pom": "sha256-zcnEn1nSMNQnF3G7dkqnCX1qy83CUAFJ5NLJUd9crDA="
+  },
+  "org/junit#junit-bom/5.7.1": {
+   "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=",
+   "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q="
+  },
+  "org/ow2#ow2/1.5": {
+   "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs="
+  },
+  "org/ow2/asm#asm-analysis/9.1": {
+   "jar": "sha256-gaiAQbG4vtpaiplkYJgEbEhwlTgnDEne9oq/8lrDvjQ=",
+   "pom": "sha256-rFRUwRsDQxypUd9x+06GyMTIDfaXn5W3V8rtOrD0cVY="
+  },
+  "org/ow2/asm#asm-commons/9.1": {
+   "jar": "sha256-r8sm3B/BLAxKma2mcJCN2C4Y38SIyvXuklRplrRwwAw=",
+   "pom": "sha256-oPZRsnuK/pwOYS16Ambqy197HHh7xLWsgkXz16EYG38="
+  },
+  "org/ow2/asm#asm-tree/9.1": {
+   "jar": "sha256-/QCvpJ6VlddkYgWwnOy0p3ao/wugby1ZuPe/nHBLSnM=",
+   "pom": "sha256-tqANkgfANUYPgcfXDtQSU/DSFmUr7UX6GjBS/81QuUw="
+  },
+  "org/ow2/asm#asm-util/9.1": {
+   "jar": "sha256-OA4uzRb3zA8adrqboEkXm1dgpXsoKoekxlPK7/LNW9Y=",
+   "pom": "sha256-jd108aHiuTxwnZdtAgXnT7850AVwPJYmpe1cxXTK+88="
+  },
+  "org/ow2/asm#asm/9.1": {
+   "jar": "sha256-zaTeRV+rSP8Ly3xItGOUR9TehZp6/DCglKmG8JNr66I=",
+   "pom": "sha256-xoOpDdaPKxeIy9/EZH6pQF71kls3HBmfj9OdRNPO3o0="
+  },
+  "org/slf4j#slf4j-api/1.8.0-beta4": {
+   "jar": "sha256-YCtxIynIS0qDxARk9P39D+QjjFPvOXE5qGcGRznb9OA=",
+   "pom": "sha256-+DFtKKzyUrIbHp6O7ZqEwq+9yOBA9p06ELq4E9PYWoU="
+  },
+  "org/slf4j#slf4j-parent/1.8.0-beta4": {
+   "pom": "sha256-uvujCoPVOpRVAZZEdWKqjNrRRWFcKJMsaku0QcNVMQE="
+  },
+  "org/slf4j#slf4j-simple/1.8.0-beta4": {
+   "jar": "sha256-usZqvFtEYt/2Lh4ZqzsKZcFg681WTPJZENsAOo5WnP0=",
+   "pom": "sha256-oXrS6OU00OgZ6o0UIT3nSNRlD/8qJX0+kqE9oxAoe/c="
+  },
+  "org/sonatype/oss#oss-parent/7": {
+   "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
+  }
+ },
+ "https://plugins.gradle.org/m2": {
+  "com/formdev#flatlaf/1.0": {
+   "jar": "sha256-E12NWsOf7CnZs/9SyzBybT+XawaYYVvjJTT9eSTynsc=",
+   "module": "sha256-dStur7AL/wRCGXCYLcqvz1l7SajJE64M73XkKHYKC68=",
+   "pom": "sha256-ylkCGnUHptHH0ZM+DN+hxKlpqgTsaMYsMdYTMtMAlpo="
+  },
+  "com/github/spotbugs#com.github.spotbugs.gradle.plugin/4.7.1": {
+   "pom": "sha256-vzSvShy4wBuhRYlSW5K1KXuRB3UmfD4r86m9Y5WEIXc="
+  },
+  "com/thoughtworks/xstream#xstream-parent/1.4.15": {
+   "pom": "sha256-GDOZpW5OtAJkCjcZURmuZx61kW17OKX2PpTvGvkPuc4="
+  },
+  "com/thoughtworks/xstream#xstream/1.4.15": {
+   "jar": "sha256-MneEmWGqnrBV+HcYEEUAhtOMwuQH7rg0bQI56gIYpFM=",
+   "pom": "sha256-sX3W1xyyywYmTZ6q0a6Mgg5FdhTx1jRcdgmSB3Ei1EY="
+  },
+  "commons-beanutils#commons-beanutils/1.9.4": {
+   "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=",
+   "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA="
+  },
+  "commons-logging#commons-logging/1.2": {
+   "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=",
+   "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA="
+  },
+  "edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/2.5.0": {
+   "pom": "sha256-n0puUetm4COQOF+0PkmHup+PCZ5QD8WCPwKh9ZFQ4Q4="
+  },
+  "edu/sc/seis/launch4j#launch4j/2.5.0": {
+   "jar": "sha256-UX6wYGabD7AySfEXvtG5UbckhI1XLhpeSgnHRWnC8CQ=",
+   "module": "sha256-ujuCeHwFd2TaKUOOoAxuVaD1xcppLb6Pm0zt1QZVSXs=",
+   "pom": "sha256-sadCLzKqOPcR43vhoilGBV2MJiby9Xy2LUHMWR6h4TI="
+  },
+  "gradle/plugin/com/github/spotbugs/snom#spotbugs-gradle-plugin/4.7.1": {
+   "jar": "sha256-4zxJQ+EOPtJ1mRoZMFagVtdXUYUcvWGqysipEXTm4Kc=",
+   "pom": "sha256-aBZTKWh+foW+JoNs7+nuoWT4xFhi+M70qkP9yr+P7T8="
+  },
+  "net/sf/launch4j#launch4j/3.14": {
+   "pom": "sha256-xEYpdod2nJWyb2Qg9zsr0qKd90TYllTAdKhVb2Is+Vs="
+  },
+  "net/sf/launch4j#launch4j/3.14/core": {
+   "jar": "sha256-pGVAv4Nrz3s1AHM9n6f1muzYyDeUJz5zZlWrLKdXYjA="
+  },
+  "org/apache#apache/13": {
+   "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0="
+  },
+  "org/apache#apache/19": {
+   "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8="
+  },
+  "org/apache/commons#commons-parent/34": {
+   "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w="
+  },
+  "org/apache/commons#commons-parent/47": {
+   "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc="
+  },
+  "xmlpull#xmlpull/1.1.3.1": {
+   "jar": "sha256-NOCO5iEWBxy7acDtcNFaelsgjWJ5jFnyEgu4kpMky2M=",
+   "pom": "sha256-jxD/2N8NPpgZyMyEAnCcaySLxTqVTvbkVHDZrjpXNfs="
+  },
+  "xpp3#xpp3_min/1.1.4c": {
+   "jar": "sha256-v8kOnjLQ6rHzl/uXS18VCoFRiDgqxB83KnFJ1bwXgAg=",
+   "pom": "sha256-tbRqwMCdpBsE28dTRWtIkShWp/+7FJBnaRC1EMRx0T8="
+  }
+ }
+}
--- a/Show more
+++ b/Show more