diff --git a/ci/OWNERS b/ci/OWNERS
index 66055144f662..343b4283340f 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -124,6 +124,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix  @Artturin @Ericson2314 @lo
 
 # NixOS integration test driver
 /nixos/lib/test-driver  @tfc
+/nixos/lib/testing      @tfc
 
 # NixOS QEMU virtualisation
 /nixos/modules/virtualisation/qemu-vm.nix                 @raitobezarius
diff --git a/doc/languages-frameworks/lua.section.md b/doc/languages-frameworks/lua.section.md
index 50b48f90d507..366f7a497fc8 100644
--- a/doc/languages-frameworks/lua.section.md
+++ b/doc/languages-frameworks/lua.section.md
@@ -232,7 +232,7 @@ The following is an example:
         vyp
         lblasc
       ];
-      license.fullName = "MIT/X11";
+      license = lib.licenses.mit;
     };
   };
 }
diff --git a/doc/redirects.json b/doc/redirects.json
index 8f45ed9add20..41d1f5a9a3e9 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -412,6 +412,9 @@
   "sec-meta-identifiers-cpe": [
     "index.html#sec-meta-identifiers-cpe"
   ],
+  "sec-meta-identifiers-purl": [
+    "index.html#sec-meta-identifiers-purl"
+  ],
   "sec-modify-via-packageOverrides": [
     "index.html#sec-modify-via-packageOverrides"
   ],
@@ -932,6 +935,15 @@
   "var-meta-identifiers-possibleCPEs": [
     "index.html#var-meta-identifiers-possibleCPEs"
   ],
+  "var-meta-identifiers-purl": [
+    "index.html#var-meta-identifiers-purl"
+  ],
+  "var-meta-identifiers-purlParts": [
+    "index.html#var-meta-identifiers-purlParts"
+  ],
+  "var-meta-identifiers-purls": [
+    "index.html#var-meta-identifiers-purls"
+  ],
   "var-meta-teams": [
     "index.html#var-meta-teams"
   ],
diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md
index b3d4ce569f09..3b4c274609f8 100644
--- a/doc/release-notes/rl-2605.section.md
+++ b/doc/release-notes/rl-2605.section.md
@@ -366,6 +366,8 @@
 
 - We now use the upstream wrapper script for Gradle, supporting both the `JAVA_HOME` and `GRADLE_OPTS` environment variables.
 
+- Updated `gonic` to 0.21.0. A full ("slow") scan is recommended after upgrading to v0.21.0 to pick up the newly scanned fields (contributors, ISRCs, record labels, per-track years, ARTIST_CREDIT).
+
 - the `autossh-ng` NixOS module was introduced as a simpler alternative to the existing `autossh` module.
 
 - Added `haskell.packages.microhs`, a set of Haskell packages built with MicroHs.
diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md
index ed4f8a8240f3..33805fc50055 100644
--- a/doc/release-notes/rl-2611.section.md
+++ b/doc/release-notes/rl-2611.section.md
@@ -11,12 +11,17 @@
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
 - `hurl` has been updated to `8.x.x` which has some breaking changes. See [upstream changelog](https://github.com/Orange-OpenSource/hurl/releases/tag/8.0.0) for details.
+- `python3Packages.django-health-check` has been updated to major version 4. See its [migration guide](https://codingjoe.dev/django-health-check/migrate-to-v4/) and [changelog](https://github.com/codingjoe/django-health-check/releases/tag/4.0.0) for breaking changes.
 
 ## Other Notable Changes {#sec-nixpkgs-release-26.11-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
-- Create the first release note entry in this section!
+- Package-URL (PURL, https://github.com/package-url/purl-spec) metadata identifier has been added for `fetchgit`, `fetchpypi` and `fetchFromGithub` fetchers.
+  `mkDerivation` has been adjusted to reuse this information.
+  Package-URLs allow reliably identifying and locating software packages.
+  Maintainers of derivations using the adapted fetchers should rely on the `drv.src.meta.identifiers.v1.purl` default identifier and can enhance their `drv.meta.identifiers.v1.purls` list once they would like to have additional identifiers.
+  Maintainers using `fetchurl` for `drv.src` are urged to adapt their `drv.meta.identifiers.purlParts` for proper identification.
 
 ## Nixpkgs Library {#sec-nixpkgs-release-26.11-lib}
 
diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md
index 1fac5244af66..a88683ed37b7 100644
--- a/doc/stdenv/meta.chapter.md
+++ b/doc/stdenv/meta.chapter.md
@@ -334,3 +334,30 @@ A readonly attribute that concatenates all CPE parts in one string.
 #### `meta.identifiers.possibleCPEs` {#var-meta-identifiers-possibleCPEs}
 
 A readonly attribute containing the list of guesses for what CPE for this package can look like. It includes all variants of version handling mentioned above. Each item is an attrset with attributes `cpeParts` and `cpe` for each guess.
+
+### Package URL {#sec-meta-identifiers-purl}
+
+[Package-URL](https://github.com/package-url/purl-spec) (PURL) is a specification to reliably identify and locate software packages.
+Through identification of software packages, additional (non-major) use cases are e.g. software license cross-verification via third party databases or initial vulnerability response management.
+Package-URLs shall default to the `mkDerivation.src`, as the original consumed software package is the single source of truth.
+
+#### `meta.identifiers.purlParts` {#var-meta-identifiers-purlParts}
+
+This attribute contains an attribute set of all parts of the PURL for this package.
+
+* `type` mandatory [type](https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/docs/standard/summary.md) which needs to be provided
+* `spec` specify the PURL in accordance with the [purl-spec](https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/purl-specification.md)
+
+#### `meta.identifiers.purl` {#var-meta-identifiers-purl}
+
+An extendable attribute which is built based on `purlParts`.
+This is the main identifier of the software package.
+For handling edge cases, consider using the list interface [`meta.identifiers.purls`](#var-meta-identifiers-purls).
+
+#### `meta.identifiers.purls` {#var-meta-identifiers-purls}
+
+An extendable list attribute which defaults to a single element equal to [`meta.identifiers.purl`](#var-meta-identifiers-purl).
+It provides an interface for additional identifiers of `mkDerivation.src` or for identifiers of vendored dependencies inside `mkDerivation.src`, which maintainers may carefully consider to specify as well.
+
+Additional identifiers are generally not recommended, as they might cause maintenance overhead or diverge.
+For example, a source distribution `pkg:github` may be hard to keep correctly aligned with the corresponding binary distribution `pkg:pypi`.
diff --git a/lib/sources.nix b/lib/sources.nix
index 43bc2ab2dbe3..43a374c16e73 100644
--- a/lib/sources.nix
+++ b/lib/sources.nix
@@ -7,12 +7,19 @@ let
     match
     split
     storeDir
+    escapeRegex
+    removePrefix
     ;
   inherit (lib)
     boolToString
     filter
     isString
     readFile
+    concatStrings
+    length
+    elemAt
+    isList
+    any
     ;
   inherit (lib.filesystem)
     pathIsRegularFile
@@ -513,6 +520,113 @@ let
     else
       throw "repoRevToName: invalid kind";
 
+  /**
+    Filter a source tree by a list of doublestar-style glob patterns,
+    returning a source that only contains paths matching at least one
+    pattern. `*` matches a single path component, and `**` matches any
+    number of components.
+
+    # Inputs
+
+    `src`
+
+    : The source tree to filter.
+
+    `patterns`
+
+    : List of glob patterns to include, e.g. `[ "*.py" "src/**" ]`.
+      A leading `**` (e.g. `**\/*.py` for all `.py` files at any depth)
+      is also supported; the `\` here is just a Nix string escape used
+      to avoid closing this comment.
+
+    # Examples
+    :::{.example}
+    ## `sourceByGlobs` usage example
+
+    - Include everything under a subdirectory
+    ```nix
+    src = sourceByGlobs ./. [ "src/**" "tests/**" ]
+    ```
+
+    - Include all .py files in root directory only
+    ```nix
+    src = sourceByGlobs ./. [ "*.py" ]
+    ```
+
+    :::
+  */
+  sourceByGlobs =
+    let
+      splitPath = path: filter isString (split "/" path);
+      # Make component regex
+      mkRe =
+        s:
+        if s == "**" then
+          ".*" # Has special handling below
+        else
+          concatStrings (map (tok: if isList tok then "[^/]*" else escapeRegex tok) (split "\\*+" s));
+
+      # Make a source filter function from pattern
+      mkMatcher =
+        pat:
+        let
+          globs = map mkRe (splitPath pat);
+          glen = length globs;
+        in
+        path: type:
+        let
+          path' = splitPath path;
+          plen = length path';
+
+          recurse =
+            gi: pi:
+            let
+              g = elemAt globs gi;
+              p = elemAt path' pi;
+              m = match g p != null;
+            in
+            if pi >= plen then # Reached end of path
+              gi >= glen || (type == "directory" || type == "symlink") # Only allow partial matches for directories
+            else if gi >= glen then # Reached end of globs
+              false
+            else if g == ".*" then # Special handling for **
+              (
+                # Lookahead for next glob match
+                if (gi + 1) == glen then
+                  true
+                else if (match (elemAt globs (gi + 1)) p != null) then
+                  recurse (gi + 1) pi
+                else if m then
+                  recurse gi (pi + 1)
+                else
+                  false
+              )
+            else if m then
+              recurse (gi + 1) (pi + 1)
+            else
+              false;
+
+        in
+        recurse 0 0;
+
+      mkSourceFilter =
+        root: patterns:
+        let
+          root' = "${toString root}/";
+          matchers = map mkMatcher patterns;
+        in
+        name: type:
+        let
+          name' = removePrefix root' name;
+        in
+        any (m: m name' type) matchers;
+
+    in
+    src: patterns:
+    lib.cleanSourceWith {
+      filter = mkSourceFilter src patterns;
+      inherit src;
+    };
 in
 {
   inherit
@@ -532,6 +646,7 @@ in
 
     sourceByRegex
     sourceFilesBySuffices
+    sourceByGlobs
 
     trace
     ;
diff --git a/lib/tests/sources.sh b/lib/tests/sources.sh
index 079c7eea5657..08315a303bc2 100755
--- a/lib/tests/sources.sh
+++ b/lib/tests/sources.sh
@@ -70,4 +70,16 @@ dir="$(nix-instantiate --eval --strict --read-write-mode --json --expr '(with im
 EOF
 ) || die "cleanSourceWith + cleanSource"
 
+
+dir="$(nix-instantiate --eval --strict --read-write-mode --json --expr '(with import <nixpkgs/lib>; "${
+  sources.sourceByGlobs '"$work"' [ "*.md" "**/*.o" ]
+}")' | crudeUnquoteJSON)"
+(cd "$dir"; find) | sort -f | diff -U10 - <(cat <<EOF
+.
+./module.o
+./README.md
+EOF
+) || die "sourceByGlobs 1"
+
+
 echo >&2 tests ok
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a3649faceb2d..23cf0097e5d6 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4282,6 +4282,12 @@
       { fingerprint = "D088 A5AF C45B 78D1 CD4F  457C 6957 B3B6 46F2 BB4E"; }
     ];
   };
+  c6rg0 = {
+    email = "c6rg0@protonmail.com";
+    github = "c6rg0";
+    githubId = 64259221;
+    name = "c6rg0";
+  };
   caarlos0 = {
     name = "Carlos A Becker";
     email = "carlos@becker.software";
diff --git a/nixos/doc/manual/configuration/profiles/headless.section.md b/nixos/doc/manual/configuration/profiles/headless.section.md
index 6b84bb7d5cc9..dab7386913d3 100644
--- a/nixos/doc/manual/configuration/profiles/headless.section.md
+++ b/nixos/doc/manual/configuration/profiles/headless.section.md
@@ -2,7 +2,7 @@
 
 Common configuration for headless machines (e.g., Amazon EC2 instances).
 
-Disables [vesa](#opt-boot.vesa), serial consoles,
+Disables serial consoles,
 [emergency mode](#opt-systemd.enableEmergencyMode),
 [grub splash images](#opt-boot.loader.grub.splashImage)
 and configures the kernel to reboot automatically on panic.
diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md
index 47e64b314df7..e7bbe1501de4 100644
--- a/nixos/doc/manual/release-notes/rl-2605.section.md
+++ b/nixos/doc/manual/release-notes/rl-2605.section.md
@@ -220,6 +220,17 @@
 
 - `services.mattermost` now defaults to version 11, which has dropped support for MySQL in favor of Postgres. As a result, all support for MySQL has been removed from the module.
   See the [migration steps](https://docs.mattermost.com/deployment-guide/manual-postgres-migration.html) if you were not running Postgres.
+  Note that version 11 also restricts the user limit to 250 [by default](https://forum.mattermost.com/t/clarification-request-on-user-limits-max-250-user-server-v-11/25309);
+  see the `pkgs.mattermost` removeUserLimit and removeFreeBadge options combined with `services.mattermost.package` to change this behavior. For example:
+
+```nix
+{
+  services.mattermost.package = pkgs.mattermost.override {
+    removeUserLimit = true;
+    removeFreeBadge = true;
+  };
+}
+```
 
 - `post-resume.target` has been removed. See {manpage}`systemd.special(7)` about `sleep.target` for instructions on ordering a process after resume with `ExecStop=`.
 
diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md
index 05a52258d54e..17f5f67082f9 100644
--- a/nixos/doc/manual/release-notes/rl-2611.section.md
+++ b/nixos/doc/manual/release-notes/rl-2611.section.md
@@ -16,7 +16,7 @@
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
-- Create the first release note entry in this section!
+- `boot.vesa` has been removed. It was deprecated in 2020 because Xorg now works better with kernel modesetting. If you still need the legacy VESA 800x600 fallback, set `boot.kernelParams = [ "vga=0x317" "nomodeset" ];` directly.
 
 ## Other Notable Changes {#sec-release-26.11-notable-changes}
 
diff --git a/nixos/modules/config/console.nix b/nixos/modules/config/console.nix
index 8f6e1ffb409c..2b8759a46e62 100644
--- a/nixos/modules/config/console.nix
+++ b/nixos/modules/config/console.nix
@@ -217,7 +217,7 @@ in
           # When imperative, seed /etc/vconsole.conf on first boot from declared
           # defaults so the keymap isn't lost before localectl is ever used
           systemd.tmpfiles.rules = lib.mkIf i18nCfg.imperativeLocale [
-            "C /etc/vconsole.conf - - - - ${vconsoleConf}"
+            "C /etc/vconsole.conf - - - - ${vconsoleConf true}"
           ];
 
           systemd.services.reload-systemd-vconsole-setup = {
diff --git a/nixos/modules/programs/throne.nix b/nixos/modules/programs/throne.nix
index 0a9e1a599eeb..2023055892dd 100644
--- a/nixos/modules/programs/throne.nix
+++ b/nixos/modules/programs/throne.nix
@@ -23,7 +23,7 @@ in
         enable = lib.mkEnableOption "TUN mode of Throne";
 
         setuid = lib.mkEnableOption ''
-          setting suid bit for throne-core to run as root, which is less
+          setting suid bit for ThroneCore to run as root, which is less
           secure than default setcap method but closer to upstream assumptions.
           Enable this if you find the default setcap method configured in
           this module doesn't work for you
@@ -36,8 +36,8 @@ in
 
     environment.systemPackages = [ cfg.package ];
 
-    security.wrappers.throne-core = lib.mkIf cfg.tunMode.enable {
-      source = "${cfg.package}/share/throne/Core";
+    security.wrappers."ThroneCore" = lib.mkIf cfg.tunMode.enable {
+      source = "${cfg.package}/share/throne/ThroneCore";
       owner = "root";
       group = "root";
       setuid = lib.mkIf cfg.tunMode.setuid true;
@@ -49,7 +49,7 @@ in
 
     # avoid resolvectl password prompt popping up three times
     # https://github.com/SagerNet/sing-tun/blob/0686f8c4f210f4e7039c352d42d762252f9d9cf5/tun_linux.go#L1062
-    # We use a hack here to determine whether the requested process is throne-core
+    # We use a hack here to determine whether the requested process is ThroneCore
     # Detect whether its capabilities contain at least `net_admin` and `net_raw`.
     # This does not reduce security, as we can already bypass `resolved` with them.
     # Alternatives to consider:
@@ -61,7 +61,7 @@ in
     #    change its own cmdline. `/proc/<pid>/exe` is reliable but kernel forbids
     #    checking that entry of process from different users, and polkit runs `spawn`
     #    as an unprivileged user.
-    # 3. Put throne-core into a systemd service, and let polkit check service name.
+    # 3. Put ThroneCore into a systemd service, and let polkit check service name.
     #    This is the most secure and convenient way but requires heavy modification
     #    to Throne source code. Would be good to let upstream support that eventually.
     security.polkit.extraConfig =
@@ -69,6 +69,7 @@ in
         ''
           polkit.addRule(function(action, subject) {
             const allowedActionIds = [
+              "org.freedesktop.resolve1.revert",
               "org.freedesktop.resolve1.set-domains",
               "org.freedesktop.resolve1.set-default-route",
               "org.freedesktop.resolve1.set-dns-servers"
diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 21ae7b0fc983..20177350a740 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -245,156 +245,134 @@ in
   };
 
   ###### implementation
-  config = lib.mkMerge [
-    {
-      warnings = lib.optional (wrappers != { } && !config.security.enableWrappers) ''
-        security.enableWrappers is set to false, but the following wrappers are still enabled and will be silently ignored: ${lib.concatStringsSep ", " (lib.attrNames wrappers)}. This might prevent fundamental functionalities, like PAM authentication. To avoid this warning, either set security.enableWrappers = true, or explicitly disable each wrapper with `enable = false`.
-      '';
-      assertions = [
-        {
-          assertion =
-            !(
-              !config.security.enableWrappers && lib.any (u: u.isNormalUser) (lib.attrValues config.users.users)
-            );
-          message = ''
-            security.enableWrappers is disabled but normal users are defined
-            (${
-              lib.concatStringsSep ", " (
-                lib.mapAttrsToList (n: _: n) (lib.filterAttrs (_: u: u.isNormalUser) config.users.users)
-              )
-            }). Without SUID wrappers, users cannot login. Either enable wrappers or remove all normal user accounts.
-          '';
-        }
-      ];
-    }
-    (lib.mkIf config.security.enableWrappers {
-      assertions = lib.mapAttrsToList (name: opts: {
-        assertion = opts.setuid || opts.setgid -> opts.capabilities == "";
-        message = ''
-          The security.wrappers.${name} wrapper is not valid:
-              setuid/setgid and capabilities are mutually exclusive.
-        '';
-      }) wrappers;
+  config = lib.mkIf config.security.enableWrappers {
 
-      security.wrappers =
-        let
-          mkSetuidRoot = source: {
-            setuid = true;
-            owner = "root";
-            group = "root";
-            inherit source;
-          };
-        in
-        {
-          # These are mount related wrappers that require the +s permission.
-          mount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/mount";
-          umount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/umount";
+    assertions = lib.mapAttrsToList (name: opts: {
+      assertion = opts.setuid || opts.setgid -> opts.capabilities == "";
+      message = ''
+        The security.wrappers.${name} wrapper is not valid:
+            setuid/setgid and capabilities are mutually exclusive.
+      '';
+    }) wrappers;
+
+    security.wrappers =
+      let
+        mkSetuidRoot = source: {
+          setuid = true;
+          owner = "root";
+          group = "root";
+          inherit source;
         };
-
-      # Make sure our wrapperDir exports to the PATH env variable when
-      # initializing the shell
-      environment.extraInit = ''
-        # Wrappers override other bin directories.
-        export PATH="${wrapperDir}:$PATH"
-      '';
-
-      security.apparmor.includes = lib.mapAttrs' (
-        wrapName: wrap:
-        lib.nameValuePair "nixos/security.wrappers/${wrapName}" ''
-          include "${
-            pkgs.apparmorRulesFromClosure { name = "security.wrappers.${wrapName}"; } [
-              (securityWrapper wrap.source)
-            ]
-          }"
-          mrpx ${wrap.source},
-        ''
-      ) wrappers;
-
-      systemd.mounts = [
-        {
-          where = parentWrapperDir;
-          what = "tmpfs";
-          type = "tmpfs";
-          options = lib.concatStringsSep "," [
-            "nodev"
-            "mode=755"
-            "size=${config.security.wrapperDirSize}"
-          ];
-        }
-      ];
-
-      systemd.services.suid-sgid-wrappers = {
-        description = "Create SUID/SGID Wrappers";
-        wantedBy = [ "sysinit.target" ];
-        before = [
-          "sysinit.target"
-          "shutdown.target"
-        ];
-        conflicts = [ "shutdown.target" ];
-        after = [ "systemd-sysusers.service" ];
-        unitConfig.DefaultDependencies = false;
-        unitConfig.RequiresMountsFor = [
-          "/nix/store"
-          "/run/wrappers"
-        ];
-        serviceConfig.RestrictSUIDSGID = false;
-        serviceConfig.Type = "oneshot";
-        script = ''
-          chmod 755 "${parentWrapperDir}"
-
-          # We want to place the tmpdirs for the wrappers to the parent dir.
-          wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX)
-          chmod a+rx "$wrapperDir"
-
-          ${lib.concatStringsSep "\n" mkWrappedPrograms}
-
-          if [ -L ${wrapperDir} ]; then
-            # Atomically replace the symlink
-            # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/
-            old=$(readlink -f ${wrapperDir})
-            if [ -e "${wrapperDir}-tmp" ]; then
-              rm --force --recursive "${wrapperDir}-tmp"
-            fi
-            ln --symbolic --force --no-dereference "$wrapperDir" "${wrapperDir}-tmp"
-            mv --no-target-directory "${wrapperDir}-tmp" "${wrapperDir}"
-            rm --force --recursive "$old"
-          else
-            # For initial setup
-            ln --symbolic "$wrapperDir" "${wrapperDir}"
-          fi
-        '';
+      in
+      {
+        # These are mount related wrappers that require the +s permission.
+        mount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/mount";
+        umount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/umount";
       };
 
-      ###### wrappers consistency checks
-      system.checks = lib.singleton (
-        pkgs.runCommand "ensure-all-wrappers-paths-exist"
-          {
-            preferLocalBuild = true;
-          }
-          ''
-            # make sure we produce output
-            mkdir -p $out
+    # Make sure our wrapperDir exports to the PATH env variable when
+    # initializing the shell
+    environment.extraInit = ''
+      # Wrappers override other bin directories.
+      export PATH="${wrapperDir}:$PATH"
+    '';
 
-            echo -n "Checking that Nix store paths of all wrapped programs exist... "
+    security.apparmor.includes = lib.mapAttrs' (
+      wrapName: wrap:
+      lib.nameValuePair "nixos/security.wrappers/${wrapName}" ''
+        include "${
+          pkgs.apparmorRulesFromClosure { name = "security.wrappers.${wrapName}"; } [
+            (securityWrapper wrap.source)
+          ]
+        }"
+        mrpx ${wrap.source},
+      ''
+    ) wrappers;
 
-            declare -A wrappers
-            ${lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: "wrappers['${n}']='${v.source}'") wrappers)}
+    systemd.mounts = [
+      {
+        where = parentWrapperDir;
+        what = "tmpfs";
+        type = "tmpfs";
+        options = lib.concatStringsSep "," [
+          "nodev"
+          "mode=755"
+          "size=${config.security.wrapperDirSize}"
+        ];
+      }
+    ];
 
-            for name in "''${!wrappers[@]}"; do
-              path="''${wrappers[$name]}"
-              if [[ "$path" =~ /nix/store ]] && [ ! -e "$path" ]; then
-                test -t 1 && echo -ne '\033[1;31m'
-                echo "FAIL"
-                echo "The path $path does not exist!"
-                echo 'Please, check the value of `security.wrappers."'$name'".source`.'
-                test -t 1 && echo -ne '\033[0m'
-                exit 1
-              fi
-            done
+    systemd.services.suid-sgid-wrappers = {
+      description = "Create SUID/SGID Wrappers";
+      wantedBy = [ "sysinit.target" ];
+      before = [
+        "sysinit.target"
+        "shutdown.target"
+      ];
+      conflicts = [ "shutdown.target" ];
+      after = [ "systemd-sysusers.service" ];
+      unitConfig.DefaultDependencies = false;
+      unitConfig.RequiresMountsFor = [
+        "/nix/store"
+        "/run/wrappers"
+      ];
+      serviceConfig.RestrictSUIDSGID = false;
+      serviceConfig.Type = "oneshot";
+      script = ''
+        chmod 755 "${parentWrapperDir}"
 
-            echo "OK"
-          ''
-      );
-    })
-  ];
+        # We want to place the tmpdirs for the wrappers to the parent dir.
+        wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX)
+        chmod a+rx "$wrapperDir"
+
+        ${lib.concatStringsSep "\n" mkWrappedPrograms}
+
+        if [ -L ${wrapperDir} ]; then
+          # Atomically replace the symlink
+          # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/
+          old=$(readlink -f ${wrapperDir})
+          if [ -e "${wrapperDir}-tmp" ]; then
+            rm --force --recursive "${wrapperDir}-tmp"
+          fi
+          ln --symbolic --force --no-dereference "$wrapperDir" "${wrapperDir}-tmp"
+          mv --no-target-directory "${wrapperDir}-tmp" "${wrapperDir}"
+          rm --force --recursive "$old"
+        else
+          # For initial setup
+          ln --symbolic "$wrapperDir" "${wrapperDir}"
+        fi
+      '';
+    };
+
+    ###### wrappers consistency checks
+    system.checks = lib.singleton (
+      pkgs.runCommand "ensure-all-wrappers-paths-exist"
+        {
+          preferLocalBuild = true;
+        }
+        ''
+          # make sure we produce output
+          mkdir -p $out
+
+          echo -n "Checking that Nix store paths of all wrapped programs exist... "
+
+          declare -A wrappers
+          ${lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: "wrappers['${n}']='${v.source}'") wrappers)}
+
+          for name in "''${!wrappers[@]}"; do
+            path="''${wrappers[$name]}"
+            if [[ "$path" =~ /nix/store ]] && [ ! -e "$path" ]; then
+              test -t 1 && echo -ne '\033[1;31m'
+              echo "FAIL"
+              echo "The path $path does not exist!"
+              echo 'Please, check the value of `security.wrappers."'$name'".source`.'
+              test -t 1 && echo -ne '\033[0m'
+              exit 1
+            fi
+          done
+
+          echo "OK"
+        ''
+    );
+  };
 }
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index fe4b5e101151..73efd441d23d 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -206,11 +206,6 @@ let
                 if lib.isList cfg.sslCiphers then (lib.concatStringsSep ":" cfg.sslCiphers) else cfg.sslCiphers
               };"
             }
-            ${optionalString (cfg.sslDhparam != false)
-              "ssl_dhparam ${
-                if cfg.sslDhparam == true then config.security.dhparams.params.nginx.path else cfg.sslDhparam
-              };"
-            }
 
             ${optionalString cfg.recommendedTlsSettings ''
               # Consider https://ssl-config.mozilla.org/#server=nginx&config=intermediate as the lower bound
@@ -981,9 +976,6 @@ in
           "ECDHE-RSA-AES256-GCM-SHA384"
           "ECDHE-ECDSA-CHACHA20-POLY1305"
           "ECDHE-RSA-CHACHA20-POLY1305"
-          "DHE-RSA-AES128-GCM-SHA256"
-          "DHE-RSA-AES256-GCM-SHA384"
-          "DHE-RSA-CHACHA20-POLY1305"
         ];
         description = ''
           List of available cipher suites to choose from when negotiating TLS sessions.
@@ -1002,13 +994,6 @@ in
         description = "Allowed TLS protocol versions.";
       };
 
-      sslDhparam = mkOption {
-        type = types.either types.path types.bool;
-        default = false;
-        example = "/path/to/dhparams.pem";
-        description = "Path to DH parameters file, or `true` to generate with `security.dhparms.params.nginx`.";
-      };
-
       proxyResolveWhileRunning = mkOption {
         type = types.bool;
         default = false;
@@ -1308,6 +1293,13 @@ in
   };
 
   imports = [
+    (mkRemovedOptionModule [ "services" "nginx" "sslDhparam" ] ''
+      DHE cipher suites have been removed from the default nginx cipher list.
+
+      No additional configuration is required as ECDHE is used by default already.
+
+      If you wish to use Hybrid PQ key exchange, you can set services.nginx.recommendedTlsSettings = true.
+    '')
     (mkRemovedOptionModule [ "services" "nginx" "stateDir" ] ''
       The Nginx log directory has been moved to /var/log/nginx, the cache directory
       to /var/cache/nginx. The option services.nginx.stateDir has been removed.
@@ -1678,8 +1670,6 @@ in
       in
       listToAttrs acmePairs;
 
-    security.dhparams.params.nginx = lib.mkIf (cfg.sslDhparam == true) { };
-
     users.users = optionalAttrs (cfg.user == "nginx") {
       nginx = {
         group = cfg.group;
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index 9f05ac0ccd2e..6a9ec9571391 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -35,6 +35,15 @@ in
 
 {
 
+  imports = [
+    (mkRemovedOptionModule [ "boot" "vesa" ] ''
+      The `boot.vesa` option has been removed. It was deprecated in 2020
+      because Xorg now works better with kernel modesetting. If you still
+      need the legacy VESA 800x600 fallback, set
+      `boot.kernelParams = [ "vga=0x317" "nomodeset" ];` directly.
+    '')
+  ];
+
   ###### interface
 
   options = {
@@ -181,19 +190,6 @@ in
       '';
     };
 
-    boot.vesa = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        (Deprecated) This option, if set, activates the VESA 800x600 video
-        mode on boot and disables kernel modesetting. It is equivalent to
-        specifying `[ "vga=0x317" "nomodeset" ]` in the
-        {option}`boot.kernelParams` option. This option is
-        deprecated as of 2020: Xorg now works better with modesetting, and
-        you might want a different VESA vga setting, anyway.
-      '';
-    };
-
     boot.extraModulePackages = mkOption {
       type = types.listOf types.package;
       default = [ ];
@@ -427,10 +423,6 @@ in
       # (so you don't need to reboot to have changes take effect).
       boot.kernelParams = [
         "loglevel=${toString config.boot.consoleLogLevel}"
-      ]
-      ++ optionals config.boot.vesa [
-        "vga=0x317"
-        "nomodeset"
       ];
 
       boot.kernel.sysctl."kernel.printk" = mkDefault config.boot.consoleLogLevel;
diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix
index 84bb0b6c4856..dd9177a5bd21 100644
--- a/nixos/modules/virtualisation/nixos-containers.nix
+++ b/nixos/modules/virtualisation/nixos-containers.nix
@@ -607,14 +607,16 @@ in
                                 boot.isNspawnContainer = true;
                                 networking.hostName = mkDefault name;
                                 networking.useDHCP = false;
-                                networking.interfaces = lib.mkIf config.privateNetwork {
-                                  eth0.ipv4.addresses = lib.optional (config.localAddress != null) (
-                                    ipv4FromString config.localAddress
-                                  );
-                                  eth0.ipv6.addresses = lib.optional (config.localAddress6 != null) (
-                                    lib.network.ipv6.fromString config.localAddress6
-                                  );
-                                };
+                                networking.interfaces = lib.mkIf config.privateNetwork (
+                                  lib.mkMerge [
+                                    (lib.mkIf (config.localAddress != null) {
+                                      eth0.ipv4.addresses = [ (ipv4FromString config.localAddress) ];
+                                    })
+                                    (lib.mkIf (config.localAddress6 != null) {
+                                      eth0.ipv6.addresses = [ (lib.network.ipv6.fromString config.localAddress6) ];
+                                    })
+                                  ]
+                                );
                                 assertions = [
                                   {
                                     assertion =
diff --git a/nixos/tests/kaidan/default.nix b/nixos/tests/kaidan/default.nix
index 9ac97dd05266..27192436e8e2 100644
--- a/nixos/tests/kaidan/default.nix
+++ b/nixos/tests/kaidan/default.nix
@@ -34,7 +34,7 @@
   };
 
   enableOCR = true;
-  interactive.sshBackdoor.enable = true; # ssh -o User=root vsock/3
+  interactive.sshBackdoor.enable = true;
 
   testScript =
     { nodes, ... }:
diff --git a/nixos/tests/mattermost/default.nix b/nixos/tests/mattermost/default.nix
index bc795c2f5940..075781583c00 100644
--- a/nixos/tests/mattermost/default.nix
+++ b/nixos/tests/mattermost/default.nix
@@ -58,11 +58,20 @@ import ../make-test-python.nix (
                   UserNoticesEnabled = false;
                 };
               };
+              package = pkgs.mattermost.override {
+                removeFreeBadge = true;
+                removeUserLimit = true;
+              };
             } mattermostConfig;
 
             # Upgrade to the latest Mattermost.
             specialisation.latest.configuration = {
-              services.mattermost.package = lib.mkForce pkgs.mattermostLatest;
+              services.mattermost.package = lib.mkForce (
+                pkgs.mattermostLatest.override {
+                  removeFreeBadge = true;
+                  removeUserLimit = true;
+                }
+              );
               system.stateVersion = lib.mkVMOverride (lib.versions.majorMinor lib.version);
             };
           }
diff --git a/nixos/tests/reaction/basic.nix b/nixos/tests/reaction/basic.nix
index 2b454723c8b2..3ce8d1b7211c 100644
--- a/nixos/tests/reaction/basic.nix
+++ b/nixos/tests/reaction/basic.nix
@@ -83,8 +83,6 @@
   # Debug interactively with:
   # - nix run .#nixosTests.reaction.driverInteractive -L
   # - run_tests()
-  # ssh -o User=root vsock%3 (can also do vsock/3, but % works with scp etc.)
-  # ssh -o User=root vsock%4
   interactive.sshBackdoor.enable = true;
 
   interactive.nodes.server =
diff --git a/nixos/tests/reaction/firewall.nix b/nixos/tests/reaction/firewall.nix
index 9286c036a025..d7208c89e27d 100644
--- a/nixos/tests/reaction/firewall.nix
+++ b/nixos/tests/reaction/firewall.nix
@@ -73,7 +73,7 @@
   # Debug interactively with:
   # - nix run .#nixosTests.reaction-firewall.driverInteractive -L
   # - run_tests()
-  interactive.sshBackdoor.enable = true; # ssh -o User=root vsock%3
+  interactive.sshBackdoor.enable = true;
   interactive.nodes.machine = _: {
     virtualisation.graphics = false;
   };
diff --git a/nixos/tests/reaction/plugins.nix b/nixos/tests/reaction/plugins.nix
index 68bec4408469..ad204e3b90e6 100644
--- a/nixos/tests/reaction/plugins.nix
+++ b/nixos/tests/reaction/plugins.nix
@@ -98,8 +98,6 @@
   # Debug interactively with:
   # - nix run .#nixosTests.reaction.driverInteractive -L
   # - run_tests()
-  # ssh -o User=root vsock%3 (can also do vsock/3, but % works with scp etc.)
-  # ssh -o User=root vsock%4
   interactive.sshBackdoor.enable = true;
 
   interactive.nodes.server =
diff --git a/nixos/tests/repath-studio.nix b/nixos/tests/repath-studio.nix
index e6761b94ac58..467b487321cf 100644
--- a/nixos/tests/repath-studio.nix
+++ b/nixos/tests/repath-studio.nix
@@ -40,7 +40,6 @@
   # Debug interactively with:
   # - nix run .#nixosTests.repath-studio.driverInteractive -L
   # - start_all()/run_tests()
-  # ssh -o User=root vsock%3 (can also do vsock/3, but % works with scp etc.)
   interactive.sshBackdoor.enable = true;
 
   testScript = /* python */ ''
diff --git a/nixos/tests/stirling-pdf-desktop.nix b/nixos/tests/stirling-pdf-desktop.nix
index bf32496bf922..4debcc213ade 100644
--- a/nixos/tests/stirling-pdf-desktop.nix
+++ b/nixos/tests/stirling-pdf-desktop.nix
@@ -107,7 +107,6 @@ in
   # - nix-build -A nixosTests.stirling-pdf-desktop.driverInteractive
   # - ./result/bin/nixos-test-driver
   # - run_tests()
-  # ssh -o User=root vsock%3 (can also do vsock/3, but % works with scp etc.)
   interactive.sshBackdoor.enable = true;
   interactive.nodes.client =
     { pkgs, ... }:
diff --git a/nixos/tests/web-apps/goupile/default.nix b/nixos/tests/web-apps/goupile/default.nix
index 54246b01e6a7..66134685aca3 100644
--- a/nixos/tests/web-apps/goupile/default.nix
+++ b/nixos/tests/web-apps/goupile/default.nix
@@ -121,7 +121,6 @@ in
   # - nix-build -A nixosTests.goupile.driverInteractive
   # - ./result/bin/nixos-test-driver
   # - run_tests()
-  # ssh -o User=root vsock%3 (can also do vsock/3, but % works with scp etc.)
   interactive.sshBackdoor.enable = true;
 
   interactive.nodes.machine =
diff --git a/nixos/tests/web-apps/pdfding/basic.nix b/nixos/tests/web-apps/pdfding/basic.nix
index 7b2d5154a7bb..9126fde0b96f 100644
--- a/nixos/tests/web-apps/pdfding/basic.nix
+++ b/nixos/tests/web-apps/pdfding/basic.nix
@@ -140,7 +140,7 @@
   # Debug interactively with:
   # - nix run .#nixosTests.pdfding.basic.driverInteractive -L
   # - start_all() / run_tests()
-  interactive.sshBackdoor.enable = true; # ssh -o User=root vsock%3
+  interactive.sshBackdoor.enable = true;
   interactive.nodes.machine =
     { config, ... }:
     let
diff --git a/nixos/tests/web-apps/pdfding/e2e.nix b/nixos/tests/web-apps/pdfding/e2e.nix
index 23bfd064c384..d8b11c8f5513 100644
--- a/nixos/tests/web-apps/pdfding/e2e.nix
+++ b/nixos/tests/web-apps/pdfding/e2e.nix
@@ -59,7 +59,7 @@
   # Debug interactively with:
   # - nix run .#nixosTests.pdfding.e2e.driverInteractive -L
   # - start_all() / run_tests()
-  interactive.sshBackdoor.enable = true; # ssh -o User=root vsock%3
+  interactive.sshBackdoor.enable = true;
   interactive.nodes.machine =
     { config, ... }:
     {
diff --git a/nixos/tests/web-apps/pdfding/postgres.nix b/nixos/tests/web-apps/pdfding/postgres.nix
index f7fa5d3c267f..96cf6426f5bf 100644
--- a/nixos/tests/web-apps/pdfding/postgres.nix
+++ b/nixos/tests/web-apps/pdfding/postgres.nix
@@ -72,7 +72,7 @@
   # Debug interactively with:
   # - nix run .#nixosTests.pdfding.postgres.driverInteractive -L
   # - start_all() / run_tests()
-  interactive.sshBackdoor.enable = true; # ssh -o User=root vsock%3
+  interactive.sshBackdoor.enable = true;
   interactive.nodes.machine =
     { config, ... }:
     let
diff --git a/nixos/tests/web-apps/pdfding/s3-backups.nix b/nixos/tests/web-apps/pdfding/s3-backups.nix
index 4a56ec8738ad..8a9539afea1b 100644
--- a/nixos/tests/web-apps/pdfding/s3-backups.nix
+++ b/nixos/tests/web-apps/pdfding/s3-backups.nix
@@ -172,7 +172,7 @@ in
   # Debug interactively with:
   # - nix run .#nixosTests.pdfding.s3.driverInteractive -L
   # - start_all() / run_tests()
-  interactive.sshBackdoor.enable = true; # ssh -o User=root vsock%3
+  interactive.sshBackdoor.enable = true;
   interactive.nodes.machine =
     { config, ... }:
     let
diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix
index 5b9c73a9fa81..b964f032a7e4 100644
--- a/pkgs/applications/blockchains/bitcoin-knots/default.nix
+++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix
@@ -38,12 +38,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = if withGui then "bitcoin-knots" else "bitcoind-knots";
-  version = "29.3.knots20260210";
+  version = "29.3.knots20260508";
 
   src = fetchurl {
     url = "https://bitcoinknots.org/files/29.x/${finalAttrs.version}/bitcoin-${finalAttrs.version}.tar.gz";
     # hash retrieved from signed SHA256SUMS
-    hash = "sha256-CO87KbC6W+eMGyBipuwIxHndNqH4PS4PqbKk7JRdToo=";
+    hash = "sha256-jjrr2sqzL29rZdkMmKGIlSVToSpXfgtY0TUlv9Wd1jA=";
   };
 
   nativeBuildInputs = [
@@ -88,18 +88,18 @@ stdenv.mkDerivation (finalAttrs: {
       publicKeys = fetchFromGitHub {
         owner = "bitcoinknots";
         repo = "guix.sigs";
-        rev = "e34c3262de92940f4dc35e67abed84499c670af2";
-        sha256 = "sha256-Zrhe7xK/7YnIfyXlMd/jpO6Ab1dNVK0S1vwdhhH3Xuc=";
+        rev = "15113e2fe61b31354a6bcc3fddd17f759ce20c4a";
+        sha256 = "sha256-snbs2j88k9CBdv8+s3GaFoIXyJRVWlKoxiKA8R6ek9Y=";
       };
 
       checksums = fetchurl {
         url = "https://bitcoinknots.org/files/${majorVersion}.x/${finalAttrs.version}/SHA256SUMS";
-        hash = "sha256-fLqGSe8/s4Ikd991rW/z8CH7UMMjvOjTHqRBwEgSD/w=";
+        hash = "sha256-vFfeObwXowk143DSv9WZ++u+KA0fuHexFU1NizrCiV4=";
       };
 
       signatures = fetchurl {
         url = "https://bitcoinknots.org/files/${majorVersion}.x/${finalAttrs.version}/SHA256SUMS.asc";
-        hash = "sha256-Z6TTVKxr30OO37ve+4MrZHolo46prUVCB25kK1jLlGk=";
+        hash = "sha256-8pVhrITphjs7rnJZrmxAU92GVgkjVPlkA54ne9iwiIs=";
       };
 
       verifyBuilderKeys =
@@ -151,6 +151,7 @@ stdenv.mkDerivation (finalAttrs: {
     # building with db48 (for legacy wallet support) is broken on Darwin
     (lib.cmakeBool "WITH_BDB" (withWallet && !stdenv.hostPlatform.isDarwin))
     (lib.cmakeBool "WITH_USDT" enableTracing)
+    (lib.cmakeFeature "RDTS_CONSENT" "RUNTIME_WARN")
   ]
   ++ lib.optionals (!finalAttrs.doCheck) [
     (lib.cmakeBool "BUILD_TESTS" false)
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 18a1c9a7f702..b61c6b5fe1de 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -1748,6 +1748,20 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  black-metal-theme-neovim = buildVimPlugin {
+    pname = "black-metal-theme-neovim";
+    version = "2.0";
+    src = fetchFromGitHub {
+      owner = "metalelf0";
+      repo = "black-metal-theme-neovim";
+      tag = "2.0";
+      hash = "sha256-z+qJfvCIV5WEAvKIkttDKpfBDt1xDBkTYLk2EoZbnj8=";
+    };
+    meta.homepage = "https://github.com/metalelf0/black-metal-theme-neovim/";
+    meta.license = getLicenseFromSpdxId "Apache-2.0";
+    meta.hydraPlatforms = [ ];
+  };
+
   blame-nvim = buildVimPlugin {
     pname = "blame.nvim";
     version = "0-unstable-2026-02-12";
@@ -5880,6 +5894,20 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  filemention-nvim = buildVimPlugin {
+    pname = "filemention.nvim";
+    version = "0-unstable-2026-05-21";
+    src = fetchFromGitHub {
+      owner = "not-manu";
+      repo = "filemention.nvim";
+      rev = "6085f2c226834081638e1e8af1ced32c78eaf8b3";
+      hash = "sha256-igcHSzEQPyek4wsNZg+iZluBSSrRIImUxl2+MGmiLKU=";
+    };
+    meta.homepage = "https://github.com/not-manu/filemention.nvim/";
+    meta.license = getLicenseFromSpdxId "MIT";
+    meta.hydraPlatforms = [ ];
+  };
+
   fine-cmdline-nvim = buildVimPlugin {
     pname = "fine-cmdline.nvim";
     version = "0-unstable-2026-03-19";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 741220112cef..eec5a4067b2b 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -364,6 +364,12 @@ assertNoAdditions {
     };
   });
 
+  bclose-vim = super.bclose-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.cc-by-sa-30;
+    };
+  });
+
   bitbake = super.bitbake.overrideAttrs (old: {
     sourceRoot = "source/contrib/vim";
     meta = old.meta // {
@@ -450,6 +456,12 @@ assertNoAdditions {
     nvimSkipModules = [ "bufferline.commands" ];
   };
 
+  BufOnly-vim = super.BufOnly-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   bufresize-nvim = super.bufresize-nvim.overrideAttrs (old: {
     meta = old.meta // {
       license = lib.licenses.mit;
@@ -480,6 +492,12 @@ assertNoAdditions {
     ];
   };
 
+  caw-vim = super.caw-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.bsd3;
+    };
+  });
+
   ccc-nvim = super.ccc-nvim.overrideAttrs {
     # ccc auto-discover requires all pass
     # but there's a bootstrap module that hangs forever if we dont stop on first success
@@ -530,7 +548,7 @@ assertNoAdditions {
     ];
   };
 
-  clang_complete = super.clang_complete.overrideAttrs {
+  clang_complete = super.clang_complete.overrideAttrs (old: {
     # In addition to the arguments you pass to your compiler, you also need to
     # specify the path of the C++ std header (if you are using C++).
     # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper).
@@ -546,7 +564,14 @@ assertNoAdditions {
             substituteInPlace "$out"/plugin/libclang.py \
               --replace-fail "/usr/lib/clang" "${llvmPackages.clang.cc}/lib/clang"
     '';
-  };
+    meta = old.meta // {
+      # Docs say bsd3, except some LLVM project files under ncsa.
+      license = with lib.licenses; [
+        bsd3
+        ncsa
+      ];
+    };
+  });
 
   clangd_extensions-nvim = super.clangd_extensions-nvim.overrideAttrs (old: {
     meta = old.meta // {
@@ -909,6 +934,18 @@ assertNoAdditions {
     ];
   };
 
+  colorizer = super.colorizer.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  Colour-Sampler-Pack = super.Colour-Sampler-Pack.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.publicDomain;
+    };
+  });
+
   command-t = super.command-t.overrideAttrs {
     nativeBuildInputs = [
       getconf
@@ -1409,6 +1446,13 @@ assertNoAdditions {
     dependencies = [ self.nui-nvim ];
   };
 
+  fastfold = super.fastfold.overrideAttrs (old: {
+    meta = old.meta // {
+      # This plugin is under the license "Rien à Branler", which is a French translation of the WTFPL license.
+      license = lib.licenses.wtfpl;
+    };
+  });
+
   faust-nvim = super.faust-nvim.overrideAttrs {
     dependencies = with self; [
       luasnip
@@ -1604,6 +1648,12 @@ assertNoAdditions {
     dependencies = [ self.plenary-nvim ];
   };
 
+  gitv = super.gitv.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   go-nvim = super.go-nvim.overrideAttrs {
     dependencies = with self; [
       nvim-treesitter
@@ -1676,6 +1726,12 @@ assertNoAdditions {
     };
   });
 
+  gv-vim = super.gv-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   gx-nvim = super.gx-nvim.overrideAttrs {
     runtimeDeps = [
       xdg-utils
@@ -1764,6 +1820,12 @@ assertNoAdditions {
     ];
   };
 
+  hoon-vim = super.hoon-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.publicDomain;
+    };
+  });
+
   hop-nvim = super.hop-nvim.overrideAttrs (old: {
     meta = old.meta // {
       license = lib.licenses.bsd3;
@@ -1819,6 +1881,18 @@ assertNoAdditions {
     doInstallCheck = true;
   };
 
+  Improved-AnsiEsc = super.Improved-AnsiEsc.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  incsearch-easymotion-vim = super.incsearch-easymotion-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   indent-blankline-nvim = super.indent-blankline-nvim.overrideAttrs {
     # Meta file
     nvimSkipModules = "ibl.config.types";
@@ -1855,10 +1929,22 @@ assertNoAdditions {
     };
   });
 
+  iosvkem = super.iosvkem.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.publicDomain;
+    };
+  });
+
   iswap-nvim = super.iswap-nvim.overrideAttrs {
     dependencies = [ self.nvim-treesitter-legacy ];
   };
 
+  jdaddy-vim = super.jdaddy-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   jdd-nvim = super.jdd-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
   };
@@ -1876,6 +1962,12 @@ assertNoAdditions {
     dependencies = [ self.lush-nvim ];
   };
 
+  jellybeans-vim = super.jellybeans-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   jinja-vim = super.jinja-vim.overrideAttrs (old: {
     meta = old.meta // {
       license = lib.licenses.mit;
@@ -1972,6 +2064,12 @@ assertNoAdditions {
     };
   });
 
+  last256 = super.last256.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   lazy-lsp-nvim = super.lazy-lsp-nvim.overrideAttrs {
     dependencies = [ self.nvim-lspconfig ];
   };
@@ -2138,13 +2236,22 @@ assertNoAdditions {
     };
   });
 
+  lexima-vim = super.lexima-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   lf-nvim = super.lf-nvim.overrideAttrs {
     dependencies = [ self.toggleterm-nvim ];
   };
 
-  lf-vim = super.lf-vim.overrideAttrs {
+  lf-vim = super.lf-vim.overrideAttrs (old: {
     dependencies = [ self.vim-floaterm ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
 
   lh-brackets = super.lh-brackets.overrideAttrs (old: {
     meta = old.meta // {
@@ -2198,17 +2305,32 @@ assertNoAdditions {
     ];
   };
 
-  litee-calltree-nvim = super.litee-calltree-nvim.overrideAttrs {
+  litee-calltree-nvim = super.litee-calltree-nvim.overrideAttrs (old: {
     dependencies = [ self.litee-nvim ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
 
-  litee-filetree-nvim = super.litee-filetree-nvim.overrideAttrs {
+  litee-filetree-nvim = super.litee-filetree-nvim.overrideAttrs (old: {
     dependencies = [ self.litee-nvim ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
 
-  litee-symboltree-nvim = super.litee-symboltree-nvim.overrideAttrs {
+  litee-nvim = super.litee-nvim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  litee-symboltree-nvim = super.litee-symboltree-nvim.overrideAttrs (old: {
     dependencies = [ self.litee-nvim ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
 
   live-preview-nvim = super.live-preview-nvim.overrideAttrs (old: {
     checkInputs = with self; [
@@ -2248,6 +2370,12 @@ assertNoAdditions {
     };
   });
 
+  lsp-rooter-nvim = super.lsp-rooter-nvim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.wtfpl;
+    };
+  });
+
   lsp_extensions-nvim = super.lsp_extensions-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
   };
@@ -2319,6 +2447,12 @@ assertNoAdditions {
     dependencies = [ self.plenary-nvim ];
   };
 
+  mark-radar-nvim = super.mark-radar-nvim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   markdoc-nvim = super.markdoc-nvim.overrideAttrs {
     dependencies = with self; [
       nvim-treesitter-parsers.markdown
@@ -2491,6 +2625,12 @@ assertNoAdditions {
     ];
   };
 
+  moonscript-vim = super.moonscript-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.wtfpl;
+    };
+  });
+
   mru = super.mru.overrideAttrs (old: {
     meta = old.meta // {
       license = lib.licenses.mit;
@@ -2514,6 +2654,12 @@ assertNoAdditions {
     dependencies = [ self.nvim-yarp ];
   };
 
+  ncm2-dictionary = super.ncm2-dictionary.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   ncm2-jedi = super.ncm2-jedi.overrideAttrs {
     dependencies = with self; [
       nvim-yarp
@@ -2534,9 +2680,12 @@ assertNoAdditions {
     dependencies = [ self.neco-syntax ];
   };
 
-  ncm2-ultisnips = super.ncm2-ultisnips.overrideAttrs {
+  ncm2-ultisnips = super.ncm2-ultisnips.overrideAttrs (old: {
     dependencies = [ self.ultisnips ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
 
   neco-ghc = super.neco-ghc.overrideAttrs (old: {
     meta = old.meta // {
@@ -2567,6 +2716,12 @@ assertNoAdditions {
     ];
   };
 
+  neocomplete-vim = super.neocomplete-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   neoconf-nvim = super.neoconf-nvim.overrideAttrs {
     dependencies = [ self.nvim-lspconfig ];
 
@@ -2687,13 +2842,19 @@ assertNoAdditions {
     ];
   };
 
-  neotest-foundry = super.neotest-foundry.overrideAttrs {
+  neotest-foundry = super.neotest-foundry.overrideAttrs (old: {
     dependencies = with self; [
       neotest
       nvim-nio
       plenary-nvim
     ];
-  };
+    meta = old.meta // {
+      license = with lib.licenses; [
+        asl20
+        mit
+      ];
+    };
+  });
 
   neotest-go = super.neotest-go.overrideAttrs {
     dependencies = with self; [
@@ -2774,13 +2935,16 @@ assertNoAdditions {
     ];
   };
 
-  neotest-mocha = super.neotest-mocha.overrideAttrs {
+  neotest-mocha = super.neotest-mocha.overrideAttrs (old: {
     dependencies = with self; [
       neotest
       nvim-nio
       plenary-nvim
     ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
 
   neotest-pest = super.neotest-pest.overrideAttrs {
     dependencies = with self; [
@@ -2852,13 +3016,16 @@ assertNoAdditions {
     ];
   };
 
-  neotest-testthat = super.neotest-testthat.overrideAttrs {
+  neotest-testthat = super.neotest-testthat.overrideAttrs (old: {
     dependencies = with self; [
       neotest
       nvim-nio
       plenary-nvim
     ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
 
   neotest-vitest = super.neotest-vitest.overrideAttrs {
     dependencies = with self; [
@@ -2942,8 +3109,11 @@ assertNoAdditions {
     dependencies = [ self.plenary-nvim ];
   };
 
-  NotebookNavigator-nvim = super.NotebookNavigator-nvim.overrideAttrs {
-  };
+  NotebookNavigator-nvim = super.NotebookNavigator-nvim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
 
   NrrwRgn = super.NrrwRgn.overrideAttrs (old: {
     meta = old.meta // {
@@ -3546,6 +3716,12 @@ assertNoAdditions {
     nvimSkipModules = "omni-lightline";
   };
 
+  omnisharp-extended-lsp-nvim = super.omnisharp-extended-lsp-nvim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   one-nvim = super.one-nvim.overrideAttrs (old: {
     # E5108: /lua/one-nvim.lua:14: Unknown option 't_Co'
     # https://github.com/Th3Whit3Wolf/one-nvim/issues/23
@@ -3725,6 +3901,12 @@ assertNoAdditions {
     ];
   };
 
+  pgsql-vim = super.pgsql-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   plantuml-nvim = super.plantuml-nvim.overrideAttrs {
     dependencies = [ self.LibDeflate-nvim ];
   };
@@ -3738,6 +3920,12 @@ assertNoAdditions {
     dependencies = [ self.plenary-nvim ];
   };
 
+  PreserveNoEOL = super.PreserveNoEOL.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   Preview-nvim = super.Preview-nvim.overrideAttrs {
     runtimeDeps = [
       md-tui
@@ -3751,6 +3939,15 @@ assertNoAdditions {
     ];
   };
 
+  psc-ide-vim = super.psc-ide-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = with lib.licenses; [
+        mit
+        wtfpl
+      ];
+    };
+  });
+
   python-mode = super.python-mode.overrideAttrs (old: {
     postPatch = (old.postPatch or "") + ''
       # NOTE: Fix broken symlink - the pytoolconfig directory was moved to src/
@@ -3780,6 +3977,12 @@ assertNoAdditions {
     nvimSkipModules = "pywal.feline";
   };
 
+  QFEnter = super.QFEnter.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   qmk-nvim = super.qmk-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
     nvimSkipModules = [
@@ -3812,6 +4015,12 @@ assertNoAdditions {
     };
   });
 
+  quickfixstatus = super.quickfixstatus.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   rainbow-delimiters-nvim = super.rainbow-delimiters-nvim.overrideAttrs (old: {
     nvimSkipModules = [
       # rainbow-delimiters.types.lua
@@ -3840,6 +4049,12 @@ assertNoAdditions {
     };
   });
 
+  readline-vim = super.readline-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   Recover-vim = super.Recover-vim.overrideAttrs (old: {
     meta = old.meta // {
       license = lib.licenses.vim;
@@ -3872,6 +4087,12 @@ assertNoAdditions {
     ];
   };
 
+  Rename = super.Rename.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   renamer-nvim = super.renamer-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
   };
@@ -4127,6 +4348,12 @@ assertNoAdditions {
     };
   });
 
+  starrynight = super.starrynight.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   startup-nvim = super.startup-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
   };
@@ -4210,6 +4437,18 @@ assertNoAdditions {
     ];
   };
 
+  tabmerge = super.tabmerge.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  tabpagebuffer-vim = super.tabpagebuffer-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   tabular = super.tabular.overrideAttrs (old: {
     meta = old.meta // {
       license = lib.licenses.bsd3;
@@ -4450,6 +4689,12 @@ assertNoAdditions {
     dependencies = [ self.nvzone-volt ];
   };
 
+  timestamp-vim = super.timestamp-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.publicDomain;
+    };
+  });
+
   tinted-vim = super.tinted-vim.overrideAttrs (old: {
     meta = old.meta // {
       license = lib.licenses.mit;
@@ -4474,6 +4719,12 @@ assertNoAdditions {
     ];
   };
 
+  todo-txt-vim = super.todo-txt-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   tokyonight-nvim = super.tokyonight-nvim.overrideAttrs {
     checkInputs = [ self.fzf-lua ];
     nvimSkipModules = [
@@ -4625,6 +4876,12 @@ assertNoAdditions {
     };
   });
 
+  verilog_systemverilog-vim = super.verilog_systemverilog-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   vim-abolish = super.vim-abolish.overrideAttrs (old: {
     meta = old.meta // {
       license = lib.licenses.vim;
@@ -4638,9 +4895,12 @@ assertNoAdditions {
     ];
   };
 
-  vim-addon-async = super.vim-addon-async.overrideAttrs {
+  vim-addon-async = super.vim-addon-async.overrideAttrs (old: {
     dependencies = [ self.vim-addon-signs ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
 
   vim-addon-background-cmd = super.vim-addon-background-cmd.overrideAttrs {
     dependencies = [ self.vim-addon-mw-utils ];
@@ -4847,6 +5107,13 @@ assertNoAdditions {
     };
   });
 
+  vim-CtrlXA = super.vim-CtrlXA.overrideAttrs (old: {
+    meta = old.meta // {
+      # This plugin is under the license "Rien à Branler", which is a French translation of the WTFPL license.
+      license = lib.licenses.wtfpl;
+    };
+  });
+
   vim-dadbod = super.vim-dadbod.overrideAttrs (old: {
     meta = old.meta // {
       license = lib.licenses.vim;
@@ -4876,6 +5143,18 @@ assertNoAdditions {
     };
   });
 
+  vim-diminactive = super.vim-diminactive.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.publicDomain;
+    };
+  });
+
+  vim-dirdiff = super.vim-dirdiff.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.bsd3;
+    };
+  });
+
   vim-dirvish = super.vim-dirvish.overrideAttrs (old: {
     meta = old.meta // {
       license = lib.licenses.gpl3Plus;
@@ -4926,18 +5205,36 @@ assertNoAdditions {
     };
   });
 
+  vim-emoji = super.vim-emoji.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   vim-endwise = super.vim-endwise.overrideAttrs (old: {
     meta = old.meta // {
       license = lib.licenses.vim;
     };
   });
 
+  vim-erlang-compiler = super.vim-erlang-compiler.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   vim-erlang-omnicomplete = super.vim-erlang-omnicomplete.overrideAttrs (old: {
     meta = old.meta // {
       license = lib.licenses.vim;
     };
   });
 
+  vim-erlang-runtime = super.vim-erlang-runtime.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   vim-erlang-tags = super.vim-erlang-tags.overrideAttrs (old: {
     meta = old.meta // {
       license = lib.licenses.asl20;
@@ -4950,6 +5247,12 @@ assertNoAdditions {
     };
   });
 
+  vim-figlet = super.vim-figlet.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   vim-fireplace = super.vim-fireplace.overrideAttrs (old: {
     meta = old.meta // {
       license = lib.licenses.vim;
@@ -4970,6 +5273,18 @@ assertNoAdditions {
     };
   });
 
+  vim-fold-cycle = super.vim-fold-cycle.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.wtfpl;
+    };
+  });
+
+  vim-ft-diff_fold = super.vim-ft-diff_fold.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.zlib;
+    };
+  });
+
   vim-fugitive = super.vim-fugitive.overrideAttrs (old: {
     meta = old.meta // {
       license = lib.licenses.vim;
@@ -5058,6 +5373,12 @@ assertNoAdditions {
     };
   });
 
+  vim-habamax = super.vim-habamax.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   vim-hcl = super.vim-hcl.overrideAttrs (old: {
     meta = old.meta // {
       license = lib.licenses.vim;
@@ -5084,6 +5405,7 @@ assertNoAdditions {
       '';
 
     meta = old.meta // {
+      license = lib.licenses.vim;
       platforms = lib.platforms.all;
     };
   });
@@ -5092,6 +5414,12 @@ assertNoAdditions {
     buildInputs = [ vim ];
   };
 
+  vim-hybrid = super.vim-hybrid.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   vim-hypr-nav = super.vim-hypr-nav.overrideAttrs {
     runtimeDeps = [ jq ];
   };
@@ -5152,6 +5480,12 @@ assertNoAdditions {
     };
   });
 
+  vim-lion = super.vim-lion.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   vim-llvm = super.vim-llvm.overrideAttrs (old: {
     meta = old.meta // {
       license = lib.licenses.WITH lib.licenses.asl20 lib.licenses.llvm-exception;
@@ -5173,6 +5507,12 @@ assertNoAdditions {
     passthru.python3Dependencies = [ python3.pkgs.mwclient ];
   };
 
+  vim-merginal = super.vim-merginal.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   vim-metamath = super.vim-metamath.overrideAttrs {
     preInstall = "cd vim";
   };
@@ -5183,24 +5523,48 @@ assertNoAdditions {
     };
   });
 
+  vim-niceblock = super.vim-niceblock.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   vim-obsession = super.vim-obsession.overrideAttrs (old: {
     meta = old.meta // {
       license = lib.licenses.vim;
     };
   });
 
+  vim-opencl = super.vim-opencl.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.gpl3;
+    };
+  });
+
   vim-openscad = super.vim-openscad.overrideAttrs (old: {
     meta = old.meta // {
       license = lib.licenses.publicDomain;
     };
   });
 
+  vim-operator-replace = super.vim-operator-replace.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   vim-operator-surround = super.vim-operator-surround.overrideAttrs (old: {
     meta = old.meta // {
       license = lib.licenses.mit;
     };
   });
 
+  vim-operator-user = super.vim-operator-user.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   vim-orgmode = super.vim-orgmode.overrideAttrs (old: {
     meta = old.meta // {
       # Source is AGPL-3.0-only; bundled docs are GFDL-1.3-or-later.
@@ -5233,12 +5597,42 @@ assertNoAdditions {
     dependencies = [ self.denops-vim ];
   };
 
+  vim-pony = super.vim-pony.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-prettyprint = super.vim-prettyprint.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.zlib;
+    };
+  });
+
+  vim-printer = super.vim-printer.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   vim-projectionist = super.vim-projectionist.overrideAttrs (old: {
     meta = old.meta // {
       license = lib.licenses.vim;
     };
   });
 
+  vim-prosession = super.vim-prosession.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-protobuf = super.vim-protobuf.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.bsd3;
+    };
+  });
+
   vim-ps1 = super.vim-ps1.overrideAttrs (old: {
     meta = old.meta // {
       license = lib.licenses.asl20;
@@ -5300,6 +5694,13 @@ assertNoAdditions {
     };
   });
 
+  vim-sentence-chopper = super.vim-sentence-chopper.overrideAttrs (old: {
+    meta = old.meta // {
+      # This plugin is under the license "Rien à Branler", which is a French translation of the WTFPL license.
+      license = lib.licenses.wtfpl;
+    };
+  });
+
   vim-sexp-mappings-for-regular-people =
     super.vim-sexp-mappings-for-regular-people.overrideAttrs
       (old: {
@@ -5308,18 +5709,37 @@ assertNoAdditions {
         };
       });
 
+  vim-sile = super.vim-sile.overrideAttrs (old: {
+    meta = old.meta // {
+      license = with lib.licenses; [
+        bsd0
+        cc0
+        gpl2Plus
+      ];
+    };
+  });
+
   vim-sleuth = super.vim-sleuth.overrideAttrs (old: {
     meta = old.meta // {
       license = lib.licenses.vim;
     };
   });
 
-  vim-snipmate = super.vim-snipmate.overrideAttrs {
+  vim-smalls = super.vim-smalls.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.cc-by-30;
+    };
+  });
+
+  vim-snipmate = super.vim-snipmate.overrideAttrs (old: {
     dependencies = with self; [
       vim-addon-mw-utils
       tlib_vim
     ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
 
   vim-speeddating = super.vim-speeddating.overrideAttrs (old: {
     dependencies = [ self.vim-repeat ];
@@ -5364,16 +5784,35 @@ assertNoAdditions {
   vim-tabby = super.vim-tabby.overrideAttrs {
   };
 
+  vim-tabpagecd = super.vim-tabpagecd.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   vim-tbone = super.vim-tbone.overrideAttrs (old: {
     meta = old.meta // {
       license = lib.licenses.vim;
     };
   });
 
+  vim-textobj-comment = super.vim-textobj-comment.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   vim-textobj-entire = super.vim-textobj-entire.overrideAttrs (old: {
     dependencies = [ self.vim-textobj-user ];
     meta = old.meta // {
       maintainers = with lib.maintainers; [ workflow ];
+      license = lib.licenses.mit;
+    };
+  });
+
+  vim-textobj-function = super.vim-textobj-function.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
     };
   });
 
@@ -5381,6 +5820,7 @@ assertNoAdditions {
     dependencies = [ self.vim-textobj-user ];
     meta = old.meta // {
       maintainers = with lib.maintainers; [ llakala ];
+      license = lib.licenses.mit;
     };
   });
 
@@ -5397,11 +5837,27 @@ assertNoAdditions {
     };
   });
 
+  vim-tmux = super.vim-tmux.overrideAttrs (old: {
+    meta = old.meta // {
+      # original code publicDomain, MIT after fork
+      license = with lib.licenses; [
+        mit
+        publicDomain
+      ];
+    };
+  });
+
   vim-tpipeline = super.vim-tpipeline.overrideAttrs {
     # Requires global variable
     nvimSkipModules = "tpipeline.main";
   };
 
+  vim-twiggy = super.vim-twiggy.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   vim-ultest = super.vim-ultest.overrideAttrs {
     # NOTE: vim-ultest is no longer maintained.
     # If using Neovim, you can switch to using neotest (https://github.com/nvim-neotest/neotest) instead.
@@ -5427,6 +5883,12 @@ assertNoAdditions {
     };
   });
 
+  vim-visualstar = super.vim-visualstar.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.zlib;
+    };
+  });
+
   vim-waikiki = super.vim-waikiki.overrideAttrs (old: {
     meta = old.meta // {
       # README-only CC-BY-SA-4.0 notice; GitHub detection missed it.
@@ -5445,6 +5907,13 @@ assertNoAdditions {
     '';
   };
 
+  vim-watchdogs = super.vim-watchdogs.overrideAttrs (old: {
+    meta = old.meta // {
+      # Plugin file licenses it under Perl terms (artistic1).
+      license = lib.licenses.artistic1;
+    };
+  });
+
   vim-wordy = super.vim-wordy.overrideAttrs (old: {
     meta = old.meta // {
       license = lib.licenses.mit;
@@ -5462,12 +5931,15 @@ assertNoAdditions {
     buildInputs = [ xkb-switch ];
   };
 
-  vim-yapf = super.vim-yapf.overrideAttrs {
+  vim-yapf = super.vim-yapf.overrideAttrs (old: {
     buildPhase = ''
       substituteInPlace ftplugin/python_yapf.vim \
         --replace-fail '"yapf"' '"${python3.pkgs.yapf}/bin/yapf"'
     '';
-  };
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
 
   vim-zettel = super.vim-zettel.overrideAttrs {
     dependencies = with self; [
@@ -5525,13 +5997,19 @@ assertNoAdditions {
     };
   });
 
+  VimOrganizer = super.VimOrganizer.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   vimoutliner = super.vimoutliner.overrideAttrs (old: {
     meta = old.meta // {
       license = lib.licenses.gpl3Only;
     };
   });
 
-  vimproc-vim = super.vimproc-vim.overrideAttrs {
+  vimproc-vim = super.vimproc-vim.overrideAttrs (old: {
     buildInputs = [ which ];
 
     # TODO: revisit
@@ -5542,7 +6020,11 @@ assertNoAdditions {
         --replace-fail vimproc_linux32.so vimproc_unix.so
       make -f make_unix.mak
     '';
-  };
+
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
 
   vimsence = super.vimsence.overrideAttrs (old: {
     meta = old.meta // {
@@ -5552,9 +6034,12 @@ assertNoAdditions {
     };
   });
 
-  vimshell-vim = super.vimshell-vim.overrideAttrs {
+  vimshell-vim = super.vimshell-vim.overrideAttrs (old: {
     dependencies = [ self.vimproc-vim ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
 
   vimtex = super.vimtex.overrideAttrs {
     checkInputs = with self; [
@@ -5581,6 +6066,18 @@ assertNoAdditions {
     };
   });
 
+  vissort-vim = super.vissort-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vivify-vim = super.vivify-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.gpl3;
+    };
+  });
+
   vs-tasks-nvim = super.vs-tasks-nvim.overrideAttrs {
     checkInputs = [
       # Optional telescope integration
@@ -5608,6 +6105,12 @@ assertNoAdditions {
     ];
   };
 
+  whitespace-nvim = super.whitespace-nvim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   wiki-vim = super.wiki-vim.overrideAttrs {
     checkInputs = [
       # Optional picker integration
@@ -5713,6 +6216,12 @@ assertNoAdditions {
     };
   });
 
+  zeavim-vim = super.zeavim-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.publicDomain;
+    };
+  });
+
   zenbones-nvim = super.zenbones-nvim.overrideAttrs {
     checkInputs = with self; [
       # Optional lush-nvim integration
@@ -5768,6 +6277,12 @@ assertNoAdditions {
     ];
   };
 
+  zoomwintab-vim = super.zoomwintab-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   zotcite = super.zotcite.overrideAttrs {
     dependencies = with self; [
       plenary-nvim
diff --git a/pkgs/applications/editors/vim/plugins/utils/updater.nix b/pkgs/applications/editors/vim/plugins/utils/updater.nix
index 2ed61a25c83a..0c77e7ce745c 100644
--- a/pkgs/applications/editors/vim/plugins/utils/updater.nix
+++ b/pkgs/applications/editors/vim/plugins/utils/updater.nix
@@ -43,7 +43,7 @@ buildPythonApplication {
         neovim-unwrapped
         nurl
       ]
-    }" --prefix PYTHONPATH : "${./.}" )
+    }" --prefix PYTHONPATH : "${lib.sources.sourceByGlobs ./. [ "**/*.py" ]}" )
     wrapPythonPrograms
   '';
 
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index f3405579d28f..0b2840762620 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -123,6 +123,7 @@ https://github.com/sontungexpt/better-diagnostic-virtual-text/,,
 https://github.com/max397574/better-escape.nvim/,,
 https://github.com/LunarVim/bigfile.nvim/,,
 https://github.com/openembedded/bitbake/,,
+https://github.com/metalelf0/black-metal-theme-neovim/,,
 https://github.com/FabijanZulj/blame.nvim/,,
 https://github.com/z4p5a9/blamer.nvim/,,
 https://github.com/joelazar/blink-calc/,,
@@ -418,6 +419,7 @@ https://github.com/micampe/fennel.vim/,,
 https://github.com/wincent/ferret/,,
 https://github.com/bogado/file-line/,,
 https://github.com/lewis6991/fileline.nvim/,,
+https://github.com/not-manu/filemention.nvim/,,
 https://github.com/VonHeikemen/fine-cmdline.nvim/,,
 https://github.com/glacambre/firenvim/,,
 https://github.com/andviro/flake8-vim/,,
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index e4c007652da9..97d492a6b34e 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -262,8 +262,8 @@ let
         mktplcRef = {
           name = "ng-template";
           publisher = "Angular";
-          version = "21.2.3";
-          hash = "sha256-Gdxw1WvMQ/t4XUfDkekIvwOsWYjmDIjGE7scsImohNc=";
+          version = "21.2.4";
+          hash = "sha256-2oTZLOQfcbqrSpEhJ0p7et/8X2JkTi4Kf2jfqVS2DKo=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog";
@@ -2855,8 +2855,8 @@ let
         mktplcRef = {
           publisher = "llvm-vs-code-extensions";
           name = "vscode-clangd";
-          version = "0.4.0";
-          hash = "sha256-A1+JaodEBWCQ5NqLkXfNqhOr8j2aFQzEofU+wseh/SY=";
+          version = "0.6.0";
+          hash = "sha256-hmoAPCp0BKB3z6z2Ai0w45RDE9v3BYupmu2A5y5OM50=";
         };
         meta = {
           description = "C/C++ completion, navigation, and insights";
@@ -3491,8 +3491,8 @@ let
         mktplcRef = {
           name = "veriloghdl";
           publisher = "mshr-h";
-          version = "1.22.2";
-          hash = "sha256-qkSBD8Mk6ow1GryitXgXx0kcLHCJeRs51VxqLQv6gac=";
+          version = "1.23.2";
+          hash = "sha256-btwEFVhvNqCnMCftSt7CS6c4lAf29N3MxBAMriKDyjg=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/mshr-h.VerilogHDL/changelog";
diff --git a/pkgs/applications/emulators/libretro/cores/bluemsx.nix b/pkgs/applications/emulators/libretro/cores/bluemsx.nix
index 2488435118a1..4d28a074a0b2 100644
--- a/pkgs/applications/emulators/libretro/cores/bluemsx.nix
+++ b/pkgs/applications/emulators/libretro/cores/bluemsx.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "bluemsx";
-  version = "0-unstable-2026-05-18";
+  version = "0-unstable-2026-05-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "bluemsx-libretro";
-    rev = "175438e5fe68ae0cfb7d04c29f81eed17635e6b4";
-    hash = "sha256-crFrG6OsmW3nNnQ+OHFtYz7cRuU9hTjWe3vq4PdYJqA=";
+    rev = "b76f27959a32e18aa04c619273152178fd0cf03b";
+    hash = "sha256-0FUfeA8IY3VyzhbZqiWYJ7Ttp4CT7kernhgwji6wALQ=";
   };
 
   meta = {
diff --git a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
index 69c42c934586..7e53c5b99b74 100644
--- a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
+++ b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mame2003-plus";
-  version = "0-unstable-2026-05-15";
+  version = "0-unstable-2026-05-23";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mame2003-plus-libretro";
-    rev = "a4a02f8f26cc8e983faeabe0a7cfdd55f0ba5403";
-    hash = "sha256-cBl67GBGaI69ETtGhwTiwxaTUl9vw8O69gdskfuoTUo=";
+    rev = "31c9da911c8b3227f4bd5e70dc5a1e3876cf9ada";
+    hash = "sha256-5RipbW1eL+VOcl1JuwEOe9ZcTZiig7WWBfJONzAdVNE=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/puae.nix b/pkgs/applications/emulators/libretro/cores/puae.nix
index 88617aa02e56..f89170fc4be5 100644
--- a/pkgs/applications/emulators/libretro/cores/puae.nix
+++ b/pkgs/applications/emulators/libretro/cores/puae.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "puae";
-  version = "0-unstable-2026-05-18";
+  version = "0-unstable-2026-05-21";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "libretro-uae";
-    rev = "6fbf272e342387281484ae84f690fa129f0ab86e";
-    hash = "sha256-JwFIQfWaorQmDxYgHvpq/CEFMc0LVAsX6TyiGN6FhZA=";
+    rev = "9fda5f344470d6837e17b939b0f53e5afe938878";
+    hash = "sha256-gGuYxGRRGyBbHiyG7Gpoi2/frEI5d+ySo8JdZStznN8=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index f20b282bd8cd..bb4b1864e4a2 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,1859 +1,1859 @@
 {
-  version = "151.0.1";
+  version = "151.0.2";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/ach/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/ach/firefox-151.0.2.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "61a2820f1467e466efeebbe591e58573f6141b3fcaae4fda1de5894fe8aa50a1";
+      sha256 = "486cafa645dbeb53056af847fc951f25c34785e97c80a58c943086a885a04926";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/af/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/af/firefox-151.0.2.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "a1012db8f1cfbd81067469635cdfdb5ac579282ce2d0911ac860a987d7b125c8";
+      sha256 = "5a8365a3cb439fe14f8922140a61017733a31763d8214182ef2e4f2d932d5d29";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/an/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/an/firefox-151.0.2.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "56f00740d66694edd7f6c23950e2d94b99a7c76954e7078688d6bf1bae105f81";
+      sha256 = "9a2f06008ae781d41403d2af84bc62ae4895453808d0390bbf0990db53706902";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/ar/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/ar/firefox-151.0.2.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "7973468a087737c367ae1984ce07ea7a5f9ebf9ebcc6a326f9ea9a2197f6ce2f";
+      sha256 = "ff7ed2c942ccfa058a35e738e419488c18f9b3d93994c28168f358b8f56f2dd1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/ast/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/ast/firefox-151.0.2.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "8efb53d2ff4f263d5cedbbbc87b6ad08f93be6b2894d7f4fa68f73c69288873b";
+      sha256 = "93541ef5fbc28ddf6d9f2f32b830bae11e9b910867cfb4025d9c4e20a1911936";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/az/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/az/firefox-151.0.2.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "b6ba04e76040cab4b21ec724a1eafc793130ab6fb66d6f7b0eeb13e04df51286";
+      sha256 = "b1296195447901f14207480cf9123a8956d9cf76c4b5680b58ca8890fb21ae40";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/be/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/be/firefox-151.0.2.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "6c342fa1319896e01bc6407303d7a987d8c35a4a8f4bd32373b12077ccc28a3b";
+      sha256 = "f1f65652c9f205c9448046e9aa228489e142e65c77171348a43144ecad7fd111";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/bg/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/bg/firefox-151.0.2.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "5d17e5f1dd079eeb5c9839bb8fd67e9c0599fc9585c4efe173746f9777d01add";
+      sha256 = "1f2cdc981908dc5189d805d636a1a33dbedb17be66f6736170e3c1f1d98fa800";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/bn/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/bn/firefox-151.0.2.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "5747c1cf35f2fde7a1cf3d21189f7290325f3f7c1c81bb3b1c8424693fe311ae";
+      sha256 = "06eed8f356a3ae9b777d015e893a8d70d032f9e1b8fda7a67a3be206944d50ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/br/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/br/firefox-151.0.2.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "abef43dc82fe9d8a07ffb635e6dc41df72a89c4789b0e74846b7031691f9367a";
+      sha256 = "e81c85bf26299fa186960449782987084db2c04acd8d8bbc88ee8c41b2d726d6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/bs/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/bs/firefox-151.0.2.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "4c590e6c2b02e04bdd9169c406fdbacddd977aed5149119a6e7279ab04dd4ec5";
+      sha256 = "5680a94d47f3e7a4ed39831c0a20697c71c137d44fadbc29d61587fa1e76bec3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/ca-valencia/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/ca-valencia/firefox-151.0.2.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "0cff64aeaaa652477dd8898a22be3f35444bdf6a07083cabe2105eb05598b4b9";
+      sha256 = "2173610c6895b386605cb4901fa63fca0177c2a074231dda10d1d326151a0331";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/ca/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/ca/firefox-151.0.2.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "ffaf1881ce983698ce2646d86789ce8f5e1ec57c17277748abe5bc996c1b6bd4";
+      sha256 = "19596ef93dc36349f3135178b38ae1c4f714b641a9c22899b5d751d07c309691";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/cak/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/cak/firefox-151.0.2.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "152b6514e1428666dd29c8525666a8c7f2cacedcbff185cd7daea7c4d00b3e45";
+      sha256 = "fa469a4f9e647f23b15e65230344a3e2363dcd44c700352c18560cd41abdb9ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/cs/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/cs/firefox-151.0.2.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "f662ca8f30627c25f287aa4bcf153bff809b1bb7722235c222a82ccefecbc5f4";
+      sha256 = "2fd58cf17e5c5c2d798d8c1dd7dc772e568e9dbdc2ea2ec2ae11cb5e8e046690";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/cy/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/cy/firefox-151.0.2.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "e81472d3da883f999f933f6d400c1af78fa30b6489720e03848b8628cede13b9";
+      sha256 = "43feb76ae6004709e7daa94dedcb8395b8f089b93d8ce73f91d50c6d011565c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/da/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/da/firefox-151.0.2.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "b49fcfc2b0849075cffc495b7c51d71e87abb85f365bfc17ab2b6050467ec868";
+      sha256 = "12fa323b46e8c01aac7ac64d1640e91b6c791d94bbfe59e6778e2d5a35546100";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/de/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/de/firefox-151.0.2.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "a89f7ea40ad12ce81c7a947f618bdc6a4ab4ef896a5dbd7f05bc9cb7a934e962";
+      sha256 = "f0f8fa985f63045bcd70c1be559737ef5a0328cb851e9f7b94b265aef0c62382";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/dsb/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/dsb/firefox-151.0.2.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "681a632023790dae1568887467e1a28458a76d82ac5f913ac5bdd74e8fe5159b";
+      sha256 = "c20a57f0d41485ff5621abb74060008049fb92fd14302dc5188c8b663a7d022b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/el/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/el/firefox-151.0.2.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "84a393d80a6b64a6c3418139f2fe0521bb008f93e9adb734efb0e90ea24c9fea";
+      sha256 = "ae6e40eb534e50d8765d0136cf5f6ef70475499a9554ee373fa07831a5866169";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/en-CA/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/en-CA/firefox-151.0.2.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "1e803519acbb803f010af98b813e564511edab8074e887a819608e425febaadf";
+      sha256 = "4753ec6d26b546509c6e85960f0d3e3ee56fa71b3bedcd5c6b898a647dfb7d40";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/en-GB/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/en-GB/firefox-151.0.2.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "dd2c24b888debe750e59d1d3b3f69a23f9562a86195fb28832e1db0dca857a0a";
+      sha256 = "4b06b255850ded515bf5abd48bd8cb6b5ce58d0496ebd48ab99974322579ec0c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/en-US/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/en-US/firefox-151.0.2.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "de1a20b7126a2ac91f12fc22e763f053d56c1716d52b7c734f519abe10f4e236";
+      sha256 = "1f77a1aacc2a0ccbb36998875f04a9c22229103dc35cb4bbb89784f0809161e0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/eo/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/eo/firefox-151.0.2.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "2bcdd21cb8f19df5d45b1b7d954df3591ed8b172606aedd359e06006533f082a";
+      sha256 = "4fe3ecb09c84e6886232cb9855d1b9094e5fa69910158b74f68d227a4c7c7074";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/es-AR/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/es-AR/firefox-151.0.2.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "462b0b7ab4767ae0c1efb9c9d9a1b23db785fcda218670d5288c4338948b3036";
+      sha256 = "c23d1321ec40e26f7a5f1564160a03d2d6097079bbf67ab6f7de53ec59f3b386";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/es-CL/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/es-CL/firefox-151.0.2.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "7b4ff843b453ee10bd40d5cc641512871c3c457fef4c8979cf466bfacbebc50d";
+      sha256 = "647943953cd3b3607c3ab19701d24f12f072a5e1bb7a2ab08ecf15a34a6ff689";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/es-ES/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/es-ES/firefox-151.0.2.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "816f375dd6c95bdc25c566a6b107996b527f413f56ce8af7cf63c9e330a489b4";
+      sha256 = "7eda0eabad83542fa8a7164a314e1da75969399664236bcdfc2a329a7c675cdb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/es-MX/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/es-MX/firefox-151.0.2.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "a2087a0a8e1b7d681cd71f3c25fc26c66963d62bf088c279284bdeeb67900cf1";
+      sha256 = "6e175f67bde628e5d6b6ae1a015d5a9d762b9387f79e66a9db89402f84774133";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/et/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/et/firefox-151.0.2.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "3d003d1d4c9511f6a727b9207ff99f371368764f13eb5be9eb5976db1d41d34f";
+      sha256 = "6900c93e49a922e2d06c03d43e6371daf4383489456bd70cbede9c4c6ee0ce20";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/eu/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/eu/firefox-151.0.2.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "0515f84f9cdbff55a02a33d1739a72c3e4cfd90b2833d4cccb2f1ea40ff6d0fc";
+      sha256 = "95d66f251e8d9aa736d55d16d4fc398eaffebc1b4ff7ab3d66956f8f5ed41f9c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/fa/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/fa/firefox-151.0.2.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "da9c0eb0fd54648b98dbdb567c423c971dd5b6b455120b553c4a7bd52f5729eb";
+      sha256 = "8ffa41fce1fd2d8bb74ef38e39f9ef98ca3e7b2244cc46bf69c34ff58c762997";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/ff/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/ff/firefox-151.0.2.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "8296718a3db6dd49b2b4f9e440950300ff064835978148a77fb24a83df17d004";
+      sha256 = "8bfaa80b105813890f9f57e16e0f9fb7c81b137dc78965154283cbe7764b7c9d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/fi/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/fi/firefox-151.0.2.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "dd436f3c8f2fcfcd8a43e501eb7e15f58f0e8aebb8bf45a2912cdae5a292c0fb";
+      sha256 = "8eecb71917b91801edb99471acad8da6cbfd73a35c3977d89131d4366141d599";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/fr/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/fr/firefox-151.0.2.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "0265e87a94cfbcb098d0f4d92cd89085c5ee8789457542b5c7fdb6ae3cc59ce6";
+      sha256 = "242516dd99be51cdc8aa135db35da7e3dd668fdfa6a55a382a5ef9cf7dad0f15";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/fur/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/fur/firefox-151.0.2.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "525f3f9d3c505bbcd58c2e3d1c4386468d2038648ce212f1e22b98b2ce7a461c";
+      sha256 = "29991536f98abf68b90fef37987100b8327d0ac007b1c056a1f60bf279a7f115";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/fy-NL/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/fy-NL/firefox-151.0.2.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "5f691eebad4a5b511a6e2211c6c0b6b7a58d938ba506c19a6edc253c31eba3cc";
+      sha256 = "1d90303b65b5a190adbc095792edf5eb5cce6ade936327ceb998d7090384dfd3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/ga-IE/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/ga-IE/firefox-151.0.2.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "e60ccb09b7ea3d7c023f580d8af7eb23c6fd1343b9e83dae6888feded244c9fa";
+      sha256 = "78a4d97a63f9a5cd7bfc34d85d8248755933a278d80aff2d359d4cd4f3abf9d9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/gd/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/gd/firefox-151.0.2.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "b5574f8cff9d7b1118c2d4017ac160cc906d72035c4600d430667967b4012d60";
+      sha256 = "ee154aaeb79b69dfcfc995a91d924d50d55d68cec8b7ef75ecbf3275de360232";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/gl/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/gl/firefox-151.0.2.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "4aab8e96e572b200ba94a186d7a0cfc7fdac0bab18a4b81c952cb01f32137ba8";
+      sha256 = "9439fddb2b95f21598a633b0a38fb1ad1a2a761043870bdec0d4566be4a9dc16";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/gn/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/gn/firefox-151.0.2.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "3bc7756bf94c0c4313ddbe3670e4b89d4a0f8df73dd863bdca2df5439b6f98b7";
+      sha256 = "b1f8ad3733dd6e1d1b4e8c2749ba50dbfe7fc117b6be601c9abbf3e29692cfd4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/gu-IN/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/gu-IN/firefox-151.0.2.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "011c9f52b02137d780a6c26f7a0f43bb575630d1f0516d2b26824c08b4a8a514";
+      sha256 = "bcbdb7dbbfbe9455a9647f2c55ccd1991141413a1a3b245eafb6ea64455512f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/he/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/he/firefox-151.0.2.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "9aca4e14d7d05410af5994b25cef49fdcc05d48f242b1fddb2fe374f81dddbca";
+      sha256 = "67246f3c9af81190ab91b6da12e642cf75f62a6b305c6f108c46fcde02256972";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/hi-IN/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/hi-IN/firefox-151.0.2.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "645b8dbbed0652fa33ea491990633dac63ff1a29b8fb231060cb3aec27e293a2";
+      sha256 = "0b87b674b62a71253cf527549d7d0cf76dd88f682b60beb9771c6cf633085791";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/hr/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/hr/firefox-151.0.2.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "80c914b2f148e01db34a042888c32101b6786ce1a7f8724bb6139a8c71e53f60";
+      sha256 = "c7ac684c8d5c29571f264164019aa84e07dc7f3fc4ae598c12a3cc03d4654b5a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/hsb/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/hsb/firefox-151.0.2.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "f73d3cd125eb8bb4f9ca0ab85a5c080cbf28d2bc58b2e0843eff684f81b44e25";
+      sha256 = "dc47e881472410f89de8a221a500e8d935ed2c496233a0617deacc58a3513fb3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/hu/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/hu/firefox-151.0.2.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "041d0cb6f14d85af63879c727ab4b0db06dece53bcca6cbc4e173bb5098c2b9f";
+      sha256 = "571b16295af9890079449d951803fbfdf9147a2d1775192167566a1a413eb307";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/hy-AM/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/hy-AM/firefox-151.0.2.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "a7f545d9ea20dcfd265acfda170bb308d5bbe443a5101e5ee7632622bfefe126";
+      sha256 = "e8fb7c112cd8b0ae119974a9cbd96a6e266111584d5155c8ec644963724d0333";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/ia/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/ia/firefox-151.0.2.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "725957640fcab48f96776354ac05547048ed575a8f28c73044771d8aac7fd508";
+      sha256 = "da3b1ef29698321527160c47f796e231bf260a57bd713af0ae6cb273ec501e46";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/id/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/id/firefox-151.0.2.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "165597750eb3211b43ffb5e9bb1f2db43c3a6dc3abc290f597ba655ef6321a69";
+      sha256 = "978ca81801f37e5793a2396f3cb45dab92ab8949b603cfa57ec119538ceed93d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/is/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/is/firefox-151.0.2.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "fe8b4baed537ab81152cdcdc7efd823ef48ca88ce96bf9f9e765a7a7d334a008";
+      sha256 = "d8dfd9f268ab555ef97844b27361c1beb68eb180006a85bb056fab7dd1a91f5f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/it/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/it/firefox-151.0.2.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "fb8849d8ce91aa211332ca1bf8e5882e77e0cca3b2c5e10993904ad9c0667f95";
+      sha256 = "fe80fc07acaa61a0055f2da79d450b99d277b47778a6d56bc24fcdc67990c003";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/ja/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/ja/firefox-151.0.2.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "ec030e0ff95a41417e777be9cd69941aa2a83df2ecfe418f325dd8384e78e2c5";
+      sha256 = "44de220d6a093e226d1614224ce261472476a2408d3a6b6f25c6d7081df16748";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/ka/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/ka/firefox-151.0.2.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "153077e3d084b34248ed91d40d77d0b9146fb266c8e8fb8a9520004179b50fc6";
+      sha256 = "801d39030445c7fa3c08c4df2392c63ba34c36abbd09d6bacb4c751db905871a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/kab/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/kab/firefox-151.0.2.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "37e62a1504db41779b655055fd974e298dbca229408d1614e2067fa98bbb12af";
+      sha256 = "c31058709171565923922e5f52ef6de2de300b2193db3998d54ba59ac3ad1be4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/kk/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/kk/firefox-151.0.2.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "2dec759e4887c90929d539f215fca7105ebc3e559afd593aa7e81ca03dc8b397";
+      sha256 = "c87239a789d10b257ebbbbbfc47b29cabcb93bf68c484fb5c768e8799b85257a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/km/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/km/firefox-151.0.2.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "b6151d344e2c737387df8589157f2ef4768f4e624127ab45488be2f1a61174c2";
+      sha256 = "9ba796be25c89298bf2c21a6e96617e8451fabbbd16f97439a75b05076ad9098";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/kn/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/kn/firefox-151.0.2.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "fbdc1100948be013e6289f98b906c909a207586882d460592546582d8f50c4f2";
+      sha256 = "da1166a2a2bd0e7e44936d2bf842ff8937703ae294c1d53d335075bce2d1b944";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/ko/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/ko/firefox-151.0.2.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "e5c2bf0010570292ca361a3469259b763fa9e8dd97773ca4a9dde0ce34915162";
+      sha256 = "a819bf9de75760e9cee775c18326d3bf05c1e63559a305f8633f09201e7a2072";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/lij/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/lij/firefox-151.0.2.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "4a4658283eea4d950131a5977686088bd317ed9cd3ebc9f59faf5215bed53e71";
+      sha256 = "5fb0361cd95854cd0f3b7b90a0dd616aaec016df0db1887af52e05fe4c3c2bc8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/lt/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/lt/firefox-151.0.2.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "c20043da6aceedbb26810767033c7970fa88497ffa6f65498ba8be28bc941320";
+      sha256 = "dd81f9ba2ef29a0153fc1df42c1761b9dc493c270061274fdec79861d2c8c111";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/lv/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/lv/firefox-151.0.2.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "56738b9a5e658da4f531467d60fcbdfdee5df6dc1f91700371e02418088f2415";
+      sha256 = "3b732c281e662926d70aee231bb7e96185847397a46ad40ca37faebf794254f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/mk/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/mk/firefox-151.0.2.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "4ea776396bcebe2e384c5bc2b20a3d930b5c2f190de1f927ded4305a9d230eec";
+      sha256 = "507f0fe10489c4a626d52f03a18b549a4e4b678ac89613a5abef4137b5d3ea70";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/mr/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/mr/firefox-151.0.2.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "43c92a2fb0b370cb882c84afefb62c5c222a74dbe47009ec5e25a1fa469b3b32";
+      sha256 = "a8638e232e288447f0a18457bba7d7a597963ee979103f7fb3ecc2b91b278b57";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/ms/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/ms/firefox-151.0.2.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "cd202d114f3709bd3e50bd8af3851e433ac8e8bb8f65ef747108788a1ac8e9f2";
+      sha256 = "15a82590ec1a8516385746be85b59496ec48c8cb71845a6e9d952794ee1fd29b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/my/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/my/firefox-151.0.2.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "923a7da8bc226a78e6db3085edcf674b696d4168a2a40b04a376baf73ac44c42";
+      sha256 = "a7f24fa6bbacd795310e460bc8c45d43c1f49b50b9c4d61265f3e20d220b897c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/nb-NO/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/nb-NO/firefox-151.0.2.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "3273d1b2bc1e12c12408b1e332e1b94038316b642293ba231ecb07d66eafa3cf";
+      sha256 = "b181e8436ad774718598d3210197802f3ce072cbeaf0ea23bc75fde54a5738da";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/ne-NP/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/ne-NP/firefox-151.0.2.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "d49470d840b6dd88f8ad928bbfbaeee693bdcf3e6afc39fa421ddc8e65765eef";
+      sha256 = "fdbd150078d1842599c2133629146bfd8331a34811289f5df2e3c44954a1d59a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/nl/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/nl/firefox-151.0.2.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "ea00461c187f8ab8128ee590966ff478cc55ee75c23b0d3b592883dbe5b00082";
+      sha256 = "1ef4ecd2fe962568d75d8cccc614b7b131ad16cd0e28c14f37c62ea626d0b2cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/nn-NO/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/nn-NO/firefox-151.0.2.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "ff6a9639c7e1e2141a8df10d318ed5106c116f63af2f8a3dd2fe7e8132042ee9";
+      sha256 = "b0214ca11f100891092c21b757a0aeabfc00922a88640b3fde60cce39be17d85";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/oc/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/oc/firefox-151.0.2.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "2e2eb2eaf7803cc0d12abdf34fc1f621a894afc2ffc8595417a59d6db39f1f31";
+      sha256 = "3c62429d6e396dfb16e5c689930b39e81dc86191148765ea157fd7d12904ccf3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/pa-IN/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/pa-IN/firefox-151.0.2.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "b3512092edbb65c745353fa9f4dd1f2eb62c6b3824949000fa2c7739cfe9c5e1";
+      sha256 = "9f2358add0ee706008a5ccfac68bf0cb84f0b6abe64d99a8f517e8c34f6a42cf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/pl/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/pl/firefox-151.0.2.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "684f582213e2f1546375e93f3bfe7e270fed9971ceb6cd91b2675253de9c6125";
+      sha256 = "e28593bf0a7b8540786d496554cb22222ae20d0bf04bfbbd17e963fb752d0128";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/pt-BR/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/pt-BR/firefox-151.0.2.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "0ca4a10d208fceb88dda03fcd76c950be9c9b0aa5ea669e98dec17c6cee75151";
+      sha256 = "a45727fdfd1f9e3b907f84d17d87a4d017f4f0bf010d8674cfbfbf2c63cbc630";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/pt-PT/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/pt-PT/firefox-151.0.2.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "8b54d199b674056067bc318abaadaea32f9b7e02033bf4938ff0df685938735c";
+      sha256 = "751530bea1a2a7314bcc6db835d7f0139c6cafa24d5ce4df42f7897c9041f2a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/rm/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/rm/firefox-151.0.2.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "ef6a582b6ca79d3caf53dc6b5eaeac4b76de23039085eb7484860f5034757cf6";
+      sha256 = "5e7aa2d0ab1f5f63ef189b47af9450c2097c96ecce87c86a3454a43ca39fe046";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/ro/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/ro/firefox-151.0.2.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "8924b5d80a848d917dd2bdb7865657fa0f8c5b5b6c0b107ed15540c3c7663c05";
+      sha256 = "ed025e60f325423f53bde1aa60362d6185eb531a760b90276f88508933d3b206";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/ru/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/ru/firefox-151.0.2.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "cb018797a449c728a37ecc2aa05e6ec935f2697a2378642e83b14deb0b33dd42";
+      sha256 = "1b954be87a855444fe1e9d10918800f0b013ebbb064f9807974877d7a540e5b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/sat/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/sat/firefox-151.0.2.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "0ca07f6863bb979a9282ac958ad0ffac605bccaefdf7166a9ada48da22103939";
+      sha256 = "cd26391098aa47835a788723643d0f14f45457e3f1719b768b5cc1c4dab7cb4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/sc/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/sc/firefox-151.0.2.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "b8b4ae2b324ee95660ae21e03f0657c6b937a0ae308d00896e595d28c02338e8";
+      sha256 = "285efa85ad5c9bf5e0e4887178bed6601b9d615387461dbcbd57f85d8060a69b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/sco/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/sco/firefox-151.0.2.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "90c151f941943f9629b824aba21ec09f84d689298d695554fdc6a9fcab077174";
+      sha256 = "5b1fc02b6dcbae54699e54fbb9b77e271f11645428480612a328f146476810cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/si/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/si/firefox-151.0.2.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "0322ff8dc2a1197416148267685346017acb0797099ca5b3189d5e7d338f828e";
+      sha256 = "53c112535753a4cf247a09eddae4f187598e882e20575d9c178760a2734f2338";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/sk/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/sk/firefox-151.0.2.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "93521d464b84e285442ec2bfa2474acd556025922ba2d9b9b6287c324a13dc36";
+      sha256 = "0a536d8f11d8e3c0e61f58629cdb6d5a17ba57276f69aca578eaf8154a38bf8a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/skr/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/skr/firefox-151.0.2.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "7a7b2920b68c8e286648c84971b2f0818b5a269adf99b53b669e81857177a379";
+      sha256 = "82ae0feec9d0bf8e12190ded08cbe935da5e64bee3780978ed6d4d3e5159e969";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/sl/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/sl/firefox-151.0.2.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "ebb11d5432ab6d7fa6438b5fd58eb2af39ad8fc38dbd7219ae863ac13041a7bf";
+      sha256 = "3804e57b4116d12be091f6313acc522820fc768b0e9752a99723dad832216f42";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/son/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/son/firefox-151.0.2.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "d73401022115ecb7ef4dad4052e7db74da22f858cd0698e190a890dcab7be879";
+      sha256 = "f4073cdad27415e199dece65e1e376733bd86124f98ad4002ce057dc31d0ad73";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/sq/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/sq/firefox-151.0.2.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "06bc06dc03cf33986d097e183bcf8b23bfc1d4fe65fffa2ebd920cc31503dd4a";
+      sha256 = "b1e4a8dd83300f9227d4ebb5689254cf30cba2c4c59a7f405b2fdfb069232b23";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/sr/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/sr/firefox-151.0.2.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "5173638f28ca6f3426402a5682124bda86ff629904a3fe2c4e9c0e9d832f4316";
+      sha256 = "1f6d54513ab93b16e9a536917918a387b68be3a85c6010c24d0da71db72f4e33";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/sv-SE/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/sv-SE/firefox-151.0.2.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "d38203966f436f5743bd251d44ee03e1fa05c314868d1342ebc821f1d4cb706b";
+      sha256 = "c4c7a63d09635f965d59559f6e795aac4860ce4693747e9469dd679d1480769a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/szl/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/szl/firefox-151.0.2.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "427800b2dc4f4a2a353a0de18cb76c27e46230a98f8dde8772756d3b582c7a63";
+      sha256 = "d489dc8925c1e61a59deaa121a2a633fd34f172a60746170557fa2bbe6002d8a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/ta/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/ta/firefox-151.0.2.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "afefed9a26904d5896c915b9cdeb1cc47c53bfaaf6a8bd0378ab3c4b5bf2cdf6";
+      sha256 = "86d36b5c34733ce6b6da3b59db14a870f2fdc45fac7c367c1ed7491704a79019";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/te/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/te/firefox-151.0.2.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "3fc94029630831d7e0684a21db8b017c2949774772563076803a2e38de729fe9";
+      sha256 = "e8536504666a4195ed9cf39add8bebd3421a2b656d1d6a2fcae94b341198ed25";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/tg/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/tg/firefox-151.0.2.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "43a29ed8f50d7dea5a74419ffb11fce99009955537412225455489a5ab19f1da";
+      sha256 = "a32c25b8452629a4834c4e44e6016045376934d91e9a61940e581d72c490d45d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/th/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/th/firefox-151.0.2.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "d107cb828c3790d006c75dbf83530bcaf51d350beb7498461f6149fcb8eaa074";
+      sha256 = "215b6d3acd6c32030ad0b0cd93933874d6146506f585127154daee467cddb55b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/tl/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/tl/firefox-151.0.2.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "2e52d7b47c29f8807f8a2151b59f9eb823f802fc3f09bbab6f0e61994a71f95f";
+      sha256 = "50bc36f2c9dc190fa4761db4f11af9376b6dfc36397b19ea8ef7ca10a38655f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/tr/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/tr/firefox-151.0.2.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "b1c0afeb43f6216f32cb971fd22aea5c8919dfb71feb414f481e832aa17f9fdd";
+      sha256 = "51e4f928003746cb1f81a6a36beaae78931cb240b94f23abf2c49b408cf99d46";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/trs/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/trs/firefox-151.0.2.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "a9574de4352415f6c51deddac4c0d8965d6e0e9442ba9f9f088aa66feadfeb6b";
+      sha256 = "a3a805e84ff680f7bb76ebedc634f6e889ff7c589edfba141165c0903ac28858";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/uk/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/uk/firefox-151.0.2.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "c7400fb14d8143b0614a266bb6b3086fdf3690d4d92d652c8d58b249a030102a";
+      sha256 = "f6d98175c746400040c71a16c38e528ccf4b9ed4f71d455889c308d6026cd733";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/ur/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/ur/firefox-151.0.2.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "470cba5d078f21d5027787b38e66b86f75578530950c3084579f2d78bd4bc2ce";
+      sha256 = "28b9276ee597046da445705cf8fba8d2362e3cc66982bf093f9af63a04862dc8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/uz/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/uz/firefox-151.0.2.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "469bdb5ec3d8c0cce7f6e9a9fcd2bd3040adec5312bc2cd087c9787738b73e2e";
+      sha256 = "e450145977e1b9809df7574f812e34c06ba1019100e1350ac450ce8e18233db0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/vi/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/vi/firefox-151.0.2.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "81185bd512437e464da18b82aad21a4a0c715e8324846b8d1425c91493e01cda";
+      sha256 = "c58070a60b97af46cef21d62b157737833c0c1de648dd22f2e65ffab0602d218";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/xh/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/xh/firefox-151.0.2.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "21bc1b876b34bc40e4058495ce5d1418dcdfaeb7d1b110261fdef9cd83919c70";
+      sha256 = "6b90880471a3009fcca6b97e0be805ffdff992bac8b71c89112817d22c5db244";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/zh-CN/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/zh-CN/firefox-151.0.2.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "1c33185bdf78eaac9dada58094e007d7e8e1ee8d214c155ee0f4bdbc1d465e27";
+      sha256 = "83d49dd7b3a9206df16179666e1af8924b9af20d120190fe19acf37f92d34c9e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-x86_64/zh-TW/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-x86_64/zh-TW/firefox-151.0.2.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "a5a0a5d257f9d7b7d751e98095c2e7615c187a34fb4dfc43603e52552a58e42a";
+      sha256 = "2e4ec2e640191c79e008bc9a3d827478bd320da787b76a3bf8ba46cd4b2dd169";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/ach/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/ach/firefox-151.0.2.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "df0706dabdb84c972916eb6fdd29d9ecc2a9d359b103fba51026f674ec295974";
+      sha256 = "0e3bedc762114f3c84d54bac48105a7843763418a87eaac62f8008e68970d077";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/af/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/af/firefox-151.0.2.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "3d390292691a92711f036915942a6116909aaf219dd359c6c7b1438239d3006a";
+      sha256 = "1ae0bf48c07eba988f6a30e86423759e4b1637d3b7b8750c7a7f84a2444f9377";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/an/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/an/firefox-151.0.2.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "bb5f882521d5b9bfeeac1e2fccd181ea1c64e213fa6d30474aacc546b034e3d4";
+      sha256 = "dbd02f5563debb61130837c6c8fafa69faf940ae6002c6b50efd372e46c255da";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/ar/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/ar/firefox-151.0.2.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "2e6e919de65ef7e77afe87369a97e3a67e3d53d221adde17fda7667a0fec4864";
+      sha256 = "9c6b5d157411af59af65a5ddd5338bc333d647a9738f725aa624399f6fc91d89";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/ast/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/ast/firefox-151.0.2.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "61e1333ef48499f7fe09c69f61b15bb597d1f4acadda50aa509faf6ba4e5e7b1";
+      sha256 = "8334978644de2cd9420e65f960418cccd973a3daac620a8c899b831dc67febc6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/az/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/az/firefox-151.0.2.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "0abd8c68c62455ae8c220387ceb183eb2ba0e52661ba5355ec5b998e32b62b3f";
+      sha256 = "5b12883ac7b74901c1a464818641f87cf93d87a89bf1d43ec42a0dd7661fbd5c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/be/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/be/firefox-151.0.2.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "0c2726fb288eb4059e51c153b044e1b8360e9c76d0184e7f33be9132c0e5220f";
+      sha256 = "3bbfd3fc24e2f3058078413877088120b1fa1033f20f7096fc7a25b9b7b8f190";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/bg/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/bg/firefox-151.0.2.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "07e76223003152343fb6590087b80bd58dcd02305e75e2a417b4df65ba5e56df";
+      sha256 = "07568e9ae4340225ade131e264c64d660cbcbde3e3a15beae72123b97cf33277";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/bn/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/bn/firefox-151.0.2.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "8190f3982722c9c4beca56f27966d4819038788a7a5370fbe0c6886e3a7ac6e9";
+      sha256 = "675c2590208473119856c3c0dd44c4612ed81e8e631fb81fc8708bb53408db41";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/br/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/br/firefox-151.0.2.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "931b82455562d32e62c28c895cf3552f23b893eef8dca94c7bc93c2c58f0fcb5";
+      sha256 = "7c7efb30d69cfd347ded00cb11c0b86e70ea158d4cf1940e2818a6d7debc34a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/bs/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/bs/firefox-151.0.2.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "d1e8becbc0b03bc38f33832a5b310ee484abbe7d5a851b6fd0f3204ffd5a390c";
+      sha256 = "75fb29bb1ed080ec6e204a524b5c5bb9924d4073ea26ad830b9157d82cd8c572";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/ca-valencia/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/ca-valencia/firefox-151.0.2.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "d5a8d6dbaeee0d6c99f1e8929da8ff41d261825706a4f46acee6f4f70c0a3393";
+      sha256 = "829321284d7fdcb15a25647f84515966ed4814a48110d2331ca6d58ac1434fa7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/ca/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/ca/firefox-151.0.2.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "64a72f4da2c01478c08a6bdfd1a87f08a4ad51fb0ff16657f814dbd97ca88728";
+      sha256 = "f98c8caa7e913b939340c1fa26c9e109a2469a5e8ae50bcdb7db597efcd0fef9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/cak/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/cak/firefox-151.0.2.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "4aa355ac43e24a5ec2f9711aa82a74164ec04044bd912487df4810a741ab1c43";
+      sha256 = "3204a64b2ffb19055bf3f8d0db30901d1ac4321eefc4f134ff197569cbac7949";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/cs/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/cs/firefox-151.0.2.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "4d9f5df9d0cf4e869937035c7d52a5840e04a009ac4b5c6be512a4123c04fc46";
+      sha256 = "5e295638bbf2737d1be682c347ee5c1002997fbaf63a3292954a26ca2984b2c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/cy/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/cy/firefox-151.0.2.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "ecfe8e509ad5b8b47f7d19038570b67dfdad798d221b0f929931a28766bf29f6";
+      sha256 = "a3ce3ff43328211e2ee95ce985fd81d758ca77682059d14cb6dc45c42072a8e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/da/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/da/firefox-151.0.2.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "9a41439aafc17bf933143fec929c1d0553af2e6709b72397ab5188522999b345";
+      sha256 = "3548d98971ded2183a108c3673226d3cfc50134b5f6f9b315860019ff45f056a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/de/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/de/firefox-151.0.2.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "626ca1a629743e1abf5888dcb94d77527815ac95318a05204fea8ec0b499817f";
+      sha256 = "1f690eefa96103d9aba6a644606492ab7634aeb6b5e2fe34f02f0d65a1f28757";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/dsb/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/dsb/firefox-151.0.2.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "84fc33c16ff5f9bb93e87ebaef840fe41c7fd43b16aca6f2135e873cfe2b7b72";
+      sha256 = "cb58d99b0d28dbef2194fcd5b1f2bdaa13dacf8a9da5a046ee03cda8de072681";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/el/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/el/firefox-151.0.2.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "f4841e5b659416e8714f120c3538ebbfdedd74010c2ec57b2784f3fc4cf05a33";
+      sha256 = "ac86a071c2222274b00835953c186e87c60192dbb4b1180039e6c373b6714a32";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/en-CA/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/en-CA/firefox-151.0.2.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "9026d3519381ca247df296f46b88d049e7f3fd85fa4ee9eb8c216262d7d630bd";
+      sha256 = "d37a30a2405f048f8fbba3c043d2d02078ed9a7bc8c09ef5f40c90a6b44d7485";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/en-GB/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/en-GB/firefox-151.0.2.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "19bdbeb61512e06bc6509fe12e0ca9a7bcd2496d34644c11d48fd88d3508fce5";
+      sha256 = "c3426f335acddc3f0ee2e8848369480a2a01c73ac0d5b1f38d85214802126c01";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/en-US/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/en-US/firefox-151.0.2.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "97656526bdf52326b68530afcb93f80f540b048681457728e4db2cb42de71ade";
+      sha256 = "2c43306c97376afa86cf361210f8d0826923eeb85e069fd07a9e7c7b60d91970";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/eo/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/eo/firefox-151.0.2.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "cd672463b7234e6fa74ddf27f7d1e82b2ae3dadcd4702b70f416a073fdf59f8f";
+      sha256 = "38ad27310be7dc51458d39a2ab2540e6d6c95c982d42d3faafcc2ffd436270ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/es-AR/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/es-AR/firefox-151.0.2.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "7da1d691534a8fc1247a02dce0cfb628a88e2e6355fde05da4f1d879b72e6355";
+      sha256 = "2205239ecf97b76ea5a58c92eb5af00750c143b3feed9b6b56e758f6f0ff1528";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/es-CL/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/es-CL/firefox-151.0.2.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "14da659fc42ab100d99badfa1858e53908c728ab3d62f5c3474cc843ae012546";
+      sha256 = "af1b59ac0ab6f74b4f8638ffcd2025ab1c28ec613b97b967a130532dca442014";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/es-ES/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/es-ES/firefox-151.0.2.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "ee9001e816e0f8ebeeac71c2bbfeacc5970cf6347641a17335985060fcca916d";
+      sha256 = "80b79b87e18b35e9197c9d9ef90327c69b05ef91facfb5f04b01d83d40cd74ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/es-MX/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/es-MX/firefox-151.0.2.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "8f06264a803047e7c42f714f42bb121de118615a1abc80ff5dadcdd5d1db3583";
+      sha256 = "ac2d86f500f06bd07ece8fc7045c32ac9729f7da5dcba2b0a2c7da603aed0d55";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/et/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/et/firefox-151.0.2.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "04e1d3ed4da4a138f7f4c0aa7acb9143aa5319d9b153f0fd3c860580efbba2f0";
+      sha256 = "916335b9a267a9370a235af5c03b93c70ad99379f5b50a031b3c64622c831934";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/eu/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/eu/firefox-151.0.2.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "2aab0ebbb8ab7c580b2cbd844edd0fb6737b4cd643b75d2a3736388b783e4433";
+      sha256 = "2c69e3776737e577bf5bd0115a212025de2647432c1d600d9d2af96a5cc2e136";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/fa/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/fa/firefox-151.0.2.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "df1c297c26375919e0944edf926f8e6135623c97cc3b0c2f865e7d592b1c90c6";
+      sha256 = "f32aa346e99cfb4e09cc5e6c131b0bb842fa6dec467fc09d1268fe62302b220a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/ff/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/ff/firefox-151.0.2.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "234848cd34eb9b9018e6ba3b42424e601bcbe34f98e3bd22286e564221c131ab";
+      sha256 = "74067ec7eb895b35f12a7380525e27a2e5f1fc3ebf7d1b3b2076422578abb160";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/fi/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/fi/firefox-151.0.2.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "37184a51cb99f4303098ae5e4e0153cf3efc778977ae73ac18391d7115628025";
+      sha256 = "48b07d5b22867080888167b15984bddda15e9772be263af7c86dd90dbbb16b86";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/fr/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/fr/firefox-151.0.2.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "bc91c01309a76b0856d54f8907f345124f4e65cd2263829cd79df3abb7731a40";
+      sha256 = "931c24557579f26b87a8dc67efe812162ca400963b7e63e49df00757c8e05b2a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/fur/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/fur/firefox-151.0.2.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "9e2d34556d0c107bdc69f09967ae9def6fe3ba787389cb41927e3c78c9137196";
+      sha256 = "69388918cc3dd83896e8fa76740fc644155f195f7e2b73277c3016d4461bfa11";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/fy-NL/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/fy-NL/firefox-151.0.2.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "9774eefca44e890e7a06795d139fad29788c85bf040f6e5c0ebebcbbdfcbce55";
+      sha256 = "d379f1b2c0a3de3107fe98c8dec20ea97f7fe4f88c4751f847bc3cffe908c0da";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/ga-IE/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/ga-IE/firefox-151.0.2.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "617a68798a0b114bb0ab73e172778af278a004345e70c1fb61232f9aa4dfcbe9";
+      sha256 = "49d66802ebc6c0909927167824447353d36cc7a2379a7cdd61ab3c2464db5cb0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/gd/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/gd/firefox-151.0.2.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "1831a8a54f3eadd3ff7f4259d975be81eb0fe19ec234d8ef22084f911bad3082";
+      sha256 = "51ece4b051c60d41cf51d7da0804b82c909779b0d7158232121efca6006488ab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/gl/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/gl/firefox-151.0.2.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "1de92317fd3fd30e702a8cfca0531f8534ffe84c573905ca66beafee57558033";
+      sha256 = "c9cd4a0de14496fde87329f4b62ad994bdf180e12247a69dc9b3dbcaba282a77";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/gn/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/gn/firefox-151.0.2.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "42bf2fe4277bb95e0fcdedba69a4c6d5f39d4b13b678e99054113c38ba1df232";
+      sha256 = "c85b1d4e9d0636ad8584e5f8219768edfa5d9995fd304125786dc7a1edb50112";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/gu-IN/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/gu-IN/firefox-151.0.2.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "4ade104dfdaa31456e94ff200e00a47c07e343cf5231971f8c703463060f0a5b";
+      sha256 = "d3f0c7bf65098dbb974c75bcb32707050e645c077a74d0c3cc15ef739321af7f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/he/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/he/firefox-151.0.2.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "f9ce23daf72fe3437ef06d313483c0418b5a74b1328ffc4a05cdab0daf1df6dd";
+      sha256 = "ffcc905a02bff48359e575f241ad002914e5432639df217d46a76a4f85f3bc02";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/hi-IN/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/hi-IN/firefox-151.0.2.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "5197949591c51f73efe20d70ab2f4081a393aec1cf07e7d55f940d02c52fd230";
+      sha256 = "5636f87165660d23449864cd682fa2ccd045dc2aecd56c044f697f07512fb197";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/hr/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/hr/firefox-151.0.2.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "5116200ad3bd8b59fb6b109e217dfc0f1771fdcf80f1f9f767c4fa9eb5cd48d0";
+      sha256 = "8cb6aa0e7486a7c5ac8b407acd55a662d8f3c965c335af1baa5172d1d6806420";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/hsb/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/hsb/firefox-151.0.2.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "a8fbc946e285ee808b45a75491ba2cb675cb153923c739a53bfef238ec0093dd";
+      sha256 = "39c8e5e9a846e7453c51d5e29a21c8dc61de950789edfc7e131e0aa4cbf0d5b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/hu/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/hu/firefox-151.0.2.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "4df5d08ace838b92cf067a2e2842e11e60cc5246244238278df810e26c8a8d90";
+      sha256 = "95cdedf6f987ec760961479adbeee3a9ee2f1f488c26f9d0e53bf52aa84d7de2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/hy-AM/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/hy-AM/firefox-151.0.2.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "6b24246e671d6bb4fb37582dd53e6005d93be490cf6ab42a9f5d8a22c0414848";
+      sha256 = "fb8563246e167b28c58affb5bfe9eb723c34337e2f3167b2f39f38a48be670b1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/ia/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/ia/firefox-151.0.2.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "89a98cd7b9e9932566715bf79b37ab5b610974b1733e9f3c5db0957cc79ad092";
+      sha256 = "075c939ec54c92a13579cdd0265ce1fb98be12e8f04efb9f913f1d55571ebc55";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/id/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/id/firefox-151.0.2.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "6ce940d5d13cb4161a52eaf43aa91f24b2395d911c95c69f893edd07a92b8e41";
+      sha256 = "1202aa11d58074562fe9f3a71680abf878d2a85040752da82b2bc700c61e4852";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/is/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/is/firefox-151.0.2.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "583c7f023dfd4e9783d789e6805782914f374f9c39fbe0817829a16e5e245bd8";
+      sha256 = "eb5aa47c30f22907a2123fa212ae2b9f31ec923d5ae978589242b817e0bcc15d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/it/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/it/firefox-151.0.2.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "e16acb2462e3bbd775d97f6a8beab427f0f21189d3ee39a4eb1df20cae3ad388";
+      sha256 = "a62ea4ca13dd1666fc39637da00940dfa0e83800adef3988e1944e0e00317382";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/ja/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/ja/firefox-151.0.2.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "55092bcffa91e87b4e3a48bbe9776587bbdb403346b42d35e8224a8442f10e33";
+      sha256 = "6ad976a287743d80149c337483c9ca9537125d669859d5c715dbd110159d675a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/ka/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/ka/firefox-151.0.2.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "65ef03d8ea3ee0f70c1a89e2e5e32e569529dd846107d3b631d64d45a1ad4c2c";
+      sha256 = "0054858bce8b35794f5a9ebddf0426580cf9687b0e70eb0ce78647bdb5097573";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/kab/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/kab/firefox-151.0.2.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "d4e3fe83fc709ea888c9995ceece1435d62f669ac2745d7ef15797cb9cda0b3b";
+      sha256 = "9164de9af184ea4fe5fb334c746e4c313caf2d343b42e03697ef6b294f236e58";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/kk/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/kk/firefox-151.0.2.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "cee6fa49dafea14a39e011f84bcb062b3dea4944f52fa16c02b434cd55b0b550";
+      sha256 = "1cc23b1a193b833109547caecc0fe923840ec839637e0b6fdd6f7f8474e6dc7a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/km/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/km/firefox-151.0.2.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "d261002faca080c3f9176cb96a232368471b7b29d1dc7b9a6bceeffbbe700f6d";
+      sha256 = "c3c40e044d5a9f8f0f07ce0ca441d99a4737a5b53ca62865345988fa4be544ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/kn/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/kn/firefox-151.0.2.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "57f16b61e3d92c3d46e3ad4d18dfd208ec8634b511e3259f82e97b29f4835ee1";
+      sha256 = "44e762a3078ad6248cf4f516a120909be30b0f547a3813e875f59a66a37b80bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/ko/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/ko/firefox-151.0.2.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "ee7a8d1d889e883f83e15b5e465aacb057266e04396abf85546925d8aedfc769";
+      sha256 = "e506346f23dc64c8b4757c564b7802ef0ae5f18bfc70eea68acaec37f8a8eb2b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/lij/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/lij/firefox-151.0.2.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "52df47f2ebde1111491ba31dc802d0afd4c8c457ca3ea04f0a3c30f366adc53c";
+      sha256 = "3980c04d3303efed01d161be92c1eab3bb0103666f7bb0005145d176a62c499d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/lt/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/lt/firefox-151.0.2.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "960b18ae776cc44abc266ec5deced3d66f187839d1e8eb7342b349ca54503d23";
+      sha256 = "c6be2481bd9cce300abb9a6f81c987f9a1909b79e03ecb62d7087482486f680c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/lv/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/lv/firefox-151.0.2.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "18a25f417418ec1ba16cf97da601d8d498c1064dd2e11b2b9a6aa96f73e059d8";
+      sha256 = "30c9a7ee92cf50a116e767be6c6dda0693bccabc4cf82f3d0c475f3487090817";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/mk/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/mk/firefox-151.0.2.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "5b4c84e1127f552902a170bedb35edd8207e4dbbd97c996700ab9e4ef1739604";
+      sha256 = "1f05249ac61fa2e4799414b4ee71768a48de6e1ab010126de39388a7174b1043";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/mr/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/mr/firefox-151.0.2.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "05be0187dff40af405eb66e26d7db0564565690e33f4555d104e9cea2d5f0984";
+      sha256 = "423d3470967f9eb560f6b76ab49e2e11eeb28619b953707ce0b20cd40607b3b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/ms/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/ms/firefox-151.0.2.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "abab034f45a1ee9ff75d598159bce055a54036b4e77bc65d1bb87e163ece7632";
+      sha256 = "41ce5df7312ee3515ee9de9e02956fdf38fd246ca93a2c91ff57c321f6a23fd6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/my/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/my/firefox-151.0.2.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "412ba9da8c07e3024ec2e8ec3a3f69e6fdaf79214e6a7d04d6a73bb47f32d81e";
+      sha256 = "e5b31714555448f48a0b83ad397cf29157487064ab1957df3df1e0d87f694317";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/nb-NO/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/nb-NO/firefox-151.0.2.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "11ee015849fd8f08a2c86bc6ae42f683df41c1d4618c1319dc2311303f27d4c1";
+      sha256 = "7cbc5b70fd068e0f78a27dc9314159de23e68c68ccfcd783e6f6614af34b0659";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/ne-NP/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/ne-NP/firefox-151.0.2.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "9ebe2524c372f1ee10389052c21094a1a7791070d8bdf6a7f5897232fb81aac2";
+      sha256 = "8383742efd6eddd238c462a35a1aea507b19ce00c54ef297059c6afa1cec5b76";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/nl/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/nl/firefox-151.0.2.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "a20b6255c1e3c2fb2de03003aad1ba86448e636b2a25ea883b91fabe2b9bdcae";
+      sha256 = "4383d802bf5a428c4bccba3af852c647026db935dd57064956b8d849d0101f29";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/nn-NO/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/nn-NO/firefox-151.0.2.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "dd5ec2d4699fc4fb4bf9bd6063928cc0b483a4a69342ce4d9004ba179ed2f8d8";
+      sha256 = "152cd6340121499590de17371018f845fbff02c9aadecfbdef2b44eea7721701";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/oc/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/oc/firefox-151.0.2.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "90cb625cd426d432f46e3f6038dec8b1f93d3a7a100cd1a4c0da5395e3d7e429";
+      sha256 = "c7e2cd656307fbcc1edcf65c5a0e10c49f09d251817af109657f2c36776d600f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/pa-IN/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/pa-IN/firefox-151.0.2.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "abb142cd43e2a47aed4cb5cf6600e1cd71b2130dcd551a1361f78a02763d928f";
+      sha256 = "6bef3c40b1146dbe499b0f0c0faebc6eb36976972c36f809095b40fe440d30e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/pl/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/pl/firefox-151.0.2.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "727d9b3e44d7a65b7e785dbf5c4636952a41588a677f9040c0544ac4560fe40d";
+      sha256 = "535a7e740a2c58053f39ad985ea2afbf2af05104e6e59f3eb0ac07920ed6d55e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/pt-BR/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/pt-BR/firefox-151.0.2.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "99c9bf4e71e335b47945db96a320c28451840dfe5f678eb5117f127ae53c9331";
+      sha256 = "f96ba261b7433cb2faedf72f294865a2a9b415b3630047e6424c51a3193a06dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/pt-PT/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/pt-PT/firefox-151.0.2.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "7224f3da0e6d643943f6a9af55697975af8ce61c1103b32dab3831b2b1d1dfb0";
+      sha256 = "f3b0f9290bac23836a2179e57c880856501edb9080b32b5db2e05a16fce8bb4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/rm/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/rm/firefox-151.0.2.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "08b2dc7435d27854b9edbb6595d9418bf7b360511c8cd5e9b7bbdbc8f08a3f9a";
+      sha256 = "b7a3c6f2e9cc52c50c9920bc9f9da8312c6c687e15439e264d6531cef40bea65";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/ro/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/ro/firefox-151.0.2.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "ef1b73ad0fc46c892c8c6b9c3dd066d8ff39b4d7b156f1a4a01560e7e54b53f1";
+      sha256 = "abcbc118539d47b2bacccd0aef7db439c8901f2a9479a640753b3cbad4190afb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/ru/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/ru/firefox-151.0.2.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "86d7f5fd85a1c97733ebfd1c00c28e76f4394818dfa3e57d3612ad9f5d91615e";
+      sha256 = "85fffdd7163a9d8162d5d81fcdcaa27981214e635ed26d82a333d03d4d726a69";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/sat/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/sat/firefox-151.0.2.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "da49cfabdb92eb6499c864a1f0d3776d23a127f839b30559638319d01b646399";
+      sha256 = "c135923ff4f9daaea15c01442ca66bd1a33b8fe6d09eae249d2eb21f4ff70f46";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/sc/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/sc/firefox-151.0.2.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "5f81ca80aff2f083cc9c42a1cbc2cd81f17b63d99da784d7946b68da3332d4d6";
+      sha256 = "9a896d2daca99b09538dadc1ae44266c872659823a8d80c27f1eca25d36214cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/sco/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/sco/firefox-151.0.2.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "702129887616a3b639c7d5de1a12057c48695af18507f42539935b6caea1a583";
+      sha256 = "a830a88335bba467576daee2a202d535ad985e16271176abd002cd86a4aa52c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/si/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/si/firefox-151.0.2.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "a8feee906e77c2024b434a240e34c2a8388d9cdad124c53818110a3fd75e644e";
+      sha256 = "0198ba9c6ea31f159cda01177d3b76842aeab11b9466c772d461de0cbf77c469";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/sk/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/sk/firefox-151.0.2.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "8c8c80842177681d709333918908d72a53894f83b45d6e43c2861f63e97614da";
+      sha256 = "41f7d9d466b3a8de76a4b3b5384c34b8ee6cfbb90c2eb12b63de49566c4440dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/skr/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/skr/firefox-151.0.2.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "19a1b91c8bd94a57b19118afba87b53374d9fb12dc313ba584d281d2e8eebd93";
+      sha256 = "fcd0dae5824ae434c82abd6ac5c7c63501680e21d09994850691ca03c4c362f5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/sl/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/sl/firefox-151.0.2.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "9b7022848bd043840da6cc4efb280e70451c3677f819a231a0c560ff54c26e82";
+      sha256 = "b85382f79739424a7b01744232d60ec60638fad728ca426d5517a4a2c978795f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/son/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/son/firefox-151.0.2.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "3700fd30787ae86b414b224448e2f7f0aab93c78069adf87b5b62ab37b412f6c";
+      sha256 = "e383008cfd8e0bd59c37dbc23f4ef223c4781434aac5858a0ef6f64b29ed751a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/sq/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/sq/firefox-151.0.2.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "ef914d4e2617898f55179e599c2c52a97d4c59804987c5da7a6ff9c9de3dd6fc";
+      sha256 = "ff3e9c00a6424c2e62e305af01ecb1ccc80448616d5e77fbb09d1085fe178517";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/sr/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/sr/firefox-151.0.2.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "f8fd4c32a45e8eacb209f2c8ac3f77f19b2369dfac932c95a240f537ab35b023";
+      sha256 = "706d51a38dd97462c75e49c314d66f6d924a7d5091de3c7022d8e2df706f2486";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/sv-SE/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/sv-SE/firefox-151.0.2.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "2579648f4b181f1df7b1f2b10fcde319a650483f9f619114dc072ca4dbeaf1bf";
+      sha256 = "1d69d263d33985e554632ab771af8e880273cb9dd7ca792e8674ca2cd48f4997";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/szl/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/szl/firefox-151.0.2.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "741617fe1e9bf6cf994da47c8213ae938a88de2a0a6838d901902d776fee02fa";
+      sha256 = "81e80e410652049a5c1ea6a2ffe10a5f33783d6f12c4e1336d642630d52df79c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/ta/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/ta/firefox-151.0.2.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "4d0a031135a175422d339f0abbc43210a908ff16e340761c5eac1e8c44d7e569";
+      sha256 = "c33e5161efdb306e2e5c2040e3e5c2e6d28681b2453ffc50804d0eaebc3271b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/te/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/te/firefox-151.0.2.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "e3f1df9fe5f99664638b50b7c585447d0945edf09ba02e4de0eb330fdb112ffa";
+      sha256 = "f65ed0a8a45940cfb965c2e4a22153e9d35f1d8939b86ec883b87d9e88ee4a7a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/tg/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/tg/firefox-151.0.2.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "3151c8321979058ef50a82290263cb9da753b6f89e715d32ab2835a082f1e601";
+      sha256 = "3593f43a25b08c2032de13bf505d0bdedf1060d6201e83abb2f39eadf2094680";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/th/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/th/firefox-151.0.2.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "49046b2e4ec83c90bab357f49e25c568f8c69a45b0b14c5dbff46ff3e0b58ee9";
+      sha256 = "d8613ded5a54bf2145c942af3110e7fa1749de908bdb7ce218434478b2d332ac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/tl/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/tl/firefox-151.0.2.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "aa0d5e1753b5fa51269c348f868301372cddbadc9cd1fbd89859e15d52d790df";
+      sha256 = "77cec2e0d654da679cbd73e4390c5e3a87e1f8107b72ef7c717ddfe2e27d64b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/tr/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/tr/firefox-151.0.2.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "7481fd25241e89ea816d875fca73ca1bb05e286357fb921bf40116265f4daa2b";
+      sha256 = "02ec71d1bfdfa8e63d70e9e7b39f643af48f8c643d8d4cd4de29e04587db43cf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/trs/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/trs/firefox-151.0.2.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "6d35728573a796801a0c1ba7d1c5d625aca35648187ce3f9d009629fd6a18308";
+      sha256 = "e518c861c43169be8c3bc7d25ff19ef2bec8ba57d50a32d31bd8383820fdff07";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/uk/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/uk/firefox-151.0.2.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "1c0c4098688be321f954028a1291ec5b26facd8094f326c459ec1c7494f58570";
+      sha256 = "475082e01719e7c0c51b7c4ed43edad07ae6bb01995e38d2ac06ea9fe143a4a5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/ur/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/ur/firefox-151.0.2.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "a8270333c2a7519f63b0f54b0925cc80c4067b282d051295f91031d949f499e2";
+      sha256 = "1263332b41905e0c6085e5a2ae39321e26e2414b2c7021c4adef07d75334f685";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/uz/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/uz/firefox-151.0.2.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "b9c37be1a8a906cd861360704665e67c146786932471f3d1ff35d44e07ee6d47";
+      sha256 = "319b687bc1ea04fd6b0af1d21f09b2fc9a1bb1f4ab14367038ae0498d9b54d4f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/vi/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/vi/firefox-151.0.2.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "699ae0787d70f32090a792039ac5301f286070d5aaeee9e8f1f71fd46d921b93";
+      sha256 = "29e98e398b3c117935d5ac905fa57f4c4e83245fe8e590b090a739901b30cd58";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/xh/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/xh/firefox-151.0.2.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "c2dca1da713622152c167e71f968c3d6cd2492f0f3f8350fe95185e2de447f77";
+      sha256 = "d0e4ac5636f91e7f9bccdb41ab1252d034ec8d34c1efd0bf7bb3153e458829ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/zh-CN/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/zh-CN/firefox-151.0.2.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "487d297127977fcef82a312dfb0321b7d432b88ba3bb960cd1df0b3ffc458443";
+      sha256 = "d8d81a0559d3b997045b03cab3975db6785cf5d06352e4a329714d21a495e5fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/linux-aarch64/zh-TW/firefox-151.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/linux-aarch64/zh-TW/firefox-151.0.2.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "cb9b86d62806b4a6e85d60f64e1483c3ee09ae7b487b24b8654e956d44519cba";
+      sha256 = "1e2d8546bc15988d77805bf985297c71ca7c68943be065b10467110c7e35ecb9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/ach/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/ach/Firefox%20151.0.2.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "b4eec660ee36c714c9e491c9516051140e5fad9df1abd6b225585cc04e7f9c4c";
+      sha256 = "8659d944088ae3daa73faefa3fbe6fb817b7d6be92ef487ef31f9b5316e1828e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/af/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/af/Firefox%20151.0.2.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "f960d233893b6a71c880fed0eb24920b0baa88146ed45ef092cf57974f7b6411";
+      sha256 = "a973431e879e8e2e70bf8579eea1061bdaebcb85e1b273c9724b593ba5065b9f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/an/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/an/Firefox%20151.0.2.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "fbcac4fdc76de05e8b03d7de2b9eae3d275ad6a9ed5cd52a005d81ca55e426ed";
+      sha256 = "5dfbb6daeaee0c3dd5c5231a0c81df8fd3c79f5a4a291cb72bfa5fa316e5cfd7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/ar/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/ar/Firefox%20151.0.2.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "b069ae7d7bed91797471e0161ba782fcf63ac3a88c085f5caa22addf03db78d0";
+      sha256 = "625a15818a72bfdd45ed120e7c880aec4246e95d7cd6a05be4cb1c8a2539a32d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/ast/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/ast/Firefox%20151.0.2.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "abe4d3185fc4327545dd7be82ab7f710151a0672f5254fbd166783d49b019a1c";
+      sha256 = "033b2e182e5d0d76f8a0c319c7d0581179205b471d5550012699ad8f70d52419";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/az/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/az/Firefox%20151.0.2.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "fdc8f921085c7a915d5193d80ae0efd10df98c55a88ae92977e462f61be0b984";
+      sha256 = "2f91edda5c5dccf889c6de6f6683eb96850859344888fa99284ffc024399bb52";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/be/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/be/Firefox%20151.0.2.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "2ee2267e528ae686b8e1cc39ccce3d5dc1f6cd1a51e27c4a18449b10a462c90f";
+      sha256 = "00339004d2b9e056066767c16623b733d769af98d9a5ed07e5a3d227eb14831a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/bg/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/bg/Firefox%20151.0.2.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "83ecd942329bee9613e32817a6d6149c50284d4c30dc2d99916f46141e24d8a8";
+      sha256 = "3519b14c4ccf93c571af09c49fa7c8094f272c0a59f22b88d499f65afd25fcd2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/bn/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/bn/Firefox%20151.0.2.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "cb1d2bca681ee962710757774dc02d21268a44a1b7f6ce08d11e98b08e01863a";
+      sha256 = "4fc1d9f4e09cf3daefdde693dbe9c003a1216182967e01844b93ca3dcca10ae9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/br/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/br/Firefox%20151.0.2.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "2eb675b32258c4bfcf793dc5910b31bb01756898b2782ef952e140a9cf927b0a";
+      sha256 = "9c87f873da32a6d3f9a60a7eedf47f64a6cfd7a853d07d137f7bbb57adca9b1d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/bs/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/bs/Firefox%20151.0.2.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "ee478a0b26689a5ee2ccc4a2571370779f583453302b69446bf5f3a17bf2fb04";
+      sha256 = "864d9c9f94b57a0c36886b0ebe2eb1d6a0eb3bccfb6c341b3b10b7a195fe4121";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/ca-valencia/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/ca-valencia/Firefox%20151.0.2.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "0674dc309ba410cc7cde29722a107da52d7aea00d23063ab8109cbad1086107c";
+      sha256 = "4386d8bd2671151d289b9a41212754b676bbb21aa963373bccd9d31b2b9b2616";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/ca/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/ca/Firefox%20151.0.2.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "027a2f449b2e757c54683ac4d9928ab9e032e5bd44216c5b72ef1cc276345d29";
+      sha256 = "9b9bfc9500e0dd3b65678718415d0f90584a0bcc70704be6948833ae7c918678";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/cak/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/cak/Firefox%20151.0.2.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "a05e309736c58cac7a02e6a63df100b1bd55e8e91d2930266739299543266f72";
+      sha256 = "af62e2abaa4af5d2fe3087da78db22a4fd28ed8092f42f82a60d549a10c1c8be";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/cs/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/cs/Firefox%20151.0.2.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "a96cd917ae1a948f5307d3f592ebbbe7dfd40553de94f5db224e0254f111fabd";
+      sha256 = "28b2e8a6728e918cc2aea8add7729f9ef620fcdad40097200275f4422fe55b80";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/cy/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/cy/Firefox%20151.0.2.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "94642cee9e8db3f4e8f0f7aa59433cdb01ea97ba33306974abcbf50962a9dcf6";
+      sha256 = "7bbd9f38cda240205cad231d991052f817d231969c7607a1991deae369617231";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/da/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/da/Firefox%20151.0.2.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "880c5afc3c0d99405bee4d8ced5b4fe57b8e256fa90050a9e9104ffce27e0b6b";
+      sha256 = "18af4dc2ac8d139bace015c3a8ba8d353ba2692ec83333a4f036e33fe0aa469a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/de/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/de/Firefox%20151.0.2.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "d9ac61b0afd2f27d414fdb77b8a61205f6f61c8ab7350f4178cf85aa63e15b35";
+      sha256 = "22da88f7abe890f64f2d899d5d3b98d1aaa599eb48984f0fbea9a9efbd1b478e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/dsb/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/dsb/Firefox%20151.0.2.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "e3f4a55b26ec348984326a992db5664ca8b47ceb3d6f9dbce3cffbc37ce68f63";
+      sha256 = "103fc932b668bbf009fa01bdbba1b778f29335fc3076add9c17d7379defe776e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/el/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/el/Firefox%20151.0.2.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "b43cf704c8c3628db59ce3915aea5c4a8eaa7566e972db73c21f8468217d13cf";
+      sha256 = "070be299672ca277897efe862e094c522328235a8b19b7ed27183607d17a1692";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/en-CA/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/en-CA/Firefox%20151.0.2.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "f75201481eeb8ce79cdc0188ba045765ff326a9c56f8ec322720f07c918c01cc";
+      sha256 = "ec1cdac3d02e3b928f350a9dbf10a1e3fd5443c086a9756baef45c7d2d5aea6e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/en-GB/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/en-GB/Firefox%20151.0.2.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "58f46cdd5fef29e04b9974b7f09049140c29ec260231b41403690ed6004a0a85";
+      sha256 = "18d443064f1b449f16155fc70822604955f18779020f92fdc358301cdab14c31";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/en-US/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/en-US/Firefox%20151.0.2.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "6e3714ef92305e1164fcb7188e47cc1f076f7836c631a428470b154a188fb3e9";
+      sha256 = "232631dd169b8a4fc661a7a6756da3910cc669ba34b81858b7915ca138752e79";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/eo/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/eo/Firefox%20151.0.2.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "72f375dc7ab7b3f61d6bea2374568f9eee4767bf4e9a1bc038da0917206cbe88";
+      sha256 = "fe783c70135cbb3d4af4b0a5f21da4d63e871830c32f373c6e98a34f637cb82f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/es-AR/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/es-AR/Firefox%20151.0.2.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "b133a24e2acc8417e403eb7ff8147336c434539bc168051dc796abdcb8bfc2f7";
+      sha256 = "985bc42d10031e8efba55c58c53fd310d4be8d569b599f96e60405a575f10000";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/es-CL/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/es-CL/Firefox%20151.0.2.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "360b0eb50e8e8de3962ab9ff6530ebd70652cd389921769a9a5919ba3d4f3e84";
+      sha256 = "6f9f7dcc63ce8fdcf9f49f8c84ad52448d9dae542c433027dd2d82aeec5cc02f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/es-ES/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/es-ES/Firefox%20151.0.2.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "7ffd72366da8315e6a4c18ef43b242b5571fdd6e9bef296f9cacb29313b4f600";
+      sha256 = "c3c58cad5984c06724b64d69e73318175f9499a48247187aed51bd65a05d23d1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/es-MX/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/es-MX/Firefox%20151.0.2.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "47549b8e10fc48371fa19bd456e635159eef1b4113fe94c567497f777515c410";
+      sha256 = "8ccd97cecb848e5bd1c08fbc785c4e28eb194950318b12d6af06a3eeb5e41e53";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/et/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/et/Firefox%20151.0.2.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "70407612a08a0ec2996051e4ac25ad46863a49e28b9563278c46b1fc4bd938c3";
+      sha256 = "451e6dec47b370200100e20add968794c2ee180477f5e4bcf601fe825e87f759";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/eu/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/eu/Firefox%20151.0.2.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "bb33a67b7aac2ae8eb4b2ff2c47ccafc8135a06e8dd2a41150bf8ed624ed7f18";
+      sha256 = "5eb22dd754eab058b88b1164c6867dc6a9c8cf94e17eab5618e7aa88572afcab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/fa/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/fa/Firefox%20151.0.2.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "6a6a14df882191b5571b5f8b083912272e039b48e7cbc8f9b31320bc9ea7e169";
+      sha256 = "15740a4b6e005ad7c5bed33b11a2e79c59ea1453a7cecc6f40653a2d720739fa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/ff/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/ff/Firefox%20151.0.2.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "f523f72466bb5bf43f801d379c17caa30a2d50ed994440fc8c4bb121eb2e72f4";
+      sha256 = "485467a4dd83937f4bf640df89989ca624c5c0f31708dbe12dd1793a6f2233f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/fi/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/fi/Firefox%20151.0.2.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "bd3b56b2684ee0d3e3d7ed931224c8418b08216ca976b03d47c72c0be8d60870";
+      sha256 = "1b20a6f31759a323aef57188c1eed109adbc40123384fea64a7ab961dd0933f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/fr/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/fr/Firefox%20151.0.2.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "9c4460dfaa2f2cb8f29faa6aa2bce3b81c86b21689e062bd41666a2b6e15c66f";
+      sha256 = "c23515dd6f3a49a5d578321e269eab49b652300354b2b98e5ebb66db9539ee8c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/fur/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/fur/Firefox%20151.0.2.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "a10f3129252d36ba85d66d991bd281f9f83a887e940d20a391f3a0824446bfeb";
+      sha256 = "02c091840f2789806197cba8e725c07b4b0b87bace5d718776627f7b3694add7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/fy-NL/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/fy-NL/Firefox%20151.0.2.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "5f576c8d64b709b242625debbc7494b8d9ab118d4aa1a498b1159c779ed48369";
+      sha256 = "55907686a949f394c64dd3b6715e47ab77da6e279d12cb036b9a8f443cac701a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/ga-IE/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/ga-IE/Firefox%20151.0.2.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "48f1b09d2692a4b2a8cb69adc61b83f798bb32c79c19ab4bd0f77826df927f45";
+      sha256 = "3212c09bb755ae910d0c391cca8dee0e172070953502d5e662ad4e7c30255806";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/gd/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/gd/Firefox%20151.0.2.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "31d80219cc20f8406451ad2fa4693f48e5c631f20837bdc16869abfd5e167b8d";
+      sha256 = "2c8f141c917347b879f12840805d549f4c1d41eecf836f7a6ed0601fa6d59e43";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/gl/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/gl/Firefox%20151.0.2.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "fb16cbe366e35c0f59022ae4317cbee949d615463afc76b7fd130b48fa18f7dc";
+      sha256 = "c96b024a06b01ab0d5384ed4f782ba54657a43e93e5ca1ef43f40c073c0f5fe8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/gn/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/gn/Firefox%20151.0.2.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "9d642237962e171bdd14d7c98b4a0546bb5b2b75c9b03225e94d0866f28e7fea";
+      sha256 = "fc7e711e7c49e0751eaae50a7225ea93a2ac2ca1dcf406a5952d116d9343cb07";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/gu-IN/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/gu-IN/Firefox%20151.0.2.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "86e390059f5869cab171d4d7117d03a59c200aff5e03b3a11823de114004bf63";
+      sha256 = "202751c3da85a0fa5d303b1ac41aa09ea8ece4e1121231cfc5bce6495afc01e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/he/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/he/Firefox%20151.0.2.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "0575b8c2a724a369d439c5e6090e891d9b2e3c43b49ee5e412c9fcaeb91e99e2";
+      sha256 = "78059b2daf35062b95372d5ee0e2309ff0ad3c981ee81a379e6adc4e84ef14c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/hi-IN/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/hi-IN/Firefox%20151.0.2.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "56f5a080dab0560e9d2c67e9235bb356aa6c705a46a7c37d16f132f015628a9b";
+      sha256 = "9a0c7f980c307a20a1d8d9b263cf19be1b367b88a433767918d32996e8ff81cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/hr/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/hr/Firefox%20151.0.2.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "932bb41ab0fa27d2e75ebf35fc328d6fe9cf1332021d17b7d520ffb7a116c797";
+      sha256 = "797e2e8e70b80cc8695c61fda971990848abbebb5e1968036349876dd81edf85";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/hsb/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/hsb/Firefox%20151.0.2.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "024fd5db76d8c24e18e79b761fa770992c698a7841e2dc3202de884249864cc1";
+      sha256 = "89cbc38b01a445111dee697223ba1c12e79a2339bccc91259215feab9bee5fbc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/hu/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/hu/Firefox%20151.0.2.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "a85ba9b0c3b10594e7874c1b168644118b88ed52befc59827b8d9ce291879c19";
+      sha256 = "663517e92d2a38eae7a830b14cb157a4046cf73225d485fdd1b3dfffc365028e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/hy-AM/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/hy-AM/Firefox%20151.0.2.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "9a557d7a84ca68c460004c48a157d4190a132f3c7ffd011cff253ea19174a193";
+      sha256 = "c3875c7a864291404169f4beb34b03f4e26203400f4fc7597ca55ece2178957c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/ia/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/ia/Firefox%20151.0.2.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "cb91908522f6487063aceaf276a8b85814b7b606f3abcf0a695b9927c854e8d9";
+      sha256 = "ea1b99809e3ed8a2961ac0c46ecafdfc4dff72b564578055a675455863fbd5e9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/id/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/id/Firefox%20151.0.2.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "368ab1fc7e2c3e6017d11c2d7d329964528185995dc4306f4234f86cc2d34f82";
+      sha256 = "5c4d7869e0286ea75275e50917d4187f2bb28d6ba449b0f23a4f219a47c5177f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/is/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/is/Firefox%20151.0.2.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "268be662c9360c352054fb907879ef13f0f91e736c0467110e3c9a9c64634c93";
+      sha256 = "66ecfb604546ef736cf40571f83d3a6cab09f581d821f39e72b54c40fd4d626b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/it/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/it/Firefox%20151.0.2.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "23d91b18a1cd8576c2226b3d3befffc17188c793bc1407e977b3c9e333c04825";
+      sha256 = "1c71cfbd0c58b1cff246011497f155759e3a20f96787ba22222a10b4c6564705";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/ja-JP-mac/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/ja-JP-mac/Firefox%20151.0.2.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "627602994fa8bbeb10edd612b98e7c824246d7a2475622cb5b838fa5e7ae1d8d";
+      sha256 = "94f0293029b07d338a7c30ceba0124ac475c072460a9de1049f8f0df24a2c248";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/ka/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/ka/Firefox%20151.0.2.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "52540f6a440c6ca1c7efe5b4db9316dbd7f0c182abfcf11d5b736c6227962ae8";
+      sha256 = "eb05f800b68cab7ca4ed9dcd6ce81716f5872bf60ce2d8bcc156b03d299db8b7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/kab/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/kab/Firefox%20151.0.2.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "65012c8c0f0cc20cec9104dad6b8f573961fedc781ed3091261669d8b608c682";
+      sha256 = "85eec3d79d9e6dec597037f26971263e2ef87f3a329c7940c7ce0bb57e8c1a20";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/kk/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/kk/Firefox%20151.0.2.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "6b9aa92faf47c854e069d56b456a3d4ad38cb4fad63c472354aedff1612605c8";
+      sha256 = "b8d556040beec7b4732304ab1c80439ef9c73246050f7cdd077f642b32a7a59e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/km/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/km/Firefox%20151.0.2.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "ea99a43ef47efb9282495382ca74ec8d1dc4a13251828a321c2dadefd863335e";
+      sha256 = "a870a347f998fa8f2085ba77ba5dd67b2bf38f2562197c424e89ee1c7b1021f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/kn/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/kn/Firefox%20151.0.2.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "885339782efae2be7d934586a101f65d92a90c90b44982803f0c7d2cd1efd9cd";
+      sha256 = "0c67d40f3796c9cd8b0c3c5e83ad70d587271901b297b5be3259fddbe0daa7f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/ko/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/ko/Firefox%20151.0.2.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "c3d3e1402e1c8df9798af72b19c4368ef140b81f4f026d25a675a6fab1c4fb18";
+      sha256 = "be8cb5882958a1fef9294c5eef80636366eeac30404ac44f5ff91bc7100673b1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/lij/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/lij/Firefox%20151.0.2.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "7650a166ed2028bdbb3c89b214fa8f45841627cfef8f08b7fd4372705a79a282";
+      sha256 = "bf786763e007f8dd2e6ec12f649f9701a5e56758101788ba9bbda6fa873895be";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/lt/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/lt/Firefox%20151.0.2.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "5515c30f36225ad41fa2143d835cecc5cadbfc0ac57e2ebf68adc63448ca90c2";
+      sha256 = "cb44962297b5291a8cfbe5231aa295460e94f2a71b0b4358ef519ec70bc0e6e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/lv/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/lv/Firefox%20151.0.2.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "aeea8324da387c297492310929b3b1d13e4897033aae8e32a0322b54a658397c";
+      sha256 = "895f6807c02c431a8b2f006fdd582cdcc122ce4d431b399af9fc55d8751bcfae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/mk/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/mk/Firefox%20151.0.2.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "177d500450eab71f06a79cb3f6149f8c3d2a4da576a8a9f220172e567f81a91a";
+      sha256 = "b6a6c2fe857dac52035f20dab968c9c859ae1302d3048e2d13e5f15f72de2fff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/mr/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/mr/Firefox%20151.0.2.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "fa117301c81745b5391745c59bcd0a8fcb73aa5e822fbbe006ff9ce2ab0c1d5e";
+      sha256 = "37be201a3aa7886155919459e8918a96f809947933aaacfba8d6b5dd11060635";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/ms/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/ms/Firefox%20151.0.2.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "4149d908ae673e73fa6c39ff394dfb3e1eb7b04dc1b8988cd2725e4ba1709129";
+      sha256 = "c480811f67777868c7137cd7a14667642e1b8b76eb24a0bdfdf56c64fa6731fa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/my/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/my/Firefox%20151.0.2.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "1e8fcc3060f2615b7fd1f3a3e9aa9b1213ec2e4c957ebe9ebfb7e52664503cd9";
+      sha256 = "e46979dd3172b49a630cae1192722632364b892b76641f291cb59d03fd2e9480";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/nb-NO/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/nb-NO/Firefox%20151.0.2.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "65e2593d91dde13db1afc03f6a5a9f8c90407cb733889797f8cdeb4c740a620d";
+      sha256 = "0b65650c66a2096f9977c64c54e3fd9ce3135423aba962b153462fdb49e411e5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/ne-NP/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/ne-NP/Firefox%20151.0.2.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "1fb1dc4beeb8efda3c7775ccfc419e9c3d9d605c177aca9e160d00c633085a9d";
+      sha256 = "643330a0a02abcedf2587bf7332aa9f6d21f3abf2d3fa793e7b013f93eaedf62";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/nl/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/nl/Firefox%20151.0.2.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "7ba835ee68d1c1007e4eb97210c9f63c62403e10784e021ac42d925a0d847ab8";
+      sha256 = "5276527b7f9f7db0bd10422d79937bd4451887dd3dc3c92f840f6eacbdb2e281";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/nn-NO/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/nn-NO/Firefox%20151.0.2.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "0b914a85da8023af5b15637befd1292e434c73901e262757565c0c0b725547f6";
+      sha256 = "4cab836bdc35b7223c5a9c2db4dba00df7a72ce20a8ed0148b3b1cb7cb4a1c14";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/oc/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/oc/Firefox%20151.0.2.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "b6fdd333677d25545a5f0efe338d00afa19e91e62905ce89638c93cb657d46ab";
+      sha256 = "387e5629cc3df30f13a7e7bd5b365f3bdc0f2978d0bc20c2f6f2d0ab32e2edeb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/pa-IN/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/pa-IN/Firefox%20151.0.2.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "911c1a1c1a874117fd3577ead904806d024546e97b426d09335e2081ddc3385c";
+      sha256 = "75de25c8aa5e18b1be9973d5eed8b012ac01ac21f023d5f4316967dfb34fec07";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/pl/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/pl/Firefox%20151.0.2.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "f635a294c4444caacd8d5f18a2f359c666cd24a1abb48f9073409209a19e8daf";
+      sha256 = "2765412c39760b5f6fe02b2bef19360cc4cbd65607d2fa2a264d785721e6bf36";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/pt-BR/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/pt-BR/Firefox%20151.0.2.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "b87907a9cafda96ac9f13daf3f459a141de5c1cafff0fc10c464505a554292b7";
+      sha256 = "712ee9ae87cf57c61be575c3329dfa4b8b97d49650c813167700ed5f301796d9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/pt-PT/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/pt-PT/Firefox%20151.0.2.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "b777a37243a5945aa12afa4dc885bd38e8cd0968a5ff03afd4b52936d06a11e8";
+      sha256 = "5a7bb1b49c0cbd4207346615aed1c40c3db76dd2ddfaa68543aca10b9fc8773c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/rm/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/rm/Firefox%20151.0.2.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "1d662a951b9ffd48ea00b956b1fe20110fc16e93463b4f92bbd2ac89b10c6243";
+      sha256 = "5c6011632e3c832708440d08658fb2068c610e5571e4c9ea35b88d632ce2e4f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/ro/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/ro/Firefox%20151.0.2.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "9c8777acbca42b8313973a1538efa6a03b989412d552ca97d418f4b1ee9bc209";
+      sha256 = "92b2488e2048f72ba0e2c31b1397b025b078d5a470f797e304799d69263c4621";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/ru/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/ru/Firefox%20151.0.2.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "07e3c9032ae830cda1088122288fe894a0af842433d51a543ed4f29c7f131bbd";
+      sha256 = "5c7cff4df8f243c39f4ca4e378b66d72360da127fc0881854cb4b4f740bc5825";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/sat/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/sat/Firefox%20151.0.2.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "6881e3bf9f334661f8e98c57080d281b44f58b3bb562c289d919d155a41a74b3";
+      sha256 = "3520f727844553880d3c499adc26917adc934014b58874b4f41973e83528293a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/sc/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/sc/Firefox%20151.0.2.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "6fe2b9a28aba5d2bdcb68e0d1b1dd37edf6e4f4866c4fd8e2e5c771a2bd5c9fe";
+      sha256 = "bc25a52ef2c74bf2ea366d784d5f1a7f7bd2ec3763714665d17563512d0d2bd2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/sco/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/sco/Firefox%20151.0.2.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "02b4be48439a141d8e0212032adfabc7481807cc5508ca21c2c36c52ad901cd1";
+      sha256 = "f33382c7d9a6445ce787cc23caca59695aa1756e6bbd2ae87082b49a46d8478c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/si/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/si/Firefox%20151.0.2.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "5f7c97ec1e462141bbb7df8d5ca40265a9eae5079ea86403781367ec9be745ef";
+      sha256 = "a91ca2965f7fcfcacd4896ed3786e6c9e4aa1ab45cc5e1b0294ec699c42433f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/sk/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/sk/Firefox%20151.0.2.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "06c35dc50d519963c2e4005d5b245d3b11780aeba76ee3b9d41082009de345a2";
+      sha256 = "db6f85949d2b2b05b39d13f11eed12c09fc4e9cd01421fcdfc4e818c111a7cbb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/skr/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/skr/Firefox%20151.0.2.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "d8bd78d22b6bb2d17aeb385c43befa6306d37f62c88ff71d7767fbe47664c77c";
+      sha256 = "66697a7fd5779240f6ee02a1747ea0b5c5016331618c7be7208717287ebeed3d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/sl/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/sl/Firefox%20151.0.2.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "b9bde50d525338d087341469d3c96eb971bf85b52c3bfd708bb1297e618e1f30";
+      sha256 = "17a753b57fe0431a8ca4fb6310548b412b076cc433ac2fd20e0fafe5122d22f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/son/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/son/Firefox%20151.0.2.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "471b4eadfbaec606f55661a1b5ef74726a7b88ce921d1ac5c6876c8d0698e766";
+      sha256 = "ca6202d81b41c6bb8496b67f7295c567e9ff3360db93879ac97fcae566eeaa88";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/sq/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/sq/Firefox%20151.0.2.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "f2a4b9b296f39be26a04171ace02b19bb9e63cf932da27aeee0472d154be6548";
+      sha256 = "821703e4de3bccd6d0eb031fc165b7ee5efd83f176de411e4097b5d49bf7fbe4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/sr/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/sr/Firefox%20151.0.2.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "4cd1d0de985d73545589c457db13df1d4e65b968171cc67522f142544a5b4321";
+      sha256 = "9eda9a012ff6925c2a1dda23b6bc64e10c0f553795be6e6d52abfd3f6fa3b030";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/sv-SE/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/sv-SE/Firefox%20151.0.2.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "ee80c629cc02347f3ce38e9759ada5a826de6ce9f8296448558991e38c634704";
+      sha256 = "01558e035bf131d01901f78a538cf940aae59ed7a0574f858da3dbab65dc58c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/szl/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/szl/Firefox%20151.0.2.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "ca3c27cc72d3c0efb36505de3115f6a75e5a965d985a9cf604ef1efaf2c3c49c";
+      sha256 = "32fe688f686f5098495cc9abeabd5753655f632cad850bae16b4b183dd08b2a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/ta/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/ta/Firefox%20151.0.2.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "633d58c885ee03cdec2b7523add547a5d5c3bfa045c59dacb292b22e118c49fe";
+      sha256 = "06bf0f7e391bacaa5cbc53dc4cf4304bee5a3aeccf15ffabe65cc1081f481b74";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/te/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/te/Firefox%20151.0.2.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "9444afe5bf3beffeac7b275957369c72cc49576daf077bfa04c148cf411f2339";
+      sha256 = "7c6fcc9734cabce4bcbeaad768d7bdaf70cc7af68b0aaecb3ab825fff6fe2f78";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/tg/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/tg/Firefox%20151.0.2.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "36f64971e8dc849ca84f6ece9d9f7978b4a30eb93eaedcd1f5f0a82a073584d2";
+      sha256 = "302084de17e0010e0af4d6fda2a295d9486c12d2ae4e055c0f8b0c6892ad68ed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/th/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/th/Firefox%20151.0.2.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "b78f9e01d4b984bdab7abb13fdb6eb04d14ad9209d8c0399a42bafb6cff148e9";
+      sha256 = "ec7cd63f3107512a87ffaff5e5e360ad48ee96ea8405cf04b802a4dbf75116f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/tl/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/tl/Firefox%20151.0.2.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "5d84fa4662d650a94dbed071c803a265964878878856e03015d95f1d5d1f5bf0";
+      sha256 = "e4b79974195bb55b91915816a1cbe028d19b6a71be23a26537cb7efbc62da035";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/tr/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/tr/Firefox%20151.0.2.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "f55331abc014aed5b7558e344201c13adb4b18e4f65420fbec9cc9afd0781e78";
+      sha256 = "6a731e5dacc76d8862ec5171a24b35c442638128b4f57d4dd27b4d55ee528ed5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/trs/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/trs/Firefox%20151.0.2.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "7da013ba3285c604c11c861af1feb7cb10f9623df1dd494a57bcb8fdff567d17";
+      sha256 = "aa28ab4a13993a4ef684e22ce8781cfe7001aa184b3bdf576daf2288565bc6c8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/uk/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/uk/Firefox%20151.0.2.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "07d6e378164dcc870aad339376c4d283dd4b324f0cf4c8d9e55ae4cdeacb1331";
+      sha256 = "a8682d1b87ac209206656f99dde64cded540fe9b10301ef9eb74275ec7f120f5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/ur/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/ur/Firefox%20151.0.2.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "8aa2ea42db123d3ad94df84b8434edd867d81ef99dbf48f8502ce90bf0f244d4";
+      sha256 = "602cf9245f6872d65a44dc9b1bd20f3c2032b9897be833bda041d5f541e13e0d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/uz/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/uz/Firefox%20151.0.2.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "9632b03e99c8d932c881b630c16f4f8981e8814ef0ced5076a9107603aa21c18";
+      sha256 = "f3b1a447ec8efe138c5ae5f6574c2fc4a4a40ed0797ad6775df65144a1d56713";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/vi/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/vi/Firefox%20151.0.2.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "d587387b82efe10155d9d328f1606c6a70c9371c61ccb5df59fb41c393d8473b";
+      sha256 = "6dec2b0b3b17b1f334987815a91b005b8bff2f65f737e863df394d88dffa5700";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/xh/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/xh/Firefox%20151.0.2.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "0f73a63c6d2e2b6335ff10ff28b86cc55fa3bf3d500c0f9e4ce03f846bd7f876";
+      sha256 = "cbf48a2f44a94ae7bcf4a8bab76817c5220bc7151c18e397ebb712340f846071";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/zh-CN/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/zh-CN/Firefox%20151.0.2.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "058aa655528687da6bd04895265cde5262ab846301ea6ecfae44dde7306fda20";
+      sha256 = "092fdbbdde5dcffc2c7b7e93ba095f7fddfd9159653881f527e85bf6179ca291";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.1/mac/zh-TW/Firefox%20151.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/151.0.2/mac/zh-TW/Firefox%20151.0.2.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "e1917f66df1841c03c5f1395fbd1d93eed0933e6f4feeb522c75b2a50c86f0a7";
+      sha256 = "106a0bed2af4e5533ffd3566280f78c1891eeecede827e92b80e1e8c0233d3ce";
     }
   ];
 }
diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
index 64fc6cf076fc..682ef706f414 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
@@ -9,10 +9,10 @@
 
 buildMozillaMach rec {
   pname = "firefox";
-  version = "151.0.1";
+  version = "151.0.2";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "8492a1bb956b38373153938bd18b0e18e3a4ad0d2abc2017b45e02bc2768c8f468d5c06329a32485a03a67bb9c22102e6abff1e73080c77764735d430dc77277";
+    sha512 = "87308953ed354a2799a9a45be40033bf9ff8d80fa220f034aacfbd6e754716901d4164c37fa56032c659b259116603e0ba2b566c1f3651ab9cc0835d502cd739";
   };
 
   meta = {
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 00f3762deb14..d8a6c14aef48 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -73,13 +73,13 @@
     "vendorHash": "sha256-FHBpTYSmVivoqz+Eaa/r5y1f/saIx4l6mjOtZhxZVRw="
   },
   "auth0_auth0": {
-    "hash": "sha256-9Kar2oz09oqucIz6x1ZEEbXFAuE/8OH6DTDz4Jk1lpo=",
+    "hash": "sha256-XCptfoE1VI+Vn8Mls86KOYo1XwLEemi4NXzm5MhsNF4=",
     "homepage": "https://registry.terraform.io/providers/auth0/auth0",
     "owner": "auth0",
     "repo": "terraform-provider-auth0",
-    "rev": "v1.46.0",
+    "rev": "v1.47.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-9Imtc2/rxcJBMch/i7iRyjYFlNeHaCL+KyJr3WzINHs="
+    "vendorHash": "sha256-U9pfdnh7jAJvdUcKzV5qD3ex5vprhN2k+f+jqLyKJqM="
   },
   "aviatrixsystems_aviatrix": {
     "hash": "sha256-46djOfAj/5kfeoKLQHbeKefzdGbmlBATR+uN/IaAn8I=",
@@ -562,13 +562,13 @@
     "vendorHash": "sha256-tCwe8TDqwq3lY7so//tHhbTh51EtfIE1UkBylJ8JhoU="
   },
   "hashicorp_dns": {
-    "hash": "sha256-sdJpv5Am1tlKyaUkmByrZauzRGZUeAirf7k9a/Fv0S0=",
+    "hash": "sha256-7sr51WH7M2x1oewGo+/1tYE2e1DKg32ryVZJPt2ZYlY=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/dns",
     "owner": "hashicorp",
     "repo": "terraform-provider-dns",
-    "rev": "v3.6.0",
+    "rev": "v3.6.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-01tI68RBp6Qpveqo6Jdynd7SWypbUsY6buPNwdcoPkc="
+    "vendorHash": "sha256-fnw0mG2kkeALZAyylgpGWyAdcybA77KL5MrobkZBhUU="
   },
   "hashicorp_external": {
     "hash": "sha256-/uBQaDqZBNmIOkwYD+zOPo7ZHiHKDZO2MmD0q52KM4k=",
@@ -968,13 +968,13 @@
     "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0="
   },
   "newrelic_newrelic": {
-    "hash": "sha256-UByjO3/TE/b3kncFVMuTpWvTfC5Oof+Z5+9KdOEs7JU=",
+    "hash": "sha256-bYWqx0vZO16pKcLXYrWtbynToxpgHI8r4eZpX43kaPk=",
     "homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
     "owner": "newrelic",
     "repo": "terraform-provider-newrelic",
-    "rev": "v3.87.3",
+    "rev": "v3.90.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-2nDiNYX8iwu4u5gaaIYJC8a/Jw/MBdTgNxmyw+RLB+c="
+    "vendorHash": "sha256-ilEvo3HS48tP8DgBW4612eBifm9GN1uyrIsPbCjPW2o="
   },
   "ns1-terraform_ns1": {
     "hash": "sha256-MX/Wd9Lztjn7uwDzJjs4bsSSp0PFzUgsu4jXke9jHL8=",
@@ -1040,13 +1040,13 @@
     "vendorHash": "sha256-ofzbDmivXgH1i1Gjhpyp0bk3FDs5SnxwoRuNAWyMqyI="
   },
   "opentelekomcloud_opentelekomcloud": {
-    "hash": "sha256-NQ8yB4maHOF/sfFSSeCW9MNnAo/PgYrXAPRuM4NNti0=",
+    "hash": "sha256-P4G1VVlQO1wkl6+fAkVJXaRAkg/5nXpa8rP4zJmM+mg=",
     "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
     "owner": "opentelekomcloud",
     "repo": "terraform-provider-opentelekomcloud",
-    "rev": "v1.36.65",
+    "rev": "v1.36.66",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-NOsmv0G+tfNwqbPF8U4vihp3cd5Kn9N0dJBWh9m5X+Y="
+    "vendorHash": "sha256-mMTZ+mAC7MoWCvOlGvT06bytYGRKX/yjRaPnXsmVtz8="
   },
   "opsgenie_opsgenie": {
     "hash": "sha256-Y67kcg/ovvZc22l1CBz0Mqu7DAIit5F0jQNfQrl2EGI=",
@@ -1292,11 +1292,11 @@
     "vendorHash": "sha256-HjrB7C0KaLJz9NVLfZdq5EZbNbF9lJPxSkQwnWUF978="
   },
   "tailscale_tailscale": {
-    "hash": "sha256-c1Hz8srHNaZJq1kJrSwm8ruoHcebM11yX2wQhWavoWE=",
+    "hash": "sha256-h+VKIhmx3wa+kImQaHeqXYM8oxeH3Ic75bG7FHBKJ1g=",
     "homepage": "https://registry.terraform.io/providers/tailscale/tailscale",
     "owner": "tailscale",
     "repo": "terraform-provider-tailscale",
-    "rev": "v0.29.0",
+    "rev": "v0.29.1",
     "spdx": "MIT",
     "vendorHash": "sha256-hl9govsnEXMd4VbOPqoSGLgSnImDA55enYTaDz2wKH0="
   },
@@ -1454,13 +1454,13 @@
     "vendorHash": "sha256-B4W8rzWHucYqA0HXrMrtKQ91ZfFAgcxHqFMvMnVuGfk="
   },
   "vmware_avi": {
-    "hash": "sha256-Zc9kvJgUeoYApurIAgghKoicpLuPoU+e52MedqPWhyA=",
+    "hash": "sha256-OPmsbEI9NgzolQSLH/OKJq8a7gvYfWNk1VVz+J9F0JA=",
     "homepage": "https://registry.terraform.io/providers/vmware/avi",
     "owner": "vmware",
     "repo": "terraform-provider-avi",
-    "rev": "v31.2.2",
+    "rev": "v32.1.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-bmMJcNmB9Pt4Y14YLGrZt2ynnLbSm4rmrqPtdrbDU08="
+    "vendorHash": "sha256-WXw9H/BQj0ZEW5YLRHWTiXF4VyaVpwlxWO4Hfy4/NdM="
   },
   "vmware_vcd": {
     "hash": "sha256-W+ffIT70IaePg3xfOaQgCjPTWTN3iSAYwkf+s+zkB84=",
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index 881228e04072..d5fe7bb3f3c5 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -31,7 +31,7 @@
   enableRST ? true,
   docutils,
   enableSpelling ? true,
-  gspell,
+  libspelling,
   enableUPnP ? true,
   gupnp-igd,
   enableAppIndicator ? true,
@@ -70,7 +70,7 @@ python3.pkgs.buildPythonApplication rec {
     libnice
   ]
   ++ lib.optional enableSecrets libsecret
-  ++ lib.optional enableSpelling gspell
+  ++ lib.optional enableSpelling libspelling
   ++ lib.optional enableUPnP gupnp-igd
   ++ lib.optional enableAppIndicator libappindicator-gtk3
   ++ lib.optional enableSoundNotifications gsound;
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index e8a2b74c4156..8a78d99b79c8 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -30,11 +30,12 @@ let
         (if lib.versionOlder version "140" then ./no-buildconfig.patch else ./no-buildconfig-tb140.patch)
       ];
       # FIXME: let's hope that upstream will fix this soon and we can drop this hack again.
-      # https://bugzilla.mozilla.org/show_bug.cgi?id=2006630
+      # https://bugzilla.mozilla.org/show_bug.cgi?id=2040877
       extraPostPatch =
-        lib.optionalString (lib.versionAtLeast version "147" && lib.versionOlder version "149")
+        lib.optionalString (lib.versionAtLeast version "151" && lib.versionOlder version "152")
           ''
-            find . -name .cargo-checksum.json | xargs sed 's/"[^"]*\.gitmodules":"[a-z0-9]*",//g' -i
+            echo https://hg.mozilla.org/releases/comm-release/rev/becfb8fb2c70f1603882a2787e2170d5d8013949 >> sourcestamp.txt
+            echo https://hg.mozilla.org/releases/mozilla-release/rev/fc12dc911f904307729760a817deb829cbf8feb4 >> sourcestamp.txt
           '';
 
       meta = {
@@ -73,8 +74,8 @@ rec {
   thunderbird = thunderbird-latest;
 
   thunderbird-latest = common {
-    version = "150.0.2";
-    sha512 = "3e52220ff34aa6cd1bf46a910dba1f30d0abf7d19ed7f501ffeeb8f5901b8d97fdc0adb0cceb434ef8e83c7f7b83f28024b872280237af72ff2da9d89fafe065";
+    version = "151.0.1";
+    sha512 = "a09c1e18faa8d7fdccf39e905542c21e817230e68c7cc6050beec048d0fec0f8eb92e51278d2ccd8d8cfa842762662235517e20238b555a4ad48ee5648dc3589";
 
     updateScript = callPackage ./update.nix {
       attrPath = "thunderbirdPackages.thunderbird-latest";
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index 021d01fffce4..c0b7ebbc0377 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -9,6 +9,7 @@
   zarith,
   camlp5,
   camlp-streams,
+  pcre2,
   bash,
 }:
 
@@ -19,6 +20,7 @@ let
       ''
         -I ${zarith}/lib/ocaml/${ocaml.version}/site-lib/zarith \
         -I ${zarith}/lib/ocaml/${ocaml.version}/site-lib/stublibs \
+        -I ${pcre2}/lib/ocaml/${ocaml.version}/site-lib/stublibs \
       ''
     else
       lib.optionalString (num != null) ''
@@ -64,6 +66,7 @@ stdenv.mkDerivation {
   ];
   propagatedBuildInputs = [
     camlp-streams
+    pcre2
     (if use_zarith then zarith else num)
   ];
 
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index 5cf447e37a0d..3eb3f412d37d 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -251,7 +251,18 @@ lib.makeOverridable (
             ${if allowedRequisites != null then "allowedRequisites" else null} = allowedRequisites;
           };
 
-          inherit preferLocalBuild meta;
+          inherit preferLocalBuild;
+
+          meta = meta // {
+            identifiers = {
+              purlParts = {
+                type = "generic";
+                # https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/generic-definition.md
+                spec = "${name}?vcs_url=${url}@${(lib.revOrTag rev tag)}";
+              };
+            }
+            // meta.identifiers or { };
+          };
 
           env = {
             NIX_PREFETCH_GIT_CHECKOUT_HOOK = finalAttrs.postCheckout;
diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix
index e12052e3d15d..1b0a1aa92805 100644
--- a/pkgs/build-support/fetchgithub/default.nix
+++ b/pkgs/build-support/fetchgithub/default.nix
@@ -89,6 +89,22 @@ decorate (
       meta
       // {
         homepage = meta.homepage or baseUrl;
+        identifiers = {
+          purlParts =
+            if githubBase == "github.com" then
+              {
+                type = "github";
+                # https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/github-definition.md
+                spec = "${owner}/${repo}@${(lib.revOrTag rev tag)}";
+              }
+            else
+              {
+                type = "generic";
+                # https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/generic-definition.md
+                spec = "${repo}?vcs_url=https://${githubBase}/${owner}/${repo}@${(lib.revOrTag rev tag)}";
+              };
+        }
+        // meta.identifiers or { };
       }
       // lib.optionalAttrs (position != null) {
         # to indicate where derivation originates, similar to make-derivation.nix's mkDerivation
diff --git a/pkgs/build-support/fetchpypi/default.nix b/pkgs/build-support/fetchpypi/default.nix
index 71530bddff37..453883ac13f2 100644
--- a/pkgs/build-support/fetchpypi/default.nix
+++ b/pkgs/build-support/fetchpypi/default.nix
@@ -51,6 +51,8 @@ lib.makeOverridable (
     format ? "setuptools",
     sha256 ? "",
     hash ? "",
+    pname,
+    version,
     ...
   }@attrs:
   let
@@ -60,8 +62,20 @@ lib.makeOverridable (
         "hash"
       ]
     );
+    meta = {
+      identifiers.purlParts = {
+        type = "pypi";
+        # https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/pypi-definition.md
+        spec = "${pname}@${version}";
+      };
+    };
   in
   fetchurl {
-    inherit url sha256 hash;
+    inherit
+      url
+      sha256
+      hash
+      meta
+      ;
   }
 )
diff --git a/pkgs/by-name/_9/_9pfs/package.nix b/pkgs/by-name/_9/_9pfs/package.nix
index 54d50ee3cf44..201e4cd2ef1d 100644
--- a/pkgs/by-name/_9/_9pfs/package.nix
+++ b/pkgs/by-name/_9/_9pfs/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "9pfs";
-  version = "0.5";
+  version = "0.6";
 
   src = fetchFromGitHub {
     owner = "ftrvxmtrx";
     repo = "9pfs";
     tag = finalAttrs.version;
-    sha256 = "sha256-NT8oIQK8Os3HRZLOH2OvauiCvh5bXZFbeEtTFbzNvrs=";
+    sha256 = "sha256-zJ1H5UfnTqGWCPt24Pi+Fr3K04wUiPVUmx1AH2sjXmM=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/a2/a2ps/package.nix b/pkgs/by-name/a2/a2ps/package.nix
index 3e4510996abc..9a8383ac4132 100644
--- a/pkgs/by-name/a2/a2ps/package.nix
+++ b/pkgs/by-name/a2/a2ps/package.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "a2ps";
-  version = "4.15.7";
+  version = "4.15.8";
 
   src = fetchurl {
     url = "mirror://gnu/a2ps/a2ps-${finalAttrs.version}.tar.gz";
-    hash = "sha256-cV84Zwr9lQtMpxwB9Gj+760mXKUtPxEpNMY8Cov7uK8=";
+    hash = "sha256-jRORWjbrv6jnsjazUMyBrccUrLIXoY6NjGB0fArTU/k=";
   };
 
   postPatch = ''
@@ -39,6 +39,8 @@ stdenv.mkDerivation (finalAttrs: {
     libpaper
   ];
 
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-error=format-security";
+
   strictDeps = true;
 
   meta = {
diff --git a/pkgs/by-name/ai/air/package.nix b/pkgs/by-name/ai/air/package.nix
index 466f99598717..b5aa88e65c77 100644
--- a/pkgs/by-name/ai/air/package.nix
+++ b/pkgs/by-name/ai/air/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "air";
-  version = "1.65.2";
+  version = "1.65.3";
 
   src = fetchFromGitHub {
     owner = "air-verse";
     repo = "air";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kQqWIqGJx8396rALn87ykdA3g+1IH+XGOpaICD02j2U=";
+    hash = "sha256-w3UJ6ezvud0KJYeModGueXx0gp9zTxo6R+BoZPH4Bpo=";
   };
 
   vendorHash = "sha256-03xZ3P/7xjznYdM9rv+8ZYftQlnjJ6ZTq0HdSvGpaWw=";
diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix
index 58503bc8e6c4..0f764d54e280 100644
--- a/pkgs/by-name/al/aliyun-cli/package.nix
+++ b/pkgs/by-name/al/aliyun-cli/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "aliyun-cli";
-  version = "3.3.15";
+  version = "3.3.16";
 
   src = fetchFromGitHub {
     owner = "aliyun";
     repo = "aliyun-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7DkVhFGUvAAFWUiFTOaYARIGCyAW3UqMCLUs5F55vfM=";
+    hash = "sha256-us22AgTEmJ8HNlXPR9mT+WJ03Qxndt+ORfMucKvIc0U=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix
index e13c62d67527..0d0765e57161 100644
--- a/pkgs/by-name/al/all-the-package-names/package.nix
+++ b/pkgs/by-name/al/all-the-package-names/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "all-the-package-names";
-  version = "2.0.2446";
+  version = "2.0.2452";
 
   src = fetchFromGitHub {
     owner = "nice-registry";
     repo = "all-the-package-names";
     tag = "v${version}";
-    hash = "sha256-77nJGQX/TCnWFYt7+ZMSMbEi8TvoO03+0EpH7h0tG+8=";
+    hash = "sha256-LNBEp1jGUxJ2cuIeXIx7+FMPkeLZP2XcTOkP0I3o5zw=";
   };
 
-  npmDepsHash = "sha256-9fq9J/afHI3W/ghmw8VhmD/QaldB9pR5mfEHrvOvkcc=";
+  npmDepsHash = "sha256-ZOtL9GDQASZhNGQdhdJv+rGLscidzfCdmwVkDfyHmGo=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix
index dd59c8eabcd7..da7eb9e734c5 100644
--- a/pkgs/by-name/as/ast-grep/package.nix
+++ b/pkgs/by-name/as/ast-grep/package.nix
@@ -11,13 +11,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ast-grep";
-  version = "0.42.1";
+  version = "0.42.3";
 
   src = fetchFromGitHub {
     owner = "ast-grep";
     repo = "ast-grep";
     tag = finalAttrs.version;
-    hash = "sha256-TdVjoJmWZ76e9h+/z4/TlytJgwQpQu/esRuZg1sZw8A=";
+    hash = "sha256-CbZDibpdEMQayd9tzNTZRUmyx4/9K5VzhbqeFatOn+Q=";
   };
 
   # error: linker `aarch64-linux-gnu-gcc` not found
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rm .cargo/config.toml
   '';
 
-  cargoHash = "sha256-EokHEduK+8h+JzIKRRga+QXLkfC4CK+qyoIxMwD2OPI=";
+  cargoHash = "sha256-WhhSD2doqdwGnSKTVjnpjnuPep+4+nB2ZPiFFi8VbQQ=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/au/auth0-cli/package.nix b/pkgs/by-name/au/auth0-cli/package.nix
index d595dae37d13..79aa36b252e0 100644
--- a/pkgs/by-name/au/auth0-cli/package.nix
+++ b/pkgs/by-name/au/auth0-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "auth0-cli";
-  version = "1.30.0";
+  version = "1.31.0";
 
   src = fetchFromGitHub {
     owner = "auth0";
     repo = "auth0-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Hl9uNYbyTtppZYxTnUirwckGrZbjdhY5IEBbXSFrNtw=";
+    hash = "sha256-6+AMU77eHYy0AwPsHt/tgtzTQkyPfvZZw1yzvWXQX0s=";
   };
 
-  vendorHash = "sha256-ltVIGm1dDR9umWPM6c4XT9PbklZ20QQj6VTzQJ301A4=";
+  vendorHash = "sha256-MzvoHXO8gDIzNqhQGgDEd8xXWF7971JLTKWt8TCldKI=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/av/avml/package.nix b/pkgs/by-name/av/avml/package.nix
index 35bbf219cdb2..bfa33693cb21 100644
--- a/pkgs/by-name/av/avml/package.nix
+++ b/pkgs/by-name/av/avml/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "avml";
-  version = "0.17.0";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "avml";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-G+0Q4V+7K6GuMc7c1s7DYSrV9l+deu0+KYAWZYdxNU0=";
+    hash = "sha256-d8H+UPCH3yyBNndlGzamgaPlhmvP4rcUSAywx8vYky0=";
   };
 
-  cargoHash = "sha256-a6mCdhi2pBc+YE3iJnjjog37lZh/a2TQRihZc0X0M8g=";
+  cargoHash = "sha256-LxoyvjFVn69s9Wf8pF+9wBgOV4fJ/th6GPzLW6hbz0E=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ];
diff --git a/pkgs/by-name/aw/aws-nuke/package.nix b/pkgs/by-name/aw/aws-nuke/package.nix
index ae840dfca893..2b27eab43df4 100644
--- a/pkgs/by-name/aw/aws-nuke/package.nix
+++ b/pkgs/by-name/aw/aws-nuke/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "aws-nuke";
-  version = "3.64.2";
+  version = "3.64.4";
 
   src = fetchFromGitHub {
     owner = "ekristen";
     repo = "aws-nuke";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Rg68lngQcF6Psg7aE0N/4Nvx7ctrs2DFtcOaqXGDUGA=";
+    hash = "sha256-oUziuU2lhp1X/RTOYn4FtimmNZ4ZEjbihdfokoeLrmw=";
   };
 
   vendorHash = "sha256-q1ASHG4KWlU8tLjHireMqmkW33Q2hy+ikOTWQPOYIXo=";
diff --git a/pkgs/by-name/ba/badkeys/package.nix b/pkgs/by-name/ba/badkeys/package.nix
index bb9ae72fcd05..73774109c2da 100644
--- a/pkgs/by-name/ba/badkeys/package.nix
+++ b/pkgs/by-name/ba/badkeys/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "badkeys";
-  version = "0.0.17";
+  version = "0.0.18";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "badkeys";
     repo = "badkeys";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sQ2HOgffVklHKpOTmIHMR0QSfsB9lxrEcaT2jzicVlM=";
+    hash = "sha256-sQPMil8MdGR9vauBgX+fAX/wdmSdqkchoxD4drGXR3I=";
   };
 
   build-system = with python3Packages; [
diff --git a/pkgs/by-name/bi/bird2/package.nix b/pkgs/by-name/bi/bird2/package.nix
index 0ab5f5eb73fb..8c1bfe924e6a 100644
--- a/pkgs/by-name/bi/bird2/package.nix
+++ b/pkgs/by-name/bi/bird2/package.nix
@@ -12,14 +12,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bird";
-  version = "2.18.1";
+  version = "2.19.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.nic.cz";
     owner = "labs";
     repo = "bird";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tYICTipTzugtb7kv/zwsChM8v+zJ2TVsotEkJDcZCto=";
+    hash = "sha256-xk3z5kkjnInmIwtE6Q7kCJ5P5Njt/Oz1+HPO0vcr93E=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/bi/bird3/package.nix b/pkgs/by-name/bi/bird3/package.nix
index acbe1d3deb9b..4f8272b481bf 100644
--- a/pkgs/by-name/bi/bird3/package.nix
+++ b/pkgs/by-name/bi/bird3/package.nix
@@ -12,14 +12,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bird";
-  version = "3.2.1";
+  version = "3.3.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.nic.cz";
     owner = "labs";
     repo = "bird";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FkrVrjT4Q9zLeauP2GOX38a7a4q7h2aQbEe/kmfKB3A=";
+    hash = "sha256-mH9CM9Emie2B9c5PeW4DKUQUzvgxTExPBGG06YbWqGo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/bu/buf/package.nix b/pkgs/by-name/bu/buf/package.nix
index 33e733fdd90d..9cf5f276fa98 100644
--- a/pkgs/by-name/bu/buf/package.nix
+++ b/pkgs/by-name/bu/buf/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "buf";
-  version = "1.69.0";
+  version = "1.70.0";
 
   src = fetchFromGitHub {
     owner = "bufbuild";
     repo = "buf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-x8Dj4xl67Jq0ViWu+Tz+3lAnfIpE926dIr+oe4ul0gI=";
+    hash = "sha256-C06/5a4icjgI35ADQKvlZ6JmCCyW/9e0aF9VIpLCqn0=";
   };
 
-  vendorHash = "sha256-zhXpWpYd/bim5f4EQJujVm072LPgBusjCFGYAwK10HE=";
+  vendorHash = "sha256-Vveg7rBno66IPinVs9RJtzVJdtAJE55QZfWA3WIXGDQ=";
 
   patches = [
     # Skip a test that requires networking to be available to work.
diff --git a/pkgs/by-name/ca/caja-with-extensions/package.nix b/pkgs/by-name/ca/caja-with-extensions/package.nix
index d9374778cb86..44272b6e2679 100644
--- a/pkgs/by-name/ca/caja-with-extensions/package.nix
+++ b/pkgs/by-name/ca/caja-with-extensions/package.nix
@@ -4,14 +4,22 @@
   glib,
   wrapGAppsHook3,
   lndir,
+  atril,
   caja,
   caja-extensions,
+  engrampa,
   extensions ? [ ],
   useDefaultExtensions ? true,
 }:
 
 let
-  selectedExtensions = extensions ++ (lib.optionals useDefaultExtensions [ caja-extensions ]);
+  selectedExtensions =
+    extensions
+    ++ (lib.optionals useDefaultExtensions [
+      atril
+      caja-extensions
+      engrampa
+    ]);
 in
 stdenv.mkDerivation {
   pname = "${caja.pname}-with-extensions";
diff --git a/pkgs/by-name/ca/caligula/package.nix b/pkgs/by-name/ca/caligula/package.nix
index 556d5060d481..d779bdc6bc6b 100644
--- a/pkgs/by-name/ca/caligula/package.nix
+++ b/pkgs/by-name/ca/caligula/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "caligula";
-  version = "0.4.11";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "ifd3f";
     repo = "caligula";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-2KCP7Utb785yIn8w/Ls19UPS9ylg1PtLRki87+BD+xw=";
+    hash = "sha256-0KSQd/DvIo813HSLL+Qvn+5GMFRK7CGxOSq4+Fyl8Zk=";
   };
 
-  cargoHash = "sha256-C86wu2Pc9O7YM1TnnfotzzOQlnJXJe2zmsX04JyJsjA=";
+  cargoHash = "sha256-ICvQ7XtA7705gJ0GijuZJROGAp/BMpyqsIygR+6kJ2I=";
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
diff --git a/pkgs/by-name/ca/caprine/package.nix b/pkgs/by-name/ca/caprine/package.nix
index 18161241ebc4..cd32fdc09816 100644
--- a/pkgs/by-name/ca/caprine/package.nix
+++ b/pkgs/by-name/ca/caprine/package.nix
@@ -27,14 +27,15 @@ buildNpmPackage rec {
   nativeBuildInputs = [ copyDesktopItems ];
 
   postBuild = ''
-    cp -r ${electron.dist} electron-dist
-    chmod -R u+w electron-dist
+    electron_dist="$(mktemp -d)"
+    cp -r ${electron.dist}/. "$electron_dist"
+    chmod -R u+w "$electron_dist"
 
     npm exec electron-builder -- \
         --dir \
         -c.npmRebuild=true \
         -c.asarUnpack="**/*.node" \
-        -c.electronDist=electron-dist \
+        -c.electronDist="$electron_dist" \
         -c.electronVersion=${electron.version}
   '';
 
diff --git a/pkgs/by-name/ca/cargo-deny/package.nix b/pkgs/by-name/ca/cargo-deny/package.nix
index 175b562e0e50..d464fc1b2972 100644
--- a/pkgs/by-name/ca/cargo-deny/package.nix
+++ b/pkgs/by-name/ca/cargo-deny/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-deny";
-  version = "0.19.6";
+  version = "0.19.7";
 
   src = fetchFromGitHub {
     owner = "EmbarkStudios";
     repo = "cargo-deny";
     tag = finalAttrs.version;
-    hash = "sha256-ttD3UgfFUuon80/O1RaGO+mOAyr1zHaUKqCqzjmTQSY=";
+    hash = "sha256-hdC8SagsZzdJ4FbBBPOt6/iAq3pHtNcS4xuYccJX56Y=";
   };
 
-  cargoHash = "sha256-Ijd0Mk2p9fsN++U+9IvUu/nqJwI5N/vFigYFFbcEdXs=";
+  cargoHash = "sha256-2f+RWVTiz0ZBdBKBQfYTojssEHlyVl1mMhfHeulOgXE=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/ca/cargo-public-api/package.nix b/pkgs/by-name/ca/cargo-public-api/package.nix
index 68b4db065e88..33b482856168 100644
--- a/pkgs/by-name/ca/cargo-public-api/package.nix
+++ b/pkgs/by-name/ca/cargo-public-api/package.nix
@@ -9,14 +9,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-public-api";
-  version = "0.51.0";
+  version = "0.52.0";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-fnkoIXv6QYJPYtsLZldOEjOxke6YVDEds3jF5SGZGKE=";
+    hash = "sha256-Z0r3lcuteU3DcXarBInYzkMaJSwfStdGi6ng2uRMXn8=";
   };
 
-  cargoHash = "sha256-F4s3h+WF/S6sQ9ux28sqNe9+C1I5H9735b+cVuRFjk8=";
+  cargoHash = "sha256-k846yNUwytLTDjrEwQU5eMj2jIuAI6B1RtttZluijDY=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix
index 0d55579b0272..997b3d788980 100644
--- a/pkgs/by-name/ca/cargo-tauri/package.nix
+++ b/pkgs/by-name/ca/cargo-tauri/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tauri";
-  version = "2.11.0";
+  version = "2.11.2";
 
   src = fetchFromGitHub {
     owner = "tauri-apps";
     repo = "tauri";
     tag = "tauri-cli-v${finalAttrs.version}";
-    hash = "sha256-hbTpLeWMc5nSJeq1vWKbVpfhp1KZjiBgmaiQMUs/MIQ=";
+    hash = "sha256-BH/tQlrmCMAab5LqQ/xl9+A5nCnN8sk6mavvAkajYHM=";
   };
 
-  cargoHash = "sha256-PrvlPfK/9qyBWOs6hG3C3w9TMK7p1TCoKpjSWkhN2rY=";
+  cargoHash = "sha256-QX151ckeSxbZgbFO88zhsvnNnjZffLpR5dDp1Dv1Wlo=";
 
   nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) [
     pkg-config
diff --git a/pkgs/by-name/ce/certificate-ripper/fix-test-temp-dir-path.patch b/pkgs/by-name/ce/certificate-ripper/fix-test-temp-dir-path.patch
deleted file mode 100644
index ff9b7d3bebd5..000000000000
--- a/pkgs/by-name/ce/certificate-ripper/fix-test-temp-dir-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/test/java/nl/altindag/crip/command/FileBaseTest.java b/src/test/java/nl/altindag/crip/command/FileBaseTest.java
-index 674ca10..f140601 100644
---- a/src/test/java/nl/altindag/crip/command/FileBaseTest.java
-+++ b/src/test/java/nl/altindag/crip/command/FileBaseTest.java
-@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
- 
- public class FileBaseTest extends BaseTest {
- 
--    protected static final Path TEMP_DIRECTORY = Paths.get(System.getProperty("user.home"), "certificate-ripper-temp");
-+    protected static final Path TEMP_DIRECTORY = Paths.get(System.getenv("TMP"), "certificate-ripper-temp");
- 
-     @BeforeEach
-     void createTempDirAndClearConsoleCaptor() throws IOException {
diff --git a/pkgs/by-name/ce/certificate-ripper/package.nix b/pkgs/by-name/ce/certificate-ripper/package.nix
index ece2a2fa1186..38613cb0c202 100644
--- a/pkgs/by-name/ce/certificate-ripper/package.nix
+++ b/pkgs/by-name/ce/certificate-ripper/package.nix
@@ -7,7 +7,7 @@
 
 buildGraalvmNativeImage (finalAttrs: {
   pname = "certificate-ripper";
-  version = "2.4.1";
+  version = "2.7.1";
 
   src = maven.buildMavenPackage {
     pname = "certificate-ripper-jar";
@@ -17,30 +17,24 @@ buildGraalvmNativeImage (finalAttrs: {
       owner = "Hakky54";
       repo = "certificate-ripper";
       tag = finalAttrs.version;
-      hash = "sha256-qQ5BHH+DT1sGNDGzSbclqc6+byBxyP16qvm3k9E/Yks=";
+      hash = "sha256-yKBINzHhUpjqrbMIt3LulKtMLyuZvuBzBaR6wMs6lCI=";
     };
 
     patches = [
       ./pin-default-maven-plguin-versions.patch
-      ./fix-test-temp-dir-path.patch
     ];
 
-    mvnHash = "sha256-G2+Z1JyxTzCZzWjB8MQH1T9kwHjtRPag+bmzGXpQXw4=";
+    mvnHash = "sha256-ZuqPzFL7CJ/H6SBcQMwTMqBsKtlxv9oiQXXfFgMdQpE=";
 
-    mvnParameters =
-      let
-        disabledTests = [
-          "PemExportCommandShould#resolveRootCaOnlyWhenEnabled" # uses network
-          "DerExportCommandShould#processSystemTrustedCertificates"
-          "JksExportCommandShould#processSystemTrustedCertificates"
-          "PemExportCommandShould#processSystemTrustedCertificates"
-          "Pkcs12ExportCommandShould#processSystemTrustedCertificates"
-        ];
-      in
-      lib.escapeShellArgs [
-        "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z" # make timestamp deterministic
-        "-Dtest=${lib.concatMapStringsSep "," (t: "!" + t) disabledTests}"
-      ];
+    mvnParameters = lib.escapeShellArgs [
+      # generate a singular .jar file
+      "-Pfat-jar"
+      # make the build timestamp deterministic
+      "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z"
+    ];
+
+    # Integration tests and network based tests fail, let's not bother with blacklisting them one-by-one
+    doCheck = false;
 
     installPhase = ''
       install -Dm644 target/crip.jar $out
diff --git a/pkgs/by-name/ch/chess-tui/package.nix b/pkgs/by-name/ch/chess-tui/package.nix
index fcaed57dc550..57e30c965d4b 100644
--- a/pkgs/by-name/ch/chess-tui/package.nix
+++ b/pkgs/by-name/ch/chess-tui/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "chess-tui";
-  version = "2.7.0";
+  version = "2.7.1";
 
   src = fetchFromGitHub {
     owner = "thomas-mauran";
     repo = "chess-tui";
     tag = finalAttrs.version;
-    hash = "sha256-BGJOPsePE5S5ySrOg63cNKn9pT+7MmDLHZrW3YhUFz8=";
+    hash = "sha256-B6CpUha5e2W82HnWOxV2arHAiqJCyL5bwkhELYQPxMg=";
   };
 
-  cargoHash = "sha256-n9rjr5vUK619XIfuHIlf+lxUAeTbhTAzmdysliKNOFY=";
+  cargoHash = "sha256-Vik4FceQSYnziDpAqz7r7gpabUp2JL5u40iT0r8fnAw=";
 
   checkFlags = [
     # assertion failed: result.is_ok()
diff --git a/pkgs/by-name/ci/circumflex/package.nix b/pkgs/by-name/ci/circumflex/package.nix
index 730f37dca274..91da5cabb9bb 100644
--- a/pkgs/by-name/ci/circumflex/package.nix
+++ b/pkgs/by-name/ci/circumflex/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "circumflex";
-  version = "4.1";
+  version = "4.1.1";
 
   src = fetchFromGitHub {
     owner = "bensadeh";
     repo = "circumflex";
     tag = finalAttrs.version;
-    hash = "sha256-JJgLRRE0Fh/oaZLZo0hLCfwUHJXBvXXfTNdmQMNUM7A=";
+    hash = "sha256-2eCxk5FynwKt0T9cseesre+dumy5K5uZZAt++R+aTxw=";
   };
 
   vendorHash = "sha256-in6yPiT/SqRaw6hFF2gCmBwGcJ315Qej3HuM7TF5MaE=";
diff --git a/pkgs/by-name/cl/clorinde/package.nix b/pkgs/by-name/cl/clorinde/package.nix
index 7c86e6640fae..ba01ddfd35fa 100644
--- a/pkgs/by-name/cl/clorinde/package.nix
+++ b/pkgs/by-name/cl/clorinde/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "clorinde";
-  version = "1.4.1";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "halcyonnouveau";
     repo = "clorinde";
     tag = "clorinde-v${finalAttrs.version}";
-    hash = "sha256-eqLY3iOunTdTZn7lfM8lLYk2e6EI1jW81BnRg/NaGuY=";
+    hash = "sha256-eWgFcyr9shcgUU4DlXl6SThbbRTMuvYOjY6hA4CCnQo=";
   };
 
-  cargoHash = "sha256-OacfUdCtRyewr8OZFBh6NphccDwQ6diWA5JqPhtMi54=";
+  cargoHash = "sha256-p/ZqG1syI6ujgNbNnSSwUz7XpvHK7ua2zH0p3P3Ngec=";
 
   cargoBuildFlags = [ "--package=clorinde" ];
 
diff --git a/pkgs/by-name/co/codebook/package.nix b/pkgs/by-name/co/codebook/package.nix
index 72c1c59cd855..346076c192ca 100644
--- a/pkgs/by-name/co/codebook/package.nix
+++ b/pkgs/by-name/co/codebook/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "codebook";
-  version = "0.3.39";
+  version = "0.3.40";
 
   src = fetchFromGitHub {
     owner = "blopker";
     repo = "codebook";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-u0BFbG7Vq2dIIJIlXe2rlNPD6iUVnb3uM95bLBg9CEU=";
+    hash = "sha256-+tjUqo5NO1cVMW2x7eKBw8PpPVvCtURCX/+pHKWT9Z4=";
   };
 
   buildAndTestSubdir = "crates/codebook-lsp";
-  cargoHash = "sha256-Tx2KxtUjQpJa2WDUlFQoNZItKowGv09ZTGytFuxL0yc=";
+  cargoHash = "sha256-IQdKVZLdXO9zQYDliPbvS7LrVT0h4zOKghJO/E5Zvus=";
 
   env = {
     CARGO_PROFILE_RELEASE_LTO = "fat";
diff --git a/pkgs/by-name/co/codeql/package.nix b/pkgs/by-name/co/codeql/package.nix
index fd525968d1b8..2a7913a09ba1 100644
--- a/pkgs/by-name/co/codeql/package.nix
+++ b/pkgs/by-name/co/codeql/package.nix
@@ -15,7 +15,7 @@
 
 stdenv.mkDerivation rec {
   pname = "codeql";
-  version = "2.25.4";
+  version = "2.25.5";
 
   dontConfigure = true;
   dontBuild = true;
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   src = fetchzip {
     url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
-    hash = "sha256-YAFWw8Fb0B+O025TvwEiCZWsKXNZN7Fk+ai/eRmCSO0=";
+    hash = "sha256-pD8F2VoWQELKYP/fT2jKr0k4+mq0ZF7/fxyDdlG9JYA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix b/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix
index afe4b2b96e8c..87b4a53499ad 100644
--- a/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix
+++ b/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix
@@ -9,13 +9,13 @@
 }:
 rustPlatform.buildRustPackage {
   pname = "cosmic-ext-applet-sysinfo";
-  version = "0-unstable-2026-05-14";
+  version = "0-unstable-2026-05-20";
 
   src = fetchFromGitHub {
     owner = "cosmic-utils";
     repo = "cosmic-ext-applet-sysinfo";
-    rev = "2e3f6ea5946ebbe06e4547a6eb48bed694b1721f";
-    hash = "sha256-8XmLFY17uuqzHZFs3L8c5robIIuHF1SKaiPhkoiO2TQ=";
+    rev = "b5ce695b1af0b4b61db1d71fd6999fc7ee65d4c0";
+    hash = "sha256-Cz2vnKKD4c7N2EsXD1YHibwIuizQi9GmhnIpZf9Mfec=";
   };
 
   cargoHash = "sha256-ogFEENZxj4ifLbqKL+gimcAMX1REp2oEohY0MqM6Jsg=";
diff --git a/pkgs/by-name/cp/cpuinfo/package.nix b/pkgs/by-name/cp/cpuinfo/package.nix
index c1b4eda08e07..8f8c716aa020 100644
--- a/pkgs/by-name/cp/cpuinfo/package.nix
+++ b/pkgs/by-name/cp/cpuinfo/package.nix
@@ -10,13 +10,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "cpuinfo";
-  version = "0-unstable-2026-04-30";
+  version = "0-unstable-2026-05-18";
 
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = "cpuinfo";
-    rev = "3681f0ce1446167d01dfe125d6db96ba2ac31c3c";
-    hash = "sha256-PhWbzQgZSUb3eVyx+JTSnxVOAC2WzL2Dw1I9/6LEIsw=";
+    rev = "ea6b9f1bb6e1001d8b21574d5bc78ddef62e499d";
+    hash = "sha256-/QsOjDik0TnH3FnK7LOwsJkvX+O+2DRFX4eF3MxD3fc=";
   };
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "cpu-info";
     maintainers = with lib.maintainers; [ pawelchcki ];
     pkgConfigModules = [ "libcpuinfo" ];
-    # https://github.com/pytorch/cpuinfo/blob/3681f0ce1446167d01dfe125d6db96ba2ac31c3c/CMakeLists.txt#L98
+    # https://github.com/pytorch/cpuinfo/blob/ea6b9f1bb6e1001d8b21574d5bc78ddef62e499d/CMakeLists.txt#L98
     platforms = lib.platforms.x86 ++ lib.platforms.aarch ++ lib.platforms.riscv;
   };
 })
diff --git a/pkgs/by-name/cv/cvc5/package.nix b/pkgs/by-name/cv/cvc5/package.nix
index 6436020f2c39..775bb1981bfa 100644
--- a/pkgs/by-name/cv/cvc5/package.nix
+++ b/pkgs/by-name/cv/cvc5/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cvc5";
-  version = "1.3.3";
+  version = "1.3.4";
 
   src = fetchFromGitHub {
     owner = "cvc5";
     repo = "cvc5";
     tag = "cvc5-${finalAttrs.version}";
-    hash = "sha256-tXhOMrf/sZwEZFWB2Amp9lApWEsfuPqaj9H7RmI733o=";
+    hash = "sha256-PZcOArSTyJzyd2DKT8K0aFC4RlVXgTCnkoU0f08KPfY=";
   };
 
   __structuredAttrs = true;
diff --git a/pkgs/by-name/dc/dcmtk/package.nix b/pkgs/by-name/dc/dcmtk/package.nix
index ce9865b7e472..7589e47a0213 100644
--- a/pkgs/by-name/dc/dcmtk/package.nix
+++ b/pkgs/by-name/dc/dcmtk/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dcmtk";
-  version = "3.6.9";
+  version = "3.7.0";
 
   src = fetchFromGitHub {
     owner = "DCMTK";
     repo = "dcmtk";
     tag = "DCMTK-${finalAttrs.version}";
-    hash = "sha256-mdI/YqM38WhnCbsylIlmqLLWC5/QR+a8Wn9CNcN7KXU=";
+    hash = "sha256-JUF3IX0LOtpeAJPuTbAJo79sCuPuhh7KNIuQJfcFN/A=";
   };
 
   # The following patches are taken from the Debian package
@@ -38,26 +38,6 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://salsa.debian.org/med-team/dcmtk/-/raw/debian/3.6.9-4/debian/patches/remove_version.patch";
       hash = "sha256-jcV2xQzKdNiBgcaFtaxdJpJCCSVOqGIsi/A4iqVM8U8=";
     })
-    (fetchurl {
-      url = "https://salsa.debian.org/med-team/dcmtk/-/raw/debian/3.6.9-4/debian/patches/0007-CVE-2024-47796.patch";
-      hash = "sha256-QYWgSbyIcOq3CVg2ynVSPCHBIrDj9uqX4ese1huoOoU=";
-    })
-    (fetchurl {
-      url = "https://salsa.debian.org/med-team/dcmtk/-/raw/debian/3.6.9-4/debian/patches/0008-CVE-2024-52333.patch";
-      hash = "sha256-/4NdauuH0v6CPMh+duMM91wWfylp6l4L2LTO80dDh9g=";
-    })
-    (fetchurl {
-      url = "https://salsa.debian.org/med-team/dcmtk/-/raw/debian/3.6.9-4/debian/patches/0009-CVE-2025-25475.patch";
-      hash = "sha256-ApuVw6aBoasuVlJ3fh/aufB2WRm2hFgLYCq1k3MPrsU=";
-    })
-    (fetchurl {
-      url = "https://salsa.debian.org/med-team/dcmtk/-/raw/debian/3.6.9-4/debian/patches/0010-CVE-2025-25474.patch";
-      hash = "sha256-aX8em1o88ND4srsYkG696elPsAIlvkRRZMT8wzD2GdQ=";
-    })
-    (fetchurl {
-      url = "https://salsa.debian.org/med-team/dcmtk/-/raw/debian/3.6.9-4/debian/patches/0011-CVE-2025-25472.patch";
-      hash = "sha256-o3/PykJFbYlasAFgPNWp09hRuH183tQuvGuaOV4MOoo=";
-    })
   ];
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/dc/dcv/package.nix b/pkgs/by-name/dc/dcv/package.nix
index 2d024c2a43eb..b229e8666abe 100644
--- a/pkgs/by-name/dc/dcv/package.nix
+++ b/pkgs/by-name/dc/dcv/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "dcv";
-  version = "0.3.2";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "tokuhirom";
     repo = "dcv";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-j2cr0GaOEHc1qlvlfYkP2ggcrbalKLdMnN54MFfrb5s=";
+    hash = "sha256-IQXhkTt0cFwg6dqTWEHNDHfDnOkI299CQgZWL63pRjU=";
   };
 
-  vendorHash = "sha256-IHDrGT14wV5/36V/NhyeBEL3h9CGVpvlHqunF/Urw0E=";
+  vendorHash = "sha256-//pHi77wZjR3irLZTvyDVTPKe29pH/NiyEuBMkRj4nA=";
 
   # Don't use the vendored dependencies as they are out of sync with go.mod
   # Instead, let Go download dependencies through the module proxy
diff --git a/pkgs/by-name/dd/ddcutil/package.nix b/pkgs/by-name/dd/ddcutil/package.nix
index 36dfaaef23f3..ee07d11f47ea 100644
--- a/pkgs/by-name/dd/ddcutil/package.nix
+++ b/pkgs/by-name/dd/ddcutil/package.nix
@@ -12,15 +12,17 @@
   libdrm,
   libxrandr,
   libxext,
+  acl,
+  dbus,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ddcutil";
-  version = "2.2.6";
+  version = "2.2.7";
 
   src = fetchurl {
     url = "https://www.ddcutil.com/tarballs/ddcutil-${finalAttrs.version}.tar.gz";
-    hash = "sha256-5LaRkcC0UK6iOjSlks88WPAn/hRiAgF5BwzJLV7K7Yg=";
+    hash = "sha256-GaxmBM8Rd7pWZm+KaCWB5x6Jc70Gx8jc8DNnTkqqpkg=";
   };
 
   nativeBuildInputs = [
@@ -29,14 +31,16 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
+    acl
+    dbus
     glib
     jansson
     libdrm
     libgudev
     libusb1
-    udev
     libxext
     libxrandr
+    udev
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/de/der-ascii/package.nix b/pkgs/by-name/de/der-ascii/package.nix
index 8235fbe99030..f64a2c08c943 100644
--- a/pkgs/by-name/de/der-ascii/package.nix
+++ b/pkgs/by-name/de/der-ascii/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "der-ascii";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "der-ascii";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-i4rNeNDE7bIsO04haMKsbJmyvQRhhEt3I7UxmfTtL78=";
+    sha256 = "sha256-/9Go4fAwXmA3SLl0bP7aLy6fEItPZoscQ4pdA2GZuyM=";
   };
   vendorHash = null;
 
diff --git a/pkgs/by-name/do/doctl/package.nix b/pkgs/by-name/do/doctl/package.nix
index 74bf69b06b19..25e7b521c0c3 100644
--- a/pkgs/by-name/do/doctl/package.nix
+++ b/pkgs/by-name/do/doctl/package.nix
@@ -9,7 +9,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "doctl";
-  version = "1.159.0";
+  version = "1.160.0";
 
   vendorHash = null;
 
@@ -42,7 +42,7 @@ buildGoModule (finalAttrs: {
     owner = "digitalocean";
     repo = "doctl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SBUTqJbxO2z5d78SQtGquVyPKQEeapmT/SVTd7nt7L0=";
+    hash = "sha256-LXALzs5oubT1uL+sgA0LsaoFbir3e8JYVlIiJv6U5J4=";
   };
 
   meta = {
diff --git a/pkgs/by-name/dr/dracut/package.nix b/pkgs/by-name/dr/dracut/package.nix
index 2dcac697dc05..bc901a594a59 100644
--- a/pkgs/by-name/dr/dracut/package.nix
+++ b/pkgs/by-name/dr/dracut/package.nix
@@ -5,7 +5,7 @@
   gitUpdater,
   makeBinaryWrapper,
   pkg-config,
-  asciidoc,
+  asciidoctor,
   libxslt,
   docbook_xsl,
   bash,
@@ -29,16 +29,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dracut";
-  version = "059";
+  version = "111";
 
   src = fetchFromGitHub {
-    owner = "dracutdevs";
-    repo = "dracut";
-    rev = finalAttrs.version;
-    hash = "sha256-zSyC2SnSQkmS/mDpBXG2DtVVanRRI9COKQJqYZZCPJM=";
+    owner = "dracut-ng";
+    repo = "dracut-ng";
+    tag = finalAttrs.version;
+    hash = "sha256-2jdS7/LGuLSBBXv1R/o8yjgwdXl2l2wNbZWxq01wSb0";
   };
 
   strictDeps = true;
+  __structuredAttrs = true;
 
   buildInputs = [
     bash
@@ -48,16 +49,17 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     makeBinaryWrapper
     pkg-config
-    asciidoc
+    asciidoctor
     libxslt
     docbook_xsl
   ];
 
   postPatch = ''
     substituteInPlace dracut.sh \
-      --replace 'dracutbasedir="$dracutsysrootdir"/usr/lib/dracut' 'dracutbasedir="$dracutsysrootdir"'"$out/lib/dracut"
+      --replace-fail "dracutbasedir=\"$""{dracutsysrootdir-}\"/usr/lib/dracut" \
+        "if [ -n \"$""{dracutsysrootdir:-}\" ]; then dracutbasedir=\"$""{dracutsysrootdir}/usr/lib/dracut\" ; else dracutbasedir=\"$out/lib/dracut\" ; fi"
     substituteInPlace lsinitrd.sh \
-      --replace 'dracutbasedir=/usr/lib/dracut' "dracutbasedir=$out/lib/dracut"
+      --replace-fail 'dracutbasedir=/usr/lib/dracut' "dracutbasedir=$out/lib/dracut"
 
     echo 'DRACUT_VERSION=${finalAttrs.version}' >dracut-version.sh
   '';
@@ -110,10 +112,11 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.updateScript = gitUpdater { };
 
   meta = {
-    homepage = "https://github.com/dracutdevs/dracut/wiki";
+    homepage = "https://dracut-ng.github.io/";
+    changelog = "https://github.com/dracut-ng/dracut/blob/${finalAttrs.src.tag}/NEWS.md";
     description = "Event driven initramfs infrastructure";
     license = lib.licenses.gpl2Plus;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ tbutter ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/eg/egctl/package.nix b/pkgs/by-name/eg/egctl/package.nix
index c0671873e0a5..283ee5d608ee 100644
--- a/pkgs/by-name/eg/egctl/package.nix
+++ b/pkgs/by-name/eg/egctl/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "egctl";
-  version = "1.7.3";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "envoyproxy";
     repo = "gateway";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8cM8wA1XCHQ2OQn/CkeWML9aWEYX9Xv3XEpn+TPGbYA=";
+    hash = "sha256-KvXOLyMWtl4ycz6P4LQalODD95ptCY7tQtxtYG2x+28=";
   };
 
-  vendorHash = "sha256-CwBaEt5BYwGVBdt/M/V1SM00MONifskQYfErVubFppY=";
+  vendorHash = "sha256-wiehH9qmDVLho+ZDQH5IbckO0LP3FLxHhYXBMA8aBjs=";
   # Fix case-insensitive conflicts producing platform-dependent checksums
   # https://github.com/microsoft/go-mssqldb/issues/234
   proxyVendor = true;
diff --git a/pkgs/by-name/en/engrampa/package.nix b/pkgs/by-name/en/engrampa/package.nix
index ecb5a343fcd9..1bf70a46bda3 100644
--- a/pkgs/by-name/en/engrampa/package.nix
+++ b/pkgs/by-name/en/engrampa/package.nix
@@ -1,7 +1,9 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
+  autoconf-archive,
+  autoreconfHook,
   pkg-config,
   gettext,
   itstool,
@@ -10,8 +12,10 @@
   gtk3,
   hicolor-icon-theme,
   json-glib,
+  mate-common,
   mate-desktop,
   wrapGAppsHook3,
+  yelp-tools,
   gitUpdater,
   # can be defaulted to true once switch to meson
   withMagic ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
@@ -20,19 +24,26 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "engrampa";
-  version = "1.28.2";
+  version = "1.28.3";
 
-  src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/engrampa-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Hpl3wjdFv4hDo38xUXHZr5eBSglxrqw9d08BdlCsCe8=";
+  src = fetchFromGitHub {
+    owner = "mate-desktop";
+    repo = "engrampa";
+    tag = "v${finalAttrs.version}";
+    fetchSubmodules = true;
+    hash = "sha256-bmqCsbGz49wda1sMiAvG3XTGpFEwMvDx8ojuzxZ9MAI=";
   };
 
   nativeBuildInputs = [
+    autoconf-archive
+    autoreconfHook
     pkg-config
     gettext
     itstool
     libxml2 # for xmllint
+    mate-common # mate-common.m4 macros
     wrapGAppsHook3
+    yelp-tools
   ];
 
   buildInputs = [
@@ -56,7 +67,6 @@ stdenv.mkDerivation (finalAttrs: {
   enableParallelBuilding = true;
 
   passthru.updateScript = gitUpdater {
-    url = "https://git.mate-desktop.org/engrampa";
     odd-unstable = true;
     rev-prefix = "v";
   };
diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix
index 5d743cfb1c3c..f72f9bfb10e4 100644
--- a/pkgs/by-name/en/enzyme/package.nix
+++ b/pkgs/by-name/en/enzyme/package.nix
@@ -7,13 +7,13 @@
 }:
 llvmPackages.stdenv.mkDerivation rec {
   pname = "enzyme";
-  version = "0.0.260";
+  version = "0.0.263";
 
   src = fetchFromGitHub {
     owner = "EnzymeAD";
     repo = "Enzyme";
     rev = "v${version}";
-    hash = "sha256-juYkvJZUo0b7N/yRRgD4Xwh4nHxRQFMVoWTgIW+N0/0=";
+    hash = "sha256-+Br2PS5IsHaAAJM5IJR7gXMx90pduixbdbSVNxL+kLo=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/eq/equibop/package.nix b/pkgs/by-name/eq/equibop/package.nix
index 61881fe24170..cbe086a6b954 100644
--- a/pkgs/by-name/eq/equibop/package.nix
+++ b/pkgs/by-name/eq/equibop/package.nix
@@ -75,7 +75,6 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postConfigure
   '';
 
-  # electron builds must be writable to support electron fuses
   preBuild = ''
     # Validate electron version matches upstream package.json
     if [ "`jq -r '.devDependencies.electron' < package.json | cut -d. -f1 | tr -d '^'`" != "${lib.versions.major electron.version}" ]
@@ -83,12 +82,8 @@ stdenv.mkDerivation (finalAttrs: {
       echo "ERROR: electron version mismatch between package.json and nixpkgs"
       exit 1
     fi
-  ''
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    cp -r ${electron.dist}/Electron.app .
-    chmod -R u+w Electron.app
-  ''
-  + lib.optionalString stdenv.hostPlatform.isLinux ''
+
+    # electron builds must be writable to support electron fuses
     cp -r ${electron.dist} electron-dist
     chmod -R u+w electron-dist
   '';
@@ -103,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
     # can't run it via bunx / npx since fixupPhase was skipped for node_modules
     node node_modules/electron-builder/out/cli/cli.js \
       --dir \
-      -c.electronDist=${if stdenv.hostPlatform.isDarwin then "." else "electron-dist"} \
+      -c.electronDist=electron-dist \
       -c.electronVersion=${electron.version} \
       -c.npmRebuild=false
 
diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix
index 150dcd7f059e..15bea73ec89f 100644
--- a/pkgs/by-name/eq/equicord/package.nix
+++ b/pkgs/by-name/eq/equicord/package.nix
@@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: {
   # the Equicord repository. Dates as tags (and automatic releases) were the compromise
   # we came to with upstream. Please do not change the version schema (e.g., to semver)
   # unless upstream changes the tag schema from dates.
-  version = "2026-04-22";
+  version = "2026-05-26";
 
   src = fetchFromGitHub {
     owner = "Equicord";
     repo = "Equicord";
     tag = finalAttrs.version;
-    hash = "sha256-KhGSQTnpOWSvrsoghF/kpzUVdNTZUlzpsm6UikySRHY=";
+    hash = "sha256-m/BdSErumQrWCSyejRFm5HcSR4FwDS2JkAXvy9PejmI=";
   };
 
   pnpmDeps = fetchPnpmDeps {
diff --git a/pkgs/by-name/er/erofs-utils/package.nix b/pkgs/by-name/er/erofs-utils/package.nix
index 817dd4068163..c997ab0ed9c2 100644
--- a/pkgs/by-name/er/erofs-utils/package.nix
+++ b/pkgs/by-name/er/erofs-utils/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   autoreconfHook,
   pkg-config,
-  fuse,
+  fuse3,
   util-linux,
   xxhash,
   lz4,
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     zstd
     libdeflate
   ]
-  ++ lib.optionals fuseSupport [ fuse ]
+  ++ lib.optionals fuseSupport [ fuse3 ]
   ++ lib.optionals selinuxSupport [ libselinux ];
 
   configureFlags = [
diff --git a/pkgs/by-name/eu/euphonica/package.nix b/pkgs/by-name/eu/euphonica/package.nix
index 082f18ae7e09..3e0534acfbd6 100644
--- a/pkgs/by-name/eu/euphonica/package.nix
+++ b/pkgs/by-name/eu/euphonica/package.nix
@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "euphonica";
-  version = "0.99.3-beta";
+  version = "0.99.4-beta";
 
   src = fetchFromGitHub {
     owner = "htkhiem";
     repo = "euphonica";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-C9OX8RzgUMdStBFq43sSl5vG7XccXTJjFvn0E2WQDuo=";
+    hash = "sha256-TDW3at2NXbdfUvHAZg7KK0HEqF8xDm0cIYfGuTSlYCQ=";
     fetchSubmodules = true;
   };
 
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-3m0ObaRR/HlxPF9Z5Zg5fMQ17YVRCx6W3drI8XVwZP8=";
+    hash = "sha256-cXlfJ3MrW8n34KxE5uD+6dTqzaazmwgNQC3hHNPqzcE=";
   };
 
   mesonBuildType = "release";
@@ -85,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       paperdigits
       aaravrav
+      doronbehar
     ];
     mainProgram = "euphonica";
     platforms = with lib.platforms; linux;
diff --git a/pkgs/by-name/ex/extest/package.nix b/pkgs/by-name/ex/extest/package.nix
index 770c955b60b3..42a589cf366f 100644
--- a/pkgs/by-name/ex/extest/package.nix
+++ b/pkgs/by-name/ex/extest/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "extest";
-  version = "1.0.2";
+  version = "1.0.3";
 
   src = fetchFromGitHub {
     owner = "Supreeeme";
     repo = "extest";
     rev = finalAttrs.version;
-    hash = "sha256-qdTF4n3uhkl3WFT+7bAlwCjxBx3ggTN6i3WzFg+8Jrw=";
+    hash = "sha256-4SVZD0aHKsn97B5bhCf7URR6iQhJlYGALKWhDg+lGhU=";
   };
 
-  cargoHash = "sha256-82jG4tHqc5FQFGp4NANk2oJjiHc0+ekVdbdWlqjzaj8=";
+  cargoHash = "sha256-OBWgNQ3OfqztaQwbK4fjOp7Lbu58U6j8tbStJ17bIko=";
 
   meta = {
     description = "X11 XTEST reimplementation primarily for Steam Controller on Wayland";
diff --git a/pkgs/by-name/fa/faiss/package.nix b/pkgs/by-name/fa/faiss/package.nix
index 962d35ab0792..b4b74a815cfc 100644
--- a/pkgs/by-name/fa/faiss/package.nix
+++ b/pkgs/by-name/fa/faiss/package.nix
@@ -5,6 +5,7 @@
   stdenv,
   capiSupport ? true,
   cmake,
+  swig,
   cudaPackages ? { },
   cudaSupport ? config.cudaSupport,
   pythonSupport ? true,
@@ -12,7 +13,6 @@
   sharedLibrarySupport ? false,
   llvmPackages,
   blas,
-  swig,
   autoAddDriverRunpath,
   optLevel ?
     let
@@ -42,7 +42,10 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "faiss";
-  version = "1.14.1";
+  version = "1.14.2";
+
+  __structuredAttrs = true;
+  strictDeps = true;
 
   outputs = [ "out" ] ++ lib.optionals pythonSupport [ "dist" ];
 
@@ -50,11 +53,12 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "facebookresearch";
     repo = "faiss";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-p1YncYUUxld9iwFXXZ+lTxYgku8l+/K6dbxZx2EcJ6k=";
+    hash = "sha256-g8URLqh7VXlb5vvpkiUUfE6cgtkMwYNGzs26iUtg28A=";
   };
 
   nativeBuildInputs = [
     cmake
+    swig
   ]
   ++ lib.optionals cudaSupport [
     cudaPackages.cuda_nvcc
@@ -68,7 +72,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     blas
-    swig
   ]
   ++ lib.optionals pythonSupport [ python3Packages.numpy ]
   ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]
diff --git a/pkgs/by-name/fa/fakeroot/package.nix b/pkgs/by-name/fa/fakeroot/package.nix
index 3b42386c05d0..401b39ab993c 100644
--- a/pkgs/by-name/fa/fakeroot/package.nix
+++ b/pkgs/by-name/fa/fakeroot/package.nix
@@ -14,7 +14,7 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "1.37.2";
+  version = "1.38.1";
   pname = "fakeroot";
 
   src = fetchFromGitLab {
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
     repo = "fakeroot";
     rev = "upstream/${finalAttrs.version}";
     domain = "salsa.debian.org";
-    hash = "sha256-TU/9oltd+2wYums8EEDUhaIVzwPeQvW13laCrJqb5A4=";
+    hash = "sha256-1Xmb8OPZSVP4xtSBGuwwKwdVQXixEugMgQfvAJueJAg=";
   };
 
   patches = lib.optionals stdenv.hostPlatform.isLinux [
diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix
index a43d25c3d323..bcdb50f4a5a0 100644
--- a/pkgs/by-name/fe/feishin/package.nix
+++ b/pkgs/by-name/fe/feishin/package.nix
@@ -74,20 +74,17 @@ buildNpmPackage {
     ln -s ${dart-sass}/bin/dart-sass "$dir"/sass
   '';
 
-  postBuild =
-    lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # electron-builder appears to build directly on top of Electron.app, by overwriting the files in the bundle.
-      cp -r ${electron.dist}/Electron.app ./
-      find ./Electron.app -name 'Info.plist' | xargs -d '\n' chmod +rw
-    ''
-    + ''
-      npm exec electron-builder -- \
-        --dir \
-        -c.electronDist=${if stdenv.hostPlatform.isDarwin then "./" else electron.dist} \
-        -c.electronVersion=${electron.version} \
-        -c.npmRebuild=false \
-        ${lib.optionalString stdenv.hostPlatform.isDarwin "-c.mac.identity=null"}
-    '';
+  postBuild = ''
+    cp -r ${electron.dist} electron-dist
+    chmod -R u+w electron-dist
+
+    npm exec electron-builder -- \
+      --dir \
+      -c.electronDist=electron-dist \
+      -c.electronVersion=${electron.version} \
+      -c.npmRebuild=false \
+      ${lib.optionalString stdenv.hostPlatform.isDarwin "-c.mac.identity=null"}
+  '';
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/fe/fetchmail/package.nix b/pkgs/by-name/fe/fetchmail/package.nix
index 55b9f40033df..29a4776a4538 100644
--- a/pkgs/by-name/fe/fetchmail/package.nix
+++ b/pkgs/by-name/fe/fetchmail/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fetchmail";
-  version = "6.6.3";
+  version = "6.6.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/fetchmail/fetchmail-${finalAttrs.version}.tar.xz";
-    hash = "sha256-JG5fwONck93ho/tmd446twDhaAkjLklZxQi5EhQ3S7I=";
+    hash = "sha256-7+AWkNIr2jWaV5x34rAHJligkr/0kOwEeKISxrfQ63A=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/fl/fly/package.nix b/pkgs/by-name/fl/fly/package.nix
index f891f6d5fab9..ab577cab9e0e 100644
--- a/pkgs/by-name/fl/fly/package.nix
+++ b/pkgs/by-name/fl/fly/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "fly";
-  version = "8.2.1";
+  version = "8.2.2";
 
   src = fetchFromGitHub {
     owner = "concourse";
     repo = "concourse";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-YKa1hGqmmwFNcPX6N7iJUjUL6FnPJLi9DZTkcujzVkY=";
+    hash = "sha256-eqzrrbIpX6hS56SQe24gWlnBPMlLH1lz+NwxdNZ3OoE=";
   };
 
-  vendorHash = "sha256-dvE5rtJX3MIuYyswLgcwojd5LIkhD4WnPEL3HNfmhkA=";
+  vendorHash = "sha256-ZNhGt+nyl7zmQIHT+5f/c2hixyZ8kLmCWO5qa7CAGuY=";
 
   subPackages = [ "fly" ];
 
diff --git a/pkgs/by-name/fn/fn-cli/package.nix b/pkgs/by-name/fn/fn-cli/package.nix
index 0c024c61b743..f88fbffe120d 100644
--- a/pkgs/by-name/fn/fn-cli/package.nix
+++ b/pkgs/by-name/fn/fn-cli/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "fn";
-  version = "0.6.56";
+  version = "0.6.58";
 
   src = fetchFromGitHub {
     owner = "fnproject";
     repo = "cli";
     rev = finalAttrs.version;
-    hash = "sha256-GeOb6HkIScxcTTPgXcZy3VyJlwK8NxDJBikDv13tTQM=";
+    hash = "sha256-Ysf+FmYiJ0R4NIskEqIClcG55EnMnBFLD/GDJd8G/sQ=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/fo/forgejo-mcp/package.nix b/pkgs/by-name/fo/forgejo-mcp/package.nix
index 31777a695bba..ae9a20c69609 100644
--- a/pkgs/by-name/fo/forgejo-mcp/package.nix
+++ b/pkgs/by-name/fo/forgejo-mcp/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "forgejo-mcp";
-  version = "2.22.0";
+  version = "2.24.2";
 
   src = fetchFromCodeberg {
     owner = "goern";
     repo = "forgejo-mcp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-115tjQoyM+0B92o02j9amkOG+fywspiZVvIgeoBFkxo=";
+    hash = "sha256-7TMfGP3XiJ+ktOhVOsf7t4eoukMs8UpZRNiXpRD6aDc=";
   };
 
-  vendorHash = "sha256-5CV4drUaYKtZ/RoydAatblhsqU8VWYzYByjhcb9KZVY=";
+  vendorHash = "sha256-QDJRbF4mZzBv1vxvo1ZQJaUJayRHj1jMgjaRfAmLMik=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/fz/fzf/package.nix b/pkgs/by-name/fz/fzf/package.nix
index 6a2521018aef..c16b66f477a9 100644
--- a/pkgs/by-name/fz/fzf/package.nix
+++ b/pkgs/by-name/fz/fzf/package.nix
@@ -11,7 +11,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "fzf";
-  version = "0.72.0";
+  version = "0.73.1";
 
   __structuredAttrs = true;
 
@@ -19,10 +19,10 @@ buildGoModule (finalAttrs: {
     owner = "junegunn";
     repo = "fzf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rUxbC2+VASAEBmL8WOpywk0SD0gyHArisl4pxnqK32I=";
+    hash = "sha256-xdhlbokeCzeBUP3YHA5u5tr3NTQz7n5TKPlJANp7yvM=";
   };
 
-  vendorHash = "sha256-uFXHoseFOxGIGPiWxWfDl339vUv855VHYgSs9rnDyuI=";
+  vendorHash = "sha256-MLuoKPEAqrpCbUphYOCpHdo8MdW5kvueeDU/3loK33Q=";
 
   env.CGO_ENABLED = 0;
 
diff --git a/pkgs/by-name/gc/gcx/package.nix b/pkgs/by-name/gc/gcx/package.nix
index 88da0dc672bb..945f3a4ae6ae 100644
--- a/pkgs/by-name/gc/gcx/package.nix
+++ b/pkgs/by-name/gc/gcx/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gcx";
-  version = "0.2.14";
+  version = "0.2.16";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "gcx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gN3l45wFpZSUnhprei/Ca1/4ptmOFtpNmNUpy6sn0aU=";
+    hash = "sha256-IQbtTEhHttJ/i8VOf6g+bulIzjltZDC6+VPjI+YdZjs=";
   };
 
-  vendorHash = "sha256-uxFYKMJgAYlj43Uri6T6vaXsv/UmYk4zfCSkvu0A6RM=";
+  vendorHash = "sha256-DJmInygabXTK6mnDlugjAAz86HEBpfCm1HQOIsg3Q/Y=";
 
   subPackages = [ "cmd/gcx" ];
 
diff --git a/pkgs/by-name/ge/gefyra/package.nix b/pkgs/by-name/ge/gefyra/package.nix
index 3d831bb775e7..410e03f0d7f6 100644
--- a/pkgs/by-name/ge/gefyra/package.nix
+++ b/pkgs/by-name/ge/gefyra/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gefyra";
-  version = "2.4.3";
+  version = "2.4.4";
 
   src = fetchzip {
     url = "https://github.com/gefyrahq/gefyra/releases/download/${finalAttrs.version}/gefyra-${finalAttrs.version}-linux-amd64.zip";
-    hash = "sha256-HWcW4JX8XglcB3OkJKdaKtZ6D9Mdg3jff0nqHOS4ESg=";
+    hash = "sha256-uYXHmaJ+g13Jw1p910HpQf2382C08Or99kdyTLDOXtI=";
     stripRoot = false;
   };
 
diff --git a/pkgs/by-name/ge/gelly/package.nix b/pkgs/by-name/ge/gelly/package.nix
index d2a6d9266c28..a043039552d0 100644
--- a/pkgs/by-name/ge/gelly/package.nix
+++ b/pkgs/by-name/ge/gelly/package.nix
@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gelly";
-  version = "1.1.2";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "Fingel";
     repo = "gelly";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oEDpfpOkA0J9fSF+haEvhmZGSZIRCaN2qHa2pHUujBs=";
+    hash = "sha256-BnBfz9gE3pz6cL7uAnzSEdI0h7rXCcsFZ8oB5uw5zjY=";
   };
 
-  cargoHash = "sha256-YpFeu5re+kYjjv6Id9kvus3oGmz3qExD8ofLFObAZdI=";
+  cargoHash = "sha256-2gkW+GJQ5TjOP4Me/g3le4/bxLgOoFlHOl/cVk/2lpM=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix
index a9e4fff504e9..b4ac203be5da 100644
--- a/pkgs/by-name/ge/gemini-cli/package.nix
+++ b/pkgs/by-name/ge/gemini-cli/package.nix
@@ -15,18 +15,18 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "gemini-cli";
-  version = "0.42.0";
+  version = "0.43.0";
 
   src = fetchFromGitHub {
     owner = "google-gemini";
     repo = "gemini-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QYSzJdyjJ5SvPkI/uf/wu8MdM76W+djai6zD38IJpos=";
+    hash = "sha256-UFz+CQLGbzFlpa5Mhf/frnQJWttF35URvua1QTfoaZ0=";
   };
 
   nodejs = nodejs_22;
 
-  npmDepsHash = "sha256-hKNEJ/MAseYs8WLr36h40pYv+5nef8EPhZIfmPKYJPY=";
+  npmDepsHash = "sha256-7Pl020NKKzRpQftzEYRpQ0v1mkPnO3kVZITvFSLYztI=";
 
   dontPatchElf = stdenv.hostPlatform.isDarwin;
 
diff --git a/pkgs/by-name/gg/ggml/package.nix b/pkgs/by-name/gg/ggml/package.nix
index f183837ea19f..ccd69b10c520 100644
--- a/pkgs/by-name/gg/ggml/package.nix
+++ b/pkgs/by-name/gg/ggml/package.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ggml";
-  version = "0.12.0";
+  version = "0.13.0";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ggml-org";
     repo = "ggml";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xho510x/7LrCHzmw++zdTg+lI96SebJkdotqIUGLwac=";
+    hash = "sha256-yUd/9uk9utNqkM2V/IIkcNuEojBJQwAOEEUbBPDsNCE=";
   };
 
   # The cmake package does not handle absolute CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR
diff --git a/pkgs/by-name/gi/giac/package.nix b/pkgs/by-name/gi/giac/package.nix
index 1a6153dd213f..82a80810c255 100644
--- a/pkgs/by-name/gi/giac/package.nix
+++ b/pkgs/by-name/gi/giac/package.nix
@@ -38,45 +38,27 @@ assert (!blas.isILP64) && (!lapack.isILP64);
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "giac${lib.optionalString enableGUI "-with-xcas"}";
-  version = "1.9.0-993"; # TODO try to remove preCheck phase on upgrade
+  version = "2.0.0-19"; # TODO try to remove preCheck phase on upgrade
 
   src = fetchurl {
-    url = "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-pqytFWrSWfEwQqRdRbaigGCq68s8mdgj2j8M+kclslE=";
+    url = "https://www-fourier.univ-grenoble-alpes.fr/~parisse/debian/dists/stable/main/source/giac_${finalAttrs.version}.tar.gz";
+    hash = "sha256-7fuKV8xNlDyN9ha1+NNHUjFPhEP0NZ3thwRXL1kcA5E=";
   };
 
   patches = [
-    ./remove-old-functional-patterns.patch
     ./fix-fltk-guard.patch
 
     (fetchpatch {
       name = "pari_2_15.patch";
       url = "https://raw.githubusercontent.com/sagemath/sage/07a2afd65fb4b0a1c9cbc43ede7d4a18c921a000/build/pkgs/giac/patches/pari_2_15.patch";
-      sha256 = "sha256-Q3xBFED7XEAyNz6AHjzt63XtospmdGAIdS6iPq1C2UE=";
-    })
-
-    (fetchpatch {
-      name = "infinity.patch";
-      url = "https://github.com/geogebra/giac/commit/851c2cd91e879c79d6652f8a5d5bed03b65c6d39.patch";
-      sha256 = "sha256-WJRT2b8I9kgAkRuIugMiXoF4hT7yR7qyad8A6IspNTM=";
-      stripLen = 5;
-      extraPrefix = "/src/";
-      excludes = [ "src/kdisplay.cc" ];
-    })
-
-    # giac calls scanf/printf with non-constant first arguments, which
-    # the compiler rightfully warns about (with an error nowadays).
-    (fetchpatch {
-      name = "fix-string-compiler-error.patch";
-      url = "https://salsa.debian.org/science-team/giac/-/raw/9ca8dbf4bb16d9d96948aa4024326d32485d7917/debian/patches/fix-string-compiler-error.patch";
-      sha256 = "sha256-r+M+9MRPRqhHcdhYWI6inxyNvWbXUbBcPCeDY7aulvk=";
+      hash = "sha256-Q3xBFED7XEAyNz6AHjzt63XtospmdGAIdS6iPq1C2UE=";
     })
 
     # issue with include path precedence
     (fetchpatch {
       name = "fix_implicit_declaration.patch";
       url = "https://salsa.debian.org/science-team/giac/-/raw/c05ae9b9e74d3c6ee6411d391071989426a76201/debian/patches/fix_implicit_declaration.patch";
-      sha256 = "sha256-ompUceYJLiL0ftfjBkIMcYvX1YqG2/XA7e1yDyFY0IY=";
+      hash = "sha256-ompUceYJLiL0ftfjBkIMcYvX1YqG2/XA7e1yDyFY0IY=";
     })
   ]
   ++ lib.optionals (!enableGUI) [
@@ -85,7 +67,10 @@ stdenv.mkDerivation (finalAttrs: {
     (fetchpatch {
       name = "nofltk-check.patch";
       url = "https://raw.githubusercontent.com/sagemath/sage/7553a3c8dfa7bcec07241a07e6a4e7dcf5bb4f26/build/pkgs/giac/patches/nofltk-check.patch";
-      sha256 = "sha256-nAl5q3ufLjK3X9s0qMlGNowdRRf3EaC24eVtJABzdXY=";
+      hash = "sha256-eA0S+pEgllv77+KIpMvZgjz99jlbnreVvtNqNXs2HvI=";
+      postFetch = ''
+        substituteInPlace "$out" --replace-quiet periode Periode
+      '';
     })
   ];
 
diff --git a/pkgs/by-name/gi/giac/remove-old-functional-patterns.patch b/pkgs/by-name/gi/giac/remove-old-functional-patterns.patch
deleted file mode 100644
index 95f6efe119fc..000000000000
--- a/pkgs/by-name/gi/giac/remove-old-functional-patterns.patch
+++ /dev/null
@@ -1,294 +0,0 @@
-From f1c5309d5b815acc2616cd9fbb5182b1e64d225f Mon Sep 17 00:00:00 2001
-From: George Huebner <george@feyor.sh>
-Date: Wed, 17 Jul 2024 18:12:36 -0500
-Subject: [PATCH 1/4] remove old <functional> patterns
-
-pointer_to_binary_function and ptr_fun are holdovers from pre c++11,
-and can be replaced or entirely removed. This allows Giac to compile
-with Clang 16>=.
----
- src/all_global_var |  2 +-
- src/gausspol.cc    |  2 +-
- src/gausspol.h     |  2 +-
- src/gen.cc         |  2 +-
- src/gen.h          |  4 ++--
- src/maple.cc       |  2 +-
- src/monomial.h     | 16 ++++++++--------
- src/plot.cc        |  2 +-
- src/poly.h         | 17 +++++++++--------
- src/solve.cc       | 18 +++++++++---------
- src/usual.cc       |  2 +-
- 11 files changed, 35 insertions(+), 34 deletions(-)
-
-diff --git a/src/all_global_var b/src/all_global_var
-index 7d75d73..55f4782 100644
---- a/src/all_global_var
-+++ b/src/all_global_var
-@@ -16,7 +16,7 @@ Relatif a l'evaluation du tableur
- // File Eqw.cc
-   vector<string> completion_tab;
- // File alg_ext.cc
--  rootmap symbolic_rootof_list(ptr_fun(islesscomplex));
-+  rootmap symbolic_rootof_list(islesscomplex);
- // File derive.cc
- // File desolve.cc
-   identificateur laplace_var(" s");
-diff --git a/src/gausspol.cc b/src/gausspol.cc
-index 8fbd581..2f2121f 100644
---- a/src/gausspol.cc
-+++ b/src/gausspol.cc
-@@ -855,7 +855,7 @@ namespace giac {
- 		 std::vector< monomial<gen> >::const_iterator & itb_end,
- 		 std::vector< monomial<gen> > & new_coord,
- 		 bool (* is_strictly_greater)( const index_m &, const index_m &),
--		 const std::pointer_to_binary_function < const monomial<gen> &, const monomial<gen> &, bool> m_is_strictly_greater
-+		 const std::function<bool(const monomial<gen> &, const monomial<gen> &)> m_is_strictly_greater
- 	     ) {
-     if (ita==ita_end || itb==itb_end){
-       new_coord.clear();
-diff --git a/src/gausspol.h b/src/gausspol.h
-index b5d214b..e6c7e0c 100644
---- a/src/gausspol.h
-+++ b/src/gausspol.h
-@@ -93,7 +93,7 @@ namespace giac {
- 		 std::vector< monomial<gen> >::const_iterator & itb_end,
- 		 std::vector< monomial<gen> > & new_coord,
- 		 bool (* is_strictly_greater)( const index_t &, const index_t &),
--		 const std::pointer_to_binary_function < const monomial<gen> &, const monomial<gen> &, bool> m_is_greater
-+         const std::function<bool(const monomial<gen> &, const monomial<gen> &)> m_is_greater
- 		 ) ;
-   void mulpoly(const polynome & th,const gen & fact,polynome & res);
-   polynome operator * (const polynome & th, const gen & fact) ;
-diff --git a/src/gen.cc b/src/gen.cc
-index 7d4874c..0b64afe 100644
---- a/src/gen.cc
-+++ b/src/gen.cc
-@@ -1126,7 +1126,7 @@ namespace giac {
- #if 1 // def NSPIRE
-       g.__MAPptr = new ref_gen_map;
- #else
--    g.__MAPptr = new ref_gen_map(ptr_fun(islesscomplexthanf));
-+    g.__MAPptr = new ref_gen_map(islesscomplexthanf);
- #endif
- #endif
-     g.type=_MAP;
-diff --git a/src/gen.h b/src/gen.h
-index 04d70af..496b25d 100644
---- a/src/gen.h
-+++ b/src/gen.h
-@@ -443,7 +443,7 @@ namespace giac {
-   };
-   typedef std::map<gen,gen,comparegen> gen_map;
- #else
--  typedef std::map<gen,gen,const std::pointer_to_binary_function < const gen &, const gen &, bool> > gen_map;
-+    typedef std::map<gen,gen,const std::function<bool(const gen &, const gen &)> > gen_map;
- #endif
-   struct ref_gen_map;
- 
-@@ -902,7 +902,7 @@ namespace giac {
- #if 1 // def NSPIRE
-     ref_gen_map(): ref_count(1),m() {}
- #else
--    ref_gen_map(const std::pointer_to_binary_function < const gen &, const gen &, bool> & p): ref_count(1),m(p) {}
-+    ref_gen_map(const std::function<bool(const gen &, const gen &)> & p): ref_count(1),m(p) {}
- #endif
-     ref_gen_map(const gen_map & M):ref_count(1),m(M) {}
-   };
-diff --git a/src/maple.cc b/src/maple.cc
-index 3b33da8..d57a170 100644
---- a/src/maple.cc
-+++ b/src/maple.cc
-@@ -3626,7 +3626,7 @@ namespace giac {
- #if 1 // def NSPIRE
-     gen_map m;
- #else
--    gen_map m(ptr_fun(islessthanf));
-+    gen_map m(islessthanf);
- #endif
-     int s=int(args.size());
-     vector<int> indexbegin,indexsize;
-diff --git a/src/monomial.h b/src/monomial.h
-index 6e606d0..637a76c 100644
---- a/src/monomial.h
-+++ b/src/monomial.h
-@@ -338,9 +338,9 @@ namespace giac {
- 
-   template<class T> class sort_helper {
-   public:
--    std::pointer_to_binary_function < const monomial<T> &, const monomial<T> &, bool> strictly_greater ;
--    sort_helper(const std::pointer_to_binary_function < const monomial<T> &, const monomial<T> &, bool> is_strictly_greater):strictly_greater(is_strictly_greater) {};
--    sort_helper():strictly_greater(std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>)) {};
-+    std::function<bool(const monomial<T> &, const monomial<T> &)> strictly_greater ;
-+      sort_helper(const std::function<bool(const monomial<T> &, const monomial<T> &)> is_strictly_greater):strictly_greater(is_strictly_greater) {};
-+    sort_helper():strictly_greater(m_lex_is_strictly_greater<T>) {};
-     bool operator () (const monomial<T> & a, const monomial<T> & b){ return strictly_greater(a,b);}
-   };
- 
-@@ -677,7 +677,7 @@ namespace giac {
- 	     typename std::vector< monomial<T> >::const_iterator & itb_end,
- 	     std::vector< monomial<T> > & new_coord,
- 	     bool (* is_strictly_greater)( const index_m &, const index_m &),
--	     const std::pointer_to_binary_function < const monomial<T> &, const monomial<T> &, bool> m_is_strictly_greater
-+	     const std::function<bool(const monomial<T> &, const monomial<T> &)> m_is_strictly_greater
- 	     ) {
-     if (ita==ita_end || itb==itb_end){
-       new_coord.clear();
-@@ -726,8 +726,8 @@ namespace giac {
- #endif
- #ifndef NSPIRE
-     /* other algorithm using a map to avoid reserving too much space */
--    typedef std::map< index_t,T,const std::pointer_to_binary_function < const index_m &, const index_m &, bool> > application;
--    application produit(std::ptr_fun(is_strictly_greater));
-+    typedef std::map< index_t,T,const std::function<bool(const index_m &, const index_m &)> > application;
-+    application produit(is_strictly_greater);
-     // typedef std::map<index_t,T> application;
-     // application produit;
-     index_t somme(ita->index.size());
-@@ -848,7 +848,7 @@ namespace giac {
-     typename std::vector< monomial<T> >::const_iterator a=v.begin(), a_end=v.end();
-     typename std::vector< monomial<T> >::const_iterator b=w.begin(), b_end=w.end();
-     std::vector< monomial<T> > res;
--    Mul(a,a_end,b,b_end,res,i_lex_is_strictly_greater,std::ptr_fun< const monomial<T> &, const monomial<T> &, bool >((m_lex_is_strictly_greater<T>)));
-+    Mul(a,a_end,b,b_end,res,i_lex_is_strictly_greater,m_lex_is_strictly_greater<T>);
-     return res ;
-   }
- 
-@@ -856,7 +856,7 @@ namespace giac {
-   std::vector< monomial<T> > & operator *= (std::vector< monomial<T> > & v,const std::vector< monomial<T> > & w){
-     typename std::vector< monomial<T> >::const_iterator a=v.begin(), a_end=v.end();
-     typename std::vector< monomial<T> >::const_iterator b=w.begin(), b_end=w.end();
--    Mul(a,a_end,b,b_end,v,i_lex_is_strictly_greater,std::ptr_fun< const monomial<T> &, const monomial<T> &, bool >((m_lex_is_strictly_greater<T>)));
-+    Mul(a,a_end,b,b_end,v,i_lex_is_strictly_greater,m_lex_is_strictly_greater<T>);
-     return v;
-   }
- 
-diff --git a/src/plot.cc b/src/plot.cc
-index 288a1b5..ac85c9a 100755
---- a/src/plot.cc
-+++ b/src/plot.cc
-@@ -11886,7 +11886,7 @@ static vecteur densityscale(double xmin,double xmax,double ymin,double ymax,doub
- #if 1 // def NSPIRE
-     gen_map m;
- #else
--    gen_map m(ptr_fun(islesscomplexthanf));
-+    gen_map m(islesscomplexthanf);
- #endif
-     int taille;
-     is >> taille;
-diff --git a/src/poly.h b/src/poly.h
-index 7d64e2c..d9ff991 100644
---- a/src/poly.h
-+++ b/src/poly.h
-@@ -40,23 +40,24 @@ namespace giac {
-     // T zero;
-     // functional object sorting function for monomial ordering
-     bool (* is_strictly_greater)( const index_m &, const index_m &);
--    std::pointer_to_binary_function < const monomial<T> &, const monomial<T> &, bool> m_is_strictly_greater ;
-+    std::function<bool(const monomial<T> &, const monomial<T> &)> m_is_strictly_greater ;
-     // constructors
-     tensor(const tensor<T> & t) : dim(t.dim), coord(t.coord), is_strictly_greater(t.is_strictly_greater), m_is_strictly_greater(t.m_is_strictly_greater) { }
-     tensor(const tensor<T> & t, const std::vector< monomial<T> > & v) : dim(t.dim), coord(v), is_strictly_greater(t.is_strictly_greater), m_is_strictly_greater(t.m_is_strictly_greater) { }
-     // warning: this constructor prohibits construction of tensor from a value
-     // of type T if this value is an int, except by using tensor<T>(T(int))
--    tensor() : dim(0), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>)) { }
--    explicit tensor(int d) : dim(d), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>)) { }
-+    // DANGER
-+    tensor() : dim(0), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(m_lex_is_strictly_greater<T>) { }
-+    explicit tensor(int d) : dim(d), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(m_lex_is_strictly_greater<T>) { }
-     explicit tensor(int d,const tensor<T> & t) : dim(d),is_strictly_greater(t.is_strictly_greater), m_is_strictly_greater(t.m_is_strictly_greater)  { }
--    tensor(const monomial<T> & v) : dim(int(v.index.size())), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>)) { 
-+    tensor(const monomial<T> & v) : dim(int(v.index.size())), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(m_lex_is_strictly_greater<T>) { 
-       coord.push_back(v);
-     }
--    tensor(const T & v, int d) : dim(d), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>)) {
-+    tensor(const T & v, int d) : dim(d), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(m_lex_is_strictly_greater<T>) {
-       if (!is_zero(v))
- 	coord.push_back(monomial<T>(v,0,d));
-     }
--    tensor(int d,const std::vector< monomial<T> > & c) : dim(d), coord(c), is_strictly_greater(i_lex_is_strictly_greater),m_is_strictly_greater(std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>)) { }
-+    tensor(int d,const std::vector< monomial<T> > & c) : dim(d), coord(c), is_strictly_greater(i_lex_is_strictly_greater),m_is_strictly_greater(m_lex_is_strictly_greater<T>) { }
-     ~tensor() { coord.clear(); }
-     // member functions
-     // ordering monomials in the tensor
-@@ -519,10 +520,10 @@ namespace giac {
-   template <class T>
-   void lexsort(std::vector < monomial<T> > & v){
- #if 1 // def NSPIRE
--    sort_helper<T> M(std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>));
-+    sort_helper<T> M(m_lex_is_strictly_greater<T>);
-     sort(v.begin(),v.end(),M);
- #else
--    sort(v.begin(),v.end(),std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>));
-+    sort(v.begin(),v.end(),m_lex_is_strictly_greater<T>);
- #endif
-   }
- 
-diff --git a/src/solve.cc b/src/solve.cc
-index 889f824..2a51ab8 100755
---- a/src/solve.cc
-+++ b/src/solve.cc
-@@ -8684,39 +8684,39 @@ namespace giac {
-     switch (order.val){
-     case _PLEX_ORDER: 
-       p.is_strictly_greater=i_lex_is_strictly_greater;
--      p.m_is_strictly_greater=std::ptr_fun(m_lex_is_strictly_greater<gen>);
-+      p.m_is_strictly_greater=m_lex_is_strictly_greater<gen>;
-       break;
-     case _REVLEX_ORDER: 
-       p.is_strictly_greater=i_total_revlex_is_strictly_greater;
--      p.m_is_strictly_greater=std::ptr_fun(m_total_revlex_is_strictly_greater<gen>);
-+      p.m_is_strictly_greater=m_total_revlex_is_strictly_greater<gen>;
-       break;
-     case _TDEG_ORDER:
-       p.is_strictly_greater=i_total_lex_is_strictly_greater;
--      p.m_is_strictly_greater=std::ptr_fun(m_total_lex_is_strictly_greater<gen>);
-+      p.m_is_strictly_greater=m_total_lex_is_strictly_greater<gen>;
-       break;
-     case _3VAR_ORDER:
-       p.is_strictly_greater=i_3var_is_strictly_greater;
--      p.m_is_strictly_greater=std::ptr_fun(m_3var_is_strictly_greater<gen>);
-+      p.m_is_strictly_greater=m_3var_is_strictly_greater<gen>;
-       break;      
-     case _7VAR_ORDER:
-       p.is_strictly_greater=i_7var_is_strictly_greater;
--      p.m_is_strictly_greater=std::ptr_fun(m_7var_is_strictly_greater<gen>);
-+      p.m_is_strictly_greater=m_7var_is_strictly_greater<gen>;
-       break;      
-     case _11VAR_ORDER:
-       p.is_strictly_greater=i_11var_is_strictly_greater;
--      p.m_is_strictly_greater=std::ptr_fun(m_11var_is_strictly_greater<gen>);
-+      p.m_is_strictly_greater=m_11var_is_strictly_greater<gen>;
-       break;      
-     case _16VAR_ORDER:
-       p.is_strictly_greater=i_16var_is_strictly_greater;
--      p.m_is_strictly_greater=std::ptr_fun(m_16var_is_strictly_greater<gen>);
-+      p.m_is_strictly_greater=m_16var_is_strictly_greater<gen>;
-       break;      
-     case _32VAR_ORDER:
-       p.is_strictly_greater=i_32var_is_strictly_greater;
--      p.m_is_strictly_greater=std::ptr_fun(m_32var_is_strictly_greater<gen>);
-+      p.m_is_strictly_greater=m_32var_is_strictly_greater<gen>;
-       break;      
-     case _64VAR_ORDER:
-       p.is_strictly_greater=i_64var_is_strictly_greater;
--      p.m_is_strictly_greater=std::ptr_fun(m_64var_is_strictly_greater<gen>);
-+      p.m_is_strictly_greater=m_64var_is_strictly_greater<gen>;
-       break;      
-     }
-     p.tsort();
-diff --git a/src/usual.cc b/src/usual.cc
-index fddede6..eb7ae5e 100755
---- a/src/usual.cc
-+++ b/src/usual.cc
-@@ -5950,7 +5950,7 @@ namespace giac {
- #if 1 // def NSPIRE
-     gen_map m;
- #else
--    gen_map m(ptr_fun(islesscomplexthanf));
-+    gen_map m(islesscomplexthanf);
- #endif
-     for (;it!=itend;++it){
-       if (is_equal(*it) || it->is_symb_of_sommet(at_deuxpoints)){
--- 
-2.44.1
-
diff --git a/pkgs/by-name/gi/git-credential-keepassxc/package.nix b/pkgs/by-name/gi/git-credential-keepassxc/package.nix
index a33a78b6fa42..5e83ff78fa01 100644
--- a/pkgs/by-name/gi/git-credential-keepassxc/package.nix
+++ b/pkgs/by-name/gi/git-credential-keepassxc/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "git-credential-keepassxc";
-  version = "0.14.2";
+  version = "0.14.3";
 
   src = fetchFromGitHub {
     owner = "Frederick888";
     repo = "git-credential-keepassxc";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-tA90IM2zLDX9LkIZ6BEW9L+Se3f/cq80f+IwLfq1cjI=";
+    hash = "sha256-rgYwcfglyutHIZrENFlYUHFeobMoLU6BwkdsaWqDkWE=";
   };
 
-  cargoHash = "sha256-5aXVvQdiQ+3c3VsGX/nrvclgNlXUO3bs0/De8LEXDek=";
+  cargoHash = "sha256-zHSMbfP9ge3JYGyUI2XMGtQwQnsDPkWDnm0F3WWwfNc=";
 
   buildFeatures =
     [ ]
diff --git a/pkgs/by-name/gi/github-mcp-server/package.nix b/pkgs/by-name/gi/github-mcp-server/package.nix
index d75a0c67e02e..71b8cd016284 100644
--- a/pkgs/by-name/gi/github-mcp-server/package.nix
+++ b/pkgs/by-name/gi/github-mcp-server/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "github-mcp-server";
-  version = "1.0.4";
+  version = "1.0.5";
 
   src = fetchFromGitHub {
     owner = "github";
     repo = "github-mcp-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-y6QGF2g9FhDxtWR//kaI5Xt2o+MwaNWCf2t0t61/vww=";
+    hash = "sha256-NVC6geIzaSyz1uTwTQO1awMBdVEuuQMB2csAfUjMvsw=";
   };
 
-  vendorHash = "sha256-fVNMtCpodsr1Z9E21osHb+e63ZQqFKYwi4fz4OsTJe0=";
+  vendorHash = "sha256-+ybGV37fjJ5eZjxTb+SUnJ52J20XizJL8WjoM16Rabg=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix
index da2c49252ccf..3fd603a4ce6e 100644
--- a/pkgs/by-name/gi/gitlab-runner/package.nix
+++ b/pkgs/by-name/gi/gitlab-runner/package.nix
@@ -12,13 +12,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "gitlab-runner";
-  version = "18.11.2";
+  version = "18.11.3";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TWpIu6LxFX5ssijlYQA/dmAiPrB0nrHtlS2MWEk6C30=";
+    hash = "sha256-/QMmBDZz6nWmc9hODS3yVe9iyNERbebGysZ1Z4B5Gw8=";
   };
 
   vendorHash = "sha256-xEvvYAVIwHwQDd38P2i6GcgFqf8FPnflWh5IEqmWQdE=";
@@ -123,6 +123,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "GitLab Runner the continuous integration executor of GitLab";
     homepage = "https://docs.gitlab.com/runner";
+    changelog = "https://gitlab.com/gitlab-org/gitlab-runner/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     mainProgram = "gitlab-runner";
     maintainers = with lib.maintainers; [ zimbatm ];
diff --git a/pkgs/by-name/gi/gitoxide/package.nix b/pkgs/by-name/gi/gitoxide/package.nix
index 6988a6080c37..b857ac360b24 100644
--- a/pkgs/by-name/gi/gitoxide/package.nix
+++ b/pkgs/by-name/gi/gitoxide/package.nix
@@ -18,16 +18,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gitoxide";
-  version = "0.53.0";
+  version = "0.54.0";
 
   src = fetchFromGitHub {
     owner = "GitoxideLabs";
     repo = "gitoxide";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fg5Y2WYlDqcV2OIVHUWMMP2e/gz2FNBUd0AmZzKUVx8=";
+    hash = "sha256-MkOmxvACroJAB1nQZT1pcJ/Fn9gWNFwKiwVNb9iUlgY=";
   };
 
-  cargoHash = "sha256-i48mE6PJTDeT+xOwljKxXZiSDvHPON+ysMptm8obIUU=";
+  cargoHash = "sha256-bYgGQa8Gym4dzkuTrOSu3NwUhYdZNtq7ACwVwhdKQRI=";
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix
index ddd7b7ebacb3..b41ae97b3f66 100644
--- a/pkgs/by-name/gl/glooctl/package.nix
+++ b/pkgs/by-name/gl/glooctl/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "glooctl";
-  version = "1.21.4";
+  version = "1.21.6";
 
   src = fetchFromGitHub {
     owner = "solo-io";
     repo = "gloo";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-cG3WKpvIanWneBYw98nprbmoTHaFbdRopJ4p5oaJkyU=";
+    hash = "sha256-KZh0ZUCZ5zUJRmt/JpfqowADrjuGgK27XoIJ/1TBgzA=";
   };
 
-  vendorHash = "sha256-8iRotQm41EcqjHUK92wpNFcq/ODDbhAhcKSxSRFmGrA=";
+  vendorHash = "sha256-1bY+69XKEmcV+8HV2X2JYA6S9A29KbHTLaXSZbkFbhg=";
 
   subPackages = [ "projects/gloo/cli/cmd" ];
 
diff --git a/pkgs/by-name/go/gonic/package.nix b/pkgs/by-name/go/gonic/package.nix
index e5470be8825b..228922950b82 100644
--- a/pkgs/by-name/go/gonic/package.nix
+++ b/pkgs/by-name/go/gonic/package.nix
@@ -18,17 +18,17 @@
   mpv,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "gonic";
-  version = "0.20.1";
+  version = "0.21.0";
   src = fetchFromGitHub {
     owner = "sentriz";
     repo = "gonic";
-    rev = "v${version}";
-    sha256 = "sha256-tW+GuNMMeiPf5XInR1BN2L7ommWh1SPClbRew8/2+cA=";
+    rev = "v${finalAttrs.version}";
+    sha256 = "sha256-+plbpqaWWr3gA3grfl5yawEyrQyw6h6rvATqGxEO09c=";
   };
 
-  vendorHash = "sha256-ynoIR4S02v3qec7447feuu/igFWR20VQVbL0GbTBpqM=";
+  vendorHash = "sha256-OynYgtqWNMyrUvysi9cNqL0nAfUXP8cOEx02lSP6E7E=";
 
   # TODO(Profpatsch): write a test for transcoding support,
   # since it is prone to break
@@ -68,4 +68,4 @@ buildGoModule rec {
     maintainers = with lib.maintainers; [ autrimpo ];
     mainProgram = "gonic";
   };
-}
+})
diff --git a/pkgs/by-name/go/goofcord/package.nix b/pkgs/by-name/go/goofcord/package.nix
index 11726d250e0d..82cd5f0174f3 100644
--- a/pkgs/by-name/go/goofcord/package.nix
+++ b/pkgs/by-name/go/goofcord/package.nix
@@ -64,19 +64,17 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postConfigure
   '';
 
-  preBuild = lib.optionalString stdenv.hostPlatform.isLinux ''
-    cp -r ${electron.dist} electron-dist
-    chmod -R u+w electron-dist
-  '';
-
   buildPhase = ''
     runHook preBuild
 
     bun run build -- --skipTypecheck
 
+    cp -r ${electron.dist} electron-dist
+    chmod -R u+w electron-dist
+
     node node_modules/electron-builder/out/cli/cli.js \
       --dir \
-      -c.electronDist="${if stdenv.hostPlatform.isLinux then "electron-dist" else electron.dist}" \
+      -c.electronDist=electron-dist \
       -c.electronVersion="${electron.version}" \
       -c.npmRebuild=false
 
diff --git a/pkgs/by-name/go/got/package.nix b/pkgs/by-name/go/got/package.nix
index bdcc557e20aa..18d7f034dcd4 100644
--- a/pkgs/by-name/go/got/package.nix
+++ b/pkgs/by-name/go/got/package.nix
@@ -25,11 +25,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "got";
-  version = "0.125";
+  version = "0.126";
 
   src = fetchurl {
     url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz";
-    hash = "sha256-rdYZgBBzZDcq64Foe8WKZsDQyeCixKm7ttNxT7RSuqw=";
+    hash = "sha256-rXXdiDGGrxCi+Lol9bTm6bKXTTkvNcjgo5O0/xNLSC0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gu/guesswidth/package.nix b/pkgs/by-name/gu/guesswidth/package.nix
index 0acac1e11c48..67fe84083696 100644
--- a/pkgs/by-name/gu/guesswidth/package.nix
+++ b/pkgs/by-name/gu/guesswidth/package.nix
@@ -10,16 +10,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "guesswidth";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "noborus";
     repo = "guesswidth";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-afZYegG4q+KmvNP2yy/HGvP4V1mpOUCxRLWLTUHAK0M=";
+    hash = "sha256-MbQBfwXdmcSU6F7M+Y70lGwBwhhJvRgtevco+UPt0Po=";
   };
 
-  vendorHash = "sha256-IGb+fM3ZOlGrLGFSUeUhZ9wDMKOBofDBYByAQlvXY14=";
+  vendorHash = "sha256-/R/KUKQq52CnukJoQybSA4OkcHq/v8ICxxUqSc4ynEQ=";
 
   ldflags = [
     "-X github.com/noborus/guesswidth.version=v${finalAttrs.version}"
diff --git a/pkgs/by-name/hi/highscore-mednafen/package.nix b/pkgs/by-name/hi/highscore-mednafen/package.nix
index 29deded80c82..e3c70a929641 100644
--- a/pkgs/by-name/hi/highscore-mednafen/package.nix
+++ b/pkgs/by-name/hi/highscore-mednafen/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "highscore-mednafen";
-  version = "0-unstable-2026-01-31";
+  version = "0-unstable-2026-05-22";
 
   src = fetchFromGitHub {
     owner = "highscore-emu";
     repo = "mednafen-highscore";
-    rev = "f1646bbc664837f5b2ecbfb32cc5c42101466bfd";
-    hash = "sha256-YHVV6/8JTESLtGA5jFozE5IhXHB4RaUaT2yvFd7wGo8=";
+    rev = "e13c337a2cde6d5304f2a33311447280ef206a7a";
+    hash = "sha256-nwvOkL1RzqXCqMFiDuSvNhgmujvxFYpdp4OScvEmppI=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/highscore";
diff --git a/pkgs/by-name/hi/highscore-mgba/package.nix b/pkgs/by-name/hi/highscore-mgba/package.nix
index 72c52a4a2040..c8cff0f59554 100644
--- a/pkgs/by-name/hi/highscore-mgba/package.nix
+++ b/pkgs/by-name/hi/highscore-mgba/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation {
   pname = "highscore-mgba";
-  version = "0-unstable-2026-05-01";
+  version = "0-unstable-2026-05-21";
 
   src = fetchFromGitHub {
     owner = "highscore-emu";
     repo = "mgba";
-    rev = "eeb3cf0f34af549d9224dd75a1e6cb6361d09aeb";
-    hash = "sha256-yGUAnG8LnZ+hCV+uE1tGX2Zmp5Hriu7LQaWfXZTJqXk=";
+    rev = "c010031f76b729819246497627746fb4a7bf6c85";
+    hash = "sha256-QhQ27s4Gc2IVkvgiB2vK2c0WXcxwl5/wmvpIRpM3NNI=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/hy/hyprwhspr-rs/package.nix b/pkgs/by-name/hy/hyprwhspr-rs/package.nix
index 2979c45ab61c..df0fb2771513 100644
--- a/pkgs/by-name/hy/hyprwhspr-rs/package.nix
+++ b/pkgs/by-name/hy/hyprwhspr-rs/package.nix
@@ -16,16 +16,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hyprwhspr-rs";
-  version = "0.3.27";
+  version = "0.3.28";
 
   src = fetchFromGitHub {
     owner = "better-slop";
     repo = "hyprwhspr-rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+A+AJUMSOXwpOI+bo/g55yfdhQazdSbmHookHXVL9Xk=";
+    hash = "sha256-2o/857vuKk4KzWUtzwkSuSwd4FGlQWstku/zXUCu+kw=";
   };
 
-  cargoHash = "sha256-PA7lC6aQTEK566ADOIC+EvsPDYvjZRi8tc14EQ7gihE=";
+  cargoHash = "sha256-Pwp56bu/ajozNby+FrNrdPpSFPo/O0sWG4I7wFvPZyg=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/in/interactive-html-bom/package.nix b/pkgs/by-name/in/interactive-html-bom/package.nix
index fad9176bad82..daa92fd895b1 100644
--- a/pkgs/by-name/in/interactive-html-bom/package.nix
+++ b/pkgs/by-name/in/interactive-html-bom/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "interactive-html-bom";
-  version = "2.11.1";
+  version = "2.11.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "openscopeproject";
     repo = "InteractiveHtmlBom";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-j8ORSHMZ3aWtWNA5UaHeL+OXh4D1wdek5JjinmqpOfI=";
+    hash = "sha256-MNwQJAibnAAMvsoTWtFiIhM6TGVUs7B2w6sA4ruXFbc=";
   };
 
   build-system = [ python3Packages.hatchling ];
diff --git a/pkgs/by-name/ir/iroh-ssh/package.nix b/pkgs/by-name/ir/iroh-ssh/package.nix
index 0e34673c8a5d..5d9ad7314e19 100644
--- a/pkgs/by-name/ir/iroh-ssh/package.nix
+++ b/pkgs/by-name/ir/iroh-ssh/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "iroh-ssh";
-  version = "0.2.10";
+  version = "0.2.11";
 
   src = fetchFromGitHub {
     owner = "rustonbsd";
     repo = "iroh-ssh";
     tag = finalAttrs.version;
-    hash = "sha256-A/QdpPHI9TCqQ2oghxPUJl4KKX8gqkA3kBvN8f1Kegg=";
+    hash = "sha256-/g5U8WW/iqf+ccIsZ5tPhkjVFsoVgDj6sfk/aSgGJBw=";
   };
 
-  cargoHash = "sha256-/cq/rOzrQ4t0qvdaqM3JhRn8IMncx7jWYDjdYmLCYvc=";
+  cargoHash = "sha256-2NAl4ClPN+OI1EBAkuL/KSiByxU34sBmYDjnRXYuiOY=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix
index 0c48de36e306..a971e357825d 100644
--- a/pkgs/by-name/is/isabelle/package.nix
+++ b/pkgs/by-name/is/isabelle/package.nix
@@ -14,6 +14,7 @@
   eprover-ho,
   cvc5,
   libpoly,
+  symfpu,
   csdp,
   rlwrap,
   perl,
@@ -109,6 +110,10 @@ let
         version = "0.2.0";
         __intentionallyOverridingVersion = true;
       };
+      symfpu = symfpu.overrideAttrs {
+        version = "0-unstable-2019-05-17";
+        __intentionallyOverridingVersion = true;
+      };
     }).overrideAttrs
       {
         version = "1.2.0";
diff --git a/pkgs/by-name/iv/ivpn-ui/package.nix b/pkgs/by-name/iv/ivpn-ui/package.nix
index cc069c4a06ac..959f5b10666c 100644
--- a/pkgs/by-name/iv/ivpn-ui/package.nix
+++ b/pkgs/by-name/iv/ivpn-ui/package.nix
@@ -34,12 +34,13 @@ buildNpmPackage (finalAttrs: {
   };
 
   postBuild = ''
-    cp -r ${electron.dist} electron-dist
-    chmod -R u+w electron-dist
+    electron_dist="$(mktemp -d)"
+    cp -r ${electron.dist}/. "$electron_dist"
+    chmod -R u+w "$electron_dist"
 
     npm exec electron-builder -- \
       --dir \
-      -c.electronDist=electron-dist \
+      -c.electronDist="$electron_dist" \
       -c.electronVersion=${electron.version} \
       --config electron-builder.config.js
   '';
diff --git a/pkgs/by-name/ji/jitsi-meet-electron/package.nix b/pkgs/by-name/ji/jitsi-meet-electron/package.nix
index dde44cd63630..6ffde69d8acb 100644
--- a/pkgs/by-name/ji/jitsi-meet-electron/package.nix
+++ b/pkgs/by-name/ji/jitsi-meet-electron/package.nix
@@ -1,28 +1,36 @@
 {
   lib,
   stdenv,
+
   buildNpmPackage,
   fetchFromGitHub,
-  copyDesktopItems,
   makeDesktopItem,
+
+  copyDesktopItems,
   makeWrapper,
+  xcbuild,
+
   libpng,
   libx11,
   libxi,
   libxtst,
   zlib,
-  electron,
+
+  electron_41,
 }:
 
+let
+  electron = electron_41;
+in
 buildNpmPackage rec {
   pname = "jitsi-meet-electron";
-  version = "2025.2.0";
+  version = "2026.5.0";
 
   src = fetchFromGitHub {
     owner = "jitsi";
     repo = "jitsi-meet-electron";
     rev = "v${version}";
-    hash = "sha256-Pk62BpfXblRph3ktxy8eF9umRmPRZbZGjRWduy+3z+s=";
+    hash = "sha256-yeYDft2d2RHNXYrmnHlBzsZ43bvBgwwsqxQr/Q+/AuQ=";
   };
 
   nativeBuildInputs = [
@@ -30,6 +38,9 @@ buildNpmPackage rec {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     copyDesktopItems
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    xcbuild
   ];
 
   # robotjs node-gyp dependencies
@@ -41,14 +52,12 @@ buildNpmPackage rec {
     zlib
   ];
 
-  npmDepsHash = "sha256-TckV91RJo06OKb8nIvxBCxu28qyHtA/ACDshOlaCQxA=";
+  npmDepsHash = "sha256-5y7q6SnA9s85+HFOhqif1N8XRO7ekGJ4nfVbWZ/diuI=";
 
   makeCacheWritable = true;
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
-    # disable code signing on Darwin
-    CSC_IDENTITY_AUTO_DISCOVERY = "false";
     NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration";
   };
 
@@ -66,6 +75,8 @@ buildNpmPackage rec {
     cp -r ${electron.dist} electron-dist
     chmod -R u+w electron-dist
 
+    export npm_config_nodedir=${electron.headers}
+
     # npmRebuild is needed because robotjs won't be built on darwin otherwise
     # asarUnpack makes sure to unwrap binaries so that nix can see the RPATH
     npm exec electron-builder -- \
@@ -73,7 +84,8 @@ buildNpmPackage rec {
         -c.npmRebuild=true \
         -c.asarUnpack="**/*.node" \
         -c.electronDist=electron-dist \
-        -c.electronVersion=${electron.version}
+        -c.electronVersion=${electron.version} \
+        -c.mac.identity=null
   '';
 
   installPhase = ''
diff --git a/pkgs/by-name/jq/jq/package.nix b/pkgs/by-name/jq/jq/package.nix
index 31633d27ba03..70b6bb169fce 100644
--- a/pkgs/by-name/jq/jq/package.nix
+++ b/pkgs/by-name/jq/jq/package.nix
@@ -139,5 +139,9 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     platforms = lib.platforms.unix;
     mainProgram = "jq";
+    identifiers.purlParts = {
+      type = "github";
+      spec = "jqlang/jq@jq-${finalAttrs.version}";
+    };
   };
 })
diff --git a/pkgs/by-name/kd/kdlfmt/package.nix b/pkgs/by-name/kd/kdlfmt/package.nix
index 0598d7359c8a..56c309ea268a 100644
--- a/pkgs/by-name/kd/kdlfmt/package.nix
+++ b/pkgs/by-name/kd/kdlfmt/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "kdlfmt";
-  version = "0.1.6";
+  version = "0.1.7";
 
   src = fetchFromGitHub {
     owner = "hougesen";
     repo = "kdlfmt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-W4a+pPdQv6/XOS3ps1CBCLuspcSAn7FJuvkA5hesvww=";
+    hash = "sha256-Ftzf4gI7E5tPo8U5ZxUMqlY5+AK5IEUUAll+GsEKYpg=";
   };
 
-  cargoHash = "sha256-VXg7CVsTuAvXrQNAtzlcJvd24BtS/bQYTGselh4Dzyk=";
+  cargoHash = "sha256-B/ir+Sf4uxQ9Fqmy6yEa3DMt0qdpfPrwD8lhUMOEUbo=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/ki/kiro-cli/package.nix b/pkgs/by-name/ki/kiro-cli/package.nix
index fa0b8d5287d7..e697c5e90f3b 100644
--- a/pkgs/by-name/ki/kiro-cli/package.nix
+++ b/pkgs/by-name/ki/kiro-cli/package.nix
@@ -14,23 +14,23 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "kiro-cli";
-  version = "2.3.0";
+  version = "2.4.1";
 
   src =
     let
       darwinDmg = fetchurl {
         url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/Kiro%20CLI.dmg";
-        hash = "sha256-lHBlzPFeT9m54dbFBXm7l/bJIVcBJqodZ6xKD9XThJc=";
+        hash = "sha256-rJaKbNhNlSL3CfTRY4Fin5CUhrvjhOJrUuqGCTlRXkQ=";
       };
     in
     {
       x86_64-linux = fetchurl {
         url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-x86_64-linux.tar.gz";
-        hash = "sha256-zLizK/0m9PdIzN4IMicq7/95lWahj7sdLzEEYpv/o+E=";
+        hash = "sha256-fXTKu1lO5hPZn1YwRkHI6B+edNatR4KJGqHXzi9Epa8=";
       };
       aarch64-linux = fetchurl {
         url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-aarch64-linux.tar.gz";
-        hash = "sha256-B4NElbGE0M7P6eGrd90UYvoeqN1fEoe+2g1/M1wM3ZY=";
+        hash = "sha256-4/HJH3cHHX4Z3/P4eHfnWA6f43TAfAUiqQsZNIehRBY=";
       };
       x86_64-darwin = darwinDmg;
       aarch64-darwin = darwinDmg;
diff --git a/pkgs/by-name/kn/knewave/package.nix b/pkgs/by-name/kn/knewave/package.nix
index 6127db35e770..3f42503893c8 100644
--- a/pkgs/by-name/kn/knewave/package.nix
+++ b/pkgs/by-name/kn/knewave/package.nix
@@ -2,12 +2,18 @@
   lib,
   fetchFromGitHub,
   stdenvNoCC,
+  installFonts,
 }:
 
 stdenvNoCC.mkDerivation {
   pname = "knewave";
   version = "2012-07-30";
 
+  outputs = [
+    "out"
+    "webfont"
+  ];
+
   src = fetchFromGitHub {
     owner = "theleagueof";
     repo = "knewave";
@@ -15,14 +21,7 @@ stdenvNoCC.mkDerivation {
     hash = "sha256-SaJU2GlxU7V3iJNQzFKg1YugaPsiJuSZpC8NCqtWyz0=";
   };
 
-  installPhase = ''
-    runHook preInstall
-
-    install -D -m444 -t $out/share/fonts/truetype $src/*.ttf
-    install -D -m444 -t $out/share/fonts/opentype $src/*.otf
-
-    runHook postInstall
-  '';
+  nativeBuildInputs = [ installFonts ];
 
   meta = {
     description = "Bold, painted face for the rocker within";
diff --git a/pkgs/by-name/ko/koka/package.nix b/pkgs/by-name/ko/koka/package.nix
index 960eab8b3f0d..a838fa7ca4ef 100644
--- a/pkgs/by-name/ko/koka/package.nix
+++ b/pkgs/by-name/ko/koka/package.nix
@@ -9,13 +9,13 @@
 }:
 
 let
-  version = "3.2.2";
+  version = "3.2.3";
 
   src = fetchFromGitHub {
     owner = "koka-lang";
     repo = "koka";
-    rev = "v${version}";
-    hash = "sha256-k1N085NoAlxewAhg5UDMo7IUf2A6gCTc9k5MWMbU0d0=";
+    tag = "v${version}";
+    hash = "sha256-sbyiY5zZuVyul98y5xwfxp7kIzeojdJWxDf6zjWnLrI=";
     fetchSubmodules = true;
   };
 
@@ -68,7 +68,7 @@ haskellPackages.mkDerivation {
     hashable
     isocline
     lens
-    lsp
+    lsp_2_8_0_0
     mtl
     network
     network-simple
diff --git a/pkgs/by-name/ku/kubectl-rabbitmq/package.nix b/pkgs/by-name/ku/kubectl-rabbitmq/package.nix
index 49a34fe93d7c..125498486e5c 100644
--- a/pkgs/by-name/ku/kubectl-rabbitmq/package.nix
+++ b/pkgs/by-name/ku/kubectl-rabbitmq/package.nix
@@ -7,18 +7,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubectl-rabbitmq";
-  version = "2.20.1";
+  version = "2.21.0";
 
   src = fetchFromGitHub {
     owner = "rabbitmq";
     repo = "cluster-operator";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-84rcffEG2+AxtCbOo7KnT6mQFOMpeWJyA0HgDxjmlyc=";
+    hash = "sha256-6kh4R84Nq82M66Y0vl1NLYUxWh52oYpCydK7vOmkMcU=";
   };
 
   modRoot = "kubectl-rabbitmq";
 
-  vendorHash = "sha256-+++RbYcQ3qrdWeBUjd50RuCuvpSbDrTycCR7mptvhoc=";
+  vendorHash = "sha256-/50MnUk1wxpUed8jZ8OC6rgu4Qj6CnUZdbYsgyjsxIo=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/ku/kubexporter/package.nix b/pkgs/by-name/ku/kubexporter/package.nix
index e461d01880b7..841f89c1e4be 100644
--- a/pkgs/by-name/ku/kubexporter/package.nix
+++ b/pkgs/by-name/ku/kubexporter/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubexporter";
-  version = "0.8.4";
+  version = "0.8.7";
 
   src = fetchFromGitHub {
     owner = "bakito";
     repo = "kubexporter";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kEQN0qrtXVPSl0v3uhOWO0OS70bCqZmojKcPrHQLLTw=";
+    hash = "sha256-sAY7nm+BaNOoPNmMDWVqJrzMSFnah8z6bKiGQrX1/+k=";
   };
 
-  vendorHash = "sha256-+2Ab/bA+IgCYvNvdnVOdDCtpbzNEcHvKxEviHgLZNvU=";
+  vendorHash = "sha256-I6FBS8VnH4p9aZgJd1/dDf1xVJ3+PBhqkePZKTMuEJo=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix
index aa28c2db02d1..827526232430 100644
--- a/pkgs/by-name/la/lazysql/package.nix
+++ b/pkgs/by-name/la/lazysql/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "lazysql";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "jorgerojas26";
     repo = "lazysql";
     rev = "v${version}";
-    hash = "sha256-fQGojLJdMnzWXetE2AL2i0q16ZRebPsGx9UsWm1CmAs=";
+    hash = "sha256-rdXZmvyBzVcvycFP/AmrnOuVauQKrmJ1ZTIXc0TWxSI=";
   };
 
   vendorHash = "sha256-FbAt/HsjoxqAKWQqqWN2xuyyTG2Ic4DcyEU4O0rjpQE=";
diff --git a/pkgs/by-name/le/ledfx/package.nix b/pkgs/by-name/le/ledfx/package.nix
index bb65c4e9071e..1db62953bff2 100644
--- a/pkgs/by-name/le/ledfx/package.nix
+++ b/pkgs/by-name/le/ledfx/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "ledfx";
-  version = "2.1.8";
+  version = "2.1.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "LedFx";
     repo = "LedFx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-le3SEGI9uis7wx9+SFpn0BJbpCybSecXEcxxAkC910U=";
+    hash = "sha256-h3bevsvgRILzAnQKSJj8X5AixB8qsyhf2+SkolSEdbk=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/li/libbraiding/package.nix b/pkgs/by-name/li/libbraiding/package.nix
index 0e4a596e0ec7..3cf9e7c0a39c 100644
--- a/pkgs/by-name/li/libbraiding/package.nix
+++ b/pkgs/by-name/li/libbraiding/package.nix
@@ -7,16 +7,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.3.1";
+  version = "1.3.2";
   pname = "libbraiding";
 
   src = fetchFromGitHub {
     owner = "miguelmarco";
     repo = "libbraiding";
-    # version 1.3.1 contains a typo in configure.ac, fixed in the next commit.
-    # TODO: remove if on upgrade
-    rev = if version == "1.3.1" then "b174832026c2412baec83277c461e4df71d8525c" else version;
-    hash = "sha256-ar/EiaMZuQRa1lr0sZPLRuk5K00j63TqNf0q0iuiKjw=";
+    rev = version;
+    hash = "sha256-Vo4nwzChjrI4PeNB+adPwDeL3gb++DEc4isX4/iDHMc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libffi_3_3/package.nix b/pkgs/by-name/li/libffi_3_3/package.nix
index fbf27320c26e..791799bc3337 100644
--- a/pkgs/by-name/li/libffi_3_3/package.nix
+++ b/pkgs/by-name/li/libffi_3_3/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
 
   doCheck ? true, # test suite depends on dejagnu which cannot be used during bootstrapping
   dejagnu,
@@ -16,7 +17,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-cvunkicD3fp6Ao1ROsFahcjVTI1n9V+lpIAohdxlIFY=";
   };
 
-  patches = [ ];
+  patches = [
+    # Backport gcc-15 fix:
+    #   https://github.com/libffi/libffi/pull/861
+    (fetchpatch {
+      name = "gcc-15.patch";
+      url = "https://github.com/libffi/libffi/commit/0859f8431242d5adff21420b9cab538d2af527b5.patch";
+      hash = "sha256-Py4ZAhVyXsfLxr4pnYAH7/lcsQOmpToFgvjQvLg9XVc=";
+    })
+  ];
 
   outputs = [
     "out"
diff --git a/pkgs/by-name/li/libglibutil/package.nix b/pkgs/by-name/li/libglibutil/package.nix
index 855776e6eca6..ac7b4c4f6561 100644
--- a/pkgs/by-name/li/libglibutil/package.nix
+++ b/pkgs/by-name/li/libglibutil/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libglibutil";
-  version = "1.0.81";
+  version = "1.0.82";
 
   src = fetchFromGitHub {
     owner = "sailfishos";
     repo = "libglibutil";
     rev = finalAttrs.version;
-    sha256 = "sha256-sDSdcsCkmsdD6yPEOi8rdURJRJ6LN69ZeiBfLZL2I68=";
+    sha256 = "sha256-etFvEqU3WeXkImRhXgEw0Pd2gZvuQK4Sy4pIIyuazqc=";
   };
 
   outputs = [
diff --git a/pkgs/development/libraries/libosmscout/default.nix b/pkgs/by-name/li/libosmscout/package.nix
similarity index 92%
rename from pkgs/development/libraries/libosmscout/default.nix
rename to pkgs/by-name/li/libosmscout/package.nix
index 7c850d962ff1..8fe0cb9fc900 100644
--- a/pkgs/development/libraries/libosmscout/default.nix
+++ b/pkgs/by-name/li/libosmscout/package.nix
@@ -5,10 +5,8 @@
   fetchpatch,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
   marisa,
-  qttools,
-  qtlocation,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation {
@@ -37,12 +35,12 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     marisa
-    qttools
-    qtlocation
+    libsForQt5.qttools
+    libsForQt5.qtlocation
   ];
 
   meta = {
diff --git a/pkgs/by-name/li/libqalculate/package.nix b/pkgs/by-name/li/libqalculate/package.nix
index 323bb2243bd4..d4618b54cecb 100644
--- a/pkgs/by-name/li/libqalculate/package.nix
+++ b/pkgs/by-name/li/libqalculate/package.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libqalculate";
-  version = "5.10.0";
+  version = "5.11.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "libqalculate";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-s5K0VPpfx0/3lGgEKJDFXdPelidpqVTNpsDolEAmKvM=";
+    hash = "sha256-lwA2faLYUb02FL9lOX+vuv/8pfKbkHWRlS1VnrV+sk4=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/li/librashader/package.nix b/pkgs/by-name/li/librashader/package.nix
index fad26c37245a..63e2932d0a14 100644
--- a/pkgs/by-name/li/librashader/package.nix
+++ b/pkgs/by-name/li/librashader/package.nix
@@ -8,20 +8,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "librashader";
-  version = "0.10.1";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "SnowflakePowered";
     repo = "librashader";
     tag = "librashader-v${finalAttrs.version}";
-    hash = "sha256-02ZWu5kllTmQsFqQFbT8ckzhWgWkjH5YsD6mf4j0ySg=";
+    hash = "sha256-ZkmaPv7cy2qj1I8hBiLBAIgbATS6Ooe/Y52cjKNYyCw=";
   };
 
   patches = [
     ./patches/fix-optional-dep-syntax.patch
   ];
 
-  cargoHash = "sha256-8F7Rl1sC3UW01HFGVp9nu83sUXrigB2URyOFSiQ6Fqs=";
+  cargoHash = "sha256-zEHvhjFGcZ9eFWfmJfrRpbjnHPqQhZ0G3OMHBWKQBzQ=";
 
   buildPhase = ''
     runHook preBuild
diff --git a/pkgs/by-name/li/libxfce4windowing/package.nix b/pkgs/by-name/li/libxfce4windowing/package.nix
index 755b4e07c9dc..d72e843ed4f5 100644
--- a/pkgs/by-name/li/libxfce4windowing/package.nix
+++ b/pkgs/by-name/li/libxfce4windowing/package.nix
@@ -28,7 +28,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libxfce4windowing";
-  version = "4.20.5";
+  version = "4.20.6";
 
   outputs = [
     "out"
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "xfce";
     repo = "libxfce4windowing";
     tag = "libxfce4windowing-${finalAttrs.version}";
-    hash = "sha256-TVu6S/Cip9IqniAvrTU5uSs7Dgm0WZNxjgB4vjHvBNU=";
+    hash = "sha256-lTOCvxUSo0CCok5nPCX7B6RqVoNMYcSb97alR+htBtY=";
   };
 
   patches = [
diff --git a/pkgs/by-name/ll/llmfit/package.nix b/pkgs/by-name/ll/llmfit/package.nix
index 4a55ce0216e4..6ecee84d2cb1 100644
--- a/pkgs/by-name/ll/llmfit/package.nix
+++ b/pkgs/by-name/ll/llmfit/package.nix
@@ -2,20 +2,23 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "llmfit";
-  version = "0.9.25";
+  version = "0.9.28";
 
   src = fetchFromGitHub {
     owner = "AlexsJones";
     repo = "llmfit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ijm2RkOF+B1E7dARxI3MsZz3l6OTQOUqBC+2mzZ7ruI=";
+    hash = "sha256-okTaIKaLw3BcBqBRe1Mz9V3tCaEStF32qxrcfggi33w=";
   };
 
-  cargoHash = "sha256-BdnsqqqnvnXQl6Q1L0tVHQyn7BatQVYfYF8mLRqZfqQ=";
+  cargoHash = "sha256-ty45oqyDcuUuiM1J41UreCqc0SbMz8U/V9ckE2FZv3c=";
+
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "TUI to find LLM models right sized for the system's RAM, CPU, and GPU";
diff --git a/pkgs/by-name/lo/lockbook-desktop/package.nix b/pkgs/by-name/lo/lockbook-desktop/package.nix
index e63092003efb..dbfcaa927b4b 100644
--- a/pkgs/by-name/lo/lockbook-desktop/package.nix
+++ b/pkgs/by-name/lo/lockbook-desktop/package.nix
@@ -18,16 +18,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lockbook-desktop";
-  version = "26.4.13";
+  version = "26.5.22";
 
   src = fetchFromGitHub {
     owner = "lockbook";
     repo = "lockbook";
     tag = finalAttrs.version;
-    hash = "sha256-KkYe07uEj/AO1rxsa4bwVsNO6iyjAFJwHeWAyMH8RPY=";
+    hash = "sha256-KqqiaM0txuZsylbr1+7faTdJINy1sNttT9n/YUpqyCc=";
   };
 
-  cargoHash = "sha256-/FLR2IXsxBEV9Z6GSJ0MTjIZjApNUN9J2ellKiKtL74=";
+  cargoHash = "sha256-d4yKch2c1w5gFBjyrYZQT/6lscRi3p05wKiJEIaXhjA=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/lo/lockbook/package.nix b/pkgs/by-name/lo/lockbook/package.nix
index 62f20bb4c598..a9e5bb46a7fb 100644
--- a/pkgs/by-name/lo/lockbook/package.nix
+++ b/pkgs/by-name/lo/lockbook/package.nix
@@ -12,16 +12,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lockbook";
-  version = "26.4.13";
+  version = "26.5.22";
 
   src = fetchFromGitHub {
     owner = "lockbook";
     repo = "lockbook";
     tag = finalAttrs.version;
-    hash = "sha256-KkYe07uEj/AO1rxsa4bwVsNO6iyjAFJwHeWAyMH8RPY=";
+    hash = "sha256-KqqiaM0txuZsylbr1+7faTdJINy1sNttT9n/YUpqyCc=";
   };
 
-  cargoHash = "sha256-/FLR2IXsxBEV9Z6GSJ0MTjIZjApNUN9J2ellKiKtL74=";
+  cargoHash = "sha256-d4yKch2c1w5gFBjyrYZQT/6lscRi3p05wKiJEIaXhjA=";
 
   doCheck = false; # there are no cli tests
   cargoBuildFlags = [
diff --git a/pkgs/by-name/lo/losslesscut/disable-update-check.patch b/pkgs/by-name/lo/losslesscut/disable-update-check.patch
new file mode 100644
index 000000000000..d75b9a582a47
--- /dev/null
+++ b/pkgs/by-name/lo/losslesscut/disable-update-check.patch
@@ -0,0 +1,102 @@
+diff --git i/src/common/types.ts w/src/common/types.ts
+index 1e6f8172..7e8e8b22 100644
+--- i/src/common/types.ts
++++ w/src/common/types.ts
+@@ -84,7 +84,6 @@ export interface Config {
+   captureFrameQuality: number,
+   captureFrameFileNameFormat: 'timestamp' | 'index',
+   enableNativeHevc: boolean,
+-  enableUpdateCheck: boolean,
+   cleanupChoices: {
+     trashTmpFiles: boolean, askForCleanup: boolean, closeFile: boolean, cleanupAfterExport?: boolean | undefined,
+   },
+diff --git i/src/main/configStore.ts w/src/main/configStore.ts
+index 3a80d2aa..b95546a9 100644
+--- i/src/main/configStore.ts
++++ w/src/main/configStore.ts
+@@ -154,7 +154,6 @@ const defaults: Config = {
+   captureFrameQuality: 0.95,
+   captureFrameFileNameFormat: 'timestamp',
+   enableNativeHevc: true,
+-  enableUpdateCheck: true,
+   cleanupChoices: {
+     trashTmpFiles: true, askForCleanup: true, closeFile: true, cleanupAfterExport: false,
+   },
+diff --git i/src/main/index.ts w/src/main/index.ts
+index 9144ddae..9b23f6ea 100644
+--- i/src/main/index.ts
++++ w/src/main/index.ts
+@@ -30,7 +30,6 @@ import HttpServer from './httpServer.js';
+ import isDev from './isDev.js';
+ import isStoreBuild from './isStoreBuild.js';
+ import { getAboutPanelOptions } from './aboutPanel.js';
+-import { checkNewVersion } from './updateChecker.js';
+ import * as i18nCommon from './i18nCommon.js';
+ import './i18n.js';
+ import type { ApiActionRequest } from '../common/types.js';
+@@ -371,14 +370,6 @@ async function init() {
+     createWindow();
+     // will also updateMenu and set about panel options
+     await changeLanguage(language);
+-
+-    const enableUpdateCheck = configStore.get('enableUpdateCheck');
+-
+-    if (!disableNetworking && enableUpdateCheck && !isStoreBuild) {
+-      newVersion = await checkNewVersion();
+-      // newVersion = '1.2.3';
+-      if (newVersion) updateMenu();
+-    }
+   } catch (err) {
+     logger.error('Failed to initialize', err);
+   }
+diff --git i/src/renderer/src/components/Settings.tsx w/src/renderer/src/components/Settings.tsx
+index b91b562e..36f779db 100644
+--- i/src/renderer/src/components/Settings.tsx
++++ w/src/renderer/src/components/Settings.tsx
+@@ -76,7 +76,7 @@ function Settings({
+ }) {
+   const { t } = useTranslation();
+ 
+-  const { customOutDir, changeOutDir, keyframeCut, toggleKeyframeCut, timecodeFormat, setTimecodeFormat, invertCutSegments, setInvertCutSegments, askBeforeClose, setAskBeforeClose, enableImportChapters, setEnableImportChapters, enableAskForFileOpenAction, setEnableAskForFileOpenAction, autoSaveProjectFile, setAutoSaveProjectFile, invertTimelineScroll, setInvertTimelineScroll, language, setLanguage, hideNotifications, setHideNotifications, hideOsNotifications, setHideOsNotifications, autoLoadTimecode, setAutoLoadTimecode, enableAutoHtml5ify, setEnableAutoHtml5ify, customFfPath, setCustomFfPath, storeProjectInWorkingDir, mouseWheelZoomModifierKey, setMouseWheelZoomModifierKey, mouseWheelFrameSeekModifierKey, setMouseWheelFrameSeekModifierKey, mouseWheelKeyframeSeekModifierKey, setMouseWheelKeyframeSeekModifierKey, segmentMouseModifierKey, setSegmentMouseModifierKey, captureFrameMethod, setCaptureFrameMethod, captureFrameQuality, setCaptureFrameQuality, captureFrameFileNameFormat, setCaptureFrameFileNameFormat, enableNativeHevc, setEnableNativeHevc, enableUpdateCheck, setEnableUpdateCheck, allowMultipleInstances, setAllowMultipleInstances, preferStrongColors, setPreferStrongColors, treatInputFileModifiedTimeAsStart, setTreatInputFileModifiedTimeAsStart, treatOutputFileModifiedTimeAsStart, setTreatOutputFileModifiedTimeAsStart, exportConfirmEnabled, toggleExportConfirmEnabled, storeWindowBounds, setStoreWindowBounds, reducedMotion, setReducedMotion } = useUserSettings();
++  const { customOutDir, changeOutDir, keyframeCut, toggleKeyframeCut, timecodeFormat, setTimecodeFormat, invertCutSegments, setInvertCutSegments, askBeforeClose, setAskBeforeClose, enableImportChapters, setEnableImportChapters, enableAskForFileOpenAction, setEnableAskForFileOpenAction, autoSaveProjectFile, setAutoSaveProjectFile, invertTimelineScroll, setInvertTimelineScroll, language, setLanguage, hideNotifications, setHideNotifications, hideOsNotifications, setHideOsNotifications, autoLoadTimecode, setAutoLoadTimecode, enableAutoHtml5ify, setEnableAutoHtml5ify, customFfPath, setCustomFfPath, storeProjectInWorkingDir, mouseWheelZoomModifierKey, setMouseWheelZoomModifierKey, mouseWheelFrameSeekModifierKey, setMouseWheelFrameSeekModifierKey, mouseWheelKeyframeSeekModifierKey, setMouseWheelKeyframeSeekModifierKey, segmentMouseModifierKey, setSegmentMouseModifierKey, captureFrameMethod, setCaptureFrameMethod, captureFrameQuality, setCaptureFrameQuality, captureFrameFileNameFormat, setCaptureFrameFileNameFormat, enableNativeHevc, setEnableNativeHevc, allowMultipleInstances, setAllowMultipleInstances, preferStrongColors, setPreferStrongColors, treatInputFileModifiedTimeAsStart, setTreatInputFileModifiedTimeAsStart, treatOutputFileModifiedTimeAsStart, setTreatOutputFileModifiedTimeAsStart, exportConfirmEnabled, toggleExportConfirmEnabled, storeWindowBounds, setStoreWindowBounds, reducedMotion, setReducedMotion } = useUserSettings();
+ 
+   const onLangChange = useCallback<ChangeEventHandler<HTMLSelectElement>>((e) => {
+     const { value } = e.target;
+@@ -204,7 +204,7 @@ function Settings({
+           <Row>
+             <KeyCell>{t('Check for updates on startup?')}</KeyCell>
+             <td>
+-              <Switch checked={enableUpdateCheck} onCheckedChange={setEnableUpdateCheck} />
++              (always disabled in nixpkgs build)
+             </td>
+           </Row>
+         )}
+diff --git i/src/renderer/src/hooks/useUserSettingsRoot.ts w/src/renderer/src/hooks/useUserSettingsRoot.ts
+index 4f8b8e0a..e67b1cd0 100644
+--- i/src/renderer/src/hooks/useUserSettingsRoot.ts
++++ w/src/renderer/src/hooks/useUserSettingsRoot.ts
+@@ -166,8 +166,6 @@ export default function useUserSettingsRoot() {
+   useEffect(() => safeSetConfig({ captureFrameFileNameFormat }), [captureFrameFileNameFormat]);
+   const [enableNativeHevc, setEnableNativeHevc] = useState(safeGetConfigInitial('enableNativeHevc'));
+   useEffect(() => safeSetConfig({ enableNativeHevc }), [enableNativeHevc]);
+-  const [enableUpdateCheck, setEnableUpdateCheck] = useState(safeGetConfigInitial('enableUpdateCheck'));
+-  useEffect(() => safeSetConfig({ enableUpdateCheck }), [enableUpdateCheck]);
+   const [cleanupChoices, setCleanupChoices] = useState(safeGetConfigInitial('cleanupChoices'));
+   useEffect(() => safeSetConfig({ cleanupChoices }), [cleanupChoices]);
+   const [allowMultipleInstances, setAllowMultipleInstances] = useState(safeGetConfigInitial('allowMultipleInstances'));
+@@ -280,7 +278,6 @@ export default function useUserSettingsRoot() {
+     captureFrameQuality,
+     captureFrameFileNameFormat,
+     enableNativeHevc,
+-    enableUpdateCheck,
+     cleanupChoices,
+     allowMultipleInstances,
+     darkMode,
+@@ -356,7 +353,6 @@ export default function useUserSettingsRoot() {
+     setCaptureFrameQuality,
+     setCaptureFrameFileNameFormat,
+     setEnableNativeHevc,
+-    setEnableUpdateCheck,
+     setCleanupChoices,
+     setAllowMultipleInstances,
+     toggleDarkMode,
diff --git a/pkgs/by-name/lo/losslesscut/missing-hashes.json b/pkgs/by-name/lo/losslesscut/missing-hashes.json
new file mode 100644
index 000000000000..8960a20054ee
--- /dev/null
+++ b/pkgs/by-name/lo/losslesscut/missing-hashes.json
@@ -0,0 +1,154 @@
+{
+  "@esbuild/aix-ppc64@npm:0.25.12": "b2cc7e0cd348bc315907f6ce090ee545d4157a19fc44327ff0262ba9296f0fad19c57dd679b1b526a0a18f34f1971b128e15b41bca794c74a9b2c32238fdd537",
+  "@esbuild/aix-ppc64@npm:0.27.2": "9c18cc2e4a03339a55013aac05b4a3fc4b77e75715dc252d034aa3d43b754abc053a7601b95e31249f4b6e69b68db2f5e6cb04b0ed619f825f2f70daff1a78d7",
+  "@esbuild/android-arm64@npm:0.25.12": "f770937988ec42e289277abc03800ccf88902684dbda3013a8ab274bb9eca36d35619a75f0f0510e225bdb4c7cf9a426218c7d2641a98fed74287a52d60d8865",
+  "@esbuild/android-arm64@npm:0.27.2": "a318fc9ffcdad7fda8bb521af8b17f73d93d9a94b4cca9301fbf72cf3f5a6e945edd589a47388de70f3e9582655dcf5b5bb928a11e306368fae4a9106d5143d2",
+  "@esbuild/android-arm@npm:0.25.12": "7a5d507aa717d85470c595e11f3c03fbf4f0bffdd10d30f49e1a3f14c2553191f156b214eacd6911fa36719faef23c28be7d88ac876ec300995987964ea16e99",
+  "@esbuild/android-arm@npm:0.27.2": "01114275e096b9177ad2496730087ee081d6e65a75bc087457b527c5baac5a8ccb362435f45232532bf6f97de95e1790dbce127d55abd5e4152c7214682bf4d3",
+  "@esbuild/android-x64@npm:0.25.12": "cd459b0433b0541bae9ffafd274c57529125719a5b78f4ee92aa9f8a1f54b002a18d889bee19084a503c114412269ef4e740d21b4a2de811ec2a076e96b35f48",
+  "@esbuild/android-x64@npm:0.27.2": "e92c5b6919081a14c8882f1167cf90b4e4bba745ad6e9a23428f85a1cd5e79dfa3f1d2fc943686b237e4cd09fac52ad3b3791deab6a0419ee10859284d3834aa",
+  "@esbuild/darwin-arm64@npm:0.25.12": "067f4588b9b64c93742c4a8cec35282dd076583006ce8089aae3095fcae5b606a2f60d86caf0527be6009be234178fb83d360af82698e2017a6f9fb9345e084d",
+  "@esbuild/darwin-arm64@npm:0.27.2": "5e99db5037167bad4a095fc445b94a2ce02357870ed58b79e13ae6bc09b5cb33d7e03f925492df940f9e0ad685a889f02beec1431d8fbf4c7ced55b2f48f5659",
+  "@esbuild/darwin-x64@npm:0.25.12": "c29947d07adacadcb29092860b69d1b668d9c5abfaf525e2a7f3ece61c3f4e72a95c1c66ad0e80fbf31d01210ae4e8330d4ae6d9c6c9ad2b8aa159eb115f9a8d",
+  "@esbuild/darwin-x64@npm:0.27.2": "87f2fbc4cf11724ef805b17cbdc7b0a9498332bc4b61d55e110ecc3b09bc488b88c0bd140ea48924e9c97a2063cf7e440fef13dd56e415c46799619d61086910",
+  "@esbuild/freebsd-arm64@npm:0.25.12": "c51691aeb04e41c554a59cbb5ab8d917446f352aeec70e3d5a7f25409e9115ff2db930589052df3e7d60f03eff4c298bda89db62f2408d1a49b6a70e69c5d4a0",
+  "@esbuild/freebsd-arm64@npm:0.27.2": "1ffa23243b913e377a5b09fd97ad9f089be3695aafdd893b60bb7f9be479256d8b7546f0bc96c4e61133fe7aeeaf95a8e941e82a65d99008ff82c99bdec85eee",
+  "@esbuild/freebsd-x64@npm:0.25.12": "9b84c48176350811690751c34d1513005290641923a161f96cb433cbcbb8c072ecb92cef39ba641f48032071f74c6119e5f081b5788242109426c54f3ef1a01e",
+  "@esbuild/freebsd-x64@npm:0.27.2": "44f744b289cf9e115b0adfac1905818d756dfced14213bf144d9016d96f67575ef2a55526f76e29ee775fcfec7274ba3a5e6833f35ed79a4592d3f5eac278267",
+  "@esbuild/linux-arm64@npm:0.25.12": "1e9cc29569890f5944e7dbe2e597eb19d76e85fe07aef6253129b16800ccb5b33a79cea17873d7debdf681d34adf77e06ae99742fe06cab095f3db441b741b1e",
+  "@esbuild/linux-arm64@npm:0.27.2": "2b037d74eaff4e9b5a6076760ede873320707636a3495939687cdd0c2c7150883111273bc0a8663fa305c42f439f4748b5ad7f15a1a1ea9fa7db575d9faf2d1b",
+  "@esbuild/linux-arm@npm:0.25.12": "fcf091d6a51834c9a942ee33b568342990c7fa29d2ff338ce628a41bc415696d09bca7ef502c2b04518973010f73ab3d13e37096030db9c8d393ab29408f104b",
+  "@esbuild/linux-arm@npm:0.27.2": "28cfc3a9ca11fc899649e7a706fb4b2ee57999bd92e86c23726b3ed0f832732411dd0aa3e2bcdb4105759f83bc4e5adc98dc195aaafce736c910db4e43694702",
+  "@esbuild/linux-ia32@npm:0.25.12": "ccd563c3189e5f651b479dd80d3bebd9d5c4747ce7448bb80266c804c3141eb3514b8c70445d77301899c54c1ff8c74614f8423704fde475a5c67efe86713235",
+  "@esbuild/linux-ia32@npm:0.27.2": "ac6cc92b9be2ec6d9d483c53fc973e6381765b784a2e1b71fa93ea0cf976344c2e3e0bfda0140b0829b3ec4304d9b886692b2891e68c17d2121066d06e67f0ac",
+  "@esbuild/linux-loong64@npm:0.25.12": "6df2710d99d84006ad8151a9ca26861dbb97524a15e61f56eb1a5a76786865ad03be838fe3d414a72b239262364964528f3136c2965b3c442c7ed85090b145c4",
+  "@esbuild/linux-loong64@npm:0.27.2": "625f5b6c2218a3acb2cff8f7f02a53ca89d13925f8932260ddad01595c6907beda4a79e4b767b1101f5971049f88d3ec6ab29cf565b4d61d9b0d7277e2cb578d",
+  "@esbuild/linux-mips64el@npm:0.25.12": "883bd8c4afd70b8e372db8a6bdb429d419ae30253a63987ff824994958d8431b6e51ead05e6372b2a233e025ea57f6f65b04ebaff8308e39acf54bfa73a5cae2",
+  "@esbuild/linux-mips64el@npm:0.27.2": "0c62692cb3a297b37212dfde52a861861843a716f6b3bdb73da49ba249a4c001b989ea61dc4540c430fac59ce2f8fc45035cdfac80172c5ddaf1b9df8471aecf",
+  "@esbuild/linux-ppc64@npm:0.25.12": "71f8544a3b99b4c95d49604b66d144e9617ae9925914c1bd5bc6731d15d4e48e7f8e9bffd85835e1c93a88c3537b53f3e99b500e4dd2533af9483055b02f9d38",
+  "@esbuild/linux-ppc64@npm:0.27.2": "b804d2dd0a6a85fe1c731828c725731a55ab120d2cc16941d560b2e9af5c2ec51586914ce26a84a326a9d46fa61eb8bb1f843953fe29ddd43b3f3099c491b5ff",
+  "@esbuild/linux-riscv64@npm:0.25.12": "fe8048262c5c6a040c047a9b7ab8547b0e7a32ce50f622ea8dadc3ec22065676efbc9b36896ca96959f77839757319633a2d05af5f2de7b32389a03b80f027f1",
+  "@esbuild/linux-riscv64@npm:0.27.2": "03e67e7207a83801363e3637f9a35fb6224ed4dc23bbf6eca41904fc42f5a6806e1e591666bf48dbf62eba97d41ff4355413b14dcb2339007b22c693374c49f6",
+  "@esbuild/linux-s390x@npm:0.25.12": "e5c023be1dfd75c915453763f944db8ab3da4f60a00c2b0e6f3b9349bc6c51e5ac5ce928db56e8f316e910213adf2172efd1b37abe070f6cda0c28583d770bab",
+  "@esbuild/linux-s390x@npm:0.27.2": "eb24b9c0a4a1492e4ff34a87933f6a3b348739c12f864b408144efdf949871c1fbb02a1cca741bfa11fd08aebe585d046fd3311b462ce4c795e3064ba3912469",
+  "@esbuild/linux-x64@npm:0.25.12": "8b2c7f5e00c40058f5c150df267cd303eae5907822f196902cd8e64af70475e800a7f132ac6388aa2b77b877d6314147e67f3fb67d97c867adccd54a2a6caaf6",
+  "@esbuild/linux-x64@npm:0.27.2": "ed1542f203329521fb1f308696c76ba59ed4a4616a24e21bf4820685362bba209d5c44c2f4e66c88dc7b7399df9ace625454d4829ee529d076ccaf61566e11cf",
+  "@esbuild/netbsd-arm64@npm:0.25.12": "19bc5a1295697aa8787929472323494302d117ea1e592f17cfae443525c1e5917a5f77e6582fc1ec9de3a11a9e296bc12749c6b12cde0aab10695b5c25f29f73",
+  "@esbuild/netbsd-arm64@npm:0.27.2": "576dd082047077b9cc41fbeffd728821a4f3b80969c1d2d6c274301122c6de2050f484fd4e946777527b8a15bd2a5ac54f85ca7ab95ea72b5345177e6a888687",
+  "@esbuild/netbsd-x64@npm:0.25.12": "8eb2ff51aa39b43a021e4b51411789b6299fd0dc38b3896719684333e32fd42ed4508ab67dcc88435631e5333573a4848dbfeec12569de46c2318dcdb39ad3ab",
+  "@esbuild/netbsd-x64@npm:0.27.2": "f8994af3e2ff3c9a91e874e58698b66e6f8d4e72dbc0aaf749b74a79420954146ed053359b0a4c213918582cee187d8a371737a33cfb93e624b4d091e5a6c240",
+  "@esbuild/openbsd-arm64@npm:0.25.12": "5ff26a012d0d35673bc3800d28f284a62c310801a68c55b2d1ed8a7e09ef7568117fb8ab2d7ec7a6e7d73ce6a9e05150ee07335fc6447ba98658469b9da1cb2e",
+  "@esbuild/openbsd-arm64@npm:0.27.2": "f710da24beeb747ef3a11b9d99085a14f5c929f942fd9d9a05b7806d5ff1b85631bfa506eb7a6aed9fd01ec99bf91f24736f9f0e0eb6b7c0019fe0dddd2e615c",
+  "@esbuild/openbsd-x64@npm:0.25.12": "41dce65493548bc0dc411a6175e9fb109a93bbbf370ef444d1459698226ad2a3096ab7edd420c27eb3d15e6bbd0bc79357bd7c0a59c5527ace0fefac181638f8",
+  "@esbuild/openbsd-x64@npm:0.27.2": "62670fbe1f609c5362df7b45968ded512a0860e2ad8a4715a89993abfa2f9f08a28f1294c7857d80e6d3f713639a71d291c06a961b331de67ad350032d1b8e96",
+  "@esbuild/openharmony-arm64@npm:0.25.12": "b3e0502067e760e5b92d3180e20372cbb2dba8267fbb56206d50bdeccd8895feb408020b98c3f17054eea0f1fba365385850cb91d1f79a25dfa3751032278825",
+  "@esbuild/openharmony-arm64@npm:0.27.2": "e279efdc18301add96ea791ba9ef117cae05346688cd521fd225a60ad166add4bc995af985058e3b6ab9e65a7c49a79108a294d6aa26a1d1685ad0db194e2c56",
+  "@esbuild/sunos-x64@npm:0.25.12": "50ed9767e00ff74a1d98d94c5fe6027bc5e9e095a64735d1d0676ec72adc4b15b0095e97f5ac71602f2c5fcdcf3e9f6cfe005315e998d9d3e12ca93a2076b639",
+  "@esbuild/sunos-x64@npm:0.27.2": "7234302321d36576b5a9f027915417cddc195a67b19cdfb50e69c337ee0dd63a88be6b72d7ef299cd569d1af62e54774303d52d3d6b5e5858db975241ae467d6",
+  "@esbuild/win32-arm64@npm:0.25.12": "4969d20da28a0c783ada6116724f51a542fad81dab043c4f6f9b7c8f4a68be558f03beb29d75bd550ab6e63f720535ebacb9ce1760099be7a63d4e1ec8351e2b",
+  "@esbuild/win32-arm64@npm:0.27.2": "36620fddf79da3e8e527ef8331436929fa7a0b23c9b591af8f8573d80ed9c4ef45b24c6fa0abbb01d187dec497efa6c9d9d397d575afc1f28477e9ca16a48d73",
+  "@esbuild/win32-ia32@npm:0.25.12": "60ce7d21c5e01c8b0c8c2c4660ff6d890a32b1acf09f5499f950a86bc5c6da17eee760c6bb7a720a0429f7633bbb38b2db517e444408d8a6ff6fc76157310980",
+  "@esbuild/win32-ia32@npm:0.27.2": "96e8c1fa0ec2b5529ead2ba703e5da7644c138b2f9b6e285c05513f0455e99b2b0dcf399f01779fb384e22810e82f892491e44402772c62d3fe094b025bbdc0f",
+  "@esbuild/win32-x64@npm:0.25.12": "bbdc69d57d85a6b8af85731c0979186aba54eb34c8d1de5eab4aa1d8fd45e3b38b5426c287cedf43228bb0794a741d9b2c55284c7db7d79335bc33dc389e7bb3",
+  "@esbuild/win32-x64@npm:0.27.2": "1ed08bebd916c16003f3784276ae683ab41d34951a0c272f6e072b8067a2b4bacd6f6f75a8dcea375b8545e15891d305425cf7c8dd31f7deab56ef22cde4a1e2",
+  "@img/sharp-darwin-arm64@npm:0.33.5": "021e77a84b2239142d82c462babf4c0b39c9ae6b6fcd10cd3e86264c48ed8d0f2e5c22e3c8427440045a9b09e21e9ddce26218a5b7148be8fa996ac5328faf06",
+  "@img/sharp-darwin-arm64@npm:0.34.5": "0f872f02a49c87c1c844c9715a1c1e4449fab30c85711d948767d41ea1eba1cc7be8268b582d95513e66cff090ab520e4104dcf30cc6f598ee429b40e890eeec",
+  "@img/sharp-darwin-x64@npm:0.33.5": "3742294f45d94742402b8d5c268f336ed0fe2c280552711e727a258e076ad2a6ee0cfb8af235654c45c288f26a8d6b94a77c00fb36c2b5079f749ddc4896f1a2",
+  "@img/sharp-darwin-x64@npm:0.34.5": "a9c0b03ad1d1c3ce549770e0655a6ad87a6e80633d65f9a009a2e19d1f5fe7b79c3ec946412f16ce302db3dfe759a35007e60e1f7042cb3e2291b49ba8d58a6a",
+  "@img/sharp-libvips-darwin-arm64@npm:1.0.4": "370561095765f56fc9b7114de22fda777bfa484c8d8643220ad39c46796ae8b389587bcaaabbc956f2ba7cc27a62ce0aeaeeba75980b6809f79205e77706ebc5",
+  "@img/sharp-libvips-darwin-arm64@npm:1.2.4": "5076747c32a07caaf86e026f84a07378bd34eec6a6bc8843e5c09fc99e22f89e383d88824c0f527070efc33fb04569fa3f867038138faf8d76af1e4ecc0fc962",
+  "@img/sharp-libvips-darwin-x64@npm:1.0.4": "cf664e6eaef5eb1355a227b629ce977ed710125652197c20d18b30db70b62fb750fc40ef08e6e4890ba22ea2ac7aa6406b05c79333d34ff0d1dc892601876680",
+  "@img/sharp-libvips-darwin-x64@npm:1.2.4": "607213511370a700fda3ece08eb0a061a09483b595b75ce5e115c9d95efb6793d1e8e90d79873a9f526378f06f5fe5f3a8f0006cf76f7c7907985c8d4539f376",
+  "@img/sharp-libvips-linux-arm64@npm:1.0.4": "b1279af75dff01d94a573a4a2d79c5d54d9daaa9b581dc1af6e416647b66bd74c8ad35fd87862085c0e02fdde7951da3dbe7da2d80f1b43c0f217386e4816789",
+  "@img/sharp-libvips-linux-arm64@npm:1.2.4": "e078ef44f936609cb2b5fc01433e6c8f3babd5ab69fcc5f006504eb4664efa791438ea61e44c8f236eef55ba6ddb7bc41dc9b8b264fe689ff35fac428ce356a0",
+  "@img/sharp-libvips-linux-arm@npm:1.0.5": "a9b4ad7285240b6717ad50975a1f95d58dc4a8575e56b9a3c53e6d92f45c4d9a550a01ba08de8c8465805cb7db0ffe4019ebff0e7d6160ed72f60f46680fc987",
+  "@img/sharp-libvips-linux-arm@npm:1.2.4": "493a3d34f9ec5a2aa71cada3c2b0cc2428659cc2aaaf4d7b7f6065648da560cb62e1febd4d49fc48f814787dc431a2c7e94992a2e2334dc409b73ec658cd0c43",
+  "@img/sharp-libvips-linux-ppc64@npm:1.2.4": "d746268a804ff66f363823840ea84a91c2c24e0f28438812c66f659b29305efee2219f1bfd7569944e02b0783044c275000c13b4180c4b07af3786bd1991567c",
+  "@img/sharp-libvips-linux-riscv64@npm:1.2.4": "3bfb408d0e333593247aff9cbbcafa8bace4714a54a742d3b18a73dc506a1176c56fed63cc682c34ac27704e207e6a53a1c9c955395abcc4ef8af8ca12b4e09b",
+  "@img/sharp-libvips-linux-s390x@npm:1.0.4": "eb8d337e1d3fe45d3fd9d1df168f04692a1175f288d7fe81312c3d96fe09c5d16b25b757714296d392a35e22297874cad24d831529bc7ac8a1f75e8b98ded0f5",
+  "@img/sharp-libvips-linux-s390x@npm:1.2.4": "79cd9764df0e845779cbc80ebf8eb0571080bce69d935fa8cd9a28a3aa5c4601c0e762ac83b6b8df0050ab54048098f692087265f64b16efc61de0818c2eea1b",
+  "@img/sharp-libvips-linux-x64@npm:1.0.4": "0fc5c2a5b5651e2f72b909edf0cbb9f85ac398878b9f197c534b3d954c016e074adf20e6bb9e0b6636864569d4d8b04baad7c30790ee5764967707a192535d20",
+  "@img/sharp-libvips-linux-x64@npm:1.2.4": "da642063f7a8f7e2c26e0b5734c1a39e7f4ca0d4521d9c6c65d81112146c4ecb846e73602fa145cf2106cd8f426d84010bb3f0baf4a9cf41db1b7deb3b47f353",
+  "@img/sharp-libvips-linuxmusl-arm64@npm:1.0.4": "56f07b51656a293547973cd99f56d2bebb8034e2a8b129fba105ebbb33ccdaf4eea94f342edc20841d355ce2aac4c5f13ae349afdcb53c8a9ae09bf2e3312884",
+  "@img/sharp-libvips-linuxmusl-arm64@npm:1.2.4": "e0ca7280827d433d10655ea1491543be98994e75a7b33b158faa7b4f6c866462d2abed253378b2534b9fab351a0961f23baaf16b4e7441131df0e3d47068507c",
+  "@img/sharp-libvips-linuxmusl-x64@npm:1.0.4": "d6447348de2653aa14ebe21bec21cc7f97e00062d07aae02a5a6b6137e90198b5a951837c97f73318694bf7325825ba4ca20f226bca378332955ea19e63262d5",
+  "@img/sharp-libvips-linuxmusl-x64@npm:1.2.4": "876e3bde360cc6966bc3a703dd316f570b031085722c9c8bf27bb31050e30c8a10ef4a8fe2e66fefa0f4482db62044c47a1df25874c6330467e12a6983bb32d2",
+  "@img/sharp-linux-arm64@npm:0.33.5": "03d77e1f4e85fe34a0e4262fb0a0d9db6fc34f889f2e20ca69b809c94db487f8d6c02aea410b12ee4b79da5dcc717f94ce4fabfbb7838e6d99597dc206ccd0a2",
+  "@img/sharp-linux-arm64@npm:0.34.5": "933c217e432ae7280bee1ef2bc0b5f3225b5ff3cfed19c25607ed7ed909b16cfa4a59c14089dd020e9b789ffd544df09e9b471281a049c926cd337509fa35241",
+  "@img/sharp-linux-arm@npm:0.33.5": "8b33046a907d89026514515c69aa58e40b42defceddba4b1fd452bf62f34e9d2acd7c53661c014b966120ba94d25bac9d694642373f79de187cad9f90c71398b",
+  "@img/sharp-linux-arm@npm:0.34.5": "c20e85339d0e4e2116094293d9c1171407faa7a7b60d579cdc4af06d7b2ad4ff4976374593a2e525a08df4fc9df0dd9e80822a38764f07bc8d63e8d988ffa165",
+  "@img/sharp-linux-ppc64@npm:0.34.5": "8ded427067577bdd686534a0db30833d43b0c232c17d232d6608f0635f364241a6078ccdbbf54f5a48b773c95a05906a5ba20cc589c86959eb0e6329902c7cb4",
+  "@img/sharp-linux-riscv64@npm:0.34.5": "764ff0baa4275a4fd9376012893ca64b6cde601a208be216d38e2c6db3977d6f3e91e12342c7cb1cd3038b7108f8778bcfba85afaf097689907a4b932e79dc7a",
+  "@img/sharp-linux-s390x@npm:0.33.5": "d8597a3e1690959e51de0bfdfc3b21148dec6428e213eeaeb5515246ca0ee5b798ba1bf84168a0586549ac4732ffc8bbaa8ffdfad2565f8fdbb7cce97f0c51ca",
+  "@img/sharp-linux-s390x@npm:0.34.5": "a4e7cae17ebf95dd53e9dd845ae3e73c783f6c7da4a5aeddf7922dda09822c55327e892d2c8888dba097e666b97254b04df3cca99aeb9eb9fc57d73b20cc6b86",
+  "@img/sharp-linux-x64@npm:0.33.5": "822b4c2f84755ba4bc9ddf309c09bab73e7d14efda964b13ff765027e745448770f35333c9912492e724ae050e9d39d5436856a2d651aec435927b213bf2c14c",
+  "@img/sharp-linux-x64@npm:0.34.5": "2f4fc06e1d3544bf41296f2776b531d5aa0ab618e129cd928514a803e4a01202b8453c0321f7999619033c687571a7f50da454ff5ca04d41f31a7796a38e9a8b",
+  "@img/sharp-linuxmusl-arm64@npm:0.33.5": "cac8f10f634d9b0432389b35e47b30770a7b3f18c001bd47ca6b46e3ee80d1107a1525f8869b3d0657d4469fa1fc93b3464c0a7cbc70a48ab1317216e7ec8d20",
+  "@img/sharp-linuxmusl-arm64@npm:0.34.5": "2bd993173f42ab72df423f968b28cbd037e82f78cd469c3b6a7f4317e164f41f04cb9b106e35337e392a1fc4848aece67f0a765b346691133d7ad71146ef97ea",
+  "@img/sharp-linuxmusl-x64@npm:0.33.5": "17060fe2130b2a1f66ad57c31cc55b5321dc6fe2616980631f6f69a7cc841d408caa991aeb4f3aebf436a1824f6a675449dceb50b5441fe15b4aadb7e2b91b8b",
+  "@img/sharp-linuxmusl-x64@npm:0.34.5": "00a5c641a144ad177d3ece569da6c05d891ab6a5c6e0f0f7ef4f74ab132c72f20b07927e5ae9c9afe090d44cf36be2170b4dc1831d0976533c693091995bb486",
+  "@img/sharp-wasm32@npm:0.33.5": "90cf7629aaec6a32f33523a48c784cff3c8981c14607f3b750db82059571962a68b862efac59c87758ed3d35c8a82790cef731c6cc2ac7fae4bd92df17e67cd2",
+  "@img/sharp-wasm32@npm:0.34.5": "7c1ed71bd821c1ddb2aac32f128d4b173af97a33274f9e386c49ccedc31bd273ae0bf564626f068a61c8bb0de1f84a4b9211c7fd79a62d8170479a1887bc935c",
+  "@img/sharp-win32-arm64@npm:0.34.5": "07146b037ae4cdc7592b983bcee7b1c0199fa0fe14f9e3430a8ec6c46c056ba9bca0ee89d18e1aac4f43331dcaf464fe82bebf34e08d5bd1541ebd2d6345e518",
+  "@img/sharp-win32-ia32@npm:0.33.5": "fed0090aa909b8f20bf8bffba3f23c3c64b11ce9d765661b9a1e7f073c39662e26d85c65355fc41dc7c645c4f12f126d597c5f897a934d248c75e058f2db9a4d",
+  "@img/sharp-win32-ia32@npm:0.34.5": "d5887234959a32c9072043e8f14589ceec867f9fb0b440a5849750c2f0e79614962f566c44763ce560c52cd1e0d086ffac6299f91711477f1316d83f8b2151c1",
+  "@img/sharp-win32-x64@npm:0.33.5": "6355e896790b1a97628884e7aca731edab9cb17faa58084d6dccdabfd1d7030eaed9dce337fa7dc0db1a6f72cda23405da666ebb623fe646be501c46dc4a6237",
+  "@img/sharp-win32-x64@npm:0.34.5": "e10ab4421a46eecab0af903761679f27f91dde01ed4d533af4d77101d17e4f16b28628e91bbbcae63ec051606103f3cde21fd5055330130217277cb13242e7af",
+  "@parcel/watcher-android-arm64@npm:2.5.1": "e9c94ede3bd5c5d999d117d22ac8032a17f8ebc72db3eff04ccb2b4e6718db19f24bf29a66a610e03f4ee95e2cd7b2d30c15b1845eb897b971fec75dbdd76141",
+  "@parcel/watcher-darwin-arm64@npm:2.5.1": "0cab55a55c128ac5742388fc8dbfeb9877018509943801ce8a52b57bb6dca24189d025d38684b1e482cb7816368a52c6434dfe45d3997e2fd2509276f48774ea",
+  "@parcel/watcher-darwin-x64@npm:2.5.1": "bf07b8ca9a435fb885fb0ca6565204d2f2098d7f632faf26a6478bb39f538c73b50afca17c193dc189a80a864d85e40f924ec7f21a0e7ad7d0de6f97f7154134",
+  "@parcel/watcher-freebsd-x64@npm:2.5.1": "9f62b9da08e98bffb7cf91b557af209586e1d7dd654c56c5a58fc4b0bb61a9bb318116ed0048416d3341d3434b1fb3089bf6cfbfcd08e61333917bc59e691c1d",
+  "@parcel/watcher-linux-arm-glibc@npm:2.5.1": "07a55a0050e913c9781d009a05b3a0a49c77c2679ae9f98b2374a7e17c5401e2076a776c7bec88de58c71fef040c89aa97176dfa28a03abf8754e18e8d1109b4",
+  "@parcel/watcher-linux-arm-musl@npm:2.5.1": "f9cab0efa652276fb4bcb58845c9606f7aead1ec81f7c4ce2d237eec754bbd3101682c735b6a371dccf93f16fcfe0ea1beef5d43eb39e4505df7f29b73ea0004",
+  "@parcel/watcher-linux-arm64-glibc@npm:2.5.1": "ce22f303187aa03fa9d1f9609d2cd56cce6b62f0a60f14a65449adc25b7072d06118d956eb7ebb548210cf2d120cf5e987abe34e6515a5bfbd35b15643f40142",
+  "@parcel/watcher-linux-arm64-musl@npm:2.5.1": "7a0b32b7b784fe3e594452b6642adc3bb4ad78eae526f5e4c7cf061f428eef2e05e827334806cd230bc873903abb1f70886716a0353e653b3b784f09d2237956",
+  "@parcel/watcher-linux-x64-glibc@npm:2.5.1": "a6241bb57c409ab56ef944e8d64e057817f41a9335047d1e252aab4e4b10f64d8bc2620ae5c761b71551f3c4b494edd687a08c274a46ca2eb84ad34f6f4de9c0",
+  "@parcel/watcher-linux-x64-musl@npm:2.5.1": "a68cfcd10a50906ab228d7b906eced68faf6a42a29da5506d24d0dd91b9593a61605b91749d9b1e3ed9f257b845f48ba3df62572e40b4ff1f724d879865b225a",
+  "@parcel/watcher-win32-arm64@npm:2.5.1": "0f467a731cf9403b8bc7d35418d991596cf5e7898029796b4c769bcbb38cd07ae6ec05ef0f19298e5f11e73ec5198bc474d79b056bdfbaea513525725103d7dd",
+  "@parcel/watcher-win32-ia32@npm:2.5.1": "9ab5f3e9849a6077c8c2aba7bdf9030dea38f0ab9180792ecd30094520cddf16f3b68006f666845b86c5ef0e05c648364475c9ba151e0269561891ca3e276667",
+  "@parcel/watcher-win32-x64@npm:2.5.1": "e588d87d5b892484d252ac8e1ec3f4bf7a664d91f0d03dd93764be8db2c35f81879275908dcbec42b0e43bc99c7afdfd29fe687ec022bb2c8c4bc7edd29eaa15",
+  "@rollup/rollup-android-arm-eabi@npm:4.54.0": "decffa63d62dd35bdb26d8d0b1a74335b4202bc987203d5479a1a5b9db6920ddf4509a6fc1b13acaf9ecb72bb6ae9dd4546c52eef15b6306782ee639e553a345",
+  "@rollup/rollup-android-arm64@npm:4.54.0": "7031d838022e6b7a29d7e7f9dd1246f02630860bb2befd12e82710f93563c394b6c975630124659e1468231bccea4bb64f10f113391ef6e48eed9ac639e03d42",
+  "@rollup/rollup-darwin-arm64@npm:4.54.0": "9084277827c93f26e24fb9e47102364c9c0b42ec995124d4b7247c0369e45e55fc59af9721cd1c43eece57e0be4d2477cc108ae815e7711f8c5b8c516b0fbfd1",
+  "@rollup/rollup-darwin-x64@npm:4.54.0": "fb5a1f2f2e1a741cf15704c30a8a6eea8a8fe6c1b660f727046f2144e8976451f228761a53a5da64e65c20f5d20a70e3c0ceb40375383ec39bdc8ad2e38afc9d",
+  "@rollup/rollup-freebsd-arm64@npm:4.54.0": "972694e21dc228bada7966e6b5725f432cd6110067fe8267e0b5c927c4c2b465d071fac5b470084d76140b79a6d6727ec75eda66a3741869d585c4d8dd9e4a96",
+  "@rollup/rollup-freebsd-x64@npm:4.54.0": "93ee0dabcab1a48b0be3ced6ad06bc3005a351ab9630a46610d3127d36ca1a62896b8a507e565e54c9eee0ac4c462e74fe723b180b81bd7e8f5097c7eb00a69a",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.54.0": "ac6795d6964fb63520608133b23e316041f30d96b2ab942761da6b403c113776b624bbe3b505ecc9a1d4c5867939fb1a73b63ff2790fd5b30ae4cc9784f5741d",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.54.0": "92192958aa6eb42e0bec35de1951909be38551cddb205ac3f374d679e5881e621a68cc2f918b66d2c3aec911f2515a7fb990dc29c1b4fadfe7bdb5b471d43f0b",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.54.0": "71f11e6784898d6dbb838d4627361294557d176365bdfa203e614ddbb426a82c1b5fc421a963c32bd0e21466cfc029a853da1300934af64c7603d9ebf8225b51",
+  "@rollup/rollup-linux-arm64-musl@npm:4.54.0": "731ee5b23b73a45f81e73fd282961ad729f0967d2ff8c7b91f215e7cda89c77572419a63cf4bb200b161e0a4943eab66f29d9da13fa447dbf884cc7803839ee1",
+  "@rollup/rollup-linux-loong64-gnu@npm:4.54.0": "f94d4ac7df23b13e8a06e1ef35397c270ccf51e8b076ef0b83642c035f3ce4f07a9e2bbc27d21f7317f95426f08f89a95ca2c68d54cc34f5ae4fbac574def324",
+  "@rollup/rollup-linux-ppc64-gnu@npm:4.54.0": "5fe4f115fa1b2c8c6f5003edbc2daef0d5088d61f8035920729989aae38ad2dc9b13f544eb6d0c584428d277dbabe0cc4a870c0f5e9e5ed4dc4ceeae5c5cc947",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.54.0": "3a42d799a0996b9b38c0ae806f516fa27fc30ff620794bf460e5879e7a1b4b2f1545a6dda7e5c6dc773998763382cdeb1ac2123742f280abf16ff031c01b84cd",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.54.0": "9e1ff8459d09f7aab892aa3a45b88098336ef9cfb9d80f1f564f648400dace91a345378237e7c0139f87a425ffc367fcc7c8f1c7120c85e44664c1ab43fca5e5",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.54.0": "cf69118bb9551d614494089a58600299abb9cac927d7e4d510c216f6df962f792a8abec1526cbd7cb1ae2e054030f049f123270cf16a68668833fa99a623a1a0",
+  "@rollup/rollup-linux-x64-gnu@npm:4.54.0": "ff40bd306fd3f8589468c31ea9a391c50832971567fbd3c2f932754500dee7380276a98e5c370143aad5e9a8e491d070e523449931b0bd882d574fbd0faf22fc",
+  "@rollup/rollup-linux-x64-musl@npm:4.54.0": "c9e24edc69d66afa58e852ad0e0890b15153ecda9a2ee230e8d2b16688fe8050541aba85474d1522f064765784efea4c56d4094673a7797d1495eca651452815",
+  "@rollup/rollup-openharmony-arm64@npm:4.54.0": "5aa3df94a66f1887311c3a8b7710ae51c54b4191954870a931b5e4eed246ca4d2513378770c9e120b726df6a4e165526aa45cce57a35f1208f42e31abafff38a",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.54.0": "4f161b3f02835ac5aa5d23312403552aa335f69f3a9f2ff8cf476a702d330aa815fe23c1745c2cd7a8516fb31bd0058df650f1eb6246b0bc4a1315afc1d45c02",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.54.0": "ebfdb21a07447bddd64a4e06947b5a747a796f888ae9ac13019f58cc943f72ab10c6d87e7bbe6bb5135b71392c757a4c0daeb034af8f0a4be33659d4a7cee92c",
+  "@rollup/rollup-win32-x64-gnu@npm:4.54.0": "bac45fe931be6474e52eaa7cb0ad249fb16deac4bb84eed0f1da40e4071cd176f689235b79f343a50e8fe6312bffe0d4328900f1a5fb0b20b4601da4779f05df",
+  "@rollup/rollup-win32-x64-msvc@npm:4.54.0": "fb67bac7c9a08fc9802b6bea292ac352a32ed66c30459b838599d704ba49b506a1f20c65acd81629867c922eaca33211730a79dd7627bee903e3f142cffce9bc",
+  "@swc/core-darwin-arm64@npm:1.15.4": "55f4601bf5c1ab2b6aadbd6cbb41e42a68f2bf5d2416f31134060f19f921883678b1dd10612a01e49ff748f79da6791d2fbb41f3c8ed16c516556ad363310844",
+  "@swc/core-darwin-arm64@npm:1.15.8": "4458d26f6682bdbf88565d548a04f6e8ed81ea05691204703a511adf4d4ef1889883da727349b5e492b2e53a4f2969fd06ea34f84e32cc5a963ac25194d6caa1",
+  "@swc/core-darwin-x64@npm:1.15.4": "2c57b7bb5c250458ee2d6e7ff43b5c4ea541347a1ad900044a22c9a328a6cb771e1e41715d1d07c683cd3f7dc007622d05725793fce2b53b70fbbc87727c89e9",
+  "@swc/core-darwin-x64@npm:1.15.8": "4075f73359b4cda8d7bcc68a636fbff60db3dea0ef4813b7e1a5ebdaa2c1197b4f888f7565a411f77ee5e8fe2398e3f1c27dfe06b2b087e7004009aeefac2019",
+  "@swc/core-linux-arm-gnueabihf@npm:1.15.4": "cde521b23e53ab61d9dff41f4d36d210affaeda2b362726fb09f4f5b52c8d62c28f16b64d8d7a0b67dd9a7fc5858b0ae43c0b2ad3e92f8f3d53fcfbea826d1ea",
+  "@swc/core-linux-arm-gnueabihf@npm:1.15.8": "6b82976fd35007ac7be41a7d8529dbb0c93bfa858e532c6a8d3fd899c41ecc9976fa40746f6005cd48d82340fcdf0a426296bef248ac7b77334c3744141fa823",
+  "@swc/core-linux-arm64-gnu@npm:1.15.4": "cf582a0c8b20688afc37801b08b1e062f394feb89561d5f0400cbdc01184828c06581d9e996685601fdffe149f57a55d43f55d034893a7fac3842d654d431463",
+  "@swc/core-linux-arm64-gnu@npm:1.15.8": "ed3a8f363bc589886d44db58dabe6d53ce23d2cb8fe93a80fd05dd1ff46ebf438d2f1d38cf4144f4d5b89504dc73d15bd84540ac23b20d4aeb4f463de99c416a",
+  "@swc/core-linux-arm64-musl@npm:1.15.4": "bcbf617fdcd8cb9d3bd74f459a3bac3ec81ab8f0ece3f3a539bf660b953e55faf3e291d7bd7a2b1f8950b630856e1fef41a3c8210f2950865f999ecbb2fd16a9",
+  "@swc/core-linux-arm64-musl@npm:1.15.8": "b063f086e3e92f622fd8fb1585bf0cf0b49eb910361844a4bdb0d0165fdb906fe53051cfbcd92ccfcbfb13ae6c0d85f2c12e373a01df5a4136b513ae94d7f626",
+  "@swc/core-linux-x64-gnu@npm:1.15.4": "0bd748a2e119e34f4934d2c3423f6471b85ced20383f0ba567f53cceda0f3681423c2cbf7dbcf7148e57b181224174856a5fe677e294ec2ac1188387152ffc58",
+  "@swc/core-linux-x64-gnu@npm:1.15.8": "7028720f8aa475896f0468dcd77cc2512362082357e4e89d6e31ec559c87d25f0f9d7fc1702d59766217ea4ee7cfc0d1de817fde56958537f8f3ed9259673b55",
+  "@swc/core-linux-x64-musl@npm:1.15.4": "8a9a3f1f4109a4747335f24853ee54c55e029819aa23ea8a0297073ee363e5cc8f63c4a5938bee4753f4fd4290b8903e3b37026465c3fc473bc13449893c28ba",
+  "@swc/core-linux-x64-musl@npm:1.15.8": "be913db41e70ae8b9553a759f7a9cc80e50c4f521f058672471a182938c3789605c2122c77c32579d2b739ba4f91fa7e8beb8be31f87858e9b52e199c6644e0c",
+  "@swc/core-win32-arm64-msvc@npm:1.15.4": "ecf64654b4c9f0cce6644976c70dc8ef35ac60b8386eb63b50d36bb64c09d6d003b26c6bef8b4cc2a262eb76877ff2b378f630746d731a8f0f3473c9b38e8059",
+  "@swc/core-win32-arm64-msvc@npm:1.15.8": "7047d7250e10577921b9250985c8e4408767fca73963b594f1e747f64e77eb5e2a4d2067a58debca9d33b2fd69385fd56410d5dca0e15bb6957aec9475909809",
+  "@swc/core-win32-ia32-msvc@npm:1.15.4": "872338382531493403bc1ef57c8b9c390b5017ec875525e0d29aecf6cad342c7113571529ffc7f37fa3b23e691bba421444f472221e91b716353fcd5e8e8b000",
+  "@swc/core-win32-ia32-msvc@npm:1.15.8": "4992c3c2fe8fc0dd870319080b806e965278a07d23d0463b16b2c95d0299c0b2e03a1b7bb84c7da41002556b8a71f86b721037e743648321c2186d68bd2b4e32",
+  "@swc/core-win32-x64-msvc@npm:1.15.4": "4cb21d5da230c820fe759fac1bb3cfa33bb9ab29eafe5951fc3f31c65e26d895f6085b660c2649747ca81e37c3abeff4de016e23479723a5d1e57c5dfca743fc",
+  "@swc/core-win32-x64-msvc@npm:1.15.8": "4faf5a9cbbe7e7afc038aa26ec658e41614c06116265be1a938e91839b027e1a847a0a767d9821165693f84fb98700032ad92830fee875164b672ac2024a035f",
+  "dmg-license@npm:1.0.11": "36c0a7b030801b91216affa9b2bb00caa345b2327f298accb2263a80a0320ca305f90b99da68007d187c830c543410d58a0a2bbc229e8d169b0e1d1652ff42aa",
+  "iconv-corefoundation@npm:1.1.7": "0189733ef51a9f481379202cb1919f2677efc44aa014ba662a6fd99e47993e350eab0ff724ed18cda8011c9b78c4702b2d374f732955f1def3fd2a14a29d25c0"
+}
diff --git a/pkgs/by-name/lo/losslesscut/package.nix b/pkgs/by-name/lo/losslesscut/package.nix
new file mode 100644
index 000000000000..f5f0e59e673f
--- /dev/null
+++ b/pkgs/by-name/lo/losslesscut/package.nix
@@ -0,0 +1,186 @@
+{
+  lib,
+  fetchFromGitHub,
+  stdenv,
+  yarn-berry_4,
+  nodejs_24,
+  electron_39,
+  makeWrapper,
+  ffmpeg-headless,
+  copyDesktopItems,
+  makeDesktopItem,
+  imagemagick,
+  nix-update-script,
+}:
+let
+  yarn-berry = yarn-berry_4;
+  nodejs = nodejs_24;
+  electron = electron_39;
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "losslesscut";
+  version = "3.68.0";
+
+  src = fetchFromGitHub {
+    owner = "mifi";
+    repo = "lossless-cut";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-LNh9F2aKxVegZTAPuEAqo2f78ynGMgnpwnDXEP1u2+M=";
+  };
+
+  patches = [
+    # fixes a few things that try to guess whether it's a dev build
+    ./undev.patch
+    ./yarn-4.14-support.patch
+    ./disable-update-check.patch
+    # LosslessCut will retrieve a URL from mifi.no (the author's domain) and directly embed the HTML in the app.
+    # This was previously used to show a Ukraine flag, which I don't have strong opinions on.
+    # However, this effectively allows arbitrary code execution, which could be IP-gated. I can't allow that.
+    # This is also a form of telemetry; a ping every time the application is launched.
+    # See https://github.com/mifi/lossless-cut/issues/1055
+    ./stub-load-mifi.patch
+  ];
+
+  postPatch = ''
+    for f in src/main/ffmpeg.ts src/main/i18nCommon.ts; do
+      substituteInPlace "$f" \
+        --subst-var-by losslesscut_resources_path $out/share/losslesscut
+    done
+  '';
+
+  env = {
+    ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+    ELECTRON_OVERRIDE_DIST_PATH = electron.dist;
+    NODE_ENV = "production";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    nodejs
+    yarn-berry.yarnBerryConfigHook
+    yarn-berry
+    makeWrapper
+    copyDesktopItems
+    imagemagick
+  ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "losslesscut";
+      desktopName = "LosslessCut";
+      comment = "simple video editor to trim or cut videos";
+      exec = "losslesscut";
+      icon = "losslesscut";
+      mimeTypes = [
+        "video/mpeg"
+        "video/x-mpeg"
+        "video/msvideo"
+        "video/quicktime"
+        "video/x-anim"
+        "video/x-avi"
+        "video/x-ms-asf"
+        "video/x-ms-wmv"
+        "video/x-msvideo"
+        "video/x-nsv"
+        "video/x-flc"
+        "video/x-fli"
+        "video/x-flv"
+        "video/vnd.rn-realvideo"
+        "video/mp4"
+        "video/mp4v-es"
+        "video/mp2t"
+        "application/ogg"
+        "application/x-ogg"
+        "video/x-ogm+ogg"
+        "audio/x-vorbis+ogg"
+        "application/x-matroska"
+        "audio/x-matroska"
+        "video/x-matroska"
+        "video/webm"
+      ];
+      terminal = false;
+      categories = [
+        "AudioVideo"
+        "AudioVideoEditing"
+      ];
+      keywords = [
+        "trim"
+        "codec"
+        "cut"
+        "movie"
+        "mpeg"
+        "avi"
+        "h264"
+        "mkv"
+        "mp4"
+      ];
+      startupWMClass = "losslesscut";
+    })
+  ];
+
+  missingHashes = ./missing-hashes.json;
+  offlineCache = yarn-berry.fetchYarnBerryDeps {
+    inherit (finalAttrs) src missingHashes patches;
+    hash = "sha256-o0u9dAoo0sTEV+kjQg8TjRNAIcx8fqfk79HsDwAXriA=";
+  };
+
+  postConfigure = ''
+    cp -r ${electron.dist} electron-dist
+    chmod u+w -R electron-dist
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    yarn build
+
+    yarn electron-builder \
+      --dir \
+      -c.electronDist=electron-dist \
+      -c.electronVersion=${electron.version}
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin $out/share/applications
+
+    cp -a dist/*-unpacked/resources $out/share/losslesscut
+
+    ln -s -t $out/share/losslesscut/ ${lib.getExe' ffmpeg-headless "ffmpeg"} ${lib.getExe' ffmpeg-headless "ffprobe"}
+
+    makeWrapper ${lib.getExe electron} $out/bin/losslesscut \
+      --set-default ELECTRON_IS_DEV 0 \
+      --add-flags $out/share/losslesscut/app.asar \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
+
+    for size in 16 24 32 48 64 128 256 512; do
+      mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
+      magick src/renderer/src/icon.svg -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/losslesscut.png
+    done
+
+    runHook postInstall
+  '';
+
+  __structuredAttrs = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Swiss army knife of lossless video/audio editing";
+    homepage = "https://losslesscut.app/";
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [
+      shelvacu
+      ShamrockLee
+    ];
+    mainProgram = "losslesscut";
+    sourceProvenance = with lib.sourceTypes; [
+      fromSource
+      binaryNativeCode # due to npm/yarn deps
+    ];
+  };
+})
diff --git a/pkgs/by-name/lo/losslesscut/stub-load-mifi.patch b/pkgs/by-name/lo/losslesscut/stub-load-mifi.patch
new file mode 100644
index 000000000000..989904c3c71f
--- /dev/null
+++ b/pkgs/by-name/lo/losslesscut/stub-load-mifi.patch
@@ -0,0 +1,12 @@
+diff --git i/src/renderer/src/mifi.ts w/src/renderer/src/mifi.ts
+index c5e29bef..760da7b5 100644
+--- i/src/renderer/src/mifi.ts
++++ w/src/renderer/src/mifi.ts
+@@ -8,6 +8,7 @@ import { isMasBuild } from './util';
+ 
+ 
+ export async function loadMifiLink() {
++  return undefined;
+   try {
+     // In old versions: https://mifi.no/losslesscut/config.json
+     return await ky('https://losslesscut.mifi.no/config.json').json();
diff --git a/pkgs/by-name/lo/losslesscut/undev.patch b/pkgs/by-name/lo/losslesscut/undev.patch
new file mode 100644
index 000000000000..9d72cf27df10
--- /dev/null
+++ b/pkgs/by-name/lo/losslesscut/undev.patch
@@ -0,0 +1,51 @@
+diff --git i/src/main/ffmpeg.ts w/src/main/ffmpeg.ts
+index 3e2e71c9..11da9721 100644
+--- i/src/main/ffmpeg.ts
++++ w/src/main/ffmpeg.ts
+@@ -50,8 +50,8 @@ function getFfPath(cmd: string) {
+ 
+   if (customFfPath) return join(customFfPath, exeName);
+ 
+-  if (app.isPackaged) {
+-    return join(process.resourcesPath, exeName);
++  if (app.isPackaged || true) {
++    return join('@losslesscut_resources_path@', exeName);
+   }
+ 
+   // local dev
+@@ -110,8 +110,6 @@ function getExecaOptions<T extends ExecaOptions>({ env, cancelSignal, ...rest }:
+     ...rest,
+     env: {
+       ...env,
+-      // https://github.com/mifi/lossless-cut/issues/1143#issuecomment-1500883489
+-      ...(isLinux && !isDev && !customFfPath && { LD_LIBRARY_PATH: process.resourcesPath }),
+     },
+   };
+   return execaOptions as T;
+diff --git i/src/main/i18nCommon.ts w/src/main/i18nCommon.ts
+index 431eb396..2c96a93f 100644
+--- i/src/main/i18nCommon.ts
++++ w/src/main/i18nCommon.ts
+@@ -16,8 +16,7 @@ export function setCustomLocalesPath(p: string) {
+ 
+ function getLangPath(subPath: string) {
+   if (customLocalesPath != null) return join(customLocalesPath, subPath);
+-  if (app.isPackaged) return join(process.resourcesPath, 'locales', subPath);
+-  return join('locales', subPath);
++  return join('@losslesscut_resources_path@', 'locales', subPath);
+ }
+ 
+ export const fallbackLng = 'en';
+diff --git i/src/main/logger.ts w/src/main/logger.ts
+index 80355d78..2536d83d 100644
+--- i/src/main/logger.ts
++++ w/src/main/logger.ts
+@@ -28,7 +28,7 @@ const createLogger = () => winston.createLogger({
+   ),
+ });
+ 
+-const logDirPath = app.isPackaged ? app.getPath('userData') : '.';
++const logDirPath = app.getPath('userData');
+ export const logFilePath = join(logDirPath, 'app.log');
+ 
+ const logger = createLogger();
diff --git a/pkgs/by-name/lo/losslesscut/yarn-4.14-support.patch b/pkgs/by-name/lo/losslesscut/yarn-4.14-support.patch
new file mode 100644
index 000000000000..d673b914d875
--- /dev/null
+++ b/pkgs/by-name/lo/losslesscut/yarn-4.14-support.patch
@@ -0,0 +1,13 @@
+diff --git i/yarn.lock w/yarn.lock
+index 1e4550e7..6a2e770c 100644
+--- i/yarn.lock
++++ w/yarn.lock
+@@ -2,7 +2,7 @@
+ # Manual changes might be lost - proceed with caution!
+ 
+ __metadata:
+-  version: 8
++  version: 9
+   cacheKey: 10
+ 
+ "7zip-bin@npm:~5.2.0":
diff --git a/pkgs/by-name/lu/luarocks-packages-updater/updater.py b/pkgs/by-name/lu/luarocks-packages-updater/updater.py
index d09016ebf76d..21d5b9026d90 100755
--- a/pkgs/by-name/lu/luarocks-packages-updater/updater.py
+++ b/pkgs/by-name/lu/luarocks-packages-updater/updater.py
@@ -170,7 +170,7 @@ def commit_files(repo, message: str, files: list[Path]) -> None:
 class LuaEditor(nixpkgs_plugin_update.Editor):
     def create_parser(self):
         parser = super().create_parser()
-        parser.set_defaults(proc=1)
+        parser.set_defaults(proc=1, update_only=None)
         return parser
 
     def get_current_plugins(self, _config: FetchConfig, _nixpkgs: str):
diff --git a/pkgs/by-name/lx/lxgw-neoxihei/package.nix b/pkgs/by-name/lx/lxgw-neoxihei/package.nix
index 6a76a110fc1b..62e1682374cc 100644
--- a/pkgs/by-name/lx/lxgw-neoxihei/package.nix
+++ b/pkgs/by-name/lx/lxgw-neoxihei/package.nix
@@ -6,11 +6,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "lxgw-neoxihei";
-  version = "1.301";
+  version = "1.302";
 
   src = fetchurl {
     url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
-    hash = "sha256-C/M5Dl94L83vB7TzREdx6dBms9aHPQfgdWEyjvtvS00=";
+    hash = "sha256-7YRfB+nDHUhzPuWyjuZUIwx7tLKjjhP9JutNWRnAw3w=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/by-name/ma/manuskript/package.nix
similarity index 96%
rename from pkgs/applications/editors/manuskript/default.nix
rename to pkgs/by-name/ma/manuskript/package.nix
index 400b73ee5062..ecc140a74ba6 100644
--- a/pkgs/applications/editors/manuskript/default.nix
+++ b/pkgs/by-name/ma/manuskript/package.nix
@@ -3,7 +3,7 @@
   zlib,
   fetchFromGitHub,
   python3Packages,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 python3Packages.buildPythonApplication (finalAttrs: {
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     hash = "sha256-jOhbN6lMx04q60S0VOABmSNE/x9Er9exFYvWJe2INlE=";
   };
 
-  nativeBuildInputs = [ wrapQtAppsHook ];
+  nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ];
 
   propagatedBuildInputs = [
     python3Packages.pyqt5
diff --git a/pkgs/applications/misc/masterpdfeditor4/default.nix b/pkgs/by-name/ma/masterpdfeditor4/package.nix
similarity index 94%
rename from pkgs/applications/misc/masterpdfeditor4/default.nix
rename to pkgs/by-name/ma/masterpdfeditor4/package.nix
index ea54e30ebecd..84b70d3cad60 100644
--- a/pkgs/applications/misc/masterpdfeditor4/default.nix
+++ b/pkgs/by-name/ma/masterpdfeditor4/package.nix
@@ -2,11 +2,9 @@
   stdenv,
   fetchurl,
   sane-backends,
-  qtbase,
-  qtsvg,
   autoPatchelfHook,
   lib,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,12 +18,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoPatchelfHook
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
     sane-backends
     stdenv.cc.cc
   ];
diff --git a/pkgs/by-name/ma/matrix-hookshot/package.nix b/pkgs/by-name/ma/matrix-hookshot/package.nix
index 12377a05339c..85c9fd4dac82 100644
--- a/pkgs/by-name/ma/matrix-hookshot/package.nix
+++ b/pkgs/by-name/ma/matrix-hookshot/package.nix
@@ -18,23 +18,23 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "matrix-hookshot";
-  version = "7.3.2";
+  version = "7.3.3";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "matrix-hookshot";
     tag = finalAttrs.version;
-    hash = "sha256-FHxR0rUrony/z8Nxv4HA0XCDlwsdoLXK/yBQlfkC6U4=";
+    hash = "sha256-SVQsXzQU3TTiKjd1manEsqL/Ui6s/sFoZPBf9mWp31k=";
   };
 
   offlineCache = fetchYarnDeps {
     inherit (finalAttrs) src;
-    hash = "sha256-Qodvybg0G2a6Jtcd89Mci/PoLXrozTJCRRVh/fedngk=";
+    hash = "sha256-1J2a0ZRARYOEQE70WnKZlgwjIwafPfmgBtUVXX106lg=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-X0k60VOG/VoffE5+pCJ33C0Oxjr7NsOHHsLNWFb/z6s=";
+    hash = "sha256-EMwrIo17d5+LTczv4/+4m6XALfH0dCHnWtBU17h+mxI=";
   };
 
   buildInputs = [ openssl ];
diff --git a/pkgs/by-name/ma/mattermost/mattermost-remove-free-banner.patch b/pkgs/by-name/ma/mattermost/mattermost-remove-free-banner.patch
new file mode 100644
index 000000000000..d3365beed9c2
--- /dev/null
+++ b/pkgs/by-name/ma/mattermost/mattermost-remove-free-banner.patch
@@ -0,0 +1,85 @@
+diff --git a/webapp/channels/src/components/global_header/left_controls/product_menu/product_branding_team_edition/product_branding_free_edition.tsx b/webapp/channels/src/components/global_header/left_controls/product_menu/product_branding_team_edition/product_branding_free_edition.tsx
+index 93cb8ab263..3d12cd5e54 100644
+--- a/webapp/channels/src/components/global_header/left_controls/product_menu/product_branding_team_edition/product_branding_free_edition.tsx
++++ b/webapp/channels/src/components/global_header/left_controls/product_menu/product_branding_team_edition/product_branding_free_edition.tsx
+@@ -57,7 +57,6 @@ const ProductBrandingFreeEdition = (): JSX.Element => {
+                 width={116}
+                 height={20}
+             />
+-            <Badge>{badgeText}</Badge>
+         </ProductBrandingFreeEditionContainer>
+     );
+ };
+diff --git a/webapp/channels/src/components/header_footer_route/header.scss b/webapp/channels/src/components/header_footer_route/header.scss
+index c2e6fbd187..bc1cedcff1 100644
+--- a/webapp/channels/src/components/header_footer_route/header.scss
++++ b/webapp/channels/src/components/header_footer_route/header.scss
+@@ -47,20 +47,7 @@
+             }
+ 
+             .freeBadge {
+-                position: relative;
+-                top: 1px;
+-                display: flex;
+-                align-self: center;
+-                padding: 2px 6px;
+-                border-radius: var(--radius-s);
+-                margin-left: 12px;
+-                background: rgba(var(--center-channel-color-rgb), 0.08);
+-                color: rgba(var(--center-channel-color-rgb), 0.75);
+-                font-family: 'Open Sans', sans-serif;
+-                font-size: 10px;
+-                font-weight: 600;
+-                letter-spacing: 0.025em;
+-                line-height: 16px;
++                display: none !important;
+             }
+         }
+     }
+@@ -83,12 +70,6 @@
+             margin-top: 12px;
+         }
+     }
+-
+-    &.has-free-banner.has-custom-site-name {
+-        .header-back-button {
+-            bottom: -20px;
+-        }
+-    }
+ }
+ 
+ @media screen and (max-width: 699px) {
+diff --git a/webapp/channels/src/components/widgets/menu/menu_items/menu_item.scss b/webapp/channels/src/components/widgets/menu/menu_items/menu_item.scss
+index dee9b57f8c..8ef4aa073a 100644
+--- a/webapp/channels/src/components/widgets/menu/menu_items/menu_item.scss
++++ b/webapp/channels/src/components/widgets/menu/menu_items/menu_item.scss
+@@ -316,14 +316,7 @@
+     }
+ 
+     .MenuStartTrial {
+-        display: flex;
+-        flex-direction: column;
+-        align-items: flex-start;
+-        padding: 8px 20px;
+-        border-radius: 4px;
+-        margin-top: 0;
+-        font-size: 12px;
+-        line-height: 16px;
++        display: none !important;
+ 
+         button {
+             padding: 3px 0;
+diff --git a/webapp/channels/webpack.config.js b/webapp/channels/webpack.config.js
+index f29f19f9ab..ab85fc3b86 100644
+--- a/webapp/channels/webpack.config.js
++++ b/webapp/channels/webpack.config.js
+@@ -469,6 +469,9 @@ if (targetIsDevServer) {
+             historyApiFallback: {
+                 index: '/static/root.html',
+             },
++            client: {
++                overlay: false,
++            },
+         },
+         performance: false,
+         optimization: {
diff --git a/pkgs/by-name/ma/mattermost/mattermost-remove-user-limit.patch b/pkgs/by-name/ma/mattermost/mattermost-remove-user-limit.patch
new file mode 100644
index 000000000000..2667c1e82cd2
--- /dev/null
+++ b/pkgs/by-name/ma/mattermost/mattermost-remove-user-limit.patch
@@ -0,0 +1,16 @@
+diff --git a/server/channels/app/limits.go b/server/channels/app/limits.go
+index 4c88c1f049..3c1af8d02f 100644
+--- a/server/channels/app/limits.go
++++ b/server/channels/app/limits.go
+@@ -10,8 +10,8 @@ import (
+ )
+ 
+ const (
+-	maxUsersLimit     = 200
+-	maxUsersHardLimit = 250
++	maxUsersLimit     = 10000000
++	maxUsersHardLimit = 10000000
+ )
+ 
+ func (a *App) GetServerLimits() (*model.ServerLimits, *model.AppError) {
+    
\ No newline at end of file
diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix
index 922a2836ad19..2acd3e9e4a1c 100644
--- a/pkgs/by-name/ma/mattermost/package.nix
+++ b/pkgs/by-name/ma/mattermost/package.nix
@@ -13,6 +13,8 @@
   nixosTests,
 
   latestVersionInfo ? null,
+  removeUserLimit ? false,
+  removeFreeBadge ? false,
   versionInfo ? {
     # ESR releases only. Note: if NixOS would release with an ESR that goes out
     # of support during the lifetime of the NixOS release, it is acceptable
@@ -136,6 +138,14 @@ buildMattermost rec {
     '';
   };
 
+  patches =
+    lib.optionals removeFreeBadge [
+      ./mattermost-remove-free-banner.patch
+    ]
+    ++ lib.optionals removeUserLimit [
+      ./mattermost-remove-user-limit.patch
+    ];
+
   # Needed because buildGoModule does not support go workspaces yet.
   # We use go 1.22's workspace vendor command, which is not yet available
   # in the default version of go used in nixpkgs, nor is it used by upstream:
diff --git a/pkgs/by-name/md/mdtsql/package.nix b/pkgs/by-name/md/mdtsql/package.nix
index a53c6e24610f..a9202225c896 100644
--- a/pkgs/by-name/md/mdtsql/package.nix
+++ b/pkgs/by-name/md/mdtsql/package.nix
@@ -9,16 +9,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "mdtsql";
-  version = "0.1.0";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "noborus";
     repo = "mdtsql";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-D9suWLrVQOztz0rRjEo+pjxQlGWOOsk3EUbkN9yuriY=";
+    hash = "sha256-fmv8wJfeJ8Lz6Z5OxggrudUvyJaA+22tCs0x2Dvz+Bw=";
   };
 
-  vendorHash = "sha256-psXnLMhrApyBjDY/S4WwIM1GLczyn4dUmX2fWSTq7mQ=";
+  vendorHash = "sha256-/FpbKpxTYiwWVDRxBn3GmPEhna/a+t4CuVq/bZmsb9w=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/me/megabasterd/package.nix b/pkgs/by-name/me/megabasterd/package.nix
index ea0401bde70b..ab888aadef1f 100644
--- a/pkgs/by-name/me/megabasterd/package.nix
+++ b/pkgs/by-name/me/megabasterd/package.nix
@@ -6,7 +6,7 @@
   maven,
 }:
 let
-  version = "8.47";
+  version = "8.51";
 in
 maven.buildMavenPackage {
   pname = "megabasterd";
@@ -16,7 +16,7 @@ maven.buildMavenPackage {
     owner = "tonikelope";
     repo = "megabasterd";
     tag = "v${version}";
-    hash = "sha256-pJk6ZDVPs/hrm0ZZI9YXv+dfZAEbpwwI8Z1By+FPwCs=";
+    hash = "sha256-FbExOSdJ4XiXKzetIlsSPrD9x2H4MxM2kKCMA4XkMLA=";
   };
 
   mvnHash = "sha256-DVfPmW0ep6y/GxnwNKXxo68W5idcTkoNqUEKm7ouTEY=";
diff --git a/pkgs/by-name/mi/minimap2/package.nix b/pkgs/by-name/mi/minimap2/package.nix
index 32c04a12d019..6bda9038b194 100644
--- a/pkgs/by-name/mi/minimap2/package.nix
+++ b/pkgs/by-name/mi/minimap2/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "minimap2";
-  version = "2.30";
+  version = "2.31";
 
   src = fetchFromGitHub {
     repo = "minimap2";
     owner = "lh3";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-TnJ/h04QdTdL56yyh+3Po19UAzrAkictu5Q6OiCQ2DY=";
+    sha256 = "sha256-RH9IvpmcDEnuFEXucORpzeWc+yJlAvW4r6RnaUT+//c=";
   };
 
   buildInputs = [ zlib ];
diff --git a/pkgs/by-name/mi/mistral-vibe/package.nix b/pkgs/by-name/mi/mistral-vibe/package.nix
index ea4d514cb694..f29d326ddb85 100644
--- a/pkgs/by-name/mi/mistral-vibe/package.nix
+++ b/pkgs/by-name/mi/mistral-vibe/package.nix
@@ -22,22 +22,13 @@ let
           hash = "sha256-1KVy9s+zjlB4w7E45PMCWRxPus24bgBmmM3k2R9d+Jg=";
         };
       });
-      # 112/2907 tests fail with textual 8.2.5:
-      # textual.app.InvalidThemeError: Theme 'textual-ansi' has not been registered.
-      textual = prev.textual.overridePythonAttrs (old: rec {
-        version = "8.2.4";
-        src = old.src.override {
-          tag = "v${version}";
-          hash = "sha256-827cm9pcj1o1FYeaoWKCJ6dEyXeDop4kYd205cySTfg=";
-        };
-      });
     };
   };
   python3Packages = python.pkgs;
 in
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "mistral-vibe";
-  version = "2.10.1";
+  version = "2.11.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -45,7 +36,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     owner = "mistralai";
     repo = "mistral-vibe";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hbsOA+8tOoFuwiz2KLdcJsbrn/sYec8vqzvh6mKgX08=";
+    hash = "sha256-s0mgWOKO+kKwJivnZw2IJRhGRET000ApvuhK6OovIIw=";
   };
 
   build-system = with python3Packages; [
diff --git a/pkgs/applications/networking/mkchromecast/default.nix b/pkgs/by-name/mk/mkchromecast/package.nix
similarity index 93%
rename from pkgs/applications/networking/mkchromecast/default.nix
rename to pkgs/by-name/mk/mkchromecast/package.nix
index f0db4eec7065..5d95d8c485f1 100644
--- a/pkgs/applications/networking/mkchromecast/default.nix
+++ b/pkgs/by-name/mk/mkchromecast/package.nix
@@ -6,7 +6,6 @@
   sox,
   flac,
   lame,
-  wrapQtAppsHook,
   ffmpeg,
   vorbis-tools,
   pulseaudio,
@@ -15,7 +14,7 @@
   opus-tools,
   gst_all_1,
   enableSonos ? true,
-  qtwayland,
+  libsForQt5,
 }:
 let
   packages = [
@@ -44,7 +43,7 @@ python3Packages.buildPythonApplication {
     hash = "sha256-UMzOIxgeTpAFQZtYirOYPoVcKgiKdGx2zwVyWmo32w4=";
   };
 
-  buildInputs = lib.optional stdenv.hostPlatform.isLinux qtwayland;
+  buildInputs = lib.optional stdenv.hostPlatform.isLinux libsForQt5.qtwayland;
   propagatedBuildInputs =
     with python3Packages;
     (
@@ -66,7 +65,7 @@ python3Packages.buildPythonApplication {
       --replace 'platform.system() == "Linux"' 'True'
   '';
 
-  nativeBuildInputs = [ wrapQtAppsHook ];
+  nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ];
 
   # Relies on an old version (0.7.7) of PyChromecast unavailable in Nixpkgs.
   # Is also I/O bound and impure, testing an actual device, so we disable.
diff --git a/pkgs/by-name/mk/mkvtoolnix/package.nix b/pkgs/by-name/mk/mkvtoolnix/package.nix
index ead5f5734f45..f596eea0c2cd 100644
--- a/pkgs/by-name/mk/mkvtoolnix/package.nix
+++ b/pkgs/by-name/mk/mkvtoolnix/package.nix
@@ -49,13 +49,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mkvtoolnix";
-  version = "98.0";
+  version = "99.0";
 
   src = fetchFromCodeberg {
     owner = "mbunkus";
     repo = "mkvtoolnix";
     tag = "release-${finalAttrs.version}";
-    hash = "sha256-gLs2+hbWFhhpabdknwoozH8WHgVNSR0VjnrmwQA7xrc=";
+    hash = "sha256-re4z0ZseuOP/P1HW3qdWLIo+YhLlSRBuqefewRm6KEI=";
   };
 
   passthru = {
diff --git a/pkgs/by-name/mo/mocha/package.nix b/pkgs/by-name/mo/mocha/package.nix
index b6fc8c731bb6..04dcea632516 100644
--- a/pkgs/by-name/mo/mocha/package.nix
+++ b/pkgs/by-name/mo/mocha/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "mocha";
-  version = "11.7.5";
+  version = "11.7.6";
 
   src = fetchFromGitHub {
     owner = "mochajs";
     repo = "mocha";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Bk/yF3z/DZ4h9mj1a/EG5ofC6/CIpLd81iQ1w7XkZ0A=";
+    hash = "sha256-pY6LYMitbhOfjNf00UuUbLgdZii7Nr/8/SlBgM5pYMI=";
   };
 
-  npmDepsHash = "sha256-dcq6P4BB6w7GGMzW2GfF8AzDnqPV/BS5nz+dxVjnc3o=";
+  npmDepsHash = "sha256-1uisNcDlv/EY+Mq24rM7BgA8GREKKvxX/gHt8dHlX2Q=";
 
   postInstall = ''
     # Installed only for backwards compat, but should just be removed.
diff --git a/pkgs/applications/editors/molsketch/openbabel.patch b/pkgs/by-name/mo/molsketch/openbabel.patch
similarity index 100%
rename from pkgs/applications/editors/molsketch/openbabel.patch
rename to pkgs/by-name/mo/molsketch/openbabel.patch
diff --git a/pkgs/applications/editors/molsketch/default.nix b/pkgs/by-name/mo/molsketch/package.nix
similarity index 95%
rename from pkgs/applications/editors/molsketch/default.nix
rename to pkgs/by-name/mo/molsketch/package.nix
index f042627055e7..3aea780b0450 100644
--- a/pkgs/applications/editors/molsketch/default.nix
+++ b/pkgs/by-name/mo/molsketch/package.nix
@@ -4,8 +4,7 @@
   fetchurl,
   cmake,
   pkg-config,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
   hicolor-icon-theme,
   openbabel,
   desktop-file-utils,
@@ -45,8 +44,8 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     hicolor-icon-theme
diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/by-name/mo/moolticute/package.nix
similarity index 89%
rename from pkgs/applications/misc/moolticute/default.nix
rename to pkgs/by-name/mo/moolticute/package.nix
index fe87ff3a1429..dbcfa3829f0a 100644
--- a/pkgs/applications/misc/moolticute/default.nix
+++ b/pkgs/by-name/mo/moolticute/package.nix
@@ -4,11 +4,7 @@
   fetchFromGitHub,
   libusb1,
   pkg-config,
-  qmake,
-  qttools,
-  wrapQtAppsHook,
-  qtbase,
-  qtwebsockets,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -29,14 +25,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkg-config
-    qmake
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     libusb1
-    qtbase
-    qtwebsockets
+    libsForQt5.qtbase
+    libsForQt5.qtwebsockets
   ];
 
   doInstallCheck = true;
diff --git a/pkgs/by-name/mq/mqtt-explorer/package.nix b/pkgs/by-name/mq/mqtt-explorer/package.nix
index e5a0d9c9dbfa..1f09774684f6 100644
--- a/pkgs/by-name/mq/mqtt-explorer/package.nix
+++ b/pkgs/by-name/mq/mqtt-explorer/package.nix
@@ -86,8 +86,9 @@ stdenv.mkDerivation rec {
 
     patchShebangs {node_modules,app/node_modules,backend/node_modules}
 
-    cp -r ${electron.dist} electron-dist
-    chmod -R u+w electron-dist
+    electron_dist="$(mktemp -d)"
+    cp -r ${electron.dist}/. "$electron_dist"
+    chmod -R u+w "$electron_dist"
 
     runHook postConfigure
   '';
@@ -98,7 +99,7 @@ stdenv.mkDerivation rec {
     tsc && cd app && yarn --offline run build && cd ..
 
     yarn --offline run electron-builder --dir \
-      -c.electronDist=electron-dist \
+      -c.electronDist="$electron_dist" \
       -c.electronVersion=${electron.version}
 
     runHook postBuild
@@ -143,7 +144,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   checkPhase = ''
-    export ELECTRON_OVERRIDE_DIST_PATH=electron-dist/
+    export ELECTRON_OVERRIDE_DIST_PATH="$electron_dist"
 
     yarn test:app --offline
     yarn test:backend --offline
diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/by-name/my/mytetra/package.nix
similarity index 93%
rename from pkgs/applications/office/mytetra/default.nix
rename to pkgs/by-name/my/mytetra/package.nix
index 0fae90828e9f..373864b8f1b1 100644
--- a/pkgs/applications/office/mytetra/default.nix
+++ b/pkgs/by-name/my/mytetra/package.nix
@@ -2,10 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  qtsvg,
   makeWrapper,
-  wrapQtAppsHook,
+  libsForQt5,
   xdg-utils,
 }:
 
@@ -21,11 +19,11 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
+    libsForQt5.qmake
     makeWrapper
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
-  buildInputs = [ qtsvg ];
+  buildInputs = [ libsForQt5.qtsvg ];
 
   hardeningDisable = [ "format" ];
 
diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-config-backup/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-config-backup/package.nix
new file mode 100644
index 000000000000..f2448ed669c8
--- /dev/null
+++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-config-backup/package.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  netbox,
+  pytestCheckHook,
+  python,
+  netbox-napalm-plugin,
+  pydriller,
+}:
+
+buildPythonPackage rec {
+  pname = "netbox-config-backup";
+  version = "2.2.2";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "DanSheps";
+    repo = "netbox-config-backup";
+    tag = "v${version}";
+    hash = "sha256-PT7/RCpB7SAinQ8McQV59b9ouqqUSoEqEj0ultL37cs=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonRemoveDeps = [ "uuid" ]; # python builtin
+
+  dependencies = [
+    netbox-napalm-plugin
+    pydriller
+  ];
+
+  nativeCheckInputs = [ netbox ];
+
+  preFixup = ''
+    export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH
+  '';
+
+  dontUsePythonImportsCheck = python.pythonVersion != netbox.python.pythonVersion;
+
+  pythonImportsCheck = [ "netbox_config_backup" ];
+
+  meta = {
+    description = "NetBox plugin for configuration backups using napalm";
+    homepage = "https://github.com/DanSheps/netbox-config-backup";
+    changelog = "https://github.com/DanSheps/netbox-config-backup/releases/tag/${src.tag}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ felbinger ];
+  };
+}
diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-lifecycle/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-lifecycle/package.nix
new file mode 100644
index 000000000000..e23fdd81a696
--- /dev/null
+++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-lifecycle/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  netbox,
+  pytestCheckHook,
+  python,
+  django-polymorphic,
+}:
+
+buildPythonPackage rec {
+  pname = "netbox-lifecycle";
+  version = "1.1.9";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "DanSheps";
+    repo = "netbox-lifecycle";
+    tag = "v${version}";
+    hash = "sha256-iCBlwhaf6IFdni7FQyRPtRJVwt04w0Jc4R0CeQlIWCY=";
+  };
+
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [ netbox ];
+
+  preFixup = ''
+    export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH
+  '';
+
+  dontUsePythonImportsCheck = python.pythonVersion != netbox.python.pythonVersion;
+
+  pythonImportsCheck = [ "netbox_lifecycle" ];
+
+  dependencies = [ django-polymorphic ];
+
+  meta = {
+    description = "NetBox plugin for managing Hardware EOL/EOS, and Support Contracts";
+    homepage = "https://github.com/DanSheps/netbox-lifecycle";
+    changelog = "https://github.com/DanSheps/netbox-lifecycle/releases/tag/${src.tag}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ felbinger ];
+  };
+}
diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-lists/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-lists/package.nix
new file mode 100644
index 000000000000..479dc69f1ab5
--- /dev/null
+++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-lists/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  netbox,
+  pytestCheckHook,
+  python,
+  django-polymorphic,
+}:
+
+buildPythonPackage rec {
+  pname = "netbox-lists";
+  version = "4.0.4";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "devon-mar";
+    repo = "netbox-lists";
+    tag = "v${version}";
+    hash = "sha256-RRUuvoeB3xfqlZr1v1zpRdmVZK9av52ZsADOh9s4toQ=";
+  };
+
+  build-system = [ hatchling ];
+
+  nativeCheckInputs = [ netbox ];
+
+  preFixup = ''
+    export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH
+  '';
+
+  dontUsePythonImportsCheck = python.pythonVersion != netbox.python.pythonVersion;
+
+  pythonImportsCheck = [ "netbox_lists" ];
+
+  meta = {
+    description = "NetBox plugin to generate IP and prefix lists. Integrates with Ansible, Terraform, Prometheus, Oxidized and more";
+    homepage = "https://github.com/devon-mar/netbox-lists";
+    changelog = "https://github.com/devon-mar/netbox-lists/releases/tag/${src.tag}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ felbinger ];
+  };
+}
diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-security/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-security/package.nix
new file mode 100644
index 000000000000..f179e4c0b1f0
--- /dev/null
+++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-security/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  netbox,
+  pytestCheckHook,
+  python,
+  django-polymorphic,
+}:
+
+buildPythonPackage rec {
+  pname = "netbox-security";
+  version = "1.4.5";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "andy-shady-org";
+    repo = "netbox-security";
+    tag = "v${version}";
+    hash = "sha256-DGiuQignYPSTFFm0RkDl5kwYQJNKbRdgdmIZ1DKXkGs=";
+  };
+
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [ netbox ];
+
+  preFixup = ''
+    export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH
+  '';
+
+  dontUsePythonImportsCheck = python.pythonVersion != netbox.python.pythonVersion;
+
+  pythonImportsCheck = [ "netbox_security" ];
+
+  meta = {
+    description = "NetBox plugin covering various security and NAT related models";
+    homepage = "https://github.com/andy-shady-org/netbox-security";
+    changelog = "https://github.com/andy-shady-org/netbox-security/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ felbinger ];
+  };
+}
diff --git a/pkgs/by-name/ne/netgen-vlsi/package.nix b/pkgs/by-name/ne/netgen-vlsi/package.nix
index e0907cc57363..5c7f3173ff18 100644
--- a/pkgs/by-name/ne/netgen-vlsi/package.nix
+++ b/pkgs/by-name/ne/netgen-vlsi/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "netgen";
-  version = "1.5.319";
+  version = "1.5.320";
 
   src = fetchFromGitHub {
     owner = "RTimothyEdwards";
     repo = "netgen";
     tag = finalAttrs.version;
-    hash = "sha256-n6UoxoPfUlWrl/3HFEXsZTl+nSTjUzK9WSt4q1kXrZs=";
+    hash = "sha256-h4SESGTjeD8vtLiLFSkIlnBVQfysQvxWp4E5nS1wu4Y=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/nf/nfs-ganesha/package.nix b/pkgs/by-name/nf/nfs-ganesha/package.nix
index 50fe1d124c05..fc3d82e0767f 100644
--- a/pkgs/by-name/nf/nfs-ganesha/package.nix
+++ b/pkgs/by-name/nf/nfs-ganesha/package.nix
@@ -25,7 +25,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nfs-ganesha";
-  version = "9.13";
+  version = "9.14";
 
   outputs = [
     "out"
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "nfs-ganesha";
     repo = "nfs-ganesha";
     tag = "V${finalAttrs.version}";
-    hash = "sha256-e6BDxb4Dt8xp9KdOcjxZKzRiKYPe+GP1UPvK/DAdX6M=";
+    hash = "sha256-aeZDXr6vUFyFhVQO31ttZ04W8KP8iKN0u17McULtQUM=";
   };
 
   patches = lib.optional useDbus ./allow-bypassing-dbus-pkg-config-test.patch;
diff --git a/pkgs/by-name/ni/nitrotpm-tools/package.nix b/pkgs/by-name/ni/nitrotpm-tools/package.nix
index b913d8c32343..ede9278bc572 100644
--- a/pkgs/by-name/ni/nitrotpm-tools/package.nix
+++ b/pkgs/by-name/ni/nitrotpm-tools/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nitrotpm-tools";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "NitroTPM-Tools";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Jnv1ZKRs59eXnW/O6UCZLIhQolQ9LZjJI6+SqXVws5Q=";
+    hash = "sha256-SL0I1bMh9QmBo4aBv1ZL3M5ZaVeJ0K3kZCMStma6bG0=";
   };
 
-  cargoHash = "sha256-ckygzrbDzzjL2eBktAHdbA40E7HDeR8S5rZCbbuVIW0=";
+  cargoHash = "sha256-/2Lo5/CCv12PJocUYjZiRD4uBxrcKWA5RelLnU4TpcQ=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/ni/nix-update/package.nix b/pkgs/by-name/ni/nix-update/package.nix
index 356de4c085d4..7e054548f497 100644
--- a/pkgs/by-name/ni/nix-update/package.nix
+++ b/pkgs/by-name/ni/nix-update/package.nix
@@ -11,14 +11,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "nix-update";
-  version = "1.15.0";
+  version = "1.15.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nix-update";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-M62YdrdAqK81MF0FL0bx6iKTDCaqOtPx3civlSg46uk=";
+    hash = "sha256-z7xXzpwsXY1x/xKeM7l2mN8dHFTp8qfgs/5xVsKjHr8=";
   };
 
   build-system = [ python3Packages.setuptools ];
diff --git a/pkgs/by-name/nn/nnd/package.nix b/pkgs/by-name/nn/nnd/package.nix
index 9197bf505c1f..56f25fb91920 100644
--- a/pkgs/by-name/nn/nnd/package.nix
+++ b/pkgs/by-name/nn/nnd/package.nix
@@ -8,16 +8,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nnd";
-  version = "0.74";
+  version = "0.77";
 
   src = fetchFromGitHub {
     owner = "al13n321";
     repo = "nnd";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IraVnIuW0AcYM/U1X57zsHQ9GOW2ZBo9coRA6AV5SWw=";
+    hash = "sha256-OUXI7MErvkGYmz3H14SOJNuqhdkC1Vk9kUZQ/mpdUPk=";
   };
 
-  cargoHash = "sha256-WT2ikyeF4dRTQbCF4f5Caj8fVIRPmHLv72L5KDFJ7BM=";
+  cargoHash = "sha256-P3r1C+8iWGXp821xALhaJj0OHeG/lvDxxDwgs574c6Y=";
 
   meta = {
     description = "Debugger for Linux";
diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix
index a373c22a23d3..d44923191750 100644
--- a/pkgs/by-name/nu/nu_scripts/package.nix
+++ b/pkgs/by-name/nu/nu_scripts/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "nu_scripts";
-  version = "0-unstable-2026-05-13";
+  version = "0-unstable-2026-05-23";
 
   src = fetchFromGitHub {
     owner = "nushell";
     repo = "nu_scripts";
-    rev = "018fe3c3134d49504be652a7ace5512291545317";
-    hash = "sha256-JUsFHsacED+7eTLAlfBnF9vasIHWIL/POJMCPbC9Baw=";
+    rev = "57f49add9b32d4741351b63236f28341eba35077";
+    hash = "sha256-l0feMriwY8/WAghUOwSsD0MDUVGXgOkzUklnnvS1ij8=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/nu/nufmt/package.nix b/pkgs/by-name/nu/nufmt/package.nix
index a67d8406714a..fb55edfcbc8f 100644
--- a/pkgs/by-name/nu/nufmt/package.nix
+++ b/pkgs/by-name/nu/nufmt/package.nix
@@ -7,22 +7,22 @@
 }:
 rustPlatform.buildRustPackage {
   pname = "nufmt";
-  version = "0-unstable-2026-03-26";
+  version = "0-unstable-2026-05-18";
 
   src = fetchFromGitHub {
     owner = "nushell";
     repo = "nufmt";
-    rev = "074930a23bc89a5f720a0d46ac2853f3153817c2";
-    hash = "sha256-XqiUPAVM6OuyNo9HbBKW+OKQrE7QbSjDRtyfmIYQRxs=";
+    rev = "2a9661dffb7e432b46c0b0956e74e0511e783dc7";
+    hash = "sha256-OTKtCQ1AafQ6ejW657mJ1vqtgmZCxKEnNMT/EOsT5ic=";
   };
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
   ];
 
-  cargoHash = "sha256-heHFiW1/2qV6BJH7Y0ObSV1sPfVaU0m2KLbASdzca8s=";
+  cargoHash = "sha256-jgmNMk2tprJsGU/pddxfKdfWli9dNwLt02LhVhQrHc4=";
 
-  # NOTE: Patch follows similar intention upstream https://github.com/nushell/nufmt/commit/074930a23bc89a5f720a0d46ac2853f3153817c2
+  # NOTE: Patch follows similar intention upstream https://github.com/nushell/nufmt/commit/2a9661dffb7e432b46c0b0956e74e0511e783dc7
   postPatch = ''
     substituteInPlace tests/ground_truth.rs --replace-fail \
       '        let path = PathBuf::from(target_dir).join("debug").join(exe_name);' \
diff --git a/pkgs/by-name/nu/nushell-plugin-semver/package.nix b/pkgs/by-name/nu/nushell-plugin-semver/package.nix
index 239e189e688f..dbddc5a9d324 100644
--- a/pkgs/by-name/nu/nushell-plugin-semver/package.nix
+++ b/pkgs/by-name/nu/nushell-plugin-semver/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nu_plugin_semver";
-  version = "0.11.16";
+  version = "0.11.17";
 
   src = fetchFromGitHub {
     owner = "abusch";
     repo = "nu_plugin_semver";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LgB2a14ZIQvNpvYU4nu3AEcwjjWIpJlMS4OGB+dHj2E=";
+    hash = "sha256-GJ3B7dENuSEZSkHV42plt7tsGLZPqqXCO3c/0ILZQ1Y=";
   };
 
-  cargoHash = "sha256-PunvfZbghJzcpAMLDIozec2GAklWTosPUWlBJ76lPV8=";
+  cargoHash = "sha256-U3wwXtvnHfbxfH5awVJbSI4OaVd/c/TsQHzaUljw99o=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/nv/nvc/package.nix b/pkgs/by-name/nv/nvc/package.nix
index f0b3bd6e859f..1b8902f723c6 100644
--- a/pkgs/by-name/nv/nvc/package.nix
+++ b/pkgs/by-name/nv/nvc/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nvc";
-  version = "1.20.1";
+  version = "1.21.0";
 
   src = fetchFromGitHub {
     owner = "nickg";
     repo = "nvc";
     tag = "r${finalAttrs.version}";
-    hash = "sha256-IFuJvNOHE5qOjWgTbi5Ba5fUgEbM4FzNJRoZApnoaKw=";
+    hash = "sha256-aGRN12QL+ODcCpxRXK8RtjT7Zk+rd1ld1gjxlubPFgI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/oe/oelint-adv/package.nix b/pkgs/by-name/oe/oelint-adv/package.nix
index 81f95ba03bcc..66b8885577fb 100644
--- a/pkgs/by-name/oe/oelint-adv/package.nix
+++ b/pkgs/by-name/oe/oelint-adv/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "oelint-adv";
-  version = "9.7.1";
+  version = "9.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "priv-kweihmann";
     repo = "oelint-adv";
     tag = finalAttrs.version;
-    hash = "sha256-44ebctMX7QfF459RvjJM4oz+ByBF3cz4e+02GnY9h1s=";
+    hash = "sha256-N7S3pmxoOcntCnMuM78H9wYZR5MczJBPhv9v0wSZIuY=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/tools/ofono-phonesim/default.nix b/pkgs/by-name/of/ofono-phonesim/package.nix
similarity index 82%
rename from pkgs/development/tools/ofono-phonesim/default.nix
rename to pkgs/by-name/of/ofono-phonesim/package.nix
index 32a33f54b0ea..f5e929dd690d 100644
--- a/pkgs/development/tools/ofono-phonesim/default.nix
+++ b/pkgs/by-name/of/ofono-phonesim/package.nix
@@ -4,8 +4,7 @@
   fetchzip,
   autoreconfHook,
   pkg-config,
-  wrapQtAppsHook,
-  qtbase,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation {
@@ -20,16 +19,16 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
   ];
 
   makeFlags = [
-    "MOC=${qtbase.dev}/bin/moc"
-    "UIC=${qtbase.dev}/bin/uic"
+    "MOC=${libsForQt5.qtbase.dev}/bin/moc"
+    "UIC=${libsForQt5.qtbase.dev}/bin/uic"
   ];
 
   meta = {
diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix
index 0bfb17de83b2..dbe82a0e2edc 100644
--- a/pkgs/by-name/on/onnxruntime/package.nix
+++ b/pkgs/by-name/on/onnxruntime/package.nix
@@ -4,6 +4,7 @@
   stdenv,
   fetchFromGitHub,
   abseil-cpp_202508,
+  buildPackages,
   cmake,
   cpuinfo,
   eigen,
@@ -61,16 +62,16 @@ let
     name = "onnx-src";
     owner = "onnx";
     repo = "onnx";
-    tag = "v1.20.1";
-    hash = "sha256-XZJXD6sBvVJ6cLPyDkKOW8oSkjqcw9whUqDWd7dxY3c=";
+    tag = "v1.21.0";
+    hash = "sha256-eF6BdTwTuHh6ckuLGN1d6z2GLU47lPqtzu4zIv8+cTs=";
   };
 
   cutlass-src = fetchFromGitHub {
     name = "cutlass-src";
     owner = "NVIDIA";
     repo = "cutlass";
-    tag = "v4.2.1";
-    hash = "sha256-iP560D5Vwuj6wX1otJhwbvqe/X4mYVeKTpK533Wr5gY=";
+    tag = "v4.4.2";
+    hash = "sha256-0q9Ad0Z6E/rO2PdM4uQc8H0E0qs9uKc3reHepiHhjEc=";
   };
 
   dlpack-src = fetchFromGitHub {
@@ -109,14 +110,14 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "onnxruntime";
-  version = "1.24.4";
+  version = "1.26.0";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "onnxruntime";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-CjPgRkPyp7dUPAOo3cePWQvucOlQAwtT4NO5w3NkV+E=";
+    hash = "sha256-+9M4mEPLLJ5N+JomoXIKcUBV85lr6lFJjJQ3qsMRrQY=";
   };
 
   patches = [
@@ -163,7 +164,6 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     cmake
     pkg-config
     python3Packages.python
-    protobuf
   ]
   ++ lib.optionals pythonSupport (
     with python3Packages;
@@ -240,10 +240,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     (darwinMinVersionHook "13.3")
   ];
 
-  nativeCheckInputs = [
-    gtest
-  ]
-  ++ lib.optionals pythonSupport (
+  nativeCheckInputs = lib.optionals pythonSupport (
     with python3Packages;
     [
       onnx
@@ -252,6 +249,10 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     ]
   );
 
+  checkInputs = [
+    gtest
+  ];
+
   # TODO: build server, and move .so's to lib output
   # Python's wheel is stored in a separate dist output
   outputs = [
@@ -269,7 +270,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     (lib.cmakeBool "ABSL_ENABLE_INSTALL" true)
     # leads to failing builds, which isn't particularly useful for Nixpkgs
-    (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-error=unused-variable")
+    (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-error=unused-variable -Wno-error=deprecated")
     (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
     (lib.cmakeBool "FETCHCONTENT_QUIET" false)
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ABSEIL_CPP" "${abseil-cpp_202508.src}")
@@ -281,7 +282,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_SAFEINT" "${safeint-src}")
     (lib.cmakeFeature "FETCHCONTENT_TRY_FIND_PACKAGE_MODE" "ALWAYS")
     # fails to find protoc on darwin, so specify it
-    (lib.cmakeFeature "ONNX_CUSTOM_PROTOC_EXECUTABLE" (lib.getExe protobuf))
+    (lib.cmakeFeature "ONNX_CUSTOM_PROTOC_EXECUTABLE" (lib.getExe buildPackages.protobuf))
     (lib.cmakeBool "onnxruntime_BUILD_SHARED_LIB" true)
     (lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" finalAttrs.doCheck)
     (lib.cmakeBool "onnxruntime_USE_FULL_PROTOBUF" withFullProtobuf)
@@ -374,6 +375,8 @@ effectiveStdenv.mkDerivation (finalAttrs: {
       ../include/onnxruntime/core/providers/coreml/coreml_provider_factory.h
   '';
 
+  strictDeps = true;
+
   # See comments in `cudaPackages.nccl`
   postFixup = lib.optionalString cudaSupport ''
     remove-references-to -t "${lib.getBin cuda_nvcc}" ''${!outputLib}/lib/libonnxruntime_providers_cuda.so
diff --git a/pkgs/by-name/on/onnxruntime/protobuf34-nodiscard.patch b/pkgs/by-name/on/onnxruntime/protobuf34-nodiscard.patch
index 9735e6607b21..23e68d06ae77 100644
--- a/pkgs/by-name/on/onnxruntime/protobuf34-nodiscard.patch
+++ b/pkgs/by-name/on/onnxruntime/protobuf34-nodiscard.patch
@@ -73,28 +73,6 @@ index 055b255132..3925db8ac7 100644
      ofs.flush();
  
      ASSERT_TRUE(std::filesystem::exists(serialized_model_path));
-diff --git a/onnxruntime/test/framework/inference_session_test.cc b/onnxruntime/test/framework/inference_session_test.cc
-index 1c4e7800b7..8ceb05f0f6 100644
---- a/onnxruntime/test/framework/inference_session_test.cc
-+++ b/onnxruntime/test/framework/inference_session_test.cc
-@@ -1045,7 +1045,7 @@ static void TestBindHelper(const std::string& log_str,
-   CreateMatMulModel(p_model, run_provider_type);
- 
-   std::string s1;
--  p_model->ToProto().SerializeToString(&s1);
-+  ASSERT_TRUE(p_model->ToProto().SerializeToString(&s1));
-   std::stringstream sstr(s1);
-   ASSERT_STATUS_OK(session_object.Load(sstr));
-   ASSERT_STATUS_OK(session_object.Initialize());
-@@ -1078,7 +1078,7 @@ TEST(InferenceSessionTests, TestIOBindingReuse) {
-   CreateMatMulModel(p_model, kCpuExecutionProvider);
- 
-   std::string s1;
--  p_model->ToProto().SerializeToString(&s1);
-+  ASSERT_TRUE(p_model->ToProto().SerializeToString(&s1));
-   std::stringstream sstr(s1);
-   ASSERT_TRUE(session_object.Load(sstr).IsOK());
-   ASSERT_STATUS_OK(session_object.Initialize());
 diff --git a/onnxruntime/test/ir/graph_test.cc b/onnxruntime/test/ir/graph_test.cc
 index 4d80cb7047..c69ac46c05 100644
 --- a/onnxruntime/test/ir/graph_test.cc
@@ -201,3 +179,16 @@ index 5caafa0f37..327463c615 100644
    std::shared_ptr<IExecutionProvider> ep_shared = ep ? std::move(ep) : nullptr;
  
    auto run_model = [&](TransformerLevel level, std::vector<OrtValue>& fetches,
+diff --git a/onnxruntime/test/optimizer/transpose_optimizer_test.cc b/onnxruntime/test/optimizer/transpose_optimizer_test.cc
+index 9e9e9e9e9e..8e8e8e8e8e 100644
+--- a/onnxruntime/test/optimizer/transpose_optimizer_test.cc
++++ b/onnxruntime/test/optimizer/transpose_optimizer_test.cc
+@@ -4532,7 +4532,7 @@ TEST(TransposeOptimizerTests, RegressionTest_Permute1DConstantEmptyPerm) {
+ 
+   // Serialize the model to a string.
+   std::string model_data;
+-  model.ToProto().SerializeToString(&model_data);
++  ASSERT_TRUE(model.ToProto().SerializeToString(&model_data));
+ 
+   SessionOptions session_options;
+   session_options.graph_optimization_level = TransformerLevel::Level1;
diff --git a/pkgs/by-name/op/opengrok/package.nix b/pkgs/by-name/op/opengrok/package.nix
index d586801f8ba6..354cecb58896 100644
--- a/pkgs/by-name/op/opengrok/package.nix
+++ b/pkgs/by-name/op/opengrok/package.nix
@@ -8,12 +8,12 @@
 
 stdenv.mkDerivation rec {
   pname = "opengrok";
-  version = "1.14.11";
+  version = "1.14.12";
 
   # binary distribution
   src = fetchurl {
     url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz";
-    hash = "sha256-05Aw44JmTHyy6JRWPk5+gv5BDN/W1ci0ddjPfvww0zI=";
+    hash = "sha256-D67KpbmuqInnfymNc9QvreTVjZmzNuxoswD/ZxTlHx8=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/science/electronics/openhantek6022/default.nix b/pkgs/by-name/op/openhantek6022/package.nix
similarity index 88%
rename from pkgs/applications/science/electronics/openhantek6022/default.nix
rename to pkgs/by-name/op/openhantek6022/package.nix
index e92a92890c6c..481dd40bb622 100644
--- a/pkgs/applications/science/electronics/openhantek6022/default.nix
+++ b/pkgs/by-name/op/openhantek6022/package.nix
@@ -4,9 +4,7 @@
   fetchFromGitHub,
   makeWrapper,
   cmake,
-  wrapQtAppsHook,
-  qtbase,
-  qttools,
+  libsForQt5,
   fftw,
   libusb1,
   libglvnd,
@@ -26,14 +24,14 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     makeWrapper
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     fftw
     libusb1
     libglvnd
-    qtbase
-    qttools
+    libsForQt5.qtbase
+    libsForQt5.qttools
   ];
 
   postPatch = ''
@@ -51,6 +49,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/OpenHantek/OpenHantek6022";
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ baracoder ];
-    platforms = qtbase.meta.platforms;
+    platforms = libsForQt5.qtbase.meta.platforms;
   };
 }
diff --git a/pkgs/by-name/op/opentofu/package.nix b/pkgs/by-name/op/opentofu/package.nix
index 4a25b64c5c6c..22afac3969d4 100644
--- a/pkgs/by-name/op/opentofu/package.nix
+++ b/pkgs/by-name/op/opentofu/package.nix
@@ -16,16 +16,16 @@
 let
   package = buildGoModule rec {
     pname = "opentofu";
-    version = "1.11.8";
+    version = "1.12.0";
 
     src = fetchFromGitHub {
       owner = "opentofu";
       repo = "opentofu";
       tag = "v${version}";
-      hash = "sha256-0lsx+tLo/m7crkRLOtASwLpbjnpghFrsxuwNr2d+7y0=";
+      hash = "sha256-ciT5GOeL+09dnwdrRpFQBAhWVvpSBQQjJKJvNdVqjCw=";
     };
 
-    vendorHash = "sha256-WO5OtKwluks5nuSHJ4NO1+EKhtCrJE9MuMGmu5fYKM4=";
+    vendorHash = "sha256-ZcsZv4MLcrVUNoK/NewfwDWUpMdgxO/f2DkyTjUqCK4=";
     ldflags = [
       "-s"
       "-w"
@@ -34,7 +34,7 @@ let
     ];
 
     nativeBuildInputs = [ installShellFiles ];
-    patches = [ ./provider-path-0_15.patch ];
+    patches = [ ./provider-path-1_12.patch ];
 
     passthru = {
       inherit plugins;
diff --git a/pkgs/by-name/op/opentofu/provider-path-0_15.patch b/pkgs/by-name/op/opentofu/provider-path-0_15.patch
deleted file mode 100644
index 318df9ab69a8..000000000000
--- a/pkgs/by-name/op/opentofu/provider-path-0_15.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur terraform.old/internal/command/init.go terraform.new/internal/command/init.go
---- terraform.old/internal/command/init.go
-+++ terraform.new/internal/command/init.go
-@@ -3,6 +3,7 @@
- import (
- 	"context"
- 	"fmt"
-+	"os"
- 	"log"
- 	"strings"
- 
-@@ -55,6 +56,11 @@
- 
- 	var diags tfdiags.Diagnostics
- 
-+	val, ok := os.LookupEnv("NIX_TERRAFORM_PLUGIN_DIR")
-+	if ok {
-+		flagPluginPath = append(flagPluginPath, val)
-+	}
-+
- 	if len(flagPluginPath) > 0 {
- 		c.pluginPath = flagPluginPath
- 	}
diff --git a/pkgs/by-name/op/opentofu/provider-path-1_12.patch b/pkgs/by-name/op/opentofu/provider-path-1_12.patch
new file mode 100644
index 000000000000..fa1a86463578
--- /dev/null
+++ b/pkgs/by-name/op/opentofu/provider-path-1_12.patch
@@ -0,0 +1,24 @@
+diff --git a/internal/command/init.go b/internal/command/init.go
+index cd44c899bd..bef2426475 100644
+--- a/internal/command/init.go
++++ b/internal/command/init.go
+@@ -8,6 +8,7 @@ package command
+ import (
+ 	"context"
+ 	"fmt"
++	"os"
+ 	"log"
+ 	"reflect"
+ 	"slices"
+@@ -78,6 +79,11 @@ func (c *InitCommand) Run(rawArgs []string) int {
+ 	// continue to mutate the Meta object state for now.
+ 	c.Meta.input = args.ViewOptions.InputEnabled
+ 
++	val, ok := os.LookupEnv("NIX_TERRAFORM_PLUGIN_DIR")
++	if ok {
++		args.FlagPluginPath = append(args.FlagPluginPath, val)
++	}
++
+ 	if len(args.FlagPluginPath) > 0 {
+ 		c.pluginPath = args.FlagPluginPath
+ 	}
diff --git a/pkgs/by-name/ou/ouch/package.nix b/pkgs/by-name/ou/ouch/package.nix
index 67c683c7fe99..10458eae1768 100644
--- a/pkgs/by-name/ou/ouch/package.nix
+++ b/pkgs/by-name/ou/ouch/package.nix
@@ -19,16 +19,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ouch";
-  version = "0.7.1";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "ouch-org";
     repo = "ouch";
     rev = finalAttrs.version;
-    hash = "sha256-XT2CWYZiY5UskTmHKl9EVWBIJoOiR9rOCQUoN8U9o40=";
+    hash = "sha256-yQt+FeEUgC6JurFwOU1Yd++OYT75TmGO7/qchng/BUA=";
   };
 
-  cargoHash = "sha256-ckqzptKk6aituDMTA5JGzMWoXiVuOoK3N29KNUJnmgw=";
+  cargoHash = "sha256-3/uO5WLcGXWryJSQ8UhJGecpAD2vQVE2c19vYAHtT/4=";
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/pa/pangolin-cli/package.nix b/pkgs/by-name/pa/pangolin-cli/package.nix
index b8765bd109c7..f558700c7a2e 100644
--- a/pkgs/by-name/pa/pangolin-cli/package.nix
+++ b/pkgs/by-name/pa/pangolin-cli/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "pangolin-cli";
-  version = "0.8.2";
+  version = "0.8.3";
 
   src = fetchFromGitHub {
     owner = "fosrl";
     repo = "cli";
     tag = finalAttrs.version;
-    hash = "sha256-LMLeJVYu2L1+FVOLNapEShj36zv8vCP9BVkU4Y/g0vc=";
+    hash = "sha256-y+B29E6wXUcMQsWLAcLYIpg0uuqjr+zfxf2WVt0oY9A=";
   };
 
   ldflags = [
diff --git a/pkgs/by-name/pd/pdfarranger/package.nix b/pkgs/by-name/pd/pdfarranger/package.nix
index 777b48c3027b..34074b940159 100644
--- a/pkgs/by-name/pd/pdfarranger/package.nix
+++ b/pkgs/by-name/pd/pdfarranger/package.nix
@@ -12,14 +12,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "pdfarranger";
-  version = "1.13.0";
+  version = "1.14.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pdfarranger";
     repo = "pdfarranger";
     tag = finalAttrs.version;
-    hash = "sha256-lZuzFGRk19opLJ2pnh8s/VwdzDLtGwTchFh0ZuLezU4=";
+    hash = "sha256-vucl04ltyAFUhwGlFfNnLEyvX2SACEt0WCG3t4QLuxc=";
   };
 
   nativeBuildInputs = [ wrapGAppsHook3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ];
diff --git a/pkgs/development/libraries/pdfhummus/default.nix b/pkgs/by-name/pd/pdfhummus/package.nix
similarity index 96%
rename from pkgs/development/libraries/pdfhummus/default.nix
rename to pkgs/by-name/pd/pdfhummus/package.nix
index e32984e33602..8cf89b119ded 100644
--- a/pkgs/development/libraries/pdfhummus/default.nix
+++ b/pkgs/by-name/pd/pdfhummus/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  qtbase,
+  libsForQt5,
   zlib,
   freetype,
   libjpeg,
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/by-name/pe/pear-desktop/package.nix b/pkgs/by-name/pe/pear-desktop/package.nix
index d908de56244e..db1853814587 100644
--- a/pkgs/by-name/pe/pear-desktop/package.nix
+++ b/pkgs/by-name/pe/pear-desktop/package.nix
@@ -47,18 +47,17 @@ stdenv.mkDerivation (finalAttrs: {
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
 
-  postBuild =
-    lib.optionalString stdenv.hostPlatform.isDarwin ''
-      cp -R ${electron.dist}/Electron.app Electron.app
-      chmod -R u+w Electron.app
-    ''
-    + ''
-      pnpm build
-      ./node_modules/.bin/electron-builder \
-        --dir \
-        -c.electronDist=${if stdenv.hostPlatform.isDarwin then "." else electron.dist} \
-        -c.electronVersion=${electron.version}
-    '';
+  postBuild = ''
+    pnpm build
+
+    cp -r ${electron.dist} electron-dist
+    chmod -R u+w electron-dist
+
+    ./node_modules/.bin/electron-builder \
+      --dir \
+      -c.electronDist=electron-dist \
+      -c.electronVersion=${electron.version}
+  '';
 
   desktopItems = [
     (makeDesktopItem {
diff --git a/pkgs/by-name/pi/pinact/package.nix b/pkgs/by-name/pi/pinact/package.nix
index a8970748c5fa..1c729b9dc239 100644
--- a/pkgs/by-name/pi/pinact/package.nix
+++ b/pkgs/by-name/pi/pinact/package.nix
@@ -13,16 +13,16 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "pinact";
-  version = "3.9.2";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "suzuki-shunsuke";
     repo = "pinact";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wbonAugeAgN4drlndazoypQKH5vQNqmZj0Pbkmiygr0=";
+    hash = "sha256-aY/M9sv3XxYQf/MrDnMGq5RCUA8XK9XgxzHD1l3UkAQ=";
   };
 
-  vendorHash = "sha256-FEZ0F/6gmWMKE5iNfBONbeEIGVwTrBgDFa7q7knrfK8=";
+  vendorHash = "sha256-+AdS/+oDsOYG9F39IFd7bShRuCFYR9e4Vi6dRxeY82Q=";
 
   env.CGO_ENABLED = 0;
 
diff --git a/pkgs/by-name/pi/pixi-pack/package.nix b/pkgs/by-name/pi/pixi-pack/package.nix
index 010ab8d57272..27189e7518d6 100644
--- a/pkgs/by-name/pi/pixi-pack/package.nix
+++ b/pkgs/by-name/pi/pixi-pack/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pixi-pack";
-  version = "0.7.8";
+  version = "0.7.9";
 
   src = fetchFromGitHub {
     owner = "Quantco";
     repo = "pixi-pack";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/r1jiEH/6TKUA4WJBH+h7Ktn13Woqz36U+ARmWbCbrU=";
+    hash = "sha256-jCKlJPLlMrMByoVU1nzqccXBeyEi9CMjrWfL+ByqDhI=";
   };
 
-  cargoHash = "sha256-etcfU+KU8y7KeWXRUXe+lig+9BxnZf1cGfS8WHxlbn0=";
+  cargoHash = "sha256-0f7IkYPQ1kIBC4aCyBU0Dpo936awol0eJNW6KcFQIAA=";
 
   buildInputs = [ openssl ];
 
diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix
index b20f4faf9517..b4a0b29d761b 100644
--- a/pkgs/by-name/pi/pixi/package.nix
+++ b/pkgs/by-name/pi/pixi/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pixi";
-  version = "0.68.1";
+  version = "0.69.0";
 
   src = fetchFromGitHub {
     owner = "prefix-dev";
     repo = "pixi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nh8F2MEmBjanpj05bugv8URjRwdNTHSHU0BPqj2mRKM=";
+    hash = "sha256-Rp7fXUq5c74AiRHxcFEvbcCYQC7dsCG0LB+j6uMkqwI=";
   };
 
-  cargoHash = "sha256-UHih9R9VWxL7pSUOCGwiuPKTzI/FNukzNLLmZFo3bto=";
+  cargoHash = "sha256-0Z+VnexqN0ZOVMmxski3cRn2trMyk5DhKvXnh0l+K/g=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/pl/pls/package.nix b/pkgs/by-name/pl/pls/package.nix
index bdbd08aab5c6..e7cbec3eb4c0 100644
--- a/pkgs/by-name/pl/pls/package.nix
+++ b/pkgs/by-name/pl/pls/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pls";
-  version = "0.0.1-beta.9";
+  version = "0.0.1-beta.10";
 
   src = fetchFromGitHub {
     owner = "pls-rs";
     repo = "pls";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ofwdhGpqYlADDY2BLe0SkoHWqSeRNtQaXK61zWVFXzw=";
+    hash = "sha256-j0bYikR0DoHRcArNnHsuYxdYqT9YjsH1g+T3s16UmcI=";
   };
 
-  cargoHash = "sha256-P+4jRuakDUPaICJPsNJ6nXfhm09K/GC/VA9bsTXIMvc=";
+  cargoHash = "sha256-eh0beK1UYf/Xe30wGxli6dfPKh875yTnOn7CCN2XTtI=";
 
   meta = {
     changelog = "https://github.com/pls-rs/pls/releases/tag/${finalAttrs.src.tag}";
diff --git a/pkgs/by-name/po/popt/package.nix b/pkgs/by-name/po/popt/package.nix
index b7e84260c1b2..abe07f84237b 100644
--- a/pkgs/by-name/po/popt/package.nix
+++ b/pkgs/by-name/po/popt/package.nix
@@ -60,5 +60,9 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ qyliss ];
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
+    identifiers.purlParts = {
+      type = "github";
+      spec = "rpm-software-management/popt@popt-${finalAttrs.version}-release";
+    };
   };
 })
diff --git a/pkgs/by-name/pr/prometheus-bird-exporter/package.nix b/pkgs/by-name/pr/prometheus-bird-exporter/package.nix
index 64519fbf8418..2659ec8fdb34 100644
--- a/pkgs/by-name/pr/prometheus-bird-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-bird-exporter/package.nix
@@ -5,26 +5,29 @@
   nixosTests,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "bird-exporter";
-  version = "1.4.3";
+  version = "1.4.5";
+
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "czerwonk";
     repo = "bird_exporter";
-    rev = version;
-    sha256 = "sha256-aClwJ+J83iuZbfNP+Y1vKEjBULD5wh/R3TMceCccacc=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-uR3/2ktVxzEZOy57eFopLFsAuiw03e9WZn2QC4/GNVc=";
   };
 
-  vendorHash = "sha256-0EXRpehdpOYpq6H9udmNnQ24EucvAcPUKOlFSAAewbE=";
+  vendorHash = "sha256-seTykqpdYQiWp8CoTAJ62rzxDaLFqjWe8y5YMu8Ypm8=";
 
   passthru.tests = { inherit (nixosTests.prometheus-exporters) bird; };
 
   meta = {
     description = "Prometheus exporter for the bird routing daemon";
-    mainProgram = "bird_exporter";
     homepage = "https://github.com/czerwonk/bird_exporter";
+    changelog = "https://github.com/czerwonk/bird_exporter/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ lukegb ];
+    mainProgram = "bird_exporter";
   };
-}
+})
diff --git a/pkgs/by-name/pr/proton-pass-cli/package.nix b/pkgs/by-name/pr/proton-pass-cli/package.nix
index 425cc765bae0..f1cfa51d6133 100644
--- a/pkgs/by-name/pr/proton-pass-cli/package.nix
+++ b/pkgs/by-name/pr/proton-pass-cli/package.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "proton-pass-cli";
-  version = "2.0.2";
+  version = "2.1.0";
 
   src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system};
 
@@ -46,19 +46,19 @@ stdenv.mkDerivation (finalAttrs: {
     sources = {
       "aarch64-darwin" = fetchurl {
         url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-aarch64";
-        hash = "sha256-C/2ZxNgnDOLCkTyTqCPGIKiXXjwvHOJNI05BcGy1z0c=";
+        hash = "sha256-5FQSl6Xqipm6MWq2kza2FVXSajX4xCB4gqaAed40NoI=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-aarch64";
-        hash = "sha256-wSxTGtuCPU6uT25pBlxudnsQ7XEyihs/piWkiXrjs4w=";
+        hash = "sha256-4UgcR9yV/iQaQoQUFDRa+yzSCFIIk/SaPCOJdTgpMQI=";
       };
       "x86_64-darwin" = fetchurl {
         url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-x86_64";
-        hash = "sha256-qXXKavGRd6LSdLeoIiwlENhOE9JS/ZxQv432flS0KBg=";
+        hash = "sha256-iT53cCskSY8+AvLXWQGcqFklQJJBO1d7AFMEIYEDllo=";
       };
       "x86_64-linux" = fetchurl {
         url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-x86_64";
-        hash = "sha256-/WClBB5kKnsRNe9oeMPXzjUjsIMhDqgQDu5cNwEBftk=";
+        hash = "sha256-WnddX4Ov+9jBvL8VF8ONGhV8FgEz5xNrANUxG6/oupM=";
       };
     };
     updateScript = writeShellScript "update-proton-pass-cli" ''
diff --git a/pkgs/tools/security/proxmark3/default.nix b/pkgs/by-name/pr/proxmark3/package.nix
similarity index 95%
rename from pkgs/tools/security/proxmark3/default.nix
rename to pkgs/by-name/pr/proxmark3/package.nix
index 2c0ac5017148..868e5796ddeb 100644
--- a/pkgs/tools/security/proxmark3/default.nix
+++ b/pkgs/by-name/pr/proxmark3/package.nix
@@ -15,8 +15,7 @@
   udevCheckHook,
   nix-update-script,
   withGui ? true,
-  wrapQtAppsHook,
-  qtbase,
+  libsForQt5,
   withPython ? true,
   python3,
   withBlueshark ? false,
@@ -57,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
     gcc-arm-embedded
     udevCheckHook
   ]
-  ++ lib.optional withGui wrapQtAppsHook;
+  ++ lib.optional withGui libsForQt5.wrapQtAppsHook;
   buildInputs = [
     readline
     bzip2
@@ -68,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
     whereami
     lua
   ]
-  ++ lib.optional withGui qtbase
+  ++ lib.optional withGui libsForQt5.qtbase
   ++ lib.optional withPython python3
   ++ lib.optional withBlueshark bluez5;
 
diff --git a/pkgs/by-name/pv/pv-migrate/package.nix b/pkgs/by-name/pv/pv-migrate/package.nix
index 931214bd64f3..1534e1ee33fa 100644
--- a/pkgs/by-name/pv/pv-migrate/package.nix
+++ b/pkgs/by-name/pv/pv-migrate/package.nix
@@ -8,18 +8,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "pv-migrate";
-  version = "3.3.0";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "utkuozdemir";
     repo = "pv-migrate";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-ieE7kO/PA/2ZgvGbDhu1MzJTk5yvg2plKTyQe0Y/nb8=";
+    sha256 = "sha256-FJalS3cUaYFs1ChAH1JA6qrRYorDQaLvWzKIE21jYPs=";
   };
 
   subPackages = [ "cmd/pv-migrate" ];
 
-  vendorHash = "sha256-0KO5kIAP53VGau2M78PIMn6KCGAkymV7Y0msnlDjvjg=";
+  vendorHash = "sha256-KFcz6SAUIg8hi+Vo/Wf6jDF6QcZ5uNueee3sG9t2zyU=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/qa/qalculate-gtk/package.nix b/pkgs/by-name/qa/qalculate-gtk/package.nix
index 06bb06c1ae64..1ece0819d853 100644
--- a/pkgs/by-name/qa/qalculate-gtk/package.nix
+++ b/pkgs/by-name/qa/qalculate-gtk/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qalculate-gtk";
-  version = "5.10.0";
+  version = "5.11.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "qalculate-gtk";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JZfolSRLRLtv529f25lEPYOlz+y+EdRqKA0Y5d1dK3s=";
+    hash = "sha256-EVDbpE/T5EvKK/fTNSDbMFMQR+uamiXo7yjv9Se09w4=";
   };
 
   patches = [
diff --git a/pkgs/by-name/qa/qalculate-qt/package.nix b/pkgs/by-name/qa/qalculate-qt/package.nix
index 7297a744ac99..82cb820f2394 100644
--- a/pkgs/by-name/qa/qalculate-qt/package.nix
+++ b/pkgs/by-name/qa/qalculate-qt/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qalculate-qt";
-  version = "5.10.0";
+  version = "5.11.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "qalculate-qt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OxcwEydEerYhFnJAeXbGW6SpjdEIAi7UOQu8958qQFs=";
+    hash = "sha256-5u/YA5/k7JQclIqJUKvzGEenEhndo52m23XlFjkhw78=";
   };
 
   nativeBuildInputs = with qt6; [
diff --git a/pkgs/by-name/qb/qbittorrent/package.nix b/pkgs/by-name/qb/qbittorrent/package.nix
index 85343193cf40..7d21ed81972b 100644
--- a/pkgs/by-name/qb/qbittorrent/package.nix
+++ b/pkgs/by-name/qb/qbittorrent/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qbittorrent" + lib.optionalString (!guiSupport) "-nox";
-  version = "5.2.0";
+  version = "5.2.1";
 
   src = fetchFromGitHub {
     owner = "qbittorrent";
     repo = "qBittorrent";
     rev = "release-${finalAttrs.version}";
-    hash = "sha256-Ha2Pc08gztI9fupQMykVz5wVIyUu9dRtChxjAGSxcOQ=";
+    hash = "sha256-xC0XCVbshs4rtfLoJKKp0+IeSN2SRg7J5G504TcXFPI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/qdjango/default.nix b/pkgs/by-name/qd/qdjango/package.nix
similarity index 94%
rename from pkgs/development/libraries/qdjango/default.nix
rename to pkgs/by-name/qd/qdjango/package.nix
index d0f1a66b440a..ad780ca0d750 100644
--- a/pkgs/development/libraries/qdjango/default.nix
+++ b/pkgs/by-name/qd/qdjango/package.nix
@@ -4,8 +4,7 @@
   fetchFromGitHub,
   testers,
   doxygen,
-  qmake,
-  qtbase,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -49,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     doxygen
-    qmake
+    libsForQt5.qmake
   ];
 
   dontWrapQtApps = true;
@@ -57,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
   doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
 
   preCheck = ''
-    export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix}
+    export QT_PLUGIN_PATH=${lib.getBin libsForQt5.qtbase}/${libsForQt5.qtbase.qtPluginPrefix}
   ''
   + lib.optionalString stdenv.hostPlatform.isDarwin ''
     # at this point in the build, install_name for dylibs hasn't been patched yet so we need to set the library path.
diff --git a/pkgs/applications/misc/qelectrotech/default.nix b/pkgs/by-name/qe/qelectrotech/package.nix
similarity index 92%
rename from pkgs/applications/misc/qelectrotech/default.nix
rename to pkgs/by-name/qe/qelectrotech/package.nix
index 7ce61dcf307f..7b05c2dec4c5 100644
--- a/pkgs/applications/misc/qelectrotech/default.nix
+++ b/pkgs/by-name/qe/qelectrotech/package.nix
@@ -5,10 +5,7 @@
   installShellFiles,
   pkg-config,
   cmake,
-  qtbase,
-  qtsvg,
-  wrapQtAppsHook,
-  qttools,
+  libsForQt5,
   pugixml,
 }:
 let
@@ -53,13 +50,13 @@ stdenv.mkDerivation rec {
     installShellFiles
     pkg-config
     cmake
-    wrapQtAppsHook
-    qttools
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qttools
   ];
 
   buildInputs = [
-    qtbase
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
     pugixml
   ];
 
@@ -88,7 +85,7 @@ stdenv.mkDerivation rec {
     homepage = "https://qelectrotech.org/";
     license = lib.licenses.gpl2;
     maintainers = with lib.maintainers; [ yvesf ];
-    platforms = qtbase.meta.platforms;
+    platforms = libsForQt5.qtbase.meta.platforms;
     broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/applications/misc/qelectrotech/system-pugixml.patch b/pkgs/by-name/qe/qelectrotech/system-pugixml.patch
similarity index 100%
rename from pkgs/applications/misc/qelectrotech/system-pugixml.patch
rename to pkgs/by-name/qe/qelectrotech/system-pugixml.patch
diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/by-name/ql/qlcplus/package.nix
similarity index 89%
rename from pkgs/applications/misc/qlcplus/default.nix
rename to pkgs/by-name/ql/qlcplus/package.nix
index 6bb2506b6ea4..2c3d79f1716f 100644
--- a/pkgs/applications/misc/qlcplus/default.nix
+++ b/pkgs/by-name/ql/qlcplus/package.nix
@@ -2,15 +2,10 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
   pkg-config,
   udevCheckHook,
-  wrapQtAppsHook,
   udev,
-  qtmultimedia,
-  qtscript,
-  qtserialport,
-  qtwebsockets,
+  libsForQt5,
   alsa-lib,
   ola,
   libftdi1,
@@ -31,17 +26,17 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
+    libsForQt5.qmake
     pkg-config
     udevCheckHook
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     udev
-    qtmultimedia
-    qtscript
-    qtserialport
-    qtwebsockets
+    libsForQt5.qtmultimedia
+    libsForQt5.qtscript
+    libsForQt5.qtserialport
+    libsForQt5.qtwebsockets
     alsa-lib
     ola
     libftdi1
diff --git a/pkgs/development/libraries/qmarkdowntextedit/default.nix b/pkgs/by-name/qm/qmarkdowntextedit/package.nix
similarity index 93%
rename from pkgs/development/libraries/qmarkdowntextedit/default.nix
rename to pkgs/by-name/qm/qmarkdowntextedit/package.nix
index ad75505c3642..56df28267e51 100644
--- a/pkgs/development/libraries/qmarkdowntextedit/default.nix
+++ b/pkgs/by-name/qm/qmarkdowntextedit/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation {
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     hash = "sha256-EYBX2SJa8o4R/zEjSFbmFxhLI726WY21XmCkWIqPeFc=";
   };
 
-  nativeBuildInputs = [ qmake ];
+  nativeBuildInputs = [ libsForQt5.qmake ];
 
   dontWrapQtApps = true;
 
diff --git a/pkgs/applications/video/qmediathekview/default.nix b/pkgs/by-name/qm/qmediathekview/package.nix
similarity index 91%
rename from pkgs/applications/video/qmediathekview/default.nix
rename to pkgs/by-name/qm/qmediathekview/package.nix
index 0abe2d514ca7..e83a58bf02d1 100644
--- a/pkgs/applications/video/qmediathekview/default.nix
+++ b/pkgs/by-name/qm/qmediathekview/package.nix
@@ -3,11 +3,9 @@
   stdenv,
   fetchFromGitHub,
   boost,
-  qtbase,
   xz,
-  qmake,
   pkg-config,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -27,15 +25,15 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     xz
     boost
   ];
 
   nativeBuildInputs = [
-    qmake
+    libsForQt5.qmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   installFlags = [ "INSTALL_ROOT=$(out)" ];
diff --git a/pkgs/by-name/qs/qsv/package.nix b/pkgs/by-name/qs/qsv/package.nix
index 3eb96885a7e8..64be3c4f433a 100644
--- a/pkgs/by-name/qs/qsv/package.nix
+++ b/pkgs/by-name/qs/qsv/package.nix
@@ -33,7 +33,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "qsv";
-  version = "19.1.0";
+  version = "20.1.0";
 
   inherit buildFeatures;
 
@@ -41,10 +41,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "dathere";
     repo = "qsv";
     rev = finalAttrs.version;
-    hash = "sha256-R3Bv0Jkq5esLQSXbhk9m3Xr9K6EmqMtc3iDF7yRspJ0=";
+    hash = "sha256-dYUZ2IwvXTFwpv1cDQjmq+iq2g/vQQovpR0++/ZtSy8=";
   };
 
-  cargoHash = "sha256-Wk5OVUKVWHvhWc1ItJcOafY75Pd8ucA3XAGUR//mtqg=";
+  cargoHash = "sha256-7jZR5u32Hy0XQEeX+tWDbpkj7jM804LBUL93wgnA5bM=";
 
   buildInputs = [
     file
diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/by-name/ra/radeon-profile/package.nix
similarity index 87%
rename from pkgs/tools/misc/radeon-profile/default.nix
rename to pkgs/by-name/ra/radeon-profile/package.nix
index 5299fde25113..a7de444b968a 100644
--- a/pkgs/tools/misc/radeon-profile/default.nix
+++ b/pkgs/by-name/ra/radeon-profile/package.nix
@@ -2,10 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  wrapQtAppsHook,
-  qtbase,
-  qtcharts,
+  libsForQt5,
   libxrandr,
   libdrm,
 }:
@@ -16,12 +13,12 @@ stdenv.mkDerivation rec {
   version = "20200824";
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
-    qtcharts
+    libsForQt5.qtbase
+    libsForQt5.qtcharts
     libxrandr
     libdrm
   ];
diff --git a/pkgs/by-name/rc/rclone/package.nix b/pkgs/by-name/rc/rclone/package.nix
index b16697db83a3..bf9adacb7452 100644
--- a/pkgs/by-name/rc/rclone/package.nix
+++ b/pkgs/by-name/rc/rclone/package.nix
@@ -9,6 +9,7 @@
   makeWrapper,
   enableCmount ? true,
   fuse3,
+  macfuse-stubs,
   librclone,
   nix-update-script,
 }:
@@ -38,9 +39,14 @@ buildGoModule (finalAttrs: {
     makeWrapper
   ];
 
-  buildInputs = lib.optional enableCmount fuse3;
+  buildInputs = lib.optional enableCmount (
+    # cgofuse uses the fuse2 header locations on darwin
+    if stdenv.hostPlatform.isDarwin then (macfuse-stubs.override { isFuse3 = false; }) else fuse3
+  );
 
-  tags = [ "fuse3" ] ++ lib.optionals enableCmount [ "cmount" ];
+  tags =
+    lib.optionals (!stdenv.hostPlatform.isDarwin) [ "fuse3" ]
+    ++ lib.optionals enableCmount [ "cmount" ];
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/re/redpanda-client/package.nix b/pkgs/by-name/re/redpanda-client/package.nix
index 83bb11fe445e..50350ed8bad2 100644
--- a/pkgs/by-name/re/redpanda-client/package.nix
+++ b/pkgs/by-name/re/redpanda-client/package.nix
@@ -7,12 +7,12 @@
   stdenv,
 }:
 let
-  version = "26.1.8";
+  version = "26.1.9";
   src = fetchFromGitHub {
     owner = "redpanda-data";
     repo = "redpanda";
     rev = "v${version}";
-    sha256 = "sha256-/puIAMeUASG50U35RTRVIOlfD4NY3HZUZ6BKJzEh/s4=";
+    sha256 = "sha256-UrrFK4VjnovSH1ahmQPaKM/uZP0BA35ckvN4ELnfG10=";
   };
 in
 buildGoModule rec {
@@ -20,7 +20,7 @@ buildGoModule rec {
   inherit doCheck src version;
   modRoot = "./src/go/rpk";
   runVend = false;
-  vendorHash = "sha256-d+qn0JiNF8YcsuhDSp/RPCly5nTy/daHaCUap2hLKCM=";
+  vendorHash = "sha256-kpcExQ/SRl0ghZqJi3Lcoc+M5oDepvMgfQI96O4u1Yw=";
 
   ldflags = [
     ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"''
diff --git a/pkgs/by-name/re/regclient/package.nix b/pkgs/by-name/re/regclient/package.nix
index d6a723d56863..a0ef20843e8a 100644
--- a/pkgs/by-name/re/regclient/package.nix
+++ b/pkgs/by-name/re/regclient/package.nix
@@ -1,4 +1,5 @@
 {
+  stdenv,
   lib,
   buildGoModule,
   fetchFromGitHub,
@@ -16,15 +17,14 @@ let
   ];
 in
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "regclient";
   version = "0.11.3";
-  tag = "v${version}";
 
   src = fetchFromGitHub {
     owner = "regclient";
     repo = "regclient";
-    rev = tag;
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-/gKvjyFOzyTsgMuqCqZaWl2yun7f+eboQ0iLuXHh4lI=";
   };
   vendorHash = "sha256-P9ayAWvQY4WgmFTWzk2ZLQ5uwMvIsSfL73C99ROmze8=";
@@ -34,30 +34,37 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X github.com/regclient/regclient/internal/version.vcsTag=${tag}"
+    "-X github.com/regclient/regclient/internal/version.vcsTag=${finalAttrs.src.tag}"
   ];
 
+  env.CGO_ENABLED = 0;
+
   nativeBuildInputs = [
     installShellFiles
     lndir
   ];
 
-  postInstall = lib.concatMapStringsSep "\n" (bin: ''
-    export bin=''$${bin}
-    export outputBin=bin
+  postInstall = lib.concatMapStringsSep "\n" (
+    bin:
+    ''
+      export bin=''$${bin}
+      export outputBin=bin
 
-    mkdir -p $bin/bin
-    mv $out/bin/${bin} $bin/bin
+      mkdir -p $bin/bin
+      mv $out/bin/${bin} $bin/bin
+    ''
+    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+      installShellCompletion --cmd ${bin} \
+        --bash <($bin/bin/${bin} completion bash) \
+        --fish <($bin/bin/${bin} completion fish) \
+        --zsh <($bin/bin/${bin} completion zsh)
+    ''
+    + ''
+      lndir -silent $bin $out
 
-    installShellCompletion --cmd ${bin} \
-      --bash <($bin/bin/${bin} completion bash) \
-      --fish <($bin/bin/${bin} completion fish) \
-      --zsh <($bin/bin/${bin} completion zsh)
-
-    lndir -silent $bin $out
-
-    unset bin outputBin
-  '') bins;
+      unset bin outputBin
+    ''
+  ) bins;
 
   checkFlags = [
     # touches network
@@ -69,7 +76,7 @@ buildGoModule rec {
       "${bin}Version" = testers.testVersion {
         package = regclient;
         command = "${bin} version";
-        version = tag;
+        version = finalAttrs.src.tag;
       };
     }) bins
   );
@@ -80,6 +87,6 @@ buildGoModule rec {
     description = "Docker and OCI Registry Client in Go and tooling using those libraries";
     homepage = "https://github.com/regclient/regclient";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ maxbrunet ];
+    maintainers = [ lib.maintainers.maxbrunet ];
   };
-}
+})
diff --git a/pkgs/by-name/re/repath-studio/package.nix b/pkgs/by-name/re/repath-studio/package.nix
index f4560fed21e6..4502ba2dc6c9 100644
--- a/pkgs/by-name/re/repath-studio/package.nix
+++ b/pkgs/by-name/re/repath-studio/package.nix
@@ -16,8 +16,6 @@
   makeWrapper,
   replaceVars,
 
-  vulkan-loader,
-
   nixosTests,
 }:
 buildNpmPackage (finalAttrs: {
@@ -72,19 +70,13 @@ buildNpmPackage (finalAttrs: {
   buildPhase = ''
     runHook preBuild
 
-    # electronDist needs to be modifiable
-    cp -r ${electron.dist} electron-dist
-    chmod -R u+w electron-dist
-  ''
-  # Electron builder complains about symlink in electron-dist
-  + lib.optionalString stdenv.hostPlatform.isLinux ''
-    rm electron-dist/libvulkan.so.1
-    cp ${lib.getLib vulkan-loader}/lib/libvulkan.so.1 electron-dist
-  ''
-  + ''
+    electron_dist="$(mktemp -d)"
+    cp -r ${electron.dist}/. "$electron_dist"
+    chmod -R u+w "$electron_dist"
+
     npm run build
     npm exec electron-builder -- --dir \
-      -c.electronDist=electron-dist \
+      -c.electronDist="$electron_dist" \
       -c.electronVersion=${electron.version}
 
     runHook postBuild
@@ -123,7 +115,7 @@ buildNpmPackage (finalAttrs: {
   doCheck = stdenv.hostPlatform.isLinux;
   checkPhase = ''
     runHook preCheck
-    export ELECTRON_OVERRIDE_DIST_PATH=electron-dist/
+    export ELECTRON_OVERRIDE_DIST_PATH="$electron_dist"
     export PUPPETEER_EXECUTABLE_PATH=${chromium}/bin/chromium
     export CHROME_BIN=${chromium}/bin/chromium
     npm run test
diff --git a/pkgs/by-name/ro/routedns/package.nix b/pkgs/by-name/ro/routedns/package.nix
index bbefbb44107b..b72c1fcd0fa4 100644
--- a/pkgs/by-name/ro/routedns/package.nix
+++ b/pkgs/by-name/ro/routedns/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "routedns";
-  version = "0.1.170";
+  version = "0.1.188";
 
   src = fetchFromGitHub {
     owner = "folbricht";
     repo = "routedns";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-hCjsyBnCHewMopnLue70ibKfTt+xUmg0/Kk+eKU/+JQ=";
+    hash = "sha256-ZVlWN8UV/R0tZKp3w/2fAAiFKZXyiwh0RtyolNaf25k=";
   };
 
   vendorHash = "sha256-a4KcKb75yWv7+1vIYCypS9nnrFJ3zogXIPzUVVA7AXs=";
diff --git a/pkgs/by-name/rs/rsshub/package.nix b/pkgs/by-name/rs/rsshub/package.nix
index e83195e4022a..bc45272d7f1e 100644
--- a/pkgs/by-name/rs/rsshub/package.nix
+++ b/pkgs/by-name/rs/rsshub/package.nix
@@ -12,13 +12,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "rsshub";
-  version = "0-unstable-2026-05-14";
+  version = "0-unstable-2026-05-23";
 
   src = fetchFromGitHub {
     owner = "DIYgod";
     repo = "RSSHub";
-    rev = "9d3790f73cc0a0131fe38378157f5e464d2e08ee";
-    hash = "sha256-G3Lnmjzeqfwe6rmo+2PQ2NKYeKcTu/L+RTqft7UdCrg=";
+    rev = "b5bcb8a5677b0491248e1f8dc732552d0198b8d0";
+    hash = "sha256-IgjzdXCyetDOU74Oy2f+aGhaEbGqX3oI78Kp2CUi0YM=";
   };
 
   patches = [
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 3;
-    hash = "sha256-IRqBTLdl2XC+dql7CqOfYxy+ej1UXItY932L3tWHd/s=";
+    hash = "sha256-KB9NAK0lqnMZ504hbKoj1Mpm0swDvrBSW4ggAORqKOo=";
     pnpm = pnpm_10;
   };
 
diff --git a/pkgs/by-name/rt/rtl_fm_streamer/package.nix b/pkgs/by-name/rt/rtl_fm_streamer/package.nix
index 777e927c92e5..0154b55258df 100644
--- a/pkgs/by-name/rt/rtl_fm_streamer/package.nix
+++ b/pkgs/by-name/rt/rtl_fm_streamer/package.nix
@@ -6,34 +6,20 @@
   pkg-config,
   libusb1,
   libev,
+  rtl-sdr,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rtl_fm_streamer";
-  version = "unstable-2021-06-08";
+  version = "0-unstable-2026-05-23";
 
   src = fetchFromGitHub {
     owner = "AlbrechtL";
     repo = "rtl_fm_streamer";
-    rev = "ceb2bf06883f986ed01aa57c84989ba35b6b9a27";
-    hash = "sha256-9M7GS6AC7HEJge04vl7V6ZdtwWvbMu/Rhaf9fwQa9WA=";
+    rev = "7d98bcee154be86b772ab9440bc65361ac2cad67";
+    hash = "sha256-IlZcxu9JMaiqY+Vu6Bv14JxpQeJqytugW4mAvS0qIKY=";
   };
 
-  postPatch = ''
-    substituteInPlace CMakeLists.txt \
-      --replace '/etc/udev/rules.d' "$out/etc/udev/rules.d"
-
-    substituteInPlace rtl-sdr.rules \
-      --replace 'MODE:="0666"' 'ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev"'
-
-    substituteInPlace CMakeLists.txt \
-      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
-  '';
-
-  patches = [
-    ./use-stdbool.patch
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -42,6 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libusb1
     libev
+    rtl-sdr
   ];
 
   cmakeFlags = [
@@ -55,6 +42,5 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/AlbrechtL/rtl_fm_streamer";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ doronbehar ];
-    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
   };
 })
diff --git a/pkgs/by-name/sa/sage/patches/revert-blas-mesonification.patch b/pkgs/by-name/sa/sage/patches/revert-blas-mesonification.patch
new file mode 100644
index 000000000000..8abda9d694c7
--- /dev/null
+++ b/pkgs/by-name/sa/sage/patches/revert-blas-mesonification.patch
@@ -0,0 +1,89 @@
+diff --git a/src/sage/config.py.in b/src/sage/config.py.in
+index 3a95538d313..f75e951f3b8 100644
+--- a/src/sage/config.py.in
++++ b/src/sage/config.py.in
+@@ -48,6 +48,11 @@ FOURTITWO_PPI = "@FOURTITWO_PPI@"
+ FOURTITWO_CIRCUITS = "@FOURTITWO_CIRCUITS@"
+ FOURTITWO_GROEBNER = "@FOURTITWO_GROEBNER@"
+ 
++# Colon-separated list of pkg-config modules to search for cblas functionality.
++# We hard-code it here as cblas because configure (build/pkgs/openblas/spkg-configure.m4)
++# always provides cblas.pc, if necessary by creating a facade pc file for a system BLAS.
++CBLAS_PC_MODULES = "cblas"
++
+ # for sage_setup.setenv
+ SAGE_ARCHFLAGS = "@SAGE_ARCHFLAGS@"
+ SAGE_PKG_CONFIG_PATH = "@SAGE_PKG_CONFIG_PATH@".replace("$SAGE_LOCAL", SAGE_LOCAL)
+diff --git a/src/sage/env.py b/src/sage/env.py
+index f6c198a8617..dc45d11fb46 100644
+--- a/src/sage/env.py
++++ b/src/sage/env.py
+@@ -218,6 +218,7 @@ FOURTITWO_RAYS = var("FOURTITWO_RAYS")
+ FOURTITWO_PPI = var("FOURTITWO_PPI")
+ FOURTITWO_CIRCUITS = var("FOURTITWO_CIRCUITS")
+ FOURTITWO_GROEBNER = var("FOURTITWO_GROEBNER")
++CBLAS_PC_MODULES = var("CBLAS_PC_MODULES", "cblas:openblas:blas")
+ ECL_CONFIG = var("ECL_CONFIG", "ecl-config")
+ NTL_INCDIR = var("NTL_INCDIR")
+ NTL_LIBDIR = var("NTL_LIBDIR")
+@@ -322,8 +323,17 @@ def sage_include_directories(use_sources=False):
+     return dirs
+ 
+ 
++def get_cblas_pc_module_name() -> str:
++    """
++    Return the name of the BLAS libraries to be used.
++    """
++    import pkgconfig
++    cblas_pc_modules = CBLAS_PC_MODULES.split(':')
++    return next(blas_lib for blas_lib in cblas_pc_modules if pkgconfig.exists(blas_lib))
++
++
+ default_required_modules = ('fflas-ffpack', 'givaro', 'gsl', 'linbox', 'Singular',
+-                            'libpng', 'gdlib', 'm4ri', 'zlib', 'ecl')
++                            'libpng', 'gdlib', 'm4ri', 'zlib', 'cblas', 'ecl')
+ 
+ 
+ default_optional_modules = ('lapack',)
+@@ -348,7 +358,7 @@ def cython_aliases(required_modules=None, optional_modules=None):
+         sage: cython_aliases()
+         {...}
+         sage: sorted(cython_aliases().keys())
+-        ['ECL_CFLAGS',
++        ['CBLAS_CFLAGS',
+          ...,
+          'ZLIB_LIBRARIES']
+         sage: cython_aliases(required_modules=('module-that-is-assumed-to-not-exist'))
+@@ -395,6 +405,8 @@ def cython_aliases(required_modules=None, optional_modules=None):
+     for lib, required in itertools.chain(((lib, True) for lib in required_modules),
+                                          ((lib, False) for lib in optional_modules)):
+         var = lib.upper().replace("-", "") + "_"
++        if lib == 'cblas':
++            lib = get_cblas_pc_module_name()
+         if lib == 'zlib':
+             aliases[var + "CFLAGS"] = ""
+             try:
+diff --git a/src/sage/misc/cython.py b/src/sage/misc/cython.py
+index 6d30189ae89..830a744c1aa 100644
+--- a/src/sage/misc/cython.py
++++ b/src/sage/misc/cython.py
+@@ -50,12 +50,16 @@ def _standard_libs_libdirs_incdirs_aliases():
+          {...})
+     """
+     aliases = cython_aliases()
+-    standard_libs = ["mpfr", "gmp", "gmpxx", "pari", "m", "ec", "gsl", "ntl"]
++    standard_libs = [
++        'mpfr', 'gmp', 'gmpxx', 'pari', 'm',
++        'ec', 'gsl',
++    ] + aliases["CBLAS_LIBRARIES"] + [
++        'ntl']
+     standard_libdirs = []
+     if SAGE_LOCAL:
+         standard_libdirs.append(os.path.join(SAGE_LOCAL, "lib"))
+-    standard_libdirs.extend(aliases["NTL_LIBDIR"])
+-    standard_incdirs = [dir.as_posix() for dir in get_include_dirs()] + aliases["NTL_INCDIR"]
++    standard_libdirs.extend(aliases["CBLAS_LIBDIR"] + aliases["NTL_LIBDIR"])
++    standard_incdirs = [dir.as_posix() for dir in get_include_dirs()] + aliases["CBLAS_INCDIR"] + aliases["NTL_INCDIR"]
+     return standard_libs, standard_libdirs, standard_incdirs, aliases
+ 
+ ################################################################
diff --git a/pkgs/by-name/sa/sage/patches/sagedoc-silence-formatting-warnings.patch b/pkgs/by-name/sa/sage/patches/sagedoc-silence-formatting-warnings.patch
new file mode 100644
index 000000000000..49361f86f5fd
--- /dev/null
+++ b/pkgs/by-name/sa/sage/patches/sagedoc-silence-formatting-warnings.patch
@@ -0,0 +1,14 @@
+diff --git a/src/sage_docbuild/sphinxbuild.py b/src/sage_docbuild/sphinxbuild.py
+index 62b2d3cb112..df4665982e8 100644
+--- a/src/sage_docbuild/sphinxbuild.py
++++ b/src/sage_docbuild/sphinxbuild.py
+@@ -107,7 +107,8 @@ class SageSphinxLogger():
+             re.compile('WARNING: Any IDs not assiend for figure node'),
+             re.compile('WARNING: .* is not referenced'),
+             re.compile('WARNING: Build finished'),
+-            re.compile('WARNING: rST localisation for language .* not found')
++            re.compile('WARNING: rST localisation for language .* not found'),
++            re.compile('WARNING: error while formatting arguments for .*')
+         )
+         # The warning "unknown config value 'multidoc_first_pass'..."
+         # should only appear when building the documentation for a
diff --git a/pkgs/by-name/sa/sage/patches/sagedoc-standalone-meson.patch b/pkgs/by-name/sa/sage/patches/sagedoc-standalone-meson.patch
new file mode 100644
index 000000000000..29e309c60d2a
--- /dev/null
+++ b/pkgs/by-name/sa/sage/patches/sagedoc-standalone-meson.patch
@@ -0,0 +1,129 @@
+diff --git a/src/doc/en/reference/repl/meson.build b/src/doc/en/reference/repl/meson.build
+index eb492404897..9b162becf3b 100644
+--- a/src/doc/en/reference/repl/meson.build
++++ b/src/doc/en/reference/repl/meson.build
+@@ -9,10 +9,3 @@ doc_sources = [
+ foreach file : doc_sources
+   doc_src += fs.copyfile(file)
+ endforeach
+-
+-doc_src_repl = custom_target(
+-  'options',
+-  output: ['options.txt'],
+-  command: [py, src / 'sage' / 'cli', '--help'],
+-  capture: true,
+-)
+diff --git a/src/doc/meson.build b/src/doc/meson.build
+index 1f33822cf5f..5ba1ab0397b 100644
+--- a/src/doc/meson.build
++++ b/src/doc/meson.build
+@@ -1,11 +1,21 @@
+-if not get_option('build-docs')
+-  subdir_done()
+-endif
+-
+-warning(
+-  'Documentation building enabled, generating targets may be slow. To disable this, pass -Dbuild-docs=false.',
++project(
++  'SageMath',
++  ['c', 'cpp', 'cython'],
++  version: '10.9',
++  license: 'GPL v3',
++  default_options: ['c_std=c17', 'cpp_std=c++17', 'python.install_env=auto'],
++  meson_version: '>=1.5',
+ )
+ 
++src = meson.current_source_dir()
++fs = import('fs')
++
++# Python module
++# https://mesonbuild.com/Python-module.html
++py_module = import('python')
++py = py_module.find_installation(pure: false)
++py_dep = py.dependency()
++
+ sphinx_check = py_module.find_installation(required: false, modules: ['sphinx'])
+ if not sphinx_check.found()
+   warning(
+@@ -35,21 +45,17 @@ doc_bootstrap = custom_target(
+   'bootstrap',
+   output: ['autogen'],
+   command: [
+-    py,
+-    files('../../tools/bootstrap-docs.py'),
++    'sage',
++    '-python',
++    files('bootstrap-docs.py'),
+     meson.current_build_dir(),
+   ],
+-  env: {'SAGE_ROOT': root},
+-  # doc_src is not really a dependency of the bootstrap, but we want to make sure
+-  # that all the source files are present before running the actual doc build
+-  # so let's collect all source-related targets here.
+-  depends: doc_src,
+ )
+ 
+ references = run_command(
+-  py,
+   [
+-    src / 'build-docs.py',
++    'sage',
++    '--docbuild',
+     '--no-prune-empty-dirs',
+     '--all-documents',
+     'reference',
+@@ -71,10 +77,7 @@ foreach type : ['inventory', 'html', 'pdf']
+       short_ref = ref
+     endif
+     deps = []
+-    deps += doc_bootstrap
+-    if short_ref == 'repl'
+-      deps += doc_src_repl
+-    endif
++    deps += doc_bootstrap
+     if type == 'html' or type == 'pdf'
+       deps += reference_inventory
+     endif
+@@ -93,8 +96,8 @@ foreach type : ['inventory', 'html', 'pdf']
+       'doc-' + type + '-reference-' + short_ref,
+       output: [type + short_ref],
+       command: [
+-        py,
+-        src / 'build-docs.py',
++        'sage',
++        '--docbuild',
+         '--no-prune-empty-dirs',
+         '--no-pdf-links',
+         ref,
+@@ -120,9 +123,9 @@ foreach type : ['inventory', 'html', 'pdf']
+ endforeach
+ 
+ other_documents = run_command(
+-  py,
+   [
+-    src / 'build-docs.py',
++    'sage',
++    '--docbuild',
+     '--no-prune-empty-dirs',
+     '--all-documents',
+     'all',
+@@ -140,8 +143,8 @@ foreach type : ['html', 'pdf']
+       'doc-' + type + '-other-' + short_doc,
+       output: [type + short_doc],
+       command: [
+-        py,
+-        src / 'build-docs.py',
++        'sage',
++        '--docbuild',
+         '--no-prune-empty-dirs',
+         '--no-pdf-links',
+         doc,
+diff --git a/src/meson.build b/src/meson.build
+index 039cbbd1294..dfb82d980fb 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -309,4 +309,3 @@ src = meson.current_source_dir()
+ 
+ # Submodules
+ subdir('sage')
+-subdir('doc')
diff --git a/pkgs/by-name/sa/sage/patches/sphinx-docbuild-subprocesses.patch b/pkgs/by-name/sa/sage/patches/sphinx-docbuild-subprocesses.patch
deleted file mode 100644
index 4010c6e6fcb7..000000000000
--- a/pkgs/by-name/sa/sage/patches/sphinx-docbuild-subprocesses.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/src/sage_docbuild/builders.py b/src/sage_docbuild/builders.py
-index 91035a01f1c..24f3d0c7c12 100644
---- a/src/sage_docbuild/builders.py
-+++ b/src/sage_docbuild/builders.py
-@@ -130,10 +130,9 @@ def builder_helper(type):
-         logger.debug(build_command)
- 
-         # Run Sphinx with Sage's special logger
--        sys.argv = ["sphinx-build"] + build_command.split()
--        from .sphinxbuild import runsphinx
-+        args = "python3 -um sage_docbuild.sphinxbuild -N".split() + build_command.split()
-         try:
--            runsphinx()
-+            subprocess.check_call(args)
-         except Exception:
-             if build_options.ABORT_ON_ERROR:
-                 raise
-diff --git a/src/sage_docbuild/sphinxbuild.py b/src/sage_docbuild/sphinxbuild.py
-index 62b2d3cb112..aa7dc07741b 100644
---- a/src/sage_docbuild/sphinxbuild.py
-+++ b/src/sage_docbuild/sphinxbuild.py
-@@ -331,3 +331,8 @@ def runsphinx():
- 
-     if not sys.warnoptions:
-         warnings.filters = original_filters[:]
-+
-+if __name__ == '__main__':
-+    import sys
-+    sys.argv[0] = "sphinx-build"
-+    runsphinx()
diff --git a/pkgs/by-name/sa/sage/patches/workaround-cython-relpaths.patch b/pkgs/by-name/sa/sage/patches/workaround-cython-relpaths.patch
new file mode 100644
index 000000000000..b79be489fc68
--- /dev/null
+++ b/pkgs/by-name/sa/sage/patches/workaround-cython-relpaths.patch
@@ -0,0 +1,32 @@
+diff --git a/src/sage/config.py.in b/src/sage/config.py.in
+index 3a95538d313..cdd551122fc 100644
+--- a/src/sage/config.py.in
++++ b/src/sage/config.py.in
+@@ -4,6 +4,8 @@ import sage
+ 
+ VERSION = "@PACKAGE_VERSION@"
+ 
++SAGE_BUILD_SRC = "@EDITABLE_SRC@/src"
++
+ # The following must not be used during build to determine source or installation
+ # location of sagelib.  See comments in SAGE_ROOT/src/Makefile.in
+ # These variables come first so that other substituted variable values can refer
+diff --git a/src/sage/misc/sageinspect.py b/src/sage/misc/sageinspect.py
+index c237af52c24..7a8e8291406 100644
+--- a/src/sage/misc/sageinspect.py
++++ b/src/sage/misc/sageinspect.py
+@@ -270,6 +270,14 @@ def _extract_embedded_position(docstring):
+         return None
+ 
+     raw_filename = res.group('FILENAME')
++
++    # remove SAGE_BUILD_SRC prefix to workaround
++    # https://github.com/cython/cython/pull/6755
++    from sage.config import SAGE_BUILD_SRC
++    from os.path import commonprefix, relpath
++    if commonprefix([raw_filename, SAGE_BUILD_SRC]) == SAGE_BUILD_SRC:
++        raw_filename = relpath(raw_filename, SAGE_BUILD_SRC)
++
+     filename = raw_filename
+ 
+     if not os.path.isabs(filename):
diff --git a/pkgs/by-name/sa/sage/sage-env.nix b/pkgs/by-name/sa/sage/sage-env.nix
index 87fb4bd9b54f..bd96c0465077 100644
--- a/pkgs/by-name/sa/sage/sage-env.nix
+++ b/pkgs/by-name/sa/sage/sage-env.nix
@@ -7,6 +7,7 @@
   env-locations,
   gfortran,
   ninja,
+  meson,
   bash,
   coreutils,
   gnused,
@@ -66,6 +67,7 @@ let
       pythonEnv
       gfortran # for inline fortran
       ninja # for inline fortran via numpy.f2py
+      meson # for inline fortran
       stdenv.cc # for cython
       bash
       coreutils
@@ -129,84 +131,60 @@ writeTextFile rec {
         m4ri
       ]
     }'
-    export SAGE_ROOT='${sagelib.src}'
-  ''
-  +
-    # TODO: is using pythonEnv instead of @sage-local@ here a good
-    # idea? there is a test in src/sage/env.py that checks if the values
-    # SAGE_ROOT and SAGE_LOCAL set here match the ones set in env.py.
-    # we fix up env.py's SAGE_ROOT in sage-src.nix (which does not
-    # have access to sage-with-env), but env.py autodetects
-    # SAGE_LOCAL to be pythonEnv.
-    # setting SAGE_LOCAL to pythonEnv also avoids having to create
-    # python3, ipython, ipython3 and jupyter symlinks in
-    # sage-with-env.nix.
-    ''
-        export SAGE_LOCAL='${pythonEnv}'
+    export PATH="${runtimepath}:$PATH"
+    export SAGE_DOC="''${SAGE_DOC_OVERRIDE:-doc-placeholder}"
+    export SAGE_DOC_SRC="''${SAGE_DOC_SRC_OVERRIDE:-${sagelib.src}/src/doc}"
 
-        export SAGE_SHARE='${sagelib}/share'
-        export SAGE_ENV_CONFIG_SOURCED=1 # sage-env complains if sage-env-config is not sourced beforehand
-        orig_path="$PATH"
-        export PATH='${runtimepath}'
+    # set locations of dependencies
+    . ${env-locations}/sage-env-locations
 
-        # set dependent vars, like JUPYTER_CONFIG_DIR
-        source "${sagelib.src}/src/bin/sage-env"
-        export PATH="$RUNTIMEPATH_PREFIX:${runtimepath}:$orig_path" # sage-env messes with PATH
+    # needed for cython
+    export CC='${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc'
+    export CXX='${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++'
+    # cython needs to find these libraries, otherwise will fail with `ld: cannot find -lflint` or similar
+    export LDFLAGS='${
+      lib.concatStringsSep " " (
+        map (pkg: "-L${pkg}/lib") [
+          flint
+          gap
+          glpk
+          gmp
+          mpfr
+          pari
+          zlib
+          eclib
+          gsl
+          ntl
+          sympow
+        ]
+      )
+    }'
+    export CFLAGS='${
+      lib.concatStringsSep " " (
+        map (pkg: "-isystem ${pkg}/include") [
+          singular
+          gmp.dev
+          glpk
+          flint
+          gap
+          mpfr.dev
+        ]
+      )
+    }'
+    export CXXFLAGS=$CFLAGS
 
-        export SAGE_LOGS="$TMPDIR/sage-logs"
-        export SAGE_DOC="''${SAGE_DOC_OVERRIDE:-doc-placeholder}"
-        export SAGE_DOC_SRC="''${SAGE_DOC_SRC_OVERRIDE:-${sagelib.src}/src/doc}"
+    export SAGE_LIB='${sagelib}/${python3.sitePackages}'
 
-        # set locations of dependencies
-        . ${env-locations}/sage-env-locations
+    export SAGE_EXTCODE='${sagelib.src}/src/sage/ext_data'
 
-        # needed for cython
-        export CC='${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc'
-        export CXX='${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++'
-        # cython needs to find these libraries, otherwise will fail with `ld: cannot find -lflint` or similar
-        export LDFLAGS='${
-          lib.concatStringsSep " " (
-            map (pkg: "-L${pkg}/lib") [
-              flint
-              gap
-              glpk
-              gmp
-              mpfr
-              pari
-              zlib
-              eclib
-              gsl
-              ntl
-              sympow
-            ]
-          )
-        }'
-        export CFLAGS='${
-          lib.concatStringsSep " " (
-            map (pkg: "-isystem ${pkg}/include") [
-              singular
-              gmp.dev
-              glpk
-              flint
-              gap
-              mpfr.dev
-            ]
-          )
-        }'
-        export CXXFLAGS=$CFLAGS
-
-        export SAGE_LIB='${sagelib}/${python3.sitePackages}'
-
-        export SAGE_EXTCODE='${sagelib.src}/src/sage/ext_data'
-
-      # for find_library
-        export DYLD_LIBRARY_PATH="${
-          lib.makeLibraryPath [
-            stdenv.cc.libc
-            singular
-            giac
-            gap
-          ]
-        }''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH"
-    '';
+    # for find_library
+    export DYLD_LIBRARY_PATH="${
+      lib.makeLibraryPath [
+        stdenv.cc.libc
+        singular
+        giac
+        gap
+      ]
+    }''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH"
+  '';
 }
diff --git a/pkgs/by-name/sa/sage/sage-src.nix b/pkgs/by-name/sa/sage/sage-src.nix
index 085ee20c9ad4..28449d48f066 100644
--- a/pkgs/by-name/sa/sage/sage-src.nix
+++ b/pkgs/by-name/sa/sage/sage-src.nix
@@ -12,14 +12,14 @@
 # all get the same sources with the same patches applied.
 
 stdenv.mkDerivation rec {
-  version = "10.7";
+  version = "10.9";
   pname = "sage-src";
 
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "sage";
     rev = version;
-    hash = "sha256-nYlBmKQ9TD5EAVvNwo8YzqAd5IUCpTU3kBTqUH21IxQ=";
+    hash = "sha256-8IBCQYdmL7ane7/WOoogArbwgqPDtL8ecz9GIzuEfOU=";
   };
 
   # contains essential files (e.g., setup.cfg) generated by the bootstrap script.
@@ -27,21 +27,39 @@ stdenv.mkDerivation rec {
   configure-src = fetchurl {
     # the hash below is the tagged commit's _parent_. it can also be found by looking for
     # the "configure" asset at https://github.com/sagemath/sage/releases/tag/${version}
-    url = "mirror://sageupstream/configure/configure-858268b40010e5ed6da13488ad0f52cda4d1f70e.tar.gz";
-    hash = "sha256-TsVX+wUWr+keCXmGQp1OHGXgNc7luajyGxfTwduSEtc=";
+    url = "mirror://sageupstream/configure/configure-8592858fd4c0eb936cfa9ebf704d165f6b857617.tar.gz";
+    hash = "sha256-jakdc+4S/2uRooEaXMlNZpo01dVBumVp7HHHP4iZu0c=";
   };
 
   # Patches needed because of particularities of nix or the way this is packaged.
   # The goal is to upstream all of them and get rid of this list.
   nixPatches = [
-    # Parallelize docubuild using subprocesses, fixing an isolation issue. See
-    # https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE
-    ./patches/sphinx-docbuild-subprocesses.patch
-
     # After updating smypow to (https://github.com/sagemath/sage/issues/3360)
     # we can now set the cache dir to be within the .sage directory. This is
     # not strictly necessary, but keeps us from littering in the user's HOME.
     ./patches/sympow-cache.patch
+
+    # MILD HACK: Turn src/doc/meson.build into a standalone project, so we can
+    # docbuild separately.
+    ./patches/sagedoc-standalone-meson.patch
+
+    # Silence some warnings during docbuild. Imported from Arch.
+    ./patches/sagedoc-silence-formatting-warnings.patch
+
+    # Workaround for https://github.com/cython/cython/pull/6755, adapted from Void. Can be removed after next Cython release.
+    ./patches/workaround-cython-relpaths.patch
+
+    # Revert https://github.com/sagemath/sage/pull/40520. It causes
+    # "undefined symbol: cblas_ctrmv" errors.
+    ./patches/revert-blas-mesonification.patch
+
+    # https://github.com/sagemath/sage/pull/41637 causes problems when
+    # docbuilding.
+    (fetchpatch2 {
+      url = "https://github.com/sagemath/sage/commit/854ea0e546ee24ff09072ee77550b944b54f697c.patch?full_index=1";
+      revert = true;
+      hash = "sha256-j5evAmOtKEG4OVFb/w/SVY2vvP5BSkqHBDmnroh8XY0=";
+    })
   ]
   ++ lib.optionals (stdenv.cc.isClang) [
     # https://github.com/NixOS/nixpkgs/pull/264126
@@ -60,11 +78,11 @@ stdenv.mkDerivation rec {
     # a more conservative version of https://github.com/sagemath/sage/pull/37951
     ./patches/gap-element-crash.patch
 
-    # https://github.com/sagemath/sage/pull/40895, landed in 10.8.beta6
+    # https://github.com/sagemath/sage/pull/42009, landed in 10.10.beta0
     (fetchpatch2 {
-      name = "doctest-absolute-path.patch";
-      url = "https://github.com/sagemath/sage/commit/3a5904d43f552bf63ed1eed9154f87b1f0de53fb.patch?full_index=1";
-      hash = "sha256-rp+9d8Y6kifWzufE07GWU68txPn//w7uMn4LcpITaBs=";
+      name = "gap-root-paths.patch";
+      url = "https://github.com/sagemath/sage/commit/24c9605a770b2419cd401bf6c8780bb4be923244.patch?full_index=1";
+      hash = "sha256-68w2HWLR6mb13BWi5Fb6SfPAqPbdJrns0l5T6SoMqNI=";
     })
   ];
 
@@ -75,63 +93,6 @@ stdenv.mkDerivation rec {
   # should come from or be proposed to upstream. This list will probably never
   # be empty since dependencies update all the time.
   packageUpgradePatches = [
-    # https://github.com/sagemath/sage/pull/40919, landed in 10.8.beta8
-    (fetchpatch2 {
-      name = "gap-4.15.1-update.patch";
-      url = "https://github.com/sagemath/sage/commit/54d4ddb132cc71ef26b4db1f48afd6736d41cc63.patch?full_index=1";
-      hash = "sha256-PZyOXRsgcsPvgceGGZXet5URJgWiIlCfFx8tvwpLk5A=";
-      excludes = [ "src/doc/zh/constructions/rep_theory.rst" ];
-    })
-
-    # https://github.com/sagemath/sage/pull/41141, landed in 10.8.beta9
-    (fetchpatch2 {
-      name = "ipython-9_7_0-unicode_to_str.patch";
-      url = "https://github.com/sagemath/sage/commit/fa00696112fde95e0c4241ad6063936200ce6f68.patch?full_index=1";
-      hash = "sha256-eFDpNu/2gcQATELmQ7/VzXI35xIzaVrD8bhhJ57e2gc=";
-    })
-
-    # https://github.com/sagemath/sage/pull/41233, landed in 10.8.rc0
-    (fetchpatch2 {
-      name = "flint-3.4-update.patch";
-      url = "https://github.com/sagemath/sage/commit/9bd5304f1a222e215d7006a04854ff66616748bf.patch?full_index=1";
-      hash = "sha256-7bgouXV3pM20IX5PM24ZpJWOBlZjQksGtjopgouEbyg=";
-    })
-
-    # https://github.com/sagemath/sage/pull/41078, landed in 10.8.beta8
-    (fetchpatch2 {
-      name = "docutils-0.22-update.patch";
-      url = "https://github.com/sagemath/sage/commit/e206e205a6841cc5251dfb37fdd36ed29345fba4.patch?full_index=1";
-      hash = "sha256-Y8DqwGBkRnL+6ejZibCmkEJ7q/Qs0wD2KGmAefVdd94=";
-    })
-
-    # https://github.com/sagemath/sage/pull/41342, landed in 10.9.beta1
-    (fetchpatch2 {
-      name = "numpy-2.4-update.patch";
-      url = "https://github.com/sagemath/sage/commit/97ceea842a39fa2f2e9098daae2738a2f2765b9e.patch?full_index=1";
-      hash = "sha256-/Tk3tIy0syOjaNRMCyot6kma3jj4288QJ3zypS79jZo=";
-    })
-
-    # https://github.com/sagemath/sage/pull/41346, landed in 10.9.beta2
-    (fetchpatch2 {
-      name = "ipython-9.8-updte.patch";
-      url = "https://github.com/sagemath/sage/commit/380949e6eeda80cca6e5dd971e2c6f367647a863.patch?full_index=1";
-      hash = "sha256-e4zmgfHrenOixgbUS1uFHzftmwNGGoSb7yFhYmqT0yc=";
-    })
-
-    # https://github.com/sagemath/sage/pull/41395, landed in 10.9.beta2
-    (fetchpatch2 {
-      name = "pyparsing-3.3-update.patch";
-      url = "https://github.com/sagemath/sage/commit/1b5a5dd78b5dcb4b3c7d1f94461ddbc647c5679f.patch?full_index=1";
-      hash = "sha256-kFXg2O3IpwaOwAaNIy6Wscx8/XSDWXrqAXS2ZJgdqsg=";
-    })
-
-    # https://github.com/sagemath/sage/pull/41433, landed in 10.9.beta3
-    (fetchpatch2 {
-      name = "scipy-1.17-update.patch";
-      url = "https://github.com/sagemath/sage/commit/ff58afe27c80c067a8965e1d70966e25d0355aaf.patch?full_index=1";
-      hash = "sha256-gWoXwhUVXL2RSVLPRbxtlP0LCSEkJ9z1PJ1wKLXef1k=";
-    })
-
     # https://github.com/sagemath/sage/pull/42089, landed in 10.10.beta0
     (fetchpatch2 {
       name = "flint-3.5.0-update.patch";
@@ -158,16 +119,28 @@ stdenv.mkDerivation rec {
       "s|var(\"SAGE_ROOT\".*|var(\"SAGE_ROOT\", \"$out\")|" \
       src/sage/env.py
 
+    # https://github.com/sagemath/sage/pull/40489 removed this file,
+    # but it seems like autogen/interpreters/internal/__init__.py
+    # was not fully adapted for that, and it causes fast_callable problems
+    touch src/sage/ext/all.py
+
+    # HACK: meson tries to run maxima at build time. that's not necessary
+    # because we ensure Sage will find all it needs at runtime.
+    sed -i 's/not is_windows/false/g' src/sage/meson.build
+    sed -i 's/if not maxima_present/if false/g' src/sage/libs/meson.build
+    sed -i '/SAGE_MAXIMA/d' src/sage/libs/meson.build
+
     # sage --docbuild unsets JUPYTER_PATH, which breaks our docbuilding
     # https://trac.sagemath.org/ticket/33650#comment:32
     sed -i "/export JUPYTER_PATH/d" src/bin/sage
   '';
 
-  buildPhase = "# do nothing";
+  buildPhase = ''
+    tar xzf ${configure-src}
+    rm configure
+  '';
 
   installPhase = ''
     cp -r . "$out"
-    tar xzf ${configure-src} -C "$out"
-    rm "$out/configure"
   '';
 }
diff --git a/pkgs/by-name/sa/sage/sagedoc.nix b/pkgs/by-name/sa/sage/sagedoc.nix
index 83fa1807b95e..ee9f06e72555 100644
--- a/pkgs/by-name/sa/sage/sagedoc.nix
+++ b/pkgs/by-name/sa/sage/sagedoc.nix
@@ -12,15 +12,31 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
+  nativeBuildInputs = with python3.pkgs; [
+    meson-python
+    cython
+    sphinx
+  ];
+
   unpackPhase = ''
     export SAGE_DOC_OVERRIDE="$PWD/share/doc/sage"
     export SAGE_DOC_SRC_OVERRIDE="$PWD/docsrc"
 
     cp -r "${src}/src/doc" "$SAGE_DOC_SRC_OVERRIDE"
     chmod -R 755 "$SAGE_DOC_SRC_OVERRIDE"
+
+    # Tools needed for meson to run the bootstrap script
+    cp -r "${src}/tools/bootstrap-docs.py" "$SAGE_DOC_SRC_OVERRIDE"
+    cp -r "${src}/build/sage_bootstrap" "$SAGE_DOC_SRC_OVERRIDE"
+    chmod -R 755 "$SAGE_DOC_SRC_OVERRIDE/sage_bootstrap/env.py"
+    sed "/assert/d" "${src}/build/sage_bootstrap/env.py" > "$SAGE_DOC_SRC_OVERRIDE/sage_bootstrap/env.py"
   '';
 
-  preBuild = ''
+  preConfigure = ''
+    cd docsrc
+  '';
+
+  buildPhase = ''
     export SAGE_ROOT="${sage-with-env.env.lib.src}"
     export PATH="${sage-with-env}/bin:$PATH"
     export HOME="$TMPDIR/sage_home"
@@ -32,10 +48,10 @@ stdenv.mkDerivation rec {
     # jupyter-sphinx calls the sagemath jupyter kernel during docbuild
     export JUPYTER_PATH=${jupyter-kernel-specs}
 
-    # the Makefile tries to guess SAGE_DOC, but in a buggy way (changed in 10.8)
-    export SAGE_DOC="$SAGE_DOC_OVERRIDE"
-
-    cd docsrc
+    meson setup $SAGE_DOC_OVERRIDE
+    meson compile -C $SAGE_DOC_OVERRIDE
+    sage -advanced > $SAGE_DOC_OVERRIDE/en/reference/repl/options.txt
+    meson compile -C $SAGE_DOC_OVERRIDE doc-html
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/sa/sage/sagelib.nix b/pkgs/by-name/sa/sage/sagelib.nix
index ddc9da0d8a98..46d4972f94a1 100644
--- a/pkgs/by-name/sa/sage/sagelib.nix
+++ b/pkgs/by-name/sa/sage/sagelib.nix
@@ -9,6 +9,7 @@
   perl,
   pkg-config,
   sage-setup,
+  sage-docbuild,
   setuptools,
   gd,
   iml,
@@ -73,6 +74,7 @@
   pplpy,
   primecountpy,
   ptyprocess,
+  pytest,
   requests,
   rpy2,
   scipy,
@@ -103,10 +105,8 @@ buildPythonPackage rec {
     pkg-config
     sage-setup
     setuptools
-  ];
-
-  pythonRelaxDeps = [
-    "sphinx"
+    meson-python
+    cython
   ];
 
   buildInputs = [
@@ -115,6 +115,8 @@ buildPythonPackage rec {
     libpng
   ];
 
+  mesonFlags = [ "-Dbuild-docs=false" ];
+
   env = lib.optionalAttrs stdenv.cc.isClang {
     # code tries to assign a unsigned long to an int in an initialized list
     # leading to this error.
@@ -175,7 +177,6 @@ buildPythonPackage rec {
     lrcalc-python
     matplotlib
     memory-allocator
-    meson-python
     mpmath
     networkx
     numpy
@@ -186,8 +187,10 @@ buildPythonPackage rec {
     pplpy
     primecountpy
     ptyprocess
+    pytest
     requests
     rpy2
+    sage-docbuild
     scipy
     sphinx
     sympy
@@ -195,28 +198,7 @@ buildPythonPackage rec {
   ];
 
   preBuild = ''
-    export SAGE_ROOT="$PWD"
-    export SAGE_LOCAL="$SAGE_ROOT"
-    export SAGE_SHARE="$SAGE_LOCAL/share"
-
-    # set locations of dependencies (needed for nbextensions like threejs)
-    . ${env-locations}/sage-env-locations
-
-    export JUPYTER_PATH="$SAGE_LOCAL/jupyter"
-    export PATH="$SAGE_ROOT/build/bin:$SAGE_ROOT/src/bin:$PATH"
-
-    export SAGE_NUM_THREADS="$NIX_BUILD_CORES"
-
-    mkdir -p "$SAGE_SHARE/sage/ext/notebook-ipython"
-    mkdir -p "var/lib/sage/installed"
-
-    sed -i "/sage-conf/d" src/{setup.cfg,pyproject.toml,requirements.txt}
-
-    cd build/pkgs/sagelib/src
-  '';
-
-  postInstall = ''
-    rm -r "$out/${python.sitePackages}/sage/cython_debug"
+    patchShebangs src/sage_setup/autogen/interpreters/__main__.py
   '';
 
   doCheck = false; # we will run tests in sage-tests.nix
diff --git a/pkgs/by-name/sa/sarasa-gothic/package.nix b/pkgs/by-name/sa/sarasa-gothic/package.nix
index cdb49d0adf24..b7ca247ad54a 100644
--- a/pkgs/by-name/sa/sarasa-gothic/package.nix
+++ b/pkgs/by-name/sa/sarasa-gothic/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sarasa-gothic";
-  version = "1.0.37";
+  version = "1.0.39";
 
   src = fetchurl {
     # Use the 'ttc' files here for a smaller closure size.
     # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
     url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip";
-    hash = "sha256-YIupzXfSAnep7qKQ4sNtxABUiDwJvzX5QtiUduYEHb4=";
+    hash = "sha256-tVmPag6X7W54xEkbo6ClnGrMQuCmYhwX5++LJsaTDsc=";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/by-name/sc/scdl/package.nix b/pkgs/by-name/sc/scdl/package.nix
index 9dc31eb0a0e7..28a414961233 100644
--- a/pkgs/by-name/sc/scdl/package.nix
+++ b/pkgs/by-name/sc/scdl/package.nix
@@ -7,23 +7,25 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "scdl";
-  version = "3.0.4";
+  version = "3.0.5";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-r7cvsoKTWE0W/pbjmbaGqra9+qb1MDxf2B5C/rdrCdU=";
+    hash = "sha256-IwbH1YUeJuAf2rtKWfluyksRRkUab0UMuOWAP8L8rzE=";
   };
 
   build-system = [ python3Packages.setuptools ];
 
-  dependencies = with python3Packages; [
-    curl-cffi
-    docopt-ng
-    mutagen
-    soundcloud-v2
-    yt-dlp
-  ];
+  dependencies =
+    with python3Packages;
+    [
+      docopt-ng
+      mutagen
+      soundcloud-v2
+      yt-dlp
+    ]
+    ++ yt-dlp.optional-dependencies.curl-cffi;
 
   # Ensure ffmpeg is available in $PATH:
   makeWrapperArgs =
diff --git a/pkgs/by-name/se/seanime/package.nix b/pkgs/by-name/se/seanime/package.nix
index a5af969f15ba..2d3bed8546ab 100644
--- a/pkgs/by-name/se/seanime/package.nix
+++ b/pkgs/by-name/se/seanime/package.nix
@@ -10,13 +10,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "seanime";
-  version = "3.8.2";
+  version = "3.8.3";
 
   src = fetchFromGitHub {
     owner = "5rahim";
     repo = "seanime";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7wOmvOrs4/YiIjOGdp6pleUcUjNaXhZFvtwBTSn5BQI=";
+    hash = "sha256-jD18xNgSKitgRzUjwJA2q79Me/qZzFb+fSLdycmAld0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sf/sftool/package.nix b/pkgs/by-name/sf/sftool/package.nix
index 6d0422180938..d262c5dd0f0c 100644
--- a/pkgs/by-name/sf/sftool/package.nix
+++ b/pkgs/by-name/sf/sftool/package.nix
@@ -10,15 +10,15 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sftool";
-  version = "0.2.2";
+  version = "0.2.3";
   src = fetchFromGitHub {
     owner = "OpenSiFli";
     repo = "sftool";
     tag = finalAttrs.version;
-    hash = "sha256-pWECmFzxOLhmiascyK1yS/uzZ3O/MVze/cRNgE01ptY=";
+    hash = "sha256-W7ndWXwhXuY5w299njDONgmkRWmvHxX0hBYW/+yVp38=";
   };
 
-  cargoHash = "sha256-mvL102oT4WxpEEplxSu6uxp+odLHFB3n6mBcztXXmRA=";
+  cargoHash = "sha256-STOL4spLNxdXv3jUov9qMg9ToYzK7aQpT31xy/aec2k=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/sh/shogihome/package.nix b/pkgs/by-name/sh/shogihome/package.nix
index e7db98e5c729..df92032feb84 100644
--- a/pkgs/by-name/sh/shogihome/package.nix
+++ b/pkgs/by-name/sh/shogihome/package.nix
@@ -5,7 +5,6 @@
   fetchFromGitHub,
   makeWrapper,
   electron_40,
-  vulkan-loader,
   makeDesktopItem,
   copyDesktopItems,
   commandLineArgs ? [ ],
@@ -22,16 +21,16 @@ let
 in
 buildNpmPackage (finalAttrs: {
   pname = "shogihome";
-  version = "1.27.2";
+  version = "1.27.3";
 
   src = fetchFromGitHub {
     owner = "sunfish-shogi";
     repo = "shogihome";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VaHIDhTYcGT4J7ken/Cz0QwSlL42RMcP4lqFR4P7/SM=";
+    hash = "sha256-25Iu/bKUCotJdQESxPPOiYehwn+D3RYnZiJfMWJ4cn0=";
   };
 
-  npmDepsHash = "sha256-2NeiCpcX1j7z+PtIF3euQamVTa+6G4SEHPGk8IVC1Dw=";
+  npmDepsHash = "sha256-gWI21dPha7yX367r50U3C9wpX5/6oBzHGJNtFmG/GQ8=";
 
   postPatch = ''
     substituteInPlace package.json \
@@ -67,17 +66,12 @@ buildNpmPackage (finalAttrs: {
 
     cp -r ${electron.dist} electron-dist
     chmod -R u+w electron-dist
-  ''
-  # Electron builder complains about symlink in electron-dist
-  + lib.optionalString stdenv.hostPlatform.isLinux ''
-    rm electron-dist/libvulkan.so.1
-    cp '${lib.getLib vulkan-loader}/lib/libvulkan.so.1' electron-dist
-  ''
-  # Explicitly set identity to null to avoid signing on arm64 macs with newer electron-builder.
-  # See: https://github.com/electron-userland/electron-builder/pull/9007
-  + ''
+
     npm run electron:pack
 
+    # Explicitly set identity to null to avoid signing on arm64 macs with newer electron-builder.
+    # See: https://github.com/electron-userland/electron-builder/pull/9007
+
     ./node_modules/.bin/electron-builder \
         --dir \
         --config .electron-builder.config.mjs \
diff --git a/pkgs/by-name/si/sieve-editor-gui/package.nix b/pkgs/by-name/si/sieve-editor-gui/package.nix
index 0ae4fdf4b224..248ffd1f2968 100644
--- a/pkgs/by-name/si/sieve-editor-gui/package.nix
+++ b/pkgs/by-name/si/sieve-editor-gui/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  nodejs_22,
   buildNpmPackage,
   fetchFromGitHub,
   electron,
@@ -32,6 +33,9 @@ buildNpmPackage {
   pname = "sieve-editor-gui";
   version = "0.6.1-unstable-2025-03-12";
 
+  # npm dependency install fails with nodejs_24: https://github.com/NixOS/nixpkgs/issues/474535
+  nodejs = nodejs_22;
+
   src = fetchFromGitHub {
     owner = "thsmi";
     repo = "sieve";
diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix
index bcae436f8128..81a18d7573aa 100644
--- a/pkgs/by-name/si/signalbackup-tools/package.nix
+++ b/pkgs/by-name/si/signalbackup-tools/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "signalbackup-tools";
-  version = "20260511";
+  version = "20260523-1";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
     tag = finalAttrs.version;
-    hash = "sha256-InI7A1/p6zSFntgWYYQBB1HMwPVorYgOVesnABy6HCY=";
+    hash = "sha256-8x5b+jDxEExoi5FvzXbE9KOfsTKEjXVMv4yYPU4aPbA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/si/simdjson/package.nix b/pkgs/by-name/si/simdjson/package.nix
index e1cc6c566ebb..575f604ca34c 100644
--- a/pkgs/by-name/si/simdjson/package.nix
+++ b/pkgs/by-name/si/simdjson/package.nix
@@ -30,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "https://simdjson.org/";
+    changelog = "https://github.com/simdjson/simdjson/releases/tag/${finalAttrs.src.tag}";
     description = "Parsing gigabytes of JSON per second";
     license = lib.licenses.asl20;
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/si/simplescreenrecorder/package.nix b/pkgs/by-name/si/simplescreenrecorder/package.nix
index e04c684a35b2..be8539bffd13 100644
--- a/pkgs/by-name/si/simplescreenrecorder/package.nix
+++ b/pkgs/by-name/si/simplescreenrecorder/package.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation {
   pname = "simplescreenrecorder";
-  version = "0.4.4-unstable-2025-12-28";
+  version = "0.4.4-unstable-2026-05-23";
 
   src = fetchFromGitHub {
     owner = "MaartenBaert";
     repo = "ssr";
-    rev = "d790385b49de937976165d6feb39414c75ad6a3d";
-    hash = "sha256-QfFK43iwtwZvTRbxNXiphcsxhn/ofllGX993XppiRBw=";
+    rev = "ad99c7e855794888101aea2f119cdab1d4aa3073";
+    hash = "sha256-Slfte4K1VEUWIWFp7D49SRNEMZY+VVHTWzf966MUR4E=";
   };
 
   cmakeFlags = [
diff --git a/pkgs/by-name/si/sipexer/package.nix b/pkgs/by-name/si/sipexer/package.nix
index b7f059a9276b..c74cae4fb072 100644
--- a/pkgs/by-name/si/sipexer/package.nix
+++ b/pkgs/by-name/si/sipexer/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "sipexer";
-  version = "1.2.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "miconda";
     repo = "sipexer";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-7L29nyFOc/5XAHpzGsFSngxMTwwIDkmwhIKIjHYGszc=";
+    hash = "sha256-I3Z0CK2XtKf+BXiHmLfVusCHVNN45Ej0hHOf/Csz+3w=";
   };
 
   vendorHash = "sha256-q2uNqKZc6Zye7YimPDrg40o68Fo4ux4fygjVjJdhqQU=";
diff --git a/pkgs/by-name/sk/skaffold/package.nix b/pkgs/by-name/sk/skaffold/package.nix
index 5ceb3439cd7d..5d6ebf6c067b 100644
--- a/pkgs/by-name/sk/skaffold/package.nix
+++ b/pkgs/by-name/sk/skaffold/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "skaffold";
-  version = "2.19.0";
+  version = "2.21.0";
 
   src = fetchFromGitHub {
     owner = "GoogleContainerTools";
     repo = "skaffold";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Ltndb5IekV6NQ6PRmMf0/uPRN0x4LsbFYdzdebrMPf0=";
+    hash = "sha256-ny1iWispfR9V4SBhTTn8e8lShi2X+HLjVT6RcqigCR8=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/sm/smug/package.nix b/pkgs/by-name/sm/smug/package.nix
index 45ccc6018adc..7b6ba67ff957 100644
--- a/pkgs/by-name/sm/smug/package.nix
+++ b/pkgs/by-name/sm/smug/package.nix
@@ -7,7 +7,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "smug";
-  version = "0.3.17";
+  version = "0.3.18";
 
   subPackages = [ "." ];
 
@@ -15,10 +15,10 @@ buildGoModule (finalAttrs: {
     owner = "ivaaaan";
     repo = "smug";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wp7JkppWsGMN9/5QcoisXlqMhG/5N1EFvP6OMeRmPEE=";
+    hash = "sha256-+A+FKHmJcStoumw/aDeSHG8nZ8hJbiizViC1MpbzT7g=";
   };
 
-  vendorHash = "sha256-N6btfKjhJ0MkXAL4enyNfnJk8vUeUDCRus5Fb7hNtug=";
+  vendorHash = "sha256-0PWAY2CeBtaRqkN93ZWeVSynaMW8E9zJwUxI5CzC1mE=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/sp/speakeasy-cli/package.nix b/pkgs/by-name/sp/speakeasy-cli/package.nix
index 2cb42d7d631a..e44197fb0f99 100644
--- a/pkgs/by-name/sp/speakeasy-cli/package.nix
+++ b/pkgs/by-name/sp/speakeasy-cli/package.nix
@@ -11,7 +11,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "speakeasy-cli";
-  version = "1.636.3";
+  version = "1.761.9";
 
   sourceRoot = ".";
   src =
@@ -33,19 +33,19 @@ stdenv.mkDerivation (finalAttrs: {
     sources = {
       "x86_64-darwin" = fetchurl {
         url = "https://github.com/speakeasy-api/speakeasy/releases/download/v${finalAttrs.version}/speakeasy_darwin_amd64.zip";
-        hash = "sha256-Q1m4g5XBNAaxJZyYz6cD/7asTUGZMa493XVVJ9s0byE=";
+        hash = "sha256-rTnaKHCJt4bQepg6e110AZavsU4AGD/3WPR0/M14gBo=";
       };
       "x86_64-linux" = fetchurl {
         url = "https://github.com/speakeasy-api/speakeasy/releases/download/v${finalAttrs.version}/speakeasy_linux_amd64.zip";
-        hash = "sha256-H1c+b4/fBWudc3tAHTNdWwa9aoe8HpffRaLRU7OOWs4=";
+        hash = "sha256-fmoLK8hAgIS0vSBQkIiJagBtfEwvf6FElhvW5xjnje4=";
       };
       "aarch64-darwin" = fetchurl {
         url = "https://github.com/speakeasy-api/speakeasy/releases/download/v${finalAttrs.version}/speakeasy_darwin_arm64.zip";
-        hash = "sha256-xO9S9gjiMel2ZB8Dq2nN5O+zIB/4qf5Z2xeXS0wiprc=";
+        hash = "sha256-f9/Pse4B8DB86ZHHPdS21yUzVtecFFS+RhOPLf/8MLg=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://github.com/speakeasy-api/speakeasy/releases/download/v${finalAttrs.version}/speakeasy_linux_arm64.zip";
-        hash = "sha256-zH/HyA6MrrCh9j53hoqfVSiRqIoL6IOCV/nsAwRlgjg=";
+        hash = "sha256-Su0ZiKwEFugniMNJshb5C156BnuHxhcArLI8FzixIEI=";
       };
     };
     updateScript = writeShellScript "update-speakeasy" ''
@@ -57,14 +57,14 @@ stdenv.mkDerivation (finalAttrs: {
           common-updater-scripts
         ]
       }"
-
-      NEW_VERSION=$(curl --silent https://api.github.com/repos/speakeasy-api/speakeasy/releases/latest | jq '.tag_name' | ltrimstr("v") --raw-output)
-      if [[ ${finalAttrs.version} = "$NEW_VERSION"]]; then
+      NEW_VERSION=$(curl --silent https://api.github.com/repos/speakeasy-api/speakeasy/releases/latest | jq --raw-output '.tag_name | ltrimstr("v")')
+      if [[ "${finalAttrs.version}" = "$NEW_VERSION" ]]; then
         echo "The new version is the same as old"
         exit 0
       fi
-      for platfrom in ${lib.escapeShellArgs finalAttrs.meta.platforms}; do
+      for platform in ${lib.escapeShellArgs (builtins.attrNames finalAttrs.passthru.sources)}; do
         update-source-version "speakeasy-cli" "$NEW_VERSION" --ignore-same-version --source-key="sources.$platform"
+      done
     '';
   };
 
diff --git a/pkgs/by-name/ss/ssh-vault/package.nix b/pkgs/by-name/ss/ssh-vault/package.nix
index 08fa8d0ca4cc..7c7fbf9c1e9c 100644
--- a/pkgs/by-name/ss/ssh-vault/package.nix
+++ b/pkgs/by-name/ss/ssh-vault/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ssh-vault";
-  version = "1.2.8";
+  version = "1.2.9";
 
   src = fetchFromGitHub {
     owner = "ssh-vault";
     repo = "ssh-vault";
     tag = finalAttrs.version;
-    hash = "sha256-kJscLetdP4D6DzzERfohezdsJqGcm/dmYTC+ZxjvRvo=";
+    hash = "sha256-2EriGn507ojvZVQrwza/hkad4YgxuB5HcmskS0cCnv4=";
   };
 
-  cargoHash = "sha256-XFKqEwWDg8FUeObhI6oOIXNh8c7gsWgSWy3YThExuU4=";
+  cargoHash = "sha256-n37iK0ZftL1KBYnHzrM7LU3ApYw672vs6MZjKI0J1lg=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/ss/sshified/package.nix b/pkgs/by-name/ss/sshified/package.nix
index e7877129bbce..69913964c1df 100644
--- a/pkgs/by-name/ss/sshified/package.nix
+++ b/pkgs/by-name/ss/sshified/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "sshified";
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "hoffie";
     repo = "sshified";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+YaqHkcsP6+J39w4WP5iA0LowmGwDHBoDNzT8fhv+Xg=";
+    hash = "sha256-XOVoITfP02m9fVimu+IHs14pbJA3+xJcSHeGV+9fSNw=";
   };
 
   vendorHash = null;
diff --git a/pkgs/development/libraries/structuresynth/default.nix b/pkgs/by-name/st/structuresynth/package.nix
similarity index 95%
rename from pkgs/development/libraries/structuresynth/default.nix
rename to pkgs/by-name/st/structuresynth/package.nix
index 23b44fb28d19..226fd556b304 100644
--- a/pkgs/development/libraries/structuresynth/default.nix
+++ b/pkgs/by-name/st/structuresynth/package.nix
@@ -4,8 +4,7 @@
   fetchFromGitHub,
   fetchpatch,
   cmake,
-  qtbase,
-  wrapQtAppsHook,
+  libsForQt5,
   libGL,
   libGLU,
 }:
@@ -44,12 +43,12 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libGL
     libGLU
-    qtbase
+    libsForQt5.qtbase
   ];
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   meta = {
diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/by-name/su/subsurface/package.nix
similarity index 91%
rename from pkgs/applications/misc/subsurface/default.nix
rename to pkgs/by-name/su/subsurface/package.nix
index 7922e5fd0eb6..fbc41a4b5e54 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/by-name/su/subsurface/package.nix
@@ -5,9 +5,7 @@
   autoreconfHook,
   writeShellScriptBin,
   cmake,
-  wrapQtAppsHook,
   pkg-config,
-  qmake,
   curl,
   grantlee,
   hidapi,
@@ -18,12 +16,7 @@
   libxslt,
   libzip,
   zlib,
-  qtbase,
-  qtconnectivity,
-  qtlocation,
-  qtsvg,
-  qttools,
-  qtpositioning,
+  libsForQt5,
   libxcomposite,
   bluez,
   writeScript,
@@ -84,17 +77,17 @@ let
       hash = "sha256-PfSLFQeCeVNcCVDCZehxyNLQGT6gff5jNxMW8lAaP8c=";
     };
 
-    nativeBuildInputs = [ qmake ];
+    nativeBuildInputs = [ libsForQt5.qmake ];
 
     buildInputs = [
-      qtbase
-      qtlocation
+      libsForQt5.qtbase
+      libsForQt5.qtlocation
       libxcomposite
     ];
 
     dontWrapQtApps = true;
 
-    pluginsSubdir = "lib/qt-${qtbase.qtCompatVersion}/plugins";
+    pluginsSubdir = "lib/qt-${libsForQt5.qtbase.qtCompatVersion}/plugins";
 
     installPhase = ''
       mkdir -p $out $(dirname ${pluginsSubdir}/geoservices)
@@ -138,16 +131,16 @@ stdenv.mkDerivation {
     libxml2
     libxslt
     libzip
-    qtbase
-    qtconnectivity
-    qtsvg
-    qttools
-    qtpositioning
+    libsForQt5.qtbase
+    libsForQt5.qtconnectivity
+    libsForQt5.qtsvg
+    libsForQt5.qttools
+    libsForQt5.qtpositioning
   ];
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
     pkg-config
   ];
 
diff --git a/pkgs/by-name/su/supercronic/package.nix b/pkgs/by-name/su/supercronic/package.nix
index 1776735f3e91..95eec57bb9ed 100644
--- a/pkgs/by-name/su/supercronic/package.nix
+++ b/pkgs/by-name/su/supercronic/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "supercronic";
-  version = "0.2.45";
+  version = "0.2.46";
 
   src = fetchFromGitHub {
     owner = "aptible";
     repo = "supercronic";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-QOWNC9RZb5FmCChcs8DvgbrW8F66IG9nteR997n0B7k=";
+    hash = "sha256-gjfQQcp7hKjkK7hQ922jgxizqu1l5aPbgna6ciovaiA=";
   };
 
-  vendorHash = "sha256-x/OSHI5HIG8Bo0FV+TzJ1o7d6+1gXida23dSxi5QiQQ=";
+  vendorHash = "sha256-n22rFA4M4QBpZGTF9FVuqCEWTBZvof8Df1ZmTilbWjI=";
 
   excludedPackages = [ "cronexpr/cronexpr" ];
 
diff --git a/pkgs/by-name/sw/sway-unwrapped/package.nix b/pkgs/by-name/sw/sway-unwrapped/package.nix
index 904ab5f8784b..3a83dac0c015 100644
--- a/pkgs/by-name/sw/sway-unwrapped/package.nix
+++ b/pkgs/by-name/sw/sway-unwrapped/package.nix
@@ -20,7 +20,7 @@
   libinput,
   gdk-pixbuf,
   librsvg,
-  wlroots_0_19,
+  wlroots_0_20,
   wayland-protocols,
   libdrm,
   evdev-proto,
@@ -36,7 +36,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sway-unwrapped";
-  version = "1.11";
+  version = "1.12";
 
   inherit
     enableXWayland
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "swaywm";
     repo = "sway";
     rev = finalAttrs.version;
-    hash = "sha256-xMrexVDpgkGnvAAglshsh7HjvcbU2/Q6JLUd5J487qg=";
+    hash = "sha256-OcF7jOOHhFPhM5APn5riy8S5jsEr9jALCVh9nBtD7Nk=";
   };
 
   patches = [
@@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
     librsvg
     wayland-protocols
     libdrm
-    (wlroots_0_19.override { inherit (finalAttrs) enableXWayland; })
+    (wlroots_0_20.override { inherit (finalAttrs) enableXWayland; })
   ]
   ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
     evdev-proto
@@ -139,7 +139,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/swaywm/sway/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux ++ lib.platforms.freebsd;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ c6rg0 ];
     mainProgram = "sway";
   };
 })
diff --git a/pkgs/by-name/sy/symfpu/package.nix b/pkgs/by-name/sy/symfpu/package.nix
index bfcd0553fd3c..f88d615873fa 100644
--- a/pkgs/by-name/sy/symfpu/package.nix
+++ b/pkgs/by-name/sy/symfpu/package.nix
@@ -8,13 +8,23 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "symfpu";
-  version = "0-unstable-2019-05-17";
+  version = "1.2.0-unstable-2026-05-13";
 
   src = fetchFromGitHub {
     owner = "martin-cs";
     repo = "symfpu";
-    rev = "8fbe139bf0071cbe0758d2f6690a546c69ff0053";
-    sha256 = "1jf5lkn67q136ppfacw3lsry369v7mdr1rhidzjpbz18jfy9zl9q";
+    rev =
+      {
+        "1.2.0-unstable-2026-05-13" = "40bdec00e99f8ea1b96c3dac0a05eed11c541639";
+        "0-unstable-2019-05-17" = "8fbe139bf0071cbe0758d2f6690a546c69ff0053";
+      }
+      ."${finalAttrs.version}";
+    hash =
+      {
+        "1.2.0-unstable-2026-05-13" = "sha256-ho0tLWFlPozq5hD+qX6AQiCPxUuRPwnXe9dEfzXwSY0=";
+        "0-unstable-2019-05-17" = "sha256-ONGfvJMo/HXlbxHmkFs9O5nhs6aDM+XuNSPgY+ykxck=";
+      }
+      ."${finalAttrs.version}";
   };
 
   nativeBuildInputs = [ copyPkgconfigItems ];
@@ -36,6 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
     includedir = "${placeholder "out"}/include";
   };
 
+  dontBuild = true;
+
   installPhase = ''
     runHook preInstall
 
diff --git a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix
index feca251c6f39..f81a4bcf12d0 100644
--- a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix
+++ b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix
@@ -1,23 +1,23 @@
 {
-  version = "1.26.0";
+  version = "1.27.0";
 
   x86_64-linux = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.26.0/linux/amd64/sysdig-cli-scanner";
-    hash = "sha256-Hd3apIXVYEj42LM+Q9HWL06bZijux/wayfdppkFZapQ=";
+    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.0/linux/amd64/sysdig-cli-scanner";
+    hash = "sha256-quUO6HDBKMefpugUlRSmQe2yA4ACNWsPo/NPyHSCCHQ=";
   };
 
   aarch64-linux = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.26.0/linux/arm64/sysdig-cli-scanner";
-    hash = "sha256-pI1xwcifWoMDSwEDphGD4S2UbgFH43BmLpusIWlNMwA=";
+    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.0/linux/arm64/sysdig-cli-scanner";
+    hash = "sha256-niPKBLEq/YCPDsoTT00ZHaL7O+a3T+1hQ4VH1tPzyJk=";
   };
 
   x86_64-darwin = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.26.0/darwin/amd64/sysdig-cli-scanner";
-    hash = "sha256-X6m0pqsfZIHSQQCA5sUeG9LrPkoC2s3nPMmYtTj4mwY=";
+    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.0/darwin/amd64/sysdig-cli-scanner";
+    hash = "sha256-g6mA7qhBBKLDfyF3XX1pO5Abr2nnnKR2VHyUjhdS3k0=";
   };
 
   aarch64-darwin = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.26.0/darwin/arm64/sysdig-cli-scanner";
-    hash = "sha256-ahFiiIucXJBoxqLlcjLbFI9olekNJYSJMjcfBWvaGrQ=";
+    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.0/darwin/arm64/sysdig-cli-scanner";
+    hash = "sha256-2wkM3C7DCTpYwR0A5eFiUNZHTYq7WHZxRPFb7jSHwyU=";
   };
 }
diff --git a/pkgs/by-name/ta/taze/package.nix b/pkgs/by-name/ta/taze/package.nix
index f72cb837498a..f5d602e33bec 100644
--- a/pkgs/by-name/ta/taze/package.nix
+++ b/pkgs/by-name/ta/taze/package.nix
@@ -12,20 +12,20 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "taze";
-  version = "19.11.0";
+  version = "19.13.0";
 
   src = fetchFromGitHub {
     owner = "antfu-collective";
     repo = "taze";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lWCfaIZF1g8tO+QKd5igxCI44OEiLk1cNS4MMtqGL4M=";
+    hash = "sha256-EUfZ8Qh/g4t5R5leMP67ReWapp5hkcjwt+0VLI+ezTs=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_9;
     fetcherVersion = 3;
-    hash = "sha256-x9XPnvyrAmFqIMhjBFQYQE1qKDG6uxzd0NnxIjdOXio=";
+    hash = "sha256-4ZTdSEjxu6+q3LZ6bUykqsSEgzQAN/IGkPhpKx+DwDg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/td/tdl/package.nix b/pkgs/by-name/td/tdl/package.nix
index 1d836a91f6f1..d5473cab7c94 100644
--- a/pkgs/by-name/td/tdl/package.nix
+++ b/pkgs/by-name/td/tdl/package.nix
@@ -5,16 +5,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "tdl";
-  version = "0.20.2";
+  version = "0.20.3";
 
   src = fetchFromGitHub {
     owner = "iyear";
     repo = "tdl";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-xDCvZ6a7xW5kJ+3nsCQGASypzrosjihI0hlSobBWwj0=";
+    hash = "sha256-uVg4SXq+E+pzKFzCt7nn99sTCLj7CXaWnjIidKPA2Kk=";
   };
 
-  vendorHash = "sha256-dMuDmW3WtXU1Awuw7KKSCk1o/GKpBfsrqfvb3wVNGWw=";
+  vendorHash = "sha256-tg6GQ3SVDJnKUCrOuI+iJ/cJeiNNki9+ZF21r0t5rQA=";
 
   postPatch = ''
     rm go.work go.work.sum
diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index 5476e70d977e..d412e0435433 100644
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -10,7 +10,6 @@
   makeWrapper,
   nix-update-script,
   versionCheckHook,
-  vulkan-loader,
   which,
 }:
 
@@ -46,21 +45,15 @@ buildNpmPackage rec {
   buildPhase = ''
     runHook preBuild
 
-    cp -r ${electron_41.dist} electron-dist
-    chmod -R u+w electron-dist
-  ''
-  # Electron builder complains about symlink in electron-dist
-  + lib.optionalString stdenv.hostPlatform.isLinux ''
-    rm electron-dist/libvulkan.so.1
-    cp ${lib.getLib vulkan-loader}/lib/libvulkan.so.1 electron-dist
-  ''
-  + ''
+    electron_dist="$(mktemp -d)"
+    cp -r ${electron_41.dist}/. "$electron_dist"
+    chmod -R u+w "$electron_dist"
 
     npm exec electron-builder -- \
         --dir \
         -c.npmRebuild=true \
         -c.asarUnpack="**/*.node" \
-        -c.electronDist=electron-dist \
+        -c.electronDist="$electron_dist" \
         -c.electronVersion=${electron_41.version} \
         -c.mac.identity=null
 
diff --git a/pkgs/by-name/te/terramate/package.nix b/pkgs/by-name/te/terramate/package.nix
index 71875dfa3214..02fdbf1f698c 100644
--- a/pkgs/by-name/te/terramate/package.nix
+++ b/pkgs/by-name/te/terramate/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "terramate";
-  version = "0.17.0";
+  version = "0.17.1";
 
   src = fetchFromGitHub {
     owner = "terramate-io";
     repo = "terramate";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Se1A43fDx4/RK70xNvUUZaAdFVWAijo+VLyHqMYgmfw=";
+    hash = "sha256-jdhOuaSFcq3bw9cX+IJN233x4o76shMfZQDmyUiTWO4=";
   };
 
-  vendorHash = "sha256-U9ASe8P+c6UDHGpazV7LJXcAAkABqXN1AO0WqxlhEGo=";
+  vendorHash = "sha256-tjAsA8rxFE4zINc0Dpm2/5PpJ6BGYJiz059dBKCKsck=";
 
   # required for version info
   nativeBuildInputs = [ git ];
diff --git a/pkgs/by-name/te/tev/package.nix b/pkgs/by-name/te/tev/package.nix
index 0a9ad2616760..12067fc0288b 100644
--- a/pkgs/by-name/te/tev/package.nix
+++ b/pkgs/by-name/te/tev/package.nix
@@ -24,14 +24,14 @@
 
 stdenv.mkDerivation rec {
   pname = "tev";
-  version = "2.12.0";
+  version = "2.12.1";
 
   src = fetchFromGitHub {
     owner = "Tom94";
     repo = "tev";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-MQb1G3l+mC50JIVj0rHget47hM6O+iywB7B1NvAa1WE=";
+    hash = "sha256-W/K70l4WXUyZUa1gVivr3y/CT4QYq12FuJqSLA2dyFU=";
   };
 
   postPatch = lib.optionalString stdenv.hostPlatform.isLinux (
diff --git a/pkgs/by-name/th/throne/core-also-check-capabilities.patch b/pkgs/by-name/th/throne/core-also-check-capabilities.patch
index 5192ddee870f..5a762ef91ec7 100644
--- a/pkgs/by-name/th/throne/core-also-check-capabilities.patch
+++ b/pkgs/by-name/th/throne/core-also-check-capabilities.patch
@@ -1,42 +1,40 @@
 diff --git a/server.go b/server.go
-index e2f2ab3..f81812f 100644
+index 4499a6d..4c14d1a 100644
 --- a/server.go
 +++ b/server.go
-@@ -16,6 +16,7 @@ import (
+@@ -24,6 +24,7 @@ import (
  	"github.com/sagernet/sing-box/experimental/clashapi"
+ 	"github.com/sagernet/sing/common"
  	E "github.com/sagernet/sing/common/exceptions"
 +	"golang.org/x/sys/unix"
  	"github.com/sagernet/sing/service"
- 	"github.com/throneproj/clash2singbox/convert"
- 	"github.com/throneproj/clash2singbox/model"
- 	"github.com/throneproj/clash2singbox/model/clash"
-@@ -349,12 +350,25 @@ func (s *server) CompileGeoSiteToSrs(in *gen.CompileGeoSiteToSrsRequest, out *ge
- }
+ 	"github.com/xtls/xray-core/core"
+ )
+@@ -462,6 +463,27 @@ func (s *server) IsPrivileged(ctx context.Context, _ *gen.EmptyReq) (*gen.IsPriv
+ 		}, nil
+ 	}
  
- func (s *server) IsPrivileged(in *gen.EmptyReq, out *gen.IsPrivilegedResponse) error {
--	if runtime.GOOS == "windows" {
--		out.HasPrivilege = To(false)
--		return nil
-+	ret := false
-+	if runtime.GOOS == "windows" || os.Geteuid() == 0 {
-+		ret = true
-+	} else if runtime.GOOS == "linux" {
++	if runtime.GOOS == "linux" {
 +		caps := unix.CapUserHeader{
 +			Version: unix.LINUX_CAPABILITY_VERSION_3,
 +			Pid:     0, // current
 +		}
++
 +		var data [2]unix.CapUserData
 +		err := unix.Capget(&caps, &data[0])
++
 +		if err != nil {
-+			ret = false
-+		} else {
-+			// CAP_NET_ADMIN = 12
-+			ret = (data[0].Effective & (1 << unix.CAP_NET_ADMIN)) != 0
++			return &gen.IsPrivilegedResponse{
++				HasPrivilege: To(false),
++			}, nil
 +		}
- 	}
- 
--	out.HasPrivilege = To(os.Geteuid() == 0)
-+	out.HasPrivilege = To(ret)
- 	return nil
++
++		// CAP_NET_ADMIN = 12
++		return &gen.IsPrivilegedResponse{
++			HasPrivilege: To((data[0].Effective & (1 << unix.CAP_NET_ADMIN)) != 0),
++		}, nil
++	}
++
+ 	return &gen.IsPrivilegedResponse{HasPrivilege: To(os.Geteuid() == 0)}, nil
  }
  
diff --git a/pkgs/by-name/th/throne/fix-autorun-desktop-exec.patch b/pkgs/by-name/th/throne/fix-autorun-desktop-exec.patch
new file mode 100644
index 000000000000..2a6d6b357c54
--- /dev/null
+++ b/pkgs/by-name/th/throne/fix-autorun-desktop-exec.patch
@@ -0,0 +1,24 @@
+diff --git a/src/sys/linux/AutoRun.cpp b/src/sys/linux/AutoRun.cpp
+index 1fafe35..fe04c75 100644
+--- a/src/sys/linux/AutoRun.cpp
++++ b/src/sys/linux/AutoRun.cpp
+@@ -31,18 +31,9 @@ void AutoRun_SetEnabled(bool enable) {
+     QString desktopFileLocation = userAutoStartPath + appName + QLatin1String(".desktop");
+     QStringList appCmdList;
+ 
+-    if (QProcessEnvironment::systemEnvironment().contains("APPIMAGE")) {
+-        appCmdList << QProcessEnvironment::systemEnvironment().value("APPIMAGE");
+-    } else {
+-        appCmdList << QApplication::applicationFilePath();
+-    }
+-
++    appCmdList << "Throne";
+     appCmdList << "-tray";
+ 
+-    if (Configs::dataManager->settingsRepo->flag_use_appdata) {
+-        appCmdList << "-appdata";
+-    }
+-
+     if (enable) {
+         if (!QDir().exists(userAutoStartPath) && !QDir().mkpath(userAutoStartPath)) {
+             // qCWarning(lcUtility) << "Could not create autostart folder"
diff --git a/pkgs/by-name/th/throne/nixos-disable-setuid-request.patch b/pkgs/by-name/th/throne/nixos-disable-setuid-request.patch
index 3b3eaec2b69d..b5aec5855a8a 100644
--- a/pkgs/by-name/th/throne/nixos-disable-setuid-request.patch
+++ b/pkgs/by-name/th/throne/nixos-disable-setuid-request.patch
@@ -1,42 +1,42 @@
 diff --git a/src/global/Configs.cpp b/src/global/Configs.cpp
-index e7bec9c..f0dfe53 100644
+index 37b69be..2d458f3 100644
 --- a/src/global/Configs.cpp
 +++ b/src/global/Configs.cpp
-@@ -404,6 +404,12 @@ namespace Configs {
-     // System Utils
+@@ -45,6 +45,12 @@ namespace Configs {
+     }
  
      QString FindCoreRealPath() {
 +        // find in PATH first
-+        QString path_for_nixos = QStandardPaths::findExecutable("throne-core");
++        QString path_for_nixos = QStandardPaths::findExecutable("ThroneCore");
 +        if (!path_for_nixos.isEmpty()) {
 +            return path_for_nixos;
 +        }
 +
-         auto fn = QApplication::applicationDirPath() + "/Core";
+         auto fn = QApplication::applicationDirPath() + "/ThroneCore";
  #ifdef Q_OS_WIN
          fn += ".exe";
 diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
-index d31c311..ce4c357 100644
+index 9acfee4..c0c313a 100644
 --- a/src/ui/mainwindow.cpp
 +++ b/src/ui/mainwindow.cpp
-@@ -151,8 +151,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
-     Configs::dataStore->core_port = MkPort();
-     if (Configs::dataStore->core_port <= 0) Configs::dataStore->core_port = 19810;
+@@ -163,8 +163,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
+     Configs::dataManager->settingsRepo->core_port = MkPort();
+     if (Configs::dataManager->settingsRepo->core_port <= 0) Configs::dataManager->settingsRepo->core_port = 19810;
  
 -    auto core_path = QApplication::applicationDirPath() + "/";
--    core_path += "Core";
+-    core_path += "ThroneCore";
 +    auto core_path = Configs::FindCoreRealPath();
  
      QStringList args;
      args.push_back("-port");
-@@ -1045,6 +1044,15 @@ bool MainWindow::get_elevated_permissions(int reason) {
+@@ -1296,6 +1295,15 @@ bool MainWindow::get_elevated_permissions(int reason) {
          return true;
      }
      if (Configs::IsAdmin()) return true;
 +    QMessageBox::critical(
 +        GetMessageBoxParent(),
 +        tr("Unable to elevate privileges when installed with Nix"),
-+        tr("Due to the read-only property of Nix store, we cannot set suid for throne-core. If you are using NixOS, please install Throne via `programs.throne.enable` and then set the `programs.throne.tunMode.enable` option to elevate privileges."),
++        tr("Due to the read-only property of the Nix store, we cannot set suid for ThroneCore. If you are using NixOS, please install Throne via `programs.throne.enable` and then set the `programs.throne.tunMode.enable` option to elevate privileges."),
 +        QMessageBox::Ok
 +    );
 +    return false;
diff --git a/pkgs/by-name/th/throne/package.nix b/pkgs/by-name/th/throne/package.nix
index f9ab2d669b64..d0266acdfa56 100644
--- a/pkgs/by-name/th/throne/package.nix
+++ b/pkgs/by-name/th/throne/package.nix
@@ -9,7 +9,7 @@
 
   protobuf,
   protoc-gen-go,
-  protorpc,
+  protoc-gen-go-grpc,
 
   cmake,
   copyDesktopItems,
@@ -19,23 +19,20 @@
 
   # override if you want to have more up-to-date rulesets
   throne-srslist ? fetchurl {
-    url = "https://raw.githubusercontent.com/throneproj/routeprofiles/0fca735ff2759422c407ac04fac819aef2fc88f9/srslist.h";
-    hash = "sha256-G2WUStxFtN0fbZm/KoD9ldUvkMWf9cDA+9fvYt8dcqo=";
+    url = "https://raw.githubusercontent.com/throneproj/routeprofiles/c637d0bb8a3707eb5e122c81753600d3e18a5969/srslist.h";
+    hash = "sha256-Kf3TAGXi7Y0PhWjdTOZdPUMlimszWkcrQw9zv8pb76s=";
   },
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "throne";
-  version = "1.0.13";
+  version = "1.1.2";
 
   src = fetchFromGitHub {
     owner = "throneproj";
     repo = "Throne";
-    # the release CI job was triggered on the xhttp branch (https://github.com/throneproj/Throne/actions/runs/20588046213),
-    # but the 1.0.13 tag was wrongly created on the dev branch
-    # we'll use the revision that was used for the job as well
-    rev = "3b737ec8cf29e03e4b7d5a09b1f502bdb8ef52e2";
-    hash = "sha256-OVgmhiKL4BaFYBeUqIX3LRNa54zq5oYyNMUYwKNvo1A=";
+    tag = finalAttrs.version;
+    hash = "sha256-gtbGKyEOTq+1IP7v4ZhVVohGQFlDtP7NbbhyFD2rCnA=";
   };
 
   strictDeps = true;
@@ -54,33 +51,36 @@ stdenv.mkDerivation (finalAttrs: {
 
   env.INPUT_VERSION = finalAttrs.version;
 
-  cmakeFlags = [
-    # makes sure the app uses the user's config directory to store it's non-static content
-    # it's essentially the same as always setting the -appdata flag when running the program
-    (lib.cmakeBool "NKR_PACKAGE" true)
-  ];
+  # suppress errors in 3rdparty/simple-protobuf
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=maybe-uninitialized";
 
   patches = [
-    # disable suid request as it cannot be applied to throne-core in nix store
-    # and prompt users to use NixOS module instead. And use throne-core from PATH
+    # disable suid request as it cannot be applied to ThroneCore in nix store
+    # and prompt users to use NixOS module instead. And use ThroneCore from PATH
     # to make use of security wrappers
     ./nixos-disable-setuid-request.patch
+
+    # sets the Exec field of the auto-run .desktop file to use the Throne binary from PATH
+    ./fix-autorun-desktop-exec.patch
   ];
 
   preBuild = ''
     ln -s ${throne-srslist} ./srslist.h
   '';
 
+  # we'll wrap manually
+  dontWrapQtApps = true;
+
   installPhase = ''
     runHook preInstall
 
     install -Dm755 Throne -t "$out/share/throne/"
     install -Dm644 "$src/res/public/Throne.png" -t "$out/share/icons/hicolor/512x512/apps/"
 
-    mkdir -p "$out/bin"
-    ln -s "$out/share/throne/Throne" "$out/bin/"
+    makeQtWrapper "$out/share/throne/Throne" "$out/bin/Throne" \
+      --append-flag "-appdata" # use writable config dir
 
-    ln -s ${finalAttrs.passthru.core}/bin/Core "$out/share/throne/Core"
+    ln -s ${finalAttrs.passthru.core}/bin/ThroneCore "$out/share/throne/ThroneCore"
 
     runHook postInstall
   '';
@@ -108,18 +108,18 @@ stdenv.mkDerivation (finalAttrs: {
     ];
 
     proxyVendor = true;
-    vendorHash = "sha256-cPo/2bUXEF9jomr0Pnty7ZutAaC0TFG397FSIqefrjw=";
+    vendorHash = "sha256-G0ev2my+sHQFYdmfkR2Zq3ujSeqi5fZ4BdrnUS8mfDE=";
 
     nativeBuildInputs = [
       protobuf
       protoc-gen-go
-      protorpc
+      protoc-gen-go-grpc
     ];
 
     # taken from script/build_go.sh
     preBuild = ''
       pushd gen
-      protoc -I . --go_out=. --protorpc_out=. libcore.proto
+      protoc -I . --go_out=. --go-grpc_out=. libcore.proto
       popd
 
       VERSION_SINGBOX=$(go list -m -f '{{.Version}}' github.com/sagernet/sing-box)
@@ -130,6 +130,9 @@ stdenv.mkDerivation (finalAttrs: {
     ldflags = [
       "-w"
       "-s"
+      "-X"
+      "internal/godebug.defaultGODEBUG=multipathtcp=0"
+      "-checklinkname=0"
     ];
 
     tags = [
@@ -140,10 +143,14 @@ stdenv.mkDerivation (finalAttrs: {
       "with_utls"
       "with_dhcp"
       "with_tailscale"
+      "badlinkname"
+      "tfogo_checklinkname"
+      "with_naive_outbound"
+      "with_purego" # prebuilt .a files inside cronet-go are annoying to fix
     ];
   };
 
-  # this tricks nix-update into also updating the vendorHash of throne-core
+  # this tricks nix-update into also updating the vendorHash of passthru.core
   passthru.goModules = finalAttrs.passthru.core.goModules;
 
   meta = {
diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/by-name/ti/tiled/package.nix
similarity index 87%
rename from pkgs/applications/editors/tiled/default.nix
rename to pkgs/by-name/ti/tiled/package.nix
index 2e87b827843d..51178cec800d 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/by-name/ti/tiled/package.nix
@@ -1,28 +1,22 @@
 {
   lib,
   stdenv,
-  env,
   fetchFromGitHub,
   pkg-config,
   qbs,
-  wrapQtAppsHook,
-  qtbase,
-  qtdeclarative,
-  qttools,
-  qtwayland,
-  qtsvg,
+  libsForQt5,
   zlib,
   zstd,
   libGL,
 }:
 
 let
-  qtEnv = env "tiled-qt-env" [
-    qtbase
-    qtdeclarative
-    qtsvg
-    qttools
-    qtwayland
+  qtEnv = libsForQt5.env "tiled-qt-env" [
+    libsForQt5.qtbase
+    libsForQt5.qtdeclarative
+    libsForQt5.qtsvg
+    libsForQt5.qttools
+    libsForQt5.qtwayland
   ];
 in
 
@@ -40,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     pkg-config
     qbs
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     qtEnv
diff --git a/pkgs/by-name/tm/tmuxai/package.nix b/pkgs/by-name/tm/tmuxai/package.nix
index 950f34126ff0..19c9c0d5a0c2 100644
--- a/pkgs/by-name/tm/tmuxai/package.nix
+++ b/pkgs/by-name/tm/tmuxai/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "tmuxai";
-  version = "2.2.1";
+  version = "2.2.2";
 
   src = fetchFromGitHub {
     owner = "alvinunreal";
     repo = "tmuxai";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-i0SML6CpFim+jMy6uOqZg1uhuy3ngYFscg2if8/3fOI=";
+    hash = "sha256-t0ToGlmeWIgbZokqewdlsj8Bm89yURFf/vVZ82OoxL4=";
   };
 
   vendorHash = "sha256-TlP5DlsPL46ityGhje/b8OHDHeWWCxu5K5iu3pyVxog=";
diff --git a/pkgs/by-name/tr/trdsql/package.nix b/pkgs/by-name/tr/trdsql/package.nix
index 276e93053dcc..ea3159b87ffb 100644
--- a/pkgs/by-name/tr/trdsql/package.nix
+++ b/pkgs/by-name/tr/trdsql/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "trdsql";
-  version = "1.1.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "noborus";
     repo = "trdsql";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MkjQAOIXnydEmOFnnYrvE2TF2I0GqSrSRUAjd+/hHwc=";
+    hash = "sha256-gcEzOgoVhXJ5PqgQ9sV6dGiQlhk4cCpcPBBAKPoyNKg=";
   };
 
-  vendorHash = "sha256-PoIa58vdDPYGL9mjEeudRYqPfvvr3W+fX5c+NgRIoLg=";
+  vendorHash = "sha256-1s2fQue0mLhJ9dKILrERa21Ut05/zVCwL2txZlqcCqE=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/tr/trezor-suite/package.nix b/pkgs/by-name/tr/trezor-suite/package.nix
index 94c5c5bb9981..9bee88c7bfb2 100644
--- a/pkgs/by-name/tr/trezor-suite/package.nix
+++ b/pkgs/by-name/tr/trezor-suite/package.nix
@@ -10,7 +10,7 @@
 
 let
   pname = "trezor-suite";
-  version = "26.4.2";
+  version = "26.5.1";
 
   suffix =
     {
@@ -24,8 +24,8 @@ let
     hash =
       {
         # curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
-        aarch64-linux = "sha512-mE+mzMKAD0NrP2QI5Zc9yEH9vjC6e2cQjzK/CW5Q5FXUg6bGC+uy5fJhxM7Q00YPcNwnoD/vP/qltIa+Y5F8wg==";
-        x86_64-linux = "sha512-DBitrg6RwUUaj3tFv2wVJ2ssuU/QedYILCGkCZQmTHVT1Y/kVs/SCXEm/fX2Ni/aPbMmB6JecslbxGgU5Tftjg==";
+        aarch64-linux = "sha512-3IPLiRyjNPN7Mw/De5SI1ez9xheNVBFuWn98bKg3rDdkLg7Bl94TgznzNBkU3wP8WtOdw3qLfOdv7ioIBu1Aqg==";
+        x86_64-linux = "sha512-TG7vRqz34LzxdzvD4e4N14DnwyuCi1eQsQrPMLkk5d60ThHXh/JN8PT53JMFIjVcp/0pTjLmshEsuQzZRhPJGg==";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };
diff --git a/pkgs/by-name/tr/trilium-desktop/package.nix b/pkgs/by-name/tr/trilium-desktop/package.nix
index f2dc554703e3..aae19eff9656 100644
--- a/pkgs/by-name/tr/trilium-desktop/package.nix
+++ b/pkgs/by-name/tr/trilium-desktop/package.nix
@@ -5,7 +5,7 @@
   fetchurl,
   makeBinaryWrapper,
   # use specific electron since it has to load a compiled module
-  electron_40,
+  electron_41,
   autoPatchelfHook,
   makeDesktopItem,
   copyDesktopItems,
@@ -15,7 +15,7 @@
 
 let
   pname = "trilium-desktop";
-  version = "0.102.2";
+  version = "0.103.0";
 
   triliumSource = os: arch: hash: {
     url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-${os}-${arch}.zip";
@@ -26,10 +26,10 @@ let
   darwinSource = triliumSource "macos";
 
   # exposed like this for update.sh
-  x86_64-linux.hash = "sha256-OVkF/iDpbtcyv8ZXVtp9QYeKrA3rolQSWBUIBaJn74Q=";
-  aarch64-linux.hash = "sha256-85HlQsd/YjuVCYSO6wP9u8dNul87weq2IYDYR7N0gls=";
-  x86_64-darwin.hash = "sha256-S28eV7NUunWsE6kpKN2h7KKRCSFaMgIr7Ofj5pjJRhI=";
-  aarch64-darwin.hash = "sha256-GghYjS7Env8IQcNS8ZwIX4bmc6iZgGeL1W4IvCGMiBw=";
+  x86_64-linux.hash = "sha256-1d6nYhj83LWzglkWoOtAj6lNPkik1qXY5lVpr1iG7No=";
+  aarch64-linux.hash = "sha256-LQMNgj1Ml8gShlPS0qgD/a+Fw4SjvvHrw6XAcSLN7q4=";
+  x86_64-darwin.hash = "sha256-H6eJPJdj1rZt1pXRKBUVOJuIhmDHY5SexKkZ8ITARGQ=";
+  aarch64-darwin.hash = "sha256-dMlgJgDuxZH1jnvLalmgDUMVCdWQ8AviGt86aeMbGVY=";
 
   sources = {
     x86_64-linux = linuxSource "x64" x86_64-linux.hash;
@@ -111,7 +111,7 @@ let
       asar pack $tmp/ $out/share/trilium/resources/app.asar
       rm -rf $tmp
 
-      makeWrapper ${lib.getExe electron_40} $out/bin/trilium \
+      makeWrapper ${lib.getExe electron_41} $out/bin/trilium \
         "''${gappsWrapperArgs[@]}" \
         --set-default ELECTRON_IS_DEV 0 \
         --add-flags $out/share/trilium/resources/app.asar
diff --git a/pkgs/by-name/tr/trilium-server/package.nix b/pkgs/by-name/tr/trilium-server/package.nix
index 88cd03372c20..f769724efc76 100644
--- a/pkgs/by-name/tr/trilium-server/package.nix
+++ b/pkgs/by-name/tr/trilium-server/package.nix
@@ -7,12 +7,12 @@
 }:
 
 let
-  version = "0.102.2";
+  version = "0.103.0";
 
   serverSource_x64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-x64.tar.xz";
-  serverSource_x64.hash = "sha256-2/Skk4I8CwttF5SEs8gPW6KyNxcrYcTuQBQ7irNL1lw=";
+  serverSource_x64.hash = "sha256-+PmlEevacif9xP8y7KrMMCwMQ0jGmT9yVhMrQ1SYG58=";
   serverSource_arm64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-arm64.tar.xz";
-  serverSource_arm64.hash = "sha256-MQlYci2Z45qSYGxgSTWN3P017GImUqkv24DBn8usDm8=";
+  serverSource_arm64.hash = "sha256-RjnHCvVIR/ExZ9lC8ukGr2M8X1Hnj5ZeVMmQHUvZTKY=";
 
   serverSource =
     if stdenv.hostPlatform.isx86_64 then
diff --git a/pkgs/by-name/ts/tsidp/package.nix b/pkgs/by-name/ts/tsidp/package.nix
index 438df791b4e1..75e9035767e3 100644
--- a/pkgs/by-name/ts/tsidp/package.nix
+++ b/pkgs/by-name/ts/tsidp/package.nix
@@ -6,16 +6,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "tsidp";
-  version = "0.0.12";
+  version = "0.0.14";
 
   src = fetchFromGitHub {
     owner = "tailscale";
     repo = "tsidp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-J85JXK7votjNzXh9qiu9YtafVh6s6SRjxO5y7jrh/tE=";
+    hash = "sha256-AZ0fAQag+pY5uYq2loQClkk0BqvC7e5C+KcI6J9g8Pw=";
   };
 
-  vendorHash = "sha256-CFiGRKlSCoPUpH63NiYBGvTUZI/Dxqkh7OsiExsNcEk=";
+  vendorHash = "sha256-sycTIr6cRY2BLve23vvpk7mhiV/jrP26SoLHxY7tznw=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/ts/tsukimi/package.nix b/pkgs/by-name/ts/tsukimi/package.nix
index 7e2fc3f69158..cd9015256e57 100644
--- a/pkgs/by-name/ts/tsukimi/package.nix
+++ b/pkgs/by-name/ts/tsukimi/package.nix
@@ -22,18 +22,18 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "tsukimi";
-  version = "0.21.0";
+  version = "26.5.3";
 
   src = fetchFromGitHub {
     owner = "tsukinaha";
     repo = "tsukimi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FmxNOMYHoQK//v4ZGvJ6vIHKYgMfQm7LTwQV9iEFo0A=";
+    hash = "sha256-SKmt/dCMsK2dTzWU8Iq5YC75PJK3Q/fNK14MLX14+g8=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src;
-    hash = "sha256-iH7vCZhCN2/gu2EC+YG/LUL9N/HMMnj7qHqXUdrlAh8=";
+    hash = "sha256-M8MbBcBeK0GBwRCo2WTHG4COsojGBKg8LotOo5A6dF4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/uc/uclibc-ng/package.nix b/pkgs/by-name/uc/uclibc-ng/package.nix
index 5d29bf709671..c84823fd84ef 100644
--- a/pkgs/by-name/uc/uclibc-ng/package.nix
+++ b/pkgs/by-name/uc/uclibc-ng/package.nix
@@ -69,11 +69,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "uclibc-ng";
-  version = "1.0.57";
+  version = "1.0.58";
 
   src = fetchurl {
     url = "https://downloads.uclibc-ng.org/releases/${finalAttrs.version}/uClibc-ng-${finalAttrs.version}.tar.xz";
-    hash = "sha256-i8c0tYTiP/auPQ67TA+x0dgUxYyCgiuTEw1Davp6zos=";
+    hash = "sha256-noEApEL3B5uXKMoobjA19n3wV4YGFm6i0e+GWkoS3bk=";
   };
 
   configurePhase = ''
diff --git a/pkgs/by-name/un/unixbench/package.nix b/pkgs/by-name/un/unixbench/package.nix
index d50553908846..04d20b10bb44 100644
--- a/pkgs/by-name/un/unixbench/package.nix
+++ b/pkgs/by-name/un/unixbench/package.nix
@@ -21,13 +21,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "unixbench";
-  version = "6.0.0";
+  version = "6.0.1";
 
   src = fetchFromGitHub {
     owner = "kdlucas";
     repo = "byte-unixbench";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GQYejkIf7g2abHafJJQTl0nWqRGsg9VDtYQgyBY/jOg=";
+    hash = "sha256-wzhyOMN2brH8mP2PQ85Ud0kSoXu8826TdQz7h9hUR7k=";
   };
 
   patches = [
diff --git a/pkgs/by-name/up/upsies/package.nix b/pkgs/by-name/up/upsies/package.nix
index 82475d40c785..601296e63301 100644
--- a/pkgs/by-name/up/upsies/package.nix
+++ b/pkgs/by-name/up/upsies/package.nix
@@ -18,14 +18,14 @@ let
 in
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "upsies";
-  version = "2026.05.14";
+  version = "2026.05.24";
   pyproject = true;
 
   src = fetchFromCodeberg {
     owner = "plotski";
     repo = "upsies";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/3jR49Rn1itps4Zz8h2//8Sq2+skVgk2Ydm+qvAzAw4=";
+    hash = "sha256-2gb5eGtEXPaFfFdfE6tBVQGPVmWwnA9Nm2N7OyinWEM=";
   };
 
   patches = [
diff --git a/pkgs/by-name/us/usacloud/package.nix b/pkgs/by-name/us/usacloud/package.nix
index b51ee2fb17bc..28008fa5ad4b 100644
--- a/pkgs/by-name/us/usacloud/package.nix
+++ b/pkgs/by-name/us/usacloud/package.nix
@@ -3,21 +3,22 @@
   buildGoModule,
   fetchFromGitHub,
   versionCheckHook,
+  writableTmpDirAsHomeHook,
   nix-update-script,
 }:
 
 buildGoModule (finalAttrs: {
   pname = "usacloud";
-  version = "1.19.3";
+  version = "1.22.1";
 
   src = fetchFromGitHub {
     owner = "sacloud";
     repo = "usacloud";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uHZJnhj36NEAZxWfwrm0Dsw42NgQp37SgOduEGA8SEU=";
+    hash = "sha256-dlrhrmIKU360/54rvjPvkwpvtvq2LtdjqV15dkFLmFI=";
   };
 
-  vendorHash = "sha256-bJV/m3b6UC3j1/SGJ7riz0GRxoCQ6lVU5DiatQWnIVc=";
+  vendorHash = "sha256-BLJ+9PEZPfNMP3IuG9ihFkSxG9Lt/Pp5eXPYkDlcbug=";
 
   ldflags = [
     "-s"
@@ -26,7 +27,11 @@ buildGoModule (finalAttrs: {
   ];
 
   doInstallCheck = true;
-  nativeInstallCheckInputs = [ versionCheckHook ];
+  nativeInstallCheckInputs = [
+    versionCheckHook
+    writableTmpDirAsHomeHook
+  ];
+  versionCheckKeepEnvironment = [ "HOME" ];
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/uu/uutils-acl/package.nix b/pkgs/by-name/uu/uutils-acl/package.nix
index 98fdd20703b1..124394efd5ef 100644
--- a/pkgs/by-name/uu/uutils-acl/package.nix
+++ b/pkgs/by-name/uu/uutils-acl/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uutils-acl";
-  version = "0.0.1-unstable-2026-05-12";
+  version = "0.0.1-unstable-2026-05-17";
 
   src = fetchFromGitHub {
     owner = "uutils";
     repo = "acl";
-    rev = "a661fe211a2b6c1881e15bfabe0bd94488445302";
-    hash = "sha256-ixXevx72Sg7ExaID8pwUMzc4ujkFSy3qT73dLfJ62IU=";
+    rev = "8c23acae9473c2a6a425a95eda474cdec33fb9a4";
+    hash = "sha256-q1dMJMMhL7/vA1ffy4KBhoPx7BoZnnr7yxLc9XDOCak=";
   };
 
-  cargoHash = "sha256-tz6gCpqlVjdJwzjHdL82V7cUm8Fz/WYCYCAVc16C1SA=";
+  cargoHash = "sha256-06gamu+PZK68QSA4vLYyjRS6ecO/ugjkmaHH2tipTl4=";
 
   cargoBuildFlags = [ "--workspace" ];
 
diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix
index b3c4da17d7ba..190cfc9cdafb 100644
--- a/pkgs/by-name/va/vacuum-go/package.nix
+++ b/pkgs/by-name/va/vacuum-go/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "vacuum-go";
-  version = "0.26.5";
+  version = "0.26.7";
 
   src = fetchFromGitHub {
     owner = "daveshanley";
     repo = "vacuum";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Em+wmDt2kI4mfqS9u/Jq499tQiLh3w/CiZlrkixZjg4=";
+    hash = "sha256-KKunxNMTYm3FCxierFHU8xc0+SA+iXBB4Xs8H3/rm/o=";
   };
 
-  vendorHash = "sha256-AWn/J/BAPIFKXpTdUej1uMBkwh3r5v8DpZHh4D7GRKg=";
+  vendorHash = "sha256-Vf9WsP3DEjb1xFWql5SHHmBC/81+VxhrK/2a0uEkPJg=";
 
   env.CGO_ENABLED = 0;
   ldflags = [
diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix
index e30dc76a2499..5bde8c1f72f8 100644
--- a/pkgs/by-name/ve/vesktop/package.nix
+++ b/pkgs/by-name/ve/vesktop/package.nix
@@ -87,7 +87,6 @@ stdenv.mkDerivation (finalAttrs: {
     ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
   };
 
-  # electron builds must be writable
   preBuild = ''
     # Validate electron version matches upstream package.json
     if [ "`jq -r '.devDependencies.electron' < package.json | cut -d. -f1 | tr -d '^'`" != "${lib.versions.major electron.version}" ]
@@ -95,12 +94,8 @@ stdenv.mkDerivation (finalAttrs: {
       echo "ERROR: electron version mismatch between package.json and nixpkgs"
       exit 1
     fi
-  ''
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    cp -r ${electron.dist}/Electron.app .
-    chmod -R u+w Electron.app
-  ''
-  + lib.optionalString stdenv.hostPlatform.isLinux ''
+
+    # electron builds must be writable
     cp -r ${electron.dist} electron-dist
     chmod -R u+w electron-dist
   '';
@@ -112,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: {
     pnpm exec electron-builder \
       --dir \
       -c.asarUnpack="**/*.node" \
-      -c.electronDist=${if stdenv.hostPlatform.isDarwin then "." else "electron-dist"} \
+      -c.electronDist=electron-dist \
       -c.electronVersion=${electron.version} \
       ${lib.optionalString stdenv.hostPlatform.isDarwin "-c.mac.identity=null"} # disable code signing on macos, https://github.com/electron-userland/electron-builder/blob/77f977435c99247d5db395895618b150f5006e8f/docs/code-signing.md#how-to-disable-code-signing-during-the-build-process-on-macos
 
diff --git a/pkgs/by-name/vi/viceroy/package.nix b/pkgs/by-name/vi/viceroy/package.nix
index f0fb7019932e..6e72ca81c09d 100644
--- a/pkgs/by-name/vi/viceroy/package.nix
+++ b/pkgs/by-name/vi/viceroy/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "viceroy";
-  version = "0.16.5";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "fastly";
     repo = "viceroy";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-66wRKZgEPey8umpO/P9bFy6PIA6BwktDl39rKUlAFCU=";
+    hash = "sha256-WlxVXMUIby5qBsb6Uc8hiya0QJfEPKhqMSNW51JkTqs=";
   };
 
-  cargoHash = "sha256-88+/musBwAafwJ4XguFUvhmo77HsZTkCdBk+h0436yE=";
+  cargoHash = "sha256-K2l53MZLwLoR2I7NdTOMTBppUoM4408UvaYX2m8RyiQ=";
 
   cargoTestFlags = [
     "--package"
diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/by-name/vi/vite/package.nix
similarity index 91%
rename from pkgs/applications/science/misc/vite/default.nix
rename to pkgs/by-name/vi/vite/package.nix
index 1bdabe3875d6..845c479a5b34 100644
--- a/pkgs/applications/science/misc/vite/default.nix
+++ b/pkgs/by-name/vi/vite/package.nix
@@ -4,14 +4,11 @@
   fetchpatch,
   lib,
   cmake,
-  qtbase,
-  qttools,
-  qtcharts,
   libGLU,
   libGL,
   glm,
   glew,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -36,12 +33,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
-    qtcharts
+    libsForQt5.qtbase
+    libsForQt5.qtcharts
     libGLU
     libGL
     glm
diff --git a/pkgs/by-name/vi/vivaldi/package.nix b/pkgs/by-name/vi/vivaldi/package.nix
index f82edf5855c1..09210d1928be 100644
--- a/pkgs/by-name/vi/vivaldi/package.nix
+++ b/pkgs/by-name/vi/vivaldi/package.nix
@@ -67,7 +67,7 @@
 
 stdenv.mkDerivation rec {
   pname = "vivaldi";
-  version = "8.0.4033.26";
+  version = "8.0.4033.34";
 
   suffix =
     {
@@ -80,8 +80,8 @@ stdenv.mkDerivation rec {
     url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb";
     hash =
       {
-        aarch64-linux = "sha256-WJLEdzqF+HBdSSYLlkbxlSwO9IcYeFh7BTAk+2FQln8=";
-        x86_64-linux = "sha256-6BexB3ZQLNqMPjM9XQgX3RowF+cEJcQmV/Z9QpzhKOE=";
+        aarch64-linux = "sha256-K5R/h+BZ0thqejG/3VM12efeZwS4Mw3tq1iHr96HIHQ=";
+        x86_64-linux = "sha256-0sQQsiJLStBTzjrd6JRKzrZ/HUZpT68O3tLdLECl7IQ=";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };
diff --git a/pkgs/by-name/vo/vouch-proxy/package.nix b/pkgs/by-name/vo/vouch-proxy/package.nix
index a61b99f7790f..0eb1021d060c 100644
--- a/pkgs/by-name/vo/vouch-proxy/package.nix
+++ b/pkgs/by-name/vo/vouch-proxy/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "vouch-proxy";
-  version = "0.45.1";
+  version = "0.47.2";
 
   src = fetchFromGitHub {
     owner = "vouch";
     repo = "vouch-proxy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xI9xucRb2D2a1Fvp5DetB4ln3C020qSGEVnuIpy1TMI=";
+    hash = "sha256-BdqdJosX1Z1CsPDW65ybk6oGdSk/RXHPaEJuuIedNJ4=";
   };
 
-  vendorHash = "sha256-hieN3RJA0eBqlYxJj6hKgpQhq8s3vg/fPzxW0XSrlPA=";
+  vendorHash = "sha256-Ma5/S2PXQ9lByIpIfkkLeiw/9rvmasSMElE1VoGIEHc=";
 
   ldflags = [
     "-s"
@@ -27,6 +27,9 @@ buildGoModule (finalAttrs: {
     export VOUCH_ROOT=$PWD
   '';
 
+  # TestClaimsHMAC requires network access to validate HMAC signatures
+  checkFlags = [ "-skip=TestClaimsHMAC" ];
+
   meta = {
     homepage = "https://github.com/vouch/vouch-proxy";
     description = "SSO and OAuth / OIDC login solution for NGINX using the auth_request module";
diff --git a/pkgs/by-name/vs/vsh/package.nix b/pkgs/by-name/vs/vsh/package.nix
index d5a3e0aebe40..8aae0d5a16cf 100644
--- a/pkgs/by-name/vs/vsh/package.nix
+++ b/pkgs/by-name/vs/vsh/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "vsh";
-  version = "0.14.0";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "fishi0x01";
     repo = "vsh";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-rYltOLDmrRc3KsxR5MmpZqf+loAs1KEdPndpnhqkBDM=";
+    sha256 = "sha256-5mQ2FlNUyvp0acdYicuVgdjkEeLxaINtZAoCwf2njzA=";
   };
 
   # vendor directory is part of repository
diff --git a/pkgs/by-name/vt/vtracer/Cargo.lock b/pkgs/by-name/vt/vtracer/Cargo.lock
index 289b4f53513c..78b3a0b6662d 100644
--- a/pkgs/by-name/vt/vtracer/Cargo.lock
+++ b/pkgs/by-name/vt/vtracer/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "adler"
@@ -36,9 +36,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "bit-vec"
@@ -54,21 +54,21 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
 
 [[package]]
 name = "bumpalo"
-version = "3.16.0"
+version = "3.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb"
 
 [[package]]
 name = "bytemuck"
-version = "1.20.0"
+version = "1.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a"
+checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec"
 
 [[package]]
 name = "byteorder"
@@ -84,9 +84,9 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "clap"
@@ -115,7 +115,7 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if 1.0.4",
  "wasm-bindgen",
 ]
 
@@ -132,18 +132,18 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.4.2"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if 1.0.4",
 ]
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
 dependencies = [
  "crossbeam-epoch",
  "crossbeam-utils",
@@ -160,9 +160,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.20"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "deflate"
@@ -176,17 +176,17 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.13.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e"
 
 [[package]]
 name = "fastrand"
-version = "1.9.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
+checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
 dependencies = [
- "instant",
+ "getrandom",
 ]
 
 [[package]]
@@ -200,6 +200,44 @@ dependencies = [
  "smallvec",
 ]
 
+[[package]]
+name = "futures-core"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
+
+[[package]]
+name = "futures-task"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
+
+[[package]]
+name = "futures-util"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "pin-project-lite",
+ "slab",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
+dependencies = [
+ "cfg-if 1.0.4",
+ "js-sys",
+ "libc",
+ "r-efi",
+ "wasip2",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "gif"
 version = "0.11.4"
@@ -244,15 +282,6 @@ version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306"
 
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
 [[package]]
 name = "itertools"
 version = "0.8.2"
@@ -264,9 +293,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.14"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
 
 [[package]]
 name = "jpeg-decoder"
@@ -279,41 +308,42 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.76"
+version = "0.3.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
+checksum = "67df7112613f8bfd9150013a0314e196f4800d3201ae742489d999db2f979f08"
 dependencies = [
+ "cfg-if 1.0.4",
+ "futures-util",
  "once_cell",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.168"
+version = "0.2.186"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d"
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
 
 [[package]]
 name = "lock_api"
-version = "0.4.12"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
 dependencies = [
- "autocfg",
  "scopeguard",
 ]
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
 
 [[package]]
 name = "memchr"
-version = "2.7.4"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
 
 [[package]]
 name = "memoffset"
@@ -385,15 +415,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.20.2"
+version = "1.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.3"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -401,17 +431,23 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.10"
+version = "0.9.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if 1.0.4",
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets",
+ "windows-link",
 ]
 
+[[package]]
+name = "pin-project-lite"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
+
 [[package]]
 name = "png"
 version = "0.16.8"
@@ -426,9 +462,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.92"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
 dependencies = [
  "unicode-ident",
 ]
@@ -439,7 +475,7 @@ version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e681a6cfdc4adcc93b4d3cf993749a4552018ee0a9b65fc0ccfad74352c72a38"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if 1.0.4",
  "indoc",
  "libc",
  "memoffset",
@@ -495,18 +531,24 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
-name = "rayon"
-version = "1.10.0"
+name = "r-efi"
+version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
+[[package]]
+name = "rayon"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d"
 dependencies = [
  "either",
  "rayon-core",
@@ -514,9 +556,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.12.1"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
 dependencies = [
  "crossbeam-deque",
  "crossbeam-utils",
@@ -524,11 +566,11 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.7"
+version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.11.1",
 ]
 
 [[package]]
@@ -538,10 +580,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84348444bd7ad45729d0c49a4240d7cdc11c9d512c06c5ad1835c1ad4acda6db"
 
 [[package]]
-name = "ryu"
-version = "1.0.18"
+name = "rustversion"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 
 [[package]]
 name = "scoped_threadpool"
@@ -557,41 +599,58 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "serde"
-version = "1.0.215"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.215"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.133"
+version = "1.0.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
+checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
 dependencies = [
  "itoa",
  "memchr",
- "ryu",
  "serde",
+ "serde_core",
+ "zmij",
 ]
 
 [[package]]
-name = "smallvec"
-version = "1.13.2"
+name = "slab"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
+
+[[package]]
+name = "smallvec"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "strsim"
@@ -612,9 +671,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.90"
+version = "2.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -649,9 +708,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.14"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
 
 [[package]]
 name = "unicode-width"
@@ -673,37 +732,24 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
 
 [[package]]
 name = "visioncortex"
-version = "0.6.1"
+version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33121c7da0e55b7fc27f552a9168506d5ff049e0248e9395d88c51d6d7e9aca3"
+checksum = "7c9a7e6cc136c7c79b4adbd311c46c323a19db7baf446822b5f90f84375934e3"
 dependencies = [
  "bit-vec",
  "flo_curves",
- "log",
- "num-traits",
-]
-
-[[package]]
-name = "visioncortex"
-version = "0.8.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dbe154fc281d74b2322adc18de7f9bbb9c4318d58ef6c201007f3fd99df9fff"
-dependencies = [
- "bit-vec",
- "flo_curves",
- "log",
  "num-traits",
 ]
 
 [[package]]
 name = "vtracer"
-version = "0.6.4"
+version = "0.6.12"
 dependencies = [
  "clap",
  "fastrand",
  "image",
  "pyo3",
- "visioncortex 0.8.8",
+ "visioncortex",
 ]
 
 [[package]]
@@ -715,43 +761,40 @@ dependencies = [
  "console_log",
  "serde",
  "serde_json",
- "visioncortex 0.6.1",
+ "visioncortex",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
-name = "wasm-bindgen"
-version = "0.2.99"
+name = "wasip2"
+version = "1.0.3+wasi-0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
+checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
 dependencies = [
- "cfg-if 1.0.0",
- "once_cell",
- "serde",
- "serde_json",
- "wasm-bindgen-macro",
+ "wit-bindgen",
 ]
 
 [[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.99"
+name = "wasm-bindgen"
+version = "0.2.121"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
+checksum = "49ace1d07c165b0864824eee619580c4689389afa9dc9ed3a4c75040d82e6790"
 dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn 2.0.90",
+ "cfg-if 1.0.4",
+ "once_cell",
+ "rustversion",
+ "serde",
+ "serde_json",
+ "wasm-bindgen-macro",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.99"
+version = "0.2.121"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
+checksum = "8e68e6f4afd367a562002c05637acb8578ff2dea1943df76afb9e83d177c8578"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -759,28 +802,31 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.99"
+version = "0.2.121"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
+checksum = "d95a9ec35c64b2a7cb35d3fead40c4238d0940c86d107136999567a4703259f2"
 dependencies = [
+ "bumpalo",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
- "wasm-bindgen-backend",
+ "syn 2.0.117",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.99"
+version = "0.2.121"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
+checksum = "c4e0100b01e9f0d03189a92b96772a1fb998639d981193d7dbab487302513441"
+dependencies = [
+ "unicode-ident",
+]
 
 [[package]]
 name = "web-sys"
-version = "0.3.76"
+version = "0.3.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc"
+checksum = "4b572dff8bcf38bad0fa19729c89bb5748b2b9b1d8be70cf90df697e3a8f32aa"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -788,9 +834,9 @@ dependencies = [
 
 [[package]]
 name = "weezl"
-version = "0.1.8"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
+checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88"
 
 [[package]]
 name = "winapi"
@@ -815,65 +861,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
-name = "windows-targets"
-version = "0.52.6"
+name = "windows-link"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_gnullvm",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
-]
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
 [[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.6"
+name = "wit-bindgen"
+version = "0.57.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
 
 [[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.6"
+name = "zmij"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
diff --git a/pkgs/by-name/vt/vtracer/package.nix b/pkgs/by-name/vt/vtracer/package.nix
index c284530549a8..4cd86c1a5e8e 100644
--- a/pkgs/by-name/vt/vtracer/package.nix
+++ b/pkgs/by-name/vt/vtracer/package.nix
@@ -6,13 +6,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "vtracer";
-  version = "0.6.5";
+  version = "0.6.15";
 
   src = fetchFromGitHub {
     owner = "visioncortex";
     repo = "vtracer";
-    rev = finalAttrs.version;
-    hash = "sha256-gU2LxUbgy2KgMCu7nyjfGkmBwnA9mjX4mUT9M9k1a4I=";
+    tag = finalAttrs.version;
+    hash = "sha256-A575QnbituecxIX0mm7bOMC+V8jeWB4j3A2iWgDKBts=";
   };
 
   cargoLock = {
diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix
index 7b384b67eb9e..a97fb6503978 100644
--- a/pkgs/by-name/vu/vunnel/package.nix
+++ b/pkgs/by-name/vu/vunnel/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "vunnel";
-  version = "0.57.0";
+  version = "0.58.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anchore";
     repo = "vunnel";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ofxc4Mbd5MUoIQ+iAUPF54rxWuwQEA2t3T+vjO3UUgA=";
+    hash = "sha256-9rxQ96PVbU5GCSpp3BDW1p/1jBnZzkmPkwblERv9CCc=";
     leaveDotGit = true;
   };
 
diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix
index e80e0a1026cf..9ec141b8592c 100644
--- a/pkgs/by-name/wa/wasm-tools/package.nix
+++ b/pkgs/by-name/wa/wasm-tools/package.nix
@@ -6,20 +6,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wasm-tools";
-  version = "1.249.0";
+  version = "1.250.0";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wasm-tools";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8YIFzaJ10ll4ESVsQWf3hRPBNpgBGFvEdDbwbJ7PsI4=";
+    hash = "sha256-YzALjnjsEHGufpTPV7XHVvNL3xU727eJoE6db9KjStc=";
     fetchSubmodules = true;
   };
 
   # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
   auditable = false;
 
-  cargoHash = "sha256-CuSLE6AwslD0SWQALAY3TTuDCKAbl6w6l5x6CwXaqcM=";
+  cargoHash = "sha256-rHoLTljDw4mzZBrpSO600TN/DVr3JKPvYVdT1vC7ynw=";
   cargoBuildFlags = [
     "--package"
     "wasm-tools"
diff --git a/pkgs/by-name/wg/wgcf/package.nix b/pkgs/by-name/wg/wgcf/package.nix
index 1da30d4848df..420cc327339b 100644
--- a/pkgs/by-name/wg/wgcf/package.nix
+++ b/pkgs/by-name/wg/wgcf/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "wgcf";
-  version = "2.2.30";
+  version = "2.2.31";
 
   src = fetchFromGitHub {
     owner = "ViRb3";
     repo = "wgcf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZiVSbsudGnwV7IkhUltzeC4EjTxWIaxvmxBiMcMYAfQ=";
+    hash = "sha256-G/qyCc43tjcWtR/GD0DtTq3TZY4MmitQhTQbpruhCKw=";
   };
 
   subPackages = ".";
 
-  vendorHash = "sha256-nEUupbb918KQrJaeSHWB/jxRtM/pD6Fjzib4y/GtnVc=";
+  vendorHash = "sha256-0KuMWUHxfnfj60PR02JQ9Ajk4czC9ggUVEspOxH8JQk=";
 
   meta = {
     description = "Cross-platform, unofficial CLI for Cloudflare Warp";
diff --git a/pkgs/applications/science/math/wolfram-engine/l10ns.nix b/pkgs/by-name/wo/wolfram-engine/l10ns.nix
similarity index 100%
rename from pkgs/applications/science/math/wolfram-engine/l10ns.nix
rename to pkgs/by-name/wo/wolfram-engine/l10ns.nix
diff --git a/pkgs/applications/science/math/wolfram-engine/default.nix b/pkgs/by-name/wo/wolfram-engine/package.nix
similarity index 98%
rename from pkgs/applications/science/math/wolfram-engine/default.nix
rename to pkgs/by-name/wo/wolfram-engine/package.nix
index e8a83f45b3d7..0dcd79b98ea8 100644
--- a/pkgs/applications/science/math/wolfram-engine/default.nix
+++ b/pkgs/by-name/wo/wolfram-engine/package.nix
@@ -34,7 +34,7 @@
   lang ? "en",
   libGL,
   libGLU,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 let
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoPatchelfHook
     installShellFiles
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
   dontWrapQtApps = true;
 
diff --git a/pkgs/by-name/xc/xcaddy/package.nix b/pkgs/by-name/xc/xcaddy/package.nix
index 9b0be4e6d9ef..c73018fc6f83 100644
--- a/pkgs/by-name/xc/xcaddy/package.nix
+++ b/pkgs/by-name/xc/xcaddy/package.nix
@@ -6,7 +6,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "xcaddy";
-  version = "0.4.5";
+  version = "0.4.6";
 
   subPackages = [ "cmd/xcaddy" ];
 
@@ -14,7 +14,7 @@ buildGoModule (finalAttrs: {
     owner = "caddyserver";
     repo = "xcaddy";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-2cP0bkG16bRdLycLx7gpnQuALgO8hDowp/4cRBO4KuM=";
+    hash = "sha256-SXCOKrGaTwcdrVhPenQGjdBaDl8/bUGmm1B3spk8eUA=";
   };
 
   patches = [
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
     "-X github.com/caddyserver/xcaddy/cmd.customVersion=v${finalAttrs.version}"
   ];
 
-  vendorHash = "sha256-2OZoSOUCkt94uG+54Dx/1di/RZxZ2UOsmTC6YDA5cKo=";
+  vendorHash = "sha256-K5+Gj4Lqla6q9vx95BtCS67mZMWkMjgIHVYpBUdx/Wc=";
 
   meta = {
     homepage = "https://github.com/caddyserver/xcaddy";
diff --git a/pkgs/by-name/xm/xmake/package.nix b/pkgs/by-name/xm/xmake/package.nix
index 83a632bb7dd6..affd69c4e88e 100644
--- a/pkgs/by-name/xm/xmake/package.nix
+++ b/pkgs/by-name/xm/xmake/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xmake";
-  version = "3.0.8";
+  version = "3.0.9";
 
   src = fetchFromGitHub {
     owner = "xmake-io";
     repo = "xmake";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8Rm1OtjpyzM/G8YN8nsK8TypF/C/8tQvW+7TxEX5st0=";
+    hash = "sha256-JoIXsEvcB65NQ7G06HgNIDqMSVzxlX7jOVxe1bWaEAQ=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/ya/yadm/package.nix b/pkgs/by-name/ya/yadm/package.nix
index 4ff69e0faaff..09a35130fb86 100644
--- a/pkgs/by-name/ya/yadm/package.nix
+++ b/pkgs/by-name/ya/yadm/package.nix
@@ -26,12 +26,26 @@
   installShellFiles,
   runCommand,
   yadm,
-}:
 
+  # Templates:
+  withAwk ? true,
+  withEsh ? true,
+  withJ2 ? true,
+
+  # Encryption:
+  withGpg ? true,
+  withOpenssl ? true,
+}:
+let
+  withTar = withGpg || withOpenssl;
+in
 resholve.mkDerivation (finalAttrs: {
   pname = "yadm";
   version = "3.5.0";
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   nativeBuildInputs = [ installShellFiles ];
 
   src = fetchFromGitHub {
@@ -62,32 +76,32 @@ resholve.mkDerivation (finalAttrs: {
       scripts = [ "bin/yadm" ];
       interpreter = "${bash}/bin/sh";
       inputs = [
+        bash
+        coreutils
         git
-        gnupg
-        openssl
-        gawk
         # see head comment
         # git-crypt
         # transcrypt
-        j2cli
-        esh
-        bash
-        coreutils
-        gnutar
-      ];
+      ]
+      ++ lib.optional withGpg gnupg
+      ++ lib.optional withOpenssl openssl
+      ++ lib.optional withAwk gawk
+      ++ lib.optional withJ2 j2cli
+      ++ lib.optional withEsh esh
+      ++ lib.optional withTar gnutar;
       fake = {
-        external = if stdenv.hostPlatform.isCygwin then [ ] else [ "cygpath" ];
+        external = lib.optional (!stdenv.hostPlatform.isCygwin) "cygpath" ++ lib.optional (!withTar) "tar";
       };
       fix = {
-        "$GPG_PROGRAM" = [ "gpg" ];
-        "$OPENSSL_PROGRAM" = [ "openssl" ];
         "$GIT_PROGRAM" = [ "git" ];
-        "$AWK_PROGRAM" = [ "awk" ];
+        "$GPG_PROGRAM" = lib.optional withGpg "gpg";
+        "$OPENSSL_PROGRAM" = lib.optional withOpenssl "openssl";
+        "$AWK_PROGRAM" = lib.optional withAwk "awk";
         # see head comment
         # "$GIT_CRYPT_PROGRAM" = [ "git-crypt" ];
         # "$TRANSCRYPT_PROGRAM" = [ "transcrypt" ];
-        "$J2CLI_PROGRAM" = [ "j2" ];
-        "$ESH_PROGRAM" = [ "esh" ];
+        "$J2CLI_PROGRAM" = lib.optional withJ2 "j2";
+        "$ESH_PROGRAM" = lib.optional withEsh "esh";
         # not in nixpkgs (yet)
         # "$ENVTPL_PROGRAM" = [ "envtpl" ];
         # "$LSB_RELEASE_PROGRAM" = [ "lsb_release" ];
@@ -100,6 +114,12 @@ resholve.mkDerivation (finalAttrs: {
         "$hook_command" = true; # ~git hooks?
         "exec" = [ "$YADM_BOOTSTRAP" ]; # yadm bootstrap script
 
+        "$GPG_PROGRAM" = !withGpg;
+        "$OPENSSL_PROGRAM" = !withOpenssl;
+        "$AWK_PROGRAM" = !withAwk;
+        "$J2CLI_PROGRAM" = !withJ2;
+        "$ESH_PROGRAM" = !withEsh;
+
         # not in nixpkgs
         "$ENVTPL_PROGRAM" = true;
         "$LSB_RELEASE_PROGRAM" = true;
@@ -135,7 +155,10 @@ resholve.mkDerivation (finalAttrs: {
     '';
     changelog = "https://github.com/yadm-dev/yadm/blob/${finalAttrs.version}/CHANGES";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ abathur ];
+    maintainers = with lib.maintainers; [
+      abathur
+      sandarukasa
+    ];
     platforms = lib.platforms.unix;
     mainProgram = "yadm";
   };
diff --git a/pkgs/by-name/ya/yadmMinimal/package.nix b/pkgs/by-name/ya/yadmMinimal/package.nix
new file mode 100644
index 000000000000..7554c12469d1
--- /dev/null
+++ b/pkgs/by-name/ya/yadmMinimal/package.nix
@@ -0,0 +1,10 @@
+{
+  yadm,
+}:
+yadm.override {
+  withAwk = false;
+  withEsh = false;
+  withJ2 = false;
+  withGpg = false;
+  withOpenssl = false;
+}
diff --git a/pkgs/by-name/zl/zlint/package.nix b/pkgs/by-name/zl/zlint/package.nix
index b54b32677997..9e07253daf9b 100644
--- a/pkgs/by-name/zl/zlint/package.nix
+++ b/pkgs/by-name/zl/zlint/package.nix
@@ -7,18 +7,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "zlint";
-  version = "3.7.0";
+  version = "3.7.1";
 
   src = fetchFromGitHub {
     owner = "zmap";
     repo = "zlint";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-e12GMbUsZFm0yPD4yh+kuK47YKvDC+VcSfth2radyUk=";
+    hash = "sha256-HgpNa1XCAaSGfzc6rMFE4NukL+WxRYxA7il2P/5DI8Q=";
   };
 
   modRoot = "v3";
 
-  vendorHash = "sha256-7g/97DjtXOsWFguWeYi7jLe7xeW1sfY0BrQxYbtIZyM=";
+  vendorHash = "sha256-NqqW5IHo15Dv1jmYSfbPtkApYIhNoDaJTxwBGwDPDjc=";
 
   excludedPackages = [
     "cmd/genTestCerts"
diff --git a/pkgs/by-name/zo/zod/package.nix b/pkgs/by-name/zo/zod/package.nix
index 161bf682b19e..577a0804e424 100644
--- a/pkgs/by-name/zo/zod/package.nix
+++ b/pkgs/by-name/zo/zod/package.nix
@@ -39,7 +39,9 @@ let
     coreutils
   ];
   hardeningDisable = [ "format" ];
-  NIX_LDFLAGS = "-L${libmysqlclient}/lib/mysql";
+  env = {
+    NIX_LDFLAGS = "-L${libmysqlclient}/lib/mysql";
+  };
   zod_engine = stdenv.mkDerivation {
     inherit
       version
@@ -48,7 +50,7 @@ let
       nativeBuildInputs
       buildInputs
       hardeningDisable
-      NIX_LDFLAGS
+      env
       ;
     pname = "zod-engine-engine";
     enableParallelBuilding = true;
@@ -67,7 +69,7 @@ let
       nativeBuildInputs
       buildInputs
       hardeningDisable
-      NIX_LDFLAGS
+      env
       ;
     pname = "zod-engine-map_editor";
     enableParallelBuilding = true;
diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix
index 916792aec826..607fd14740d6 100644
--- a/pkgs/by-name/zo/zoom-us/package.nix
+++ b/pkgs/by-name/zo/zoom-us/package.nix
@@ -54,25 +54,25 @@ let
   # Zoom versions are released at different times per platform and often with different versions.
   # We write them on three lines like this (rather than using {}) so that the updater script can
   # find where to edit them.
-  versions.aarch64-darwin = "7.0.0.77593";
-  versions.x86_64-darwin = "7.0.0.77593";
+  versions.aarch64-darwin = "7.0.5.81138";
+  versions.x86_64-darwin = "7.0.5.81138";
 
   # This is the fallback version so that evaluation can produce a meaningful result.
-  versions.x86_64-linux = "7.0.0.1666";
+  versions.x86_64-linux = "7.0.5.3034";
 
   srcs = {
     aarch64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
       name = "zoomusInstallerFull.pkg";
-      hash = "sha256-YSUaM8YAJHigm4M9W34/bD164M8f/hbhtcmHyUwFN20=";
+      hash = "sha256-uFnwBVZn5iUTIHNYG2WqiULA8siGWJaqY0BcRCoU6gg=";
     };
     x86_64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
-      hash = "sha256-jIKBCrnvF101WJm8Tcpi2R5jRsqRXH7NQVGkSTnAeMA=";
+      hash = "sha256-ZeTgrqkpYumSGlbv/O8/GKALns4bNaFJR3CgV4Mswb4=";
     };
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
-      hash = "sha256-aPQ44znQfxcjGnUpON5RRj3+SG+IDaBa/s0khwj/AIo=";
+      hash = "sha256-eHJIkY1qRC7z3+k6AMog2wlby8Wgupy48A5O7UKRiVU=";
     };
   };
 
diff --git a/pkgs/by-name/zu/zulip/package.nix b/pkgs/by-name/zu/zulip/package.nix
index 34657eefa06b..14cd14a49b54 100644
--- a/pkgs/by-name/zu/zulip/package.nix
+++ b/pkgs/by-name/zu/zulip/package.nix
@@ -13,6 +13,9 @@
   copyDesktopItems,
 }:
 
+let
+  electron = electron_39;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "zulip";
   version = "5.12.3";
@@ -43,10 +46,10 @@ stdenv.mkDerivation (finalAttrs: {
   buildPhase = ''
     runHook preBuild
 
-    npm_config_nodedir=${electron_39.headers} \
+    npm_config_nodedir=${electron.headers} \
       node --run pack -- \
-      -c.electronDist=${electron_39}/libexec/electron \
-      -c.electronVersion=${electron_39.version}
+      -c.electronDist=${electron.dist} \
+      -c.electronVersion=${electron.version}
 
     runHook postBuild
   '';
@@ -59,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     install -m 444 -D app/resources/zulip.png $out/share/icons/hicolor/512x512/apps/zulip.png
 
-    makeBinaryWrapper '${lib.getExe electron_39}' "$out/bin/zulip" \
+    makeBinaryWrapper '${lib.getExe electron}' "$out/bin/zulip" \
       --add-flags "$out/share/lib/zulip/app.asar" \
       --inherit-argv0
 
diff --git a/pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix b/pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix
index a8503e1b9aae..2a0010b061a5 100644
--- a/pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix
+++ b/pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix
@@ -1,11 +1,17 @@
 {
+  lib,
   runCommand,
   purescript,
   nodejs,
 }:
 
 runCommand "purescript-test-minimal-module" { } ''
-  ${purescript}/bin/purs compile -o ./output ${./.}/Main.purs
+  ${purescript}/bin/purs compile -o ./output ${
+    lib.sources.sourceByGlobs ./. [
+      "*.purs"
+      "*.js"
+    ]
+  }/Main.purs
 
   echo 'import {main} from "./output/Main/index.js"; main()' > node.mjs
 
diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index 7d2e3517f979..877fb974c887 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -54,8 +54,6 @@ buildPackages.stdenv.mkDerivation (finalAttrs: {
   # thus probably intend to substitute it.
   allowSubstitutes = true;
 
-  inherit docPackages;
-
   passAsFile = [ "buildCommand" ];
 
   buildCommand = ''
@@ -128,6 +126,8 @@ buildPackages.stdenv.mkDerivation (finalAttrs: {
   passthru = {
     isHaskellLibrary = false; # for the filter in ./with-packages-wrapper.nix
 
+    inherit docPackages;
+
     # The path to the Hoogle database.
     database = "${finalAttrs.finalPackage}/${databasePath}";
 
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index fdb19c6bc62f..26e87a7ff104 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -1008,15 +1008,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "fzf-lua";
-      version = "0.0.2648-1";
+      version = "0.0.2654-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/fzf-lua-0.0.2648-1.rockspec";
-          sha256 = "0lkn7j9mfpv5vagp7xilki05k0ymrg22j95s2g8plg1fhvcykxxw";
+          url = "mirror://luarocks/fzf-lua-0.0.2654-1.rockspec";
+          sha256 = "19msswvglynba5xy0f14xlcidjln6mphnrnydx9x7k03770qmbj9";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/ibhagwan/fzf-lua/archive/23f71140754b9162551dc8ccc1d6346e4275ecc2.zip";
-        sha256 = "0qw2chgv0zlwr524xi4ghxmfpn9nhxsbq7gga8i78sclsg7r8fhy";
+        url = "https://github.com/ibhagwan/fzf-lua/archive/fea9eedc6894c44d44cbb772a5cd11c93b82d7a1.zip";
+        sha256 = "09ayadlmdkljhcm5ncby8w6w8b1kfyhmw0bf3zhl6r8cfansixc2";
       };
 
       disabled = luaOlder "5.1";
@@ -1105,15 +1105,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "grug-far.nvim";
-      version = "1.6.69-1";
+      version = "1.6.70-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/grug-far.nvim-1.6.69-1.rockspec";
-          sha256 = "1fnk6s5kzq03ny3h18ap7454i2sv9c0ipbwl2zxhx1wkrpnbrnhy";
+          url = "mirror://luarocks/grug-far.nvim-1.6.70-1.rockspec";
+          sha256 = "06cb19vg9rj48idc22ncjabb1phhrbiklr42mazf5y91dd9w8b19";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/MagicDuck/grug-far.nvim/archive/a5875fde04e2940a5060f8df9c453bcfcfe0a5c0.zip";
-        sha256 = "0cygcm9giqxr701vn1dgq8bn3nvjnwl5f9shgxppdf5w9fw0l4bk";
+        url = "https://github.com/MagicDuck/grug-far.nvim/archive/5506c2f59dc9ab2ed6c233585412b24d31d51521.zip";
+        sha256 = "1n62s1z0r78snlravyh0k4kp5i7gsyi5p78fpgilgqaqs6s8my48";
       };
 
       disabled = luaOlder "5.1";
@@ -1707,17 +1707,17 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "lrexlib-gnu";
-      version = "2.9.2-1";
+      version = "2.9.3-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/lrexlib-gnu-2.9.2-1.rockspec";
-          sha256 = "14dp5lzpz2prvimpcbqjygbyh9h791h0ywjknj9wgrjjd62qsy6i";
+          url = "mirror://luarocks/lrexlib-gnu-2.9.3-1.rockspec";
+          sha256 = "1wn69qi1qfd3d13zrgw6xq7dwqks6kwj7s398kbgacq79ibv6js3";
         }).outPath;
       src = fetchFromGitHub {
         owner = "rrthomas";
         repo = "lrexlib";
-        tag = "rel-2-9-2";
-        hash = "sha256-DzNDve+xeKb+kAcW+o7GK/RsoDhaDAVAWAhgjISCyZc=";
+        tag = "rel-2-9-3";
+        hash = "sha256-7lybrMvNk2YhXish01PQlMpRVW+qlFj03RO33zmgGp4=";
       };
 
       disabled = luaOlder "5.1";
@@ -1743,17 +1743,17 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "lrexlib-oniguruma";
-      version = "2.9.2-1";
+      version = "2.9.3-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/lrexlib-oniguruma-2.9.2-1.rockspec";
-          sha256 = "13m2v6mmmlkf2bd1mnngg118s4ymrqs7n34la6hrb4m1x772adhd";
+          url = "mirror://luarocks/lrexlib-oniguruma-2.9.3-1.rockspec";
+          sha256 = "0zgpfnb7l018kh16xn836gwydhy0hpqzjchlbk0jhnjlzcvynidm";
         }).outPath;
       src = fetchFromGitHub {
         owner = "rrthomas";
         repo = "lrexlib";
-        tag = "rel-2-9-2";
-        hash = "sha256-DzNDve+xeKb+kAcW+o7GK/RsoDhaDAVAWAhgjISCyZc=";
+        tag = "rel-2-9-3";
+        hash = "sha256-7lybrMvNk2YhXish01PQlMpRVW+qlFj03RO33zmgGp4=";
       };
 
       disabled = luaOlder "5.1";
@@ -1780,17 +1780,17 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "lrexlib-pcre";
-      version = "2.9.2-1";
+      version = "2.9.3-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/lrexlib-pcre-2.9.2-1.rockspec";
-          sha256 = "1214ssm6apgprryqvijjjn82ikb27ylq94yijqf7qjyiy6pz7dc1";
+          url = "mirror://luarocks/lrexlib-pcre-2.9.3-1.rockspec";
+          sha256 = "1pwwzc12a6dl5i4i8gl5i0r8aabqfpmdfrlj0fkvj5v56v9bkw09";
         }).outPath;
       src = fetchFromGitHub {
         owner = "rrthomas";
         repo = "lrexlib";
-        tag = "rel-2-9-2";
-        hash = "sha256-DzNDve+xeKb+kAcW+o7GK/RsoDhaDAVAWAhgjISCyZc=";
+        tag = "rel-2-9-3";
+        hash = "sha256-7lybrMvNk2YhXish01PQlMpRVW+qlFj03RO33zmgGp4=";
       };
 
       disabled = luaOlder "5.1";
@@ -1816,17 +1816,17 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "lrexlib-pcre2";
-      version = "2.9.2-1";
+      version = "2.9.3-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/lrexlib-pcre2-2.9.2-1.rockspec";
-          sha256 = "181878m8gq9wl7c4h9rsq1iig70n9rmyfbj86swz1v4vi7s7ks9p";
+          url = "mirror://luarocks/lrexlib-pcre2-2.9.3-1.rockspec";
+          sha256 = "17y1zhjb5h1bdd4rdaycrnp3xwzm06y1179ga0wpcwvg0ybwmvfn";
         }).outPath;
       src = fetchFromGitHub {
         owner = "rrthomas";
         repo = "lrexlib";
-        rev = "rel-2-9-2";
-        hash = "sha256-DzNDve+xeKb+kAcW+o7GK/RsoDhaDAVAWAhgjISCyZc=";
+        tag = "rel-2-9-3";
+        hash = "sha256-7lybrMvNk2YhXish01PQlMpRVW+qlFj03RO33zmgGp4=";
       };
 
       disabled = luaOlder "5.1";
@@ -1853,17 +1853,17 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "lrexlib-posix";
-      version = "2.9.2-1";
+      version = "2.9.3-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/lrexlib-posix-2.9.2-1.rockspec";
-          sha256 = "1i11cdvz09a3wjhfjgc88g0mdmdrk13fnhhgskzgm5cmhsdx4s0i";
+          url = "mirror://luarocks/lrexlib-posix-2.9.3-1.rockspec";
+          sha256 = "0s8w35x3jvhjn4znram93dj4kck95sv4zrlqcs6mqa4q70d5rl27";
         }).outPath;
       src = fetchFromGitHub {
         owner = "rrthomas";
         repo = "lrexlib";
-        tag = "rel-2-9-2";
-        hash = "sha256-DzNDve+xeKb+kAcW+o7GK/RsoDhaDAVAWAhgjISCyZc=";
+        tag = "rel-2-9-3";
+        hash = "sha256-7lybrMvNk2YhXish01PQlMpRVW+qlFj03RO33zmgGp4=";
       };
 
       disabled = luaOlder "5.1";
@@ -5046,23 +5046,21 @@ final: prev: {
       fetchurl,
       fetchzip,
       luaOlder,
-      nvim-web-devicons,
     }:
     buildLuarocksPackage {
       pname = "oil.nvim";
-      version = "2.15.0-1";
+      version = "2.16.0-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/oil.nvim-2.15.0-1.rockspec";
-          sha256 = "0xkych23rn6jpj4hbam1j7ca1gwb9z3lzfm7id3dvcqj8aysv77j";
+          url = "mirror://luarocks/oil.nvim-2.16.0-1.rockspec";
+          sha256 = "0gsdvzysvvb72z2bd5vcxpssgnb0q91y2z5nrzzafq7670xz49dp";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/stevearc/oil.nvim/archive/v2.15.0.zip";
-        sha256 = "0rrv7wg0nwfj5fd6byxs4np1p18xxdzyv11ba6vqqh3s6z0qwawc";
+        url = "https://github.com/stevearc/oil.nvim/archive/v2.16.0.zip";
+        sha256 = "0pipdvaxrkdyfbp66sgrc3ppy260m95am9zhi3m8n7lm1ivp6fzb";
       };
 
       disabled = luaOlder "5.1";
-      propagatedBuildInputs = [ nvim-web-devicons ];
 
       meta = {
         homepage = "https://github.com/stevearc/oil.nvim";
@@ -6066,40 +6064,6 @@ final: prev: {
     }
   ) { };
 
-  tomlua = callPackage (
-    {
-      buildLuarocksPackage,
-      fetchurl,
-      fetchzip,
-      luaOlder,
-    }:
-    buildLuarocksPackage {
-      pname = "tomlua";
-      version = "1.1.5-1";
-      knownRockspec =
-        (fetchurl {
-          url = "mirror://luarocks/tomlua-1.1.5-1.rockspec";
-          sha256 = "0xqxlw1pzvy63kw8d98nfh0k9269s4dg90md72m8kfcrj7isrb6m";
-        }).outPath;
-      src = fetchzip {
-        url = "https://github.com/BirdeeHub/tomlua/archive/v1.1.5.zip";
-        sha256 = "136jxj26dk3jl17dm86ifvfmpfbj0mf6yp2yy6i8g4xxfqs27n9q";
-      };
-
-      disabled = luaOlder "5.1";
-
-      meta = {
-        homepage = "https://github.com/BirdeeHub/tomlua";
-        maintainers = [ lib.maintainers.birdee ];
-        license = lib.licenses.mit;
-        description = "Speedy toml parsing for lua, implemented in C";
-        longDescription = ''
-          Speedy toml parsing for lua, implemented in C
-              for use in hot-path or startup-time parsing of toml files.'';
-      };
-    }
-  ) { };
-
   toml-edit = callPackage (
     {
       buildLuarocksPackage,
@@ -6136,6 +6100,40 @@ final: prev: {
     }
   ) { };
 
+  tomlua = callPackage (
+    {
+      buildLuarocksPackage,
+      fetchurl,
+      fetchzip,
+      luaOlder,
+    }:
+    buildLuarocksPackage {
+      pname = "tomlua";
+      version = "1.2.3-1";
+      knownRockspec =
+        (fetchurl {
+          url = "mirror://luarocks/tomlua-1.2.3-1.rockspec";
+          sha256 = "0aqagzxnz58nzwx7h3igycvcraxs1h7hyl47d7sbb01kcclp5jr6";
+        }).outPath;
+      src = fetchzip {
+        url = "https://github.com/BirdeeHub/tomlua/archive/v1.2.3.zip";
+        sha256 = "04mg0m3qkr89la733rpzd8xrjq8ysrmjm7v8fid1r80cp1kbg9vf";
+      };
+
+      disabled = luaOlder "5.1";
+
+      meta = {
+        homepage = "https://github.com/BirdeeHub/tomlua";
+        maintainers = with lib.maintainers; [ birdee ];
+        license = lib.licenses.mit;
+        description = "Speedy toml parsing for lua, implemented in C";
+        longDescription = ''
+          Speedy toml parsing for lua, implemented in C 
+          for use in hot-path or startup-time parsing of toml files.'';
+      };
+    }
+  ) { };
+
   tree-sitter-cli = callPackage (
     {
       buildLuarocksPackage,
diff --git a/pkgs/development/lua-modules/image-nvim/default.nix b/pkgs/development/lua-modules/image-nvim/default.nix
index b4dee69fee8b..a62c5d33acf7 100644
--- a/pkgs/development/lua-modules/image-nvim/default.nix
+++ b/pkgs/development/lua-modules/image-nvim/default.nix
@@ -30,6 +30,6 @@ buildLuarocksPackage rec {
     homepage = "https://github.com/3rd/image.nvim";
     description = "🖼️ Bringing images to Neovim.";
     maintainers = with lib.maintainers; [ SuperSandro2000 ];
-    license.fullName = "MIT";
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/lua-modules/readline/default.nix b/pkgs/development/lua-modules/readline/default.nix
index ef2a04267fe2..83a983ca2833 100644
--- a/pkgs/development/lua-modules/readline/default.nix
+++ b/pkgs/development/lua-modules/readline/default.nix
@@ -1,6 +1,7 @@
 {
   buildLuarocksPackage,
   fetchurl,
+  lib,
   luaAtLeast,
   luaOlder,
   luaposix,
@@ -39,7 +40,7 @@ buildLuarocksPackage {
   meta = {
     homepage = "https://pjb.com.au/comp/lua/readline.html";
     description = "Interface to the readline library";
-    license.fullName = "MIT/X11";
+    license = lib.licenses.mit;
     broken = (luaOlder "5.1") || (luaAtLeast "5.5");
   };
 }
diff --git a/pkgs/development/misc/resholve/resholve-utils.nix b/pkgs/development/misc/resholve/resholve-utils.nix
index e9350ed08e29..648de4bddea7 100644
--- a/pkgs/development/misc/resholve/resholve-utils.nix
+++ b/pkgs/development/misc/resholve/resholve-utils.nix
@@ -287,8 +287,7 @@ rec {
 
         postFixup = unresholved.postResholve;
 
-        # don't break the metadata...
-        meta = unresholved.meta;
+        inherit (unresholved) meta strictDeps __structuredAttrs;
       };
   };
 }
diff --git a/pkgs/development/ocaml-modules/awa/default.nix b/pkgs/development/ocaml-modules/awa/default.nix
index 397112faa857..6e387054ab35 100644
--- a/pkgs/development/ocaml-modules/awa/default.nix
+++ b/pkgs/development/ocaml-modules/awa/default.nix
@@ -7,8 +7,7 @@
   mirage-crypto-rng,
   mirage-crypto-pk,
   x509,
-  cstruct,
-  cstruct-unix,
+  ohex,
   eqaf,
   mtime,
   logs,
@@ -21,11 +20,11 @@
 
 buildDunePackage (finalAttrs: {
   pname = "awa";
-  version = "0.5.2";
+  version = "0.6.0";
 
   src = fetchurl {
     url = "https://github.com/mirage/awa-ssh/releases/download/v${finalAttrs.version}/awa-${finalAttrs.version}.tbz";
-    hash = "sha256-64gloekVN0YsBwUodrJc6QaNU3PGKMIZMPJWvBfzaj0=";
+    hash = "sha256-TO4O2n+L1avIGGKBnZ0wo6jSQBml5Yn6C46VWEPvcvE=";
   };
 
   propagatedBuildInputs = [
@@ -34,7 +33,7 @@ buildDunePackage (finalAttrs: {
     mirage-crypto-rng
     mirage-crypto-pk
     x509
-    cstruct
+    ohex
     mtime
     logs
     base64
@@ -44,7 +43,6 @@ buildDunePackage (finalAttrs: {
 
   doCheck = true;
   checkInputs = [
-    cstruct-unix
     cmdliner
     fmt
     mirage-mtime
diff --git a/pkgs/development/ocaml-modules/awa/mirage.nix b/pkgs/development/ocaml-modules/awa/mirage.nix
index 6189d4118032..c50321f520dd 100644
--- a/pkgs/development/ocaml-modules/awa/mirage.nix
+++ b/pkgs/development/ocaml-modules/awa/mirage.nix
@@ -1,7 +1,6 @@
 {
   buildDunePackage,
   awa,
-  cstruct,
   mtime,
   lwt,
   mirage-flow,
@@ -18,7 +17,6 @@ buildDunePackage {
 
   propagatedBuildInputs = [
     awa
-    cstruct
     mtime
     lwt
     mirage-flow
diff --git a/pkgs/development/ocaml-modules/caqti/default.nix b/pkgs/development/ocaml-modules/caqti/default.nix
index 200ca7bc07a3..33fce6590df3 100644
--- a/pkgs/development/ocaml-modules/caqti/default.nix
+++ b/pkgs/development/ocaml-modules/caqti/default.nix
@@ -19,13 +19,13 @@
 
 buildDunePackage (finalAttrs: {
   pname = "caqti";
-  version = "2.2.4";
+  version = "2.3.1";
 
   minimalOCamlVersion = "4.08";
 
   src = fetchurl {
     url = "https://github.com/paurkedal/ocaml-caqti/releases/download/v${finalAttrs.version}/caqti-v${finalAttrs.version}.tbz";
-    hash = "sha256-uOpDKCAVTsCVEyxPeyRLBs2FU+CyA1GFuETZxPMK+Ls=";
+    hash = "sha256-A2OAoPGmfgnQAsxH8sscUuv098ybiepbcM7Ds4nOKY0=";
   };
 
   buildInputs = [ dune-site ];
diff --git a/pkgs/development/ocaml-modules/iri/default.nix b/pkgs/development/ocaml-modules/iri/default.nix
index 49dfc5d5b2b5..74c2481ddf8f 100644
--- a/pkgs/development/ocaml-modules/iri/default.nix
+++ b/pkgs/development/ocaml-modules/iri/default.nix
@@ -9,7 +9,7 @@
 
 buildDunePackage (finalAttrs: {
   pname = "iri";
-  version = "1.1.0";
+  version = "1.2.0";
 
   minimalOCamlVersion = "4.12";
 
@@ -18,7 +18,7 @@ buildDunePackage (finalAttrs: {
     owner = "zoggy";
     repo = "ocaml-iri";
     rev = finalAttrs.version;
-    hash = "sha256-fh5+0CWplDdGXCotZL2UzjOGil2LR4NppttaquO/ndE=";
+    hash = "sha256-+wBQBzRkN36T3zAQWmqq/VdhgLrCnbvOouEmVg37s/w=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix
index 03a1c76eff89..514264325329 100644
--- a/pkgs/development/python-modules/adb-shell/default.nix
+++ b/pkgs/development/python-modules/adb-shell/default.nix
@@ -4,6 +4,7 @@
   aiofiles,
   async-timeout,
   buildPythonPackage,
+  setuptools,
   cryptography,
   fetchFromGitHub,
   isPy3k,
@@ -15,21 +16,23 @@
   rsa,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "adb-shell";
   version = "0.4.4";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = !isPy3k;
 
   src = fetchFromGitHub {
     owner = "JeffLIrion";
     repo = "adb_shell";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-pOkFUh3SEu/ch9R1lVoQn50nufQp8oI+D4/+Ybal5CA=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     cryptography
     pyasn1
     rsa
@@ -50,7 +53,7 @@ buildPythonPackage rec {
     pycryptodome
     pytestCheckHook
   ]
-  ++ lib.concatAttrValues optional-dependencies;
+  ++ lib.concatAttrValues finalAttrs.optional-dependencies;
 
   pythonImportsCheck = [ "adb_shell" ];
 
@@ -60,4 +63,4 @@ buildPythonPackage rec {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ jamiemagee ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/aiolichess/default.nix b/pkgs/development/python-modules/aiolichess/default.nix
index 117589863d88..18ffcab02d98 100644
--- a/pkgs/development/python-modules/aiolichess/default.nix
+++ b/pkgs/development/python-modules/aiolichess/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "aiolichess";
-  version = "1.2.0";
+  version = "1.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aryanhasgithub";
     repo = "aiolichess";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WCrvDNlq0i2FBD6Ouiue3BQcTuIV80Z8MT/5mOjTr3w=";
+    hash = "sha256-cJuaEjapvmmRypJHvkveBxjAvGpkq0tjguXJLktnb74=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/auditwheel/default.nix b/pkgs/development/python-modules/auditwheel/default.nix
index bc897e98f084..72d4fbd8722d 100644
--- a/pkgs/development/python-modules/auditwheel/default.nix
+++ b/pkgs/development/python-modules/auditwheel/default.nix
@@ -16,12 +16,12 @@
 
 buildPythonPackage rec {
   pname = "auditwheel";
-  version = "6.6.0";
+  version = "6.7.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-J387MVrQsE3wor4tEmw/05kwvCZd8PlYnXjJcP8G9Ss=";
+    hash = "sha256-cKpP6OJNRH6ftHCC8KoN4ta96Kqpu/5RcCAyjOqA4PE=";
   };
 
   build-system = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
index 25850b7ed4b2..98a144f91a66 100644
--- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
@@ -8,15 +8,15 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "azure-mgmt-netapp";
-  version = "15.0.0";
+  version = "16.0.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "azure_mgmt_netapp";
-    inherit version;
-    hash = "sha256-0wp5YQK1BFvnmIHaXPMxs0XiXQ9akjWXGYOh2uUc84k=";
+    inherit (finalAttrs) version;
+    hash = "sha256-/tcO1+pIMcB2e+T1f2ClHxLjSzqv0PherTPMgI12/BY=";
   };
 
   build-system = [ setuptools ];
@@ -38,8 +38,8 @@ buildPythonPackage rec {
   meta = {
     description = "Microsoft Azure NetApp Files Management Client Library for Python";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
-    changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-netapp_${version}/sdk/netapp/azure-mgmt-netapp/CHANGELOG.md";
+    changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-netapp_${finalAttrs.version}/sdk/netapp/azure-mgmt-netapp/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
index 945a9dec0867..ff6a6490b68d 100644
--- a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-recoveryservices";
-  version = "4.0.0";
+  version = "4.0.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "azure_mgmt_recoveryservices";
     inherit version;
-    hash = "sha256-oUKc/Sg6nJlQrBU0gvqcl0Fkb9INqKqcPIHnJceMXJ8=";
+    hash = "sha256-/9/yZ9sqYC6wMMCC9Tpd8YXIbqU8RG6meaEzYAJ4YGs=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/bitmath/default.nix b/pkgs/development/python-modules/bitmath/default.nix
index 52213081e0f5..87c00c52e548 100644
--- a/pkgs/development/python-modules/bitmath/default.nix
+++ b/pkgs/development/python-modules/bitmath/default.nix
@@ -1,33 +1,35 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  isPy3k,
-  progressbar231 ? null,
-  progressbar33,
-  mock,
+  fetchFromGitHub,
+  hatchling,
+  pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "bitmath";
-  version = "1.3.3.1";
-  format = "setuptools";
+  version = "2.1.1";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "293325f01e65defe966853111df11d39215eb705a967cb115851da8c4cfa3eb8";
+  src = fetchFromGitHub {
+    owner = "timlnx";
+    repo = "bitmath";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-9hiwIpDIAU+N+LhlJ9qlKBZQibbrwwhGM77fvEnABRI=";
   };
 
-  nativeCheckInputs = [
-    (if isPy3k then progressbar33 else progressbar231)
-    mock
-  ];
+  build-system = [ hatchling ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "bitmath" ];
 
   meta = {
     description = "Module for representing and manipulating file sizes with different prefix";
-    mainProgram = "bitmath";
-    homepage = "https://github.com/tbielawa/bitmath";
+    homepage = "https://github.com/timlnx/bitmath";
+    changelog = "https://github.com/timlnx/bitmath/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ twey ];
+    mainProgram = "bitmath";
   };
-}
+})
diff --git a/pkgs/development/python-modules/brother-ql/default.nix b/pkgs/development/python-modules/brother-ql/default.nix
index 3a6058c9c5e5..0501cb397a41 100644
--- a/pkgs/development/python-modules/brother-ql/default.nix
+++ b/pkgs/development/python-modules/brother-ql/default.nix
@@ -2,7 +2,6 @@
   fetchPypi,
   buildPythonPackage,
   setuptools,
-  future,
   packbits,
   pillow,
   pyusb,
@@ -14,24 +13,26 @@
 
 buildPythonPackage rec {
   pname = "brother-ql";
-  version = "0.11.2";
+  version = "0.12.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "brother_ql_next";
     inherit version;
-    hash = "sha256-3rTf+4W5KK7zSGIE3bBHXHE0hjyvpjB0IiEtbax6mkU=";
+    hash = "sha256-NTw5hlMJRoABvbteyCYF0Kopc9AjNyuwLSB+zS3RYRQ=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
     setuptools
-    future
+  ];
+
+  dependencies = [
+    attrs
+    click
+    jsons
     packbits
     pillow
     pyusb
-    click
-    attrs
-    jsons
   ];
 
   meta = {
diff --git a/pkgs/development/python-modules/cached-ipaddress/default.nix b/pkgs/development/python-modules/cached-ipaddress/default.nix
index 8cbd78573f83..820d3dfe2448 100644
--- a/pkgs/development/python-modules/cached-ipaddress/default.nix
+++ b/pkgs/development/python-modules/cached-ipaddress/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "cached-ipaddress";
-  version = "1.0.1";
+  version = "1.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "cached-ipaddress";
     tag = "v${version}";
-    hash = "sha256-/bq9RZcC6VDK5JxT1QcAJpWNmioNqOearYc34KsCvHs=";
+    hash = "sha256-VIIcScaZwd5BAidgG30edYsAQaFnqxEQX+F/t+HR278=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix
index b233d5ac8cf1..ba704941367e 100644
--- a/pkgs/development/python-modules/clarifai-grpc/default.nix
+++ b/pkgs/development/python-modules/clarifai-grpc/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "clarifai-grpc";
-  version = "12.4.1";
+  version = "12.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Clarifai";
     repo = "clarifai-python-grpc";
     tag = version;
-    hash = "sha256-WQf2GNj4vjoUmRPmEVua0DsXNYpnJDI/oVRz+C9m82k=";
+    hash = "sha256-4oyVZCKtQ3B3vy4cSJfV3GSylbM5sQcygAKzIv47aq8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/color-operations/default.nix b/pkgs/development/python-modules/color-operations/default.nix
index d50282718c1f..dadf385564e6 100644
--- a/pkgs/development/python-modules/color-operations/default.nix
+++ b/pkgs/development/python-modules/color-operations/default.nix
@@ -16,16 +16,16 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "color-operations";
-  version = "0.2.0";
+  version = "0.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "vincentsarago";
     repo = "color-operations";
-    tag = version;
-    hash = "sha256-LUO9PxrXCkFqyguvX4GT6vmlALMyfkDqXeGZAQG76vw=";
+    tag = finalAttrs.version;
+    hash = "sha256-hDxbyhelsl/EvsesD4Rux5CQM86squ4gHevVK/UP8Y8=";
   };
 
   build-system = [
@@ -50,8 +50,8 @@ buildPythonPackage rec {
   meta = {
     description = "Apply basic color-oriented image operations. Fork of rio-color";
     homepage = "https://github.com/vincentsarago/color-operations";
-    changelog = "https://github.com/vincentsarago/color-operations/releases/tag/${src.tag}";
+    changelog = "https://github.com/vincentsarago/color-operations/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     teams = [ lib.teams.geospatial ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/color-parser-py/default.nix b/pkgs/development/python-modules/color-parser-py/default.nix
index 9f4ae2bc0b00..77862d5041ae 100644
--- a/pkgs/development/python-modules/color-parser-py/default.nix
+++ b/pkgs/development/python-modules/color-parser-py/default.nix
@@ -6,21 +6,21 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "color-parser-py";
-  version = "0.1.6";
+  version = "0.1.7";
   pyproject = true;
 
   # PyPI has Cargo.lock
   src = fetchPypi {
     pname = "color_parser_py";
-    inherit version;
-    hash = "sha256-m1qhVAwQNtCwz+DLSAdfKhzkohMLMjvPHxynKhlJfN8=";
+    inherit (finalAttrs) version;
+    hash = "sha256-C3Q9vaOa/SE0PtQu5Gw/sk1JMRIlhgbA5VTW+2aC5dU=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit pname version src;
-    hash = "sha256-tKXA6sd5gLCJUaqxzFcZ3lePK41Wk2TbLp0HXBacOyo=";
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-nyl0Nmf0DNLH3j2XrTTO1u3erBCbRyp/xO0w/USjDHE=";
   };
 
   nativeBuildInputs = [
@@ -38,7 +38,8 @@ buildPythonPackage rec {
   meta = {
     description = "Python bindings for color parsing and conversion";
     homepage = "https://github.com/rusiaaman/color-parser-py";
+    changelog = "https://github.com/rusiaaman/color-parser-py/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ aleksana ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/cometx/default.nix b/pkgs/development/python-modules/cometx/default.nix
index 29fde5dac071..d770b390bec1 100644
--- a/pkgs/development/python-modules/cometx/default.nix
+++ b/pkgs/development/python-modules/cometx/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "cometx";
-  version = "3.4.3";
+  version = "3.6.6";
 
   pyproject = true;
   build-system = [ setuptools ];
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "comet-ml";
     repo = "cometx";
     tag = version;
-    hash = "sha256-Wb4En/fTXeC5kvOIVAQzKxl8HXyOYvG4OGWhKhrAP6g=";
+    hash = "sha256-Ub7Ucn/Xgaedymqjgiouy685PPr3tULAvJNLeqAgf78=";
   };
 
   dependencies = [
diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix
index 2a076628e538..9e542285ca2e 100644
--- a/pkgs/development/python-modules/cyclopts/default.nix
+++ b/pkgs/development/python-modules/cyclopts/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "cyclopts";
-  version = "4.16.0";
+  version = "4.16.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "BrianPugh";
     repo = "cyclopts";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tDDYVqhjvTRQ0rTvib4ek49zEnEefkKoq1t/3C/PRlQ=";
+    hash = "sha256-uKeGQw/vWDOtRi+CGNHfMAf/ofZyEfRqp2fUUWaIEDs=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix
index bdf788fbed23..b133b9d144ee 100644
--- a/pkgs/development/python-modules/cypari2/default.nix
+++ b/pkgs/development/python-modules/cypari2/default.nix
@@ -4,7 +4,9 @@
   python,
   fetchPypi,
   pari,
+  pkg-config,
   gmp,
+  meson-python,
   cython,
   cysignals,
 
@@ -15,26 +17,33 @@
 buildPythonPackage rec {
   pname = "cypari2";
   # upgrade may break sage, please test the sage build or ping @timokau on upgrade
-  version = "2.2.2";
-  format = "setuptools";
+  version = "2.2.4";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-E6M4c16iIcEGj4/EFVYb93fYxoclcCvHSVRyZP0JFyA=";
+    hash = "sha256-+fDplKmgsGRhkyBBHh2cMDFYhH4FW1gILv2t5ayX9hM=";
   };
 
-  preBuild = ''
-    # generate cythonized extensions (auto_paridecl.pxd is crucial)
-    ${python.pythonOnBuildForHost.interpreter} setup.py build_ext --inplace
+  preConfigure = ''
+    substituteInPlace cypari2/meson.build \
+       --replace-fail "'cypari2.py'" "'cypari2.pc'"
   '';
 
-  nativeBuildInputs = [ pari ];
-
-  buildInputs = [ gmp ];
-
-  propagatedBuildInputs = [
-    cysignals
+  build-system = [
+    meson-python
     cython
+    cysignals
+  ];
+
+  nativeBuildInputs = [
+    pari
+    pkg-config
+  ];
+
+  buildInputs = [
+    gmp
+    pari
   ];
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/dep-logic/default.nix b/pkgs/development/python-modules/dep-logic/default.nix
index 19d26cc62795..3b2b2a377ec0 100644
--- a/pkgs/development/python-modules/dep-logic/default.nix
+++ b/pkgs/development/python-modules/dep-logic/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "dep-logic";
-  version = "0.5.2";
+  version = "0.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pdm-project";
     repo = "dep-logic";
     tag = finalAttrs.version;
-    hash = "sha256-BjqPtfYsHSDQoaYs+hB0r/mRuONqBHOb6goi1dxkFWo=";
+    hash = "sha256-FfnRpWKsObt38b/2e3t4wgxCtEs6OiEAQfJqhD+hI7c=";
   };
 
   nativeBuildInputs = [ pdm-backend ];
diff --git a/pkgs/development/python-modules/django-health-check/default.nix b/pkgs/development/python-modules/django-health-check/default.nix
index e32a4a19981a..48deb090ecd4 100644
--- a/pkgs/development/python-modules/django-health-check/default.nix
+++ b/pkgs/development/python-modules/django-health-check/default.nix
@@ -1,32 +1,35 @@
 {
   lib,
-  boto3,
+  stdenv,
   buildPythonPackage,
   celery,
-  django-storages,
-  django,
   fetchFromGitHub,
   flit-core,
   flit-scm,
-  gitMinimal,
-  mock,
   pytest-cov-stub,
   pytest-django,
   pytestCheckHook,
   redis,
-  sphinx,
+  psutil,
+  dnspython,
+  pytest-asyncio,
+  libredirect,
+  confluent-kafka,
+  aio-pika,
+  httpx,
+  feedparser,
 }:
 
 buildPythonPackage rec {
   pname = "django-health-check";
-  version = "3.20.8";
+  version = "4.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "KristianOellegaard";
+    owner = "codingjoe";
     repo = "django-health-check";
     tag = version;
-    hash = "sha256-voB3shugfM/nO0vPd9yA4NOUB+E9aVcFnqG1mtfRYFc=";
+    hash = "sha256-ijlkgE1ZxlBPUadTeZcwIKYocZo51ZidQyQqFHOnEv4=";
   };
 
   build-system = [
@@ -34,36 +37,67 @@ buildPythonPackage rec {
     flit-scm
   ];
 
-  buildInputs = [
-    sphinx
-    django
+  dependencies = [
+    dnspython
   ];
 
-  nativeBuildInputs = [ gitMinimal ];
+  optional-dependencies = {
+    psutil = [ psutil ];
+    celery = [ celery ];
+    kafka = [ confluent-kafka ];
+    rabbitmq = [ aio-pika ];
+    redis = [ redis ];
+    rss = [
+      httpx
+      feedparser
+    ];
+    atlassian = [ httpx ];
+  };
 
   nativeCheckInputs = [
-    boto3
-    django-storages
     pytest-cov-stub
     pytest-django
     pytestCheckHook
-    mock
-    celery
-    redis
+    psutil
+    pytest-asyncio
+    libredirect.hook
   ];
 
   disabledTests = [
-    # commandline output mismatch
-    "test_command_with_non_existence_subset"
+    # require online DNS resolution
+    "test_run_check__dns_working"
+    "test_check_status__nonexistent_hostname"
+    "test_check_status__no_answer"
+  ]
+  ++ lib.optionals stdenv.isDarwin [
+    # sensors_temperatures is not available on darwin: https://psutil.readthedocs.io/stable/index.html#psutil.sensors_temperatures
+    "TestTemperature"
+    # some metrics aren't available on darwin: https://psutil.readthedocs.io/stable/index.html#psutil.virtual_memory
+    "TestMemory"
+    # live_server not working on darwin
+    "TestHealthCheckCommand"
   ];
 
   pythonImportsCheck = [ "health_check" ];
 
+  preCheck = ''
+    echo "nameserver 127.0.0.1" > resolv.conf
+    export NIX_REDIRECTS=/etc/resolv.conf=$(realpath resolv.conf)
+  '';
+
+  preInstallCheck = ''
+    export PYTHONPATH=$PWD:$PYTHONPATH
+    export DJANGO_SETTINGS_MODULE=tests.testapp.settings
+  '';
+
   meta = {
     description = "Pluggable app that runs a full check on the deployment";
-    homepage = "https://github.com/KristianOellegaard/django-health-check";
-    changelog = "https://github.com/revsys/django-health-check/releases/tag/${src.tag}";
+    homepage = "https://github.com/codingjoe/django-health-check";
+    changelog = "https://github.com/codingjoe/django-health-check/releases/tag/${src.tag}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ onny ];
+    maintainers = with lib.maintainers; [
+      onny
+      dav-wolff
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/django-markdownx/default.nix b/pkgs/development/python-modules/django-markdownx/default.nix
index 687a4e578b30..97f37c7a85c2 100644
--- a/pkgs/development/python-modules/django-markdownx/default.nix
+++ b/pkgs/development/python-modules/django-markdownx/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "django-markdownx";
-  version = "4.0.9";
+  version = "4.0.11";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "neutronX";
     repo = "django-markdownx";
     tag = "v${version}";
-    hash = "sha256-il9bXi8URq7mQMCyKl5ikHT4nH2R9ixMDHSpH8gfnVU=";
+    hash = "sha256-dTNWTXHj5Tk77/XdIgfFGLir0JhlhwcWAIKDax8qM9M=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/django-prometheus/default.nix b/pkgs/development/python-modules/django-prometheus/default.nix
index b2526d41c4ad..07eebf02ed58 100644
--- a/pkgs/development/python-modules/django-prometheus/default.nix
+++ b/pkgs/development/python-modules/django-prometheus/default.nix
@@ -3,21 +3,23 @@
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
+  django,
   prometheus-client,
+  psycopg,
   pytest-django,
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "django-prometheus";
-  version = "2.4.1";
+  version = "2.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "django-commons";
     repo = "django-prometheus";
-    tag = "v${version}";
-    hash = "sha256-Bf1JSh9ibiPOa252IPld1FvHTPbCsB/amtlQdRQwoWY=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ghY8eznPbkK7/jaeTAG3v5CD4ZZbFNNWSfjBNfuHBTo=";
   };
 
   postPatch = ''
@@ -34,20 +36,24 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies = [ prometheus-client ];
+  dependencies = [
+    django
+    prometheus-client
+  ];
 
   pythonImportsCheck = [ "django_prometheus" ];
 
   nativeCheckInputs = [
-    pytest-django
+    psycopg
     pytestCheckHook
+    pytest-django
   ];
 
   meta = {
-    changelog = "https://github.com/django-commons/django-prometheus/releases/tag/v${version}";
+    changelog = "https://github.com/django-commons/django-prometheus/releases/tag/${finalAttrs.src.tag}";
     description = "Django middlewares to monitor your application with Prometheus.io";
     homepage = "https://github.com/django-commons/django-prometheus";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ hexa ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix
index 9edac97dd23f..6d518ff7e734 100644
--- a/pkgs/development/python-modules/eigenpy/default.nix
+++ b/pkgs/development/python-modules/eigenpy/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "eigenpy";
-  version = "3.12.0";
+  version = "3.13.0";
   pyproject = false; # Built with cmake
 
   src = fetchFromGitHub {
     owner = "stack-of-tasks";
     repo = "eigenpy";
     tag = "v${version}";
-    hash = "sha256-U4uL0knGJFpD14Gc32lgTZlw7QlXHMEqTnp0bmHJRU8=";
+    hash = "sha256-05G0U1RjVwggfnABxZH+9kxDIo7M9rgxHCcTvNgTZCQ=";
   };
 
   outputs = [
diff --git a/pkgs/development/python-modules/faiss/default.nix b/pkgs/development/python-modules/faiss/default.nix
index 76bb135148f8..bf0f5dcdad32 100644
--- a/pkgs/development/python-modules/faiss/default.nix
+++ b/pkgs/development/python-modules/faiss/default.nix
@@ -12,6 +12,7 @@
 buildPythonPackage {
   inherit (faiss-build) pname version;
   pyproject = true;
+  __structuredAttrs = true;
 
   src = "${lib.getOutput "dist" faiss-build}";
 
diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix
index a902b8e0c3b8..4fffd13392d3 100644
--- a/pkgs/development/python-modules/flask-jwt-extended/default.nix
+++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname = "flask-jwt-extended";
-  version = "4.7.1";
+  version = "4.7.4";
   pyproject = true;
 
   src = fetchPypi {
     pname = "flask_jwt_extended";
     inherit version;
-    hash = "sha256-gIXWdXUFtvMpGiY4yE0gfo8K0N5mLR9Gqi935ligyXY=";
+    hash = "sha256-eP0PRgMX+s86AISmRX/68vHdqe771Xb5TOo1sOrdVTE=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/flask-security/default.nix b/pkgs/development/python-modules/flask-security/default.nix
index 40fde723c6ed..d715cd322f53 100644
--- a/pkgs/development/python-modules/flask-security/default.nix
+++ b/pkgs/development/python-modules/flask-security/default.nix
@@ -51,14 +51,14 @@
 
 buildPythonPackage rec {
   pname = "flask-security";
-  version = "5.8.0";
+  version = "5.8.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pallets-eco";
     repo = "flask-security";
     tag = version;
-    hash = "sha256-ocHxrcdwO4nvpwMJUhT6TYmzPt7V3nkmES3HdxBkzyQ=";
+    hash = "sha256-xNWgLIk/AB5beZQX7jzh8uQ9o0Gq+W5rgowBS215pk4=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/gehomesdk/default.nix b/pkgs/development/python-modules/gehomesdk/default.nix
index df4dfb912947..093f71d6f24f 100644
--- a/pkgs/development/python-modules/gehomesdk/default.nix
+++ b/pkgs/development/python-modules/gehomesdk/default.nix
@@ -15,12 +15,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "gehomesdk";
-  version = "2026.2.0";
+  version = "2026.5.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-+BWGkUDKd+9QGbdXuLjmJxLm1xUv0dpIRlPlDkUJ25w=";
+    hash = "sha256-Q5YvefLDLvZAicBMaD6M7sASIfXllpf1kVlwWEd59zg=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/ggml-python/default.nix b/pkgs/development/python-modules/ggml-python/default.nix
index 9a2fc9a01658..95fb4eccad21 100644
--- a/pkgs/development/python-modules/ggml-python/default.nix
+++ b/pkgs/development/python-modules/ggml-python/default.nix
@@ -36,6 +36,7 @@ buildPythonPackage (finalAttrs: {
   pname = "ggml-python";
   version = "0.0.37";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "abetlen";
diff --git a/pkgs/development/python-modules/greynoise/default.nix b/pkgs/development/python-modules/greynoise/default.nix
index f2c6759cf63c..3f70f86a5eae 100644
--- a/pkgs/development/python-modules/greynoise/default.nix
+++ b/pkgs/development/python-modules/greynoise/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "greynoise";
-  version = "3.0.2";
+  version = "3.0.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "GreyNoise-Intelligence";
     repo = "pygreynoise";
     tag = "v${version}";
-    hash = "sha256-CP+Fx3Gu6pQWnX/WjJ+qq7TK9onatVHp0ghu33WU7X4=";
+    hash = "sha256-ClNKDMfMKcOYOasUqmQoOtKFsAi5wZw/MLTkq5YzpJk=";
   };
 
   patches = lib.optionals (!withRepl) [
diff --git a/pkgs/development/python-modules/hy/default.nix b/pkgs/development/python-modules/hy/default.nix
index 505f2800d634..4dc38d26b6dc 100644
--- a/pkgs/development/python-modules/hy/default.nix
+++ b/pkgs/development/python-modules/hy/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "hy";
-  version = "1.2.0";
+  version = "1.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hylang";
     repo = "hy";
     tag = version;
-    hash = "sha256-uKkTH5vywJ5OrbbHIpHGLbTA/Px0/02JEXI8NIUvt/w=";
+    hash = "sha256-B8luwaIDUMdMZk/QZNKTM+ejCvJR8LoIcuQCCqsqu2k=";
   };
 
   # https://github.com/hylang/hy/blob/1.0a4/get_version.py#L9-L10
diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index c87dca558444..0a17e7f40900 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "iamdata";
-  version = "0.1.202605251";
+  version = "0.1.202605261";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EO2FwOx7b5m8ChAkyHfYRwSbWf+h3unG8TfApa50+ME=";
+    hash = "sha256-gUriLM9qiqKEh+ugMwTBM6+Mvhh54Sf12cLKzMzky7w=";
   };
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/jaxtyping/default.nix b/pkgs/development/python-modules/jaxtyping/default.nix
index 36735b912689..e388ba7b5260 100644
--- a/pkgs/development/python-modules/jaxtyping/default.nix
+++ b/pkgs/development/python-modules/jaxtyping/default.nix
@@ -27,14 +27,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "jaxtyping";
-  version = "0.3.9";
+  version = "0.3.10";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "patrick-kidger";
     repo = "jaxtyping";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ex84xtns3wtIodXdpC6/88Kn0I+33B7ScHPIc9C5tuY=";
+    hash = "sha256-7HhStNjVKjnPfXiuXDLsvwH1efSGSMqRuCWeOtpcidw=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix
index 10ad8a1f528b..4fdc59fa52e0 100644
--- a/pkgs/development/python-modules/jdatetime/default.nix
+++ b/pkgs/development/python-modules/jdatetime/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "jdatetime";
-  version = "5.2.0";
+  version = "5.3.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-yB1YmHF7grYJo84qc/i40yMLDHV+XA3p1rGs/cIk9VE=";
+    hash = "sha256-0g65/CoA6GSTphVrKg5OV58jN56P6hhqDmA/02oTAic=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/langchain-google-genai/default.nix b/pkgs/development/python-modules/langchain-google-genai/default.nix
index e257fe4473f6..af7e50122f3a 100644
--- a/pkgs/development/python-modules/langchain-google-genai/default.nix
+++ b/pkgs/development/python-modules/langchain-google-genai/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "langchain-google-genai";
-  version = "4.2.2";
+  version = "4.2.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain-google";
     tag = "libs/genai/v${finalAttrs.version}";
-    hash = "sha256-W5JACbNUApJFz8XikKXGMY3XL1zdbaf+u9WmCQymy9M=";
+    hash = "sha256-OJQRYCzMa6y1F3gHFBAY+G3v3ZWzhw1ZqvbePTJyzr8=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/libs/genai";
diff --git a/pkgs/development/python-modules/mkdocs-include-markdown-plugin/default.nix b/pkgs/development/python-modules/mkdocs-include-markdown-plugin/default.nix
index 9d0f41163128..446ffc72c0bf 100644
--- a/pkgs/development/python-modules/mkdocs-include-markdown-plugin/default.nix
+++ b/pkgs/development/python-modules/mkdocs-include-markdown-plugin/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "mkdocs-include-markdown-plugin";
-  version = "7.2.2";
+  version = "7.3.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "mkdocs_include_markdown_plugin";
     inherit version;
-    hash = "sha256-8FLMt0Hsz0mBFrgmwdeKLXYcVnRzcllHCUQc7glj+8k=";
+    hash = "sha256-KAASZ0ZFLjHC4yG71DyBkLNW4N41PiDLwWo0o8PWeWw=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/msprime/default.nix b/pkgs/development/python-modules/msprime/default.nix
index 4ea724ca1c60..3a4ec1b457c7 100644
--- a/pkgs/development/python-modules/msprime/default.nix
+++ b/pkgs/development/python-modules/msprime/default.nix
@@ -17,12 +17,12 @@
 
 buildPythonPackage rec {
   pname = "msprime";
-  version = "1.4.1";
+  version = "1.4.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-aKcgjq6jDKRzNlKHyDMHj2VK8eGGsk/AEF53F8k7uWc=";
+    hash = "sha256-hpGz7fdPl5ZBFieXDmps0Q7Fhcmr9K3ULZPimzhl/SI=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/mypyllant/default.nix b/pkgs/development/python-modules/mypyllant/default.nix
index dd08f34a91cc..4c397564e1b4 100644
--- a/pkgs/development/python-modules/mypyllant/default.nix
+++ b/pkgs/development/python-modules/mypyllant/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "mypyllant";
-  version = "0.9.10";
+  version = "0.9.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "signalkraft";
     repo = "myPyllant";
     tag = "v${version}";
-    hash = "sha256-hsuRoh8meAlPd5+WlYkjbGhNKDLV5XsKn27zQWnrELQ=";
+    hash = "sha256-ZVk9QV5Q5bEeS3dsyFkhdPOJDqwf76o6XW5VSBuutMw=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/numpy-quaternion/default.nix b/pkgs/development/python-modules/numpy-quaternion/default.nix
new file mode 100644
index 000000000000..639875be1c4c
--- /dev/null
+++ b/pkgs/development/python-modules/numpy-quaternion/default.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  hatchling,
+  numpy,
+  setuptools,
+
+  # dependencies
+  scipy,
+
+  # tests
+  pytest-cov-stub,
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "numpy-quaternion";
+  version = "2024.0.13";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "moble";
+    repo = "quaternion";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-W35R+S6yzcKTpKtemjiLzH9v5owduUtos9DyoY28qbc=";
+  };
+
+  build-system = [
+    hatchling
+    numpy
+    setuptools
+  ];
+
+  dependencies = [
+    numpy
+    scipy
+  ];
+
+  pythonImportsCheck = [ "quaternion" ];
+
+  nativeCheckInputs = [
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Built-in support for quaternions in numpy";
+    homepage = "https://github.com/moble/quaternion";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+})
diff --git a/pkgs/development/python-modules/nvidia-cutlass-dsl-libs-base/default.nix b/pkgs/development/python-modules/nvidia-cutlass-dsl-libs-base/default.nix
new file mode 100644
index 000000000000..cd5c4659f1ac
--- /dev/null
+++ b/pkgs/development/python-modules/nvidia-cutlass-dsl-libs-base/default.nix
@@ -0,0 +1,101 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchPypi,
+  python,
+
+  # nativeBuildInputs
+  autoAddDriverRunpath,
+  autoPatchelfHook,
+
+  # dependencies
+  cuda-bindings,
+  numpy,
+  typing-extensions,
+}:
+
+let
+  platform =
+    {
+      x86_64-linux = "manylinux_2_28_x86_64";
+      aarch64-linux = "manylinux_2_28_aarch64";
+    }
+    .${stdenv.hostPlatform.system}
+      or (throw "nvidia-cutlass-dsl-libs-base is not supported on ${stdenv.hostPlatform.system}");
+
+  pyShortVersion = "cp${builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion}";
+
+  hashes = {
+    x86_64-linux = {
+      cp311 = "sha256-kReQDLpT08Iajay6a789bl8mnkJ6UmwyD7RHB6DVc2M=";
+      cp312 = "sha256-Fe9qWRk2Z+Zjk070hz+MytN0Vem3w8QZwwchE7iu32E=";
+      cp313 = "sha256-5Z2n2J5eT4UUxlMIQ/kQ+dhzTYBC3KoHnJ2cUGPrNRQ=";
+      cp314 = "sha256-EsKffB8fgoUQkro4aSZNr6+wNSKMDZgnqNsIuIT7gMo=";
+    };
+    aarch64-linux = {
+      cp311 = "sha256-y7VVqVxwEeSzyjKL5AcpnHfSiWYK2+oi7VFdRAbmlJw=";
+      cp312 = "sha256-0qPEEih+NW++SP6fhF1tM8013qXiDX5PYowglXlnys0=";
+      cp313 = "sha256-OVvXfPZCru8xExNFPmWC8RyTV6S4H+Yg6j2szR/Mq5s=";
+      cp314 = "sha256-IW7uaqgQfTVWn5RRtmsDo8UxZ4QdGvm2MLlm742Wbhk=";
+    };
+  };
+in
+buildPythonPackage (finalAttrs: {
+  pname = "nvidia-cutlass-dsl-libs-base";
+  version = "4.5.2";
+  format = "wheel";
+
+  src = fetchPypi {
+    pname = "nvidia_cutlass_dsl_libs_base";
+    inherit (finalAttrs) version;
+    format = "wheel";
+    inherit platform;
+    dist = pyShortVersion;
+    python = pyShortVersion;
+    abi = pyShortVersion;
+    hash =
+      hashes.${stdenv.hostPlatform.system}.${pyShortVersion}
+        or (throw "No hash specified for '${stdenv.hostPlatform.system}.${pyShortVersion}'");
+  };
+
+  pythonRemoveDeps = [
+    # Only cuda-bindings is needed
+    "cuda-python"
+  ];
+  dependencies = [
+    cuda-bindings
+    numpy
+    typing-extensions
+  ];
+
+  nativeBuildInputs = [
+    autoAddDriverRunpath
+    autoPatchelfHook
+  ];
+
+  autoPatchelfIgnoreMissingDeps = [
+    # libmlir_cuda_runtime.so links libcuda.so.1
+    # autoAddDriverRunpath bakes the driver path into the runpath; tell autoPatchelfHook not to fail
+    # on it.
+    "libcuda.so.1"
+  ];
+
+  # This wheel ships the `cutlass` module via `nvidia_cutlass_dsl.pth`.
+  # Python only processes `.pth` files in dirs that `site.py` registers as site-packages, not in
+  # PYTHONPATH entries so pythonImportsCheck (which uses PYTHONPATH) can't see `cutlass`.
+  dontUsePythonImportsCheck = true;
+
+  # No tests in the Pypi archive
+  doCheck = false;
+
+  meta = {
+    description = "Bundled MLIR/CUDA runtime libraries and Python sources for the NVIDIA CUTLASS DSL";
+    homepage = "https://github.com/NVIDIA/cutlass";
+    changelog = "https://github.com/NVIDIA/cutlass/blob/v${finalAttrs.version}/CHANGELOG.md";
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.unfreeRedistributable; # NVIDIA Proprietary
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/development/python-modules/nvidia-cutlass-dsl-libs-base/prefetch.sh b/pkgs/development/python-modules/nvidia-cutlass-dsl-libs-base/prefetch.sh
new file mode 100755
index 000000000000..ce0200c446c2
--- /dev/null
+++ b/pkgs/development/python-modules/nvidia-cutlass-dsl-libs-base/prefetch.sh
@@ -0,0 +1,29 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i sh -p jq
+
+pname="nvidia-cutlass-dsl-libs-base"
+outfile="${pname}-hashes.nix"
+# Clear file
+rm -f $outfile
+
+prefetch() {
+  package_attr="python${1}Packages.${pname}"
+  echo "Fetching hash for $package_attr on $2"
+
+  expr="(import <nixpkgs> { system = \"$2\"; }).$package_attr.src.url"
+  url=$(NIX_PATH=.. nix-instantiate --eval -E "$expr" | jq -r)
+
+  sha256=$(nix-prefetch-url "$url")
+  hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$sha256")
+
+  echo -e "  cp${1} = \"${hash}\";" >>$outfile
+  echo
+}
+
+for system in "x86_64-linux" "aarch64-linux"; do
+  echo "${system} = {" >>$outfile
+  for python_version in "311" "312" "313" "314"; do
+    prefetch "$python_version" "$system"
+  done
+  echo "};" >>$outfile
+done
diff --git a/pkgs/development/python-modules/nvidia-cutlass-dsl/default.nix b/pkgs/development/python-modules/nvidia-cutlass-dsl/default.nix
new file mode 100644
index 000000000000..59f4cd405157
--- /dev/null
+++ b/pkgs/development/python-modules/nvidia-cutlass-dsl/default.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+
+  # dependencies
+  nvidia-cutlass-dsl-libs-base,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "nvidia-cutlass-dsl";
+  inherit (nvidia-cutlass-dsl-libs-base) version;
+  format = "wheel";
+
+  # Universal metadata-only wheel that just pulls in `nvidia-cutlass-dsl-libs-base`
+  # (which actually ships the Python code and the bundled MLIR/CUDA runtime libs).
+  src = fetchPypi {
+    pname = "nvidia_cutlass_dsl";
+    inherit (finalAttrs) version;
+    format = "wheel";
+    python = "py3";
+    dist = "py3";
+    hash = "sha256-aO0bY8p0quh5VQEtqd/X/arkcTKdACiyKbhBxxksz1I=";
+  };
+
+  dependencies = [
+    nvidia-cutlass-dsl-libs-base
+  ];
+
+  # The `cutlass` module is provided by `nvidia-cutlass-dsl-libs-base` via a `.pth` file.
+  # pythonImportsCheck uses PYTHONPATH, which Python's site.py doesn't scan for `.pth` files.
+  dontUsePythonImportsCheck = true;
+
+  # No tests in the Pypi archive
+  doCheck = false;
+
+  meta = {
+    description = "NVIDIA CUTLASS Python DSL";
+    homepage = "https://github.com/NVIDIA/cutlass";
+    changelog = "https://github.com/NVIDIA/cutlass/blob/v${finalAttrs.version}/CHANGELOG.md";
+    license = lib.licenses.unfreeRedistributable; # NVIDIA Proprietary
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/development/python-modules/osxphotos/default.nix b/pkgs/development/python-modules/osxphotos/default.nix
index 6b1c02676856..cd42a619f65f 100644
--- a/pkgs/development/python-modules/osxphotos/default.nix
+++ b/pkgs/development/python-modules/osxphotos/default.nix
@@ -17,6 +17,7 @@
   pathvalidate,
   pip,
   ptpython,
+  psutil,
   pytimeparse2,
   pyyaml,
   requests,
@@ -41,17 +42,29 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "osxphotos";
-  version = "0.75.1";
+  version = "0.75.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "RhetTbull";
     repo = "osxphotos";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aX+4wgjqWxoIez/pJ7ioes5OTHFijztSFTvTxdND6Eo=";
+    hash = "sha256-9oQ9yLNHACLgOegNRcuysGIo8cbYLhlkNa41Y+YHFTM=";
   };
 
+  pythonRelaxDeps = [
+    "bitmath"
+    "mako"
+    "more-itertools"
+    "objexplore"
+    "rich"
+    "textx"
+    "tenacity"
+    "whenever"
+  ];
+
   build-system = [ setuptools ];
+
   dependencies = [
     beautifulsoup4
     bitmath
@@ -64,12 +77,13 @@ buildPythonPackage (finalAttrs: {
     packaging
     pathvalidate
     pip
+    psutil
     ptpython
     pytimeparse2
     pyyaml
     requests
-    rich-theme-manager
     rich
+    rich-theme-manager
     shortuuid
     strpdatetime
     tenacity
@@ -83,16 +97,8 @@ buildPythonPackage (finalAttrs: {
     xdg-base-dirs
   ];
 
-  pythonRelaxDeps = [
-    "mako"
-    "more-itertools"
-    "objexplore"
-    "rich"
-    "textx"
-    "tenacity"
-  ];
-
   pythonImportsCheck = [ "osxphotos" ];
+
   nativeCheckInputs = [
     pytestCheckHook
     pytest-mock
diff --git a/pkgs/development/python-modules/py-opensonic/default.nix b/pkgs/development/python-modules/py-opensonic/default.nix
index 4d48cc1435c9..831ae47316b9 100644
--- a/pkgs/development/python-modules/py-opensonic/default.nix
+++ b/pkgs/development/python-modules/py-opensonic/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "py-opensonic";
-  version = "9.0.1";
+  version = "9.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "khers";
     repo = "py-opensonic";
     tag = "v${version}";
-    hash = "sha256-CkOAqeB9p6K3qFf7q/McyTpKte8w4sKo3fuBk6sx6ZE=";
+    hash = "sha256-xZHlI62QoKkR4sZf0GUEzUGMpG2urHooPs8GvVyqpIQ=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pydriller/default.nix b/pkgs/development/python-modules/pydriller/default.nix
new file mode 100644
index 000000000000..c5c5c38a438f
--- /dev/null
+++ b/pkgs/development/python-modules/pydriller/default.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pytestCheckHook,
+
+  # dependencies
+  gitpython,
+  pytz,
+  types-pytz,
+  lizard,
+}:
+
+buildPythonPackage rec {
+  pname = "pydriller";
+  version = "2.9";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "ishepard";
+    repo = "pydriller";
+    tag = version;
+    hash = "sha256-Al81olowYgN/8xIh6ForQHibgy4qy5ivh7YJGm+lGIE=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    gitpython
+    pytz
+    types-pytz
+    lizard
+  ];
+
+  # require internet access
+  doChecks = false;
+
+  pythonImportsCheck = [ "pydriller" ];
+
+  meta = {
+    description = "Python Framework to analyse Git repositories";
+    homepage = "https://pydriller.readthedocs.io/en/latest/";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ felbinger ];
+  };
+}
diff --git a/pkgs/development/python-modules/pyfireservicerota/default.nix b/pkgs/development/python-modules/pyfireservicerota/default.nix
index 1cc7afb19d5f..a8f07d074aa9 100644
--- a/pkgs/development/python-modules/pyfireservicerota/default.nix
+++ b/pkgs/development/python-modules/pyfireservicerota/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pyfireservicerota";
-  version = "0.0.48";
+  version = "0.0.49";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cyberjunky";
     repo = "python-fireservicerota";
     tag = version;
-    hash = "sha256-wHcIzhSofp8dwlPy35gOJwIM0wtWPqUx7/kg6NjfNhc=";
+    hash = "sha256-EVMxAOP6haS+jkLD6pOZnu0yhhNMR+gCud2qXsycNbc=";
   };
 
   build-system = [ pdm-backend ];
diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix
index 1ba3142797bb..b813583c19ca 100644
--- a/pkgs/development/python-modules/pytapo/default.nix
+++ b/pkgs/development/python-modules/pytapo/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pytapo";
-  version = "3.4.13";
+  version = "3.4.14";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-+PQ5x8ob59AhcCaqs/KKS3/7ywe0bkZUvun/sVGBtNA=";
+    hash = "sha256-x9XmlTlt/V+0pVFJlQBZmj5CX03LrRhI6cE5VV48GTI=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pytest-spec/default.nix b/pkgs/development/python-modules/pytest-spec/default.nix
index 42d469b2cd89..11005215975b 100644
--- a/pkgs/development/python-modules/pytest-spec/default.nix
+++ b/pkgs/development/python-modules/pytest-spec/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pytest-spec";
-  version = "6.0.0";
+  version = "6.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pchomik";
     repo = "pytest-spec";
     tag = finalAttrs.version;
-    hash = "sha256-2DXC02FSiGzsavdkoDFlxKdYaYpPAy3VbEG4YZSO5c8=";
+    hash = "sha256-9kJLIe2msS2DrpEerSOa9rh3XfBJQMfY7wwrtH3XQn0=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix
index 054e36058943..af3d21c0c285 100644
--- a/pkgs/development/python-modules/python-engineio/default.nix
+++ b/pkgs/development/python-modules/python-engineio/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "python-engineio";
-  version = "4.13.1";
+  version = "4.13.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "miguelgrinberg";
     repo = "python-engineio";
     tag = "v${version}";
-    hash = "sha256-WX3UyKypx5hE7x7rA6waELEnAXg95zEd4vX27Tni2/c=";
+    hash = "sha256-j4PHBiKwkYq8x/UYtnCLbtQVsXWNy84SsKAd0urhoY8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/python-openevse-http/default.nix b/pkgs/development/python-modules/python-openevse-http/default.nix
index 81bd81eccc91..f33bdd102a93 100644
--- a/pkgs/development/python-modules/python-openevse-http/default.nix
+++ b/pkgs/development/python-modules/python-openevse-http/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "python-openevse-http";
-  version = "0.3.3";
+  version = "0.3.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "firstof9";
     repo = "python-openevse-http";
     tag = finalAttrs.version;
-    hash = "sha256-U6v2YcPOllJwmlhQ+ilexj5u1Lom3zwXeQUyKan4j2I=";
+    hash = "sha256-H5kRn8TmTpaX1qf94N2l1qOm03upFzHFistZDLFu/Zs=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyyardian/default.nix b/pkgs/development/python-modules/pyyardian/default.nix
index f17742b1be67..831eaa9878fc 100644
--- a/pkgs/development/python-modules/pyyardian/default.nix
+++ b/pkgs/development/python-modules/pyyardian/default.nix
@@ -7,24 +7,21 @@
   wheel,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pyyardian";
-  version = "1.2.0";
+  version = "1.3.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "h3l1o5";
     repo = "pyyardian";
-    tag = version;
-    hash = "sha256-JBb62pFDuVcXIGRc6UOp5/ciUtbGm4XnKZjt1icF/jQ=";
+    tag = finalAttrs.version;
+    hash = "sha256-LOHE8vGrT25sgjhcNarMOi0hzpPpHjVIeVq7CezYicY=";
   };
 
-  nativeBuildInputs = [
-    setuptools
-    wheel
-  ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ aiohttp ];
+  dependencies = [ aiohttp ];
 
   # Tests require network access
   doCheck = false;
@@ -34,7 +31,8 @@ buildPythonPackage rec {
   meta = {
     description = "Module for interacting with the Yardian irrigation controller";
     homepage = "https://github.com/h3l1o5/pyyardian";
+    changelog = "https://github.com/aeon-matrix/pyyardian/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix
index aa4f2776b5a9..d096c7a57165 100644
--- a/pkgs/development/python-modules/qtile/default.nix
+++ b/pkgs/development/python-modules/qtile/default.nix
@@ -17,6 +17,7 @@
   iwlib,
   libcst,
   mpd2,
+  prompt-toolkit,
   psutil,
   pulsectl-asyncio,
   pygobject3,
@@ -118,6 +119,9 @@ buildPythonPackage (finalAttrs: {
     iwlib
     libcst
     mpd2
+    # prompt-toolkit used for qtile repl
+    # see https://github.com/qtile/qtile/blob/master/libqtile/scripts/repl.py
+    prompt-toolkit
     psutil
     pulsectl-asyncio
     pygobject3
diff --git a/pkgs/development/python-modules/submitit/default.nix b/pkgs/development/python-modules/submitit/default.nix
index 799043833101..56044665bb5a 100644
--- a/pkgs/development/python-modules/submitit/default.nix
+++ b/pkgs/development/python-modules/submitit/default.nix
@@ -1,23 +1,31 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  cloudpickle,
+
+  # build-system
   flit-core,
+
+  # dependencies
+  cloudpickle,
   typing-extensions,
+
+  # tests
   pytestCheckHook,
   pytest-asyncio,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "submitit";
   version = "1.5.4";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "facebookincubator";
     repo = "submitit";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-Q/2mC7viLYl8fx7dtQueZqT191EbERZPfN0WkTS/U1w=";
   };
 
@@ -40,13 +48,18 @@ buildPythonPackage rec {
   disabledTests = [
     # These tests are broken
     "test_setup"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Fails in the sandbox:
+    #   AssertionError: Should have resumed from a checkpoint
+    "test_requeuing"
   ];
 
   meta = {
-    changelog = "https://github.com/facebookincubator/submitit/releases/tag/${version}";
+    changelog = "https://github.com/facebookincubator/submitit/releases/tag/${finalAttrs.src.tag}";
     description = "Python 3.8+ toolbox for submitting jobs to Slurm";
     homepage = "https://github.com/facebookincubator/submitit";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.nickcao ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix
index f4960e92fa30..3389d9a961e8 100644
--- a/pkgs/development/python-modules/textual/default.nix
+++ b/pkgs/development/python-modules/textual/default.nix
@@ -35,16 +35,17 @@
   time-machine,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "textual";
-  version = "8.2.6";
+  version = "8.2.7";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "Textualize";
     repo = "textual";
-    tag = "v${version}";
-    hash = "sha256-VSgwa817ovlbKnuJx6KCy3osund8PXZ4Sqlh02TkxGA=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-jRTdxVpeRk8gAur5+VpLVVghBdYenXysoEFRBfczkR4=";
   };
 
   build-system = [ poetry-core ];
@@ -116,8 +117,8 @@ buildPythonPackage rec {
   meta = {
     description = "TUI framework for Python inspired by modern web development";
     homepage = "https://github.com/Textualize/textual";
-    changelog = "https://github.com/Textualize/textual/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/Textualize/textual/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ gepbird ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/tinygrad/default.nix b/pkgs/development/python-modules/tinygrad/default.nix
index e6f805449778..e5d5a5a870f0 100644
--- a/pkgs/development/python-modules/tinygrad/default.nix
+++ b/pkgs/development/python-modules/tinygrad/default.nix
@@ -17,10 +17,6 @@
   setuptools,
 
   # optional-dependencies
-  # arm
-  unicorn,
-  # triton
-  triton,
   # testing_minimal
   hypothesis,
   numpy,
@@ -28,7 +24,8 @@
   torch,
   z3-solver,
   # testing_unit
-  ggml-python,
+  capstone,
+  gguf,
   openai,
   safetensors,
   tabulate,
@@ -37,7 +34,6 @@
   blobfile,
   boto3,
   bottle,
-  capstone,
   librosa,
   networkx,
   nibabel,
@@ -64,14 +60,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "tinygrad";
-  version = "0.12.0";
+  version = "0.13.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "tinygrad";
     repo = "tinygrad";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Lied19C1sAbislr2WznnCZEmOn5PA0OzMg2KOdWOYkA=";
+    hash = "sha256-cGv+swFzaMjwz40/p9OyW3HpZts09kVax2T/xYKW8sE=";
   };
 
   patches =
@@ -110,13 +107,13 @@ buildPythonPackage (finalAttrs: {
   postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
     substituteInPlace tinygrad/runtime/autogen/opencl.py \
       --replace-fail \
-        "dll = DLL('opencl', 'OpenCL')" \
-        "dll = DLL('opencl', '${lib.getLib ocl-icd}/lib/libOpenCL.so')"
+        "dll = c.DLL('opencl', 'OpenCL')" \
+        "dll = c.DLL('opencl', '${lib.getLib ocl-icd}/lib/libOpenCL.so')"
 
     substituteInPlace tinygrad/runtime/autogen/libc.py \
       --replace-fail \
-        "dll = DLL('libc', 'c', use_errno=True)" \
-        "dll = DLL('libc', '${lib.getLib stdenv.cc.libc}/lib/libc.so.6', use_errno=True)"
+        "dll = c.DLL('libc', 'c', use_errno=True)" \
+        "dll = c.DLL('libc', '${lib.getLib stdenv.cc.libc}/lib/libc.so.6', use_errno=True)"
   '';
 
   __propagatedImpureHostDeps = lib.optional stdenv.hostPlatform.isDarwin "/usr/lib/libc.dylib";
@@ -124,8 +121,6 @@ buildPythonPackage (finalAttrs: {
   build-system = [ setuptools ];
 
   optional-dependencies = lib.fix (self: {
-    arm = [ unicorn ];
-    triton = [ triton ];
     testing_minimal = [
       hypothesis
       numpy
@@ -134,7 +129,8 @@ buildPythonPackage (finalAttrs: {
       z3-solver
     ];
     testing_unit = self.testing_minimal ++ [
-      ggml-python
+      capstone
+      gguf
       openai
       safetensors
       tabulate
@@ -144,7 +140,6 @@ buildPythonPackage (finalAttrs: {
       blobfile
       boto3
       bottle
-      capstone
       librosa
       networkx
       nibabel
@@ -188,8 +183,13 @@ buildPythonPackage (finalAttrs: {
     "test_backward_sum_acc_dtype"
     "test_failure_27"
 
+    # Fail on some CPUs
+    #   RuntimeError: DNNL does not support bf16/f16 backward on the platform with avx2_vnni_2
+    "test_conv2d_fused_half"
+    "test_conv2d_half"
+
     # Flaky:
-    # AssertionError: 2.1376906810000946 not less than 2.0
+    #   AssertionError: 2.1376906810000946 not less than 2.0
     "test_recursive_pad"
 
     # Require internet access
@@ -206,6 +206,7 @@ buildPythonPackage (finalAttrs: {
     "test_dataset_is_realized"
     "test_e2e_big"
     "test_fetch_small"
+    "test_gguf_load_no_tensor_leak"
     "test_hevc_parser"
     "test_huggingface_enet_safetensors"
     "test_index_mnist"
@@ -247,6 +248,7 @@ buildPythonPackage (finalAttrs: {
     "test_float_cast_to_unsigned_underflow"
     "test_int8"
     "test_int8_to_uint16_negative"
+    "test_zero_copy_from_default_to_cpu"
 
     # RuntimeError: Failed to initialize cpuinfo!
     "test_conv2d_fused_half"
@@ -276,8 +278,9 @@ buildPythonPackage (finalAttrs: {
 
   disabledTestPaths = [
     # Require internet access
+    "test/amd/test_llvm.py"
+    "test/amd/test_pdf.py"
     "test/models/test_mnist.py"
-    "test/models/test_real_world.py"
     "test/testextra/test_lr_scheduler.py"
 
     # Files under this directory are not considered as tests by upstream and should be skipped
diff --git a/pkgs/development/python-modules/tinygrad/patch-cuda-paths.patch b/pkgs/development/python-modules/tinygrad/patch-cuda-paths.patch
index b2a2177ab3e2..ead63a624695 100644
--- a/pkgs/development/python-modules/tinygrad/patch-cuda-paths.patch
+++ b/pkgs/development/python-modules/tinygrad/patch-cuda-paths.patch
@@ -1,37 +1,44 @@
 diff --git a/tinygrad/runtime/autogen/cuda.py b/tinygrad/runtime/autogen/cuda.py
-index 061c8d73f..65ec3ffd7 100644
+index 07b0abd2e..1308edce3 100644
 --- a/tinygrad/runtime/autogen/cuda.py
 +++ b/tinygrad/runtime/autogen/cuda.py
-@@ -1,7 +1,7 @@
- # mypy: ignore-errors
- import ctypes
- from tinygrad.runtime.support.c import DLL, Struct, CEnum, _IO, _IOW, _IOR, _IOWR
--dll = DLL('cuda', 'cuda')
-+dll = DLL('cuda', '@driverLink@/lib/libcuda.so')
- cuuint32_t = ctypes.c_uint32
- cuuint64_t = ctypes.c_uint64
- CUdeviceptr_v2 = ctypes.c_uint64
+@@ -4,7 +4,7 @@ import ctypes
+ from typing import Literal, TypeAlias
+ from tinygrad.runtime.support.c import _IO, _IOW, _IOR, _IOWR
+ from tinygrad.runtime.support import c
+-dll = c.DLL('cuda', 'cuda')
++dll = c.DLL('cuda', '@driverLink@/lib/libcuda.so')
+ cuuint32_t: TypeAlias = ctypes.c_uint32
+ cuuint64_t: TypeAlias = ctypes.c_uint64
+ CUdeviceptr_v2: TypeAlias = ctypes.c_uint64
 diff --git a/tinygrad/runtime/autogen/nvrtc.py b/tinygrad/runtime/autogen/nvrtc.py
-index 88085c45b..90518d403 100644
+index b8e50c9fb..512d10a31 100644
 --- a/tinygrad/runtime/autogen/nvrtc.py
 +++ b/tinygrad/runtime/autogen/nvrtc.py
-@@ -2,7 +2,7 @@
- import ctypes
- from tinygrad.runtime.support.c import DLL, Struct, CEnum, _IO, _IOW, _IOR, _IOWR
+@@ -5,7 +5,7 @@ from typing import Literal, TypeAlias
+ from tinygrad.runtime.support.c import _IO, _IOW, _IOR, _IOWR
+ from tinygrad.runtime.support import c
  import sysconfig
--dll = DLL('nvrtc', 'nvrtc', f'/usr/local/cuda/targets/{sysconfig.get_config_vars().get("MULTIARCH", "").rsplit("-", 1)[0]}/lib')
-+dll = DLL('nvrtc','@cuda_nvrtc@/lib/libnvrtc.so')
- nvrtcResult = CEnum(ctypes.c_uint32)
- NVRTC_SUCCESS = nvrtcResult.define('NVRTC_SUCCESS', 0)
- NVRTC_ERROR_OUT_OF_MEMORY = nvrtcResult.define('NVRTC_ERROR_OUT_OF_MEMORY', 1)
+-dll = c.DLL('nvrtc', 'nvrtc', [f'/{pre}/cuda/targets/{tgt}/lib' for pre in ['opt', 'usr/local'] for tgt in [sysconfig.get_config_vars().get("MULTIARCH", "").rsplit("-", 1)[0], 'sbsa-linux']])
++dll = c.DLL('nvrtc', '@cuda_nvrtc@/lib/libnvrtc.so')
+ nvrtcResult: dict[int, str] = {(NVRTC_SUCCESS:=0): 'NVRTC_SUCCESS', (NVRTC_ERROR_OUT_OF_MEMORY:=1): 'NVRTC_ERROR_OUT_OF_MEMORY', (NVRTC_ERROR_PROGRAM_CREATION_FAILURE:=2): 'NVRTC_ERROR_PROGRAM_CREATION_FAILURE', (NVRTC_ERROR_INVALID_INPUT:=3): 'NVRTC_ERROR_INVALID_INPUT', (NVRTC_ERROR_INVALID_PROGRAM:=4): 'NVRTC_ERROR_INVALID_PROGRAM', (NVRTC_ERROR_INVALID_OPTION:=5): 'NVRTC_ERROR_INVALID_OPTION', (NVRTC_ERROR_COMPILATION:=6): 'NVRTC_ERROR_COMPILATION', (NVRTC_ERROR_BUILTIN_OPERATION_FAILURE:=7): 'NVRTC_ERROR_BUILTIN_OPERATION_FAILURE', (NVRTC_ERROR_NO_NAME_EXPRESSIONS_AFTER_COMPILATION:=8): 'NVRTC_ERROR_NO_NAME_EXPRESSIONS_AFTER_COMPILATION', (NVRTC_ERROR_NO_LOWERED_NAMES_BEFORE_COMPILATION:=9): 'NVRTC_ERROR_NO_LOWERED_NAMES_BEFORE_COMPILATION', (NVRTC_ERROR_NAME_EXPRESSION_NOT_VALID:=10): 'NVRTC_ERROR_NAME_EXPRESSION_NOT_VALID', (NVRTC_ERROR_INTERNAL_ERROR:=11): 'NVRTC_ERROR_INTERNAL_ERROR'}
+ @dll.bind(c.POINTER[ctypes.c_char], ctypes.c_uint32)
+ def nvrtcGetErrorString(result:ctypes.c_uint32) -> c.POINTER[ctypes.c_char]: ...
+@@ -52,4 +52,4 @@ def nvrtcGetProgramLog(prog:nvrtcProgram, log:c.POINTER[ctypes.c_char]) -> ctype
+ def nvrtcAddNameExpression(prog:nvrtcProgram, name_expression:c.POINTER[ctypes.c_char]) -> ctypes.c_uint32: ...
+ @dll.bind(ctypes.c_uint32, nvrtcProgram, c.POINTER[ctypes.c_char], c.POINTER[c.POINTER[ctypes.c_char]])
+ def nvrtcGetLoweredName(prog:nvrtcProgram, name_expression:c.POINTER[ctypes.c_char], lowered_name:c.POINTER[c.POINTER[ctypes.c_char]]) -> ctypes.c_uint32: ...
+-__DEPRECATED__ = lambda msg: __attribute__((deprecated(msg))) # type: ignore
+\ No newline at end of file
++__DEPRECATED__ = lambda msg: __attribute__((deprecated(msg))) # type: ignore
 diff --git a/tinygrad/runtime/support/compiler_cuda.py b/tinygrad/runtime/support/compiler_cuda.py
-index 8f71a9255..fdbf01bad 100644
+index 57c40a447..b95e7f91c 100644
 --- a/tinygrad/runtime/support/compiler_cuda.py
 +++ b/tinygrad/runtime/support/compiler_cuda.py
-@@ -43,7 +43,7 @@ def cuda_disassemble(lib:bytes, arch:str):
- class CUDACompiler(Compiler):
-   def __init__(self, arch:str, cache_key:str="cuda"):
-     self.arch, self.compile_options = arch, [f'--gpu-architecture={arch}']
+@@ -44,7 +44,7 @@ def cuda_disassemble(lib:bytes, arch:str, ptx=False):
+ class NVRTCCompiler(Compiler):
+   def __init__(self, arch:str, ptx=True, cache_key:str="cuda"):
+     self.ptx, self.arch, self.compile_options = ptx, arch, [f'--gpu-architecture={arch}']
 -    self.compile_options += [f"-I{CUDA_PATH}/include"] if CUDA_PATH else ["-I/usr/local/cuda/include", "-I/usr/include", "-I/opt/cuda/include"]
 +    self.compile_options += ["-I@cuda_cudart@/include"]
      nvrtc_check(nvrtc.nvrtcVersion((nvrtcMajor := ctypes.c_int()), (nvrtcMinor := ctypes.c_int())))
diff --git a/pkgs/development/python-modules/tinygrad/patch-deps-paths.patch b/pkgs/development/python-modules/tinygrad/patch-deps-paths.patch
index 8e8bbeec2f66..a3136c2063d7 100644
--- a/pkgs/development/python-modules/tinygrad/patch-deps-paths.patch
+++ b/pkgs/development/python-modules/tinygrad/patch-deps-paths.patch
@@ -1,39 +1,53 @@
 diff --git a/tinygrad/runtime/autogen/libclang.py b/tinygrad/runtime/autogen/libclang.py
-index dbf22b6f5..4a5a097dc 100644
+index d6b5c69ec..c153e0453 100644
 --- a/tinygrad/runtime/autogen/libclang.py
 +++ b/tinygrad/runtime/autogen/libclang.py
-@@ -1,7 +1,7 @@
- # mypy: ignore-errors
- import ctypes
- from tinygrad.runtime.support.c import DLL, Struct, CEnum, _IO, _IOW, _IOR, _IOWR
--dll = DLL('libclang', ['clang-20', 'clang'])
-+dll = DLL('libclang', '@libclang@')
- CXIndex = ctypes.c_void_p
- class struct_CXTargetInfoImpl(Struct): pass
- CXTargetInfo = ctypes.POINTER(struct_CXTargetInfoImpl)
+@@ -5,7 +5,7 @@ from typing import Literal, TypeAlias
+ from tinygrad.runtime.support.c import _IO, _IOW, _IOR, _IOWR
+ from tinygrad.runtime.support import c
+ from tinygrad.helpers import WIN, OSX
+-dll = c.DLL('libclang', 'C:\\Program Files\\LLVM\\bin\\libclang.dll' if WIN else ['/opt/homebrew/opt/llvm@21/lib/libclang.dylib', '/opt/homebrew/opt/llvm@20/lib/libclang.dylib', '/opt/homebrew/opt/llvm@19/lib/libclang.dylib', '/opt/homebrew/opt/llvm@18/lib/libclang.dylib', '/opt/homebrew/opt/llvm@17/lib/libclang.dylib', '/opt/homebrew/opt/llvm@16/lib/libclang.dylib', '/opt/homebrew/opt/llvm@15/lib/libclang.dylib', '/opt/homebrew/opt/llvm@14/lib/libclang.dylib'] if OSX else ['clang', 'clang-21', 'clang-20', 'clang-19', 'clang-18', 'clang-17', 'clang-16', 'clang-15', 'clang-14'])
++dll = c.DLL('libclang', '@libclang@')
+ CXIndex: TypeAlias = ctypes.c_void_p
+ class struct_CXTargetInfoImpl(c.Struct): pass
+ CXTargetInfo: TypeAlias = c.POINTER[struct_CXTargetInfoImpl]
+@@ -1016,4 +1016,4 @@ CINDEX_VERSION_MAJOR = 0
+ CINDEX_VERSION_MINOR = 64
+ CINDEX_VERSION_ENCODE = lambda major,minor: (((major)*10000) + ((minor)*1)) # type: ignore
+ CINDEX_VERSION = CINDEX_VERSION_ENCODE(CINDEX_VERSION_MAJOR, CINDEX_VERSION_MINOR)
+-CINDEX_VERSION_STRINGIZE = lambda major,minor: CINDEX_VERSION_STRINGIZE_(major, minor) # type: ignore
+\ No newline at end of file
++CINDEX_VERSION_STRINGIZE = lambda major,minor: CINDEX_VERSION_STRINGIZE_(major, minor) # type: ignore
 diff --git a/tinygrad/runtime/autogen/llvm.py b/tinygrad/runtime/autogen/llvm.py
-index 7d05224e7..54204f563 100644
+index 336010490..f43ca99f1 100644
 --- a/tinygrad/runtime/autogen/llvm.py
 +++ b/tinygrad/runtime/autogen/llvm.py
-@@ -2,7 +2,7 @@
- import ctypes
- from tinygrad.runtime.support.c import DLL, Struct, CEnum, _IO, _IOW, _IOR, _IOWR
+@@ -5,7 +5,7 @@ from typing import Literal, TypeAlias
+ from tinygrad.runtime.support.c import _IO, _IOW, _IOR, _IOWR
+ from tinygrad.runtime.support import c
  from tinygrad.helpers import WIN, OSX
--dll = DLL('llvm', 'C:\\Program Files\\LLVM\\bin\\LLVM-C.dll' if WIN else '/opt/homebrew/opt/llvm@20/lib/libLLVM.dylib' if OSX else ['LLVM', 'LLVM-21', 'LLVM-20', 'LLVM-19', 'LLVM-18', 'LLVM-17', 'LLVM-16', 'LLVM-15', 'LLVM-14'])
-+dll = DLL('llvm', '@libllvm@')
- intmax_t = ctypes.c_int64
- try: (imaxabs:=dll.imaxabs).restype, imaxabs.argtypes = intmax_t, [intmax_t]
- except AttributeError: pass
+-dll = c.DLL('llvm', 'C:\\Program Files\\LLVM\\bin\\LLVM-C.dll' if WIN else ['/opt/homebrew/opt/llvm@21/lib/libLLVM.dylib', '/opt/homebrew/opt/llvm@20/lib/libLLVM.dylib', '/opt/homebrew/opt/llvm@19/lib/libLLVM.dylib', '/opt/homebrew/opt/llvm@18/lib/libLLVM.dylib', '/opt/homebrew/opt/llvm@17/lib/libLLVM.dylib', '/opt/homebrew/opt/llvm@16/lib/libLLVM.dylib', '/opt/homebrew/opt/llvm@15/lib/libLLVM.dylib', '/opt/homebrew/opt/llvm@14/lib/libLLVM.dylib'] if OSX else ['LLVM', 'LLVM-21', 'LLVM-20', 'LLVM-19', 'LLVM-18', 'LLVM-17', 'LLVM-16', 'LLVM-15', 'LLVM-14'])
++dll = c.DLL('llvm', '@libllvm@')
+ intmax_t: TypeAlias = ctypes.c_int64
+ @dll.bind(intmax_t, intmax_t)
+ def imaxabs(__n:intmax_t) -> intmax_t: ...
+@@ -3188,4 +3188,4 @@ LLVM_BLAKE3_OUT_LEN = 32
+ LLVM_BLAKE3_BLOCK_LEN = 64
+ LLVM_BLAKE3_CHUNK_LEN = 1024
+ LLVM_BLAKE3_MAX_DEPTH = 54
+-LTO_API_VERSION = 29
+\ No newline at end of file
++LTO_API_VERSION = 29
 diff --git a/tinygrad/runtime/support/compiler_cpu.py b/tinygrad/runtime/support/compiler_cpu.py
-index 8b11f3af8..d8190fac3 100644
+index 5b6121ebb..18f66f8f7 100644
 --- a/tinygrad/runtime/support/compiler_cpu.py
 +++ b/tinygrad/runtime/support/compiler_cpu.py
-@@ -15,7 +15,7 @@ class ClangJITCompiler(Compiler):
-     arch = {'x86_64': '-march=native', 'AMD64': '-march=native', 'riscv64': '-march=rv64g'}.get(platform.machine(), "-mcpu=native")
-     args = [arch, f'--target={target}-none-unknown-elf', '-O2', '-fPIC', '-ffreestanding', '-fno-math-errno', '-nostdlib', '-fno-ident']
-     arch_args = ['-ffixed-x18'] if target == 'arm64' else []
--    obj = subprocess.check_output([getenv("CC", 'clang'), '-c', '-x', 'c', *args, *arch_args, '-', '-o', '-'], input=src.encode('utf-8'))
-+    obj = subprocess.check_output(["@clang@", '-c', '-x', 'c', *args, *arch_args, '-', '-o', '-'], input=src.encode('utf-8'))
-     return jit_loader(obj)
+@@ -20,7 +20,7 @@ class ClangJITCompiler(Compiler):
+   def compile_to_obj(self, src:str) -> bytes:
+     """Compile C source to ELF object file (before linking)."""
+     # -fno-math-errno is required for __builtin_sqrt to become an instruction instead of a function call
+-    return subprocess.check_output([getenv("CC", 'clang'), '-c', '-x', 'c', '-O2', '-fPIC', '-ffreestanding', '-fno-math-errno', '-nostdlib',
++    return subprocess.check_output(["@clang@", '-c', '-x', 'c', '-O2', '-fPIC', '-ffreestanding', '-fno-math-errno', '-nostdlib',
+                                     '-fno-ident', f'--target={self.arch}-none-unknown-elf', *self.args, '-', '-o', '-'], input=src.encode('utf-8'))
  
-   def disassemble(self, lib:bytes): return capstone_flatdump(lib)
+   def compile(self, src:str) -> bytes: return jit_loader(self.compile_to_obj(src))
diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix
index e4a1617e3771..fd3c517e0442 100644
--- a/pkgs/development/python-modules/types-awscrt/default.nix
+++ b/pkgs/development/python-modules/types-awscrt/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "types-awscrt";
-  version = "0.31.3";
+  version = "0.33.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_awscrt";
     inherit (finalAttrs) version;
-    hash = "sha256-CdPq8AIx4PR+EBvZhn5DCHO8VwQAUOKjvYMFy0/DCGU=";
+    hash = "sha256-gDvH5+L2FyoKvXHfZZM2j4L8IxJ8oV0ofzYOn8vTqXc=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/vincenty/default.nix b/pkgs/development/python-modules/vincenty/default.nix
index 2f0fc2fd5d2b..439e9249fbff 100644
--- a/pkgs/development/python-modules/vincenty/default.nix
+++ b/pkgs/development/python-modules/vincenty/default.nix
@@ -2,20 +2,23 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "vincenty";
   version = "0.1.4";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "maurycyp";
     repo = "vincenty";
-    rev = version;
-    sha256 = "1li8gv0zb1pdbxdybgaykm38lqbkb5dr7rph6zs1k4k3sh15ldw3";
+    tag = finalAttrs.version;
+    hash = "sha256-gzdaAtRjkhn0N/Dmk1tZc2GKRp1eveVbX+2G9cF+KNI=";
   };
 
+  build-system = [ setuptools ];
+
   # no tests implemented
   doCheck = false;
 
@@ -27,4 +30,4 @@ buildPythonPackage rec {
     license = lib.licenses.unlicense;
     maintainers = with lib.maintainers; [ dotlambda ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix
index 9d5634503d8a..db881906be3a 100644
--- a/pkgs/development/python-modules/vispy/default.nix
+++ b/pkgs/development/python-modules/vispy/default.nix
@@ -20,12 +20,12 @@
 
 buildPythonPackage rec {
   pname = "vispy";
-  version = "0.16.1";
+  version = "0.16.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-uTwyyF0IwGro9eMXf5z9bEleF0XyEgt3eDCt7l2cNkg=";
+    hash = "sha256-CUUavoeBM2/WhCIHzZXOXoYJ2Z8TvN6JhBJTgSXDUIg=";
   };
 
   patches = lib.optionals (!stdenv.hostPlatform.isDarwin) [
diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix
index 86d56facfead..0588073bf039 100644
--- a/pkgs/development/python-modules/weaviate-client/default.nix
+++ b/pkgs/development/python-modules/weaviate-client/default.nix
@@ -18,16 +18,19 @@
   pydantic,
   pytest-asyncio,
   pytest-httpserver,
+  pytest-xdist,
   pytestCheckHook,
   pythonOlder,
   requests,
+  stdenv,
   setuptools-scm,
   validators,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "weaviate-client";
-  version = "4.20.5";
+  version = "4.21.0";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -36,7 +39,7 @@ buildPythonPackage rec {
     owner = "weaviate";
     repo = "weaviate-python-client";
     tag = "v${version}";
-    hash = "sha256-3CJLD/bew9qx2aDrIwcaMlgwCe8E4bj3ZDh5t0v8Pf8=";
+    hash = "sha256-nGYslKyIQWAwhu5Fa23jXtgBN9q4jjrmBhWv4EO3Vn8=";
   };
 
   pythonRelaxDeps = [
@@ -69,13 +72,14 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    pytest-httpserver
     pytest-asyncio
+    pytest-httpserver
+    pytest-xdist
     pytestCheckHook
+    writableTmpDirAsHomeHook
   ];
 
   preCheck = ''
-    export HOME=$(mktemp -d)
     sed -i '/raw.githubusercontent.com/,+1d' test/test_util.py
     substituteInPlace pytest.ini \
       --replace-fail "--benchmark-skip" ""
@@ -97,7 +101,10 @@ buildPythonPackage rec {
 
   enabledTestPaths = [
     "test"
-    "mock_tests"
+  ];
+
+  disabledTestPaths = [
+    "mock_tests" # mock gRPC/HTTP servers fail to bind ports
   ];
 
   __darwinAllowLocalNetworking = true;
@@ -110,9 +117,5 @@ buildPythonPackage rec {
     changelog = "https://github.com/weaviate/weaviate-python-client/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ happysalada ];
-    badPlatforms = [
-      # weaviate.exceptions.WeaviateGRPCUnavailableError
-      lib.systems.inspect.patterns.isDarwin
-    ];
   };
 }
diff --git a/pkgs/development/python-modules/whisperx/default.nix b/pkgs/development/python-modules/whisperx/default.nix
index c3873ff9e938..a69600afbce7 100644
--- a/pkgs/development/python-modules/whisperx/default.nix
+++ b/pkgs/development/python-modules/whisperx/default.nix
@@ -44,14 +44,14 @@ let
 in
 buildPythonPackage (finalAttrs: {
   pname = "whisperx";
-  version = "3.8.5";
+  version = "3.8.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "m-bain";
     repo = "whisperX";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dFjB0X7JUqv7r64QLbsQwJNRWti+xGUOWKkhOxJE1tg=";
+    hash = "sha256-VPP02LtyczOiWdKuDvgnGeekEk+p6DVvLQrCE0d0LfU=";
   };
 
   # As `makeWrapperArgs` does not apply to the module, and whisperx depends on `ffmpeg`,
diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix
index a759f10138f3..ba2a5dddcb84 100644
--- a/pkgs/development/ruby-modules/gem/default.nix
+++ b/pkgs/development/ruby-modules/gem/default.nix
@@ -72,6 +72,13 @@ lib.makeOverridable (
               attrs.source.remotes or [ "https://rubygems.org" ]
             );
             inherit (attrs.source) sha256;
+            meta = {
+              identifiers.purlParts = {
+                type = "gem";
+                # https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/gem-definition.md
+                spec = "${gemName}@${version}?platform=${platform}";
+              };
+            };
           }
         else if type == "git" then
           fetchgit {
diff --git a/pkgs/os-specific/linux/scx/scx_cscheds.nix b/pkgs/os-specific/linux/scx/scx_cscheds.nix
index 4089fcc1d16d..b23d424d0070 100644
--- a/pkgs/os-specific/linux/scx/scx_cscheds.nix
+++ b/pkgs/os-specific/linux/scx/scx_cscheds.nix
@@ -49,7 +49,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
   ];
 
   __structuredAttrs = true;
-  env.EXPECTED_SCHEDULERS = finalAttrs.passthru.schedulers;
+  EXPECTED_SCHEDULERS = finalAttrs.passthru.schedulers;
 
   doInstallCheck = true;
   installCheckPhase = ''
diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix
index 8c87c868de75..cfe95417ac31 100644
--- a/pkgs/pkgs-lib/formats.nix
+++ b/pkgs/pkgs-lib/formats.nix
@@ -460,8 +460,7 @@ optionalAttrs allowAliases aliases
 
   toml =
     { }:
-    json { }
-    // {
+    {
       type = types.toml;
 
       generate =
diff --git a/pkgs/pkgs-lib/formats/java-properties/test/default.nix b/pkgs/pkgs-lib/formats/java-properties/test/default.nix
index 2ea787a90341..68cd5cfa1bcf 100644
--- a/pkgs/pkgs-lib/formats/java-properties/test/default.nix
+++ b/pkgs/pkgs-lib/formats/java-properties/test/default.nix
@@ -72,8 +72,8 @@ stdenv.mkDerivation {
     )
   );
 
-  src = lib.sourceByRegex ./. [
-    ".*\\.java"
+  src = lib.sources.sourceByGlobs ./. [
+    "**/*.java"
   ];
   # On Linux, this can be C.UTF-8, but darwin + zulu requires en_US.UTF-8
   LANG = "en_US.UTF-8";
diff --git a/pkgs/servers/home-assistant/custom-components/browser-mod/package.nix b/pkgs/servers/home-assistant/custom-components/browser-mod/package.nix
index 4f6912a79dcd..67460224ab93 100644
--- a/pkgs/servers/home-assistant/custom-components/browser-mod/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/browser-mod/package.nix
@@ -10,13 +10,13 @@
 buildHomeAssistantComponent rec {
   owner = "thomasloven";
   domain = "browser_mod";
-  version = "2.13.3";
+  version = "2.13.4";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "hass-browser_mod";
     tag = "v${version}";
-    hash = "sha256-Q7+9pcV9vZ+PPXjlOezcDPtzcekXqBHgPJSwh5n9ruE=";
+    hash = "sha256-AE23WTzVt3nF3oLeUdQ9p0kr+4q/Ymko82OOIxaNOcQ=";
   };
 
   nativeBuildInputs = [
@@ -27,7 +27,7 @@ buildHomeAssistantComponent rec {
 
   npmDeps = fetchNpmDeps {
     inherit src;
-    hash = "sha256-MeB1NgQM8HvQF42AaE1XkIt0aODVACO8a0wtUFOqVW8=";
+    hash = "sha256-1MlUUYkLBSsoeJRH56LXLwXWcrMVKYzW4HcayrR1tI8=";
   };
 
   npmBuildScript = "build";
diff --git a/pkgs/servers/home-assistant/custom-components/cable_modem_monitor/package.nix b/pkgs/servers/home-assistant/custom-components/cable_modem_monitor/package.nix
new file mode 100644
index 000000000000..16f176672760
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-components/cable_modem_monitor/package.nix
@@ -0,0 +1,98 @@
+{
+  beautifulsoup4,
+  buildHomeAssistantComponent,
+  buildPythonPackage,
+  cryptography,
+  defusedxml,
+  fetchFromGitHub,
+  hatchling,
+  lib,
+  nix-update-script,
+  pydantic,
+  pytestCheckHook,
+  pytest-cov-stub,
+  pytest-homeassistant-custom-component,
+  pytest-socket,
+  pyyaml,
+  requests,
+}:
+let
+  version = "3.14.0-beta.6";
+  src = fetchFromGitHub {
+    owner = "solentlabs";
+    repo = "cable_modem_monitor";
+    tag = "v${version}";
+    hash = "sha256-1Mkowy23ct8QGKe5m6XIyEE4SfAbRLlOmTzTsPHY+iw=";
+    fetchLFS = true;
+  };
+
+  core = buildPythonPackage (finalAttrs: {
+    inherit src version;
+    pname = "solentlabs-cable-modem-monitor-core";
+    pyproject = true;
+
+    sourceRoot = "${finalAttrs.src.name}/packages/cable_modem_monitor_core";
+
+    build-system = [ hatchling ];
+
+    dependencies = [
+      beautifulsoup4
+      defusedxml
+      pydantic
+      pyyaml
+      requests
+    ];
+
+    nativeCheckInputs = [
+      cryptography
+      pytestCheckHook
+      pytest-cov-stub
+      pytest-socket
+    ];
+  });
+
+  catalog = buildPythonPackage (finalAttrs: {
+    inherit src version;
+    pname = "solentlabs-cable-modem-monitor-catalog";
+    pyproject = true;
+
+    sourceRoot = "${finalAttrs.src.name}/packages/cable_modem_monitor_catalog";
+
+    build-system = [ hatchling ];
+
+    dependencies = [
+      core
+    ];
+
+    nativeCheckInputs = [
+      cryptography
+      pytestCheckHook
+      pytest-socket
+    ];
+  });
+in
+buildHomeAssistantComponent rec {
+  inherit src version;
+  owner = "solentlabs";
+  domain = "cable_modem_monitor";
+
+  dependencies = [
+    catalog
+    core
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-homeassistant-custom-component
+  ];
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=unstable" ]; };
+
+  meta = {
+    description = "Home Assistant integration for monitoring cable modem signal quality";
+    homepage = "https://solentlabs.io/cable-modem-monitor";
+    changelog = "https://github.com/solentlabs/cable_modem_monitor/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ RoGreat ];
+  };
+}
diff --git a/pkgs/servers/home-assistant/custom-components/smarthq/package.nix b/pkgs/servers/home-assistant/custom-components/smarthq/package.nix
new file mode 100644
index 000000000000..301fa4e15907
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-components/smarthq/package.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  aiohttp,
+  buildHomeAssistantComponent,
+  fetchFromGitHub,
+}:
+
+buildHomeAssistantComponent (finalAttrs: {
+  owner = "geappliances";
+  domain = "smarthq";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "geappliances";
+    repo = "geappliances-smarthq-integration";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-LTLlkl4Mh0nSZfNVyLEItVPnQkM1nnDkPjsM98otp3w=";
+  };
+
+  dependencies = [
+    aiohttp
+  ];
+
+  meta = {
+    changelog = "https://github.com/geappliances/geappliances-smarthq-integration/releases/tag/${finalAttrs.src.tag}";
+    description = "Home Assistant integration for GE Appliances SmartHQ connected devices";
+    homepage = "https://github.com/geappliances/geappliances-smarthq-integration";
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
diff --git a/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix
index 12a1053d3dae..85f5dfeed814 100644
--- a/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "frser-sqlite-datasource";
-  version = "4.0.2";
-  zipHash = "sha256-soRmlYBhFhUoQmSGJC6mMP+UH7nqKzBTVItOk2WFggs=";
+  version = "4.0.6";
+  zipHash = "sha256-5c4jVN0mupvqVrN/ntQFDMkXpGuFigoZHhyv2jgr8Yo=";
   meta = {
     description = "Use a SQLite database as a data source in Grafana";
     license = lib.licenses.asl20;
diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix
index 7bdafecf2e50..cc50b6028da4 100644
--- a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "marcusolsson-dynamictext-panel";
-  version = "6.2.0";
-  zipHash = "sha256-pxTmylBvI73csDM6rMoUjGN9EM5zR/PfH1ZE1XKW94c=";
+  version = "6.2.3";
+  zipHash = "sha256-Z2R/kl6y4OaN8JRqPaKOuVLRZvPy2M43wVE+al4YquI=";
   meta = {
     description = "Dynamic, data-driven text panel for Grafana";
     license = lib.licenses.asl20;
diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix
index ec8b8bfea2c2..4beded4f79c8 100644
--- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "volkovlabs-echarts-panel";
-  version = "7.2.4";
-  zipHash = "sha256-ZqTGG3UlRqpSCITBFB5g7gIE9vxHS8VZ0Gchcfr9Dko=";
+  version = "7.2.5";
+  zipHash = "sha256-5J9SDu+S85HRHHepT1UDtUBFHp51XamsXLNVOo5ds7U=";
   meta = {
     description = "Visualization panel for Grafana that allows you to incorporate the popular Apache ECharts library into your Grafana dashboard";
     license = lib.licenses.asl20;
diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix
index 3a440ef98d61..d7b9064a2a5b 100644
--- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "volkovlabs-form-panel";
-  version = "6.3.3";
-  zipHash = "sha256-nhHTNKqnSAGSpsAOB1IjcA4zm013ywJf/ucJzAm9osQ=";
+  version = "6.3.4";
+  zipHash = "sha256-6VFhDmkShKxennSdprdxIWWp0D//MlE6EZr8bXj7naU=";
   meta = {
     description = "Plugin that allows inserting and updating application data, as well as modifying configuration directly from your Grafana dashboard";
     license = lib.licenses.asl20;
diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-rss-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-rss-datasource/default.nix
index 3db477e171ed..3cc607729bda 100644
--- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-rss-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-rss-datasource/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "volkovlabs-rss-datasource";
-  version = "4.4.0";
-  zipHash = "sha256-0/B5E1DSjVq9e+1FAFw0J3Kuc7oud6apP9b07icg1Hk=";
+  version = "4.4.1";
+  zipHash = "sha256-SaSzrtAiB97IM2se1RLBkkpZeFjMmvS9o5Si2aGOv+c=";
   meta = {
     description = "Plugin for Grafana that retrieves RSS/Atom feeds and allows visualizing them using Dynamic Text and other panels";
     license = lib.licenses.asl20;
diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix
index 3dc1aadadf96..da5e64159391 100644
--- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "volkovlabs-variable-panel";
-  version = "5.1.3";
-  zipHash = "sha256-oNTTvNelEKENDJ7xsjbtwGg2rsKZn9iy52l1zZWE26I=";
+  version = "5.2.0";
+  zipHash = "sha256-MzxKOJhDc0qogIPCnhf5bG/GcSzT6RbwYxU81Qj/NO8=";
   meta = {
     description = "Variable panel allows you to have dashboard filters in a separate panel which you can place anywhere on the dashboard";
     license = lib.licenses.asl20;
diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix
index 6ed84bd702e4..80cf515acfdf 100644
--- a/pkgs/servers/roundcube/default.nix
+++ b/pkgs/servers/roundcube/default.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "roundcube";
-  version = "1.7.0";
+  version = "1.7.1";
 
   src = fetchurl {
     url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
-    sha256 = "sha256-o0w2baK3okrUpjgrS7mmd8tYHuCL/GME0KmnIQmOepg=";
+    sha256 = "sha256-HgOCvO/WJ6sLYoXTGB3fultET9z21J8z9eoV+/l4ZO8=";
   };
 
   patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ];
diff --git a/pkgs/stdenv/freebsd/bootstrap-files/x86_64-unknown-freebsd.nix b/pkgs/stdenv/freebsd/bootstrap-files/x86_64-unknown-freebsd.nix
index de7a004d51ab..31da5284e21a 100644
--- a/pkgs/stdenv/freebsd/bootstrap-files/x86_64-unknown-freebsd.nix
+++ b/pkgs/stdenv/freebsd/bootstrap-files/x86_64-unknown-freebsd.nix
@@ -2,20 +2,20 @@
 # $ ./refresh-tarballs.bash --targets=x86_64-unknown-freebsd
 #
 # Metadata:
-# - nixpkgs revision: b92edf1104c47016385e85c87c2d953cf5cd2f98
+# - nixpkgs revision: 87c888eedeced2c577b21a86b5bce79b3067ab20
 # - hydra build: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.x86_64-unknown-freebsd.build/latest
-# - resolved hydra build: https://hydra.nixos.org/build/276943819
-# - instantiated derivation: /nix/store/npq4w33g3a2gcgh1q535gj4ixd1g5ksl-build.drv
-# - output directory: /nix/store/yy36y5s9i4wl768imwfn112sb7w3pyk8-build
-# - build time: Thu, 31 Oct 2024 20:57:22 +0000
+# - resolved hydra build: https://hydra.nixos.org/build/330335973
+# - instantiated derivation: /nix/store/bfd2kfv09jls14ifr2jg28s2ygiqd3kw-build.drv
+# - output directory: /nix/store/9hjgqrmhvny7fxg90w8j7d97f7ny8l8w-build
+# - build time: Sun, 24 May 2026 15:32:02 +0000
 {
   bootstrapTools = import <nix/fetchurl.nix> {
-    url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-freebsd/b92edf1104c47016385e85c87c2d953cf5cd2f98/bootstrap-tools.tar.xz";
-    hash = "sha256-oHLddpWWwe/ixYuf3hQfmGrGuixF3+G8HCm+B7g3CzY=";
+    url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-freebsd/87c888eedeced2c577b21a86b5bce79b3067ab20/bootstrap-tools.tar.xz";
+    hash = "sha256-J+0DbtPnxYzwY3+PCdGr6YYlCzw3Ov5EMoxI02rs+9U=";
   };
   unpack = import <nix/fetchurl.nix> {
-    url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-freebsd/b92edf1104c47016385e85c87c2d953cf5cd2f98/unpack.nar.xz";
-    hash = "sha256-aR3lz35Y3ppJBG0/WAT8avsUeDgNMejhGf9LRxTiScI=";
+    url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-freebsd/87c888eedeced2c577b21a86b5bce79b3067ab20/unpack.nar.xz";
+    hash = "sha256-zlE/VteBYhAIt7vnKuwgitnezcH3KpN2myUyJnR0Wh4=";
     name = "unpack";
     unpack = true;
   };
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 91e40c365127..62b2abdf5b2f 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -622,14 +622,37 @@ let
                   cpe = makeCPE guessedParts;
                 }
               ) possibleCPEPartsFuns;
+
+          purlParts = attrs.meta.identifiers.purlParts or { };
+          purlPartsFormatted =
+            if purlParts ? type && purlParts ? spec then "pkg:${purlParts.type}/${purlParts.spec}" else null;
+
+          # search for a PURL in the following order:
+          purl =
+            # 1) locally set through API
+            if purlPartsFormatted != null then purlPartsFormatted else null;
+
+          # search for a PURL in the following order:
+          purls =
+            # 1) locally overwritten through meta.identifiers.purls (e.g. extension of list)
+            attrs.meta.identifiers.purls or (
+              # 2) locally set through API
+              if purlPartsFormatted != null then [ purlPartsFormatted ] else [ ]
+            );
+
           v1 = {
-            inherit cpeParts possibleCPEs;
+            inherit
+              cpeParts
+              possibleCPEs
+              purls
+              ;
             ${if cpe != null then "cpe" else null} = cpe;
+            ${if purl != null then "purl" else null} = purl;
           };
         in
         v1
         // {
-          inherit v1;
+          inherit v1 purlParts;
         };
 
       # Expose the result of the checks for everyone to see.
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix
index 02ffa2bddb18..db5411b0d6cb 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ibus-rime";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "rime";
     repo = "ibus-rime";
     rev = version;
-    sha256 = "sha256-prxXFC5l7JKmrKJe2R5U7kKJmb2m06B+Tic+m6LGthM=";
+    sha256 = "sha256-7RyCJpgGMqq5s4ijTDA2aq2CtpnQ1HOwO9aPrizSaSo=";
   };
 
   buildInputs = [
diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix
index 49ae37312f11..cf8c88806e14 100644
--- a/pkgs/tools/misc/graylog/plugins.nix
+++ b/pkgs/tools/misc/graylog/plugins.nix
@@ -9,8 +9,6 @@
 let
   inherit (lib)
     licenses
-    maintainers
-    platforms
     sourceTypes
     ;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5732b38125d4..65272db8e6d6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2846,8 +2846,6 @@ with pkgs;
     }
   );
 
-  mytetra = libsForQt5.callPackage ../applications/office/mytetra { };
-
   nerd-fonts = recurseIntoAttrs (callPackage ../data/fonts/nerd-fonts { });
 
   maple-mono = recurseIntoAttrs (callPackage ../data/fonts/maple-font { });
@@ -2937,8 +2935,6 @@ with pkgs;
 
   nwdiag = with python3Packages; toPythonApplication nwdiag;
 
-  ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim { };
-
   ola = callPackage ../applications/misc/ola {
     protobuf = protobuf_21;
   };
@@ -2949,8 +2945,6 @@ with pkgs;
 
   open-interpreter = with python3Packages; toPythonApplication open-interpreter;
 
-  openhantek6022 = libsForQt5.callPackage ../applications/science/electronics/openhantek6022 { };
-
   openmvs = callPackage ../applications/science/misc/openmvs {
     inherit (llvmPackages) openmp;
   };
@@ -3123,8 +3117,6 @@ with pkgs;
 
   po4a = perlPackages.Po4a;
 
-  proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix { };
-
   pycflow2dot = with python3.pkgs; toPythonApplication pycflow2dot;
 
   pyinfra = with python3Packages; toPythonApplication pyinfra;
@@ -3147,14 +3139,8 @@ with pkgs;
 
   mpi = openmpi; # this attribute should used to build MPI applications
 
-  qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { };
-
-  qmarkdowntextedit = libsForQt5.callPackage ../development/libraries/qmarkdowntextedit { };
-
   quota = if stdenv.hostPlatform.isLinux then linuxquota else unixtools.quota;
 
-  radeon-profile = libsForQt5.callPackage ../tools/misc/radeon-profile { };
-
   rainbowstream = with python3.pkgs; toPythonApplication rainbowstream;
 
   rapidgzip = with python3Packages; toPythonApplication rapidgzip;
@@ -3263,8 +3249,6 @@ with pkgs;
 
   strip-nondeterminism = perlPackages.strip-nondeterminism;
 
-  subsurface = libsForQt5.callPackage ../applications/misc/subsurface { };
-
   sumorobot-manager =
     python3Packages.callPackage ../applications/science/robotics/sumorobot-manager
       { };
@@ -3311,8 +3295,6 @@ with pkgs;
     extraFonts = true;
   };
 
-  tiled = libsForQt5.callPackage ../applications/editors/tiled { };
-
   tinc = callPackage ../tools/networking/tinc { };
 
   tinc_pre = callPackage ../tools/networking/tinc/pre.nix { };
@@ -6622,8 +6604,6 @@ with pkgs;
 
   libmicrohttpd = libmicrohttpd_1_0;
 
-  libosmscout = libsForQt5.callPackage ../development/libraries/libosmscout { };
-
   libpeas = callPackage ../development/libraries/libpeas { };
   libpeas2 = callPackage ../development/libraries/libpeas/2.x.nix { };
 
@@ -6999,8 +6979,6 @@ with pkgs;
 
   pcre2 = callPackage ../development/libraries/pcre2 { };
 
-  pdfhummus = libsForQt5.callPackage ../development/libraries/pdfhummus { };
-
   inherit
     (callPackage ../development/libraries/physfs {
     })
@@ -7070,8 +7048,6 @@ with pkgs;
 
   pth = if stdenv.hostPlatform.isMusl then npth else gnupth;
 
-  qdjango = libsForQt5.callPackage ../development/libraries/qdjango { };
-
   quartoMinimal = quarto.override {
     rWrapper = null;
     python3 = null;
@@ -7295,8 +7271,6 @@ with pkgs;
 
   streamlink-twitch-gui-bin = callPackage ../applications/video/streamlink-twitch-gui/bin.nix { };
 
-  structuresynth = libsForQt5.callPackage ../development/libraries/structuresynth { };
-
   szurubooru = callPackage ../servers/web-apps/szurubooru { };
 
   tclap = tclap_1_2;
@@ -7971,8 +7945,6 @@ with pkgs;
     ];
   };
 
-  mkchromecast = libsForQt5.callPackage ../applications/networking/mkchromecast { };
-
   moodle = callPackage ../servers/web-apps/moodle { };
 
   moodle-utils = callPackage ../servers/web-apps/moodle/moodle-utils.nix { };
@@ -8931,8 +8903,6 @@ with pkgs;
 
   activitywatch = callPackage ../applications/office/activitywatch/wrapper.nix { };
 
-  masterpdfeditor4 = libsForQt5.callPackage ../applications/misc/masterpdfeditor4 { };
-
   inherit
     ({
       pdfstudio2021 = callPackage ../applications/misc/pdfstudio { year = "2021"; };
@@ -9367,12 +9337,8 @@ with pkgs;
 
   m32edit = callPackage ../applications/audio/midas/m32edit.nix { };
 
-  manuskript = libsForQt5.callPackage ../applications/editors/manuskript { };
-
   minari = python3Packages.toPythonApplication python3Packages.minari;
 
-  molsketch = libsForQt5.callPackage ../applications/editors/molsketch { };
-
   graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; };
   graphicsmagick-imagemagick-compat = graphicsmagick.imagemagick-compat;
 
@@ -9670,8 +9636,6 @@ with pkgs;
     lua = lua5;
   };
 
-  moolticute = libsForQt5.callPackage ../applications/misc/moolticute { };
-
   mopidyPackages = recurseIntoAttrs (
     callPackages ../applications/audio/mopidy {
       python = python3;
@@ -9897,8 +9861,6 @@ with pkgs;
 
   qbittorrent-enhanced-nox = qbittorrent-enhanced.override { guiSupport = false; };
 
-  qelectrotech = libsForQt5.callPackage ../applications/misc/qelectrotech { };
-
   qemu-python-utils = python3Packages.toPythonApplication (
     python3Packages.qemu.override {
       fuseSupport = true;
@@ -9917,8 +9879,6 @@ with pkgs;
 
   wrapQemuBinfmtP = callPackage ../by-name/qe/qemu/binfmt-p-wrapper.nix { };
 
-  qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { };
-
   qmplay2-qt5 = qmplay2.override { qtVersion = "5"; };
   qmplay2-qt6 = qmplay2.override { qtVersion = "6"; };
 
@@ -11129,8 +11089,6 @@ with pkgs;
 
   trilinos-mpi = trilinos.override { withMPI = true; };
 
-  wolfram-engine = libsForQt5.callPackage ../applications/science/math/wolfram-engine { };
-
   wolfram-for-jupyter-kernel = callPackage ../applications/editors/jupyter-kernels/wolfram { };
 
   ### SCIENCE/MOLECULAR-DYNAMICS
@@ -11279,7 +11237,7 @@ with pkgs;
     enableUnfree = true;
   };
 
-  inherit (ocamlPackages) hol_light;
+  inherit (ocaml-ng.ocamlPackages_5_3) hol_light;
 
   isabelle-components = recurseIntoAttrs (callPackage ../by-name/is/isabelle/components { });
 
@@ -11397,8 +11355,6 @@ with pkgs;
     python3 = python312; # fails to build otherwise
   };
 
-  vite = libsForQt5.callPackage ../applications/science/misc/vite { };
-
   ### SCIENCE / PHYSICS
 
   hepmc3 = callPackage ../development/libraries/physics/hepmc3 {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d1f5db3f99c5..4ed1ce5b08d2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11423,6 +11423,8 @@ self: super: with self; {
 
   numpy-groupies = callPackage ../development/python-modules/numpy-groupies { };
 
+  numpy-quaternion = callPackage ../development/python-modules/numpy-quaternion { };
+
   numpy-stl = callPackage ../development/python-modules/numpy-stl { };
 
   numpy-typing-compat = callPackage ../development/python-modules/numpy-typing-compat { };
@@ -11451,6 +11453,12 @@ self: super: with self; {
 
   nvidia-cutlass = callPackage ../development/python-modules/nvidia-cutlass { };
 
+  nvidia-cutlass-dsl = callPackage ../development/python-modules/nvidia-cutlass-dsl { };
+
+  nvidia-cutlass-dsl-libs-base =
+    callPackage ../development/python-modules/nvidia-cutlass-dsl-libs-base
+      { };
+
   nvidia-dlprof-pytorch-nvtx =
     callPackage ../development/python-modules/nvidia-dlprof-pytorch-nvtx
       { };
@@ -13857,6 +13865,8 @@ self: super: with self; {
 
   pydrawise = callPackage ../development/python-modules/pydrawise { };
 
+  pydriller = callPackage ../development/python-modules/pydriller { };
+
   pydrive2 = callPackage ../development/python-modules/pydrive2 { };
 
   pydroid-ipcam = callPackage ../development/python-modules/pydroid-ipcam { };