diff --git a/ci/OWNERS b/ci/OWNERS
index 4e8cc28e50fe..8a52e846aafd 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -247,7 +247,6 @@ nixos/modules/installer/tools/nix-fallback-paths.nix  @Artturin @Ericson2314 @lo
 /pkgs/applications/networking/browsers/firefox/update.nix
 /pkgs/applications/networking/browsers/firefox/packages/firefox.nix @mweinelt
 /pkgs/applications/networking/browsers/firefox/packages/firefox-esr-*.nix @mweinelt
-/pkgs/applications/networking/browsers/librewolf @squalus @DominicWrege @fpletz
 /pkgs/applications/networking/browsers/chromium @emilylange @networkException
 /nixos/tests/chromium.nix @emilylange @networkException
 
diff --git a/ci/github-script/check-target-branch.js b/ci/github-script/check-target-branch.js
index 47e36b9cb3f6..46101adcf200 100644
--- a/ci/github-script/check-target-branch.js
+++ b/ci/github-script/check-target-branch.js
@@ -122,7 +122,11 @@ async function checkTargetBranch({ github, context, core, dry }) {
     ].join('\n'),
   )
 
-  if (maxRebuildCount >= 1000 && !isExemptHomeAssistantUpdate) {
+  if (
+    maxRebuildCount >= 1000 &&
+    !isExemptHomeAssistantUpdate &&
+    !isExemptKernelUpdate
+  ) {
     const desiredBranch =
       base === 'master' ? 'staging' : `staging-${split(base).version}`
     const body = [
diff --git a/doc/languages-frameworks/ocaml.section.md b/doc/languages-frameworks/ocaml.section.md
index d84b5fd80a1c..06c2fb197105 100644
--- a/doc/languages-frameworks/ocaml.section.md
+++ b/doc/languages-frameworks/ocaml.section.md
@@ -116,14 +116,14 @@ Here is a second example, this time using a source archive generated with `dune-
   buildDunePackage,
 }:
 
-buildDunePackage (finalAtts: {
+buildDunePackage (finalAttrs: {
   pname = "wtf8";
   version = "1.0.2";
 
   minimalOCamlVersion = "4.02";
 
   src = fetchurl {
-    url = "https://github.com/flowtype/ocaml-wtf8/releases/download/v${finalAtts.version}/wtf8-v${finalAtts.version}.tbz";
+    url = "https://github.com/flowtype/ocaml-wtf8/releases/download/v${finalAttrs.version}/wtf8-v${finalAttrs.version}.tbz";
     hash = "sha256-d5/3KUBAWRj8tntr4RkJ74KWW7wvn/B/m1nx0npnzyc=";
   };
 
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0a51778b0ae9..ff8e1d013a64 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9556,6 +9556,12 @@
     githubId = 127353;
     name = "Geoffrey Huntley";
   };
+  gibbert = {
+    email = "gbjgms@gmail.com";
+    github = "zgibberish";
+    githubId = 67570424;
+    name = "gibbert";
+  };
   gigahawk = {
     email = "Jasper Chan";
     name = "jasperchan515@gmail.com";
@@ -11780,6 +11786,12 @@
     githubId = 1358764;
     name = "Jamie Magee";
   };
+  janhencic = {
+    name = "Jan Hencic";
+    email = "jan@hencic.com";
+    github = "janhencic";
+    githubId = 61284133;
+  };
   jankaifer = {
     name = "Jan Kaifer";
     email = "jan@kaifer.cz";
@@ -18651,6 +18663,11 @@
     githubId = 50854675;
     name = "Nelson Jeppesen";
   };
+  nemin = {
+    name = "Nemin";
+    github = "Nemin32";
+    githubId = 2953293;
+  };
   neosimsim = {
     email = "me@abn.sh";
     github = "neosimsim";
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index ad464dfa198d..f45258d0038b 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -105,7 +105,7 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - [K40-Whisperer](https://www.scorchworks.com/K40whisperer/k40whisperer.html), a program to control cheap Chinese laser cutters. Available as [programs.k40-whisperer.enable](#opt-programs.k40-whisperer.enable). Users must add themselves to the `k40` group to be able to access the device.
 
-- [kanidm](https://kanidm.github.io/kanidm/stable/), an identity management server written in Rust. Available as [services.kanidm](#opt-services.kanidm.enableServer)
+- [kanidm](https://kanidm.github.io/kanidm/stable/), an identity management server written in Rust. Available as [services.kanidm](#opt-services.kanidm.server.enable) (renamed to `services.kanidm.server.enable` in 26.05).
 
 - [Maddy](https://maddy.email/), a free an open source mail server. Available as [services.maddy](#opt-services.maddy.enable).
 
diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md
index d1fe153f0df1..ba453437ea8b 100644
--- a/nixos/doc/manual/release-notes/rl-2605.section.md
+++ b/nixos/doc/manual/release-notes/rl-2605.section.md
@@ -149,6 +149,11 @@ See <https://github.com/NixOS/nixpkgs/issues/481673>.
 
 - `services.slurm` now supports slurmrestd usage through the `services.slurm.rest` NixOS options.
 
+- `services.kanidm` options for server, client and unix were moved under dedicated namespaces.
+  For each component `enableComponent` and `componentSettings` are now `component.enable` and
+  `component.settings`. The unix module now supports using SSH keys from Kanidm via
+  `services.kanidm.unix.sshIntegration = true`.
+
 - `glibc` has been updated to version 2.42.
 
   This version no longer makes the stack executable when a shared library requires this. A symptom
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 01b5603dbf2d..9f5ad83e0746 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -772,7 +772,7 @@ let
               }
               {
                 name = "kanidm";
-                enable = config.services.kanidm.enablePam;
+                enable = config.services.kanidm.unix.enable;
                 control = "sufficient";
                 modulePath = "${config.services.kanidm.package}/lib/pam_kanidm.so";
                 settings = {
@@ -1139,7 +1139,7 @@ let
                 }
                 {
                   name = "kanidm";
-                  enable = config.services.kanidm.enablePam;
+                  enable = config.services.kanidm.unix.enable;
                   control = "sufficient";
                   modulePath = "${config.services.kanidm.package}/lib/pam_kanidm.so";
                   settings = {
@@ -1248,7 +1248,7 @@ let
               }
               {
                 name = "kanidm";
-                enable = config.services.kanidm.enablePam;
+                enable = config.services.kanidm.unix.enable;
                 control = "sufficient";
                 modulePath = "${config.services.kanidm.package}/lib/pam_kanidm.so";
               }
@@ -1412,7 +1412,7 @@ let
               }
               {
                 name = "kanidm";
-                enable = config.services.kanidm.enablePam;
+                enable = config.services.kanidm.unix.enable;
                 control = "optional";
                 modulePath = "${config.services.kanidm.package}/lib/pam_kanidm.so";
               }
@@ -2339,7 +2339,7 @@ in
       # Include the PAM modules in the system path mostly for the manpages.
       [ package ]
       ++ lib.optional config.users.ldap.enable pam_ldap
-      ++ lib.optional config.services.kanidm.enablePam config.services.kanidm.package
+      ++ lib.optional config.services.kanidm.unix.enable config.services.kanidm.package
       ++ lib.optional config.services.sssd.enable pkgs.sssd
       ++ lib.optionals config.security.pam.krb5.enable [
         pam_krb5
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 988fc1fcc677..c353caed9e03 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -1626,7 +1626,8 @@ in
         nodejs
         gnupg
 
-        "${cfg.packages.gitlab}/share/gitlab/vendor/gems/sidekiq-${cfg.packages.gitlab.rubyEnv.gems.sidekiq.version}"
+        # We currently use the bundled sidekiq, if we use upstream sidekiq again, this needs to include the version
+        "${cfg.packages.gitlab}/share/gitlab/vendor/gems/sidekiq"
 
         # Needed for GitLab project imports
         gnutar
diff --git a/nixos/modules/services/security/crowdsec.nix b/nixos/modules/services/security/crowdsec.nix
index 7d89659f5dd1..78d861604dad 100644
--- a/nixos/modules/services/security/crowdsec.nix
+++ b/nixos/modules/services/security/crowdsec.nix
@@ -602,7 +602,7 @@ in
       ++ lib.optionals (cfg.settings.console.tokenFile != null) [
         ''
           if [ ! -e "${cfg.settings.console.tokenFile}" ]; then
-            ${lib.getExe cscli} console enroll "$(cat ${cfg.settings.console.tokenFile})" --name ${cfg.name}
+            ${lib.getExe cscli} console enroll "$(${lib.getExe' pkgs.coreutils "cat"} ${cfg.settings.console.tokenFile})" --name ${cfg.name}
           fi
         ''
       ];
diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix
index 924b3f60f647..7018c2de8889 100644
--- a/nixos/modules/services/security/kanidm.nix
+++ b/nixos/modules/services/security/kanidm.nix
@@ -31,6 +31,7 @@ let
     mkOption
     mkOrder
     mkPackageOption
+    mkRenamedOptionModule
     optional
     optionals
     optionalString
@@ -44,9 +45,9 @@ let
   settingsFormat = pkgs.formats.toml { };
   # Remove null values, so we can document optional values that don't end up in the generated TOML file.
   filterConfig = converge (filterAttrsRecursive (_: v: v != null));
-  serverConfigFile = settingsFormat.generate "server.toml" (filterConfig cfg.serverSettings);
-  clientConfigFile = settingsFormat.generate "kanidm-config.toml" (filterConfig cfg.clientSettings);
-  unixConfigFile = settingsFormat.generate "kanidm-unixd.toml" (filterConfig cfg.unixSettings);
+  serverConfigFile = settingsFormat.generate "server.toml" (filterConfig cfg.server.settings);
+  clientConfigFile = settingsFormat.generate "kanidm-config.toml" (filterConfig cfg.client.settings);
+  unixConfigFile = settingsFormat.generate "kanidm-unixd.toml" (filterConfig cfg.unix.settings);
   provisionSecretFiles = filter (x: x != null) (
     [
       cfg.provision.idmAdminPasswordFile
@@ -56,11 +57,11 @@ let
     ++ mapAttrsToList (_: x: x.basicSecretFile) cfg.provision.systems.oauth2
   );
   secretPaths = [
-    cfg.serverSettings.tls_chain
-    cfg.serverSettings.tls_key
+    cfg.server.settings.tls_chain
+    cfg.server.settings.tls_key
   ]
   ++ optionals cfg.provision.enable provisionSecretFiles;
-  enableServerBackup = cfg.enableServer && (cfg.serverSettings.online_backup.versions != 0);
+  enableServerBackup = cfg.server.enable && (cfg.server.settings.online_backup.versions != 0);
 
   # Merge bind mount paths and remove paths where a prefix is already mounted.
   # This makes sure that if e.g. the tls_chain is in the nix store and /nix/store is already in the mount
@@ -218,7 +219,7 @@ let
 
   serverPort =
     let
-      address = cfg.serverSettings.bindaddress;
+      address = cfg.server.settings.bindaddress;
     in
     # ipv6:
     if hasInfix "]:" address then
@@ -230,19 +231,42 @@ let
     # default is 8443
     else
       throw "Address not parseable as IPv4 nor IPv6.";
+
+  addKaniSshKeys = cfg.unix.enable && cfg.unix.sshIntegration;
 in
 {
-  options.services.kanidm = {
-    enableClient = mkEnableOption "the Kanidm client";
-    enableServer = mkEnableOption "the Kanidm server";
-    enablePam = mkEnableOption "the Kanidm PAM and NSS integration";
+  imports = [
+    (mkRenamedOptionModule
+      [ "services" "kanidm" "enableServer" ]
+      [ "services" "kanidm" "server" "enable" ]
+    )
+    (mkRenamedOptionModule
+      [ "services" "kanidm" "serverSettings" ]
+      [ "services" "kanidm" "server" "settings" ]
+    )
+    (mkRenamedOptionModule
+      [ "services" "kanidm" "enableClient" ]
+      [ "services" "kanidm" "client" "enable" ]
+    )
+    (mkRenamedOptionModule
+      [ "services" "kanidm" "clientSettings" ]
+      [ "services" "kanidm" "client" "settings" ]
+    )
+    (mkRenamedOptionModule [ "services" "kanidm" "enablePam" ] [ "services" "kanidm" "unix" "enable" ])
+    (mkRenamedOptionModule
+      [ "services" "kanidm" "unixSettings" ]
+      [ "services" "kanidm" "unix" "settings" ]
+    )
+  ];
 
+  options.services.kanidm = {
     package = mkPackageOption pkgs "kanidm" {
       example = "kanidm_1_8";
       extraDescription = "Must be set to an explicit version.";
     };
 
-    serverSettings = mkOption {
+    server.enable = mkEnableOption "the Kanidm server";
+    server.settings = mkOption {
       type = types.submodule {
         freeformType = settingsFormat.type;
 
@@ -270,7 +294,7 @@ in
           domain = mkOption {
             description = ''
               The `domain` that Kanidm manages. Must be below or equal to the domain
-              specified in `serverSettings.origin`.
+              specified in `server.settings.origin`.
               This can be left at `null`, only if your instance has the role `ReadOnlyReplica`.
               While it is possible to change the domain later on, it requires extra steps!
               Please consider the warnings and execute the steps described
@@ -345,7 +369,8 @@ in
       '';
     };
 
-    clientSettings = mkOption {
+    client.enable = mkEnableOption "the Kanidm client";
+    client.settings = mkOption {
       type = types.submodule {
         freeformType = settingsFormat.type;
 
@@ -363,7 +388,11 @@ in
       '';
     };
 
-    unixSettings = mkOption {
+    unix = {
+      enable = mkEnableOption "the Kanidm PAM and NSS integration";
+      sshIntegration = mkEnableOption "Kanidm SSH keys login";
+    };
+    unix.settings = mkOption {
       type = types.submodule {
         freeformType = settingsFormat.type;
 
@@ -394,7 +423,7 @@ in
       instanceUrl = mkOption {
         description = "The instance url to which the provisioning tool should connect.";
         default = "https://localhost:${serverPort}";
-        defaultText = "https://localhost:<port from serverSettings.bindaddress>";
+        defaultText = "https://localhost:<port from server.settings.bindaddress>";
         type = types.str;
       };
 
@@ -671,11 +700,11 @@ in
     };
   };
 
-  config = mkIf (cfg.enableClient || cfg.enableServer || cfg.enablePam) {
+  config = mkIf (cfg.client.enable || cfg.server.enable || cfg.unix.enable) {
     warnings = lib.optionals (cfg.package.eolMessage != "") [ cfg.package.eolMessage ];
     services.kanidm = {
-      unixSettings.version = "2";
-      serverSettings.version = "2";
+      unix.settings.version = "2";
+      server.settings.version = "2";
     };
 
     assertions =
@@ -699,7 +728,7 @@ in
             unknownGroups = subtractLists knownGroups groups;
           in
           {
-            assertion = (cfg.enableServer && cfg.provision.enable) -> unknownGroups == [ ];
+            assertion = (cfg.server.enable && cfg.provision.enable) -> unknownGroups == [ ];
             message = "${opt} refers to unknown groups: ${toString unknownGroups}";
           };
 
@@ -709,71 +738,71 @@ in
             unknownEntities = subtractLists (attrNames entitiesByName) entities;
           in
           {
-            assertion = (cfg.enableServer && cfg.provision.enable) -> unknownEntities == [ ];
+            assertion = (cfg.server.enable && cfg.provision.enable) -> unknownEntities == [ ];
             message = "${opt} refers to unknown entities: ${toString unknownEntities}";
           };
       in
       [
         {
-          assertion = cfg.enablePam -> !(cfg.unixSettings ? pam_allowed_login_groups);
+          assertion = cfg.unix.enable -> !(cfg.unix.settings ? pam_allowed_login_groups);
           message = ''
-            <option>services.kanidm.unixSettings.pam_allowed_login_groups</option> has been renamed
-            to <option>services.kanidm.unixSettings.kanidm.pam_allowed_login_groups</option>.
+            <option>services.kanidm.unix.settings.pam_allowed_login_groups</option> has been renamed
+            to <option>services.kanidm.unix.settings.kanidm.pam_allowed_login_groups</option>.
             Please change your usage.
           '';
         }
         {
           assertion =
-            !cfg.enableServer
-            || ((cfg.serverSettings.tls_chain or null) == null)
-            || (!isStorePath cfg.serverSettings.tls_chain);
+            !cfg.server.enable
+            || ((cfg.server.settings.tls_chain or null) == null)
+            || (!isStorePath cfg.server.settings.tls_chain);
           message = ''
-            <option>services.kanidm.serverSettings.tls_chain</option> points to
+            <option>services.kanidm.server.settings.tls_chain</option> points to
             a file in the Nix store. You should use a quoted absolute path to
             prevent this.
           '';
         }
         {
           assertion =
-            !cfg.enableServer
-            || ((cfg.serverSettings.tls_key or null) == null)
-            || (!isStorePath cfg.serverSettings.tls_key);
+            !cfg.server.enable
+            || ((cfg.server.settings.tls_key or null) == null)
+            || (!isStorePath cfg.server.settings.tls_key);
           message = ''
-            <option>services.kanidm.serverSettings.tls_key</option> points to
+            <option>services.kanidm.server.settings.tls_key</option> points to
             a file in the Nix store. You should use a quoted absolute path to
             prevent this.
           '';
         }
         {
-          assertion = !cfg.enableClient || options.services.kanidm.clientSettings.isDefined;
+          assertion = !cfg.client.enable || options.services.kanidm.client.settings.isDefined;
           message = ''
-            <option>services.kanidm.clientSettings</option> needs to be configured
+            <option>services.kanidm.client.settings</option> needs to be configured
             if the client is enabled.
           '';
         }
         {
-          assertion = !cfg.enablePam || options.services.kanidm.clientSettings.isDefined;
+          assertion = !cfg.unix.enable || options.services.kanidm.client.settings.isDefined;
           message = ''
-            <option>services.kanidm.clientSettings</option> needs to be configured
+            <option>services.kanidm.client.settings</option> needs to be configured
             for the PAM daemon to connect to the Kanidm server.
           '';
         }
         {
           assertion =
-            !cfg.enableServer
+            !cfg.server.enable
             || (
-              cfg.serverSettings.domain == null
-              -> cfg.serverSettings.role == "WriteReplica" || cfg.serverSettings.role == "WriteReplicaNoUI"
+              cfg.server.settings.domain == null
+              -> cfg.server.settings.role == "WriteReplica" || cfg.server.settings.role == "WriteReplicaNoUI"
             );
           message = ''
-            <option>services.kanidm.serverSettings.domain</option> can only be set if this instance
+            <option>services.kanidm.server.settings.domain</option> can only be set if this instance
             is not a ReadOnlyReplica. Otherwise the db would inherit it from
             the instance it follows.
           '';
         }
         {
-          assertion = cfg.provision.enable -> cfg.enableServer;
-          message = "<option>services.kanidm.provision</option> requires <option>services.kanidm.enableServer</option> to be true";
+          assertion = cfg.provision.enable -> cfg.server.enable;
+          message = "<option>services.kanidm.provision</option> requires <option>services.kanidm.server.enable</option> to be true";
         }
         # If any secret is provisioned, the kanidm package must have some required patches applied to it
         {
@@ -844,27 +873,28 @@ in
                 # At least one group must map to a value in each claim map
                 (mkIf (cfg.provision.extraJsonFile == null) {
                   assertion =
-                    (cfg.provision.enable && cfg.enableServer)
+                    (cfg.provision.enable && cfg.server.enable)
                     -> any (xs: xs != [ ]) (attrValues claimCfg.valuesByGroup);
                   message = "services.kanidm.provision.systems.oauth2.${oauth2}.claimMaps.${claim} does not specify any values for any group";
                 })
                 # Public clients cannot define a basic secret
                 {
                   assertion =
-                    (cfg.provision.enable && cfg.enableServer && oauth2Cfg.public) -> oauth2Cfg.basicSecretFile == null;
+                    (cfg.provision.enable && cfg.server.enable && oauth2Cfg.public)
+                    -> oauth2Cfg.basicSecretFile == null;
                   message = "services.kanidm.provision.systems.oauth2.${oauth2} is a public client and thus cannot specify a basic secret";
                 }
                 # Public clients cannot disable PKCE
                 {
                   assertion =
-                    (cfg.provision.enable && cfg.enableServer && oauth2Cfg.public)
+                    (cfg.provision.enable && cfg.server.enable && oauth2Cfg.public)
                     -> !oauth2Cfg.allowInsecureClientDisablePkce;
                   message = "services.kanidm.provision.systems.oauth2.${oauth2} is a public client and thus cannot disable PKCE";
                 }
                 # Non-public clients cannot enable localhost redirects
                 {
                   assertion =
-                    (cfg.provision.enable && cfg.enableServer && !oauth2Cfg.public)
+                    (cfg.provision.enable && cfg.server.enable && !oauth2Cfg.public)
                     -> !oauth2Cfg.enableLocalhostRedirects;
                   message = "services.kanidm.provision.systems.oauth2.${oauth2} is a non-public client and thus cannot enable localhost redirects";
                 }
@@ -874,17 +904,17 @@ in
         )
       );
 
-    environment.systemPackages = mkIf cfg.enableClient [ cfg.package ];
+    environment.systemPackages = mkIf cfg.client.enable [ cfg.package ];
 
     systemd.tmpfiles.settings."10-kanidm" = mkIf enableServerBackup {
-      ${cfg.serverSettings.online_backup.path}.d = {
+      ${cfg.server.settings.online_backup.path}.d = {
         mode = "0700";
         user = "kanidm";
         group = "kanidm";
       };
     };
 
-    systemd.services.kanidm = mkIf cfg.enableServer {
+    systemd.services.kanidm = mkIf cfg.server.enable {
       description = "kanidm identity management daemon";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
@@ -915,10 +945,10 @@ in
           BindPaths =
             [ ]
             # To store backups
-            ++ optional enableServerBackup cfg.serverSettings.online_backup.path
+            ++ optional enableServerBackup cfg.server.settings.online_backup.path
             ++ optional (
-              cfg.enablePam && cfg.unixSettings ? home_mount_prefix
-            ) cfg.unixSettings.home_mount_prefix;
+              cfg.unix.enable && cfg.unix.settings ? home_mount_prefix
+            ) cfg.unix.settings.home_mount_prefix;
 
           AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
           CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
@@ -936,7 +966,7 @@ in
       ];
     };
 
-    systemd.services.kanidm-unixd = mkIf cfg.enablePam {
+    systemd.services.kanidm-unixd = mkIf cfg.unix.enable {
       description = "Kanidm PAM daemon";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
@@ -979,7 +1009,7 @@ in
       environment.RUST_LOG = "info";
     };
 
-    systemd.services.kanidm-unixd-tasks = mkIf cfg.enablePam {
+    systemd.services.kanidm-unixd-tasks = mkIf cfg.unix.enable {
       description = "Kanidm PAM home management daemon";
       wantedBy = [ "multi-user.target" ];
       after = [
@@ -1033,25 +1063,26 @@ in
 
     # These paths are hardcoded
     environment.etc = mkMerge [
-      (mkIf cfg.enableServer { "kanidm/server.toml".source = serverConfigFile; })
-      (mkIf options.services.kanidm.clientSettings.isDefined {
+      (mkIf cfg.server.enable { "kanidm/server.toml".source = serverConfigFile; })
+      (mkIf options.services.kanidm.client.settings.isDefined {
         "kanidm/config".source = clientConfigFile;
       })
-      (mkIf cfg.enablePam { "kanidm/unixd".source = unixConfigFile; })
+      (mkIf cfg.unix.enable { "kanidm/unixd".source = unixConfigFile; })
     ];
 
-    system.nssModules = mkIf cfg.enablePam [ cfg.package ];
+    system.nssModules = mkIf cfg.unix.enable [ cfg.package ];
 
     # Needs to be before "files" which is `mkBefore`
-    system.nssDatabases.group = mkOrder 490 (optional cfg.enablePam "kanidm");
-    system.nssDatabases.passwd = mkOrder 490 (optional cfg.enablePam "kanidm");
+    system.nssDatabases.group = mkOrder 490 (optional cfg.unix.enable "kanidm");
+    system.nssDatabases.passwd = mkOrder 490 (optional cfg.unix.enable "kanidm");
 
     users.groups = mkMerge [
-      (mkIf cfg.enableServer { kanidm = { }; })
-      (mkIf cfg.enablePam { kanidm-unixd = { }; })
+      (mkIf cfg.server.enable { kanidm = { }; })
+      (mkIf cfg.unix.enable { kanidm-unixd = { }; })
+      (mkIf addKaniSshKeys { kanidm-authorized-keys = { }; })
     ];
     users.users = mkMerge [
-      (mkIf cfg.enableServer {
+      (mkIf cfg.server.enable {
         kanidm = {
           description = "Kanidm server";
           isSystemUser = true;
@@ -1059,14 +1090,34 @@ in
           packages = [ cfg.package ];
         };
       })
-      (mkIf cfg.enablePam {
+      (mkIf cfg.unix.enable {
         kanidm-unixd = {
           description = "Kanidm PAM daemon";
           isSystemUser = true;
           group = "kanidm-unixd";
         };
       })
+      (mkIf addKaniSshKeys {
+        kanidm-authorized-keys = {
+          description = "Kanidm authorized keys delegate";
+          isSystemUser = true;
+          group = "kanidm-authorized-keys";
+        };
+      })
     ];
+
+    # AuthorizedKeysCommand is displeased with `/nix/store` permissions
+    services.openssh.settings = mkIf addKaniSshKeys {
+      AuthorizedKeysCommand = "${config.security.wrapperDir}/kanidm_ssh_authorizedkeys %u";
+      AuthorizedKeysCommandUser = "kanidm-authorized-keys";
+    };
+
+    security.wrappers.kanidm_ssh_authorizedkeys = mkIf addKaniSshKeys {
+      owner = "root";
+      group = "root";
+      permissions = "a+rx";
+      source = "${cfg.package}/bin/kanidm_ssh_authorizedkeys";
+    };
   };
 
   meta.maintainers = with lib.maintainers; [
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index fef72c5b1392..beb628c42214 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -293,9 +293,6 @@ let
         ) "'dbtableprefix' => '${toString c.dbtableprefix}',"}
         ${lib.optionalString (c.dbpassFile != null) "'dbpassword' => nix_read_secret('dbpass'),"}
         'dbtype' => '${c.dbtype}',
-        ${lib.concatStringsSep "\n" (
-          lib.mapAttrsToList (name: credential: "'${name}' => nix_read_secret('${name}'),") cfg.secrets
-        )}
         ${objectstoreConfig}
       ];
 
@@ -304,6 +301,12 @@ let
         "impossible: this should never happen (decoding generated settings file %s failed)"
       ));
 
+      $CONFIG = array_replace_recursive($CONFIG, [
+        ${lib.concatStringsSep "\n" (
+          lib.mapAttrsToList (name: credential: "'${name}' => nix_read_secret('${name}'),") cfg.secrets
+        )}
+      ]);
+
       ${lib.optionalString (cfg.secretFile != null) ''
         $CONFIG = array_replace_recursive($CONFIG, nix_read_secret_and_decode_json_file('secret_file'));
       ''}
diff --git a/nixos/modules/services/web-apps/vikunja.nix b/nixos/modules/services/web-apps/vikunja.nix
index c273cccff1e5..f4fd912aed2a 100644
--- a/nixos/modules/services/web-apps/vikunja.nix
+++ b/nixos/modules/services/web-apps/vikunja.nix
@@ -45,6 +45,11 @@ in
       type = types.str;
       description = "The Hostname under which the frontend is running.";
     };
+    address = mkOption {
+      type = types.str;
+      default = "";
+      description = "The IP address to bind to.";
+    };
     port = mkOption {
       type = types.port;
       default = 3456;
@@ -105,7 +110,7 @@ in
           ;
       };
       service = {
-        interface = ":${toString cfg.port}";
+        interface = "${cfg.address}:${toString cfg.port}";
         frontendurl = "${cfg.frontendScheme}://${cfg.frontendHostname}/";
       };
       files = {
diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix
index 664743157328..cf1076b4d99a 100644
--- a/nixos/modules/virtualisation/oci-containers.nix
+++ b/nixos/modules/virtualisation/oci-containers.nix
@@ -536,7 +536,7 @@ let
         ExecStartPre = [ "${preStartScript}/bin/pre-start" ];
         TimeoutStartSec = 0;
         TimeoutStopSec = 120;
-        Restart = "always";
+        Restart = "on-failure";
       }
       // optionalAttrs (cfg.backend == "podman") {
         Environment = "PODMAN_SYSTEMD_UNIT=%n";
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 9cefb763d6b6..68b920a4dd41 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -837,6 +837,7 @@ in
   kimai = runTest ./kimai.nix;
   kismet = runTest ./kismet.nix;
   kmonad = runTest ./kmonad.nix;
+  kmscon = runTest ./kmscon.nix;
   knot = runTest ./knot.nix;
   komga = runTest ./komga.nix;
   komodo-periphery = runTest ./komodo-periphery.nix;
diff --git a/nixos/tests/kanidm-provisioning.nix b/nixos/tests/kanidm-provisioning.nix
index 5e5a6f0db606..8813be497abe 100644
--- a/nixos/tests/kanidm-provisioning.nix
+++ b/nixos/tests/kanidm-provisioning.nix
@@ -25,21 +25,25 @@ in
     {
       services.kanidm = {
         package = kanidmPackage;
-        enableServer = true;
-        serverSettings = {
-          origin = "https://${serverDomain}";
-          domain = serverDomain;
-          bindaddress = "[::]:443";
-          ldapbindaddress = "[::1]:636";
-          tls_chain = "${certsPath}/snakeoil.crt";
-          tls_key = "${certsPath}/snakeoil.key";
+        server = {
+          enable = true;
+          settings = {
+            origin = "https://${serverDomain}";
+            domain = serverDomain;
+            bindaddress = "[::]:443";
+            ldapbindaddress = "[::1]:636";
+            tls_chain = "${certsPath}/snakeoil.crt";
+            tls_key = "${certsPath}/snakeoil.key";
+          };
         };
         # So we can check whether provisioning did what we wanted
-        enableClient = true;
-        clientSettings = {
-          uri = "https://${serverDomain}";
-          verify_ca = true;
-          verify_hostnames = true;
+        client = {
+          enable = true;
+          settings = {
+            uri = "https://${serverDomain}";
+            verify_ca = true;
+            verify_hostnames = true;
+          };
         };
       };
 
@@ -289,7 +293,7 @@ in
       # We need access to the config file in the test script.
       filteredConfig = pkgs.lib.converge (pkgs.lib.filterAttrsRecursive (
         _: v: v != null
-      )) nodes.provision.services.kanidm.serverSettings;
+      )) nodes.provision.services.kanidm.server.settings;
       serverConfigFile = (pkgs.formats.toml { }).generate "server.toml" filteredConfig;
 
       specialisations = "${nodes.provision.system.build.toplevel}/specialisation";
diff --git a/nixos/tests/kanidm.nix b/nixos/tests/kanidm.nix
index 7a0fe66ae968..4ee6ce4cd1da 100644
--- a/nixos/tests/kanidm.nix
+++ b/nixos/tests/kanidm.nix
@@ -29,14 +29,16 @@ in
     {
       services.kanidm = {
         package = kanidmPackage;
-        enableServer = true;
-        serverSettings = {
-          origin = "https://${serverDomain}";
-          domain = serverDomain;
-          bindaddress = "[::]:443";
-          ldapbindaddress = "[::1]:636";
-          tls_chain = "${certsPath}/snakeoil.crt";
-          tls_key = "${certsPath}/snakeoil.key";
+        server = {
+          enable = true;
+          settings = {
+            origin = "https://${serverDomain}";
+            domain = serverDomain;
+            bindaddress = "[::]:443";
+            ldapbindaddress = "[::1]:636";
+            tls_chain = "${certsPath}/snakeoil.crt";
+            tls_key = "${certsPath}/snakeoil.key";
+          };
         };
       };
 
@@ -59,15 +61,17 @@ in
     {
       services.kanidm = {
         package = kanidmPackage;
-        enableClient = true;
-        clientSettings = {
-          uri = "https://${serverDomain}";
-          verify_ca = true;
-          verify_hostnames = true;
-        };
-        enablePam = true;
-        unixSettings = {
-          kanidm.pam_allowed_login_groups = [ "shell" ];
+        client = {
+          enable = true;
+          settings = {
+            uri = "https://${serverDomain}";
+            verify_ca = true;
+            verify_hostnames = true;
+          };
+          unix = {
+            enable = true;
+            kanidm.pam_allowed_login_groups = [ "shell" ];
+          };
         };
       };
 
@@ -86,7 +90,7 @@ in
       # We need access to the config file in the test script.
       filteredConfig = pkgs.lib.converge (pkgs.lib.filterAttrsRecursive (
         _: v: v != null
-      )) nodes.server.services.kanidm.serverSettings;
+      )) nodes.server.services.kanidm.server.settings;
       serverConfigFile = (pkgs.formats.toml { }).generate "server.toml" filteredConfig;
     in
     ''
diff --git a/nixos/tests/kmscon.nix b/nixos/tests/kmscon.nix
new file mode 100644
index 000000000000..0eb7e941bd84
--- /dev/null
+++ b/nixos/tests/kmscon.nix
@@ -0,0 +1,43 @@
+{ ... }:
+{
+  name = "kmscon";
+
+  nodes.machine =
+    {
+      pkgs,
+      lib,
+      ...
+    }:
+    {
+      imports = [
+        ./common/user-account.nix
+      ];
+
+      services.kmscon = {
+        enable = true;
+        hwRender = true;
+        fonts = [
+          {
+            name = "JetBrainsMono Nerd Font";
+            package = pkgs.nerd-fonts.jetbrains-mono;
+          }
+        ];
+        package = pkgs.kmscon;
+      };
+    };
+
+  enableOCR = true;
+
+  testScript = ''
+    machine.succeed(":")
+    # ^ this create a screen
+
+    with subtest("ensure we can open a tty"):
+      machine.wait_for_text("machine login:")
+      machine.send_chars("alice\n")
+      machine.wait_for_text("Password:")
+      machine.send_chars("foobar\n")
+      machine.wait_for_text("alice@machine")
+      machine.screenshot("tty.png")
+  '';
+}
diff --git a/nixos/tests/networking/networkmanager.nix b/nixos/tests/networking/networkmanager.nix
index 320aa86cd04d..55f65897e3cc 100644
--- a/nixos/tests/networking/networkmanager.nix
+++ b/nixos/tests/networking/networkmanager.nix
@@ -8,10 +8,34 @@ with import ../../lib/testing-python.nix { inherit system pkgs; };
 
 let
   lib = pkgs.lib;
+
+  # Generate EAP certificates on the fly (CA, server, and client certs)
+  eapCerts = pkgs.runCommand "eap-certs" { buildInputs = [ pkgs.openssl ]; } ''
+    mkdir -p $out
+
+    # Create CA certificate
+    openssl req -x509 -newkey rsa:2048 -days 365000 -nodes \
+      -keyout $out/ca.key -out $out/ca.cert \
+      -subj "/CN=ExampleCA"
+
+    # Create server certificate
+    openssl req -newkey rsa:2048 -nodes \
+      -keyout $out/server.key -out server.csr \
+      -subj "/CN=server.example.com"
+    openssl x509 -req -in server.csr -CA $out/ca.cert -CAkey $out/ca.key \
+      -days 365000 -set_serial 100 -out $out/server.cert
+
+    # Create client certificate
+    openssl req -newkey rsa:2048 -nodes \
+      -keyout $out/client1.key -out client1.csr \
+      -subj "/CN=client1.example.com"
+    openssl x509 -req -in client1.csr -CA $out/ca.cert -CAkey $out/ca.key \
+      -days 365000 -set_serial 101 -out $out/client1.cert
+  '';
+
   # this is intended as a client test since you shouldn't use NetworkManager for a router or server
   # so using systemd-networkd for the router vm is fine in these tests.
   router = import ./router.nix { networkd = true; };
-  qemu-common = import ../../lib/qemu-common.nix { inherit (pkgs) lib pkgs; };
   clientConfig =
     extraConfig:
     lib.recursiveUpdate {
@@ -180,6 +204,100 @@ let
         client.wait_until_succeeds("ping -c 1 fd00:1234:5678:1::23")
       '';
     };
+    eap =
+      let
+        toBase64Blob =
+          file:
+          "data:;base64,"
+          + builtins.readFile (
+            pkgs.runCommand "base64" { } ''
+              ${pkgs.coreutils}/bin/base64 -w0 ${file} > $out
+            ''
+          );
+      in
+      {
+        name = "eap / 802.1x with secrets in blob encoding";
+        nodes = {
+          router = import ./router-eap.nix { inherit eapCerts; };
+          client = clientConfig {
+            networking.networkmanager.ensureProfiles.profiles.default = {
+              ipv4.method = "auto";
+              "802-1x" = {
+                eap = "tls";
+                identity = "client1.example.com";
+                ca-cert = toBase64Blob "${eapCerts}/ca.cert";
+                client-cert = toBase64Blob "${eapCerts}/client1.cert";
+                private-key = toBase64Blob "${eapCerts}/client1.key";
+                private-key-password-flags = "4";
+              };
+            };
+            networking.wireless = {
+              # it is a bit unfortunate that wpa-supplicant is equated with
+              # `wireless` when it also works for wired connections
+              enable = lib.mkOverride 9 true;
+              driver = "wired";
+            };
+          };
+        };
+
+        testScript = ''
+          start_all()
+          client.wait_for_unit("NetworkManager.service")
+          router.wait_for_unit("freeradius.service")
+          router.wait_for_unit("hostapd.service")
+          router.wait_until_succeeds("journalctl -b --unit freeradius.service | grep \"Sent Access-Accept\"")
+          router.wait_until_succeeds("journalctl -b --unit freeradius.service | grep \"TLS-Client-Cert-Common-Name := \\\"client1.example.com\\\"\"")
+        '';
+      };
+    eapFiles = {
+      name = "eap / 802.1x with secrets in stored in files";
+      nodes = {
+        router = import ./router-eap.nix { inherit eapCerts; };
+        client = clientConfig {
+          environment.etc = {
+            "wpa_supplicant/ca.cert" = {
+              source = "${eapCerts}/ca.cert";
+              user = "wpa_supplicant";
+              mode = "0400";
+            };
+            "wpa_supplicant/client1.cert" = {
+              source = "${eapCerts}/client1.cert";
+              user = "wpa_supplicant";
+              mode = "0400";
+            };
+            "wpa_supplicant/client1.key" = {
+              source = "${eapCerts}/client1.key";
+              user = "wpa_supplicant";
+              mode = "0400";
+            };
+          };
+          networking.networkmanager.ensureProfiles.profiles.default = {
+            ipv4.method = "auto";
+            "802-1x" = {
+              eap = "tls";
+              identity = "client1.example.com";
+              ca-cert = "/etc/wpa_supplicant/ca.cert";
+              client-cert = "/etc/wpa_supplicant/client1.cert";
+              private-key = "/etc/wpa_supplicant/client1.key";
+              private-key-password-flags = "4";
+            };
+          };
+          networking.wireless = {
+            enable = lib.mkOverride 9 true;
+            driver = "wired";
+          };
+        };
+      };
+
+      testScript = ''
+        start_all()
+        client.wait_for_unit("NetworkManager.service")
+        router.wait_for_unit("freeradius.service")
+        router.wait_for_unit("hostapd.service")
+        router.wait_until_succeeds("journalctl -b --unit freeradius.service | grep \"Sent Access-Accept\"")
+        router.wait_until_succeeds("journalctl -b --unit freeradius.service | grep \"TLS-Client-Cert-Common-Name := \\\"client1.example.com\\\"\"")
+      '';
+    };
   };
 in
 lib.mapAttrs (lib.const (
diff --git a/nixos/tests/networking/router-eap.nix b/nixos/tests/networking/router-eap.nix
new file mode 100644
index 000000000000..fac1e5b700f2
--- /dev/null
+++ b/nixos/tests/networking/router-eap.nix
@@ -0,0 +1,146 @@
+{ eapCerts }:
+{ config, pkgs, ... }:
+let
+  radiusDir =
+    let
+      eapConfig = builtins.toFile "eap.conf" ''
+        eap {
+            default_eap_type = tls
+            timer_expire = 60
+            ignore_unknown_eap_types = no
+
+            tls {
+                # Path to CA certificate
+                ca_file = ''${certdir}/ca.cert
+
+                # Path to server certificate and private key
+                certificate_file = ''${certdir}/server.cert
+                private_key_file = ''${certdir}/server.key
+
+                # Enable mutual authentication
+                require_client_cert = yes
+
+                # Cipher suite (example)
+                ciphers = "DEFAULT"
+            }
+        }
+      '';
+      clientsConfig = builtins.toFile "client.conf" ''
+        client localhost {
+          ipaddr = 127.0.0.1
+          secret = insecure
+          require_message_authenticator = no
+        }
+      '';
+
+      # sample users file, not used for eap-tls, only for e.g. eap-ttls
+      usersConfig = builtins.toFile "users.conf" ''
+        testuser	Cleartext-Password := "supersecret"
+      '';
+
+      # this constructs the freeradius config directory
+      # it starts with the upstream config, then overwrites certain files
+      # and uses the generated certs from eapCerts
+      buildScript = pkgs.writeShellApplication {
+        name = "builder";
+
+        runtimeInputs = [ pkgs.coreutils ];
+
+        # https://www.shellcheck.net/wiki/SC2154 -- out is referenced but not assigned.
+        excludeShellChecks = [ "SC2154" ];
+
+        text = ''
+          cp --recursive  ${pkgs.freeradius}/etc/* "$out"
+          chmod +w -R "$out"
+          cp --force ${eapCerts}/ca.cert "$out/certs/ca.cert"
+          cp --force ${eapCerts}/ca.key "$out/certs/ca.key"
+          cp --force ${eapCerts}/server.cert "$out/certs/server.cert"
+          cp --force ${eapCerts}/server.key "$out/certs/server.key"
+          cp --force ${eapConfig} "$out/mods-enabled/eap"
+          cp --force ${usersConfig} "$out/users"
+          cp --force ${clientsConfig} "$out/clients.conf"
+        '';
+      };
+    in
+    derivation {
+      name = "radius_dir";
+      builder = "${pkgs.bash}/bin/bash";
+      args = [ "${buildScript}/bin/builder" ];
+      inherit (pkgs) system;
+    };
+  inherit (pkgs) lib;
+  vlanIfs = lib.range 1 (lib.length config.virtualisation.vlans);
+in
+{
+  virtualisation.vlans = [
+    1
+    2
+    3
+  ];
+  boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = true;
+  networking = {
+    useDHCP = false;
+    useNetworkd = true;
+    firewall.checkReversePath = true;
+    firewall.allowedUDPPorts = [ 547 ];
+    interfaces = lib.mkOverride 0 (
+      lib.listToAttrs (
+        lib.forEach vlanIfs (
+          n:
+          lib.nameValuePair "eth${toString n}" {
+            ipv4.addresses = [
+              {
+                address = "192.168.${toString n}.1";
+                prefixLength = 24;
+              }
+            ];
+            ipv6.addresses = [
+              {
+                address = "fd00:1234:5678:${toString n}::1";
+                prefixLength = 64;
+              }
+            ];
+          }
+        )
+      )
+    );
+  };
+
+  services.freeradius = {
+    enable = true;
+    configDir = radiusDir;
+    debug = true;
+  };
+
+  # upstream nixpkgs hostapd is focused on Wifi
+  systemd.services.hostapd =
+    let
+      hostapdConfig = builtins.toFile "hostapd.conf" ''
+        interface=eth1
+        driver=wired
+        logger_stdout=-1
+        logger_stdout_level=1
+        debug=2
+        dump_file=/tmp/hostapd.dump
+        ieee8021x=1
+        eap_reauth_period=3600
+        use_pae_group_addr=1
+        ##### RADIUS configuration ####################################################
+        own_ip_addr=127.0.0.1
+        nas_identifier=ap.example.com
+        auth_server_addr=127.0.0.1
+        auth_server_port=1812
+        auth_server_shared_secret=insecure
+      '';
+    in
+    {
+      description = "IEEE 802.11 Host Access-Point Daemon";
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        ExecStart = "${pkgs.hostapd}/bin/hostapd ${hostapdConfig}";
+        Restart = "always";
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        RuntimeDirectory = "hostapd";
+      };
+    };
+}
diff --git a/pkgs/applications/audio/mmlgui/default.nix b/pkgs/applications/audio/mmlgui/default.nix
index 18a8cdf57618..40ef6fa5ae23 100644
--- a/pkgs/applications/audio/mmlgui/default.nix
+++ b/pkgs/applications/audio/mmlgui/default.nix
@@ -6,9 +6,9 @@
   pkg-config,
   glfw,
   libvgm,
-  libX11,
-  libXau,
-  libXdmcp,
+  libx11,
+  libxau,
+  libxdmcp,
   cppunit,
 }:
 
@@ -55,9 +55,9 @@ stdenv.mkDerivation {
     libvgm
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
-    libXau
-    libXdmcp
+    libx11
+    libxau
+    libxdmcp
   ];
 
   checkInputs = [
diff --git a/pkgs/applications/audio/open-music-kontrollers/generic.nix b/pkgs/applications/audio/open-music-kontrollers/generic.nix
index a6b601601264..3a632d0fb340 100644
--- a/pkgs/applications/audio/open-music-kontrollers/generic.nix
+++ b/pkgs/applications/audio/open-music-kontrollers/generic.nix
@@ -7,8 +7,8 @@
   ninja,
   lv2,
   sord,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   glew,
   lv2lint,
   pname,
@@ -40,8 +40,8 @@ stdenv.mkDerivation {
   buildInputs = [
     lv2
     sord
-    libX11
-    libXext
+    libx11
+    libxext
     glew
     lv2lint
   ]
diff --git a/pkgs/applications/audio/rakarrack/default.nix b/pkgs/applications/audio/rakarrack/default.nix
index 7bbc20ac0c4c..bcab38ff170d 100644
--- a/pkgs/applications/audio/rakarrack/default.nix
+++ b/pkgs/applications/audio/rakarrack/default.nix
@@ -6,8 +6,8 @@
   alsa-utils,
   fltk,
   libjack2,
-  libXft,
-  libXpm,
+  libxft,
+  libxpm,
   libjpeg,
   libpng,
   libsamplerate,
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
     alsa-utils
     fltk
     libjack2
-    libXft
-    libXpm
+    libxft
+    libxpm
     libjpeg
     libpng
     libsamplerate
diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix
index ea7cbdfe621c..1a76c7b2acbc 100644
--- a/pkgs/applications/audio/zynaddsubfx/default.nix
+++ b/pkgs/applications/audio/zynaddsubfx/default.nix
@@ -36,8 +36,8 @@
   fltk,
   libGL,
   libjpeg,
-  libX11,
-  libXpm,
+  libx11,
+  libxpm,
   ntk,
 
   # Test dependencies
@@ -116,16 +116,16 @@ stdenv.mkDerivation rec {
   ++ lib.optionals (guiModule == "fltk") [
     fltk
     libjpeg
-    libXpm
+    libxpm
   ]
   ++ lib.optionals (guiModule == "ntk") [
     ntk
     cairo
-    libXpm
+    libxpm
   ]
   ++ lib.optionals (guiModule == "zest") [
     libGL
-    libX11
+    libx11
   ];
 
   cmakeFlags = [
diff --git a/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix b/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix
index 63d4e4ffd7d8..7160a2cd1631 100644
--- a/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix
+++ b/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix
@@ -8,7 +8,7 @@
   ruby,
   libGL,
   libuv,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation rec {
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libGL
     libuv
-    libX11
+    libx11
   ];
 
   # Force optimization to fix:
diff --git a/pkgs/applications/display-managers/sddm/unwrapped.nix b/pkgs/applications/display-managers/sddm/unwrapped.nix
index 09fa4c71998d..64296db0c33d 100644
--- a/pkgs/applications/display-managers/sddm/unwrapped.nix
+++ b/pkgs/applications/display-managers/sddm/unwrapped.nix
@@ -7,7 +7,7 @@
   pkg-config,
   qttools,
   libxcb,
-  libXau,
+  libxau,
   pam,
   qtbase,
   qtdeclarative,
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libxcb
-    libXau
+    libxau
     pam
     qtbase
     qtdeclarative
diff --git a/pkgs/applications/editors/android-studio-for-platform/common.nix b/pkgs/applications/editors/android-studio-for-platform/common.nix
index 4e2fce6eb9c2..308e112a8c77 100644
--- a/pkgs/applications/editors/android-studio-for-platform/common.nix
+++ b/pkgs/applications/editors/android-studio-for-platform/common.nix
@@ -25,12 +25,12 @@
   fontsConf,
   fontconfig,
   freetype,
-  libX11,
-  libXext,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXtst,
+  libx11,
+  libxext,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxtst,
   makeFontsConf,
   makeWrapper,
   ncurses5,
@@ -107,14 +107,14 @@ let
             # Crash at startup without these
             fontconfig
             freetype
-            libXext
-            libXi
-            libXrender
-            libXtst
-            libX11
+            libxext
+            libxi
+            libxrender
+            libxtst
+            libx11
 
             # Support multiple monitors
-            libXrandr
+            libxrandr
 
             # For GTKLookAndFeel
             gtk2
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
index b3dbb8e516b4..3724d382ee0c 100644
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@@ -34,7 +34,7 @@
   libpng,
   libuuid,
   libsecret,
-  libX11,
+  libx11,
   libxcb,
   libxkbcommon,
   mesa-demos,
@@ -44,15 +44,15 @@
   libxcb-image,
   libxcb-cursor,
   libxkbfile,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXtst,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxtst,
   makeWrapper,
   ncurses5,
   nspr,
@@ -141,10 +141,10 @@ let
             # Crash at startup without these
             fontconfig
             freetype
-            libXext
-            libXi
-            libXrender
-            libXtst
+            libxext
+            libxi
+            libxrender
+            libxtst
             libsecret
 
             # No crash, but attempted to load at startup
@@ -159,7 +159,7 @@ let
             zlib
             pkgsi686Linux.zlib
             # Support multiple monitors
-            libXrandr
+            libxrandr
 
             # For Android emulator
             alsa-lib
@@ -168,7 +168,7 @@ let
             libbsd
             libpulseaudio
             libuuid
-            libX11
+            libx11
             libxcb
             libxkbcommon
             libxcb-wm
@@ -179,10 +179,10 @@ let
             libice
             libsm
             libxkbfile
-            libXcomposite
-            libXcursor
-            libXdamage
-            libXfixes
+            libxcomposite
+            libxcursor
+            libxdamage
+            libxfixes
             libGL
             libdrm
             libpng
diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix
index 15188aa9f1ac..2c690523e9f4 100644
--- a/pkgs/applications/editors/cudatext/default.nix
+++ b/pkgs/applications/editors/cudatext/default.nix
@@ -5,7 +5,7 @@
   coreutils,
   lazarus,
   fpc,
-  libX11,
+  libx11,
 
   # GTK2/3
   pango,
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
   ++ lib.optional (widgetset == "qt5") libsForQt5.wrapQtAppsHook;
 
   buildInputs = [
-    libX11
+    libx11
   ]
   ++ lib.optionals (lib.hasPrefix "gtk" widgetset) [
     pango
diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix
index 74b728362170..b43949c12542 100644
--- a/pkgs/applications/editors/eclipse/build-eclipse.nix
+++ b/pkgs/applications/editors/eclipse/build-eclipse.nix
@@ -4,14 +4,14 @@
   makeDesktopItem,
   freetype,
   fontconfig,
-  libX11,
-  libXrender,
+  libx11,
+  libxrender,
   zlib,
   jdk,
   glib,
   glib-networking,
   gtk,
-  libXtst,
+  libxtst,
   libsecret,
   gsettings-desktop-schemas,
   webkitgtk_4_1,
@@ -52,9 +52,9 @@ stdenv.mkDerivation rec {
     gsettings-desktop-schemas
     gtk
     jdk
-    libX11
-    libXrender
-    libXtst
+    libx11
+    libxrender
+    libxtst
     libsecret
     zlib
   ]
@@ -73,8 +73,8 @@ stdenv.mkDerivation rec {
       lib.makeLibraryPath [
         freetype
         fontconfig
-        libX11
-        libXrender
+        libx11
+        libxrender
         zlib
       ]
     } $libCairo
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
           [
             glib
             gtk
-            libXtst
+            libxtst
             libsecret
           ]
           ++ lib.optional (webkitgtk_4_1 != null) webkitgtk_4_1
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 5eb5d8029bef..a707927a54b4 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -6,12 +6,12 @@
   makeWrapper,
   freetype,
   fontconfig,
-  libX11,
-  libXrender,
+  libx11,
+  libxrender,
   zlib,
   glib,
   gtk3,
-  libXtst,
+  libxtst,
   jdk,
   gsettings-desktop-schemas,
   webkitgtk_4_1 ? null, # for internal web browser
@@ -56,13 +56,13 @@ let
       makeDesktopItem
       freetype
       fontconfig
-      libX11
-      libXrender
+      libx11
+      libxrender
       zlib
       jdk
       glib
       gtk
-      libXtst
+      libxtst
       gsettings-desktop-schemas
       webkitgtk_4_1
       makeWrapper
diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix
index f9e5c7367dcd..431a30956430 100644
--- a/pkgs/applications/editors/emacs/make-emacs.nix
+++ b/pkgs/applications/editors/emacs/make-emacs.nix
@@ -30,12 +30,12 @@
   harfbuzz,
   imagemagick,
   jansson,
-  libXaw,
-  libXcursor,
-  libXft,
-  libXi,
-  libXpm,
-  libXrandr,
+  libxaw,
+  libxcursor,
+  libxft,
+  libxi,
+  libxpm,
+  libxrandr,
   libgccjit,
   libjpeg,
   libotf,
@@ -314,7 +314,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals withPgtk [
     giflib
     gtk3
-    libXpm
+    libxpm
     libjpeg
     libpng
     librsvg
@@ -335,9 +335,9 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals withX [
     Xaw3d
     giflib
-    libXaw
-    libXpm
-    libXrandr
+    libxaw
+    libxpm
+    libxrandr
     libjpeg
     libpng
     librsvg
@@ -347,10 +347,10 @@ stdenv.mkDerivation (finalAttrs: {
     cairo
   ]
   ++ lib.optionals (withX && !withCairo) [
-    libXft
+    libxft
   ]
   ++ lib.optionals withXinput2 [
-    libXi
+    libxi
   ]
   ++ lib.optionals withWebkitgtk [
     webkitgtk_4_1
@@ -485,7 +485,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   postFixup = lib.optionalString (stdenv.hostPlatform.isLinux && withX && toolkit == "lucid") ''
-    patchelf --add-rpath ${lib.makeLibraryPath [ libXcursor ]} $out/bin/emacs
+    patchelf --add-rpath ${lib.makeLibraryPath [ libxcursor ]} $out/bin/emacs
     patchelf --add-needed "libXcursor.so.1" "$out/bin/emacs"
   '';
 
diff --git a/pkgs/applications/editors/jetbrains/builder/linux.nix b/pkgs/applications/editors/jetbrains/builder/linux.nix
index 5194df00de23..5e4d2377ca89 100644
--- a/pkgs/applications/editors/jetbrains/builder/linux.nix
+++ b/pkgs/applications/editors/jetbrains/builder/linux.nix
@@ -21,7 +21,7 @@
   glibcLocales,
   fontconfig,
   libGL,
-  libX11,
+  libx11,
 
   jdk,
   vmopts ? null,
@@ -85,7 +85,7 @@ lib.extendMkDerivation {
         stdenv.cc.cc
         fontconfig
         libGL
-        libX11
+        libx11
       ];
 
       nativeBuildInputs = nativeBuildInputs ++ [
diff --git a/pkgs/applications/editors/jetbrains/ides/rider.nix b/pkgs/applications/editors/jetbrains/ides/rider.nix
index c7db457d1740..dad1f9b73c8f 100644
--- a/pkgs/applications/editors/jetbrains/ides/rider.nix
+++ b/pkgs/applications/editors/jetbrains/ides/rider.nix
@@ -12,7 +12,7 @@
   musl,
   libice,
   libsm,
-  libX11,
+  libx11,
   dotnetCorePackages,
   libxcb-keysyms,
   expat,
@@ -75,7 +75,7 @@ in
     # Avalonia dependencies needed for dotMemory
     libice
     libsm
-    libX11
+    libx11
   ];
 
   # NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed
diff --git a/pkgs/applications/editors/vim/full.nix b/pkgs/applications/editors/vim/full.nix
index 7ea0de1676ae..e2d251d93b99 100644
--- a/pkgs/applications/editors/vim/full.nix
+++ b/pkgs/applications/editors/vim/full.nix
@@ -16,14 +16,14 @@
   perl,
   tcl,
   ruby,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   libsm,
-  libXpm,
-  libXt,
-  libXaw,
-  libXau,
-  libXmu,
+  libxpm,
+  libxt,
+  libxaw,
+  libxau,
+  libxmu,
   libsodium,
   libice,
   wayland-scanner,
@@ -179,13 +179,13 @@ stdenv.mkDerivation {
   ++ lib.optionals (guiSupport == "gtk2" || guiSupport == "gtk3") [
     libsm
     libice
-    libX11
-    libXext
-    libXpm
-    libXt
-    libXaw
-    libXau
-    libXmu
+    libx11
+    libxext
+    libxpm
+    libxt
+    libxaw
+    libxau
+    libxmu
   ]
   ++ lib.optional (guiSupport == "gtk2") gtk2-x11
   ++ lib.optional (guiSupport == "gtk3") gtk3-x11
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index d679909fe41b..0ebd96e5cff6 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -15188,6 +15188,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  telescope-ast-grep-nvim = buildVimPlugin {
+    pname = "telescope-ast-grep.nvim";
+    version = "0-unstable-2023-11-05";
+    src = fetchFromGitHub {
+      owner = "ray-x";
+      repo = "telescope-ast-grep.nvim";
+      rev = "fa7d7fa5c723b57bba333429224e99fde2a63632";
+      hash = "sha256-WPzFG8gdf0XzxsFkxgseOy6GQBu9C2KDOXeasdct0F8=";
+    };
+    meta.homepage = "https://github.com/ray-x/telescope-ast-grep.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   telescope-asynctasks-nvim = buildVimPlugin {
     pname = "telescope-asynctasks.nvim";
     version = "0-unstable-2022-04-09";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 2508344be1c9..b09cba248435 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -1166,6 +1166,7 @@ https://github.com/wellle/targets.vim/,,
 https://github.com/tbabej/taskwiki/,,
 https://github.com/tomtom/tcomment_vim/,,
 https://github.com/nvim-telekasten/telekasten.nvim/,,
+https://github.com/ray-x/telescope-ast-grep.nvim/,HEAD,
 https://github.com/GustavoKatel/telescope-asynctasks.nvim/,,
 https://github.com/nvim-telescope/telescope-cheat.nvim/,,
 https://github.com/fannheyward/telescope-coc.nvim/,,
diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index 7ce5e1474f52..95edf0d6a43c 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-code";
     publisher = "anthropic";
-    version = "2.1.25";
-    hash = "sha256-9x9wDngiHfjUHTsUEraF7pUjbHlmcT7VotiPV9bPwIo=";
+    version = "2.1.34";
+    hash = "sha256-qCvgb2fs0t3hlI36egvlZYem8CzUKIAipaEZOumDtWk=";
   };
 
   postInstall = ''
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index ddb6425a6ec1..ddbd0672dbb1 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -481,8 +481,8 @@ let
         mktplcRef = {
           publisher = "ban";
           name = "spellright";
-          version = "3.0.146";
-          hash = "sha256-gvj5vWA8VAy5Ohtkn9vsx7MswgVAcxYOLm+ifKhjLz0=";
+          version = "3.0.148";
+          hash = "sha256-h1xKEpKg4j7mGw3EQQDPZBDBDY/xjk2lsGk0ktd2ems=";
         };
         meta = {
           description = "Visual Studio Code extension for Spellchecker";
@@ -675,8 +675,8 @@ let
         mktplcRef = {
           name = "markdown-mermaid";
           publisher = "bierner";
-          version = "1.31.0";
-          hash = "sha256-7KpyUXR3a7ZD9bcdJ4t5HRjSAlUww8q6XSOcxHCN4Cw=";
+          version = "1.31.1";
+          hash = "sha256-K3UXNT3MpGlhyHcx0AYAkCPEJIbYIu3e/ucIAQLwoEQ=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/bierner.markdown-mermaid/changelog";
@@ -727,8 +727,8 @@ let
         mktplcRef = {
           name = "vscode-intelephense-client";
           publisher = "bmewburn";
-          version = "1.16.1";
-          hash = "sha256-dcfFtVnk5qyCeiM0nZwscKQZDhUXIkg1TJxVUuzA69Q=";
+          version = "1.16.5";
+          hash = "sha256-ppWHZFQfC2bje1rNZh8Pu+BKQdAI60kpxRwUg8EfD8M=";
         };
         meta = {
           description = "PHP code intelligence for Visual Studio Code";
@@ -1727,8 +1727,8 @@ let
         mktplcRef = {
           name = "foam-vscode";
           publisher = "foam";
-          version = "0.29.1";
-          hash = "sha256-U5DkTMNLoE9TDCa+Womml9ilv162FqVsnkyGsJ80+Ag=";
+          version = "0.29.2";
+          hash = "sha256-6Bga51DCHaVn+UV5RPCE7uFsAei/F0xN4Mk4dm52FWs=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog";
@@ -1965,8 +1965,8 @@ let
         mktplcRef = {
           name = "gitlab-workflow";
           publisher = "gitlab";
-          version = "6.67.5";
-          hash = "sha256-xttk9mP5XIeeymE0l0TI+JsC862yOaEuwb6HscDyRMU=";
+          version = "6.68.1";
+          hash = "sha256-ZNdtaVo3KFGhGX99fGv/aSUcjy636W5e4DctPCMrRtY=";
         };
         meta = {
           description = "GitLab extension for Visual Studio Code";
@@ -4840,8 +4840,8 @@ let
         mktplcRef = {
           name = "uiua-vscode";
           publisher = "uiua-lang";
-          version = "0.0.67";
-          hash = "sha256-Q/wJZ+ObCU+hRpZZKQGQtdt99/I6QHkSuHlNy7oe5Pk=";
+          version = "0.0.68";
+          hash = "sha256-5qzMT7aue8PO4mpMsoBc/18J7yhxrmKwA+KE+LeK0mU=";
         };
         meta = {
           description = "VSCode language extension for Uiua";
@@ -5215,8 +5215,8 @@ let
         mktplcRef = {
           name = "csharp-ls";
           publisher = "vytautassurvila";
-          version = "0.0.29";
-          hash = "sha256-0gh7q/F69OD/soRuZHHxC9PRtOXJmjZjei6IbV82Rgs=";
+          version = "0.0.30";
+          hash = "sha256-BVSazrQxVm4yYBVdtFP3Aojl06xI2msFXIGw64LeePY=";
         };
         meta = {
           changelog = "https://github.com/vytautassurvila/vscode-csharp-ls/blob/master/CHANGELOG.md";
diff --git a/pkgs/applications/editors/vscode/extensions/language-packs.nix b/pkgs/applications/editors/vscode/extensions/language-packs.nix
index 050d388b5c6f..b0d8acc2c338 100644
--- a/pkgs/applications/editors/vscode/extensions/language-packs.nix
+++ b/pkgs/applications/editors/vscode/extensions/language-packs.nix
@@ -13,7 +13,7 @@ let
   buildVscodeLanguagePack =
     {
       language,
-      version ? "1.105.2025100809",
+      version ? "1.108.2026012809",
       hash,
     }:
     buildVscodeMarketplaceExtension {
@@ -41,71 +41,71 @@ in
   # French
   vscode-language-pack-fr = buildVscodeLanguagePack {
     language = "fr";
-    hash = "sha256-HFpkXUYz7//5KlKe1NjiT/KBFBar9H5ivpltqGOTHJo=";
+    hash = "sha256-1+aWgvoXR/FqhnIn3OrLOC11jLXVWlO2yecpzr2Waww=";
   };
   # Italian
   vscode-language-pack-it = buildVscodeLanguagePack {
     language = "it";
-    hash = "sha256-YD1jTB9VzWF51QaFPRsEBC1pMkgrs2cl0HFA/PFz3ro=";
+    hash = "sha256-t6jN3qok7B4/G/IjEXD6THO6c+8X+1gxny6W7qdh5mI=";
   };
   # German
   vscode-language-pack-de = buildVscodeLanguagePack {
     language = "de";
-    hash = "sha256-hIw0nFdYgcyOuJW8k7HRS0sKc0Gsuh7YWyLwQ3Z1FkU=";
+    hash = "sha256-rZM/T1gbYrtcHNLW0itNdhKcRR938PwK5VBN0xLDIWg=";
   };
   # Spanish
   vscode-language-pack-es = buildVscodeLanguagePack {
     language = "es";
-    hash = "sha256-iO+1Lq/vXkMCGNnj9CovBhLPtbuJtGHSfQnjXypRBcw=";
+    hash = "sha256-PG3oOCjWRgh1ox6GAPRdZdf8QNP1JsJZznJnM+2Ihl0=";
   };
   # Russian
   vscode-language-pack-ru = buildVscodeLanguagePack {
     language = "ru";
-    hash = "sha256-HxTStM+g/XKJH1twNYMu/V7IM7vBlYF4mfcemV+oOQI=";
+    hash = "sha256-RPpNet015xGnOszcKfehP9VxnfDAnQJ2A62rVtNBDew=";
   };
   # Chinese (Simplified)
   vscode-language-pack-zh-hans = buildVscodeLanguagePack {
     language = "zh-hans";
-    hash = "sha256-nCPu7pEXpM22M+2IMtuPgxzyEF3R6MPm2CVZAccPdAU=";
+    hash = "sha256-pm1dCoK4YM8XBM/O6p42R4PYy5f95sLcECHJMAKFt9Q=";
   };
   # Chinese (Traditional)
   vscode-language-pack-zh-hant = buildVscodeLanguagePack {
     language = "zh-hant";
-    hash = "sha256-JKKqrwGn/EMDMot1cIgLpekUVQf4IY+snENeKoE5jYU=";
+    hash = "sha256-cSM+2W5aCUA77kxgV7vyk7KAoSlkeT+y56ziIPjP9II=";
   };
   # Japanese
   vscode-language-pack-ja = buildVscodeLanguagePack {
     language = "ja";
-    hash = "sha256-6OWcr/XnJsOvRFho+P5Z+ppuAC8d08I3s0YWnLhH874=";
+    hash = "sha256-UfMMLKHi48Qhgm8PXFAfGFQFX6e8vQsl/RYqha42TOc=";
   };
   # Korean
   vscode-language-pack-ko = buildVscodeLanguagePack {
     language = "ko";
-    hash = "sha256-VqlAaS679KF0ZKlzDT55FIu5GKyzU41y1ptX7t88UHc=";
+    hash = "sha256-gneZF4CIEDy88juFZBiB9/o/rzTnu2du4aiZ+NH+XlE=";
   };
   # Czech
   vscode-language-pack-cs = buildVscodeLanguagePack {
     language = "cs";
-    hash = "sha256-yFtp+XK7Y2Fi/uYqsh88d3hCRcQJhJOLWvs2pQ05ddo=";
+    hash = "sha256-ojh2KBEpTTJsAgM2RilGO58kkcWgaFf5nkiiZ4gYNtg=";
   };
   # Portuguese (Brazil)
   vscode-language-pack-pt-br = buildVscodeLanguagePack {
     language = "pt-BR";
-    hash = "sha256-2zM8E832ioa6fqnWzPq+PA/eiEAo8FDNNH/4HJPZIcI=";
+    hash = "sha256-n55nI9gCxNpr6Pq70qJnmgp2rs0Gcblirg4SaeXAXtE=";
   };
   # Turkish
   vscode-language-pack-tr = buildVscodeLanguagePack {
     language = "tr";
-    hash = "sha256-7ghSb/sQM64wfsRRtS+quAqJEvUdIXAcPCQKJbsDXKc=";
+    hash = "sha256-S6orhrfCaA4aeLhW3+rdaJb4X8h7IUjfBC9A+QgiQgk=";
   };
   # Polish
   vscode-language-pack-pl = buildVscodeLanguagePack {
     language = "pl";
-    hash = "sha256-/joZpsIAY9Ut67wAbzNTraBgBgtjDAeRoq8PUbP3rSc=";
+    hash = "sha256-YoNl44f2jEYXIhDKz+xU5fzt/JD6l86dtbqXFKOzHrk=";
   };
   # Pseudo Language
   vscode-language-pack-qps-ploc = buildVscodeLanguagePack {
     language = "qps-ploc";
-    hash = "sha256-xERSh5N5Mbyc977ji0n91ra0RV9ZldJKBzc3IWYWYyo=";
+    hash = "sha256-onc+lk6itrWP5J17eVLIMcpG1gDM/rpTzKci8m2uBcY=";
   };
 }
diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix
index 89242a851ca3..9887ca490d02 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "debugpy";
     publisher = "ms-python";
-    version = "2025.16.0";
-    hash = "sha256-QPIDUzzwIfzyicsCwqU2u6hVSjCJMInHhHMBqvL8tYs=";
+    version = "2025.18.0";
+    hash = "sha256-UegvlhgIjbwv9SgZIdtzX8FDOL9qjBLOFm0jaTexNrQ=";
   };
 
   meta = {
diff --git a/pkgs/applications/editors/vscode/extensions/ndonfris.fish-lsp/default.nix b/pkgs/applications/editors/vscode/extensions/ndonfris.fish-lsp/default.nix
index f5839175e689..099e2a4b2ca8 100644
--- a/pkgs/applications/editors/vscode/extensions/ndonfris.fish-lsp/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ndonfris.fish-lsp/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "ndonfris";
     name = "fish-lsp";
-    version = "0.1.18";
-    hash = "sha256-skNFNiVx7g/lpsxegTync9yEjt+h/Eb+5TnByeLXSPY=";
+    version = "0.1.19";
+    hash = "sha256-xvt8pI+Esqm4klOzSa2GPd4y00lTED5uN+VFCHTY56w=";
   };
 
   meta = {
diff --git a/pkgs/applications/emulators/kega-fusion/default.nix b/pkgs/applications/emulators/kega-fusion/default.nix
index fd5ed5924b27..fda1ee74cebd 100644
--- a/pkgs/applications/emulators/kega-fusion/default.nix
+++ b/pkgs/applications/emulators/kega-fusion/default.nix
@@ -10,10 +10,10 @@
   gtk2,
   alsa-lib,
   libsm,
-  libX11,
+  libx11,
   gdk-pixbuf,
   pango,
-  libXinerama,
+  libxinerama,
   mpg123,
   runtimeShell,
 }:
@@ -27,10 +27,10 @@ let
     gtk2
     alsa-lib
     libsm
-    libX11
+    libx11
     gdk-pixbuf
     pango
-    libXinerama
+    libxinerama
   ];
 
 in
diff --git a/pkgs/applications/emulators/libretro/cores/citra.nix b/pkgs/applications/emulators/libretro/cores/citra.nix
index b2723c025be9..8b076fa54829 100644
--- a/pkgs/applications/emulators/libretro/cores/citra.nix
+++ b/pkgs/applications/emulators/libretro/cores/citra.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   libGL,
   libGLU,
-  libX11,
+  libx11,
   mkLibretroCore,
 }:
 mkLibretroCore {
@@ -29,7 +29,7 @@ mkLibretroCore {
   extraBuildInputs = [
     libGL
     libGLU
-    libX11
+    libx11
   ];
 
   extraNativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/emulators/libretro/cores/snes9x.nix b/pkgs/applications/emulators/libretro/cores/snes9x.nix
index e6b78a5635e5..da8a3a0d8ef3 100644
--- a/pkgs/applications/emulators/libretro/cores/snes9x.nix
+++ b/pkgs/applications/emulators/libretro/cores/snes9x.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "snes9x";
-  version = "0-unstable-2026-01-26";
+  version = "0-unstable-2026-02-03";
 
   src = fetchFromGitHub {
     owner = "snes9xgit";
     repo = "snes9x";
-    rev = "830d8552551d7a71e9d084f727dc15cf15d9796c";
-    hash = "sha256-Xu3s1z4Pab71D2orv7HyL8b3E59AnQEAil0XeWKfKdw=";
+    rev = "02f642cdadfaa8f9fa7ec674382d6c70a8b534d6";
+    hash = "sha256-4BqWxchxdq8pbWw3Iql786Iu/OY5VMT1pF8wowI26h0=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix
index aad123a10c56..9db7a75cc8f6 100644
--- a/pkgs/applications/emulators/mame/default.nix
+++ b/pkgs/applications/emulators/mame/default.nix
@@ -12,8 +12,8 @@
   fontconfig,
   glm,
   installShellFiles,
-  libXi,
-  libXinerama,
+  libxi,
+  libxinerama,
   libjpeg,
   libpcap,
   libpulseaudio,
@@ -93,8 +93,8 @@ stdenv.mkDerivation rec {
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
     libpulseaudio
-    libXinerama
-    libXi
+    libxinerama
+    libxi
     fontconfig
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix
index ff6a01114671..734cc4cf2815 100644
--- a/pkgs/applications/emulators/wine/base.nix
+++ b/pkgs/applications/emulators/wine/base.nix
@@ -18,7 +18,7 @@
   pkg-config,
   nixosTests,
   supportFlags,
-  wineRelease,
+  pnameSuffix ? "",
   patches,
   moltenvk,
   buildScript ? null,
@@ -95,9 +95,7 @@ stdenv.mkDerivation (
   // {
     inherit version src;
 
-    pname =
-      prevName
-      + lib.optionalString (wineRelease != "stable" && wineRelease != "unstable") "-${wineRelease}";
+    pname = prevName + pnameSuffix;
 
     # Fixes "Compiler cannot create executables" building wineWow with mingwSupport
     strictDeps = true;
@@ -267,7 +265,8 @@ stdenv.mkDerivation (
         )
       )
     );
-    env.NIX_CFLAGS_COMPILE = lib.optionalString (wineRelease == "yabridge") "-std=gnu17";
+    # Just here to avoid rebuilds for now.
+    env.NIX_CFLAGS_COMPILE = "";
 
     # Don't shrink the ELF RPATHs in order to keep the extra RPATH
     # elements specified above.
diff --git a/pkgs/applications/emulators/wine/default.nix b/pkgs/applications/emulators/wine/default.nix
index 1d34ce36b5b1..5244bc9ea7e5 100644
--- a/pkgs/applications/emulators/wine/default.nix
+++ b/pkgs/applications/emulators/wine/default.nix
@@ -48,11 +48,38 @@
 }:
 
 let
-  wine-build =
-    build:
-    lib.getAttr build (
-      callPackage ./packages.nix {
-        inherit wineRelease;
+  sources = callPackage ./sources.nix { };
+
+  # Map user-facing release names to sources, pname suffix, and staging flag
+  releaseInfo = {
+    stable = {
+      src = sources.stable;
+      useStaging = false;
+    };
+    unstable = {
+      src = sources.unstable;
+      useStaging = false;
+    };
+    # Many versions have a "staging" variant, but when we say "staging",
+    # the version we want to use is "unstable".
+    staging = {
+      src = sources.unstable;
+      pnameSuffix = "-staging";
+      useStaging = true;
+    };
+    # "yabridge" enables staging too --- we are not interested in
+    # yabridge without the staging patches applied.
+    yabridge = {
+      src = sources.yabridge;
+      pnameSuffix = "-yabridge";
+      useStaging = true;
+    };
+  };
+
+  baseWine = lib.getAttr wineBuild (
+    callPackage ./packages.nix (
+      releaseInfo.${wineRelease}
+      // {
         supportFlags = {
           inherit
             alsaSupport
@@ -90,6 +117,14 @@ let
         };
         inherit moltenvk;
       }
-    );
+    )
+  );
 in
-wine-build wineBuild
+if wineRelease == "yabridge" then
+  baseWine.overrideAttrs (old: {
+    env = old.env // {
+      NIX_CFLAGS_COMPILE = "-std=gnu17";
+    };
+  })
+else
+  baseWine
diff --git a/pkgs/applications/emulators/wine/packages.nix b/pkgs/applications/emulators/wine/packages.nix
index 6070c68b64c2..db91a073baec 100644
--- a/pkgs/applications/emulators/wine/packages.nix
+++ b/pkgs/applications/emulators/wine/packages.nix
@@ -7,7 +7,9 @@
   callPackage,
   replaceVars,
   moltenvk,
-  wineRelease ? "stable",
+  src,
+  pnameSuffix ? "",
+  useStaging ? false,
   supportFlags,
   # Staging native build deps
   autoconf,
@@ -18,19 +20,6 @@
 }:
 
 let
-  sources = callPackage ./sources.nix { };
-
-  # "staging" of course enables staging, but for "yabridge" we do too
-  # --- we are not interested in yabridge without the staging patches
-  # applied.
-  useStaging = wineRelease == "staging" || wineRelease == "yabridge";
-
-  # Map wineRelease to actual source. Many versions have a "staging"
-  # variant, but when we say "staging", the version we want to use is
-  # "unstable".
-  baseRelease = if wineRelease == "staging" then "unstable" else wineRelease;
-
-  src = lib.getAttr baseRelease (callPackage ./sources.nix { });
   inherit (src)
     version
     patches
@@ -48,7 +37,7 @@ in
       supportFlags
       patches
       moltenvk
-      wineRelease
+      pnameSuffix
       useStaging
       # Forcing these `nativeBuildInputs` used in the `staging` to come
       # from ambient `pkgs`, rather than being provided by
@@ -76,7 +65,7 @@ in
       supportFlags
       patches
       moltenvk
-      wineRelease
+      pnameSuffix
       useStaging
       ;
     pkgArches = [ pkgs ];
@@ -98,7 +87,7 @@ in
       supportFlags
       patches
       moltenvk
-      wineRelease
+      pnameSuffix
       useStaging
       ;
     stdenv = stdenv_32bit;
@@ -132,7 +121,7 @@ in
       version
       patches
       moltenvk
-      wineRelease
+      pnameSuffix
       useStaging
       ;
     supportFlags = supportFlags // {
diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix
index fdb6fffad5be..223fdba8014c 100644
--- a/pkgs/applications/emulators/wine/sources.nix
+++ b/pkgs/applications/emulators/wine/sources.nix
@@ -254,8 +254,8 @@ rec {
 
   winetricks = fetchFromGitHub rec {
     # https://github.com/Winetricks/winetricks/releases
-    version = "20250102";
-    hash = "sha256-Km2vVTYsLs091cjmNTW8Kqku3vdsEA0imTtZfqZWDQo=";
+    version = "20260125";
+    hash = "sha256-uIBVESebsH7rXnxWd/qlrZxcG7Y486PctHzcLz29HDk=";
     owner = "Winetricks";
     repo = "winetricks";
     rev = version;
diff --git a/pkgs/applications/emulators/wine/winetricks.nix b/pkgs/applications/emulators/wine/winetricks.nix
index 76e9ee4b621f..76a3eef7a497 100644
--- a/pkgs/applications/emulators/wine/winetricks.nix
+++ b/pkgs/applications/emulators/wine/winetricks.nix
@@ -2,20 +2,23 @@
   lib,
   stdenv,
   callPackage,
-  perl,
-  which,
-  coreutils,
-  zenity,
-  curl,
-  cabextract,
-  unzip,
-  p7zip,
-  gnused,
-  gnugrep,
+  makeWrapper,
   bash,
+  cabextract,
+  coreutils,
+  curl,
   gawk,
+  gnugrep,
+  gnused,
   gnutar,
   gzip,
+  p7zip,
+  perl,
+  unzip,
+  which,
+  zenity,
+  unrar-free,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation rec {
@@ -27,36 +30,49 @@ stdenv.mkDerivation rec {
   buildInputs = [
     perl
     which
-  ];
-
-  # coreutils is for sha1sum
-  pathAdd = lib.makeBinPath [
-    perl
-    which
-    coreutils
-    zenity
-    curl
-    cabextract
-    unzip
-    p7zip
-    gnused
-    gnugrep
-    bash
-    gawk
-    gnutar
-    gzip
+    makeWrapper
   ];
 
   makeFlags = [ "PREFIX=$(out)" ];
 
   doCheck = false; # requires "bashate"
 
-  postInstall = ''
-    sed -i \
-      -e '2i PATH="${pathAdd}:$PATH"' \
-      "$out/bin/winetricks"
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  postPatch = ''
+    patchShebangs src/winetricks
+    substituteInPlace src/winetricks \
+      --replace-fail 'command -v unrar' 'command -v unrar-free' \
+      --replace-fail 'w_try unrar' 'w_try unrar-free'
   '';
 
+  postInstall =
+    let
+      runtimeDependencies = [
+        bash
+        cabextract
+        coreutils
+        curl
+        gawk
+        gnugrep
+        gnused
+        gnutar
+        gzip
+        p7zip
+        perl
+        unrar-free
+        unzip
+        which
+        zenity
+      ];
+    in
+    ''
+      wrapProgram $out/bin/winetricks \
+        --prefix PATH : "${lib.makeBinPath runtimeDependencies}" \
+        --set WINETRICKS_LATEST_VERSION_CHECK "disabled"
+    '';
+
   passthru = {
     inherit (src) updateScript;
   };
diff --git a/pkgs/applications/emulators/zsnes/2.x.nix b/pkgs/applications/emulators/zsnes/2.x.nix
index ead5cd4289f4..5a313443fee7 100644
--- a/pkgs/applications/emulators/zsnes/2.x.nix
+++ b/pkgs/applications/emulators/zsnes/2.x.nix
@@ -6,7 +6,7 @@
   libGL,
   libGLU,
   libpng,
-  libX11,
+  libx11,
   nasm,
   pkg-config,
   zlib,
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     libGL
     libGLU
     libpng
-    libX11
+    libx11
     zlib
   ];
 
diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix
index 6721d21baa54..539291870208 100644
--- a/pkgs/applications/graphics/ImageMagick/6.x.nix
+++ b/pkgs/applications/graphics/ImageMagick/6.x.nix
@@ -9,9 +9,9 @@
   zlibSupport ? true,
   zlib,
   libX11Support ? !stdenv.hostPlatform.isMinGW,
-  libX11,
+  libx11,
   libXtSupport ? !stdenv.hostPlatform.isMinGW,
-  libXt,
+  libxt,
   fontconfigSupport ? true,
   fontconfig,
   freetypeSupport ? true,
@@ -130,8 +130,8 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional freetypeSupport freetype
   ++ lib.optional libjpegSupport libjpeg
   ++ lib.optional lcms2Support lcms2
-  ++ lib.optional libX11Support libX11
-  ++ lib.optional libXtSupport libXt
+  ++ lib.optional libX11Support libx11
+  ++ lib.optional libXtSupport libxt
   ++ lib.optional libwebpSupport libwebp;
 
   doCheck = false; # fails 2 out of 76 tests
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 0f4e87c9056f..6862b5461960 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -9,9 +9,9 @@
   zlibSupport ? true,
   zlib,
   libX11Support ? !stdenv.hostPlatform.isMinGW,
-  libX11,
+  libx11,
   libXtSupport ? !stdenv.hostPlatform.isMinGW,
-  libXt,
+  libxt,
   fontconfigSupport ? true,
   fontconfig,
   freetypeSupport ? true,
@@ -158,8 +158,8 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional freetypeSupport freetype
   ++ lib.optional libjpegSupport libjpeg
   ++ lib.optional lcms2Support lcms2
-  ++ lib.optional libX11Support libX11
-  ++ lib.optional libXtSupport libXt
+  ++ lib.optional libX11Support libx11
+  ++ lib.optional libXtSupport libxt
   ++ lib.optional libwebpSupport libwebp
   ++ lib.optional fftwSupport fftw;
 
diff --git a/pkgs/applications/graphics/imlibsetroot/default.nix b/pkgs/applications/graphics/imlibsetroot/default.nix
index bfc91646471d..a019120e2fc6 100644
--- a/pkgs/applications/graphics/imlibsetroot/default.nix
+++ b/pkgs/applications/graphics/imlibsetroot/default.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
   libxinerama,
   imlib2,
 }:
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    libX11
+    libx11
     imlib2
     libxinerama
   ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
 
     gcc -g imlibsetroot.c -o imlibsetroot              \
       -I${imlib2.dev}/include -L${imlib2}/lib -lImlib2 \
-      -I${libX11.dev}/include -lXinerama -lX11
+      -I${libx11.dev}/include -lXinerama -lX11
 
     runHook postBuild
   '';
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index a54fc5d1685c..9d3738d17752 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -32,7 +32,7 @@
   libsigcxx,
   libvisio,
   libwpg,
-  libXft,
+  libxft,
   libxml2,
   libxslt,
   readline,
@@ -160,7 +160,7 @@ stdenv.mkDerivation (finalAttrs: {
     libsigcxx
     libvisio
     libwpg
-    libXft
+    libxft
     libxml2
     libxslt
     readline
diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix
index 644aa457acba..2c6d63d0e918 100644
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@@ -12,14 +12,14 @@
   libdatrie,
   libxkbcommon,
   libepoxy,
-  libXtst,
+  libxtst,
   wrapGAppsHook3,
   makeWrapper,
   pixman,
   libpthread-stubs,
   gtkmm3,
-  libXau,
-  libXdmcp,
+  libxau,
+  libxdmcp,
   lcms2,
   libiptcdata,
   fftw,
@@ -81,12 +81,12 @@ stdenv.mkDerivation rec {
     libdatrie
     libxkbcommon
     libepoxy
-    libXtst
+    libxtst
     pixman
     libpthread-stubs
     gtkmm3
-    libXau
-    libXdmcp
+    libxau
+    libxdmcp
     lcms2
     libiptcdata
     fftw
diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix
index 21c34ad95c6c..509f21e65a47 100644
--- a/pkgs/applications/graphics/sane/frontends.nix
+++ b/pkgs/applications/graphics/sane/frontends.nix
@@ -5,7 +5,7 @@
   fetchpatch,
   autoconf,
   sane-backends,
-  libX11,
+  libx11,
   gtk2,
   pkg-config,
   libusb-compat-0_1 ? null,
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     sane-backends
-    libX11
+    libx11
     gtk2
   ]
   ++ lib.optional (libusb-compat-0_1 != null) libusb-compat-0_1;
diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix
index 4fcd2792617e..a4d12da344e4 100644
--- a/pkgs/applications/graphics/sxiv/default.nix
+++ b/pkgs/applications/graphics/sxiv/default.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libXft,
+  libxft,
   imlib2,
   giflib,
   libexif,
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   preBuild = lib.optionalString (conf != null) "cp ${configFile} config.def.h";
 
   buildInputs = [
-    libXft
+    libxft
     imlib2
     giflib
     libexif
diff --git a/pkgs/applications/graphics/unigine-sanctuary/default.nix b/pkgs/applications/graphics/unigine-sanctuary/default.nix
index dbbccc45c736..503cbdd28cfa 100644
--- a/pkgs/applications/graphics/unigine-sanctuary/default.nix
+++ b/pkgs/applications/graphics/unigine-sanctuary/default.nix
@@ -4,10 +4,10 @@
   fetchurl,
   makeWrapper,
   autoPatchelfHook,
-  libX11,
-  libXext,
-  libXrandr,
-  libXinerama,
+  libx11,
+  libxext,
+  libxrandr,
+  libxinerama,
   libglvnd,
   openal,
   glibc,
@@ -80,10 +80,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     stdenv.cc.cc
-    libX11
-    libXext
-    libXrandr
-    libXinerama
+    libx11
+    libxext
+    libxrandr
+    libxinerama
   ];
 
   dontUnpack = true;
diff --git a/pkgs/applications/graphics/unigine-superposition/default.nix b/pkgs/applications/graphics/unigine-superposition/default.nix
index 78ddf8f4edae..8d3033f017e8 100644
--- a/pkgs/applications/graphics/unigine-superposition/default.nix
+++ b/pkgs/applications/graphics/unigine-superposition/default.nix
@@ -7,17 +7,17 @@
   fontconfig,
   zlib,
   qtquickcontrols2,
-  libXinerama,
+  libxinerama,
   libxcb,
   libsm,
-  libXi,
+  libxi,
   libglvnd,
-  libXext,
-  libXrandr,
+  libxext,
+  libxrandr,
   mailspring,
-  libX11,
+  libx11,
   libice,
-  libXrender,
+  libxrender,
   autoPatchelfHook,
   makeWrapper,
   xkeyboard_config,
@@ -52,17 +52,17 @@ let
       fontconfig
       zlib
       qtquickcontrols2
-      libXinerama
+      libxinerama
       libxcb
       libsm
-      libXi
+      libxi
       libglvnd
-      libXext
-      libXrandr
+      libxext
+      libxrandr
       mailspring
-      libX11
+      libx11
       libice
-      libXrender
+      libxrender
     ];
 
     installPhase = ''
@@ -109,17 +109,17 @@ buildFHSEnv {
     fontconfig
     zlib
     qtquickcontrols2
-    libXinerama
+    libxinerama
     libxcb
     libsm
-    libXi
+    libxi
     libglvnd
-    libXext
-    libXrandr
+    libxext
+    libxrandr
     mailspring
-    libX11
+    libx11
     libice
-    libXrender
+    libxrender
     openal
   ];
   runScript = "superposition";
diff --git a/pkgs/applications/graphics/unigine-tropics/default.nix b/pkgs/applications/graphics/unigine-tropics/default.nix
index bbcf0648369c..67cea522ae00 100644
--- a/pkgs/applications/graphics/unigine-tropics/default.nix
+++ b/pkgs/applications/graphics/unigine-tropics/default.nix
@@ -4,10 +4,10 @@
   fetchurl,
   makeWrapper,
   autoPatchelfHook,
-  libX11,
-  libXext,
-  libXrandr,
-  libXinerama,
+  libx11,
+  libxext,
+  libxrandr,
+  libxinerama,
   libglvnd,
   openal,
   glibc,
@@ -78,10 +78,10 @@ stdenv.mkDerivation {
 
   buildInputs = [
     stdenv.cc.cc
-    libX11
-    libXext
-    libXrandr
-    libXinerama
+    libx11
+    libxext
+    libxrandr
+    libxinerama
   ];
 
   dontUnpack = true;
diff --git a/pkgs/applications/misc/avalonia-ilspy/default.nix b/pkgs/applications/misc/avalonia-ilspy/default.nix
index be52ef6a3a82..41b393f3ee84 100644
--- a/pkgs/applications/misc/avalonia-ilspy/default.nix
+++ b/pkgs/applications/misc/avalonia-ilspy/default.nix
@@ -4,13 +4,13 @@
   fetchFromGitHub,
   buildDotnetModule,
   dotnetCorePackages,
-  libX11,
+  libx11,
   libice,
   libsm,
-  libXi,
-  libXcursor,
-  libXext,
-  libXrandr,
+  libxi,
+  libxcursor,
+  libxext,
+  libxrandr,
   fontconfig,
   glew,
   makeDesktopItem,
@@ -59,13 +59,13 @@ buildDotnetModule rec {
 
   runtimeDeps = [
     # Avalonia UI
-    libX11
+    libx11
     libice
     libsm
-    libXi
-    libXcursor
-    libXext
-    libXrandr
+    libxi
+    libxcursor
+    libxext
+    libxrandr
     fontconfig
     glew
   ];
diff --git a/pkgs/applications/misc/goldendict-ng/default.nix b/pkgs/applications/misc/goldendict-ng/default.nix
index 4539c3606639..3083af21c1da 100644
--- a/pkgs/applications/misc/goldendict-ng/default.nix
+++ b/pkgs/applications/misc/goldendict-ng/default.nix
@@ -16,7 +16,7 @@
   fmt,
   bzip2,
   libiconv,
-  libXtst,
+  libxtst,
   qtbase,
   qtsvg,
   qtwebengine,
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
     hunspell
     xz
     lzo
-    libXtst
+    libxtst
     bzip2
     libiconv
     opencc
diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix
index 672a300a6c2c..06cff3872060 100644
--- a/pkgs/applications/misc/goldendict/default.nix
+++ b/pkgs/applications/misc/goldendict/default.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   pkg-config,
-  libXtst,
+  libxtst,
   libvorbis,
   hunspell,
   lzo,
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     qtx11extras
-    libXtst
+    libxtst
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     bzip2
diff --git a/pkgs/applications/misc/googleearth-pro/default.nix b/pkgs/applications/misc/googleearth-pro/default.nix
index 0b476660c585..76722bdeb2e8 100644
--- a/pkgs/applications/misc/googleearth-pro/default.nix
+++ b/pkgs/applications/misc/googleearth-pro/default.nix
@@ -8,10 +8,10 @@
   libGLU,
   libsm,
 
-  libXcomposite,
-  libXi,
-  libXrender,
-  libX11,
+  libxcomposite,
+  libxi,
+  libxrender,
+  libx11,
 
   libxcb,
   sqlite,
@@ -65,10 +65,10 @@ stdenv.mkDerivation rec {
     libGL
     libGLU
     libsm
-    libX11
-    libXcomposite
-    libXi
-    libXrender
+    libx11
+    libxcomposite
+    libxi
+    libxrender
     libproxy
     libxcb
     libxml2_13
diff --git a/pkgs/applications/misc/inochi2d/generic.nix b/pkgs/applications/misc/inochi2d/generic.nix
index 30e521755fde..7841debc7c9b 100644
--- a/pkgs/applications/misc/inochi2d/generic.nix
+++ b/pkgs/applications/misc/inochi2d/generic.nix
@@ -16,7 +16,7 @@
   zenity,
   luajit_2_1,
   libGL,
-  libX11,
+  libx11,
 
   builderArgs,
 }:
@@ -58,7 +58,7 @@ buildDubPackage (
       freetype
       SDL2
       libGL
-      libX11
+      libx11
     ];
 
     dontUseCmakeConfigure = true;
diff --git a/pkgs/applications/misc/kemai/default.nix b/pkgs/applications/misc/kemai/default.nix
index 7ca6353aa9fc..7f3374ac0860 100644
--- a/pkgs/applications/misc/kemai/default.nix
+++ b/pkgs/applications/misc/kemai/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 
   # buildInputs
-  libXScrnSaver,
+  libxscrnsaver,
   magic-enum,
 
   # nativeBuildInputs
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   buildInputs = [
-    libXScrnSaver
+    libxscrnsaver
     magic-enum
     qtbase
     qtconnectivity
diff --git a/pkgs/applications/misc/parsec/bin.nix b/pkgs/applications/misc/parsec/bin.nix
index f259b7771750..c483c5bb6488 100644
--- a/pkgs/applications/misc/parsec/bin.nix
+++ b/pkgs/applications/misc/parsec/bin.nix
@@ -10,11 +10,11 @@
   openssl,
   udev,
   libglvnd,
-  libX11,
-  libXcursor,
-  libXi,
-  libXrandr,
-  libXfixes,
+  libx11,
+  libxcursor,
+  libxi,
+  libxrandr,
+  libxfixes,
   libpulseaudio,
   libva,
   ffmpeg_7,
@@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation {
   buildInputs = [
     stdenv.cc.cc # libstdc++
     libglvnd
-    libX11
+    libx11
   ];
 
   runtimeDependenciesPath = lib.makeLibraryPath [
@@ -58,11 +58,11 @@ stdenvNoCC.mkDerivation {
     libpng
     libjpeg8
     curl
-    libX11
-    libXcursor
-    libXi
-    libXrandr
-    libXfixes
+    libx11
+    libxcursor
+    libxi
+    libxrandr
+    libxfixes
     vulkan-loader
   ];
 
diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/pkgs/applications/misc/qMasterPassword/default.nix
index e443741ebd25..d7078b2be9c9 100644
--- a/pkgs/applications/misc/qMasterPassword/default.nix
+++ b/pkgs/applications/misc/qMasterPassword/default.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXtst,
+  libx11,
+  libxtst,
   cmake,
   qtbase,
   qttools,
@@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
     libscrypt
   ]
   ++ lib.optionals x11Support [
-    libX11
-    libXtst
+    libx11
+    libxtst
   ];
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix
index 7130e5e34e93..cb6def2c2074 100644
--- a/pkgs/applications/misc/qtbitcointrader/default.nix
+++ b/pkgs/applications/misc/qtbitcointrader/default.nix
@@ -5,14 +5,14 @@
   libsForQt5,
 }:
 
-stdenv.mkDerivation (finalAttr: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "qtbitcointrader";
   version = "1.42.21";
 
   src = fetchFromGitHub {
     owner = "JulyIGHOR";
     repo = "QtBitcoinTrader";
-    tag = "v${finalAttr.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-u3+Kwn8KunYUpWCd55TQuVVfoSp8hdti93d6hk7Uqx8=";
   };
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttr: {
     libsForQt5.qtscript
   ];
 
-  sourceRoot = "${finalAttr.src.name}/src";
+  sourceRoot = "${finalAttrs.src.name}/src";
 
   configurePhase = ''
     runHook preConfigure
diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index 5920f8e351bd..ef12052d6c91 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -24,7 +24,7 @@
   withDrm ? stdenv.hostPlatform.isLinux,
   libdrm,
   withVidmode ? stdenv.hostPlatform.isLinux,
-  libXxf86vm,
+  libxxf86vm,
 
   withGeolocation ? true,
   withCoreLocation ? withGeolocation && stdenv.hostPlatform.isDarwin,
@@ -88,7 +88,7 @@ let
       ++ lib.optional withRandr libxcb
       ++ lib.optional withGeoclue geoclue
       ++ lib.optional withDrm libdrm
-      ++ lib.optional withVidmode libXxf86vm
+      ++ lib.optional withVidmode libxxf86vm
       ++ lib.optional withAppIndicator (
         if (pname != "gammastep") then libappindicator else libayatana-appindicator
       );
diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix
index bf49a24c4c04..5dcec2b91675 100644
--- a/pkgs/applications/misc/rescuetime/default.nix
+++ b/pkgs/applications/misc/rescuetime/default.nix
@@ -6,10 +6,10 @@
   wrapQtAppsHook,
   patchelf,
   qt5,
-  libXtst,
-  libXext,
-  libX11,
-  libXScrnSaver,
+  libxtst,
+  libxext,
+  libx11,
+  libxscrnsaver,
   writeScript,
   common-updater-scripts,
   curl,
@@ -53,10 +53,10 @@ stdenv.mkDerivation rec {
       --set-rpath "${
         lib.makeLibraryPath [
           qt5.qtbase
-          libXtst
-          libXext
-          libX11
-          libXScrnSaver
+          libxtst
+          libxext
+          libx11
+          libxscrnsaver
         ]
       }" \
       $out/bin/rescuetime
diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index a2014e91f357..7922e5fd0eb6 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -24,7 +24,7 @@
   qtsvg,
   qttools,
   qtpositioning,
-  libXcomposite,
+  libxcomposite,
   bluez,
   writeScript,
 }:
@@ -89,7 +89,7 @@ let
     buildInputs = [
       qtbase
       qtlocation
-      libXcomposite
+      libxcomposite
     ];
 
     dontWrapQtApps = true;
diff --git a/pkgs/applications/misc/sweethome3d/linux.nix b/pkgs/applications/misc/sweethome3d/linux.nix
index 46f24c071cf9..c76a9d54ca18 100644
--- a/pkgs/applications/misc/sweethome3d/linux.nix
+++ b/pkgs/applications/misc/sweethome3d/linux.nix
@@ -11,7 +11,7 @@
   gsettings-desktop-schemas,
   p7zip,
   autoPatchelfHook,
-  libXxf86vm,
+  libxxf86vm,
   libGL,
   copyDesktopItems,
 
@@ -96,7 +96,7 @@ stdenv.mkDerivation {
     p7zip
     gtk3
     gsettings-desktop-schemas
-    libXxf86vm
+    libxxf86vm
   ];
 
   # upstream targets Java 7 by default
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 74e5606dfbeb..79e4a1fe3253 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -59,9 +59,9 @@
   glib,
   gtk3,
   dbus-glib,
-  libXScrnSaver,
-  libXcursor,
-  libXtst,
+  libxscrnsaver,
+  libxcursor,
+  libxtst,
   libxshmfence,
   libGLU,
   libGL,
@@ -70,7 +70,7 @@
   pciutils,
   protobuf,
   speechd-minimal,
-  libXdamage,
+  libxdamage,
   at-spi2-core,
   pipewire,
   libva,
@@ -365,9 +365,9 @@ let
       glib
       gtk3
       dbus-glib
-      libXScrnSaver
-      libXcursor
-      libXtst
+      libxscrnsaver
+      libxcursor
+      libxtst
       libxshmfence
       libGLU
       libGL
@@ -375,7 +375,7 @@ let
       pciutils
       protobuf
       speechd-minimal
-      libXdamage
+      libxdamage
       at-spi2-core
       pipewire
       libva
@@ -425,9 +425,9 @@ let
       glib
       gtk3
       dbus-glib
-      libXScrnSaver
-      libXcursor
-      libXtst
+      libxscrnsaver
+      libxcursor
+      libxtst
       libxshmfence
       libGLU
       libGL
@@ -436,7 +436,7 @@ let
       pciutils
       protobuf
       speechd-minimal
-      libXdamage
+      libxdamage
       at-spi2-core
       pipewire
       libva
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 7780edc2f9d9..2186453baef9 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -9,7 +9,7 @@
   curl,
   dbus-glib,
   gtk3,
-  libXtst,
+  libxtst,
   libva,
   pciutils,
   pipewire,
@@ -92,7 +92,7 @@ stdenv.mkDerivation {
     adwaita-icon-theme
     alsa-lib
     dbus-glib
-    libXtst
+    libxtst
   ];
   runtimeDependencies = [
     curl
diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json
deleted file mode 100644
index 4be25a0c8d30..000000000000
--- a/pkgs/applications/networking/browsers/librewolf/src.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "packageVersion": "147.0.1-3",
-  "source": {
-    "rev": "147.0.1-3",
-    "hash": "sha256-0BeC3zlL5cvnpTaPnKn26lT1XlvqBQuMc4rauNbeIIk="
-  },
-  "firefox": {
-    "version": "147.0.1",
-    "hash": "sha512-8eG8SGRRJU8zsAD7RRP9lIpaboSEGYDudnxC0ybhhW9EqEN8j9v/LLNNF3/qKxkH/Nct0zvOw/Bt242IFRhTqA=="
-  }
-}
diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix
index a317577efc0e..c81fea5eb958 100644
--- a/pkgs/applications/networking/browsers/palemoon/bin.nix
+++ b/pkgs/applications/networking/browsers/palemoon/bin.nix
@@ -13,7 +13,7 @@
   withGTK3 ? true,
   gtk3,
   libglvnd,
-  libXt,
+  libxt,
   libpulseaudio,
   makeDesktopItem,
   wrapGAppsHook3,
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     alsa-lib
     dbus-glib
     gtk2-x11
-    libXt
+    libxt
     (lib.getLib stdenv.cc.cc)
   ]
   ++ lib.optionals withGTK3 [
diff --git a/pkgs/applications/networking/cluster/k3s/1_32/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_32/chart-versions.nix
index ae882e7da509..6b9e1977eb77 100644
--- a/pkgs/applications/networking/cluster/k3s/1_32/chart-versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_32/chart-versions.nix
@@ -1,10 +1,10 @@
 {
   traefik-crd = {
-    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-37.1.1+up37.1.0.tgz";
-    sha256 = "0q568ffjhxmw87fzwafxlxrzx2lgcqlqbwj87pbc2xszh9pyakyd";
+    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-38.0.201+up38.0.2.tgz";
+    sha256 = "1fxkdmk859nwn0x9iq0abdwb16njsang7257ppaj9s1if06fsncd";
   };
   traefik = {
-    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-37.1.1+up37.1.0.tgz";
-    sha256 = "0gpcr6zfbncvp2sjjwzg732k4xfr5ba0pbc5x08lgwvibqpp4r27";
+    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-38.0.201+up38.0.2.tgz";
+    sha256 = "16kzjy8dgswn4jfx62dn2ihmgpkzcfvjv6ync9zdi397fz32mqjv";
   };
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json
index 35f6baea1aab..2140d0b31c72 100644
--- a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json
@@ -1,26 +1,26 @@
 {
   "airgap-images-amd64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
-    "sha256": "6dfe83a7d8984a5fe6be63a429698ce3fc61761ce68e3f4f2c6f3ff96a349f37"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-amd64.tar.gz",
+    "sha256": "572f512cc0bdf89213d2c532e6182d4a291663bb38a51beb57197bf3fb67dd47"
   },
   "airgap-images-amd64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "9b6a7ea64b7b14a6c43613e4e170902e99c600857265875282f8d4b9dfefa6f4"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "a65a1ed1cf081285d4c32ed3989d95cb0a4d90209e99a8765b65d41b02ea059d"
   },
   "airgap-images-arm-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s1/k3s-airgap-images-arm.tar.gz",
-    "sha256": "cbda428d59a8593267343fb32ad985bf2125f45860425f9b7b31bbea9d305046"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-arm.tar.gz",
+    "sha256": "ffaee35854e9bfa6f34fae0a7a2ff81e8909cfb2d5a5bd65df89c03a1ceb1b3a"
   },
   "airgap-images-arm-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "b1a253aab260beabea305517d8d57cce4594d2e071320d5700d389b29eb3c196"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-arm.tar.zst",
+    "sha256": "b92568a2fa8683a5abd29c151d12f2737bf7ac961dfa615a2fa891a66f2d23cf"
   },
   "airgap-images-arm64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
-    "sha256": "0f6e598bf90b9ced4f1f758db6b0d7f8afbf9b5973d801d8a743c5b27ac3b748"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-arm64.tar.gz",
+    "sha256": "cc99b0211110b8dc14c47cde0fe9b93b7e36c2ead64286412a896f6aa8a722cf"
   },
   "airgap-images-arm64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "297beda34a0a2a7ff727fced94dba6f999636a4e9b2cdd6e30840cc0e746a4ee"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.11%2Bk3s3/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "a7ab99f7e2a6cf6ecc833c8ba67ba154b3ff186c58d574fa4bbda2e70dcb55f7"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix
index 905c26918e97..d37386e72219 100644
--- a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix
@@ -1,20 +1,20 @@
 {
-  k3sVersion = "1.32.11+k3s1";
-  k3sCommit = "8119508834f2503e3c7bace3125f5db6b038d377";
-  k3sRepoSha256 = "0fni4sh3a5flyrli7xxd9zxj9sh75kv79msy3zkfbgjxqz7rg4v9";
-  k3sVendorHash = "sha256-8gzvad5Cpkatc8158m9FBGnkGEbajn30alSPlzhor0E=";
+  k3sVersion = "1.32.11+k3s3";
+  k3sCommit = "c9aa1d2889a003715698542826c2af94160ac2e5";
+  k3sRepoSha256 = "0fi634dnsghjwnp07h6jhknccqlr9n5g3l34sipc41vvfmn4b0k8";
+  k3sVendorHash = "sha256-qbmqzsd8oMQSFCh7HvjDiYds5gLEIGjjcv4EJbgxfJI=";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
   k3sRootVersion = "0.15.0";
   k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0";
-  k3sCNIVersion = "1.8.0-k3s1";
-  k3sCNISha256 = "04xig5spp81l81781ixmk99ghiz8lk0p16zhcbja5mslfdjmc7vg";
+  k3sCNIVersion = "1.9.0-k3s1";
+  k3sCNISha256 = "0naqf3jkxz3rd9ljd40wbm8walgi2bx6d1l9wr6mcvrgj7d5g28c";
   containerdVersion = "2.1.5-k3s1.32";
   containerdSha256 = "1fzld9q0ycfg9b3054qg70mif1p6i7xqikcbabrmxapk81fy83kn";
   containerdPackage = "github.com/k3s-io/containerd/v2";
   criCtlVersion = "1.31.0-k3s2";
-  flannelVersion = "v0.27.4";
-  flannelPluginVersion = "v1.8.0-flannel1";
+  flannelVersion = "v0.28.0";
+  flannelPluginVersion = "v1.9.0-flannel1";
   kubeRouterVersion = "v2.6.3-k3s1";
   criDockerdVersion = "v0.3.19-k3s2.32";
   helmJobVersion = "v0.9.12-build20251215";
diff --git a/pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix
index ae882e7da509..6b9e1977eb77 100644
--- a/pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix
@@ -1,10 +1,10 @@
 {
   traefik-crd = {
-    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-37.1.1+up37.1.0.tgz";
-    sha256 = "0q568ffjhxmw87fzwafxlxrzx2lgcqlqbwj87pbc2xszh9pyakyd";
+    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-38.0.201+up38.0.2.tgz";
+    sha256 = "1fxkdmk859nwn0x9iq0abdwb16njsang7257ppaj9s1if06fsncd";
   };
   traefik = {
-    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-37.1.1+up37.1.0.tgz";
-    sha256 = "0gpcr6zfbncvp2sjjwzg732k4xfr5ba0pbc5x08lgwvibqpp4r27";
+    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-38.0.201+up38.0.2.tgz";
+    sha256 = "16kzjy8dgswn4jfx62dn2ihmgpkzcfvjv6ync9zdi397fz32mqjv";
   };
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json
index d1cce735c16a..8b50bf120d6f 100644
--- a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json
@@ -1,26 +1,26 @@
 {
   "airgap-images-amd64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
-    "sha256": "47644f3141878535a1951fdaf03bc485001b50a58b8fb58d97c75c49ea38a1f0"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-amd64.tar.gz",
+    "sha256": "130a3b3e51947b7a0beffca422b85c2d3fbe78b1163a0fc069871877021123d3"
   },
   "airgap-images-amd64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "9b6a7ea64b7b14a6c43613e4e170902e99c600857265875282f8d4b9dfefa6f4"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "b0d7062008fa7fcad9ad7c6b60f74ae1c561927dbb5a4105433f5afbd091361b"
   },
   "airgap-images-arm-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s1/k3s-airgap-images-arm.tar.gz",
-    "sha256": "ee76f65f39a0ca12bbaa6bf9fdd5dc161b553b15a5746d47795cf0113916c063"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-arm.tar.gz",
+    "sha256": "6451f4bd29b4ab76dcbfa520d907425976a04e9d5044b969e81fa2dfdc085c20"
   },
   "airgap-images-arm-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "b1a253aab260beabea305517d8d57cce4594d2e071320d5700d389b29eb3c196"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-arm.tar.zst",
+    "sha256": "03a165ad40d022616281fbf329bcfa546b9245a9f431d1c362b86faff72d83dd"
   },
   "airgap-images-arm64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
-    "sha256": "a2f534291abd4d6491dc669b46e437df1fe0cd7b573485ec30aa813510b22635"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-arm64.tar.gz",
+    "sha256": "6243a503de28c17f4b1b16018237a5008bc99983dc3b3b87ed2a1fe790d9e211"
   },
   "airgap-images-arm64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "87db88828e43179ef30a17ba66b416a3e398c4a00673908bd8d39ae4996ce300"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.7%2Bk3s3/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "74713adf726f6b407330b93e252b7a8e0a85204137c8a6f61b66f681b5761c42"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix
index de73eecf3c19..49a514d8fd05 100644
--- a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix
@@ -1,20 +1,20 @@
 {
-  k3sVersion = "1.33.7+k3s1";
-  k3sCommit = "0b396d3f7f26e0c2ae5b6a114383830f533938c2";
-  k3sRepoSha256 = "0jkvm7c333zazabsxrjl6wkdsni1m5g5gamriyyf53lly9935wsf";
-  k3sVendorHash = "sha256-HpgcO/mUo64mkH38sAURnLOmXdXmHh3o6iDKtQeUt/E=";
+  k3sVersion = "1.33.7+k3s3";
+  k3sCommit = "1288e778af2a8ae295c47c213a3d13abd2969cde";
+  k3sRepoSha256 = "07274x0d0q7cn6x5g8d0zbyf67axrmchhngsjsp3plskyr313hcy";
+  k3sVendorHash = "sha256-XlZFYEGqoDGFlLJYRJDDoRPWuptFYkZT6axergChFN4=";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
   k3sRootVersion = "0.15.0";
   k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0";
-  k3sCNIVersion = "1.8.0-k3s1";
-  k3sCNISha256 = "04xig5spp81l81781ixmk99ghiz8lk0p16zhcbja5mslfdjmc7vg";
+  k3sCNIVersion = "1.9.0-k3s1";
+  k3sCNISha256 = "0naqf3jkxz3rd9ljd40wbm8walgi2bx6d1l9wr6mcvrgj7d5g28c";
   containerdVersion = "2.1.5-k3s1.33";
   containerdSha256 = "15iw6px3710rlsx7j933i07qd4a2r7caagfjbhhfcp33m9k19v7h";
   containerdPackage = "github.com/k3s-io/containerd/v2";
   criCtlVersion = "1.33.0-k3s2";
-  flannelVersion = "v0.27.4";
-  flannelPluginVersion = "v1.8.0-flannel1";
+  flannelVersion = "v0.28.0";
+  flannelPluginVersion = "v1.9.0-flannel1";
   kubeRouterVersion = "v2.6.3-k3s1";
   criDockerdVersion = "v0.3.19-k3s2";
   helmJobVersion = "v0.9.12-build20251215";
diff --git a/pkgs/applications/networking/cluster/k3s/1_34/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_34/chart-versions.nix
index ae882e7da509..6b9e1977eb77 100644
--- a/pkgs/applications/networking/cluster/k3s/1_34/chart-versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_34/chart-versions.nix
@@ -1,10 +1,10 @@
 {
   traefik-crd = {
-    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-37.1.1+up37.1.0.tgz";
-    sha256 = "0q568ffjhxmw87fzwafxlxrzx2lgcqlqbwj87pbc2xszh9pyakyd";
+    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-38.0.201+up38.0.2.tgz";
+    sha256 = "1fxkdmk859nwn0x9iq0abdwb16njsang7257ppaj9s1if06fsncd";
   };
   traefik = {
-    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-37.1.1+up37.1.0.tgz";
-    sha256 = "0gpcr6zfbncvp2sjjwzg732k4xfr5ba0pbc5x08lgwvibqpp4r27";
+    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-38.0.201+up38.0.2.tgz";
+    sha256 = "16kzjy8dgswn4jfx62dn2ihmgpkzcfvjv6ync9zdi397fz32mqjv";
   };
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json
index ca2e2fb2860e..86024f6eca19 100644
--- a/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json
@@ -1,26 +1,26 @@
 {
   "airgap-images-amd64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
-    "sha256": "499d7fb0b2eab200e9bf9b3935ce787a7fa0597933dce25ad091703933d6ecc8"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s3/k3s-airgap-images-amd64.tar.gz",
+    "sha256": "696c2e10f511295f5e0e6281a2f22eec60b33962d45bc9117703db1ac887e981"
   },
   "airgap-images-amd64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "b8dff3265568e1be66ab72ac0ded68bd266fa37a32c010f1253dba6547a49ce8"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s3/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "4805a6c4bfdfd20d3ad42bc14c79e00662739aca275e6a37cd8f3a406fae0f0a"
   },
   "airgap-images-arm-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s1/k3s-airgap-images-arm.tar.gz",
-    "sha256": "170db25228c873741f895fced05f0e5bdbbddb8ffeb5e0342a5b8e44f3c28757"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s3/k3s-airgap-images-arm.tar.gz",
+    "sha256": "a4bc850fcf9b73bf0f45d4a1f50bd612e52d77daa5de5020589e7f99e5d1a3e6"
   },
   "airgap-images-arm-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "27407fd1553c89b8ccd3b45ad0fbdcd483c1a010e7b28b60b24a8e73b58aa783"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s3/k3s-airgap-images-arm.tar.zst",
+    "sha256": "a1b0ac3a00f409fa51e196ea9db5f2282efff00a282ab797bf49b29453bb1379"
   },
   "airgap-images-arm64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
-    "sha256": "e67cddf839571cd489aef44acb2aca82285a9789a170c1a44d51b7f8b6129883"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s3/k3s-airgap-images-arm64.tar.gz",
+    "sha256": "ceea4427499fb39be0bff18f840cf80a091f63e88421bc89fdfceb8017aab59b"
   },
   "airgap-images-arm64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "b6cb3c06f19859d3a5fba54b305097e89d2a86b5bce9e8360a46b9d2e67da565"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.3%2Bk3s3/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "e0cec00a1c19c8c6f7fde7005e325d285f23ff43752cce9ce0796ccb10e9582a"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_34/versions.nix b/pkgs/applications/networking/cluster/k3s/1_34/versions.nix
index 3cc9396b70cd..880c8208b997 100644
--- a/pkgs/applications/networking/cluster/k3s/1_34/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_34/versions.nix
@@ -1,20 +1,20 @@
 {
-  k3sVersion = "1.34.3+k3s1";
-  k3sCommit = "48ffa7b6893f21b919b3029d54c9d9838ae426a1";
-  k3sRepoSha256 = "1177kzbhp6ihb7dzfdi1a0idgp69y1hwh6wnwvdx1fnivg2gj7aw";
-  k3sVendorHash = "sha256-dp8SU24nuy3WmG1Zln/J2nVHnVQmVyN78FBOSxNjbF8=";
+  k3sVersion = "1.34.3+k3s3";
+  k3sCommit = "2975fb0973ca47f54b1aa2a8c3a976a779f52349";
+  k3sRepoSha256 = "0bvccp573xihzbnkd3n6xldcxpnlwiz9b5p0fw6sxv69m7jaac2f";
+  k3sVendorHash = "sha256-R8QXwXmTKsONsbWaedFNDPdYZ82jaQ/T8S9sllqKPjk=";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
   k3sRootVersion = "0.15.0";
   k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0";
-  k3sCNIVersion = "1.8.0-k3s1";
-  k3sCNISha256 = "04xig5spp81l81781ixmk99ghiz8lk0p16zhcbja5mslfdjmc7vg";
+  k3sCNIVersion = "1.9.0-k3s1";
+  k3sCNISha256 = "0naqf3jkxz3rd9ljd40wbm8walgi2bx6d1l9wr6mcvrgj7d5g28c";
   containerdVersion = "2.1.5-k3s1";
   containerdSha256 = "0n0g58d352i8wz0bqn87vgrd7z54j268cbmbp19fz68wmifm7fl8";
   containerdPackage = "github.com/k3s-io/containerd/v2";
   criCtlVersion = "1.34.0-k3s2";
-  flannelVersion = "v0.27.4";
-  flannelPluginVersion = "v1.8.0-flannel1";
+  flannelVersion = "v0.28.0";
+  flannelPluginVersion = "v1.9.0-flannel1";
   kubeRouterVersion = "v2.6.3-k3s1";
   criDockerdVersion = "v0.3.19-k3s3";
   helmJobVersion = "v0.9.12-build20251215";
diff --git a/pkgs/applications/networking/cluster/k3s/1_35/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_35/chart-versions.nix
index ae882e7da509..6b9e1977eb77 100644
--- a/pkgs/applications/networking/cluster/k3s/1_35/chart-versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_35/chart-versions.nix
@@ -1,10 +1,10 @@
 {
   traefik-crd = {
-    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-37.1.1+up37.1.0.tgz";
-    sha256 = "0q568ffjhxmw87fzwafxlxrzx2lgcqlqbwj87pbc2xszh9pyakyd";
+    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-38.0.201+up38.0.2.tgz";
+    sha256 = "1fxkdmk859nwn0x9iq0abdwb16njsang7257ppaj9s1if06fsncd";
   };
   traefik = {
-    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-37.1.1+up37.1.0.tgz";
-    sha256 = "0gpcr6zfbncvp2sjjwzg732k4xfr5ba0pbc5x08lgwvibqpp4r27";
+    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-38.0.201+up38.0.2.tgz";
+    sha256 = "16kzjy8dgswn4jfx62dn2ihmgpkzcfvjv6ync9zdi397fz32mqjv";
   };
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_35/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_35/images-versions.json
index aa290e65619b..5da05dfcef7f 100644
--- a/pkgs/applications/networking/cluster/k3s/1_35/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_35/images-versions.json
@@ -1,26 +1,26 @@
 {
   "airgap-images-amd64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
-    "sha256": "af7ce67f0a8c457618a492ba995cc645d8ad13512008b88db97719941c39389a"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s3/k3s-airgap-images-amd64.tar.gz",
+    "sha256": "8a1c1f25d62d3395fbb2b37d55cf3d836ca4bc68e6358d21b6573f42d295c6f0"
   },
   "airgap-images-amd64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "2e3d6d14bbbeb8c16f1849cca8da48887c5a7ddceb1cc2bf60be63e4fa8c63f3"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s3/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "4805a6c4bfdfd20d3ad42bc14c79e00662739aca275e6a37cd8f3a406fae0f0a"
   },
   "airgap-images-arm-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s1/k3s-airgap-images-arm.tar.gz",
-    "sha256": "82cf1310db1bfac5733c5c16864034c6c7c7affc60c39be610ce7cf169631ef5"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s3/k3s-airgap-images-arm.tar.gz",
+    "sha256": "8659dda950ab0ddff37b2c8d59f527489e1accde30f652b6c3b434385825b8b5"
   },
   "airgap-images-arm-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "27407fd1553c89b8ccd3b45ad0fbdcd483c1a010e7b28b60b24a8e73b58aa783"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s3/k3s-airgap-images-arm.tar.zst",
+    "sha256": "fab2006d48153f278332504c1aa8b03e5683c14924f66ecbd5eeb7db3a5dedd9"
   },
   "airgap-images-arm64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
-    "sha256": "cb3d24f44c9f29da3421e99db0801f2a30b3e16c7032c423a9b631c0fc66a5fa"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s3/k3s-airgap-images-arm64.tar.gz",
+    "sha256": "ec9a3d8b04445afe24093dd0f4e65a1da6b3a5d73f3c739746aaa8ec0aaa03cb"
   },
   "airgap-images-arm64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "b6cb3c06f19859d3a5fba54b305097e89d2a86b5bce9e8360a46b9d2e67da565"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s3/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "4c6a31ffa5bc267986f47f36396c51232f55b5db22253630bf7e8b48ea41084f"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_35/versions.nix b/pkgs/applications/networking/cluster/k3s/1_35/versions.nix
index 54a6fbdde470..420e5f4422c0 100644
--- a/pkgs/applications/networking/cluster/k3s/1_35/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_35/versions.nix
@@ -1,20 +1,20 @@
 {
-  k3sVersion = "1.35.0+k3s1";
-  k3sCommit = "a6c6cd15c0c42ec9fce21f8ad5f42aa74fddb4f2";
-  k3sRepoSha256 = "0033m0vbysy2bcjfmam387580j1cmq6cys8diismgf8m5s64nivb";
-  k3sVendorHash = "sha256-S9GkT87C8qbuefH93Y6d0Y95NNuT6paNdDkmSDllFIY=";
+  k3sVersion = "1.35.0+k3s3";
+  k3sCommit = "323b95245012f0d56a863d8c23964399814191c2";
+  k3sRepoSha256 = "1h6az9xj074pj8s60p2yw9gbqz2dabrxvrq41igcw0nq7ymcwaaz";
+  k3sVendorHash = "sha256-4Qs03mrOJBxsyQe4RrDG9vvS23JwjUPhPec/TebS4Yw=";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
   k3sRootVersion = "0.15.0";
   k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0";
-  k3sCNIVersion = "1.8.0-k3s1";
-  k3sCNISha256 = "04xig5spp81l81781ixmk99ghiz8lk0p16zhcbja5mslfdjmc7vg";
+  k3sCNIVersion = "1.9.0-k3s1";
+  k3sCNISha256 = "0naqf3jkxz3rd9ljd40wbm8walgi2bx6d1l9wr6mcvrgj7d5g28c";
   containerdVersion = "2.1.5-k3s1";
   containerdSha256 = "0n0g58d352i8wz0bqn87vgrd7z54j268cbmbp19fz68wmifm7fl8";
   containerdPackage = "github.com/k3s-io/containerd/v2";
   criCtlVersion = "1.35.0-k3s2";
-  flannelVersion = "v0.27.4";
-  flannelPluginVersion = "v1.8.0-flannel1";
+  flannelVersion = "v0.28.0";
+  flannelPluginVersion = "v1.9.0-flannel1";
   kubeRouterVersion = "v2.6.3-k3s1";
   criDockerdVersion = "v0.3.19-k3s3";
   helmJobVersion = "v0.9.12-build20251215";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index c9ade2fd4bdd..24ca0d9af168 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -45,13 +45,13 @@
     "vendorHash": "sha256-6sVapd0vqL4xGLqTQS4zQIlnMA8HRmjufDi1lOgldlU="
   },
   "aliyun_alicloud": {
-    "hash": "sha256-JcNbhR9qeakHWTDu4tF3Sl2G5zfcohNEsK87znI5hiM=",
+    "hash": "sha256-NL2UmL4wLBbdT5DW7uGYOBQwPN0nQUP54gtFwc2PcB8=",
     "homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
     "owner": "aliyun",
     "repo": "terraform-provider-alicloud",
-    "rev": "v1.269.0",
+    "rev": "v1.270.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-ogQLStDbsM0aRf4QIbITB8Z+L9DUtZwoAPK6T4xylXI="
+    "vendorHash": "sha256-Hvk2jckla1LcMankcdUTct8Kea0OznyxDxTJ+UrJHy0="
   },
   "aminueza_minio": {
     "hash": "sha256-rgrX08mO99cl95YTW0rqFH/jJhyxMr/DSIEL5Wg9R9s=",
@@ -526,11 +526,11 @@
     "vendorHash": null
   },
   "hashicorp_azurerm": {
-    "hash": "sha256-uAaWBctVH61wMz12hX3DnayVn6LK1e3aUM2SQBNx3QQ=",
+    "hash": "sha256-ZqR6UjG+3KUuqnru5CycUcjWxLwCiQdpsIPR2UiY3g8=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
     "owner": "hashicorp",
     "repo": "terraform-provider-azurerm",
-    "rev": "v4.58.0",
+    "rev": "v4.59.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
@@ -1409,11 +1409,11 @@
     "vendorHash": "sha256-l6EzevVL6YxLLq9QWcGZv9Go+0sUToLubHbMeNL1vJg="
   },
   "ucloud_ucloud": {
-    "hash": "sha256-mPTejWXREIBjEZVb660bUUnyj3z7hgfKPrUsSVvMx7A=",
+    "hash": "sha256-UOVnfWYhntmRHMApQgemjUBsyUIz0bexsc1gwDGGee4=",
     "homepage": "https://registry.terraform.io/providers/ucloud/ucloud",
     "owner": "ucloud",
     "repo": "terraform-provider-ucloud",
-    "rev": "v1.39.1",
+    "rev": "v1.39.2",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix
index 272e68447aed..c867158d90e1 100644
--- a/pkgs/applications/networking/instant-messengers/discord/linux.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix
@@ -32,17 +32,17 @@
   libpulseaudio,
   libuuid,
   libva,
-  libX11,
-  libXScrnSaver,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXtst,
+  libx11,
+  libxscrnsaver,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxtst,
   libxcb,
   libxshmfence,
   libgbm,
@@ -116,10 +116,10 @@ stdenv.mkDerivation (finalAttrs: {
     cups
     libdrm
     libuuid
-    libXdamage
-    libX11
-    libXScrnSaver
-    libXtst
+    libxdamage
+    libx11
+    libxscrnsaver
+    libxtst
     libxcb
     libxshmfence
     libgbm
@@ -153,24 +153,24 @@ stdenv.mkDerivation (finalAttrs: {
       gtk3
       libglvnd
       libnotify
-      libX11
-      libXcomposite
+      libx11
+      libxcomposite
       libunity
       libuuid
       libva
-      libXcursor
-      libXdamage
-      libXext
-      libXfixes
-      libXi
-      libXrandr
-      libXrender
-      libXtst
+      libxcursor
+      libxdamage
+      libxext
+      libxfixes
+      libxi
+      libxrandr
+      libxrender
+      libxtst
       nspr
       libxcb
       pango
       pipewire
-      libXScrnSaver
+      libxscrnsaver
       libappindicator-gtk3
       libdbusmenu
       wayland
diff --git a/pkgs/applications/networking/instant-messengers/linphone/mediastreamer2/default.nix b/pkgs/applications/networking/instant-messengers/linphone/mediastreamer2/default.nix
index dbc987f8b9b1..4f8affb14418 100644
--- a/pkgs/applications/networking/instant-messengers/linphone/mediastreamer2/default.nix
+++ b/pkgs/applications/networking/instant-messengers/linphone/mediastreamer2/default.nix
@@ -5,8 +5,8 @@
   glew,
   gsm,
   lib,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   libopus,
   libpulseaudio,
   libsForQt5,
@@ -47,8 +47,8 @@ mkLinphoneDerivation (finalAttrs: {
 
     ffmpeg_4
     glew
-    libX11
-    libXext
+    libx11
+    libxext
     libpulseaudio
     libv4l
     speex
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index 9d4903adc988..cff21dd33d16 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -18,8 +18,8 @@
   lib,
   libice,
   libsm,
-  libXScrnSaver,
-  libXext,
+  libxscrnsaver,
+  libxext,
   libgcrypt,
   libgnt,
   libidn,
@@ -76,8 +76,8 @@ let
         gst_all_1.gstreamer
         libice
         libsm
-        libXScrnSaver
-        libXext
+        libxscrnsaver
+        libxext
         libgnt
         libidn
         libstartup_notification
diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index b8dc68206883..03be31854dbc 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -20,8 +20,8 @@
   readline,
   sqlite,
   autoAwaySupport ? true,
-  libXScrnSaver,
-  libX11,
+  libxscrnsaver,
+  libx11,
   notifySupport ? true,
   libnotify,
   gdk-pixbuf,
@@ -77,8 +77,8 @@ stdenv.mkDerivation (finalAttrs: {
     sqlite
   ]
   ++ lib.optionals autoAwaySupport [
-    libXScrnSaver
-    libX11
+    libxscrnsaver
+    libx11
   ]
   ++ lib.optionals notifySupport [
     libnotify
diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index 184c69feb4e0..8c36016dbd47 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -11,7 +11,7 @@
   qttools,
   libidn,
   qca-qt5,
-  libXScrnSaver,
+  libxscrnsaver,
   hunspell,
   libsecret,
   libgcrypt,
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
     qtx11extras
     libidn
     qca-qt5
-    libXScrnSaver
+    libxscrnsaver
     hunspell
     libsecret
     libgcrypt
diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix
index 44aa11883449..3b6d1ddab889 100644
--- a/pkgs/applications/networking/instant-messengers/psi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi/default.nix
@@ -11,7 +11,7 @@
   qtwebengine,
   libidn,
   qca-qt5,
-  libXScrnSaver,
+  libxscrnsaver,
   hunspell,
 }:
 
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     qtwebengine
     libidn
     qca-qt5
-    libXScrnSaver
+    libxscrnsaver
     hunspell
   ];
 
diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
index 606260896580..187b1a8c1219 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
@@ -13,14 +13,14 @@
   openh264,
   crc32c,
   libvpx,
-  libX11,
-  libXtst,
-  libXcomposite,
-  libXdamage,
-  libXext,
-  libXrender,
-  libXrandr,
-  libXi,
+  libx11,
+  libxtst,
+  libxcomposite,
+  libxdamage,
+  libxext,
+  libxrender,
+  libxrandr,
+  libxi,
   glib,
   abseil-cpp,
   pipewire,
@@ -80,14 +80,14 @@ stdenv.mkDerivation {
     abseil-cpp
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
-    libXtst
-    libXcomposite
-    libXdamage
-    libXext
-    libXrender
-    libXrandr
-    libXi
+    libx11
+    libxtst
+    libxcomposite
+    libxdamage
+    libxext
+    libxrender
+    libxrandr
+    libxi
     glib
     pipewire
     libgbm
diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
index b4b9f4873d83..402a40df3100 100644
--- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix
+++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
@@ -11,8 +11,8 @@
   cmake,
   openssl,
   xorgproto,
-  libX11,
-  libXScrnSaver,
+  libx11,
+  libxscrnsaver,
   xz,
   zlib,
 }:
@@ -39,8 +39,8 @@ stdenv.mkDerivation {
     qtwebkit
     openssl
     xorgproto
-    libX11
-    libXScrnSaver
+    libx11
+    libxscrnsaver
     xz
     zlib
   ];
diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
index bcc69afddec1..caa41241c0f0 100644
--- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
+++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
@@ -7,7 +7,7 @@
   pkg-config,
   wrapQtAppsHook,
   bzip2,
-  libX11,
+  libx11,
   qtbase,
   qttools,
   qtmultimedia,
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     qtmultimedia
     qtscript
     bzip2
-    libX11
+    libx11
     pcre-cpp
     libidn
     lua5
diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix
index 42ba28a0e96f..272a1a78a381 100644
--- a/pkgs/applications/networking/p2p/retroshare/default.nix
+++ b/pkgs/applications/networking/p2p/retroshare/default.nix
@@ -15,7 +15,7 @@
   libxslt,
   sqlcipher,
   rapidjson,
-  libXScrnSaver,
+  libxscrnsaver,
   qtbase,
   qtx11extras,
   qtmultimedia,
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     qtbase
     libgnome-keyring
     bzip2
-    libXScrnSaver
+    libxscrnsaver
     libxml2
     libxslt
     sqlcipher
diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index 446ba3f40a64..a0ee9f9c0344 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -8,13 +8,13 @@
   dbus,
   getconf,
   glibc,
-  libXrandr,
-  libX11,
-  libXext,
-  libXdamage,
-  libXtst,
+  libxrandr,
+  libx11,
+  libxext,
+  libxdamage,
+  libxtst,
   libsm,
-  libXfixes,
+  libxfixes,
   coreutils,
   wrapQtAppsHook,
   icu63,
@@ -126,13 +126,13 @@ stdenv.mkDerivation rec {
     }"
     "--prefix LD_LIBRARY_PATH : ${
       lib.makeLibraryPath [
-        libXrandr
-        libX11
-        libXext
-        libXdamage
-        libXtst
+        libxrandr
+        libx11
+        libxext
+        libxdamage
+        libxtst
         libsm
-        libXfixes
+        libxfixes
         dbus
         icu63
       ]
diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix
index ea3e5d9556cd..5f759c7faaac 100644
--- a/pkgs/applications/office/cb2bib/default.nix
+++ b/pkgs/applications/office/cb2bib/default.nix
@@ -7,7 +7,7 @@
   qtwebkit,
   qtx11extras,
   lzo,
-  libX11,
+  libx11,
   wrapQtAppsHook,
 }:
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     qtwebkit
     qtx11extras
     lzo
-    libX11
+    libx11
   ];
   nativeBuildInputs = [
     qmake
diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix
index e98dd238b55f..fbde47cb85c3 100644
--- a/pkgs/applications/office/softmaker/generic.nix
+++ b/pkgs/applications/office/softmaker/generic.nix
@@ -11,11 +11,11 @@
   glib,
   gst_all_1,
   libGL,
-  libX11,
-  libXext,
-  libXmu,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxext,
+  libxmu,
+  libxrandr,
+  libxrender,
 
   # For fixing up execution of /bin/ls, which is necessary for
   # product unlocking.
@@ -60,11 +60,11 @@ stdenv.mkDerivation {
     gst_all_1.gstreamer
     gst_all_1.gst-plugins-base
     libGL
-    libX11
-    libXext
-    libXmu
-    libXrandr
-    libXrender
+    libx11
+    libxext
+    libxmu
+    libxrandr
+    libxrender
     (lib.getLib stdenv.cc.cc)
   ];
 
diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix
index f15e934ded3c..99a47f15b7f2 100644
--- a/pkgs/applications/radio/fldigi/default.nix
+++ b/pkgs/applications/radio/fldigi/default.nix
@@ -10,7 +10,7 @@
   libsndfile,
   libsamplerate,
   libpulseaudio,
-  libXinerama,
+  libxinerama,
   gettext,
   pkg-config,
   alsa-lib,
@@ -19,17 +19,17 @@
 
 stdenv.mkDerivation rec {
   pname = "fldigi";
-  version = "4.2.09";
+  version = "4.2.11";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
-    hash = "sha256-L+gj4DQyEOhPYAgOQuMtKf9RLzHJ4ACUHvGJcXDiLDc=";
+    hash = "sha256-dis3D/6crnc6KgO1EtC3JC5+kEB8EdWrvS0xrmUBZk8=";
   };
 
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    libXinerama
+    libxinerama
     gettext
     hamlib
     fltk_1_3
@@ -45,7 +45,14 @@ stdenv.mkDerivation rec {
     udev
   ];
 
-  env.CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++14";
+  env.CXXFLAGS = lib.concatStringsSep " " (
+    lib.optionals stdenv.cc.isClang [
+      "-std=c++14"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      "-Wno-error=unguarded-availability"
+    ]
+  );
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix
index b9cbc8d0210b..4ff9ef72b682 100644
--- a/pkgs/applications/radio/limesuite/default.nix
+++ b/pkgs/applications/radio/limesuite/default.nix
@@ -9,7 +9,7 @@
   libusb1,
   soapysdr,
   mesa_glu,
-  libX11,
+  libx11,
   gnuplot,
   fltk,
   withGui ? false,
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals withGui [
     fltk
-    libX11
+    libx11
     mesa_glu
     wxGTK32
   ];
diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix
index 67942ed248ad..d7215163a78b 100644
--- a/pkgs/applications/science/astronomy/celestia/default.nix
+++ b/pkgs/applications/science/astronomy/celestia/default.nix
@@ -9,7 +9,7 @@
   gtkglext,
   libjpeg_turbo,
   libtheora,
-  libXmu,
+  libxmu,
   lua,
   libGLU,
   libGL,
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     perl
     libjpeg_turbo
     libtheora
-    libXmu
+    libxmu
     libGLU
     libGL
   ];
diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix
index 3856e9148aa9..5ce67c09a684 100644
--- a/pkgs/applications/science/electronics/eagle/eagle.nix
+++ b/pkgs/applications/science/electronics/eagle/eagle.nix
@@ -4,12 +4,12 @@
   fetchurl,
   wrapQtAppsHook,
   makeDesktopItem,
-  libXrender,
-  libXrandr,
-  libXcursor,
-  libX11,
-  libXext,
-  libXi,
+  libxrender,
+  libxrandr,
+  libxcursor,
+  libx11,
+  libxext,
+  libxi,
   libxcb,
   libGL,
   glib,
@@ -27,12 +27,12 @@
 
 let
   libPath = lib.makeLibraryPath [
-    libXrender
-    libXrandr
-    libXcursor
-    libX11
-    libXext
-    libXi
+    libxrender
+    libxrandr
+    libxcursor
+    libx11
+    libxext
+    libxi
     libxcb
     libGL
     glib
@@ -72,12 +72,12 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ wrapQtAppsHook ];
 
   buildInputs = [
-    libXrender
-    libXrandr
-    libXcursor
-    libX11
-    libXext
-    libXi
+    libxrender
+    libxrandr
+    libxcursor
+    libx11
+    libxext
+    libxi
     libxcb
     libGL
     glib
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 0af9390e8c3b..a59779aff60e 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -4,9 +4,9 @@
   fetchurl,
   bzip2,
   gfortran,
-  libX11,
-  libXmu,
-  libXt,
+  libx11,
+  libxmu,
+  libxt,
   libjpeg,
   libpng,
   libtiff,
@@ -73,10 +73,10 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     bzip2
     gfortran
-    libX11
-    libXmu
-    libXt
-    libXt
+    libx11
+    libxmu
+    libxt
+    libxt
     libjpeg
     libpng
     libtiff
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
index dada6d1e8545..431126826a55 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
@@ -4,11 +4,11 @@
   fetchurl,
   fetchpatch,
   makeDesktopItem,
-  libX11,
-  libXt,
-  libXft,
-  libXrender,
-  libXext,
+  libx11,
+  libxt,
+  libxft,
+  libxrender,
+  libxext,
   ncurses,
   fontconfig,
   freetype,
@@ -66,18 +66,18 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    libX11
-    libXt
-    libXft
+    libx11
+    libxt
+    libxft
     ncurses # required to build the terminfo file
     fontconfig
     freetype
-    libXrender
+    libxrender
     libptytty
   ]
   ++ lib.optionals perlSupport [
     perl
-    libXext
+    libxext
   ]
   ++ lib.optional gdkPixbufSupport gdk-pixbuf;
 
@@ -90,8 +90,6 @@ stdenv.mkDerivation {
     (
       if emojiSupport then
         [
-          # the required patches to libXft are in nixpkgs by default, see
-          # ../../../servers/x11/xorg/overrides.nix
           (fetchPatchFromAUR {
             name = "enable-wide-glyphs.patch";
             package = "rxvt-unicode-truecolor-wide-glyphs";
diff --git a/pkgs/applications/version-management/p4v/linux.nix b/pkgs/applications/version-management/p4v/linux.nix
index c8808b66928c..df6d516e1cbe 100644
--- a/pkgs/applications/version-management/p4v/linux.nix
+++ b/pkgs/applications/version-management/p4v/linux.nix
@@ -5,15 +5,15 @@
   dbus,
   fontconfig,
   gccForLibs,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXtst,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxtst,
   libinput,
   libxcb,
   libxkbcommon,
@@ -47,15 +47,15 @@ let
       dbus
       fontconfig
       gccForLibs
-      libX11
-      libXcomposite
-      libXcursor
-      libXdamage
-      libXext
-      libXi
-      libXrandr
-      libXrender
-      libXtst
+      libx11
+      libxcomposite
+      libxcursor
+      libxdamage
+      libxext
+      libxi
+      libxrandr
+      libxrender
+      libxtst
       libinput
       libxcb
       libxkbcommon
diff --git a/pkgs/applications/video/hyperion-ng/default.nix b/pkgs/applications/video/hyperion-ng/default.nix
index adb9eebc91ba..618d690d7609 100644
--- a/pkgs/applications/video/hyperion-ng/default.nix
+++ b/pkgs/applications/video/hyperion-ng/default.nix
@@ -14,9 +14,9 @@
   libcec,
   libftdi1,
   libusb1,
-  libX11,
+  libx11,
   libxcb,
-  libXrandr,
+  libxrandr,
   python3,
   qtbase,
   qtserialport,
@@ -47,9 +47,9 @@ stdenv.mkDerivation rec {
     hidapi
     libftdi1
     libusb1
-    libX11
+    libx11
     libxcb
-    libXrandr
+    libxrandr
     flatbuffers
     protobuf
     mbedtls
diff --git a/pkgs/applications/video/jellyfin-desktop/default.nix b/pkgs/applications/video/jellyfin-desktop/default.nix
index 8c69b74ca47a..12ac1682972f 100644
--- a/pkgs/applications/video/jellyfin-desktop/default.nix
+++ b/pkgs/applications/video/jellyfin-desktop/default.nix
@@ -14,7 +14,7 @@
   mpvqt,
   libcec,
   SDL2,
-  libXrandr,
+  libxrandr,
   cacert,
   nix-update-script,
 }:
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     SDL2
 
     # frame rate switching
-    libXrandr
+    libxrandr
     cacert
   ]
   ++ lib.optional (!stdenv.hostPlatform.isDarwin) mpvqt;
diff --git a/pkgs/applications/video/kaffeine/default.nix b/pkgs/applications/video/kaffeine/default.nix
index 66527511271b..c730a82499a6 100644
--- a/pkgs/applications/video/kaffeine/default.nix
+++ b/pkgs/applications/video/kaffeine/default.nix
@@ -6,10 +6,10 @@
   extra-cmake-modules,
   libvlc,
   libv4l,
-  libX11,
+  libx11,
   kidletime,
   kdelibs4support,
-  libXScrnSaver,
+  libxscrnsaver,
   wrapQtAppsHook,
   qtx11extras,
 }:
@@ -35,11 +35,11 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libvlc
     libv4l
-    libX11
+    libx11
     kidletime
     qtx11extras
     kdelibs4support
-    libXScrnSaver
+    libxscrnsaver
   ];
 
   meta = {
diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix
index 65a25fb06dfa..ae3566402649 100644
--- a/pkgs/applications/video/kodi/addons/youtube/default.nix
+++ b/pkgs/applications/video/kodi/addons/youtube/default.nix
@@ -10,13 +10,13 @@
 buildKodiAddon rec {
   pname = "youtube";
   namespace = "plugin.video.youtube";
-  version = "7.4.0";
+  version = "7.4.0.1";
 
   src = fetchFromGitHub {
     owner = "anxdpanic";
     repo = "plugin.video.youtube";
     rev = "v${version}";
-    hash = "sha256-IEfgpl/uuELQ+4dVqek7/iCHW+sooVZ5eiASNXnm5EA=";
+    hash = "sha256-8cWwsaF37tVfj3ATWVn9r2UMwQa4SZiXL3x8GW67EfE=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix
index b4a87cee6961..4a7392e6d4a3 100644
--- a/pkgs/applications/video/kodi/unwrapped.nix
+++ b/pkgs/applications/video/kodi/unwrapped.nix
@@ -92,17 +92,17 @@
   lirc,
   mesa-gl-headers,
   x11Support ? true,
-  libX11,
+  libx11,
   xorgproto,
-  libXt,
-  libXmu,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXtst,
-  libXfixes,
+  libxt,
+  libxmu,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxtst,
+  libxfixes,
   xdpyinfo,
-  libXdmcp,
+  libxdmcp,
   dbusSupport ? true,
   dbus,
   joystickSupport ? true,
@@ -350,16 +350,16 @@ stdenv.mkDerivation (
       zlib
     ]
     ++ lib.optionals x11Support [
-      libX11
+      libx11
       xorgproto
-      libXt
-      libXmu
-      libXext.dev
-      libXdmcp
-      libXinerama
-      libXrandr.dev
-      libXtst
-      libXfixes
+      libxt
+      libxmu
+      libxext.dev
+      libxdmcp
+      libxinerama
+      libxrandr.dev
+      libxtst
+      libxfixes
     ]
     ++ lib.optional dbusSupport dbus
     ++ lib.optional joystickSupport cwiid
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index fdf4f39b017d..b087115ccf6d 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -16,18 +16,18 @@
   fribidiSupport ? true,
   fribidi,
   x11Support ? true,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   libGLU,
   libGL,
   xineramaSupport ? true,
-  libXinerama,
+  libxinerama,
   xvSupport ? true,
-  libXv,
+  libxv,
   alsaSupport ? stdenv.hostPlatform.isLinux,
   alsa-lib,
   screenSaverSupport ? true,
-  libXScrnSaver,
+  libxscrnsaver,
   vdpauSupport ? false,
   libvdpau,
   cddaSupport ? !stdenv.hostPlatform.isDarwin,
@@ -146,16 +146,16 @@ stdenv.mkDerivation {
   ++ lib.optional fontconfigSupport fontconfig
   ++ lib.optional fribidiSupport fribidi
   ++ lib.optionals x11Support [
-    libX11
-    libXext
+    libx11
+    libxext
     libGLU
     libGL
   ]
   ++ lib.optional alsaSupport alsa-lib
-  ++ lib.optional xvSupport libXv
+  ++ lib.optional xvSupport libxv
   ++ lib.optional theoraSupport libtheora
   ++ lib.optional cacaSupport libcaca
-  ++ lib.optional xineramaSupport libXinerama
+  ++ lib.optional xineramaSupport libxinerama
   ++ lib.optional dvdnavSupport libdvdnav
   ++ lib.optional dvdreadSupport libdvdread
   ++ lib.optional bluraySupport libbluray
@@ -167,7 +167,7 @@ stdenv.mkDerivation {
   ]
   ++ lib.optional x264Support x264
   ++ lib.optional pulseSupport libpulseaudio
-  ++ lib.optional screenSaverSupport libXScrnSaver
+  ++ lib.optional screenSaverSupport libxscrnsaver
   ++ lib.optional lameSupport lame
   ++ lib.optional vdpauSupport libvdpau
   ++ lib.optional speexSupport speex
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index 1fd414087914..483bf8df6d3b 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -19,13 +19,13 @@
   libsamplerate,
   libbluray,
   lzo,
-  libX11,
-  libXv,
-  libXrandr,
-  libXvMC,
-  libXinerama,
-  libXxf86vm,
-  libXmu,
+  libx11,
+  libxv,
+  libxrandr,
+  libxvmc,
+  libxinerama,
+  libxxf86vm,
+  libxmu,
   yasm,
   libuuid,
   taglib,
@@ -75,14 +75,14 @@ stdenv.mkDerivation rec {
     alsa-lib
     libpulseaudio
     fftwSinglePrec
-    libX11
-    libXv
-    libXrandr
-    libXvMC
-    libXmu
-    libXinerama
-    libXxf86vm
-    libXmu
+    libx11
+    libxv
+    libxrandr
+    libxvmc
+    libxmu
+    libxinerama
+    libxxf86vm
+    libxmu
     libuuid
     taglib
     exiv2
diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix
index a79bb1e575ae..7889794a06c1 100644
--- a/pkgs/applications/video/natron/default.nix
+++ b/pkgs/applications/video/natron/default.nix
@@ -12,7 +12,7 @@
   expat,
   extra-cmake-modules,
   glog,
-  libXdmcp,
+  libxdmcp,
   python312,
   wayland,
 }:
@@ -76,7 +76,7 @@ stdenv.mkDerivation {
     wayland
     glog
     ceres-solver
-    libXdmcp
+    libxdmcp
   ];
 
   postInstall = ''
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 62e3f8a03e32..363137c4bdad 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -18,7 +18,7 @@
   libjack2,
   libxkbcommon,
   libpthread-stubs,
-  libXdmcp,
+  libxdmcp,
   qtbase,
   qtsvg,
   speex,
@@ -140,7 +140,7 @@ stdenv.mkDerivation (finalAttrs: {
     libv4l
     libxkbcommon
     libpthread-stubs
-    libXdmcp
+    libxdmcp
     qtbase
     qtsvg
     speex
diff --git a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
index 480f2b942416..96efc3f3d892 100644
--- a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
@@ -17,7 +17,7 @@
   qtbase,
   stdenv,
   websocketpp,
-  libXScrnSaver,
+  libxscrnsaver,
   libusb1,
   pkg-config,
   # #FIXME: Could not get cmake to pick up on these dependencies
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     procps
     qtbase
     websocketpp
-    libXScrnSaver
+    libxscrnsaver
     libusb1
   ];
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
index f0c08e3012b2..b4546c885f8e 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
@@ -9,9 +9,9 @@
   wayland-scanner,
   obs-studio,
   libffi,
-  libX11,
-  libXau,
-  libXdmcp,
+  libx11,
+  libxau,
+  libxdmcp,
   libxcb,
   vulkan-headers,
   vulkan-loader,
@@ -45,9 +45,9 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libGL
     libffi
-    libX11
-    libXau
-    libXdmcp
+    libx11
+    libxau
+    libxdmcp
     libxcb
     vulkan-headers
     vulkan-loader
@@ -60,8 +60,8 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     substituteInPlace src/glinject.c \
       --replace "libGLX.so.0" "${lib.getLib libGL}/lib/libGLX.so.0" \
-      --replace "libX11.so.6" "${lib.getLib libX11}/lib/libX11.so.6" \
-      --replace "libX11-xcb.so.1" "${lib.getLib libX11}/lib/libX11-xcb.so.1" \
+      --replace "libX11.so.6" "${lib.getLib libx11}/lib/libX11.so.6" \
+      --replace "libX11-xcb.so.1" "${lib.getLib libx11}/lib/libX11-xcb.so.1" \
       --replace "libxcb-dri3.so.0" "${lib.getLib libxcb}/lib/libxcb-dri3.so.0" \
       --replace "libEGL.so.1" "${lib.getLib libGL}/lib/libEGL.so.1" \
       --replace "libvulkan.so.1" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1"
diff --git a/pkgs/applications/video/obs-studio/plugins/wlrobs.nix b/pkgs/applications/video/obs-studio/plugins/wlrobs.nix
index eeda8f3eb233..d77e494a71b0 100644
--- a/pkgs/applications/video/obs-studio/plugins/wlrobs.nix
+++ b/pkgs/applications/video/obs-studio/plugins/wlrobs.nix
@@ -7,7 +7,7 @@
   ninja,
   wayland,
   obs-studio,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation {
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   buildInputs = [
     wayland
     obs-studio
-    libX11
+    libx11
   ];
 
   meta = {
diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
index c50603dc3355..e58e8475fe22 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -5,11 +5,11 @@
   alsa-lib,
   ffmpeg,
   libjack2,
-  libX11,
-  libXext,
-  libXinerama,
+  libx11,
+  libxext,
+  libxinerama,
   qtx11extras,
-  libXfixes,
+  libxfixes,
   libGLU,
   libGL,
   pkg-config,
@@ -60,10 +60,10 @@ stdenv.mkDerivation {
     alsa-lib
     ffmpeg
     libjack2
-    libX11
-    libXext
-    libXfixes
-    libXinerama
+    libx11
+    libxext
+    libxfixes
+    libxinerama
     libGLU
     libGL
     libpulseaudio
diff --git a/pkgs/applications/video/vdr/xineliboutput/default.nix b/pkgs/applications/video/vdr/xineliboutput/default.nix
index 405d548bd7f2..65ee991e2b2f 100644
--- a/pkgs/applications/video/vdr/xineliboutput/default.nix
+++ b/pkgs/applications/video/vdr/xineliboutput/default.nix
@@ -10,10 +10,10 @@
   libextractor,
   libglvnd,
   libGLU,
-  libX11,
-  libXext,
-  libXrender,
-  libXrandr,
+  libx11,
+  libxext,
+  libxrender,
+  libxrandr,
   ffmpeg,
   avahi,
   wayland,
@@ -71,10 +71,10 @@ let
       libglvnd
       libGLU
       libvdpau
-      libXext
-      libXrandr
-      libXrender
-      libX11
+      libxext
+      libxrandr
+      libxrender
+      libx11
       vdr
       xine-lib
       avahi
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 0ebfbbaf9e57..935e5ab09084 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -71,6 +71,7 @@ let
           vdemeester
           teutat3s
         ];
+        identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "docker" version;
       };
 
       docker-runc = runc.overrideAttrs {
@@ -248,6 +249,7 @@ let
           meta = docker-meta // {
             homepage = "https://mobyproject.org/";
             description = "Collaborative project for the container ecosystem to assemble container-based systems";
+            identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "mobyproject" version;
           };
         }
       );
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 2f12f6db51c0..49d1f1cae540 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -10,12 +10,12 @@
   pam,
   libxslt,
   libxml2,
-  libX11,
+  libx11,
   xorgproto,
-  libXext,
-  libXcursor,
-  libXfixes,
-  libXmu,
+  libxext,
+  libxcursor,
+  libxfixes,
+  libxmu,
   SDL2,
   libcap,
   libGL,
@@ -23,8 +23,8 @@
   libpng,
   glib,
   lvm2,
-  libXrandr,
-  libXinerama,
+  libxrandr,
+  libxinerama,
   libopus,
   libtpms,
   qt6,
@@ -144,9 +144,9 @@ stdenv.mkDerivation (finalAttrs: {
     libxslt
     libxml2
     xorgproto
-    libX11
-    libXext
-    libXcursor
+    libx11
+    libxext
+    libxcursor
     libcap
     glib
     lvm2
@@ -156,8 +156,8 @@ stdenv.mkDerivation (finalAttrs: {
     pam
     makeself
     perl
-    libXmu
-    libXrandr
+    libxmu
+    libxrandr
     libpng
     libopus
     libtpms
@@ -172,7 +172,7 @@ stdenv.mkDerivation (finalAttrs: {
     qtbase
     qttools
     qtscxml
-    libXinerama
+    libxinerama
     SDL2
     libGLU
   ]
@@ -208,7 +208,7 @@ stdenv.mkDerivation (finalAttrs: {
       s@"libdbus-1\.so\.3"@"${dbus.lib}/lib/libdbus-1.so.3"@g'
 
     grep 'libXfixes\.so\.3'     src include -rI --files-with-match | xargs sed -i -e '
-      s@"libXfixes\.so\.3"@"${libXfixes.out}/lib/libXfixes.so.3"@g'
+      s@"libXfixes\.so\.3"@"${libxfixes.out}/lib/libXfixes.so.3"@g'
 
     grep 'libasound\.so\.2'     src include -rI --files-with-match | xargs sed -i -e '
       s@"libasound\.so\.2"@"${alsa-lib.out}/lib/libasound.so.2"@g'
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix
index 06d245582a38..39b79420732b 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix
@@ -5,11 +5,11 @@
   lib,
   pam,
   libxslt,
-  libXext,
-  libXcursor,
-  libXmu,
+  libxext,
+  libxcursor,
+  libxmu,
   glib,
-  libXrandr,
+  libxrandr,
   dbus,
   xz,
   pkg-config,
@@ -58,11 +58,11 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     dbus
     libxslt
-    libXext
-    libXcursor
+    libxext
+    libxcursor
     pam
-    libXmu
-    libXrandr
+    libxmu
+    libxrandr
   ];
 
   KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
diff --git a/pkgs/applications/window-managers/2bwm/default.nix b/pkgs/applications/window-managers/2bwm/default.nix
index f5a54b9c229b..3b2053fdca26 100644
--- a/pkgs/applications/window-managers/2bwm/default.nix
+++ b/pkgs/applications/window-managers/2bwm/default.nix
@@ -6,7 +6,7 @@
   libxcb,
   libxcb-keysyms,
   libxcb-wm,
-  libX11,
+  libx11,
   libxcb-util,
   xcbutilxrm,
 }:
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     libxcb
     libxcb-keysyms
     libxcb-wm
-    libX11
+    libx11
     libxcb-util
     xcbutilxrm
   ];
diff --git a/pkgs/applications/window-managers/evilwm/default.nix b/pkgs/applications/window-managers/evilwm/default.nix
index c238f048874b..0830c3ca4986 100644
--- a/pkgs/applications/window-managers/evilwm/default.nix
+++ b/pkgs/applications/window-managers/evilwm/default.nix
@@ -2,10 +2,10 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXext,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxext,
+  libxrandr,
+  libxrender,
   xorgproto,
   patches ? [ ],
 }:
@@ -20,10 +20,10 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    libX11
-    libXext
-    libXrandr
-    libXrender
+    libx11
+    libxext
+    libxrandr
+    libxrender
     xorgproto
   ];
 
diff --git a/pkgs/applications/window-managers/hyprwm/hypr/default.nix b/pkgs/applications/window-managers/hyprwm/hypr/default.nix
index 30f79ff8d5ee..4aa1d9559d3b 100644
--- a/pkgs/applications/window-managers/hyprwm/hypr/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/hypr/default.nix
@@ -7,8 +7,8 @@
   glib,
   gtkmm3,
   harfbuzz,
-  libX11,
-  libXdmcp,
+  libx11,
+  libxdmcp,
   libxcb,
   makeWrapper,
   pcre2,
@@ -46,8 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     gtkmm3
     harfbuzz
-    libX11
-    libXdmcp
+    libx11
+    libxdmcp
     libxcb
     pcre2
     libxcb-cursor
@@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Tiling X11 window manager written in modern C++";
     license = lib.licenses.bsd3;
     maintainers = [ ];
-    inherit (libX11.meta) platforms;
+    inherit (libx11.meta) platforms;
     mainProgram = "Hypr";
   };
 })
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index a104a4902897..7a2432747630 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -13,7 +13,7 @@
   libxcb-wm,
   xcbutilxrm,
   libstartup_notification,
-  libX11,
+  libx11,
   pcre2,
   libev,
   yajl,
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
     xcbutilxrm
     libxkbcommon
     libstartup_notification
-    libX11
+    libx11
     pcre2
     libev
     yajl
diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index bfa39114c90d..4de1997717c3 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -8,7 +8,7 @@
   libxcb-keysyms,
   libxcb-image,
   pam,
-  libX11,
+  libx11,
   libev,
   cairo,
   libxkbcommon,
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     libxcb-keysyms
     libxcb-image
     pam
-    libX11
+    libx11
     libev
     cairo
     libxkbcommon
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index 6918a964de26..e996b27c4657 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -10,7 +10,7 @@
   libxcb-image,
   xcbutilxrm,
   pam,
-  libX11,
+  libx11,
   libev,
   cairo,
   libxkbcommon,
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     libxcb-image
     xcbutilxrm
     pam
-    libX11
+    libx11
     libev
     cairo
     libxkbcommon
diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix
index 098f7d4c3e62..2ecbea730741 100644
--- a/pkgs/applications/window-managers/ion-3/default.nix
+++ b/pkgs/applications/window-managers/ion-3/default.nix
@@ -7,8 +7,8 @@
   groff,
   libice,
   libsm,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
 }:
 
 stdenv.mkDerivation rec {
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libice
     libsm
-    libX11
-    libXext
+    libx11
+    libxext
     lua
     gettext
     groff
diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index 79b932157728..e1c9c32e4e30 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -8,14 +8,14 @@
   fontconfig,
   freetype,
   gettext,
-  libX11,
-  libXau,
-  libXdmcp,
-  libXext,
-  libXft,
-  libXinerama,
-  libXmu,
-  libXpm,
+  libx11,
+  libxau,
+  libxdmcp,
+  libxext,
+  libxft,
+  libxinerama,
+  libxmu,
+  libxpm,
   libjpeg,
   libpng,
   librsvg,
@@ -50,14 +50,14 @@ stdenv.mkDerivation rec {
     expat
     fontconfig
     freetype
-    libX11
-    libXau
-    libXdmcp
-    libXext
-    libXft
-    libXinerama
-    libXmu
-    libXpm
+    libx11
+    libxau
+    libxdmcp
+    libxext
+    libxft
+    libxinerama
+    libxmu
+    libxpm
     libjpeg
     libpng
     librsvg
diff --git a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
index b240cfc8e9ef..ba57e5bae6f7 100644
--- a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
+++ b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
@@ -5,7 +5,7 @@
   cmake,
   pkg-config,
   gettext,
-  libXpm,
+  libxpm,
   libGL,
   fltk,
   hicolor-icon-theme,
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libXpm
+    libxpm
     libGL
     fltk
     hicolor-icon-theme
diff --git a/pkgs/applications/window-managers/lemonbar/xft.nix b/pkgs/applications/window-managers/lemonbar/xft.nix
index d2fb54a330ea..f288bf4ee0fb 100644
--- a/pkgs/applications/window-managers/lemonbar/xft.nix
+++ b/pkgs/applications/window-managers/lemonbar/xft.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   perl,
   libxcb,
-  libXft,
+  libxft,
 }:
 
 stdenv.mkDerivation {
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     libxcb
-    libXft
+    libxft
     perl
   ];
 
diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix
index 56ffaa458cf4..d1fb089ca0f1 100644
--- a/pkgs/applications/window-managers/tabbed/default.nix
+++ b/pkgs/applications/window-managers/tabbed/default.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchgit,
   xorgproto,
-  libX11,
-  libXft,
+  libx11,
+  libxft,
   customConfig ? null,
   patches ? [ ],
 }:
@@ -27,8 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     xorgproto
-    libX11
-    libXft
+    libx11
+    libxft
   ];
 
   makeFlags = [ "CC:=$(CC)" ];
diff --git a/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix b/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix
index 8728631bf4e1..89f8308802cc 100644
--- a/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix
+++ b/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix
@@ -5,7 +5,7 @@
   lib,
   libice,
   libsm,
-  libX11,
+  libx11,
   stdenv,
   writeText,
 }:
@@ -58,7 +58,7 @@
           prependToVar dotnetRuntimeDeps \
             "${lib.getLib libice}" \
             "${lib.getLib libsm}" \
-            "${lib.getLib libX11}"
+            "${lib.getLib libx11}"
         '';
       }
     );
diff --git a/pkgs/build-support/fetchfossil/nix-prefetch-fossil b/pkgs/build-support/fetchfossil/nix-prefetch-fossil
new file mode 100755
index 000000000000..1f3c2636355e
--- /dev/null
+++ b/pkgs/build-support/fetchfossil/nix-prefetch-fossil
@@ -0,0 +1,125 @@
+#!/bin/sh -e
+
+url=
+rev=
+expHash=
+hashType="${NIX_HASH_ALGO:-sha256}"
+
+# Parse command line arguments
+argi=0
+argfun=""
+for arg; do
+    if test -z "$argfun"; then
+        case $arg in
+            --url) argfun=set_url;;
+            --rev) argfun=set_rev;;
+            --hash) argfun=set_expHash;;
+            --help|-h)
+                echo "Usage: nix-prefetch-fossil [options] [URL [REVISION [EXPECTED-HASH]]]"
+                echo ""
+                echo "Options:"
+                echo "  --url URL       Fossil repository URL"
+                echo "  --rev REV       Fossil revision/tag/branch (default: trunk)"
+                echo "  --hash HASH     Expected hash"
+                echo "  --help          Show this help message"
+                exit 0
+                ;;
+            *)
+                argi=$((argi + 1))
+                case $argi in
+                    1) url=$arg;;
+                    2) rev=$arg;;
+                    3) expHash=$arg;;
+                    *) echo "Too many arguments" >&2; exit 1;;
+                esac
+                ;;
+        esac
+    else
+        case $argfun in
+            set_*)
+                var=${argfun#set_}
+                eval "$var='$arg'"
+                ;;
+        esac
+        argfun=""
+    fi
+done
+
+if test -z "$url"; then
+    echo "error: URL is required" >&2
+    echo "Usage: nix-prefetch-fossil [URL [REVISION [EXPECTED-HASH]]]" >&2
+    exit 1
+fi
+
+# Default to trunk if no revision specified
+if test -z "$rev"; then
+    rev="trunk"
+fi
+
+# If the hash was given, check if we already have it in store
+if test -n "$expHash"; then
+    finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" fossil-archive)
+    if nix-store --check-validity "$finalPath" 2> /dev/null; then
+        echo "$expHash"
+        exit 0
+    fi
+fi
+
+# Create temporary directory for cloning
+tmpPath="$(mktemp -d --tmpdir fossil-checkout-tmp-XXXXXXXX)"
+cleanup() { rm -rf "$tmpPath"; }
+trap cleanup EXIT
+
+# Fossil wants to write global configuration to $HOME/.fossil
+# We'll let it write to the temp directory instead
+export HOME="$tmpPath"
+
+echo "Fetching Fossil repository $url at revision $rev..." >&2
+
+# Clone the repository
+fossil clone -A nobody "$url" "$tmpPath/fossil-clone.fossil" >&2
+
+# Create directory for checkout
+checkoutDir="$tmpPath/checkout"
+mkdir -p "$checkoutDir"
+
+# Open the repository at the specified revision
+cd "$checkoutDir"
+fossil open "$tmpPath/fossil-clone.fossil" "$rev" >&2
+
+# Get the actual commit hash and date
+checkoutLine=$(fossil info | grep ^checkout:)
+# Remove 'checkout:' prefix and squeeze multiple spaces, then extract fields
+actualRev=$(echo "$checkoutLine" | sed 's/^checkout:[[:space:]]*//' | tr -s ' ' | cut -d' ' -f1)
+# Extract date (format: checkout:     HASH YYYY-MM-DD HH:MM:SS UTC)
+actualDate=$(echo "$checkoutLine" | sed 's/^checkout:[[:space:]]*//' | tr -s ' ' | cut -d' ' -f2)
+cd - >/dev/null
+
+# Remove the fossil checkout file
+rm -f "$checkoutDir/.fslckout"
+
+# Calculate the hash
+hash=$(nix-hash --type "$hashType" --base32 "$checkoutDir")
+echo "hash is $hash" >&2
+
+# Add to store if we don't have an expected hash or if it matches
+if test -z "$expHash" || test "$expHash" = "$hash"; then
+    finalPath=$(nix-store --add-fixed --recursive "$hashType" "$checkoutDir")
+    echo "path is $finalPath" >&2
+elif test -n "$expHash" && test "$expHash" != "$hash"; then
+    echo "error: hash mismatch for Fossil repository $url" >&2
+    echo "  expected: $expHash" >&2
+    echo "  actual:   $hash" >&2
+    exit 1
+fi
+
+# Output JSON result
+cat <<EOF
+{
+  "url": "$url",
+  "rev": "$actualRev",
+  "date": "$actualDate",
+  "$hashType": "$hash",
+  "hash": "$(nix-hash --to-sri --type $hashType $hash)"
+}
+EOF
diff --git a/pkgs/by-name/_1/_1oom/package.nix b/pkgs/by-name/_1/_1oom/package.nix
index 6a49d1a9525d..23e47251488a 100644
--- a/pkgs/by-name/_1/_1oom/package.nix
+++ b/pkgs/by-name/_1/_1oom/package.nix
@@ -6,7 +6,7 @@
   autoreconfHook,
   allegro,
   libsamplerate,
-  libX11,
+  libx11,
   SDL2,
   SDL2_mixer,
   readline,
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     allegro
     libsamplerate
-    libX11
+    libx11
     SDL2
     SDL2_mixer
     readline
diff --git a/pkgs/by-name/_1/_1password-gui/linux.nix b/pkgs/by-name/_1/_1password-gui/linux.nix
index 57e3c76dea8b..c2b1b4526021 100644
--- a/pkgs/by-name/_1/_1password-gui/linux.nix
+++ b/pkgs/by-name/_1/_1password-gui/linux.nix
@@ -18,12 +18,12 @@
   gdk-pixbuf,
   glib,
   gtk3,
-  libX11,
-  libXcomposite,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXrandr,
+  libx11,
+  libxcomposite,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxrandr,
   libdrm,
   libxcb,
   libxkbcommon,
@@ -82,12 +82,12 @@ stdenv.mkDerivation {
           gdk-pixbuf
           glib
           gtk3
-          libX11
-          libXcomposite
-          libXdamage
-          libXext
-          libXfixes
-          libXrandr
+          libx11
+          libxcomposite
+          libxdamage
+          libxext
+          libxfixes
+          libxrandr
           libdrm
           libxcb
           libxkbcommon
diff --git a/pkgs/by-name/_2/_2ship2harkinian/package.nix b/pkgs/by-name/_2/_2ship2harkinian/package.nix
index 5f098b8518fd..4cccacc22e35 100644
--- a/pkgs/by-name/_2/_2ship2harkinian/package.nix
+++ b/pkgs/by-name/_2/_2ship2harkinian/package.nix
@@ -27,7 +27,7 @@
   libogg,
   libopus,
   libvorbis,
-  libX11,
+  libx11,
   opusfile,
   sdl_gamecontrollerdb,
   makeDesktopItem,
@@ -148,7 +148,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
     libpulseaudio
     libvorbis
-    libX11
+    libx11
     libzip
     nlohmann_json
     (lib.getDev opusfile)
diff --git a/pkgs/by-name/_4/_4d-minesweeper/package.nix b/pkgs/by-name/_4/_4d-minesweeper/package.nix
index bb297d064b63..27b16a398887 100644
--- a/pkgs/by-name/_4/_4d-minesweeper/package.nix
+++ b/pkgs/by-name/_4/_4d-minesweeper/package.nix
@@ -9,14 +9,14 @@
   godot3-export-templates,
   godot3-headless,
   libGLU,
-  libX11,
-  libXcursor,
-  libXext,
-  libXfixes,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxcursor,
+  libxext,
+  libxfixes,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxrender,
   libglvnd,
   libpulseaudio,
   zlib,
@@ -43,14 +43,14 @@ stdenv.mkDerivation {
     gcc-unwrapped.lib
     git
     libGLU
-    libX11
-    libXcursor
-    libXext
-    libXfixes
-    libXi
-    libXinerama
-    libXrandr
-    libXrender
+    libx11
+    libxcursor
+    libxext
+    libxfixes
+    libxi
+    libxinerama
+    libxrandr
+    libxrender
     libglvnd
     libpulseaudio
     zlib
diff --git a/pkgs/by-name/_9/_9menu/package.nix b/pkgs/by-name/_9/_9menu/package.nix
index 1d5b56aba11d..7e29940cca1e 100644
--- a/pkgs/by-name/_9/_9menu/package.nix
+++ b/pkgs/by-name/_9/_9menu/package.nix
@@ -6,8 +6,8 @@
   pkg-config,
   meson,
   ninja,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -27,8 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
   ];
   buildInputs = [
-    libX11
-    libXext
+    libx11
+    libxext
   ];
 
   passthru.updateScript = nix-update-script {
@@ -44,6 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "9menu";
     license = lib.licenses.gpl3Plus;
     maintainers = [ ];
-    platforms = libX11.meta.platforms;
+    platforms = libx11.meta.platforms;
   };
 })
diff --git a/pkgs/by-name/a-/a-keys-path/package.nix b/pkgs/by-name/a-/a-keys-path/package.nix
index c8e9c37a3836..f8110e3b1cb8 100644
--- a/pkgs/by-name/a-/a-keys-path/package.nix
+++ b/pkgs/by-name/a-/a-keys-path/package.nix
@@ -10,13 +10,13 @@
   alsa-lib,
   godot3-export-templates,
   godot3-headless,
-  libX11,
-  libXcursor,
-  libXext,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxcursor,
+  libxext,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxrender,
   libglvnd,
   writableTmpDirAsHomeHook,
 }:
@@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXcursor
-    libXext
-    libXi
-    libXinerama
-    libXrandr
-    libXrender
+    libx11
+    libxcursor
+    libxext
+    libxi
+    libxinerama
+    libxrandr
+    libxrender
     libglvnd
   ];
 
diff --git a/pkgs/by-name/aa/aaaaxy/package.nix b/pkgs/by-name/aa/aaaaxy/package.nix
index fdde52c8e985..825d3dbe8c95 100644
--- a/pkgs/by-name/aa/aaaaxy/package.nix
+++ b/pkgs/by-name/aa/aaaaxy/package.nix
@@ -4,13 +4,13 @@
   buildGoModule,
   alsa-lib,
   libGL,
-  libX11,
-  libXcursor,
-  libXext,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXxf86vm,
+  libx11,
+  libxcursor,
+  libxext,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxxf86vm,
   go-licenses,
   pkg-config,
   zip,
@@ -37,13 +37,13 @@ buildGoModule rec {
   buildInputs = [
     alsa-lib
     libGL
-    libX11
-    libXcursor
-    libXext
-    libXi
-    libXinerama
-    libXrandr
-    libXxf86vm
+    libx11
+    libxcursor
+    libxext
+    libxi
+    libxinerama
+    libxrandr
+    libxxf86vm
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ac/ace-of-penguins/package.nix b/pkgs/by-name/ac/ace-of-penguins/package.nix
index 28ec3c649014..5ca4ce5b5227 100644
--- a/pkgs/by-name/ac/ace-of-penguins/package.nix
+++ b/pkgs/by-name/ac/ace-of-penguins/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchurl,
   copyDesktopItems,
-  libX11,
-  libXpm,
+  libx11,
+  libxpm,
   libpng,
   makeDesktopItem,
   zlib,
@@ -34,8 +34,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXpm
+    libx11
+    libxpm
     libpng
     zlib
   ];
diff --git a/pkgs/by-name/ad/adlplug/package.nix b/pkgs/by-name/ad/adlplug/package.nix
index 1eadcfd29e26..041939ce0505 100644
--- a/pkgs/by-name/ad/adlplug/package.nix
+++ b/pkgs/by-name/ad/adlplug/package.nix
@@ -9,11 +9,11 @@
   liblo,
   alsa-lib,
   freetype,
-  libX11,
-  libXrandr,
-  libXinerama,
-  libXext,
-  libXcursor,
+  libx11,
+  libxrandr,
+  libxinerama,
+  libxext,
+  libxcursor,
 
   # Enabling JACK requires a JACK server at runtime, no fallback mechanism
   withJack ? false,
@@ -95,11 +95,11 @@ stdenv.mkDerivation {
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
     freetype
-    libX11
-    libXrandr
-    libXinerama
-    libXext
-    libXcursor
+    libx11
+    libxrandr
+    libxinerama
+    libxext
+    libxcursor
   ]
   ++ lib.optionals withJack [ libjack2 ];
 
diff --git a/pkgs/by-name/ae/aeolus/package.nix b/pkgs/by-name/ae/aeolus/package.nix
index 171761c85c27..e3cc65c2494c 100644
--- a/pkgs/by-name/ae/aeolus/package.nix
+++ b/pkgs/by-name/ae/aeolus/package.nix
@@ -7,8 +7,8 @@
   alsa-lib,
   libjack2,
   libclxclient,
-  libX11,
-  libXft,
+  libx11,
+  libxft,
   readline,
   aeolus-stops,
 }:
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
     alsa-lib
     libjack2
     libclxclient
-    libX11
-    libXft
+    libx11
+    libxft
     readline
   ];
 
diff --git a/pkgs/by-name/ae/aether-lv2/package.nix b/pkgs/by-name/ae/aether-lv2/package.nix
index 7a0abfdc3b82..fa67a7d04c53 100644
--- a/pkgs/by-name/ae/aether-lv2/package.nix
+++ b/pkgs/by-name/ae/aether-lv2/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   lv2,
-  libX11,
+  libx11,
   libGL,
   libGLU,
   libgbm,
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     lv2
-    libX11
+    libx11
     libGL
     libGLU
     libgbm
diff --git a/pkgs/by-name/ag/age/package.nix b/pkgs/by-name/ag/age/package.nix
index 9ac09fee82be..ecbb1d9d5309 100644
--- a/pkgs/by-name/ag/age/package.nix
+++ b/pkgs/by-name/ag/age/package.nix
@@ -16,14 +16,14 @@
   nix-update-script,
 }:
 
-buildGoModule (final: {
+buildGoModule (finalAttrs: {
   pname = "age";
   version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "FiloSottile";
     repo = "age";
-    tag = "v${final.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-Qs/q3zQYV0PukABBPf/aU5V1oOhw95NG6K301VYJk8A=";
   };
 
@@ -32,7 +32,7 @@ buildGoModule (final: {
   ldflags = [
     "-s"
     "-w"
-    "-X main.Version=v${final.version}"
+    "-X main.Version=v${finalAttrs.version}"
   ];
 
   nativeBuildInputs = [ installShellFiles ];
@@ -67,15 +67,15 @@ buildGoModule (final: {
   # convenience function for wrapping sops with plugins
   passthru.withPlugins =
     filter:
-    runCommand "age-${final.version}-with-plugins" { nativeBuildInputs = [ makeWrapper ]; } ''
-      makeWrapper ${lib.getBin final.finalPackage}/bin/age $out/bin/age \
-        --prefix PATH : "${lib.makeBinPath (filter final.passthru.plugins)}"
+    runCommand "age-${finalAttrs.version}-with-plugins" { nativeBuildInputs = [ makeWrapper ]; } ''
+      makeWrapper ${lib.getBin finalAttrs.finalPackage}/bin/age $out/bin/age \
+        --prefix PATH : "${lib.makeBinPath (filter finalAttrs.passthru.plugins)}"
     '';
 
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    changelog = "https://github.com/FiloSottile/age/releases/tag/v${final.version}";
+    changelog = "https://github.com/FiloSottile/age/releases/tag/v${finalAttrs.version}";
     homepage = "https://age-encryption.org/";
     description = "Modern encryption tool with small explicit keys";
     license = lib.licenses.bsd3;
diff --git a/pkgs/by-name/ag/agg/package.nix b/pkgs/by-name/ag/agg/package.nix
index 9eb7dd218ac8..698b2ff62037 100644
--- a/pkgs/by-name/ag/agg/package.nix
+++ b/pkgs/by-name/ag/agg/package.nix
@@ -8,7 +8,7 @@
   pkg-config,
   freetype,
   SDL,
-  libX11,
+  libx11,
 }:
 let
   stdenv = gccStdenv;
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
     SDL
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
+    libx11
   ];
 
   postPatch = ''
@@ -51,8 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
     "--enable-examples=no"
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    "--x-includes=${lib.getDev libX11}/include"
-    "--x-libraries=${lib.getLib libX11}/lib"
+    "--x-includes=${lib.getDev libx11}/include"
+    "--x-libraries=${lib.getLib libx11}/lib"
   ];
 
   env.NIX_CFLAGS_COMPILE = toString [ "-fpermissive" ];
diff --git a/pkgs/by-name/ai/airshipper/package.nix b/pkgs/by-name/ai/airshipper/package.nix
index 73f838a1f1e4..3e21da8fefb4 100644
--- a/pkgs/by-name/ai/airshipper/package.nix
+++ b/pkgs/by-name/ai/airshipper/package.nix
@@ -8,10 +8,10 @@
   wayland,
   wayland-protocols,
   libxkbcommon,
-  libX11,
-  libXrandr,
-  libXi,
-  libXcursor,
+  libx11,
+  libxrandr,
+  libxi,
+  libxcursor,
   udev,
   alsa-lib,
   stdenv,
@@ -36,10 +36,10 @@ let
         (lib.getLib stdenv.cc.cc)
         libxkbcommon
         libxcb
-        libX11
-        libXcursor
-        libXrandr
-        libXi
+        libx11
+        libxcursor
+        libxrandr
+        libxi
         vulkan-loader
         libGL
       ];
@@ -76,10 +76,10 @@ rustPlatform.buildRustPackage {
     wayland
     wayland-protocols
     libxkbcommon
-    libX11
-    libXrandr
-    libXi
-    libXcursor
+    libx11
+    libxrandr
+    libxi
+    libxcursor
   ];
   nativeBuildInputs = [
     cmake
@@ -105,10 +105,10 @@ rustPlatform.buildRustPackage {
         fontconfig
         freetype
         libxkbcommon
-        libX11
-        libXrandr
-        libXi
-        libXcursor
+        libx11
+        libxrandr
+        libxi
+        libxcursor
       ];
     in
     ''
diff --git a/pkgs/by-name/ai/airwave/package.nix b/pkgs/by-name/ai/airwave/package.nix
index 9afd4a33d6d2..4f2a4e455157 100644
--- a/pkgs/by-name/ai/airwave/package.nix
+++ b/pkgs/by-name/ai/airwave/package.nix
@@ -6,7 +6,7 @@
   cmake,
   makeWrapper,
   file,
-  libX11,
+  libx11,
   qt5,
   vst2-sdk,
 }:
@@ -33,7 +33,7 @@ multiStdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     file
-    libX11
+    libx11
     qt5.qtbase
     wine-wow64
   ];
diff --git a/pkgs/by-name/al/alacritty-theme/package.nix b/pkgs/by-name/al/alacritty-theme/package.nix
index 0e0ce734fb3c..0f11fbed594c 100644
--- a/pkgs/by-name/al/alacritty-theme/package.nix
+++ b/pkgs/by-name/al/alacritty-theme/package.nix
@@ -5,7 +5,7 @@
   stdenvNoCC,
 }:
 
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "alacritty-theme";
   version = "0-unstable-2025-11-16";
 
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation (self: {
   dontBuild = true;
   preferLocalBuild = true;
 
-  sourceRoot = "${self.src.name}/themes";
+  sourceRoot = "${finalAttrs.src.name}/themes";
   installPhase = ''
     runHook preInstall
     install -Dt $out/share/alacritty-theme *.toml
diff --git a/pkgs/by-name/al/alice/package.nix b/pkgs/by-name/al/alice/package.nix
index 88ef1554dd51..daf66b775658 100644
--- a/pkgs/by-name/al/alice/package.nix
+++ b/pkgs/by-name/al/alice/package.nix
@@ -4,7 +4,7 @@
   fetchzip,
 }:
 
-stdenv.mkDerivation (attrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "Alice";
   version = "2.003";
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation (attrs: {
 
   src = fetchzip {
     url =
-      with attrs;
+      with finalAttrs;
       "https://github.com/cyrealtype/${pname}/releases/download/v${version}/${pname}-v${version}.zip";
     stripRoot = false;
     hash = "sha256-p+tE3DECfJyBIPyafGZ8jDYQ1lPb+iAnEwLyaUy7DW0=";
diff --git a/pkgs/by-name/al/alienarena/package.nix b/pkgs/by-name/al/alienarena/package.nix
index 49d7044c5835..7bd034f88a31 100644
--- a/pkgs/by-name/al/alienarena/package.nix
+++ b/pkgs/by-name/al/alienarena/package.nix
@@ -7,8 +7,8 @@
   libjpeg,
   libogg,
   libvorbis,
-  libX11,
-  libXxf86vm,
+  libx11,
+  libxxf86vm,
   openal,
   pkg-config,
   stdenv,
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
     libjpeg
     libogg
     libvorbis
-    libX11
-    libXxf86vm
+    libx11
+    libxxf86vm
     openal
   ];
 
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 a26dedd94d4f..d988f33f5fe7 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.2341";
+  version = "2.0.2348";
 
   src = fetchFromGitHub {
     owner = "nice-registry";
     repo = "all-the-package-names";
     tag = "v${version}";
-    hash = "sha256-ZjUCNdP5UGq/sqUk7iqx2L2ymby5KcQyQdmdmxv57LY=";
+    hash = "sha256-qr7QluBqFTy78JBHRkd2L0jh4Pxg6Fsy1yMKxtXx6+0=";
   };
 
-  npmDepsHash = "sha256-u/copIR9UIZ6A1k6SSv8CBgHL9rNs/T/m/Zani9+Edg=";
+  npmDepsHash = "sha256-kF8R345gXDbTDxYMr/jkHvEN4ysL/PLEVh/8uZf1D4I=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/al/alliance/package.nix b/pkgs/by-name/al/alliance/package.nix
index 1090c1b81474..a2d43b1f74f9 100644
--- a/pkgs/by-name/al/alliance/package.nix
+++ b/pkgs/by-name/al/alliance/package.nix
@@ -4,9 +4,9 @@
   fetchFromGitHub,
   xorgproto,
   motif,
-  libX11,
-  libXt,
-  libXpm,
+  libx11,
+  libxt,
+  libxpm,
   bison,
   flex,
   automake,
@@ -38,9 +38,9 @@ stdenv.mkDerivation {
   buildInputs = [
     xorgproto
     motif
-    libX11
-    libXt
-    libXpm
+    libx11
+    libxt
+    libxpm
     bison
   ];
 
diff --git a/pkgs/by-name/al/alock/package.nix b/pkgs/by-name/al/alock/package.nix
index 9938810d1196..e7c8f1c004ba 100644
--- a/pkgs/by-name/al/alock/package.nix
+++ b/pkgs/by-name/al/alock/package.nix
@@ -5,10 +5,10 @@
   gitUpdater,
   pkg-config,
   autoreconfHook,
-  libX11,
+  libx11,
   pam,
   libgcrypt,
-  libXrender,
+  libxrender,
   imlib2,
 }:
 
@@ -37,10 +37,10 @@ stdenv.mkDerivation (finalAttrs: {
     autoreconfHook
   ];
   buildInputs = [
-    libX11
+    libx11
     pam
     libgcrypt
-    libXrender
+    libxrender
     imlib2
   ];
 
diff --git a/pkgs/by-name/al/althttpd/package.nix b/pkgs/by-name/al/althttpd/package.nix
index f467d0fd03f1..e8148aa18a5c 100644
--- a/pkgs/by-name/al/althttpd/package.nix
+++ b/pkgs/by-name/al/althttpd/package.nix
@@ -3,16 +3,17 @@
   stdenv,
   fetchfossil,
   openssl,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation {
   pname = "althttpd";
-  version = "0-unstable-2023-08-12";
+  version = "0-unstable-2025-08-22";
 
   src = fetchfossil {
     url = "https://sqlite.org/althttpd/";
-    rev = "c0bdc68e6c56ef25";
-    hash = "sha256-VoDR5MlVlvar9wYA0kUhvDQVjxDwsZlqrNR3u4Tqw5c=";
+    rev = "e9bf26f78e1f5792";
+    hash = "sha256-Q16tqhnPzYrFkrHTC8NBrdpsbrpjPUkdxLwmyYqUHZo=";
   };
 
   buildInputs = [ openssl ];
@@ -23,6 +24,8 @@ stdenv.mkDerivation {
     install -Dm755 -t $out/bin althttpd
   '';
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
     description = "Althttpd webserver";
     homepage = "https://sqlite.org/althttpd/";
diff --git a/pkgs/by-name/al/althttpd/update.sh b/pkgs/by-name/al/althttpd/update.sh
new file mode 100755
index 000000000000..15e6d703cb52
--- /dev/null
+++ b/pkgs/by-name/al/althttpd/update.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p common-updater-scripts jq gawk
+
+set -euo pipefail
+
+nixpkgs="$(git rev-parse --show-toplevel)"
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
+# Build and run nix-prefetch-fossil from the local nixpkgs
+prefetch_fossil="$(nix-build "$nixpkgs" -A nix-prefetch-scripts --no-out-link 2>/dev/null)/bin/nix-prefetch-fossil"
+
+echo "Fetching latest althttpd revision..." >&2
+
+# Run nix-prefetch-fossil and capture output
+output=$("$prefetch_fossil" https://sqlite.org/althttpd trunk 2>&1)
+
+# Extract JSON from output (it's at the end after the blank line)
+json_output=$(echo "$output" | gawk '/^{/{p=1} p')
+
+# Extract revision, hash, and date
+full_rev=$(echo "$json_output" | jq -r '.rev')
+new_rev="${full_rev:0:16}"  # Use 16-char prefix for consistency
+new_hash=$(echo "$json_output" | jq -r '.hash')
+commit_date=$(echo "$json_output" | jq -r '.date')
+
+# Fallback to current date if extraction fails
+if [ -z "$commit_date" ] || [ "$commit_date" = "null" ]; then
+    commit_date=$(date +%Y-%m-%d)
+fi
+new_version="0-unstable-$commit_date"
+
+echo "Updating althttpd to $new_version (rev $new_rev)" >&2
+
+# Use update-source-version from the nixpkgs root
+(
+    cd "$nixpkgs"
+    update-source-version althttpd "$new_version" "$new_hash" \
+        --file="pkgs/by-name/al/althttpd/package.nix" \
+        --rev="$new_rev"
+)
diff --git a/pkgs/by-name/al/alttab/package.nix b/pkgs/by-name/al/alttab/package.nix
index abfcacffbf0f..3b5cfbdb99de 100644
--- a/pkgs/by-name/al/alttab/package.nix
+++ b/pkgs/by-name/al/alttab/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   coreutils,
   fetchFromGitHub,
+  fetchpatch,
   autoconf,
   automake,
   pkg-config,
@@ -35,6 +36,15 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "sha256-1+hk0OeSriXPyefv3wOgeiW781PL4VP5Luvt+RS5jmg=";
   };
 
+  patches = [
+    # Fix gcc-15 build failure: https://github.com/sagb/alttab/pull/178
+    (fetchpatch {
+      name = "gcc-15.patch";
+      url = "https://github.com/sagb/alttab/commit/665e3e369f74ab0075c22a46a3cb3a9f76bdd762.patch";
+      hash = "sha256-7l74kXs0bAyozBbgOEzDSY+4NE2pjdVfWda0XiPvCz4=";
+    })
+  ];
+
   nativeBuildInputs = [
     autoconf
     automake
diff --git a/pkgs/by-name/al/alvr/package.nix b/pkgs/by-name/al/alvr/package.nix
index cad1f3853cbd..e575afc2406c 100644
--- a/pkgs/by-name/al/alvr/package.nix
+++ b/pkgs/by-name/al/alvr/package.nix
@@ -15,10 +15,10 @@
   gmp,
   jack2,
   lame,
-  libX11,
-  libXi,
-  libXrandr,
-  libXcursor,
+  libx11,
+  libxi,
+  libxrandr,
+  libxcursor,
   libdrm,
   libglvnd,
   libogg,
@@ -111,10 +111,10 @@ rustPlatform.buildRustPackage rec {
     gmp
     jack2
     lame
-    libX11
-    libXcursor
-    libXi
-    libXrandr
+    libx11
+    libxcursor
+    libxi
+    libxrandr
     libdrm
     libglvnd
     libogg
diff --git a/pkgs/by-name/am/amd-debug-tools/package.nix b/pkgs/by-name/am/amd-debug-tools/package.nix
index d31c9f3cdc91..2a0e5401c87f 100644
--- a/pkgs/by-name/am/amd-debug-tools/package.nix
+++ b/pkgs/by-name/am/amd-debug-tools/package.nix
@@ -9,13 +9,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "amd-debug-tools";
-  version = "0.2.10";
+  version = "0.2.13";
   pyproject = true;
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/linux/kernel/git/superm1/amd-debug-tools.git";
     rev = version;
-    hash = "sha256-tbykQ8tc6YKHjKEHA9Ml7Z7MjDQzMGXtTwMG9buiovg=";
+    hash = "sha256-748K4Ee9HVYWQ7/DVz7F2nZNjau5v4OGvgHwJZ4vYpM=";
   };
 
   build-system = with python3Packages; [
diff --git a/pkgs/by-name/am/amdgpu_top/package.nix b/pkgs/by-name/am/amdgpu_top/package.nix
index c2d11097735e..d7d2b29079bf 100644
--- a/pkgs/by-name/am/amdgpu_top/package.nix
+++ b/pkgs/by-name/am/amdgpu_top/package.nix
@@ -3,40 +3,40 @@
   rustPlatform,
   fetchFromGitHub,
   libdrm,
-  libX11,
+  libx11,
   libGL,
   wayland,
   wayland-protocols,
   libxkbcommon,
-  libXrandr,
-  libXi,
-  libXcursor,
+  libxrandr,
+  libxi,
+  libxcursor,
   nix-update-script,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "amdgpu_top";
-  version = "0.11.0";
+  version = "0.11.2";
 
   src = fetchFromGitHub {
     owner = "Umio-Yasuno";
     repo = "amdgpu_top";
     tag = "v${version}";
-    hash = "sha256-ZXvTLzEjH+R59GqRzDcdtNI7MD7SpG89Wm32KdgEAgg=";
+    hash = "sha256-yw73bKO91O05WBQNwjcQ+AqxYgGXXC7XJzUnMx5/IWc=";
   };
 
-  cargoHash = "sha256-L9vQHht7sZCosKTiMS77IG2WOOTmnMbLQqN8SInU6zM=";
+  cargoHash = "sha256-hQrgAyi7740bY5knICWACZhDYoZwPs/dO/PgVC4Krx0=";
 
   buildInputs = [
     libdrm
-    libX11
+    libx11
     libGL
     wayland
     wayland-protocols
     libxkbcommon
-    libXrandr
-    libXi
-    libXcursor
+    libxrandr
+    libxi
+    libxcursor
   ];
 
   postInstall = ''
diff --git a/pkgs/by-name/am/amule/package.nix b/pkgs/by-name/am/amule/package.nix
index 9f559ab9ca77..92704f390d0b 100644
--- a/pkgs/by-name/am/amule/package.nix
+++ b/pkgs/by-name/am/amule/package.nix
@@ -19,7 +19,7 @@
   libpng,
   pkg-config,
   makeWrapper,
-  libX11,
+  libx11,
 }:
 
 # daemon and client are not build monolithic
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
     boost186
   ]
   ++ lib.optional httpServer libpng
-  ++ lib.optional client libX11;
+  ++ lib.optional client libx11;
 
   cmakeFlags = [
     "-DBUILD_MONOLITHIC=${if monolithic then "ON" else "OFF"}"
diff --git a/pkgs/by-name/an/andyetitmoves/package.nix b/pkgs/by-name/an/andyetitmoves/package.nix
index 7a7d60bd0691..5f680c234fd9 100644
--- a/pkgs/by-name/an/andyetitmoves/package.nix
+++ b/pkgs/by-name/an/andyetitmoves/package.nix
@@ -6,10 +6,10 @@
   libogg,
   libtheora,
   SDL,
-  libXft,
+  libxft,
   SDL_image,
   zlib,
-  libX11,
+  libx11,
   libpng,
   openal,
   runtimeShell,
@@ -80,10 +80,10 @@ stdenv.mkDerivation rec {
     libogg
     libtheora
     SDL
-    libXft
+    libxft
     SDL_image
     zlib
-    libX11
+    libx11
     libpng
     openal
   ];
diff --git a/pkgs/by-name/an/animeko/package.nix b/pkgs/by-name/an/animeko/package.nix
index 54e8bfe7965e..b8c7d0ee2217 100644
--- a/pkgs/by-name/an/animeko/package.nix
+++ b/pkgs/by-name/an/animeko/package.nix
@@ -7,8 +7,8 @@
   autoPatchelfHook,
   jetbrains, # Requird by upstream due to JCEF dependency
   fontconfig,
-  libXinerama,
-  libXrandr,
+  libxinerama,
+  libxrandr,
   file,
   gtk3,
   glib,
@@ -79,8 +79,8 @@
   boost,
   thrift,
   libGL,
-  libX11,
-  libXdamage,
+  libx11,
+  libxdamage,
   nss,
   nspr,
 }:
@@ -157,8 +157,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     fontconfig
-    libXinerama
-    libXrandr
+    libxinerama
+    libxrandr
     file
     shine
     libmpeg2
@@ -230,8 +230,8 @@ stdenv.mkDerivation (finalAttrs: {
     nss
     nspr
     libGL
-    libX11
-    libXdamage
+    libx11
+    libxdamage
   ];
 
   dontWrapQtApps = true;
diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix
index 13610ce0f511..27f523a3a743 100644
--- a/pkgs/by-name/an/ansel/package.nix
+++ b/pkgs/by-name/an/ansel/package.nix
@@ -41,10 +41,10 @@
   libsysprof-capture,
   libthai,
   libwebp,
-  libXdmcp,
+  libxdmcp,
   libxkbcommon,
   libxml2,
-  libXtst,
+  libxtst,
   llvmPackages,
   openexr,
   openjpeg,
@@ -149,10 +149,10 @@ stdenv.mkDerivation {
     libsysprof-capture
     libthai
     libwebp
-    libXdmcp
+    libxdmcp
     libxkbcommon
     libxml2
-    libXtst
+    libxtst
     openexr
     openjpeg
     osm-gps-map
diff --git a/pkgs/by-name/an/anthy/package.nix b/pkgs/by-name/an/anthy/package.nix
index c47b6f7d08b6..a3c3153c1c40 100644
--- a/pkgs/by-name/an/anthy/package.nix
+++ b/pkgs/by-name/an/anthy/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Hiragana text to Kana Kanji mixed text Japanese input method";
-    homepage = "https://anthy.osdn.jp/";
+    homepage = "https://web.archive.org/web/20250404073626/https://osdn.net/projects/anthy/";
     license = lib.licenses.gpl2Plus;
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/an/antiprism/package.nix b/pkgs/by-name/an/antiprism/package.nix
index e74330edf20d..afe7bb297fd5 100644
--- a/pkgs/by-name/an/antiprism/package.nix
+++ b/pkgs/by-name/an/antiprism/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   autoreconfHook,
-  libX11,
+  libx11,
   libGL,
   libGLU,
   libglut,
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ autoreconfHook ];
 
   buildInputs = [
-    libX11
+    libx11
     libGLU
     libGL
     libglut
diff --git a/pkgs/by-name/ao/ao3downloader/package.nix b/pkgs/by-name/ao/ao3downloader/package.nix
index b32ab0553bc6..edcd616a13bc 100644
--- a/pkgs/by-name/ao/ao3downloader/package.nix
+++ b/pkgs/by-name/ao/ao3downloader/package.nix
@@ -8,14 +8,14 @@
 # https://github.com/nianeyna/ao3downloader/blob/f8399bb8aca276ae7359157b90afd13925c90056/pyproject.toml#L8
 python312Packages.buildPythonApplication rec {
   pname = "ao3downloader";
-  version = "2025.11.0";
+  version = "2026.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nianeyna";
     repo = "ao3downloader";
     tag = "v${version}";
-    hash = "sha256-EXoDUeadR25XpUNkXIALbZOqUJIdTNdbfYZoVwgZq7U=";
+    hash = "sha256-NrVzRYNxvy8LOvXy0/1go0wEQyLt56inu+f93UFX1CM=";
   };
 
   build-system = with python312Packages; [
diff --git a/pkgs/by-name/ap/apitrace/package.nix b/pkgs/by-name/ap/apitrace/package.nix
index 9319b421cf23..86aa5a92a8d0 100644
--- a/pkgs/by-name/ap/apitrace/package.nix
+++ b/pkgs/by-name/ap/apitrace/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  libX11,
+  libx11,
   procps,
   python3,
   libdwarf,
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   # LD_PRELOAD wrappers need to be statically linked to work against all kinds
   # of games -- so it's fine to use e.g. bundled snappy.
   buildInputs = [
-    libX11
+    libx11
     procps
     libdwarf
     gtest
diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix
index c9a671fb7242..31400b0860df 100644
--- a/pkgs/by-name/ap/apko/package.nix
+++ b/pkgs/by-name/ap/apko/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "apko";
-  version = "1.0.5";
+  version = "1.1.4";
 
   src = fetchFromGitHub {
     owner = "chainguard-dev";
     repo = "apko";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7KDyTXqIM4hUnNVJt4xwsuUdP0eYSF+fSBRuSKs8VzQ=";
+    hash = "sha256-8nxz8Qmo1waHa3c6qbb5cy+mMT2kaWcHSl4uW3qrBsI=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -29,7 +29,11 @@ buildGoModule (finalAttrs: {
       find "$out" -name .git -print0 | xargs -0 rm -rf
     '';
   };
-  vendorHash = "sha256-vHTJCfXVlbBLQXC/tsXJsGoACcxAhJmFlU/tq10836Q=";
+  vendorHash = "sha256-vGtxVQSesrqWnYJT7B2KhWiYtUFsYVPdI/ZEbpFmkOc=";
+
+  excludedPackages = [
+    "internal/gen-jsonschema"
+  ];
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/ap/apotris/package.nix b/pkgs/by-name/ap/apotris/package.nix
index 4b09797fba01..9eb49286d147 100644
--- a/pkgs/by-name/ap/apotris/package.nix
+++ b/pkgs/by-name/ap/apotris/package.nix
@@ -15,12 +15,12 @@
   SDL2,
   SDL2_mixer,
   libopenmpt,
-  libXrandr,
-  libXext,
-  libXfixes,
-  libXcursor,
-  libXi,
-  libXScrnSaver,
+  libxrandr,
+  libxext,
+  libxfixes,
+  libxcursor,
+  libxi,
+  libxscrnsaver,
   makeDesktopItem,
 }:
 
@@ -58,12 +58,12 @@ stdenv.mkDerivation (finalAttrs: {
     SDL2_mixer
     libopenmpt
     SDL2
-    libXrandr
-    libXext
-    libXfixes
-    libXcursor
-    libXi
-    libXScrnSaver
+    libxrandr
+    libxext
+    libxfixes
+    libxcursor
+    libxi
+    libxscrnsaver
   ];
 
   strictDeps = true;
diff --git a/pkgs/by-name/ap/applewin/package.nix b/pkgs/by-name/ap/applewin/package.nix
index db41883579d4..2ee654c6b34c 100644
--- a/pkgs/by-name/ap/applewin/package.nix
+++ b/pkgs/by-name/ap/applewin/package.nix
@@ -24,8 +24,8 @@
   xz,
   libsysprof-capture,
   lerc,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   qt6Packages,
   qt6,
   enableQt6 ? true,
@@ -75,8 +75,8 @@ stdenv.mkDerivation (finalAttrs: {
     libjpeg
     libwebp
     libpng
-    libX11
-    libXext
+    libx11
+    libxext
   ]
   ++ lib.optionals enableQt6 [
     qt6Packages.qtbase
diff --git a/pkgs/by-name/ar/aranym/package.nix b/pkgs/by-name/ar/aranym/package.nix
index 627790626b4d..3585c8938eb8 100644
--- a/pkgs/by-name/ar/aranym/package.nix
+++ b/pkgs/by-name/ar/aranym/package.nix
@@ -4,7 +4,7 @@
   autoreconfHook,
   fetchFromGitHub,
   libGLU,
-  libX11,
+  libx11,
   pkg-config,
   stdenv,
 }:
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libGLU
-    libX11
+    libx11
     SDL2
   ];
 
diff --git a/pkgs/by-name/ar/arcan/package.nix b/pkgs/by-name/ar/arcan/package.nix
index 75d471de2e3a..3425e72ab31a 100644
--- a/pkgs/by-name/ar/arcan/package.nix
+++ b/pkgs/by-name/ar/arcan/package.nix
@@ -13,11 +13,11 @@
   jbig2dec,
   leptonica,
   libGL,
-  libX11,
-  libXau,
-  libXcomposite,
-  libXdmcp,
-  libXfixes,
+  libx11,
+  libxau,
+  libxcomposite,
+  libxdmcp,
+  libxfixes,
   libdrm,
   libffi,
   libjpeg,
@@ -81,11 +81,11 @@ stdenv.mkDerivation (finalAttrs: {
     jbig2dec
     leptonica
     libGL
-    libX11
-    libXau
-    libXcomposite
-    libXdmcp
-    libXfixes
+    libx11
+    libxau
+    libxcomposite
+    libxdmcp
+    libxfixes
     libdrm
     libffi
     libjpeg
diff --git a/pkgs/by-name/ar/arena/package.nix b/pkgs/by-name/ar/arena/package.nix
index 849c1810c2af..5c4cbac0783d 100644
--- a/pkgs/by-name/ar/arena/package.nix
+++ b/pkgs/by-name/ar/arena/package.nix
@@ -8,7 +8,7 @@
   cairo,
   atk,
   gdk-pixbuf,
-  libX11,
+  libx11,
 }:
 
 # Arena is free software in the sense of "free beer" but not as in "free
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     cairo
     atk
     gdk-pixbuf
-    libX11
+    libx11
     (lib.getLib stdenv.cc.cc)
   ];
 
diff --git a/pkgs/by-name/ar/ares/package.nix b/pkgs/by-name/ar/ares/package.nix
index c02e63559da2..d4f8f2c97015 100644
--- a/pkgs/by-name/ar/ares/package.nix
+++ b/pkgs/by-name/ar/ares/package.nix
@@ -8,8 +8,8 @@
   gtksourceview3,
   libGL,
   libGLU,
-  libX11,
-  libXv,
+  libx11,
+  libxv,
   libao,
   libpulseaudio,
   libretro-shaders-slang,
@@ -62,8 +62,8 @@ stdenv.mkDerivation (finalAttrs: {
     gtksourceview3
     libGL
     libGLU
-    libX11
-    libXv
+    libx11
+    libxv
     libpulseaudio
     openal
     udev
diff --git a/pkgs/by-name/ar/argyllcms/package.nix b/pkgs/by-name/ar/argyllcms/package.nix
index 2fa6337ae613..2b04d47a936b 100644
--- a/pkgs/by-name/ar/argyllcms/package.nix
+++ b/pkgs/by-name/ar/argyllcms/package.nix
@@ -3,19 +3,19 @@
   fetchzip,
   jam,
   unzip,
-  libX11,
-  libXxf86vm,
-  libXrandr,
-  libXinerama,
-  libXrender,
-  libXext,
+  libx11,
+  libxxf86vm,
+  libxrandr,
+  libxinerama,
+  libxrender,
+  libxext,
   libtiff,
   libjpeg,
   libpng,
-  libXScrnSaver,
+  libxscrnsaver,
   writeText,
-  libXdmcp,
-  libXau,
+  libxdmcp,
+  libxau,
   lib,
   openssl,
   buildPackages,
@@ -136,15 +136,15 @@ stdenv.mkDerivation rec {
     libtiff
     libjpeg
     libpng
-    libX11
-    libXxf86vm
-    libXrandr
-    libXinerama
-    libXext
-    libXrender
-    libXScrnSaver
-    libXdmcp
-    libXau
+    libx11
+    libxxf86vm
+    libxrandr
+    libxinerama
+    libxext
+    libxrender
+    libxscrnsaver
+    libxdmcp
+    libxau
     openssl
   ];
 
diff --git a/pkgs/by-name/ar/arkade/package.nix b/pkgs/by-name/ar/arkade/package.nix
index f67aefdc28ac..613c0a41351e 100644
--- a/pkgs/by-name/ar/arkade/package.nix
+++ b/pkgs/by-name/ar/arkade/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "arkade";
-  version = "0.11.69";
+  version = "0.11.70";
 
   src = fetchFromGitHub {
     owner = "alexellis";
     repo = "arkade";
     tag = version;
-    hash = "sha256-aTgW7zYaY8R4fgfQEg2IKC0+199ZLyLPFEQhKmRqFys=";
+    hash = "sha256-M4W1vcAgIE8XzpyBjW2EuqTySNyDRQuQ8rpCpn4TiFY=";
   };
 
   env.CGO_ENABLED = 0;
diff --git a/pkgs/by-name/ar/armagetronad/package.nix b/pkgs/by-name/ar/armagetronad/package.nix
index 78d217979804..fdbd59665d68 100644
--- a/pkgs/by-name/ar/armagetronad/package.nix
+++ b/pkgs/by-name/ar/armagetronad/package.nix
@@ -23,7 +23,7 @@
   libGL,
   libGLU,
   libpng,
-  libX11,
+  libx11,
   libxml2,
   protobuf,
   xvfb-run,
@@ -60,7 +60,7 @@ let
           extraBuildInputs = lib.optionals (!dedicatedServer) [
             libGL
             libGLU
-            libX11
+            libx11
             libpng
             SDL
             SDL_image
@@ -87,7 +87,7 @@ let
             freetype
             libGL
             libGLU
-            libX11
+            libx11
             SDL2
             SDL2_image
             SDL2_mixer
@@ -107,7 +107,7 @@ let
           extraBuildInputs = lib.optionals (!dedicatedServer) [
             libGL
             libGLU
-            libX11
+            libx11
             libpng
             SDL
             SDL_image
diff --git a/pkgs/by-name/ar/arrow/package.nix b/pkgs/by-name/ar/arrow/package.nix
index 576f80f03c53..bd9bb6f4b52f 100644
--- a/pkgs/by-name/ar/arrow/package.nix
+++ b/pkgs/by-name/ar/arrow/package.nix
@@ -6,11 +6,11 @@
   alsa-lib,
   libGL,
   libpulseaudio,
-  libX11,
-  libXcursor,
-  libXext,
-  libXi,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxext,
+  libxi,
+  libxrandr,
   udev,
   vulkan-loader,
   autoPatchelfHook,
@@ -55,11 +55,11 @@ stdenv.mkDerivation (finalAttrs: {
     alsa-lib
     libGL
     libpulseaudio
-    libX11
-    libXcursor
-    libXext
-    libXi
-    libXrandr
+    libx11
+    libxcursor
+    libxext
+    libxi
+    libxrandr
     udev
     vulkan-loader
   ];
diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix
index 72ab394c00dc..d98a6c2e98c5 100644
--- a/pkgs/by-name/ar/art/package.nix
+++ b/pkgs/by-name/ar/art/package.nix
@@ -12,13 +12,13 @@
   lerc,
   libxkbcommon,
   libepoxy,
-  libXtst,
+  libxtst,
   wrapGAppsHook3,
   pixman,
   libpthread-stubs,
   gtkmm3,
-  libXau,
-  libXdmcp,
+  libxau,
+  libxdmcp,
   lcms2,
   libraw,
   libiptcdata,
@@ -72,12 +72,12 @@ stdenv.mkDerivation (finalAttrs: {
     lerc
     libxkbcommon
     libepoxy
-    libXtst
+    libxtst
     pixman
     libpthread-stubs
     gtkmm3
-    libXau
-    libXdmcp
+    libxau
+    libxdmcp
     lcms2
     libraw
     libiptcdata
diff --git a/pkgs/by-name/ar/artyFX/package.nix b/pkgs/by-name/ar/artyFX/package.nix
index 68694583fe50..650b83b4dda1 100644
--- a/pkgs/by-name/ar/artyFX/package.nix
+++ b/pkgs/by-name/ar/artyFX/package.nix
@@ -6,7 +6,7 @@
   cmake,
   libjack2,
   libpthread-stubs,
-  libXdmcp,
+  libxdmcp,
   libxshmfence,
   libsndfile,
   lv2,
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
     cairomm
     libjack2
     libpthread-stubs
-    libXdmcp
+    libxdmcp
     libxshmfence
     libsndfile
     lv2
diff --git a/pkgs/by-name/as/aseprite/package.nix b/pkgs/by-name/as/aseprite/package.nix
index 5b40efd86c7d..4c3ead38f4e8 100644
--- a/pkgs/by-name/as/aseprite/package.nix
+++ b/pkgs/by-name/as/aseprite/package.nix
@@ -17,13 +17,13 @@
   libjpeg,
   libpng,
   libwebp,
-  libX11,
-  libXcursor,
-  libXext,
-  libXi,
-  libXxf86vm,
+  libx11,
+  libxcursor,
+  libxext,
+  libxi,
+  libxxf86vm,
   libxcb,
-  libXrandr,
+  libxrandr,
   ninja,
   pcre2,
   pixman,
@@ -87,13 +87,13 @@ clangStdenv.mkDerivation (finalAttrs: {
     libjpeg
     libpng
     libwebp
-    libX11
-    libXcursor
-    libXext
-    libXi
-    libXxf86vm
+    libx11
+    libxcursor
+    libxext
+    libxi
+    libxxf86vm
     libxcb
-    libXrandr
+    libxrandr
     pcre2
     pixman
     skia-aseprite
diff --git a/pkgs/by-name/as/assaultcube/package.nix b/pkgs/by-name/as/assaultcube/package.nix
index c5d31f1300cd..5a4e9393f4ed 100644
--- a/pkgs/by-name/as/assaultcube/package.nix
+++ b/pkgs/by-name/as/assaultcube/package.nix
@@ -11,7 +11,7 @@
   SDL2,
   SDL2_image,
   libGL,
-  libX11,
+  libx11,
   makeWrapper,
   zlib,
   file,
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     SDL2
     SDL2_image
     libGL
-    libX11
+    libx11
     libogg
     libvorbis
   ];
diff --git a/pkgs/by-name/at/at-spi2-core/package.nix b/pkgs/by-name/at/at-spi2-core/package.nix
index 193bb60da079..06e85ff8ccc5 100644
--- a/pkgs/by-name/at/at-spi2-core/package.nix
+++ b/pkgs/by-name/at/at-spi2-core/package.nix
@@ -17,11 +17,11 @@
   dbus,
   glib,
   dconf,
-  libX11,
+  libx11,
   libxml2,
-  libXtst,
-  libXi,
-  libXext,
+  libxtst,
+  libxi,
+  libxext,
   gnome,
   systemdLibs,
   systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdLibs,
@@ -55,13 +55,13 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     libxml2
     # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case
-    libXtst
-    libXi
-    # libXext is a transitive dependency of libXi
-    libXext
+    libxtst
+    libxi
+    # libxext is a transitive dependency of libxi
+    libxext
   ]
   ++ lib.optionals systemdSupport [
     # libsystemd is a needed for dbus-broker support
diff --git a/pkgs/by-name/at/atari800/package.nix b/pkgs/by-name/at/atari800/package.nix
index 367feef63db6..e19b8730b8a0 100644
--- a/pkgs/by-name/at/atari800/package.nix
+++ b/pkgs/by-name/at/atari800/package.nix
@@ -6,7 +6,7 @@
   fetchFromGitHub,
   libGL,
   libGLU,
-  libX11,
+  libx11,
   readline,
   zlib,
 }:
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     SDL
     libGL
     libGLU
-    libX11
+    libx11
     readline
     zlib
   ];
diff --git a/pkgs/by-name/at/ataripp/package.nix b/pkgs/by-name/at/ataripp/package.nix
index d31bb3b4f897..fde9cae8f43a 100644
--- a/pkgs/by-name/at/ataripp/package.nix
+++ b/pkgs/by-name/at/ataripp/package.nix
@@ -7,8 +7,8 @@
   gcc-unwrapped,
   libice,
   libsm,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -26,8 +26,8 @@ stdenv.mkDerivation (finalAttrs: {
     gcc-unwrapped
     libice
     libsm
-    libX11
-    libXext
+    libx11
+    libxext
   ];
 
   postFixup = ''
diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix
index b876eadd8880..9dd69e2093b0 100644
--- a/pkgs/by-name/au/audacity/package.nix
+++ b/pkgs/by-name/au/audacity/package.nix
@@ -40,8 +40,8 @@
   at-spi2-core,
   dbus,
   libepoxy,
-  libXdmcp,
-  libXtst,
+  libxdmcp,
+  libxtst,
   libpthread-stubs,
   libsbsms_2_3_0,
   libselinux,
@@ -136,8 +136,8 @@ stdenv.mkDerivation (finalAttrs: {
     at-spi2-core
     dbus
     libepoxy
-    libXdmcp
-    libXtst
+    libxdmcp
+    libxtst
     libpthread-stubs
     libxkbcommon
     libselinux
diff --git a/pkgs/by-name/au/autocutsel/package.nix b/pkgs/by-name/au/autocutsel/package.nix
index 0c33c150d2f0..9a38dbb09557 100644
--- a/pkgs/by-name/au/autocutsel/package.nix
+++ b/pkgs/by-name/au/autocutsel/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXaw,
+  libx11,
+  libxaw,
 }:
 
 stdenv.mkDerivation rec {
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    libX11
-    libXaw
+    libx11
+    libxaw
   ];
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix
index d293b11a44f2..6090eb54feb2 100644
--- a/pkgs/by-name/au/automatic-timezoned/package.nix
+++ b/pkgs/by-name/au/automatic-timezoned/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "automatic-timezoned";
-  version = "2.0.113";
+  version = "2.0.115";
 
   src = fetchFromGitHub {
     owner = "maxbrunet";
     repo = "automatic-timezoned";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-R7JJNPwhWOJB+19RC38ICy/ViOQRYnoPU7Fghi5bC40=";
+    sha256 = "sha256-xv+C6ML4JrwsEvvg1V/9WlE/FZh5ANB+rvYDTFsM9fQ=";
   };
 
-  cargoHash = "sha256-TMuQdYNCJf/krUXLf7vPdUidzLMsUiF1jWvTBqmNEBQ=";
+  cargoHash = "sha256-zXsUvORQl04X1dliQmpksBnzYlYO0MkDGgmQt5F3XdQ=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix
index 3c18fc19fd7a..a9f0d6f49df6 100644
--- a/pkgs/by-name/av/avalonia/package.nix
+++ b/pkgs/by-name/av/avalonia/package.nix
@@ -7,11 +7,11 @@
   lib,
   libice,
   libsm,
-  libX11,
-  libXcursor,
-  libXext,
-  libXi,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxext,
+  libxi,
+  libxrandr,
   liberation_ttf,
   makeFontsConf,
   nodejs,
@@ -85,11 +85,11 @@ stdenvNoCC.mkDerivation (
         substituteInPlace src/Avalonia.X11/SMLib.cs \
           --replace-fail '"libSM.so.6"' '"${lib.getLib libsm}/lib/libSM.so.6"'
         substituteInPlace src/Avalonia.X11/XLib.cs \
-          --replace-fail '"libX11.so.6"' '"${lib.getLib libX11}/lib/libX11.so.6"' \
-          --replace-fail '"libXrandr.so.2"' '"${lib.getLib libXrandr}/lib/libXrandr.so.2"' \
-          --replace-fail '"libXext.so.6"' '"${lib.getLib libXext}/lib/libXext.so.6"' \
-          --replace-fail '"libXi.so.6"' '"${lib.getLib libXi}/lib/libXi.so.6"' \
-          --replace-fail '"libXcursor.so.1"' '"${lib.getLib libXcursor}/lib/libXcursor.so.1"'
+          --replace-fail '"libX11.so.6"' '"${lib.getLib libx11}/lib/libX11.so.6"' \
+          --replace-fail '"libXrandr.so.2"' '"${lib.getLib libxrandr}/lib/libXrandr.so.2"' \
+          --replace-fail '"libXext.so.6"' '"${lib.getLib libxext}/lib/libXext.so.6"' \
+          --replace-fail '"libXi.so.6"' '"${lib.getLib libxi}/lib/libXi.so.6"' \
+          --replace-fail '"libXcursor.so.1"' '"${lib.getLib libxcursor}/lib/libXcursor.so.1"'
 
         # from RestoreAdditionalProjectSources, which isn't supported by nuget-to-json
         dotnet nuget add source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json
diff --git a/pkgs/by-name/av/avidemux/package.nix b/pkgs/by-name/av/avidemux/package.nix
index de00a6caac59..e08c57ac3b85 100644
--- a/pkgs/by-name/av/avidemux/package.nix
+++ b/pkgs/by-name/av/avidemux/package.nix
@@ -9,14 +9,14 @@
   gettext,
   libvdpau,
   libva,
-  libXv,
+  libxv,
   sqlite,
   yasm,
   freetype,
   fontconfig,
   fribidi,
   makeWrapper,
-  libXext,
+  libxext,
   libGLU,
   alsa-lib,
   withX265 ? true,
@@ -109,13 +109,13 @@ stdenv.mkDerivation (finalAttrs: {
     gettext
     libvdpau
     libva
-    libXv
+    libxv
     sqlite
     fribidi
     fontconfig
     freetype
     alsa-lib
-    libXext
+    libxext
     libGLU
   ]
   ++ lib.optional withX264 x264
@@ -142,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: {
     let
       wrapWith =
         makeWrapper: filename:
-        "${makeWrapper} ${filename} --set ADM_ROOT_DIR $out --prefix LD_LIBRARY_PATH : ${libXext}/lib";
+        "${makeWrapper} ${filename} --set ADM_ROOT_DIR $out --prefix LD_LIBRARY_PATH : ${libxext}/lib";
       wrapQtApp = wrapWith "wrapQtApp";
       wrapProgram = wrapWith "wrapProgram";
     in
diff --git a/pkgs/by-name/aw/aws-sam-cli/package.nix b/pkgs/by-name/aw/aws-sam-cli/package.nix
index 0b11c1ee9196..07d1aa433ffa 100644
--- a/pkgs/by-name/aw/aws-sam-cli/package.nix
+++ b/pkgs/by-name/aw/aws-sam-cli/package.nix
@@ -11,14 +11,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "aws-sam-cli";
-  version = "1.152.0";
+  version = "1.153.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-sam-cli";
     tag = "v${version}";
-    hash = "sha256-N+x9ZNd6WvDJTFERhWJD5HsDE7dFyH+jOnEMzJ3IHSk=";
+    hash = "sha256-502Ca/oHAIG/9G25G8xEJEJPWwDKeGrpRN1ZcEY+1LE=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];
diff --git a/pkgs/by-name/az/azpainter/package.nix b/pkgs/by-name/az/azpainter/package.nix
index 31ebda65c6ba..585f0d2e0f06 100644
--- a/pkgs/by-name/az/azpainter/package.nix
+++ b/pkgs/by-name/az/azpainter/package.nix
@@ -8,10 +8,10 @@
   ninja,
   pkg-config,
   libiconv,
-  libX11,
-  libXcursor,
-  libXext,
-  libXi,
+  libx11,
+  libxcursor,
+  libxext,
+  libxi,
   freetype,
   fontconfig,
   libjpeg,
@@ -41,10 +41,10 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
 
   buildInputs = [
-    libX11
-    libXcursor
-    libXext
-    libXi
+    libx11
+    libxcursor
+    libxext
+    libxi
     freetype
     fontconfig
     libjpeg
diff --git a/pkgs/by-name/ba/banana-accounting/package.nix b/pkgs/by-name/ba/banana-accounting/package.nix
index 2be9b632bf7c..bbdf31e2a98a 100644
--- a/pkgs/by-name/ba/banana-accounting/package.nix
+++ b/pkgs/by-name/ba/banana-accounting/package.nix
@@ -9,7 +9,7 @@
   gmp,
   gtk3,
   libGL,
-  libX11,
+  libx11,
   libgcrypt,
 }:
 
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     (lib.getLib stdenv.cc.cc)
     libGL
-    libX11
+    libx11
     libgcrypt
   ];
 
diff --git a/pkgs/by-name/ba/bark/package.nix b/pkgs/by-name/ba/bark/package.nix
index ae9588cf4b46..f6abecc0de47 100644
--- a/pkgs/by-name/ba/bark/package.nix
+++ b/pkgs/by-name/ba/bark/package.nix
@@ -11,13 +11,13 @@
   versionCheckHook,
   nix-update-script,
 }:
-rustPlatform.buildRustPackage (final: {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "bark";
   version = "0.6.0";
   src = fetchFromGitHub {
     owner = "haileys";
     repo = "bark";
-    tag = "v${final.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-JaUIWGCYhasM0DgqL+DiG2rE1OWVg/N66my/4RWDN1E=";
   };
 
diff --git a/pkgs/by-name/ba/baudline/package.nix b/pkgs/by-name/ba/baudline/package.nix
index 31b6a1c573be..5c7efbe4cc95 100644
--- a/pkgs/by-name/ba/baudline/package.nix
+++ b/pkgs/by-name/ba/baudline/package.nix
@@ -2,22 +2,22 @@
   lib,
   stdenv,
   fetchurl,
-  libXmu,
-  libXt,
-  libX11,
-  libXext,
-  libXxf86vm,
+  libxmu,
+  libxt,
+  libx11,
+  libxext,
+  libxxf86vm,
   libjack2,
   makeWrapper,
 }:
 
 let
   rpath = lib.makeLibraryPath [
-    libXmu
-    libXt
-    libX11
-    libXext
-    libXxf86vm
+    libxmu
+    libxt
+    libx11
+    libxext
+    libxxf86vm
     libjack2
   ];
 in
diff --git a/pkgs/by-name/bc/bchoppr/package.nix b/pkgs/by-name/bc/bchoppr/package.nix
index 0a32a4b8578a..b2a2813b7c99 100644
--- a/pkgs/by-name/bc/bchoppr/package.nix
+++ b/pkgs/by-name/bc/bchoppr/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   pkg-config,
   cairo,
-  libX11,
+  libx11,
   lv2,
 }:
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     cairo
-    libX11
+    libx11
     lv2
   ];
 
diff --git a/pkgs/by-name/be/bepass/package.nix b/pkgs/by-name/be/bepass/package.nix
index c575769443fd..145f5a99b4a8 100644
--- a/pkgs/by-name/be/bepass/package.nix
+++ b/pkgs/by-name/be/bepass/package.nix
@@ -6,12 +6,12 @@
   pkg-config,
   glfw,
   libxft,
-  libXcursor,
-  libXrandr,
-  libXinerama,
+  libxcursor,
+  libxrandr,
+  libxinerama,
   xinput,
-  libXi,
-  libXxf86vm,
+  libxi,
+  libxxf86vm,
 }:
 buildGoModule rec {
   pname = "bepass";
@@ -34,12 +34,12 @@ buildGoModule rec {
   buildInputs = lib.optionals enableGUI [
     glfw
     libxft
-    libXcursor
-    libXrandr
-    libXinerama
-    libXi
+    libxcursor
+    libxrandr
+    libxinerama
+    libxi
     xinput
-    libXxf86vm
+    libxxf86vm
   ];
 
   ldflags = [
diff --git a/pkgs/by-name/be/berry/package.nix b/pkgs/by-name/be/berry/package.nix
index 5f35e5e9e3fa..84eb367acb55 100644
--- a/pkgs/by-name/be/berry/package.nix
+++ b/pkgs/by-name/be/berry/package.nix
@@ -5,10 +5,10 @@
   copyDesktopItems,
   fontconfig,
   freetype,
-  libX11,
-  libXext,
-  libXft,
-  libXinerama,
+  libx11,
+  libxext,
+  libxft,
+  libxinerama,
   makeDesktopItem,
   pkg-config,
   which,
@@ -32,10 +32,10 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXext
-    libXft
-    libXinerama
+    libx11
+    libxext
+    libxft
+    libxinerama
     fontconfig
     freetype
   ];
@@ -87,6 +87,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     mainProgram = "berry";
     maintainers = [ ];
-    inherit (libX11.meta) platforms;
+    inherit (libx11.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/be/bespokesynth/package.nix b/pkgs/by-name/be/bespokesynth/package.nix
index 36a29a13c4d7..36ed0ff97e27 100644
--- a/pkgs/by-name/be/bespokesynth/package.nix
+++ b/pkgs/by-name/be/bespokesynth/package.nix
@@ -13,12 +13,12 @@
   freetype,
   jsoncpp,
   libusb1,
-  libX11,
-  libXrandr,
-  libXinerama,
-  libXext,
-  libXcursor,
-  libXScrnSaver,
+  libx11,
+  libxrandr,
+  libxinerama,
+  libxext,
+  libxcursor,
+  libxscrnsaver,
   libGL,
   libxcb,
   vst2-sdk,
@@ -95,12 +95,12 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     # List obtained from https://github.com/BespokeSynth/BespokeSynth/blob/main/azure-pipelines.yml
-    libX11
-    libXrandr
-    libXinerama
-    libXext
-    libXcursor
-    libXScrnSaver
+    libx11
+    libxrandr
+    libxinerama
+    libxext
+    libxcursor
+    libxscrnsaver
     curl
     gtk3
     webkitgtk_4_1
@@ -145,12 +145,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux "-rpath ${
     lib.makeLibraryPath [
-      libX11
-      libXrandr
-      libXinerama
-      libXext
-      libXcursor
-      libXScrnSaver
+      libx11
+      libxrandr
+      libxinerama
+      libxext
+      libxcursor
+      libxscrnsaver
     ]
   }";
 
diff --git a/pkgs/by-name/be/bevelbar/package.nix b/pkgs/by-name/be/bevelbar/package.nix
index fbc3bf55cddb..c094c2794fc9 100644
--- a/pkgs/by-name/be/bevelbar/package.nix
+++ b/pkgs/by-name/be/bevelbar/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchurl,
   pkg-config,
-  libX11,
-  libXft,
-  libXrandr,
+  libx11,
+  libxft,
+  libxrandr,
   gitUpdater,
 }:
 
@@ -21,9 +21,9 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    libX11
-    libXft
-    libXrandr
+    libx11
+    libxft
+    libxrandr
   ];
 
   makeFlags = [ "prefix=$(out)" ];
diff --git a/pkgs/by-name/bg/bgs/package.nix b/pkgs/by-name/bg/bgs/package.nix
index 08cf1f52b143..905576f50795 100644
--- a/pkgs/by-name/bg/bgs/package.nix
+++ b/pkgs/by-name/bg/bgs/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchFromGitHub,
   pkg-config,
-  libX11,
-  libXinerama,
+  libx11,
+  libxinerama,
   imlib2,
 }:
 
@@ -23,8 +23,8 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    libX11
-    libXinerama
+    libx11
+    libxinerama
     imlib2
   ];
 
diff --git a/pkgs/by-name/bi/bink-player/package.nix b/pkgs/by-name/bi/bink-player/package.nix
index 5bd2442cb32e..2a9cbb51f03a 100644
--- a/pkgs/by-name/bi/bink-player/package.nix
+++ b/pkgs/by-name/bi/bink-player/package.nix
@@ -5,7 +5,7 @@
   autoPatchelfHook,
   p7zip,
   libGL,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     stdenv.cc.cc.lib
     libGL
-    libX11
+    libx11
   ];
 
   installPhase = ''
diff --git a/pkgs/by-name/bj/bjumblr/package.nix b/pkgs/by-name/bj/bjumblr/package.nix
index e72a29221607..2176e8f088e7 100644
--- a/pkgs/by-name/bj/bjumblr/package.nix
+++ b/pkgs/by-name/bj/bjumblr/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
   cairo,
   lv2,
   pkg-config,
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    libX11
+    libx11
     cairo
     lv2
     libsndfile
diff --git a/pkgs/by-name/bl/blend2d/package.nix b/pkgs/by-name/bl/blend2d/package.nix
index 85b1dec72dbf..717608aca030 100644
--- a/pkgs/by-name/bl/blend2d/package.nix
+++ b/pkgs/by-name/bl/blend2d/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation {
   pname = "blend2d";
-  version = "0.21.2-unstable-2025-11-03";
+  version = "0.21.2-unstable-2025-11-29";
 
   src = fetchFromGitHub {
     owner = "blend2d";
     repo = "blend2d";
-    rev = "def0d1238c3e5d0983bb848e5676049d829e435b";
-    hash = "sha256-b9DlgJNpMSLMM+xrM7sKVRH/DAoGHhOrwq5sw4OKH+k=";
+    rev = "6dbc2cefbc996379e07104e34519a440b49b15d7";
+    hash = "sha256-25moUXRikLCFDWcWy4SP2uAE02kyxlAf8PxZTMtnW9U=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix
index 4c53c3a5afd0..892c28d1c530 100644
--- a/pkgs/by-name/bl/blender/package.nix
+++ b/pkgs/by-name/bl/blender/package.nix
@@ -28,11 +28,11 @@
   lib,
   libGL,
   libGLU,
-  libX11,
-  libXext,
-  libXi,
-  libXrender,
-  libXxf86vm,
+  libx11,
+  libxext,
+  libxi,
+  libxrender,
+  libxxf86vm,
   libdecor,
   libepoxy,
   libffi,
@@ -280,11 +280,11 @@ stdenv'.mkDerivation (finalAttrs: {
       [
         libGL
         libGLU
-        libX11
-        libXext
-        libXi
-        libXrender
-        libXxf86vm
+        libx11
+        libxext
+        libxi
+        libxrender
+        libxxf86vm
         openal
         openxr-loader
       ]
diff --git a/pkgs/by-name/bl/blendfarm/package.nix b/pkgs/by-name/bl/blendfarm/package.nix
index 28333e1f2cac..eb6e32c15ed1 100644
--- a/pkgs/by-name/bl/blendfarm/package.nix
+++ b/pkgs/by-name/bl/blendfarm/package.nix
@@ -12,7 +12,7 @@
   darwin,
   fontconfig,
   libgdiplus,
-  libXrandr,
+  libxrandr,
   glib,
   writeShellScriptBin,
   blender,
@@ -89,7 +89,7 @@ buildDotnetModule rec {
     pcre
     libgdiplus
     glib
-    libXrandr
+    libxrandr
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ blender ];
 
diff --git a/pkgs/by-name/bl/bloodspilot-client/package.nix b/pkgs/by-name/bl/bloodspilot-client/package.nix
index 7436908119bb..d2b92acf661a 100644
--- a/pkgs/by-name/bl/bloodspilot-client/package.nix
+++ b/pkgs/by-name/bl/bloodspilot-client/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
   SDL,
   libGLU,
   libGL,
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [ ./bloodspilot-sdl-window-fix.patch ];
 
   buildInputs = [
-    libX11
+    libx11
     SDL
     SDL_ttf
     SDL_image
diff --git a/pkgs/by-name/bl/bluemail/package.nix b/pkgs/by-name/bl/bluemail/package.nix
index d8e70610d742..b131da910a02 100644
--- a/pkgs/by-name/bl/bluemail/package.nix
+++ b/pkgs/by-name/bl/bluemail/package.nix
@@ -9,7 +9,7 @@
   gtk3,
   alsa-lib,
   nss,
-  libXdamage,
+  libxdamage,
   libdrm,
   libgbm,
   libxshmfence,
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
     gtk3
     alsa-lib
     nss
-    libXdamage
+    libxdamage
     libdrm
     libgbm
     libxshmfence
diff --git a/pkgs/by-name/bl/bluespec/package.nix b/pkgs/by-name/bl/bluespec/package.nix
index fc9591d9ecfd..d5d1ac88333a 100644
--- a/pkgs/by-name/bl/bluespec/package.nix
+++ b/pkgs/by-name/bl/bluespec/package.nix
@@ -6,7 +6,7 @@
   autoconf,
   automake,
   fontconfig,
-  libX11,
+  libx11,
   perl,
   flex,
   bison,
@@ -147,7 +147,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = yices.buildInputs ++ [
     fontconfig
-    libX11 # tcltk
+    libx11 # tcltk
     tcl
     tk
     which
diff --git a/pkgs/by-name/bl/blugon/package.nix b/pkgs/by-name/bl/blugon/package.nix
index 5ee5ebf58c95..0ab73abaebc2 100644
--- a/pkgs/by-name/bl/blugon/package.nix
+++ b/pkgs/by-name/bl/blugon/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchFromGitHub,
   python3,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -20,8 +20,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     python3
-    libX11
-    libXrandr
+    libx11
+    libxrandr
   ];
 
   # Remove at next release
diff --git a/pkgs/by-name/bo/bobcat/package.nix b/pkgs/by-name/bo/bobcat/package.nix
index 115f211aa1b9..85f3d094b8fe 100644
--- a/pkgs/by-name/bo/bobcat/package.nix
+++ b/pkgs/by-name/bo/bobcat/package.nix
@@ -5,7 +5,7 @@
   icmake,
   yodl,
   libmilter,
-  libX11,
+  libx11,
   openssl,
   readline,
   util-linux,
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libmilter
-    libX11
+    libx11
     openssl
     readline
     util-linux
diff --git a/pkgs/by-name/bo/bochs/package.nix b/pkgs/by-name/bo/bochs/package.nix
index 8a8859546f98..6b8ff52a4150 100644
--- a/pkgs/by-name/bo/bochs/package.nix
+++ b/pkgs/by-name/bo/bochs/package.nix
@@ -8,8 +8,8 @@
   gtk3,
   libGL,
   libGLU,
-  libX11,
-  libXpm,
+  libx11,
+  libxpm,
   libtool,
   ncurses,
   pkg-config,
@@ -61,8 +61,8 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals enableX11 [
     libGL
     libGLU
-    libX11
-    libXpm
+    libx11
+    libxpm
   ];
 
   configureFlags = [
diff --git a/pkgs/by-name/bo/boinc/package.nix b/pkgs/by-name/bo/boinc/package.nix
index 1825c41d476c..056029987a62 100644
--- a/pkgs/by-name/bo/boinc/package.nix
+++ b/pkgs/by-name/bo/boinc/package.nix
@@ -9,8 +9,8 @@
   curl,
   libGLU,
   libGL,
-  libXmu,
-  libXi,
+  libxmu,
+  libxi,
   libglut,
   libjpeg,
   libtool,
@@ -19,9 +19,9 @@
   sqlite,
   gtk3,
   patchelf,
-  libXScrnSaver,
+  libxscrnsaver,
   libnotify,
-  libX11,
+  libx11,
   libxcb,
   headless ? false,
 }:
@@ -54,15 +54,15 @@ stdenv.mkDerivation rec {
   ++ lib.optionals (!headless) [
     libGLU
     libGL
-    libXmu
-    libXi
+    libxmu
+    libxi
     libglut
     libjpeg
     wxGTK32
     gtk3
-    libXScrnSaver
+    libxscrnsaver
     libnotify
-    libX11
+    libx11
     libxcb
     libxcb-util
   ];
diff --git a/pkgs/by-name/bo/bonzomatic/package.nix b/pkgs/by-name/bo/bonzomatic/package.nix
index e1ee65d74f21..a83bf2932f19 100644
--- a/pkgs/by-name/bo/bonzomatic/package.nix
+++ b/pkgs/by-name/bo/bonzomatic/package.nix
@@ -7,12 +7,12 @@
   alsa-lib,
   fontconfig,
   mesa_glu,
-  libXcursor,
-  libXinerama,
-  libXrandr,
+  libxcursor,
+  libxinerama,
+  libxrandr,
   xinput,
-  libXi,
-  libXext,
+  libxi,
+  libxext,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -40,12 +40,12 @@ stdenv.mkDerivation (finalAttrs: {
     alsa-lib
     fontconfig
     mesa_glu
-    libXcursor
-    libXinerama
-    libXrandr
+    libxcursor
+    libxinerama
+    libxrandr
     xinput
-    libXi
-    libXext
+    libxi
+    libxext
   ];
 
   postFixup = ''
diff --git a/pkgs/by-name/bo/bossa/package.nix b/pkgs/by-name/bo/bossa/package.nix
index fcba7c83a213..e1665d6d1ef6 100644
--- a/pkgs/by-name/bo/bossa/package.nix
+++ b/pkgs/by-name/bo/bossa/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   wxGTK32,
-  libX11,
+  libx11,
   readline,
   fetchpatch,
 }:
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ bin2c ];
   buildInputs = [
     wxGTK32
-    libX11
+    libx11
     readline
   ];
 
diff --git a/pkgs/by-name/bo/box2d/package.nix b/pkgs/by-name/bo/box2d/package.nix
index 8b3057b0288b..881f29239669 100644
--- a/pkgs/by-name/bo/box2d/package.nix
+++ b/pkgs/by-name/bo/box2d/package.nix
@@ -13,11 +13,11 @@
   glfw3,
   imgui,
   libGLU,
-  libX11,
-  libXcursor,
-  libXi,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxi,
+  libxinerama,
+  libxrandr,
   libglut,
   xorgproto,
 
@@ -72,11 +72,11 @@ stdenv.mkDerivation (finalAttrs: {
       IMGUI_BUILD_GLFW_BINDING = true;
     })
     libGLU
-    libX11
-    libXcursor
-    libXi
-    libXinerama
-    libXrandr
+    libx11
+    libxcursor
+    libxi
+    libxinerama
+    libxrandr
     libglut
     xorgproto
   ];
diff --git a/pkgs/by-name/bo/box2d_2/package.nix b/pkgs/by-name/bo/box2d_2/package.nix
index 48eb6c42bfc9..59b0d1d50408 100644
--- a/pkgs/by-name/bo/box2d_2/package.nix
+++ b/pkgs/by-name/bo/box2d_2/package.nix
@@ -10,11 +10,11 @@
   # buildInputs
   glfw3,
   libGLU,
-  libX11,
-  libXcursor,
-  libXi,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxi,
+  libxinerama,
+  libxrandr,
   libglut,
   xorgproto,
 
@@ -44,11 +44,11 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     glfw3
     libGLU
-    libX11
-    libXcursor
-    libXi
-    libXinerama
-    libXrandr
+    libx11
+    libxcursor
+    libxi
+    libxinerama
+    libxrandr
     libglut
     xorgproto
   ];
diff --git a/pkgs/by-name/bo/boxed-cpp/package.nix b/pkgs/by-name/bo/boxed-cpp/package.nix
index 6977c595aca2..1645b5aa5121 100644
--- a/pkgs/by-name/bo/boxed-cpp/package.nix
+++ b/pkgs/by-name/bo/boxed-cpp/package.nix
@@ -6,14 +6,14 @@
   catch2,
 }:
 
-stdenv.mkDerivation (final: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "boxed-cpp";
   version = "1.4.3";
 
   src = fetchFromGitHub {
     owner = "contour-terminal";
     repo = "boxed-cpp";
-    rev = "v${final.version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-uZ/wT159UuEcTUtoQyt0D59z2wnLT5KpeeCpjyij198=";
   };
 
diff --git a/pkgs/by-name/br/brave/make-brave.nix b/pkgs/by-name/br/brave/make-brave.nix
index 3d61baca34d6..7104061ddd32 100644
--- a/pkgs/by-name/br/brave/make-brave.nix
+++ b/pkgs/by-name/br/brave/make-brave.nix
@@ -21,17 +21,17 @@
   gtk3,
   gtk4,
   qt6,
-  libX11,
-  libXScrnSaver,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXtst,
+  libx11,
+  libxscrnsaver,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxtst,
   libdrm,
   libkrb5,
   libuuid,
@@ -110,20 +110,20 @@ let
     gtk3
     gtk4
     libdrm
-    libX11
+    libx11
     libGL
     libxkbcommon
-    libXScrnSaver
-    libXcomposite
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
-    libXrandr
-    libXrender
+    libxscrnsaver
+    libxcomposite
+    libxcursor
+    libxdamage
+    libxext
+    libxfixes
+    libxi
+    libxrandr
+    libxrender
     libxshmfence
-    libXtst
+    libxtst
     libuuid
     libgbm
     nspr
diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix
index dd8051878de0..c13c17f3dce9 100644
--- a/pkgs/by-name/br/brave/package.nix
+++ b/pkgs/by-name/br/brave/package.nix
@@ -3,24 +3,24 @@
 
 let
   pname = "brave";
-  version = "1.86.146";
+  version = "1.86.148";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-/Z2KLxURCgBfqunQUrspn9wS2QAjlWQBd3K7uXwk+fk=";
+      hash = "sha256-86VeBM2kKbuQ+/FAq24X4DdkAUOFzlGg52cAosMExzo=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-T8/Yv5jn4Fa79eDj0IFE9P9FbCSf7H2V/UY9S/i3C3c=";
+      hash = "sha256-VLJLU9hgKX7MwhxdFLyaPTmOb6+AEsJze40EePVd+Ug=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-BD4M16DVvcy0HGPrRc6l0T/so0mGicgaa7QvdGqfqKs=";
+      hash = "sha256-fYHd1TMN8kWzhchcCLxgU1M3frxCkvE7uITIdiopSU4=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-tbotgvXI706iM+VrXW6QA2ewxqQHqaFvV30cb7PwSrY=";
+      hash = "sha256-a37FTE/qi37d+pGrtkZWVqKaMXzLyIO/ppV4k9hz0uE=";
     };
   };
 
diff --git a/pkgs/by-name/br/bristol/package.nix b/pkgs/by-name/br/bristol/package.nix
index dab1639125e7..c805e8465906 100644
--- a/pkgs/by-name/br/bristol/package.nix
+++ b/pkgs/by-name/br/bristol/package.nix
@@ -5,8 +5,8 @@
   alsa-lib,
   libjack2,
   pkg-config,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   xorgproto,
   libpulseaudio,
   copyDesktopItems,
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
     alsa-lib
     libjack2
     libpulseaudio
-    libX11
-    libXext
+    libx11
+    libxext
     xorgproto
   ];
 
diff --git a/pkgs/by-name/br/brlcad/package.nix b/pkgs/by-name/br/brlcad/package.nix
index 180578191552..9b4212bd8d0b 100644
--- a/pkgs/by-name/br/brlcad/package.nix
+++ b/pkgs/by-name/br/brlcad/package.nix
@@ -5,8 +5,8 @@
   fetchpatch,
   cmake,
   fontconfig,
-  libX11,
-  libXi,
+  libx11,
+  libxi,
   freetype,
   libgbm,
 }:
@@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     fontconfig
-    libX11
-    libXi
+    libx11
+    libxi
     freetype
     libgbm
   ];
diff --git a/pkgs/by-name/br/brotli/package.nix b/pkgs/by-name/br/brotli/package.nix
index 7320d148d993..c6cc9bc0e8bb 100644
--- a/pkgs/by-name/br/brotli/package.nix
+++ b/pkgs/by-name/br/brotli/package.nix
@@ -84,5 +84,6 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     platforms = lib.platforms.all;
     mainProgram = "brotli";
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "google" finalAttrs.version;
   };
 })
diff --git a/pkgs/by-name/bs/bschaffl/package.nix b/pkgs/by-name/bs/bschaffl/package.nix
index aaae1dcc53ca..4cf6abd63618 100644
--- a/pkgs/by-name/bs/bschaffl/package.nix
+++ b/pkgs/by-name/bs/bschaffl/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   pkg-config,
   cairo,
-  libX11,
+  libx11,
   lv2,
 }:
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     cairo
-    libX11
+    libx11
     lv2
   ];
 
diff --git a/pkgs/by-name/bs/bsnes-hd/package.nix b/pkgs/by-name/bs/bsnes-hd/package.nix
index 6e18d86fe0c8..f6decae52c64 100644
--- a/pkgs/by-name/bs/bsnes-hd/package.nix
+++ b/pkgs/by-name/bs/bsnes-hd/package.nix
@@ -5,8 +5,8 @@
   fetchFromGitHub,
   gtk3,
   gtksourceview3,
-  libX11,
-  libXv,
+  libx11,
+  libxv,
   libao,
   libicns,
   libpulseaudio,
@@ -59,8 +59,8 @@ stdenv.mkDerivation {
     libao
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
-    libXv
+    libx11
+    libxv
     udev
     gtk3
     gtksourceview3
diff --git a/pkgs/by-name/bs/bspwm/package.nix b/pkgs/by-name/bs/bspwm/package.nix
index c5e621f5eba4..047de693024f 100644
--- a/pkgs/by-name/bs/bspwm/package.nix
+++ b/pkgs/by-name/bs/bspwm/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   libxcb,
-  libXinerama,
+  libxinerama,
   libxcb-util,
   libxcb-keysyms,
   libxcb-wm,
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libxcb
-    libXinerama
+    libxinerama
     libxcb-util
     libxcb-keysyms
     libxcb-wm
diff --git a/pkgs/by-name/bu/bucklespring-libinput/package.nix b/pkgs/by-name/bu/bucklespring-libinput/package.nix
index 8a7f15686481..71fb6aa0df6c 100644
--- a/pkgs/by-name/bu/bucklespring-libinput/package.nix
+++ b/pkgs/by-name/bu/bucklespring-libinput/package.nix
@@ -11,8 +11,8 @@
 
   openal,
   alure,
-  libXtst,
-  libX11,
+  libxtst,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -36,8 +36,8 @@ stdenv.mkDerivation (finalAttrs: {
     alure
   ]
   ++ lib.optionals legacy [
-    libXtst
-    libX11
+    libxtst
+    libx11
   ]
   ++ lib.optionals (!legacy) [ libinput ];
 
diff --git a/pkgs/by-name/bu/buf/package.nix b/pkgs/by-name/bu/buf/package.nix
index 466e2db28b7d..59f715a8872f 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.60.0";
+  version = "1.64.0";
 
   src = fetchFromGitHub {
     owner = "bufbuild";
     repo = "buf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6hXDepvmSovTnrbtZqgU08qUBP6UCtmKeU68rYsIWKg=";
+    hash = "sha256-vz7HtNe198Wjy4bjpx327VW11Qme5VWZMyeb56nWy0A=";
   };
 
-  vendorHash = "sha256-7HdYKFMceaZkZYkxhpFrVQKsNCeXeUH1SPupkzAJpl0=";
+  vendorHash = "sha256-jBwIDPDRdXO89uyrw2Ul2uE50zCLxS9qBzoYOQXupUQ=";
 
   patches = [
     # Skip a test that requires networking to be available to work.
diff --git a/pkgs/by-name/bu/bumblebee/package.nix b/pkgs/by-name/bu/bumblebee/package.nix
index 26b401397b93..c1bbb4ae962b 100644
--- a/pkgs/by-name/bu/bumblebee/package.nix
+++ b/pkgs/by-name/bu/bumblebee/package.nix
@@ -26,7 +26,7 @@
   makeWrapper,
   glib,
   libbsd,
-  libX11,
+  libx11,
   xorg-server,
   kmod,
   xf86-video-nouveau,
@@ -135,7 +135,7 @@ stdenv.mkDerivation rec {
   # Build-time dependencies of bumblebeed and optirun.
   # Note that it has several runtime dependencies.
   buildInputs = [
-    libX11
+    libx11
     glib
     libbsd
     kmod
diff --git a/pkgs/by-name/bu/bumpp/package.nix b/pkgs/by-name/bu/bumpp/package.nix
index 0c9ab5816356..b516143dd652 100644
--- a/pkgs/by-name/bu/bumpp/package.nix
+++ b/pkgs/by-name/bu/bumpp/package.nix
@@ -12,19 +12,19 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "bumpp";
-  version = "10.3.2";
+  version = "10.4.1";
 
   src = fetchFromGitHub {
     owner = "antfu-collective";
     repo = "bumpp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1hGVLPogdeyWh/B2Yxfo/9YbJpFYl8ATh+QCa2VVyyk=";
+    hash = "sha256-cYtk7gE2TYgrFUoa2HV56/qTSX/Dojlo+eDwWRGQr1c=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 2;
-    hash = "sha256-y7uHDtoOjsLnNF47r4aWHYXW0ui8shhn1M0cD2FpaCg=";
+    hash = "sha256-/Yz5Gas3OsqdLAiuZRwGTTcIS/UR1WWms01vU1WxlCo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/bu/bup/package.nix b/pkgs/by-name/bu/bup/package.nix
index 8373c3b527d1..379531d3ccd0 100644
--- a/pkgs/by-name/bu/bup/package.nix
+++ b/pkgs/by-name/bu/bup/package.nix
@@ -15,7 +15,7 @@
 assert par2Support -> par2cmdline != null;
 
 let
-  version = "0.33.9";
+  version = "0.33.10";
 
   pythonDeps =
     with python3.pkgs;
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
     repo = "bup";
     owner = "bup";
     tag = version;
-    hash = "sha256-MW4kScu81XW89W7WpvOj40+S8bG5QozN30Hfj4TsnX4=";
+    hash = "sha256-uqXlfTFRgCN9c00iQik+IMN6k81fpeY6gNscP54Xzgs=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/c2/c2fmzq/package.nix b/pkgs/by-name/c2/c2fmzq/package.nix
index 9f116ed1d97d..30e30e9293f2 100644
--- a/pkgs/by-name/c2/c2fmzq/package.nix
+++ b/pkgs/by-name/c2/c2fmzq/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "c2FmZQ";
-  version = "0.5.3";
+  version = "0.5.5";
 
   src = fetchFromGitHub {
     owner = "c2FmZQ";
     repo = "c2FmZQ";
     rev = "v${version}";
-    hash = "sha256-SBCUOQpV03kZu6nHuwTUd8gyKeK+XAthZ+H7IRYFjdM=";
+    hash = "sha256-O4/V8fFiTfqTiJWPwEsdigdeKBmwGGo43ZvJXPcVRlE=";
   };
 
   ldflags = [
@@ -23,7 +23,7 @@ buildGoModule rec {
 
   sourceRoot = "${src.name}/c2FmZQ";
 
-  vendorHash = "sha256-jyos/CNQyuatq4KL2nqCPtRuMQLZMB35VECiKQhq4go=";
+  vendorHash = "sha256-B1kHtDHnviU60WEfmASMX69nyEepeeBdMZVtbcmZ9z4=";
 
   subPackages = [
     "c2FmZQ-client"
diff --git a/pkgs/by-name/c6/c64-debugger/package.nix b/pkgs/by-name/c6/c64-debugger/package.nix
index 4ddc6309cdd7..8951b52cbd57 100644
--- a/pkgs/by-name/c6/c64-debugger/package.nix
+++ b/pkgs/by-name/c6/c64-debugger/package.nix
@@ -6,7 +6,7 @@
   gtk3,
   libGL,
   libGLU,
-  libX11,
+  libx11,
   pkg-config,
   upx,
   libxcb-util,
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
     gtk3
     libGL
     libGLU
-    libX11
+    libx11
     libxcb-util
   ];
 
diff --git a/pkgs/by-name/ca/caf/package.nix b/pkgs/by-name/ca/caf/package.nix
index a979212e10cf..7b045f2a5408 100644
--- a/pkgs/by-name/ca/caf/package.nix
+++ b/pkgs/by-name/ca/caf/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Open source implementation of the actor model in C++";
-    homepage = "http://actor-framework.org/";
+    homepage = "https://www.actor-framework.org/";
     license = lib.licenses.bsd3;
     platforms = lib.platforms.unix;
     changelog = "https://github.com/actor-framework/actor-framework/raw/${finalAttrs.version}/CHANGELOG.md";
diff --git a/pkgs/by-name/ca/cage/package.nix b/pkgs/by-name/ca/cage/package.nix
index 8f8e06024e1a..7326ee2dc221 100644
--- a/pkgs/by-name/ca/cage/package.nix
+++ b/pkgs/by-name/ca/cage/package.nix
@@ -16,7 +16,7 @@
   libxkbcommon,
   libxcb-wm,
   libGL,
-  libX11,
+  libx11,
   xwayland ? null,
   nixosTests,
 }:
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxkbcommon
     libxcb-wm
     libGL
-    libX11
+    libx11
   ];
 
   postFixup = lib.optionalString wlroots_0_19.enableXWayland ''
diff --git a/pkgs/by-name/ca/cairo/package.nix b/pkgs/by-name/ca/cairo/package.nix
index 73120b1031aa..163a15c9bfca 100644
--- a/pkgs/by-name/ca/cairo/package.nix
+++ b/pkgs/by-name/ca/cairo/package.nix
@@ -15,8 +15,8 @@
   pixman,
   zlib,
   x11Support ? !stdenv.hostPlatform.isDarwin || true,
-  libXext,
-  libXrender,
+  libxext,
+  libxrender,
   gobjectSupport ? true,
   glib,
   xcbSupport ? x11Support,
@@ -72,8 +72,8 @@ stdenv.mkDerivation (
       zlib
     ]
     ++ optionals x11Support [
-      libXext
-      libXrender
+      libxext
+      libxrender
     ]
     ++ optionals xcbSupport [ libxcb ]
     ++ optional gobjectSupport glib; # TODO: maybe liblzo but what would it be for here?
diff --git a/pkgs/by-name/ca/cardinal/package.nix b/pkgs/by-name/ca/cardinal/package.nix
index 086ecb44a54f..7ac3155a6047 100644
--- a/pkgs/by-name/ca/cardinal/package.nix
+++ b/pkgs/by-name/ca/cardinal/package.nix
@@ -9,10 +9,10 @@
   jansson,
   lib,
   libGL,
-  libX11,
-  libXcursor,
-  libXext,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxext,
+  libxrandr,
   libarchive,
   libjack2,
   liblo,
@@ -57,10 +57,10 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
     jansson
     libGL
-    libX11
-    libXcursor
-    libXext
-    libXrandr
+    libx11
+    libxcursor
+    libxext
+    libxrandr
     libarchive
     liblo
     libsamplerate
diff --git a/pkgs/by-name/ca/cargo-swift/package.nix b/pkgs/by-name/ca/cargo-swift/package.nix
index 0bdc41fd09a3..6b187dc1db35 100644
--- a/pkgs/by-name/ca/cargo-swift/package.nix
+++ b/pkgs/by-name/ca/cargo-swift/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-swift";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "antoniusnaumann";
     repo = "cargo-swift";
     rev = "v${version}";
-    hash = "sha256-koHQaYfMDc8GxQ+K7C1YluMY5u4cUGV8/Ehjt/KWl/g=";
+    hash = "sha256-abLXt9wIw/qhSkusRSmHJHU8feojaLVQeFP8DAkE1Gc=";
   };
 
-  cargoHash = "sha256-8aFISZ2nzCmxxKkX77jEOE/MWcKwyTw8IGTEbJ0mKWg=";
+  cargoHash = "sha256-u4lzPbXyBCcZk5kzxuYHjtJQTTxjRYeDeMpIcK+Dr8Q=";
 
   meta = {
     description = "Cargo plugin to easily build Swift packages from Rust code";
diff --git a/pkgs/by-name/ca/caribou/package.nix b/pkgs/by-name/ca/caribou/package.nix
index 3bdd2335ae0a..73d6edec687b 100644
--- a/pkgs/by-name/ca/caribou/package.nix
+++ b/pkgs/by-name/ca/caribou/package.nix
@@ -12,7 +12,7 @@
   python3,
   libxml2,
   libxklavier,
-  libXtst,
+  libxtst,
   gtk2,
   intltool,
   libxslt,
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
     dbus
     pythonEnv
     python3.pkgs.pygobject3
-    libXtst
+    libxtst
     gtk2
   ];
 
diff --git a/pkgs/by-name/cd/cdesktopenv/package.nix b/pkgs/by-name/cd/cdesktopenv/package.nix
index 5cda8d923622..9523f084119d 100644
--- a/pkgs/by-name/cd/cdesktopenv/package.nix
+++ b/pkgs/by-name/cd/cdesktopenv/package.nix
@@ -2,26 +2,26 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
   bison,
   mksh,
   perl,
-  libXinerama,
-  libXt,
-  libXext,
+  libxinerama,
+  libxt,
+  libxext,
   libtirpc,
   motif,
-  libXft,
+  libxft,
   xbitmaps,
   libjpeg,
-  libXmu,
-  libXdmcp,
-  libXScrnSaver,
+  libxmu,
+  libxdmcp,
+  libxscrnsaver,
   bdftopcf,
   ncompress,
   mkfontdir,
   tcl,
-  libXaw,
+  libxaw,
   libxcrypt,
   glibcLocales,
   autoPatchelfHook,
@@ -31,7 +31,7 @@
   autoreconfHook,
   opensp,
   flex,
-  libXpm,
+  libxpm,
   rpcsvc-proto,
   sessreg,
   pkg-config,
@@ -71,23 +71,23 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   buildInputs = [
-    libX11
-    libXinerama
-    libXt
-    libXext
+    libx11
+    libxinerama
+    libxt
+    libxext
     libtirpc
     motif
-    libXft
+    libxft
     xbitmaps
     libjpeg
-    libXmu
-    libXdmcp
-    libXScrnSaver
+    libxmu
+    libxdmcp
+    libxscrnsaver
     tcl
-    libXaw
+    libxaw
     mksh
     libxcrypt
-    libXpm
+    libxpm
     sessreg
     lmdb
   ];
diff --git a/pkgs/by-name/ce/cemu/package.nix b/pkgs/by-name/ce/cemu/package.nix
index 52b100884300..912859780604 100644
--- a/pkgs/by-name/ce/cemu/package.nix
+++ b/pkgs/by-name/ce/cemu/package.nix
@@ -15,7 +15,7 @@
   gtk3,
   hidapi,
   imgui,
-  libXrender,
+  libxrender,
   libpng,
   libusb1,
   libzip,
@@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
     libusb1
     libzip
-    libXrender
+    libxrender
     pugixml
     rapidjson
     vulkan-headers
diff --git a/pkgs/by-name/ce/cen64/package.nix b/pkgs/by-name/ce/cen64/package.nix
index 7153d395105a..3301875adc2f 100644
--- a/pkgs/by-name/ce/cen64/package.nix
+++ b/pkgs/by-name/ce/cen64/package.nix
@@ -5,7 +5,7 @@
   cmake,
   libGL,
   libiconv,
-  libX11,
+  libx11,
   openal,
   nix-update-script,
 }:
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libGL
     libiconv
-    libX11
+    libx11
     openal
   ];
 
diff --git a/pkgs/by-name/ce/certinfo/package.nix b/pkgs/by-name/ce/certinfo/package.nix
index 7ce53102cd21..322ea5e73ac9 100644
--- a/pkgs/by-name/ce/certinfo/package.nix
+++ b/pkgs/by-name/ce/certinfo/package.nix
@@ -3,7 +3,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
-  libX11,
+  libx11,
 }:
 
 buildGoModule rec {
@@ -20,7 +20,7 @@ buildGoModule rec {
   # clipboard functionality not working on Darwin
   doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64);
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libX11 ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libx11 ];
 
   vendorHash = null;
 
diff --git a/pkgs/by-name/cg/cgui/package.nix b/pkgs/by-name/cg/cgui/package.nix
index cc34ba0610a2..2d0746137cbc 100644
--- a/pkgs/by-name/cg/cgui/package.nix
+++ b/pkgs/by-name/cg/cgui/package.nix
@@ -5,7 +5,7 @@
   texinfo,
   allegro,
   perl,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     texinfo
     allegro
     perl
-    libX11
+    libx11
   ];
 
   configurePhase = ''
diff --git a/pkgs/by-name/ch/chemtool/package.nix b/pkgs/by-name/ch/chemtool/package.nix
index 91530a78206e..49cfead9e5a5 100644
--- a/pkgs/by-name/ch/chemtool/package.nix
+++ b/pkgs/by-name/ch/chemtool/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   pkg-config,
-  libX11,
+  libx11,
   gtk2,
   fig2dev,
   wrapGAppsHook3,
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     wrapGAppsHook3
   ];
   buildInputs = [
-    libX11
+    libx11
     gtk2
     fig2dev
   ];
diff --git a/pkgs/by-name/ch/chessdb/package.nix b/pkgs/by-name/ch/chessdb/package.nix
index 4c117dc62236..f17d43c4204d 100644
--- a/pkgs/by-name/ch/chessdb/package.nix
+++ b/pkgs/by-name/ch/chessdb/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   tcl,
   tk,
-  libX11,
+  libx11,
   makeWrapper,
 }:
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     tcl
     tk
-    libX11
+    libx11
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/ch/chez-racket/shared.nix b/pkgs/by-name/ch/chez-racket/shared.nix
index 752dde048323..aa38643ee4f4 100644
--- a/pkgs/by-name/ch/chez-racket/shared.nix
+++ b/pkgs/by-name/ch/chez-racket/shared.nix
@@ -8,7 +8,7 @@ args:
   darwin,
   ncurses,
   libiconv,
-  libX11,
+  libx11,
   zlib,
   lz4,
 }:
@@ -41,7 +41,7 @@ stdenv.mkDerivation (
     ];
     buildInputs = [
       libiconv
-      libX11
+      libx11
       lz4
       ncurses
       zlib
diff --git a/pkgs/by-name/ch/chez/package.nix b/pkgs/by-name/ch/chez/package.nix
index c09310a7a1ab..4b636c759f5e 100644
--- a/pkgs/by-name/ch/chez/package.nix
+++ b/pkgs/by-name/ch/chez/package.nix
@@ -10,7 +10,7 @@
   darwin,
   ncurses,
   libiconv,
-  libX11,
+  libx11,
   testers,
   writableTmpDirAsHomeHook,
   buildPackages,
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     libffi
   ]
   ++ lib.optionals stdenv.hostPlatform.isUnix [
-    libX11
+    libx11
   ];
 
   /*
diff --git a/pkgs/by-name/ch/chipmunk/package.nix b/pkgs/by-name/ch/chipmunk/package.nix
index 30f004669f1a..07b6c31b2040 100644
--- a/pkgs/by-name/ch/chipmunk/package.nix
+++ b/pkgs/by-name/ch/chipmunk/package.nix
@@ -8,12 +8,12 @@
   libGL,
   glfw2,
   glew,
-  libX11,
+  libx11,
   xorgproto,
-  libXi,
-  libXmu,
+  libxi,
+  libxmu,
   fetchpatch,
-  libXrandr,
+  libxrandr,
 }:
 
 stdenv.mkDerivation rec {
@@ -40,11 +40,11 @@ stdenv.mkDerivation rec {
     libGL
     glfw2
     glew
-    libX11
+    libx11
     xorgproto
-    libXi
-    libXmu
-    libXrandr
+    libxi
+    libxmu
+    libxrandr
   ];
 
   postInstall = ''
diff --git a/pkgs/by-name/ch/chiptrack/package.nix b/pkgs/by-name/ch/chiptrack/package.nix
index 16ad7447de1d..33bf51c5b814 100644
--- a/pkgs/by-name/ch/chiptrack/package.nix
+++ b/pkgs/by-name/ch/chiptrack/package.nix
@@ -18,11 +18,11 @@
   libglvnd,
   libjpeg,
   libxkbcommon,
-  libX11,
-  libXcursor,
-  libXext,
-  libXi,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxext,
+  libxi,
+  libxrandr,
   makeWrapper,
   ninja,
   pkg-config,
@@ -114,11 +114,11 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
           ++ lib.optionals clangStdenv.hostPlatform.isLinux [
             libglvnd
             libxkbcommon
-            libX11
-            libXcursor
-            libXext
-            libXrandr
-            libXi
+            libx11
+            libxcursor
+            libxext
+            libxrandr
+            libxi
             wayland
           ]
         )
diff --git a/pkgs/by-name/ch/chow-centaur/package.nix b/pkgs/by-name/ch/chow-centaur/package.nix
index 9e5aa61cbda2..fdba91e2e5af 100644
--- a/pkgs/by-name/ch/chow-centaur/package.nix
+++ b/pkgs/by-name/ch/chow-centaur/package.nix
@@ -9,9 +9,9 @@
   libxcb-cursor,
   libxcb-keysyms,
   libxcb-util,
-  libXrandr,
-  libXinerama,
-  libXcursor,
+  libxrandr,
+  libxinerama,
+  libxcursor,
   alsa-lib,
   libjack2,
   lv2,
@@ -40,9 +40,9 @@ stdenv.mkDerivation (finalAttrs: {
     libxcb-cursor
     libxcb-keysyms
     libxcb-util
-    libXrandr
-    libXinerama
-    libXcursor
+    libxrandr
+    libxinerama
+    libxcursor
     alsa-lib
     libjack2
     lv2
diff --git a/pkgs/by-name/ch/chow-kick/package.nix b/pkgs/by-name/ch/chow-kick/package.nix
index fb4716d53c96..729e7f93c03e 100644
--- a/pkgs/by-name/ch/chow-kick/package.nix
+++ b/pkgs/by-name/ch/chow-kick/package.nix
@@ -7,10 +7,10 @@
   freetype,
   lib,
   libGL,
-  libXcursor,
-  libXext,
-  libXinerama,
-  libXrandr,
+  libxcursor,
+  libxext,
+  libxinerama,
+  libxrandr,
   libjack2,
   libxkbcommon,
   lv2,
@@ -40,10 +40,10 @@ stdenv.mkDerivation (finalAttrs: {
     libepoxy
     freetype
     libGL
-    libXcursor
-    libXext
-    libXinerama
-    libXrandr
+    libxcursor
+    libxext
+    libxinerama
+    libxrandr
     libjack2
     libxkbcommon
     lv2
diff --git a/pkgs/by-name/ch/chow-phaser/package.nix b/pkgs/by-name/ch/chow-phaser/package.nix
index d71c4124ad14..fac85cd36a82 100644
--- a/pkgs/by-name/ch/chow-phaser/package.nix
+++ b/pkgs/by-name/ch/chow-phaser/package.nix
@@ -12,12 +12,12 @@
   gtk3,
   lib,
   libGL,
-  libXcursor,
-  libXdmcp,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXtst,
+  libxcursor,
+  libxdmcp,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxtst,
   libdatrie,
   libjack2,
   libpsl,
@@ -60,12 +60,12 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
     gtk3
     libGL
-    libXcursor
-    libXdmcp
-    libXext
-    libXinerama
-    libXrandr
-    libXtst
+    libxcursor
+    libxdmcp
+    libxext
+    libxinerama
+    libxrandr
+    libxtst
     libdatrie
     libjack2
     libpsl
diff --git a/pkgs/by-name/ch/chow-tape-model/package.nix b/pkgs/by-name/ch/chow-tape-model/package.nix
index e61a13ab1618..c7524b7588dc 100644
--- a/pkgs/by-name/ch/chow-tape-model/package.nix
+++ b/pkgs/by-name/ch/chow-tape-model/package.nix
@@ -11,12 +11,12 @@
   gtk3,
   lib,
   libGL,
-  libXcursor,
-  libXdmcp,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXtst,
+  libxcursor,
+  libxdmcp,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxtst,
   libdatrie,
   libjack2,
   libpsl,
@@ -66,12 +66,12 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
     gtk3
     libGL
-    libXcursor
-    libXdmcp
-    libXext
-    libXinerama
-    libXrandr
-    libXtst
+    libxcursor
+    libxdmcp
+    libxext
+    libxinerama
+    libxrandr
+    libxtst
     libdatrie
     libjack2
     libpsl
diff --git a/pkgs/by-name/ci/cinelerra/package.nix b/pkgs/by-name/ci/cinelerra/package.nix
index d890f199cc07..89efbd0a8de3 100644
--- a/pkgs/by-name/ci/cinelerra/package.nix
+++ b/pkgs/by-name/ci/cinelerra/package.nix
@@ -25,12 +25,12 @@
   x264,
   gettext,
   openexr,
-  libXext,
-  libXxf86vm,
-  libXv,
-  libXi,
-  libX11,
-  libXft,
+  libxext,
+  libxxf86vm,
+  libxv,
+  libxi,
+  libx11,
+  libxft,
   xorgproto,
   libtheora,
   libpng,
@@ -96,12 +96,12 @@ stdenv.mkDerivation {
     x264
     gettext
     openexr
-    libXext
-    libXxf86vm
-    libXv
-    libXi
-    libX11
-    libXft
+    libxext
+    libxxf86vm
+    libxv
+    libxi
+    libx11
+    libxft
     xorgproto
     libtheora
     libpng
diff --git a/pkgs/by-name/ci/cinnamon-control-center/package.nix b/pkgs/by-name/ci/cinnamon-control-center/package.nix
index fc64851c586c..6bb69dd84c82 100644
--- a/pkgs/by-name/ci/cinnamon-control-center/package.nix
+++ b/pkgs/by-name/ci/cinnamon-control-center/package.nix
@@ -18,7 +18,7 @@
   libwacom,
   wrapGAppsHook3,
   libnma,
-  libXi,
+  libxi,
   modemmanager,
   xorgproto,
   meson,
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     libwacom
     networkmanager
     libnma
-    libXi
+    libxi
     modemmanager
     xorgproto
     upower
diff --git a/pkgs/by-name/ci/cinnamon/package.nix b/pkgs/by-name/ci/cinnamon/package.nix
index d2ba38f50427..9c4fe470673a 100644
--- a/pkgs/by-name/ci/cinnamon/package.nix
+++ b/pkgs/by-name/ci/cinnamon/package.nix
@@ -22,8 +22,8 @@
   json-glib,
   libsecret,
   libstartup_notification,
-  libXtst,
-  libXdamage,
+  libxtst,
+  libxdamage,
   libgbm,
   muffin,
   networkmanager,
@@ -107,8 +107,8 @@ stdenv.mkDerivation rec {
     json-glib
     libsecret
     libstartup_notification
-    libXtst
-    libXdamage
+    libxtst
+    libxdamage
     libgbm
     muffin
     networkmanager
diff --git a/pkgs/by-name/ci/circleci-cli/package.nix b/pkgs/by-name/ci/circleci-cli/package.nix
index 4bc18bea9b40..56d6579a7cc2 100644
--- a/pkgs/by-name/ci/circleci-cli/package.nix
+++ b/pkgs/by-name/ci/circleci-cli/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "circleci-cli";
-  version = "0.1.34038";
+  version = "0.1.34283";
 
   src = fetchFromGitHub {
     owner = "CircleCI-Public";
     repo = "circleci-cli";
     rev = "v${version}";
-    sha256 = "sha256-kEhAiTcWY+xXX5jFgJZtle0CEwqRT2BHDEM8iSUFRh4=";
+    sha256 = "sha256-LcZAdYADw8pQQIpnAhP1Yoo4E5pC+/9+rNEthntZ1vU=";
   };
 
   vendorHash = "sha256-QMSciB81khHhjd/4Km1YYyTiEFDF75AcNGsmZTLLO5Q=";
diff --git a/pkgs/by-name/ck/ckb-next/package.nix b/pkgs/by-name/ck/ckb-next/package.nix
index 70f4db66cb5d..8825a524ee64 100644
--- a/pkgs/by-name/ck/ckb-next/package.nix
+++ b/pkgs/by-name/ck/ckb-next/package.nix
@@ -10,7 +10,7 @@
   cmake,
   zlib,
   kmod,
-  libXdmcp,
+  libxdmcp,
   gnused,
   withPulseaudio ? stdenv.hostPlatform.isLinux,
   libpulseaudio,
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
     udev
     qt6.qtbase
     zlib
-    libXdmcp
+    libxdmcp
     qt6.qttools
     qt6Packages.quazip
     qt6.qtwayland
diff --git a/pkgs/by-name/cl/clanlib/package.nix b/pkgs/by-name/cl/clanlib/package.nix
index 5ecd5b46fec5..b9a6450a7c5c 100644
--- a/pkgs/by-name/cl/clanlib/package.nix
+++ b/pkgs/by-name/cl/clanlib/package.nix
@@ -10,8 +10,8 @@
   freetype,
   fontconfig,
   alsa-lib,
-  libXrender,
-  libXinerama,
+  libxrender,
+  libxinerama,
   nix-update-script,
 }:
 
@@ -38,8 +38,8 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
     fontconfig
     alsa-lib
-    libXrender
-    libXinerama
+    libxrender
+    libxinerama
   ];
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/cl/classicube/package.nix b/pkgs/by-name/cl/classicube/package.nix
index fb788a2845f1..4076d261d389 100644
--- a/pkgs/by-name/cl/classicube/package.nix
+++ b/pkgs/by-name/cl/classicube/package.nix
@@ -6,8 +6,8 @@
   makeWrapper,
   makeDesktopItem,
   copyDesktopItems,
-  libX11,
-  libXi,
+  libx11,
+  libxi,
   libGL,
   curl,
   openal,
@@ -74,8 +74,8 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [
-    libX11
-    libXi
+    libx11
+    libxi
     libGL
     curl
     openal
diff --git a/pkgs/by-name/cl/claude-code-acp/package.nix b/pkgs/by-name/cl/claude-code-acp/package.nix
index 68116b9f6e08..eb30cea5c1b6 100644
--- a/pkgs/by-name/cl/claude-code-acp/package.nix
+++ b/pkgs/by-name/cl/claude-code-acp/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "claude-code-acp";
-  version = "0.13.2";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "zed-industries";
     repo = "claude-code-acp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hHq7U7PRqMln9jgdnYdVeWmagMQOiKSMI2VIcyGNgVk=";
+    hash = "sha256-vmsPHfE5wAfGARLPlcbQxXuHKMEKUAVC66zlhE0Fdo0=";
   };
 
-  npmDepsHash = "sha256-tsB5OrdbcmVr+zsrrJAjdOhtKoYzyecaZcyrwJU7zjg=";
+  npmDepsHash = "sha256-lVxvoTxaLdRQ61rtYKgE9ETaGP3fOovtzYKs5lxMAC8=";
 
   meta = {
     description = "ACP-compatible coding agent powered by the Claude Code SDK";
diff --git a/pkgs/by-name/cl/claude-code-bin/manifest.json b/pkgs/by-name/cl/claude-code-bin/manifest.json
index 972e12eb48ea..7b28d4bb081d 100644
--- a/pkgs/by-name/cl/claude-code-bin/manifest.json
+++ b/pkgs/by-name/cl/claude-code-bin/manifest.json
@@ -1,34 +1,41 @@
 {
-  "version": "2.1.25",
-  "buildDate": "2026-01-29T20:35:15Z",
+  "version": "2.1.34",
+  "buildDate": "2026-02-06T06:39:27Z",
   "platforms": {
     "darwin-arm64": {
-      "checksum": "1023c0334b0bf99ce7a466adbdb24ed0cae0ce4e1138837238e132b3886dd789",
-      "size": 182288624
+      "binary": "claude",
+      "checksum": "58bd74f33a9f0beb4338e02f613f63064fda73e9226288d10909df50a466ec60",
+      "size": 180901616
     },
     "darwin-x64": {
-      "checksum": "13fc5f92b6fec84b674ac7cf506524323f012cf999740733f7377f6fb46bcfd7",
-      "size": 188585664
+      "binary": "claude",
+      "checksum": "57e08c32782d0e3d1e38cf697261f85813a710d2719447a75770bdafdc4740c8",
+      "size": 187198656
     },
     "linux-arm64": {
-      "checksum": "38016991376efb8b1a83488800a9589694a6e77a7a920c5e654778c68753c776",
-      "size": 216667439
+      "binary": "claude",
+      "checksum": "ffb0625ad609b5816cedfb23f88325f62b63747ab6fdfe5a53f352fd4ed77b33",
+      "size": 215296297
     },
     "linux-x64": {
-      "checksum": "696135f0eccaf7a4070168845146833fa4fc93a6191fe026a7517af4d2e14fec",
-      "size": 224472763
+      "binary": "claude",
+      "checksum": "3665f12f67a1159b31005dcce11ca1de41d49759bae3d01ed853940fe7c4a21f",
+      "size": 223101542
     },
     "linux-arm64-musl": {
-      "checksum": "a6aee1f2d6e5010432a589fc52772e44186099e3d1fd94419b1689ff860935de",
-      "size": 211931471
+      "binary": "claude",
+      "checksum": "2f610b62fb441b4b9d4223f1036a76d86576ab484876eb5f10bcede91178f913",
+      "size": 210560329
     },
     "linux-x64-musl": {
-      "checksum": "bd51f99dca3ba650ce74d9a491d6fae06da7f48e426d2948b0aed274eb34b141",
-      "size": 217161339
+      "binary": "claude",
+      "checksum": "e1f8081c9f53bcb7055bfe855c717bd6040cee8a81a7c29deb6d8b1c6e4d8259",
+      "size": 215790118
     },
     "win32-x64": {
-      "checksum": "d47eb36d833a4a9c74fac9a91026cd7f8959d509bb6b7a14702fb2a72e7c0b66",
-      "size": 234309792
+      "binary": "claude.exe",
+      "checksum": "655008c690f8e5397ce7d420d0b3e09ef286035e7a1e4d12caa8f61fb3c968ec",
+      "size": 232975520
     }
   }
 }
diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index 749493370e5f..41383c8c8978 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@anthropic-ai/claude-code",
-  "version": "2.1.25",
+  "version": "2.1.34",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@anthropic-ai/claude-code",
-      "version": "2.1.25",
+      "version": "2.1.34",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 1bb60aa0c745..d5403e0f9e52 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -15,14 +15,14 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "claude-code";
-  version = "2.1.25";
+  version = "2.1.34";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-61tEjrW4WFAbichsQJwAUjEecMiDmYGvgeqAhuqs3IA=";
+    hash = "sha256-J3kltFY5nR3PsRWbW310VqD/6hhfMbVSvynv0eaIi3M=";
   };
 
-  npmDepsHash = "sha256-QH117ZS1pJgqTorGgn/YY/oU0X2/b033dOqRcU+oR5M=";
+  npmDepsHash = "sha256-n762einDxLUUXWMsfdPVhA/kn0ywlJgFQ2ZGoEk3E68=";
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/cl/clightd/package.nix b/pkgs/by-name/cl/clightd/package.nix
index 33fa4c4fd91f..c5f7223b9a32 100644
--- a/pkgs/by-name/cl/clightd/package.nix
+++ b/pkgs/by-name/cl/clightd/package.nix
@@ -12,16 +12,16 @@
   libusb1,
   libjpeg,
   libmodule,
-  libXdmcp,
+  libxdmcp,
   util-linux,
   libpthread-stubs,
   enableDdc ? true,
   ddcutil,
   enableDpms ? true,
-  libXext,
+  libxext,
   enableGamma ? true,
   libdrm,
-  libXrandr,
+  libxrandr,
   libiio,
   wayland,
   enableScreen ? true,
@@ -81,13 +81,13 @@ stdenv.mkDerivation (finalAttrs: {
     libmodule
     libiio
 
-    libXdmcp
+    libxdmcp
     util-linux
     libpthread-stubs
   ]
   ++ lib.optionals enableDdc [ ddcutil ]
-  ++ lib.optionals enableDpms [ libXext ]
-  ++ lib.optionals enableGamma [ libXrandr ]
+  ++ lib.optionals enableDpms [ libxext ]
+  ++ lib.optionals enableGamma [ libxrandr ]
   ++ lib.optionals (enableDpms || enableGamma || enableScreen) [
     libdrm
     wayland
diff --git a/pkgs/by-name/cl/clipnotify/package.nix b/pkgs/by-name/cl/clipnotify/package.nix
index 992bb1398b78..33f9bfbc8943 100644
--- a/pkgs/by-name/cl/clipnotify/package.nix
+++ b/pkgs/by-name/cl/clipnotify/package.nix
@@ -1,6 +1,6 @@
 {
-  libX11,
-  libXfixes,
+  libx11,
+  libxfixes,
   lib,
   stdenv,
   fetchFromGitHub,
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    libX11
-    libXfixes
+    libx11
+    libxfixes
   ];
 
   installPhase = ''
diff --git a/pkgs/by-name/cl/clipqr/package.nix b/pkgs/by-name/cl/clipqr/package.nix
index 27f403c97843..e5b731968d59 100644
--- a/pkgs/by-name/cl/clipqr/package.nix
+++ b/pkgs/by-name/cl/clipqr/package.nix
@@ -4,13 +4,13 @@
   fetchFromGitLab,
   lib,
   libGL,
-  libX11,
-  libXcursor,
-  libXext,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXxf86vm,
+  libx11,
+  libxcursor,
+  libxext,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxxf86vm,
   makeDesktopItem,
   libgbm,
   pkg-config,
@@ -37,13 +37,13 @@ buildGoModule rec {
 
   buildInputs = [
     libGL
-    libX11
-    libXcursor
-    libXext
-    libXi
-    libXinerama
-    libXrandr
-    libXxf86vm
+    libx11
+    libxcursor
+    libxext
+    libxi
+    libxinerama
+    libxrandr
+    libxxf86vm
     libgbm
   ];
 
diff --git a/pkgs/by-name/cl/clonehero/package.nix b/pkgs/by-name/cl/clonehero/package.nix
index c1362d517a44..8133d140a201 100644
--- a/pkgs/by-name/cl/clonehero/package.nix
+++ b/pkgs/by-name/cl/clonehero/package.nix
@@ -8,14 +8,14 @@
   alsa-lib,
   dbus,
   libGL,
-  libXcursor,
-  libXext,
-  libXi,
-  libXinerama,
+  libxcursor,
+  libxext,
+  libxi,
+  libxinerama,
   libxkbcommon,
-  libXrandr,
-  libXScrnSaver,
-  libXxf86vm,
+  libxrandr,
+  libxscrnsaver,
+  libxxf86vm,
   udev,
   vulkan-loader, # (not used by default, enable in settings menu)
   wayland, # (not used by default, enable with SDL_VIDEODRIVER=wayland - doesn't support HiDPI)
@@ -48,14 +48,14 @@ stdenv.mkDerivation (finalAttrs: {
     # Run-time libraries (loaded with dlopen)
     dbus
     libGL
-    libXcursor
-    libXext
-    libXi
-    libXinerama
+    libxcursor
+    libxext
+    libxi
+    libxinerama
     libxkbcommon
-    libXrandr
-    libXScrnSaver
-    libXxf86vm
+    libxrandr
+    libxscrnsaver
+    libxxf86vm
     udev
     vulkan-loader
     wayland
diff --git a/pkgs/by-name/cl/closurecompiler/package.nix b/pkgs/by-name/cl/closurecompiler/package.nix
index 4123d2a06020..d7d84b3d6eb0 100644
--- a/pkgs/by-name/cl/closurecompiler/package.nix
+++ b/pkgs/by-name/cl/closurecompiler/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "closure-compiler";
-  version = "20250820";
+  version = "20260128";
 
   src = fetchurl {
     url = "mirror://maven/com/google/javascript/closure-compiler/v${finalAttrs.version}/closure-compiler-v${finalAttrs.version}.jar";
-    sha256 = "sha256-Fx0kNU/+fc03j+Tfsw5Gc4WTkfTaEacLoE/awN1NgtI=";
+    sha256 = "sha256-GlloHdQBhil/++qld8+yyYpNmCACYxjW8QW0YtPTOVk=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/by-name/cl/cloudflare-cli/package.nix b/pkgs/by-name/cl/cloudflare-cli/package.nix
index a26e55212153..a95c112f3c95 100644
--- a/pkgs/by-name/cl/cloudflare-cli/package.nix
+++ b/pkgs/by-name/cl/cloudflare-cli/package.nix
@@ -12,18 +12,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cloudflare-cli";
-  version = "5.1.0";
+  version = "5.1.2";
 
   src = fetchFromGitHub {
     owner = "danielpigott";
     repo = "cloudflare-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FE6LvzGd3Pl31vocXSZ6VY6P3iuVPxQR1eJwUSkXf70=";
+    hash = "sha256-KDL9UGsBVH+BxeMwpcwqH0P0Y8QbFMSqNT5FrTZxDog=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = finalAttrs.src + "/yarn.lock";
-    hash = "sha256-dH0eW2IIxgqLiJHAmDKbeA0xz2EMWrZrKIf3P2mBDKU=";
+    hash = "sha256-30zvP1sYENfTh8o/RiSrYPZR3to3GF2m036q/+mrcSU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/cl/clprover/package.nix b/pkgs/by-name/cl/clprover/package.nix
index ec18eb101cb4..af561cfb1c71 100644
--- a/pkgs/by-name/cl/clprover/package.nix
+++ b/pkgs/by-name/cl/clprover/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 }:
 
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "CLProver++";
   version = "1.0.3";
 
@@ -43,8 +43,8 @@ stdenv.mkDerivation (self: {
     mkdir -p $out/bin
     cp -r bin $out/
 
-    mkdir -p $out/share/${self.pname}
-    cp -r examples $out/share/${self.pname}/examples
+    mkdir -p $out/share/${finalAttrs.pname}
+    cp -r examples $out/share/${finalAttrs.pname}/examples
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/cl/clutter/package.nix b/pkgs/by-name/cl/clutter/package.nix
index 9b224902df09..1c2c1ed2876f 100644
--- a/pkgs/by-name/cl/clutter/package.nix
+++ b/pkgs/by-name/cl/clutter/package.nix
@@ -5,12 +5,12 @@
   pkg-config,
   libGLU,
   libGL,
-  libX11,
-  libXext,
-  libXfixes,
-  libXdamage,
-  libXcomposite,
-  libXi,
+  libx11,
+  libxext,
+  libxfixes,
+  libxdamage,
+  libxcomposite,
+  libxi,
   libxcb,
   cogl,
   pango,
@@ -54,14 +54,14 @@ stdenv.mkDerivation {
     gobject-introspection
   ]
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    libX11
+    libx11
     libGL
     libGLU
-    libXext
-    libXfixes
-    libXdamage
-    libXcomposite
-    libXi
+    libxext
+    libxfixes
+    libxdamage
+    libxcomposite
+    libxi
     libxcb
     libinput
     libgudev
diff --git a/pkgs/by-name/co/cobalt/package.nix b/pkgs/by-name/co/cobalt/package.nix
index ccb3e73b713a..65e1d5d54f57 100644
--- a/pkgs/by-name/co/cobalt/package.nix
+++ b/pkgs/by-name/co/cobalt/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cobalt";
-  version = "0.20.2";
+  version = "0.20.3";
 
   src = fetchFromGitHub {
     owner = "cobalt-org";
     repo = "cobalt.rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XtytPFg8N4ilFte8s5DoMrQHjAkJ7RkJcMbGXcxmaa4=";
+    hash = "sha256-ec6S6PQzDc8t8MuZLyVStxi7tQB6rMu+Fz8Tw1qpTGc=";
   };
 
-  cargoHash = "sha256-x4cnwCpbDYvUhlp8Fw2//NC9Z/kbv/hGF7MqKAft8bU=";
+  cargoHash = "sha256-xwpEdhV9YDfNIbjocz5N0E4BO8FW7Af2kW4QndqZhPo=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
diff --git a/pkgs/by-name/co/coc-pyright/package.nix b/pkgs/by-name/co/coc-pyright/package.nix
index 4ed1a55251c2..05b85464a88e 100644
--- a/pkgs/by-name/co/coc-pyright/package.nix
+++ b/pkgs/by-name/co/coc-pyright/package.nix
@@ -7,17 +7,17 @@
 
 buildNpmPackage {
   pname = "coc-pyright";
-  version = "0-unstable-2026-01-04";
+  version = "0-unstable-2026-02-01";
 
   src = fetchFromGitHub {
     owner = "fannheyward";
     repo = "coc-pyright";
     # No tagged releases, this commit corresponds to the latest release of the package.
-    rev = "767eebcb9f9b828412b9ec02e80558f3e748798a";
-    hash = "sha256-PNCh6EiXQxIYgU6hOG1/ialhP0p2uGTQAgipiDpgI6s=";
+    rev = "8160b7e315c3b2480749b141f9a24d19323d4282";
+    hash = "sha256-0pdbwZa7ikFVKP3OTDufOobIoWUlfWheIC5mSRAF198=";
   };
 
-  npmDepsHash = "sha256-D5e17ubJ8leB5zoNO0DbZ1rUf/JpSJlezOldA3pvtFo=";
+  npmDepsHash = "sha256-01AvG8BPwFIqqYwqHbbEonA0jMIKhF5wnl/azjfmaPE=";
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
 
diff --git a/pkgs/by-name/co/coin3d/package.nix b/pkgs/by-name/co/coin3d/package.nix
index beec964eecb5..8fd16c4d4281 100644
--- a/pkgs/by-name/co/coin3d/package.nix
+++ b/pkgs/by-name/co/coin3d/package.nix
@@ -6,7 +6,7 @@
   cmake,
   libGL,
   libGLU,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     libGL
     libGLU
   ]
-  ++ lib.optional stdenv.hostPlatform.isLinux libX11;
+  ++ lib.optional stdenv.hostPlatform.isLinux libx11;
 
   meta = {
     homepage = "https://github.com/coin3d/coin";
diff --git a/pkgs/by-name/co/commonsIo/package.nix b/pkgs/by-name/co/commonsIo/package.nix
index 692832d63db1..996c24f5d60b 100644
--- a/pkgs/by-name/co/commonsIo/package.nix
+++ b/pkgs/by-name/co/commonsIo/package.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.20.0";
+  version = "2.21.0";
   pname = "commons-io";
 
   src = fetchurl {
     url = "mirror://apache/commons/io/binaries/commons-io-${version}-bin.tar.gz";
-    sha256 = "sha256-+hNGq8TV4g8w9Q2df9kpYniBg1h8dOX6mF/1kk4VLcw=";
+    hash = "sha256-x2Szn/hbuYWX+8J0ZHV9XAY0L5PQlvtIKpV2MJSic4w=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/co/commonsLang/package.nix b/pkgs/by-name/co/commonsLang/package.nix
index 86cd8a10029f..6bbb259df4a2 100644
--- a/pkgs/by-name/co/commonsLang/package.nix
+++ b/pkgs/by-name/co/commonsLang/package.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "3.19.0";
+  version = "3.20.0";
   pname = "commons-lang";
 
   src = fetchurl {
     url = "mirror://apache/commons/lang/binaries/commons-lang3-${finalAttrs.version}-bin.tar.gz";
-    hash = "sha256-BipGZH6z6s2GKPSdgU4UCjBhIM+o0cB9/QyXRJLIADo=";
+    hash = "sha256-p3h128i3tofknZFM8Az3I3pUj0FjwqZFZbPamZ2LAk8=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/co/conntrack-tools/package.nix b/pkgs/by-name/co/conntrack-tools/package.nix
index 629306bc059d..e2f32a8ef1fa 100644
--- a/pkgs/by-name/co/conntrack-tools/package.nix
+++ b/pkgs/by-name/co/conntrack-tools/package.nix
@@ -53,5 +53,6 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ fpletz ];
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "netfilter" version;
   };
 }
diff --git a/pkgs/by-name/co/construo/package.nix b/pkgs/by-name/co/construo/package.nix
index 85eb218ce3bc..5751e2054c8d 100644
--- a/pkgs/by-name/co/construo/package.nix
+++ b/pkgs/by-name/co/construo/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
   zlib,
   xorgproto,
   withLibGL ? !stdenv.hostPlatform.isDarwin,
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    libX11
+    libx11
     zlib
     xorgproto
   ]
diff --git a/pkgs/by-name/co/copyq/package.nix b/pkgs/by-name/co/copyq/package.nix
index b1b3e65f8d63..7b486ec05bc9 100644
--- a/pkgs/by-name/co/copyq/package.nix
+++ b/pkgs/by-name/co/copyq/package.nix
@@ -6,8 +6,8 @@
   cmake,
   ninja,
   qt6,
-  libXfixes,
-  libXtst,
+  libxfixes,
+  libxtst,
   wayland,
   pkg-config,
   kdePackages,
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
     qt6.qtsvg
     qt6.qttools
     qt6.qtdeclarative
-    libXfixes
-    libXtst
+    libxfixes
+    libxtst
     qt6.qtwayland
     wayland
     kdePackages.kconfig
diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix
index daed0e15bf7b..a242457cc4dd 100644
--- a/pkgs/by-name/co/cosmic-applets/package.nix
+++ b/pkgs/by-name/co/cosmic-applets/package.nix
@@ -20,17 +20,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-applets";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-applets";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-+1cqennGetcjJTgVfglq/LJ22goLQmahPCK/atdHxXU=";
+    hash = "sha256-AauNHedDr6WcnbuQLWdcecyeqJJ2npyxVS+5BuBUDIE=";
   };
 
-  cargoHash = "sha256-uMMrLd3s0SqYCkSA82wWUxMfiTUzuDdsmyxy/MCYIWY=";
+  cargoHash = "sha256-n83JK/pOEMLTBlh0bbFqyW10usEthrSiXoozqmkUa58=";
 
   nativeBuildInputs = [
     just
diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-applibrary/package.nix
index 70d38b0b2521..b02d6980d4f4 100644
--- a/pkgs/by-name/co/cosmic-applibrary/package.nix
+++ b/pkgs/by-name/co/cosmic-applibrary/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-applibrary";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-applibrary";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-3vIp+Vs4prsFFiTmjrUXoYqH27y6ccVlUQcP5ICFq3g=";
+    hash = "sha256-emJc7pp+VF+YwEQ7+VI6gP8z20eWcrvubBDEqATyRfk=";
   };
 
-  cargoHash = "sha256-I6C5PrIymU8vZ7LvmnSlFFIp0cvlP1umiFMyrAyYf4A=";
+  cargoHash = "sha256-apLIpb1VUuQRgOJ2mQioPyucbETzyh5wOeatMCLGrc4=";
 
   nativeBuildInputs = [
     just
diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix
index 7ea99d5f72c6..966ffb4aea32 100644
--- a/pkgs/by-name/co/cosmic-bg/package.nix
+++ b/pkgs/by-name/co/cosmic-bg/package.nix
@@ -13,14 +13,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-bg";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-bg";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-LBIcQG3ZebK1bPVJ8WNHkHMLPsEcw77oZAkQRrd4j6o=";
+    hash = "sha256-lD5lTYXBy+keee+VArtNHgCS9n737YKaW8Kg3tu+8o0=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix
index 803a2190b24c..b4dc8766d14c 100644
--- a/pkgs/by-name/co/cosmic-comp/package.nix
+++ b/pkgs/by-name/co/cosmic-comp/package.nix
@@ -20,14 +20,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-comp";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-comp";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-vhWZpn9FPoH+mTKqCf6ug73FdT7Odr6f8pWNNIDKwFs=";
+    hash = "sha256-ccLifEvy705JpmXFrkouVW6yFNh2bafxy366H7pzmlQ=";
   };
 
   cargoHash = "sha256-A0d00GdspoYI1fUic8TK9UzaQn39wbnvevD8IiPKC7w=";
diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix
index 1c4bddab9839..a870bc9c89c2 100644
--- a/pkgs/by-name/co/cosmic-edit/package.nix
+++ b/pkgs/by-name/co/cosmic-edit/package.nix
@@ -16,17 +16,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-edit";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-edit";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-4+GfIAsjzo1jr+wa9JjuIUvW3P3r03avP2W5hZJYXHU=";
+    hash = "sha256-ico9i7NqNtmvz+mptuOc/d34WBxsJ4HI5A/daX/we/A=";
   };
 
-  cargoHash = "sha256-ydI/DTbGlgwc9l/XsW1SbTOfSyTdcjM0i0jXLua4+f8=";
+  cargoHash = "sha256-c7TEjrGCop1KL6gGjXSXg0lmZi7xgpqxrjorrlnKwb4=";
 
   postPatch = ''
     substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix
index c664e9d3bf68..2b0a1b29fd2f 100644
--- a/pkgs/by-name/co/cosmic-files/package.nix
+++ b/pkgs/by-name/co/cosmic-files/package.nix
@@ -12,17 +12,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-files";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-files";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-aHNu6IedGWag6u+uRg2IFfcb8fTu5o4XfGwBXJBOkSM=";
+    hash = "sha256-Q8/DM24/6sjn9+nDE16GD3QJHfb0QgfVK7fXuLrb8Gs=";
   };
 
-  cargoHash = "sha256-kzyyKzkuCYqEsaaKhAVH31ztbww4k8XZ5HyBQeYO/Nc=";
+  cargoHash = "sha256-3fnZizzYGjsAGHoONKgMB34uoxZPa5Pdvl4/biapjnU=";
 
   nativeBuildInputs = [
     just
diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix
index 4555a5653838..384be08c6f4a 100644
--- a/pkgs/by-name/co/cosmic-greeter/package.nix
+++ b/pkgs/by-name/co/cosmic-greeter/package.nix
@@ -19,17 +19,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-greeter";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-greeter";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-ivFs/AOUXhzd6I9H+Zw3CS97qFQ/FeiAnlDuzRMneQI=";
+    hash = "sha256-DVSt66vgcp/cn3gSNROY/0J1qdKpcqlSE+iylApMycY=";
   };
 
-  cargoHash = "sha256-4yRBgFrH4RBpuvChTED+ynx+PyFumoT2Z+R1gXxF4Xc=";
+  cargoHash = "sha256-sNJTXBInr/h8w5dhOOP9ceBYWBcJW3qGjDuaG6UTV90=";
 
   env.VERGEN_GIT_SHA = finalAttrs.src.tag;
 
diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix
index ba9837db6a9f..9bee16ee278e 100644
--- a/pkgs/by-name/co/cosmic-icons/package.nix
+++ b/pkgs/by-name/co/cosmic-icons/package.nix
@@ -9,7 +9,7 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "cosmic-icons";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/co/cosmic-idle/package.nix b/pkgs/by-name/co/cosmic-idle/package.nix
index aa03f36bf220..a08a29d6a49e 100644
--- a/pkgs/by-name/co/cosmic-idle/package.nix
+++ b/pkgs/by-name/co/cosmic-idle/package.nix
@@ -16,17 +16,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-idle";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-idle";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-qVrcMI7sr0mWyYW1fM6oP/6qKEhlqqyQ/WiJaWfCQPU=";
+    hash = "sha256-mQnWGYHlY1zKGynCwJSxjMSeHd0iBFYWsY3b1wZEGTs=";
   };
 
-  cargoHash = "sha256-vfuhXT/MJHchJdW+3GPuvZbYVdClpsbNfOzLKWW4LPY=";
+  cargoHash = "sha256-wAjFC6qAC3nllbnZf0KVaZTEztNYo6GTvwcp5FYmXLw=";
 
   nativeBuildInputs = [
     just
diff --git a/pkgs/by-name/co/cosmic-initial-setup/package.nix b/pkgs/by-name/co/cosmic-initial-setup/package.nix
index 58bc324f4fcf..7c394e1d9d04 100644
--- a/pkgs/by-name/co/cosmic-initial-setup/package.nix
+++ b/pkgs/by-name/co/cosmic-initial-setup/package.nix
@@ -14,17 +14,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-initial-setup";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-initial-setup";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-xeJfS3vXYCy3R20K5jiyPmgZI+arhkzm3Vz6YQnLe9Y=";
+    hash = "sha256-y2wRVAnCh1B45MZLj0e1waAJlsp/cUUcshuHItyCQgs=";
   };
 
-  cargoHash = "sha256-co7fOPjNLi32XRXKdmCWC+bWhEljsdSc/scasghG4/8=";
+  cargoHash = "sha256-Kj+eaTMHMQQHN0X3prIuZm1wvfnaV7BUlUKem6JLtc8=";
 
   buildFeatures = [ "nixos" ];
 
diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix
index be43c37bbb9e..40dd1eb2fe52 100644
--- a/pkgs/by-name/co/cosmic-launcher/package.nix
+++ b/pkgs/by-name/co/cosmic-launcher/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-launcher";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-launcher";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-uKTeNTJtsDx0FS3fmvqMbXPTezMkD1dcn5dPKXvmcp4=";
+    hash = "sha256-jpiIebeMZwx6OHpmQlG0PptOv08opretAJjYEQV9j84=";
   };
 
-  cargoHash = "sha256-bmQ8Ni0sR9gfttsEhh9LNbWmTdOkW/JSMEzOf+kvN98=";
+  cargoHash = "sha256-o2CyAjUp0E4m5G4SG8vm4RhQzvFsmbgfJDQRRxoyGEg=";
 
   nativeBuildInputs = [
     just
diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix
index 55b51602ca0b..5a5a682ce386 100644
--- a/pkgs/by-name/co/cosmic-notifications/package.nix
+++ b/pkgs/by-name/co/cosmic-notifications/package.nix
@@ -12,14 +12,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-notifications";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-notifications";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-BNOerRv9w0Y9Wozoc5IOouMjne7XQN/SItSy2LQrK9w=";
+    hash = "sha256-vTg3poU2MfkpcBCFTBzBsZ2rQetAgQz8E6269O6aYrk=";
   };
 
   cargoHash = "sha256-zyM4iMJs2wPIKIEdji1uJF3WYpPGihFswIK5Wyf6Mns=";
diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix
index 0a9ea87c0d13..96ea51febf0b 100644
--- a/pkgs/by-name/co/cosmic-osd/package.nix
+++ b/pkgs/by-name/co/cosmic-osd/package.nix
@@ -15,14 +15,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-osd";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-osd";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-6GuLFy1DKXk//LhhRA62KX1P/X+QSsNCy5Eiwjxqk9M=";
+    hash = "sha256-O3HGAz0Sk3LI/5J68/CVYserSFZztLxbMYp5fkLqgfY=";
   };
 
   cargoHash = "sha256-DNQvmE/2swrDybjcQfCAjMRkAttjl+ibbLG0HSlcZwU=";
diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix
index bd102f53d0c2..5ab5f744448b 100644
--- a/pkgs/by-name/co/cosmic-panel/package.nix
+++ b/pkgs/by-name/co/cosmic-panel/package.nix
@@ -11,7 +11,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-panel";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/co/cosmic-player/package.nix b/pkgs/by-name/co/cosmic-player/package.nix
index 3fb9f91e3335..4e6c12641143 100644
--- a/pkgs/by-name/co/cosmic-player/package.nix
+++ b/pkgs/by-name/co/cosmic-player/package.nix
@@ -18,17 +18,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-player";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-player";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-F5Phk9JgcSc3Hj+2NxVfqq1Ujz8hv3DVJqAP3aEo2Ic=";
+    hash = "sha256-jFaeBJQjLRrQuFskRWVgmO0FqYX6mXrZBnUHF3KfVrc=";
   };
 
-  cargoHash = "sha256-Z0+6jtvJ3z/ptcqrbvSuXgjH2liASNJwBIKiHbrVBT8=";
+  cargoHash = "sha256-8uyYs1J2284AHy8xEG9uYtSMFcm93LmtCp491zC6fLA=";
 
   nativeBuildInputs = [
     just
diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix
index 41f273aa7e25..317421f19875 100644
--- a/pkgs/by-name/co/cosmic-randr/package.nix
+++ b/pkgs/by-name/co/cosmic-randr/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-randr";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/co/cosmic-reader/package.nix b/pkgs/by-name/co/cosmic-reader/package.nix
index db0db0399f60..9b3124d2c2c7 100644
--- a/pkgs/by-name/co/cosmic-reader/package.nix
+++ b/pkgs/by-name/co/cosmic-reader/package.nix
@@ -19,16 +19,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-reader";
-  version = "0-unstable-2026-01-16";
+  version = "0-unstable-2026-01-31";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-reader";
-    rev = "1b030e2f96dc7a141473f87de3cb1f375298589f";
-    hash = "sha256-r+QPe7+rvdYm76DLFtOePh9+eIvSbzuqvhe4490ynWk=";
+    rev = "4dec38f058da6f4443ea3a2032be79339d7c814e";
+    hash = "sha256-LyBzcWJWOSe5TNS9trH7To2Te1aFPSsUGV9c/nfK0oA=";
   };
 
-  cargoHash = "sha256-4ofAtZN3FpYwNahinldALbdEJA5lDwa+CUsVIISnSTc=";
+  cargoHash = "sha256-IT0gCE1chtmvu/sSjkQ3t1eIUq/ItfxygICe8HOBDHA=";
 
   nativeBuildInputs = [
     just
diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix
index f2aee8b9df6b..ce87604987d6 100644
--- a/pkgs/by-name/co/cosmic-screenshot/package.nix
+++ b/pkgs/by-name/co/cosmic-screenshot/package.nix
@@ -11,14 +11,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-screenshot";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-screenshot";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-xNEICyR/4EYTPTMnlRTag3Ji5rM8HJl6m9MAe7FdHTk=";
+    hash = "sha256-f2KdtZBPSM7Ol0umCWXkkn54DnnvqGm8kuilp4HJ8OU=";
   };
 
   cargoHash = "sha256-O8fFeg1TkKCg+QbTnNjsH52xln4+ophh/BW/b4zQs9o=";
diff --git a/pkgs/by-name/co/cosmic-session/package.nix b/pkgs/by-name/co/cosmic-session/package.nix
index 64ac86039f23..54158a6b7435 100644
--- a/pkgs/by-name/co/cosmic-session/package.nix
+++ b/pkgs/by-name/co/cosmic-session/package.nix
@@ -12,14 +12,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-session";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-session";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-JlRGK3uac94r81MBaOZZ4hRcKD4fh/vgJBxic0BSWnY=";
+    hash = "sha256-LZN+7hN3rBpVk7UWvG9D4gH2UOrfwMmSisdIsOT4vmA=";
   };
 
   cargoHash = "sha256-wFh9AYQRZB9qK0vCrhW9Zk61Yg+VY3VPAqJRD47NbK4=";
diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
index 81306035d0be..c93f2fbe0fdf 100644
--- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix
+++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
@@ -16,14 +16,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-settings-daemon";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-settings-daemon";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-4BXsjcAzu4twwIGqHQ4jvewO5oUns6yqY1n26KbIygQ=";
+    hash = "sha256-4YozCuj6lF9GmsV9eRD4HEb3G8tYKjQc3+ghYHxKrhE=";
   };
 
   postPatch = ''
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '/usr/share/themes/adw-gtk3' '${adw-gtk3}/share/themes/adw-gtk3'
   '';
 
-  cargoHash = "sha256-1YQ7eQ6L6OHvVihUUnZCDWXXtVOyaI1pFN7YD/OBcfo=";
+  cargoHash = "sha256-KRV9WKOf9W0g4d2uKrAFEuDqJgr+CTpvtVLn7TIYuBw=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix
index 413b376c967a..7770177c6a28 100644
--- a/pkgs/by-name/co/cosmic-settings/package.nix
+++ b/pkgs/by-name/co/cosmic-settings/package.nix
@@ -27,17 +27,17 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-settings";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-settings";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-/Zzs2b51J0v9PavMr3MuNiFBprb7oJiSC+qDVvMTwEk=";
+    hash = "sha256-OIVG0snnYtRkL8D3nurlygkqx6ugzIV4RPm7wReaE4o=";
   };
 
-  cargoHash = "sha256-XY1ovI73O2jJdx1a5pUk/n6TUazklq7PA+bgva3xslo=";
+  cargoHash = "sha256-T9fbhrYrQrc7TjyumhfT5vyElRKnDzxVBsJtcGA3f7I=";
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix
index 34d1096550d3..426e4ccf66e5 100644
--- a/pkgs/by-name/co/cosmic-store/package.nix
+++ b/pkgs/by-name/co/cosmic-store/package.nix
@@ -15,17 +15,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-store";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-store";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-61O6TY41raQ1+EhCLrCC8Krzt6pWM/BFL61KHkxou2M=";
+    hash = "sha256-5PXOg0HE2Q/mP8QzYP1iA4/Qg8h6+gUAvPtHixS3xzA=";
   };
 
-  cargoHash = "sha256-VapIpvjtBo+oSUWtilPR0v5crjDVt0OGdHlx73Gb6Jk=";
+  cargoHash = "sha256-CF8gbrWaAlBJ+siqN1eTiqpLLxcLWZ0NsXWlRT9O5HU=";
 
   nativeBuildInputs = [
     just
diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix
index 690176cf44e8..a229b6519519 100644
--- a/pkgs/by-name/co/cosmic-term/package.nix
+++ b/pkgs/by-name/co/cosmic-term/package.nix
@@ -15,17 +15,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-term";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-term";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-RYRAJhixba8i8hKpZSZLPLza+V9XZuSaZmWknoIJ3mk=";
+    hash = "sha256-0YTiLCRw2aObPM2KUbx25q9vuAXejFKFTVtVOu6nHdw=";
   };
 
-  cargoHash = "sha256-ImWHjEKgu9FQR52A3GjnAkxlPduKuzSUAOANYr0DzMA=";
+  cargoHash = "sha256-qdM4Wh4td1fGunjH4qkGaXBuu1HO+I6KVR7zImU/WaE=";
 
   nativeBuildInputs = [
     just
diff --git a/pkgs/by-name/co/cosmic-wallpapers/package.nix b/pkgs/by-name/co/cosmic-wallpapers/package.nix
index 37ca95969c68..cdc7f97806be 100644
--- a/pkgs/by-name/co/cosmic-wallpapers/package.nix
+++ b/pkgs/by-name/co/cosmic-wallpapers/package.nix
@@ -7,7 +7,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "cosmic-wallpapers";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
index c3b7a8059819..3877f23886a6 100644
--- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
+++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
@@ -14,14 +14,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-workspaces-epoch";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-workspaces-epoch";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-Gg4ogMf2C3rXf3p/8GPpiZ2aG02KWTtrqby47UW7B3I=";
+    hash = "sha256-MWQhDFCn10ONm3SuT+vcXkliCvm3xPJHHYVytufCq2g=";
   };
 
   cargoHash = "sha256-ZVl09YgeH+V4X3H88rdeiBgua1IpVcfKe0y8A78wzl4=";
diff --git a/pkgs/by-name/cp/cpu-x/package.nix b/pkgs/by-name/cp/cpu-x/package.nix
index 0817e99d435e..dc2f55303da9 100644
--- a/pkgs/by-name/cp/cpu-x/package.nix
+++ b/pkgs/by-name/cp/cpu-x/package.nix
@@ -17,7 +17,7 @@
   vulkan-headers,
   vulkan-loader,
   glfw,
-  libXdmcp,
+  libxdmcp,
   pcre,
   util-linux,
   libselinux,
@@ -28,7 +28,7 @@
   libepoxy,
   dbus,
   at-spi2-core,
-  libXtst,
+  libxtst,
   gtkmm3,
 }:
 
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
     glfw
     opencl-headers
     ocl-icd
-    libXdmcp
+    libxdmcp
     pcre
     util-linux
     libselinux
@@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
     libepoxy
     dbus
     at-spi2-core
-    libXtst
+    libxtst
   ];
 
   preFixup = ''
diff --git a/pkgs/by-name/cp/cpuinfo/package.nix b/pkgs/by-name/cp/cpuinfo/package.nix
index aba43c6c3735..0a63e3d0f801 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-2025-12-09";
+  version = "0-unstable-2026-01-30";
 
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = "cpuinfo";
-    rev = "ff24ffee8340fbd9001cce6a9ef41cdd16aa2bd3";
-    hash = "sha256-lvsM/K0CDknsGN/ZXSZCg6nr6BLMQce8wlHncjGHMdk=";
+    rev = "84818a41e074779dbb00521a4731d3e14160ff15";
+    hash = "sha256-eXrfeFK0ADKAYoy/vESv7nQnH0oGpeZKlX8XEqPQspo=";
   };
 
   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/ff24ffee8340fbd9001cce6a9ef41cdd16aa2bd3/CMakeLists.txt#L98
+    # https://github.com/pytorch/cpuinfo/blob/84818a41e074779dbb00521a4731d3e14160ff15/CMakeLists.txt#L98
     platforms = lib.platforms.x86 ++ lib.platforms.aarch ++ lib.platforms.riscv;
   };
 })
diff --git a/pkgs/by-name/cr/craftos-pc/package.nix b/pkgs/by-name/cr/craftos-pc/package.nix
index a9efef2055cf..5e94f15a5447 100644
--- a/pkgs/by-name/cr/craftos-pc/package.nix
+++ b/pkgs/by-name/cr/craftos-pc/package.nix
@@ -13,7 +13,7 @@
   libpng,
   pngpp,
   libwebp,
-  libX11,
+  libx11,
 }:
 
 let
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     libwebp
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
+    libx11
   ];
   strictDeps = true;
 
diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix
index 3f2b9a2f8a32..7175f27d524e 100644
--- a/pkgs/by-name/cr/crush/package.nix
+++ b/pkgs/by-name/cr/crush/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "crush";
-  version = "0.36.0";
+  version = "0.39.2";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "crush";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xitCvejiVts9kkvtcVwh/zaeWIzDj0jx9xQMh2h+9Ns=";
+    hash = "sha256-2Y9hxrqFQmKR6BaKP0fHTW5h5P8bnlyCKL/vy1ZqsOE=";
   };
 
-  vendorHash = "sha256-8Tw+O57E5aKFO2bKimiXRK9tGnAAQr3qsuP6P9LgBjw=";
+  vendorHash = "sha256-Y7QterJ5Mmjg/kMqFGbeSvd+3UwG8uGFTrdIBET5yRI=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/cr/cryptsetup/package.nix b/pkgs/by-name/cr/cryptsetup/package.nix
index d310ed986ca9..5c5ce5ed5e8c 100644
--- a/pkgs/by-name/cr/cryptsetup/package.nix
+++ b/pkgs/by-name/cr/cryptsetup/package.nix
@@ -116,5 +116,6 @@ stdenv.mkDerivation (finalAttrs: {
       raitobezarius
     ];
     platforms = with lib.platforms; linux;
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "cryptsetup_project" finalAttrs.version;
   };
 })
diff --git a/pkgs/by-name/cs/cspell/package.nix b/pkgs/by-name/cs/cspell/package.nix
index 846e253afc33..eef3622ff733 100644
--- a/pkgs/by-name/cs/cspell/package.nix
+++ b/pkgs/by-name/cs/cspell/package.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "cspell";
-  version = "9.6.2";
+  version = "9.6.4";
 
   src = fetchFromGitHub {
     owner = "streetsidesoftware";
     repo = "cspell";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JEvvopeSqoVXrh9t4ORUlT0nPdE+3PofzD7h4VajnAs=";
+    hash = "sha256-OeS3wBOnvhxQtAAra40wb1FMYIb2mpKrqf72AFuU944=";
   };
 
   pnpmWorkspaces = [ "cspell..." ];
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
       ;
     pnpm = pnpm_10;
     fetcherVersion = 2;
-    hash = "sha256-CNsxfAsIQxmDvuGZtedKnHMOoB1usDlw45cKYxaD05U=";
+    hash = "sha256-ufHALS8FL2VjNnYHUBZh99IpivZDtaYaVjTmEoY6Sqc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ct/ctagdrc/package.nix b/pkgs/by-name/ct/ctagdrc/package.nix
index 7099451fdaab..630daf364b6f 100644
--- a/pkgs/by-name/ct/ctagdrc/package.nix
+++ b/pkgs/by-name/ct/ctagdrc/package.nix
@@ -7,14 +7,14 @@
   alsa-lib,
   fontconfig,
   freetype,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXdmcp,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXtst,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxdmcp,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxtst,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -38,14 +38,14 @@ stdenv.mkDerivation (finalAttrs: {
     alsa-lib
     fontconfig
     freetype
-    libX11
-    libXcomposite
-    libXcursor
-    libXdmcp
-    libXext
-    libXinerama
-    libXrandr
-    libXtst
+    libx11
+    libxcomposite
+    libxcursor
+    libxdmcp
+    libxext
+    libxinerama
+    libxrandr
+    libxtst
   ];
 
   env.NIX_CFLAGS_COMPILE = toString [
diff --git a/pkgs/by-name/cu/cubicsdr/package.nix b/pkgs/by-name/cu/cubicsdr/package.nix
index 796e4587faf3..45865b47e42b 100644
--- a/pkgs/by-name/cu/cubicsdr/package.nix
+++ b/pkgs/by-name/cu/cubicsdr/package.nix
@@ -8,7 +8,7 @@
   hamlib,
   libpulseaudio,
   libGL,
-  libX11,
+  libx11,
   liquid-dsp,
   pkg-config,
   soapysdr-with-plugins,
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     libpulseaudio
     libGL
-    libX11
+    libx11
   ];
 
   cmakeFlags = [ "-DUSE_HAMLIB=ON" ] ++ lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON";
diff --git a/pkgs/by-name/cu/curl-impersonate/package.nix b/pkgs/by-name/cu/curl-impersonate/package.nix
index f7b6ea5718ed..ee93a60d52f4 100644
--- a/pkgs/by-name/cu/curl-impersonate/package.nix
+++ b/pkgs/by-name/cu/curl-impersonate/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  darwin,
   fetchFromGitHub,
   callPackage,
   buildGoModule,
@@ -74,6 +75,9 @@ stdenv.mkDerivation rec {
     zlib
     zstd
     sqlite
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    darwin.ICU
   ];
 
   configureFlags = [
diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix
index 6677f8d79fbd..f41dec189091 100644
--- a/pkgs/by-name/cu/curlMinimal/package.nix
+++ b/pkgs/by-name/cu/curlMinimal/package.nix
@@ -290,5 +290,6 @@ stdenv.mkDerivation (finalAttrs: {
     broken = stdenv.hostPlatform.isStatic && (brotliSupport || gssSupport);
     pkgConfigModules = [ "libcurl" ];
     mainProgram = "curl";
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "haxx" finalAttrs.version;
   };
 })
diff --git a/pkgs/by-name/cw/cwm/package.nix b/pkgs/by-name/cw/cwm/package.nix
index e2dc85ce035a..588fe324b6fa 100644
--- a/pkgs/by-name/cw/cwm/package.nix
+++ b/pkgs/by-name/cw/cwm/package.nix
@@ -2,10 +2,10 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXinerama,
-  libXrandr,
-  libXft,
+  libx11,
+  libxinerama,
+  libxrandr,
+  libxft,
   bison,
   pkg-config,
 }:
@@ -29,10 +29,10 @@ stdenv.mkDerivation (finalAttrs: {
     bison
   ];
   buildInputs = [
-    libX11
-    libXinerama
-    libXrandr
-    libXft
+    libx11
+    libxinerama
+    libxrandr
+    libxft
   ];
 
   prePatch = ''sed -i "s@/usr/local@$out@" Makefile'';
diff --git a/pkgs/by-name/da/daggerfall-unity/package.nix b/pkgs/by-name/da/daggerfall-unity/package.nix
index 4e15a46526e2..565f9c9b3703 100644
--- a/pkgs/by-name/da/daggerfall-unity/package.nix
+++ b/pkgs/by-name/da/daggerfall-unity/package.nix
@@ -6,12 +6,12 @@
   fetchzip,
   lib,
   libGL,
-  libXScrnSaver,
-  libXcursor,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXxf86vm,
+  libxscrnsaver,
+  libxcursor,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxxf86vm,
   libpulseaudio,
   libudev0-shim,
   makeDesktopItem,
@@ -56,12 +56,12 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     alsa-lib
     libGL
-    libXScrnSaver
-    libXcursor
-    libXi
-    libXinerama
-    libXrandr
-    libXxf86vm
+    libxscrnsaver
+    libxcursor
+    libxi
+    libxinerama
+    libxrandr
+    libxxf86vm
     libpulseaudio
     libudev0-shim
     vulkan-loader
diff --git a/pkgs/by-name/da/darcnes/package.nix b/pkgs/by-name/da/darcnes/package.nix
index 7a68ff5bf713..4a0dd84c52c6 100644
--- a/pkgs/by-name/da/darcnes/package.nix
+++ b/pkgs/by-name/da/darcnes/package.nix
@@ -2,10 +2,10 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXt,
-  libXext,
-  libXaw,
+  libx11,
+  libxt,
+  libxext,
+  libxaw,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,10 +20,10 @@ stdenv.mkDerivation rec {
   patches = [ ./label.patch ];
 
   buildInputs = [
-    libX11
-    libXt
-    libXext
-    libXaw
+    libx11
+    libxt
+    libxext
+    libxaw
   ];
   installPhase = "install -Dt $out/bin darcnes";
 
diff --git a/pkgs/by-name/da/dark-mode-notify/package.nix b/pkgs/by-name/da/dark-mode-notify/package.nix
index e1abe256505d..2b941f11b0ed 100644
--- a/pkgs/by-name/da/dark-mode-notify/package.nix
+++ b/pkgs/by-name/da/dark-mode-notify/package.nix
@@ -9,7 +9,7 @@
 
 # Use the same stdenv, including clang, as Swift itself
 # Fixes build issues, see https://github.com/NixOS/nixpkgs/pull/296082 and https://github.com/NixOS/nixpkgs/issues/295322
-swiftPackages.stdenv.mkDerivation (final: {
+swiftPackages.stdenv.mkDerivation (finalAttrs: {
   pname = "dark-mode-notify";
   version = "0-unstable-2022-07-18";
 
diff --git a/pkgs/by-name/da/darkradiant/package.nix b/pkgs/by-name/da/darkradiant/package.nix
index b050e643c752..00ca5bd6ee82 100644
--- a/pkgs/by-name/da/darkradiant/package.nix
+++ b/pkgs/by-name/da/darkradiant/package.nix
@@ -16,7 +16,7 @@
   ftgl,
   freetype,
   glew,
-  libX11,
+  libx11,
   glib,
   python3,
   asciidoctor,
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
     libgit2
     python3
   ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ];
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ libx11 ];
 
   doCheck = true;
 
diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix
index ce87ec77391a..e554dbef3f06 100644
--- a/pkgs/by-name/da/darktable/package.nix
+++ b/pkgs/by-name/da/darktable/package.nix
@@ -67,10 +67,10 @@
   colord-gtk,
   libselinux,
   libsepol,
-  libX11,
-  libXdmcp,
+  libx11,
+  libxdmcp,
   libxkbcommon,
-  libXtst,
+  libxtst,
   ocl-icd,
   # Darwin only
   gtk-mac-integration,
@@ -82,12 +82,12 @@ let
   pugixml-shared = pugixml.override { shared = true; };
 in
 stdenv.mkDerivation rec {
-  version = "5.4.0";
+  version = "5.4.1";
   pname = "darktable";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
-    hash = "sha256-K/C66njSeUXPCcM9iATxeeA6g+4Z0ukn/WYOpGrKOxY=";
+    hash = "sha256-r9x8iKM4qM0vrDHIRQ0Hbtv3PpVuQwcmDIPrwZX4ReQ=";
   };
 
   nativeBuildInputs = [
@@ -155,10 +155,10 @@ stdenv.mkDerivation rec {
     colord-gtk
     libselinux
     libsepol
-    libX11
-    libXdmcp
+    libx11
+    libxdmcp
     libxkbcommon
-    libXtst
+    libxtst
     ocl-icd
     util-linux
   ]
diff --git a/pkgs/by-name/da/darktile/package.nix b/pkgs/by-name/da/darktile/package.nix
index a26a97ea8ad1..4bdde9305925 100644
--- a/pkgs/by-name/da/darktile/package.nix
+++ b/pkgs/by-name/da/darktile/package.nix
@@ -2,13 +2,13 @@
   fetchFromGitHub,
   lib,
   pkg-config,
-  libX11,
-  libXcursor,
-  libXrandr,
-  libXinerama,
-  libXi,
-  libXext,
-  libXxf86vm,
+  libx11,
+  libxcursor,
+  libxrandr,
+  libxinerama,
+  libxi,
+  libxext,
+  libxxf86vm,
   libGL,
   nixosTests,
   buildGoModule,
@@ -30,13 +30,13 @@ buildGoModule rec {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    libX11
-    libXcursor
-    libXrandr
-    libXinerama
-    libXi
-    libXext
-    libXxf86vm
+    libx11
+    libxcursor
+    libxrandr
+    libxinerama
+    libxi
+    libxext
+    libxxf86vm
     libGL
   ];
 
diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix
index 9bd5360a4927..19093e4d20fb 100644
--- a/pkgs/by-name/da/databricks-cli/package.nix
+++ b/pkgs/by-name/da/databricks-cli/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "databricks-cli";
-  version = "0.285.0";
+  version = "0.287.0";
 
   src = fetchFromGitHub {
     owner = "databricks";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-hiRae4pb8WsWvQ4ucRhz6eY2+h6KIXjCkxNVOL2hUbA=";
+    hash = "sha256-gUy1fhv/l/wmFUTSHcORkVu/ggbFv0Dc5KTjbPlrKPU=";
   };
 
   # Otherwise these tests fail asserting that the version is 0.0.0-dev
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
       --replace-fail "cli/0.0.0-dev" "cli/${finalAttrs.version}"
   '';
 
-  vendorHash = "sha256-PIHy5XJEx5FAWhm5i4dTGlPMf5Gnxz98xE4OeWVyvnE=";
+  vendorHash = "sha256-TNUI2VQVKnxTiKQg9Bj3qDK2w3oOjO0rdrtTlFIhTzA=";
 
   excludedPackages = [
     "bundle/internal"
diff --git a/pkgs/by-name/da/davmail/package.nix b/pkgs/by-name/da/davmail/package.nix
index dde7d21c8e6e..c4deac4af9bb 100644
--- a/pkgs/by-name/da/davmail/package.nix
+++ b/pkgs/by-name/da/davmail/package.nix
@@ -9,7 +9,7 @@
   gtk3,
   ant,
   jdk,
-  libXtst,
+  libxtst,
   coreutils,
   gnugrep,
   zulu,
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
         lib.makeLibraryPath [
           glib
           gtk'
-          libXtst
+          libxtst
         ]
       }
 
diff --git a/pkgs/by-name/db/dbus/package.nix b/pkgs/by-name/db/dbus/package.nix
index 5c0e9255d315..8789436b6a24 100644
--- a/pkgs/by-name/db/dbus/package.nix
+++ b/pkgs/by-name/db/dbus/package.nix
@@ -139,5 +139,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl2Plus; # most is also under AFL-2.1
     teams = [ lib.teams.freedesktop ];
     platforms = lib.platforms.unix;
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "freedesktop" finalAttrs.version;
   };
 })
diff --git a/pkgs/by-name/dd/ddcutil/package.nix b/pkgs/by-name/dd/ddcutil/package.nix
index 80795c41efa9..914839320f22 100644
--- a/pkgs/by-name/dd/ddcutil/package.nix
+++ b/pkgs/by-name/dd/ddcutil/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
   autoreconfHook,
   pkg-config,
   glib,
@@ -16,11 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ddcutil";
-  version = "2.2.3";
+  version = "2.2.5";
 
-  src = fetchurl {
-    url = "https://www.ddcutil.com/tarballs/ddcutil-${finalAttrs.version}.tar.gz";
-    hash = "sha256-4XvAUqYvnqhS2eOLpPHtfnNmVnoOGdvhpDnuca2+BqA=";
+  src = fetchFromGitHub {
+    owner = "rockowitz";
+    repo = "ddcutil";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-6Bf4I2bt7Ykn2P834tVIbTaY+7fae18zrs2I84Byv1Y=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/dd/ddd/package.nix b/pkgs/by-name/dd/ddd/package.nix
index e6a90e53b518..e870f0d26220 100644
--- a/pkgs/by-name/dd/ddd/package.nix
+++ b/pkgs/by-name/dd/ddd/package.nix
@@ -6,8 +6,8 @@
   desktopToDarwinBundle,
   motif,
   ncurses,
-  libX11,
-  libXt,
+  libx11,
+  libxt,
   gdb,
 }:
 
@@ -33,8 +33,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     motif
     ncurses
-    libX11
-    libXt
+    libx11
+    libxt
   ];
 
   # ioctl is not found without this flag. fixed in next release
diff --git a/pkgs/by-name/dd/ddnet/package.nix b/pkgs/by-name/dd/ddnet/package.nix
index cd584368a7f8..97e29e8654ad 100644
--- a/pkgs/by-name/dd/ddnet/package.nix
+++ b/pkgs/by-name/dd/ddnet/package.nix
@@ -13,7 +13,7 @@
   libGLU,
   libnotify,
   libogg,
-  libX11,
+  libx11,
   opusfile,
   pcre,
   python3,
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
       spirv-tools
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
-      libX11
+      libx11
     ]
   );
 
diff --git a/pkgs/by-name/dd/ddrescueview/package.nix b/pkgs/by-name/dd/ddrescueview/package.nix
index 50828787fa1c..5048801adfa3 100644
--- a/pkgs/by-name/dd/ddrescueview/package.nix
+++ b/pkgs/by-name/dd/ddrescueview/package.nix
@@ -9,7 +9,7 @@
   gdk-pixbuf,
   glib,
   gtk2,
-  libX11,
+  libx11,
   pango,
 }:
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     gdk-pixbuf
     glib
     gtk2
-    libX11
+    libx11
     pango
   ];
 
diff --git a/pkgs/by-name/de/deadbeef/package.nix b/pkgs/by-name/de/deadbeef/package.nix
index 6179b42afcad..df3a2bc559bf 100644
--- a/pkgs/by-name/de/deadbeef/package.nix
+++ b/pkgs/by-name/de/deadbeef/package.nix
@@ -40,7 +40,7 @@
   artworkSupport ? true,
   imlib2,
   hotkeysSupport ? true,
-  libX11,
+  libx11,
   osdSupport ? true,
   dbus,
   # output plugins
@@ -116,7 +116,7 @@ clangStdenv.mkDerivation (finalAttrs: {
     imlib2
   ]
   ++ optionals hotkeysSupport [
-    libX11
+    libx11
   ]
   ++ optionals osdSupport [
     dbus
diff --git a/pkgs/by-name/de/deadpixi-sam-unstable/package.nix b/pkgs/by-name/de/deadpixi-sam-unstable/package.nix
index d50412deb49d..cbd620ec8f07 100644
--- a/pkgs/by-name/de/deadpixi-sam-unstable/package.nix
+++ b/pkgs/by-name/de/deadpixi-sam-unstable/package.nix
@@ -3,10 +3,10 @@
   stdenv,
   fetchFromGitHub,
   freetype,
-  libX11,
-  libXi,
-  libXt,
-  libXft,
+  libx11,
+  libxi,
+  libxt,
+  libxft,
 }:
 
 stdenv.mkDerivation {
@@ -30,10 +30,10 @@ stdenv.mkDerivation {
   CFLAGS = "-D_DARWIN_C_SOURCE";
   makeFlags = [ "DESTDIR=$(out)" ];
   buildInputs = [
-    libX11
-    libXi
-    libXt
-    libXft
+    libx11
+    libxi
+    libxt
+    libxft
   ];
   # build fails when run in parallel
   enableParallelBuilding = false;
diff --git a/pkgs/by-name/de/decent-sampler/package.nix b/pkgs/by-name/de/decent-sampler/package.nix
index 8c5b9d5e350d..49400c93d453 100644
--- a/pkgs/by-name/de/decent-sampler/package.nix
+++ b/pkgs/by-name/de/decent-sampler/package.nix
@@ -9,7 +9,7 @@
   alsa-lib,
   freetype,
   nghttp2,
-  libX11,
+  libx11,
   expat,
 }:
 
@@ -71,7 +71,7 @@ buildFHSEnv {
     decent-sampler
     freetype
     nghttp2
-    libX11
+    libx11
     expat
   ];
 
diff --git a/pkgs/by-name/de/delayarchitect/package.nix b/pkgs/by-name/de/delayarchitect/package.nix
index 53a3f3713085..0646e77ffd3a 100644
--- a/pkgs/by-name/de/delayarchitect/package.nix
+++ b/pkgs/by-name/de/delayarchitect/package.nix
@@ -3,11 +3,11 @@
   stdenv,
   fetchFromGitHub,
   libGL,
-  libX11,
-  libXext,
-  libXrandr,
-  libXinerama,
-  libXcursor,
+  libx11,
+  libxext,
+  libxrandr,
+  libxinerama,
+  libxcursor,
   freetype,
   alsa-lib,
   cmake,
@@ -34,11 +34,11 @@ stdenv.mkDerivation {
 
   buildInputs = [
     libGL
-    libX11
-    libXext
-    libXrandr
-    libXinerama
-    libXcursor
+    libx11
+    libxext
+    libxrandr
+    libxinerama
+    libxcursor
     freetype
     alsa-lib
   ];
diff --git a/pkgs/by-name/de/deskflow/package.nix b/pkgs/by-name/de/deskflow/package.nix
index 98c8fbf1c1b7..e391c3410856 100644
--- a/pkgs/by-name/de/deskflow/package.nix
+++ b/pkgs/by-name/de/deskflow/package.nix
@@ -8,12 +8,12 @@
   gtest,
   libei,
   libportal,
-  libX11,
+  libx11,
   libxkbfile,
-  libXtst,
-  libXinerama,
-  libXi,
-  libXrandr,
+  libxtst,
+  libxinerama,
+  libxi,
+  libxrandr,
   libxkbcommon,
   pugixml,
   python3,
@@ -66,12 +66,12 @@ stdenv.mkDerivation (finalAttrs: {
     gtest
     libei
     libportal
-    libX11
+    libx11
     libxkbfile
-    libXinerama
-    libXi
-    libXrandr
-    libXtst
+    libxinerama
+    libxi
+    libxrandr
+    libxtst
     libxkbcommon
     pugixml
     gdk-pixbuf
diff --git a/pkgs/by-name/de/desmume/package.nix b/pkgs/by-name/de/desmume/package.nix
index 94064d3b704c..cc6b654542e4 100644
--- a/pkgs/by-name/de/desmume/package.nix
+++ b/pkgs/by-name/de/desmume/package.nix
@@ -11,7 +11,7 @@
   gtk3,
   intltool,
   libGLU,
-  libXmu,
+  libxmu,
   libpcap,
   libtool,
   lua,
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
     alsa-lib
     gtk3
     libGLU
-    libXmu
+    libxmu
     libpcap
     openal
     soundtouch
diff --git a/pkgs/by-name/de/devour/package.nix b/pkgs/by-name/de/devour/package.nix
index f49b88e4cea4..b24c736543d2 100644
--- a/pkgs/by-name/de/devour/package.nix
+++ b/pkgs/by-name/de/devour/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
     install -Dm555 -t $out/bin devour
   '';
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   meta = {
     description = "Hides your current window when launching an external program";
diff --git a/pkgs/by-name/de/dexed/package.nix b/pkgs/by-name/de/dexed/package.nix
index 6a699e941963..4d645d779f1f 100644
--- a/pkgs/by-name/de/dexed/package.nix
+++ b/pkgs/by-name/de/dexed/package.nix
@@ -5,11 +5,11 @@
   gitUpdater,
   cmake,
   pkg-config,
-  libX11,
-  libXrandr,
-  libXinerama,
-  libXext,
-  libXcursor,
+  libx11,
+  libxrandr,
+  libxinerama,
+  libxext,
+  libxcursor,
   freetype,
   alsa-lib,
   libjack2,
@@ -43,11 +43,11 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
-    libXext
-    libXcursor
-    libXinerama
-    libXrandr
+    libx11
+    libxext
+    libxcursor
+    libxinerama
+    libxrandr
     freetype
     alsa-lib
     libjack2
diff --git a/pkgs/by-name/dh/dhcpcd/package.nix b/pkgs/by-name/dh/dhcpcd/package.nix
index 4a9cd199ae05..3f470ffd9cd8 100644
--- a/pkgs/by-name/dh/dhcpcd/package.nix
+++ b/pkgs/by-name/dh/dhcpcd/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dhcpcd";
-  version = "10.2.4";
+  version = "10.3.0";
 
   src = fetchFromGitHub {
     owner = "NetworkConfiguration";
     repo = "dhcpcd";
     rev = "v${version}";
-    sha256 = "sha256-ysaKgF4Cu/S6yhSn/4glA0+Ey54KNp3/1Oh82yE0/PY=";
+    sha256 = "sha256-XbXZkws1eHvN7OEq7clq2kziwwdk04lNrWbJ9RdHExU=";
   };
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/dh/dhewm3/package.nix b/pkgs/by-name/dh/dhewm3/package.nix
index 03e314492d1d..b9a364a25a73 100644
--- a/pkgs/by-name/dh/dhewm3/package.nix
+++ b/pkgs/by-name/dh/dhewm3/package.nix
@@ -10,7 +10,7 @@
   libjpeg,
   libogg,
   libvorbis,
-  libX11,
+  libx11,
   openal,
   curl,
   copyDesktopItems,
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     SDL2
     libGLU
     libGL
-    libX11
+    libx11
     zlib
     libjpeg
     libogg
diff --git a/pkgs/by-name/di/dillo-plus/package.nix b/pkgs/by-name/di/dillo-plus/package.nix
index e6032ba38c95..f1caa7955ea2 100644
--- a/pkgs/by-name/di/dillo-plus/package.nix
+++ b/pkgs/by-name/di/dillo-plus/package.nix
@@ -6,7 +6,7 @@
   giflib,
   libjpeg,
   libpng,
-  libXdmcp,
+  libxdmcp,
   openssl,
   pkg-config,
   wget,
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     giflib
     libjpeg
     libpng
-    libXdmcp
+    libxdmcp
     openssl
   ];
 
diff --git a/pkgs/by-name/di/diodon/package.nix b/pkgs/by-name/di/diodon/package.nix
index c65646b31a16..e487fd5d4f4b 100644
--- a/pkgs/by-name/di/diodon/package.nix
+++ b/pkgs/by-name/di/diodon/package.nix
@@ -14,7 +14,7 @@
   xvfb-run,
   libayatana-appindicator,
   libpeas,
-  libXtst,
+  libxtst,
   zeitgeist,
 }:
 
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     libayatana-appindicator
     libpeas
-    libXtst
+    libxtst
     zeitgeist
   ];
 
diff --git a/pkgs/by-name/di/diopser/package.nix b/pkgs/by-name/di/diopser/package.nix
index 2c7bb8a5bfa1..e0c5342b1fdf 100644
--- a/pkgs/by-name/di/diopser/package.nix
+++ b/pkgs/by-name/di/diopser/package.nix
@@ -8,11 +8,11 @@
   libjack2,
   alsa-lib,
   freetype,
-  libX11,
-  libXrandr,
-  libXinerama,
-  libXext,
-  libXcursor,
+  libx11,
+  libxrandr,
+  libxinerama,
+  libxext,
+  libxcursor,
 }:
 
 let
@@ -84,11 +84,11 @@ stdenv.mkDerivation {
     libjack2
     alsa-lib
     freetype
-    libX11
-    libXrandr
-    libXinerama
-    libXext
-    libXcursor
+    libx11
+    libxrandr
+    libxinerama
+    libxext
+    libxcursor
   ];
 
   cmakeFlags = [
diff --git a/pkgs/by-name/di/disk_indicator/package.nix b/pkgs/by-name/di/disk_indicator/package.nix
index 1f2e4d3b6f55..8de9b94a97f1 100644
--- a/pkgs/by-name/di/disk_indicator/package.nix
+++ b/pkgs/by-name/di/disk_indicator/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation {
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     sha256 = "sha256-cRqgIxF6H1WyJs5hhaAXVdWAlv6t22BZLp3p/qRlCSM=";
   };
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   postPatch = ''
     # avoid -Werror
diff --git a/pkgs/by-name/di/distrho-ports/package.nix b/pkgs/by-name/di/distrho-ports/package.nix
index 186d87c3d0a6..8b7123b29815 100644
--- a/pkgs/by-name/di/distrho-ports/package.nix
+++ b/pkgs/by-name/di/distrho-ports/package.nix
@@ -6,10 +6,10 @@
   fftwFloat,
   freetype,
   libGL,
-  libX11,
-  libXcursor,
-  libXext,
-  libXrender,
+  libx11,
+  libxcursor,
+  libxext,
+  libxrender,
   meson,
   ninja,
   pkg-config,
@@ -50,10 +50,10 @@ stdenv.mkDerivation {
     alsa-lib
     freetype
     libGL
-    libX11
-    libXcursor
-    libXext
-    libXrender
+    libx11
+    libxcursor
+    libxext
+    libxrender
   ];
 
   env.NIX_CFLAGS_COMPILE = toString [ "-fpermissive" ];
diff --git a/pkgs/by-name/dl/dlib/package.nix b/pkgs/by-name/dl/dlib/package.nix
index 98732ca34049..a7c802197ac2 100644
--- a/pkgs/by-name/dl/dlib/package.nix
+++ b/pkgs/by-name/dl/dlib/package.nix
@@ -11,7 +11,7 @@
   lapack,
   config,
   guiSupport ? false,
-  libX11,
+  libx11,
   enableShared ? !stdenv.hostPlatform.isStatic, # dlib has a build system that forces the user to choose between either shared or static libraries. See https://github.com/davisking/dlib/issues/923#issuecomment-2175865174
   sse4Support ? stdenv.hostPlatform.sse4_1Support,
   avxSupport ? stdenv.hostPlatform.avxSupport,
@@ -66,7 +66,7 @@
     blas
     lapack
   ]
-  ++ lib.optionals guiSupport [ libX11 ]
+  ++ lib.optionals guiSupport [ libx11 ]
   ++ lib.optionals cudaSupport (
     with cudaPackages;
     [
diff --git a/pkgs/by-name/dm/dmenu-rs/package.nix b/pkgs/by-name/dm/dmenu-rs/package.nix
index ddca968f9f32..70ac55438b09 100644
--- a/pkgs/by-name/dm/dmenu-rs/package.nix
+++ b/pkgs/by-name/dm/dmenu-rs/package.nix
@@ -13,8 +13,8 @@
   # buildInputs
   expat,
   fontconfig,
-  libXft,
-  libXinerama,
+  libxft,
+  libxinerama,
   libxcb,
   aspell,
   xclip,
@@ -60,8 +60,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     expat
     fontconfig
-    libXft
-    libXinerama
+    libxft
+    libxinerama
     libxcb
   ]
   ++ lib.optionals enablePlugins [
diff --git a/pkgs/by-name/dm/dmenu/package.nix b/pkgs/by-name/dm/dmenu/package.nix
index bfcd38cc704a..0ad19f9047ff 100644
--- a/pkgs/by-name/dm/dmenu/package.nix
+++ b/pkgs/by-name/dm/dmenu/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchzip,
   fontconfig,
-  libX11,
-  libXinerama,
-  libXft,
+  libx11,
+  libxinerama,
+  libxft,
   writeText,
   # customization
   config,
@@ -27,9 +27,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     fontconfig
-    libX11
-    libXinerama
-    libXft
+    libx11
+    libxinerama
+    libxft
   ]
   ++ extraLibs;
 
diff --git a/pkgs/by-name/do/dolphin-emu-primehack/package.nix b/pkgs/by-name/do/dolphin-emu-primehack/package.nix
index a15859c43049..78a2f375b132 100644
--- a/pkgs/by-name/do/dolphin-emu-primehack/package.nix
+++ b/pkgs/by-name/do/dolphin-emu-primehack/package.nix
@@ -17,11 +17,11 @@
   libGL,
   libGLU,
   libsm,
-  libXdmcp,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXxf86vm,
+  libxdmcp,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxxf86vm,
   libao,
   libpthread-stubs,
   libpulseaudio,
@@ -87,11 +87,11 @@ stdenv.mkDerivation (finalAttrs: {
     libGL
     libGLU
     libsm
-    libXdmcp
-    libXext
-    libXinerama
-    libXrandr
-    libXxf86vm
+    libxdmcp
+    libxext
+    libxinerama
+    libxrandr
+    libxxf86vm
     libao
     libpthread-stubs
     libpulseaudio
diff --git a/pkgs/by-name/do/dolphin-emu/package.nix b/pkgs/by-name/do/dolphin-emu/package.nix
index 3edb8c1be552..b23dab82c6a7 100644
--- a/pkgs/by-name/do/dolphin-emu/package.nix
+++ b/pkgs/by-name/do/dolphin-emu/package.nix
@@ -21,7 +21,7 @@
   glslang,
   gtest,
   hidapi,
-  libXdmcp,
+  libxdmcp,
   libpulseaudio,
   libspng,
   libusb1,
@@ -40,8 +40,8 @@
   alsa-lib,
   bluez,
   libGL,
-  libXext,
-  libXrandr,
+  libxext,
+  libxrandr,
   libevdev,
   udev,
   vulkan-loader,
@@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
     glslang
     gtest
     hidapi
-    libXdmcp
+    libxdmcp
     libpulseaudio
     libspng
     libusb1
@@ -117,8 +117,8 @@ stdenv.mkDerivation (finalAttrs: {
     alsa-lib
     bluez
     libGL
-    libXext
-    libXrandr
+    libxext
+    libxrandr
     libevdev
     # FIXME: Vendored version is newer than mgba's stable release, remove the comment on next mgba's version
     #mgba # Derivation doesn't support Darwin
diff --git a/pkgs/by-name/do/dosbox-x/package.nix b/pkgs/by-name/do/dosbox-x/package.nix
index a97bf0f71987..402e0f6b927c 100644
--- a/pkgs/by-name/do/dosbox-x/package.nix
+++ b/pkgs/by-name/do/dosbox-x/package.nix
@@ -13,7 +13,7 @@
   libpng,
   libslirp,
   libxkbfile,
-  libXrandr,
+  libxrandr,
   makeWrapper,
   ncurses,
   pkg-config,
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
     libxkbfile
-    libXrandr
+    libxrandr
   ];
 
   # Tests for SDL_net.h for modem & IPX support, not automatically picked up due to being in SDL2 subdirectory
diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix
index fecea934cee8..6a88569550ba 100644
--- a/pkgs/by-name/do/doublecmd/package.nix
+++ b/pkgs/by-name/do/doublecmd/package.nix
@@ -7,7 +7,7 @@
   getopt,
   glib,
   lazarus,
-  libX11,
+  libx11,
   libsForQt5,
   writableTmpDirAsHomeHook,
 }:
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     dbus
     glib
-    libX11
+    libx11
     libsForQt5.libqtpas
   ];
 
diff --git a/pkgs/by-name/dr/dreamchess/package.nix b/pkgs/by-name/dr/dreamchess/package.nix
index dca3b4a027d8..5842d7894c0b 100644
--- a/pkgs/by-name/dr/dreamchess/package.nix
+++ b/pkgs/by-name/dr/dreamchess/package.nix
@@ -14,7 +14,7 @@
   glew,
   freetype,
   libsm,
-  libXext,
+  libxext,
   libGL,
   libGLU,
   libx11,
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     glew
     freetype
     libsm
-    libXext
+    libxext
     libGL
     libGLU
     libxcb
diff --git a/pkgs/by-name/dr/drumgizmo/package.nix b/pkgs/by-name/dr/drumgizmo/package.nix
index 5b37f44fabb1..cee0419ad314 100644
--- a/pkgs/by-name/dr/drumgizmo/package.nix
+++ b/pkgs/by-name/dr/drumgizmo/package.nix
@@ -7,8 +7,8 @@
   expat,
   glib,
   libjack2,
-  libXext,
-  libX11,
+  libxext,
+  libx11,
   libpng,
   libpthread-stubs,
   libsmf,
@@ -46,8 +46,8 @@ stdenv.mkDerivation rec {
     expat
     glib
     libjack2
-    libXext
-    libX11
+    libxext
+    libx11
     libpng
     libpthread-stubs
     libsmf
diff --git a/pkgs/by-name/ds/dssat/package.nix b/pkgs/by-name/ds/dssat/package.nix
index c04c35f6f012..2f3b6543c426 100644
--- a/pkgs/by-name/ds/dssat/package.nix
+++ b/pkgs/by-name/ds/dssat/package.nix
@@ -23,14 +23,14 @@ let
     hash = "sha256-WwJR5lnWtR3aYWZmk8pBC0/qaRqY0UrWHIaYp2ajImE=";
   };
 in
-stdenv.mkDerivation (final: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "dssat";
   version = "4.8.2.12";
 
   src = fetchFromGitHub {
     owner = "DSSAT";
     repo = "dssat-csm-os";
-    tag = "v${final.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-8OaTM7IXFZjlelx5O4O+bVNQj4dIhGzIk2iCfpqI8uA=";
   };
 
diff --git a/pkgs/by-name/ds/dssi/package.nix b/pkgs/by-name/ds/dssi/package.nix
index f0861c5646b2..8f0d027ac89a 100644
--- a/pkgs/by-name/ds/dssi/package.nix
+++ b/pkgs/by-name/ds/dssi/package.nix
@@ -6,7 +6,7 @@
   libjack2,
   liblo,
   alsa-lib,
-  libX11,
+  libx11,
   libsndfile,
   libsm,
   libsamplerate,
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     libjack2
     liblo
     alsa-lib
-    libX11
+    libx11
     libsndfile
     libsm
     libsamplerate
diff --git a/pkgs/by-name/du/duckstation/package.nix b/pkgs/by-name/du/duckstation/package.nix
index 0944f6591a3b..374380073240 100644
--- a/pkgs/by-name/du/duckstation/package.nix
+++ b/pkgs/by-name/du/duckstation/package.nix
@@ -22,7 +22,7 @@
   rapidjson,
   libzip,
   curl,
-  libX11,
+  libx11,
   wayland,
   shaderc,
   spirv-cross,
@@ -248,7 +248,7 @@ let
       cpuinfo
       libzip
       curl
-      libX11
+      libx11
       wayland
       spirv-cross
       qt6.qtbase
diff --git a/pkgs/by-name/du/dunst/package.nix b/pkgs/by-name/du/dunst/package.nix
index e84968bd3b57..3b282880c6f5 100644
--- a/pkgs/by-name/du/dunst/package.nix
+++ b/pkgs/by-name/du/dunst/package.nix
@@ -7,18 +7,18 @@
   which,
   perl,
   jq,
-  libXrandr,
+  libxrandr,
   coreutils,
   cairo,
   dbus,
   systemd,
   gdk-pixbuf,
   glib,
-  libX11,
-  libXScrnSaver,
+  libx11,
+  libxscrnsaver,
   wayland,
   wayland-protocols,
-  libXinerama,
+  libxinerama,
   libnotify,
   pango,
   xorgproto,
@@ -58,11 +58,11 @@ stdenv.mkDerivation (finalAttrs: {
     librsvg
   ]
   ++ lib.optionals withX11 [
-    libX11
-    libXScrnSaver
-    libXinerama
+    libx11
+    libxscrnsaver
+    libxinerama
     xorgproto
-    libXrandr
+    libxrandr
   ]
   ++ lib.optionals withWayland [
     wayland
diff --git a/pkgs/by-name/dw/dwl/package.nix b/pkgs/by-name/dw/dwl/package.nix
index 748a464ad63e..280a15e8da84 100644
--- a/pkgs/by-name/dw/dwl/package.nix
+++ b/pkgs/by-name/dw/dwl/package.nix
@@ -2,7 +2,7 @@
   lib,
   fetchFromCodeberg,
   installShellFiles,
-  libX11,
+  libx11,
   libinput,
   libxcb,
   libxkbcommon,
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     wlroots_0_18
   ]
   ++ lib.optionals enableXWayland [
-    libX11
+    libx11
     libxcb-wm
     xwayland
   ];
diff --git a/pkgs/by-name/dw/dwm-status/package.nix b/pkgs/by-name/dw/dwm-status/package.nix
index c0cbb359805e..78d208e24206 100644
--- a/pkgs/by-name/dw/dwm-status/package.nix
+++ b/pkgs/by-name/dw/dwm-status/package.nix
@@ -7,7 +7,7 @@
   libnotify,
   makeWrapper,
   pkg-config,
-  libX11,
+  libx11,
   enableAlsaUtils ? true,
   alsa-utils,
   coreutils,
@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     dbus
     gdk-pixbuf
     libnotify
-    libX11
+    libx11
   ];
 
   cargoHash = "sha256-o6gzP0mo7+np5Ba22gPAHcPPXoFTYThNsMr6nNC/Zm4=";
diff --git a/pkgs/by-name/dw/dwm/package.nix b/pkgs/by-name/dw/dwm/package.nix
index 29660cad7c46..4956b3dd7896 100644
--- a/pkgs/by-name/dw/dwm/package.nix
+++ b/pkgs/by-name/dw/dwm/package.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   fetchzip,
-  libX11,
-  libXinerama,
-  libXft,
+  libx11,
+  libxinerama,
+  libxft,
   writeText,
   pkg-config,
   # customization
@@ -28,9 +28,9 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = lib.optional stdenv.hostPlatform.isStatic pkg-config;
 
   buildInputs = [
-    libX11
-    libXinerama
-    libXft
+    libx11
+    libxinerama
+    libxft
   ]
   ++ extraLibs;
 
diff --git a/pkgs/by-name/dw/dwmblocks/package.nix b/pkgs/by-name/dw/dwmblocks/package.nix
index 8524914d0611..409e3692f810 100644
--- a/pkgs/by-name/dw/dwmblocks/package.nix
+++ b/pkgs/by-name/dw/dwmblocks/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
   patches ? [ ],
   writeText,
   conf ? null,
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     hash = "sha256-QtYQB2mvw1k2LA8D+/cVnA8+GRDWjhIM6rxfi/IGjEw=";
   };
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   inherit patches;
 
diff --git a/pkgs/by-name/dz/dzen2/package.nix b/pkgs/by-name/dz/dzen2/package.nix
index 549bf4e6f732..8530be3bfcef 100644
--- a/pkgs/by-name/dz/dzen2/package.nix
+++ b/pkgs/by-name/dz/dzen2/package.nix
@@ -3,10 +3,10 @@
   stdenv,
   fetchurl,
   pkg-config,
-  libX11,
-  libXft,
-  libXinerama,
-  libXpm,
+  libx11,
+  libxft,
+  libxinerama,
+  libxpm,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -15,10 +15,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    libX11
-    libXft
-    libXinerama
-    libXpm
+    libx11
+    libxft
+    libxinerama
+    libxpm
   ];
 
   src = fetchurl {
diff --git a/pkgs/by-name/e1/e16/package.nix b/pkgs/by-name/e1/e16/package.nix
index 96d3f75d26b1..de0b127bc0aa 100644
--- a/pkgs/by-name/e1/e16/package.nix
+++ b/pkgs/by-name/e1/e16/package.nix
@@ -6,13 +6,13 @@
   freetype,
   imlib2,
   libsm,
-  libXcomposite,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXft,
-  libXinerama,
-  libXrandr,
+  libxcomposite,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxft,
+  libxinerama,
+  libxrandr,
   libpulseaudio,
   libsndfile,
   pango,
@@ -38,13 +38,13 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
     imlib2
     libsm
-    libXcomposite
-    libXdamage
-    libXext
-    libXfixes
-    libXft
-    libXinerama
-    libXrandr
+    libxcomposite
+    libxdamage
+    libxext
+    libxfixes
+    libxft
+    libxinerama
+    libxrandr
     libpulseaudio
     libsndfile
     pango
diff --git a/pkgs/by-name/ea/eaglemode/package.nix b/pkgs/by-name/ea/eaglemode/package.nix
index c9b48d69b5a3..312ac01b2eb9 100644
--- a/pkgs/by-name/ea/eaglemode/package.nix
+++ b/pkgs/by-name/ea/eaglemode/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchurl,
   perl,
-  libX11,
-  libXinerama,
+  libx11,
+  libxinerama,
   libjpeg,
   libpng,
   libtiff,
@@ -13,8 +13,8 @@
   librsvg,
   glib,
   gtk3,
-  libXext,
-  libXxf86vm,
+  libxext,
+  libxxf86vm,
   poppler,
   vlc,
   ghostscript,
@@ -57,8 +57,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     perl
-    libX11
-    libXinerama
+    libx11
+    libxinerama
     libjpeg
     libpng
     libtiff
@@ -66,8 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
     librsvg
     glib
     gtk3
-    libXxf86vm
-    libXext
+    libxxf86vm
+    libxext
     poppler
     vlc
     ghostscript
diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix
index 8031453475ca..8cedc500052b 100644
--- a/pkgs/by-name/ea/easyeffects/package.nix
+++ b/pkgs/by-name/ea/easyeffects/package.nix
@@ -59,13 +59,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "easyeffects";
-  version = "8.0.9";
+  version = "8.1.2";
 
   src = fetchFromGitHub {
     owner = "wwmm";
     repo = "easyeffects";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cFMbeJeEIDP7uiNi+rRKErgHtjP/PbPKASo+M2qogZQ=";
+    hash = "sha256-Tz14pjI5pNJOQH0KFaf9mJkFdup1GVxlkMnzVQusx/M=";
   };
 
   patches = [ ./qmlmodule-fix.patch ];
diff --git a/pkgs/by-name/ea/easyrpg-player/package.nix b/pkgs/by-name/ea/easyrpg-player/package.nix
index 7938b789d073..be6ae208c849 100644
--- a/pkgs/by-name/ea/easyrpg-player/package.nix
+++ b/pkgs/by-name/ea/easyrpg-player/package.nix
@@ -20,14 +20,14 @@
   libsndfile,
   libsysprof-capture,
   libvorbis,
-  libXcursor,
-  libXext,
-  libXi,
-  libXinerama,
+  libxcursor,
+  libxext,
+  libxi,
+  libxinerama,
   libxmp,
-  libXrandr,
-  libXScrnSaver,
-  libXxf86vm,
+  libxrandr,
+  libxscrnsaver,
+  libxxf86vm,
   mpg123,
   nlohmann_json,
   opusfile,
@@ -86,13 +86,13 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
-    libXcursor
-    libXext
-    libXi
-    libXinerama
-    libXrandr
-    libXScrnSaver
-    libXxf86vm
+    libxcursor
+    libxext
+    libxi
+    libxinerama
+    libxrandr
+    libxscrnsaver
+    libxxf86vm
     libdecor
   ];
 
diff --git a/pkgs/by-name/eb/ebumeter/package.nix b/pkgs/by-name/eb/ebumeter/package.nix
index 0d70c6f57a9b..01aa85f8a16b 100644
--- a/pkgs/by-name/eb/ebumeter/package.nix
+++ b/pkgs/by-name/eb/ebumeter/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXft,
+  libx11,
+  libxft,
   libclthreads,
   libclxclient,
   libjack2,
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    libX11
-    libXft
+    libx11
+    libxft
     libclthreads
     libclxclient
     libjack2
diff --git a/pkgs/by-name/ec/eclipse-mat/package.nix b/pkgs/by-name/ec/eclipse-mat/package.nix
index 0da8dc8710c5..1bd1223b828d 100644
--- a/pkgs/by-name/ec/eclipse-mat/package.nix
+++ b/pkgs/by-name/ec/eclipse-mat/package.nix
@@ -7,9 +7,9 @@
   gtk3,
   jdk17,
   lib,
-  libX11,
-  libXrender,
-  libXtst,
+  libx11,
+  libxrender,
+  libxtst,
   makeDesktopItem,
   makeWrapper,
   shared-mime-info,
@@ -64,8 +64,8 @@ stdenv.mkDerivation rec {
       lib.makeLibraryPath [
         freetype
         fontconfig
-        libX11
-        libXrender
+        libx11
+        libxrender
         zlib
       ]
     } $libCairo
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
         lib.makeLibraryPath [
           glib
           gtk3
-          libXtst
+          libxtst
           webkitgtk_4_1
         ]
       } \
@@ -103,9 +103,9 @@ stdenv.mkDerivation rec {
     gsettings-desktop-schemas
     gtk3
     jdk
-    libX11
-    libXrender
-    libXtst
+    libx11
+    libxrender
+    libxtst
     zlib
     shared-mime-info
     webkitgtk_4_1
diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
index a67d01d10575..9b0d051ac310 100644
--- a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
+++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
@@ -5,8 +5,8 @@
   gradle_9,
   jdk25,
   wrapGAppsHook3,
-  libXxf86vm,
-  libXtst,
+  libxxf86vm,
+  libxtst,
   libglvnd,
   glib,
   alsa-lib,
@@ -99,9 +99,9 @@ stdenv.mkDerivation rec {
     makeWrapper $out/share/ed-odyssey-materials-helper/bin/Elite\ Dangerous\ Odyssey\ Materials\ Helper $out/bin/ed-odyssey-materials-helper \
       --prefix LD_LIBRARY_PATH : ${
         lib.makeLibraryPath [
-          libXxf86vm
+          libxxf86vm
           glib
-          libXtst
+          libxtst
           libglvnd
           alsa-lib
           ffmpeg
diff --git a/pkgs/by-name/ed/edit/package.nix b/pkgs/by-name/ed/edit/package.nix
index 0ec7d6cb04dd..7fc5627cf9c3 100644
--- a/pkgs/by-name/ed/edit/package.nix
+++ b/pkgs/by-name/ed/edit/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchgit,
   cwebbin,
-  libX11,
-  libXft,
+  libx11,
+  libxft,
   ncurses,
   pkg-config,
   unzip,
@@ -27,8 +27,8 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    libX11
-    libXft
+    libx11
+    libxft
     ncurses
   ];
 
diff --git a/pkgs/by-name/ed/edmarketconnector/package.nix b/pkgs/by-name/ed/edmarketconnector/package.nix
index 0bf83b5c809c..3ae084e7e72c 100644
--- a/pkgs/by-name/ed/edmarketconnector/package.nix
+++ b/pkgs/by-name/ed/edmarketconnector/package.nix
@@ -24,13 +24,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "edmarketconnector";
-  version = "6.1.1";
+  version = "6.1.2";
 
   src = fetchFromGitHub {
     owner = "EDCD";
     repo = "EDMarketConnector";
     tag = "Release/${finalAttrs.version}";
-    hash = "sha256-kWxen2CTmccI6FMoIZIvgI0Sk5TIL09onxTB3iY60I4=";
+    hash = "sha256-dnSzT1C4ElUkj34S3bYI+v0oKJQQ7zQBZ8OuhVB6ans=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/ed/edopro/package.nix b/pkgs/by-name/ed/edopro/package.nix
index 82218d5097b2..de7b73e63a7a 100644
--- a/pkgs/by-name/ed/edopro/package.nix
+++ b/pkgs/by-name/ed/edopro/package.nix
@@ -25,9 +25,9 @@
   libjpeg,
   libpng,
   libvorbis,
-  libX11,
+  libx11,
   libxkbcommon,
-  libXxf86vm,
+  libxxf86vm,
   mono,
   nlohmann_json,
   openal,
@@ -86,9 +86,9 @@ let
 
     buildInputs = [
       libGLU
-      libX11
+      libx11
       libxkbcommon
-      libXxf86vm
+      libxxf86vm
       wayland
     ];
 
@@ -277,9 +277,9 @@ let
         --prefix LD_LIBRARY_PATH : ${
           lib.makeLibraryPath [
             libGL
-            libX11
+            libx11
             libxkbcommon
-            libXxf86vm
+            libxxf86vm
             sqlite
             wayland
             egl-wayland
diff --git a/pkgs/by-name/eg/egl-wayland/package.nix b/pkgs/by-name/eg/egl-wayland/package.nix
index 2ddfe076adaa..ecba143b71f5 100644
--- a/pkgs/by-name/eg/egl-wayland/package.nix
+++ b/pkgs/by-name/eg/egl-wayland/package.nix
@@ -8,7 +8,7 @@
   ninja,
   wayland-scanner,
   libGL,
-  libX11,
+  libx11,
   libdrm,
   wayland,
   wayland-protocols,
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libGL
-    libX11
+    libx11
     libdrm
     wayland
     wayland-protocols
diff --git a/pkgs/by-name/el/elfutils/package.nix b/pkgs/by-name/el/elfutils/package.nix
index 2a53e669c653..21e5a5c79d6b 100644
--- a/pkgs/by-name/el/elfutils/package.nix
+++ b/pkgs/by-name/el/elfutils/package.nix
@@ -155,5 +155,6 @@ stdenv.mkDerivation rec {
       gpl3Plus
     ];
     maintainers = with lib.maintainers; [ r-burns ];
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "elfutils_project" version;
   };
 }
diff --git a/pkgs/by-name/el/elinks/package.nix b/pkgs/by-name/el/elinks/package.nix
index 2ce8ba592931..e5b8bcb014a8 100644
--- a/pkgs/by-name/el/elinks/package.nix
+++ b/pkgs/by-name/el/elinks/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   ncurses,
-  libX11,
+  libx11,
   bzip2,
   zlib,
   brotli,
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     ncurses
-    libX11
+    libx11
     bzip2
     zlib
     brotli
diff --git a/pkgs/by-name/em/emboss/package.nix b/pkgs/by-name/em/emboss/package.nix
index 83177cc85da2..28155d4376bd 100644
--- a/pkgs/by-name/em/emboss/package.nix
+++ b/pkgs/by-name/em/emboss/package.nix
@@ -5,9 +5,9 @@
   readline,
   perl,
   libharu,
-  libX11,
+  libx11,
   libpng,
-  libXt,
+  libxt,
   zlib,
 }:
 
@@ -25,8 +25,8 @@ stdenv.mkDerivation (finalAttrs: {
     perl
     libharu
     libpng
-    libX11
-    libXt
+    libx11
+    libxt
     zlib
   ];
 
diff --git a/pkgs/by-name/em/embree/package.nix b/pkgs/by-name/em/embree/package.nix
index 6a16aee8f1ed..f4eef0730150 100644
--- a/pkgs/by-name/em/embree/package.nix
+++ b/pkgs/by-name/em/embree/package.nix
@@ -11,7 +11,7 @@
   libjpeg,
   libpng,
   libpthread-stubs,
-  libX11,
+  libx11,
   glib,
 }:
 
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     openimageio
     libjpeg
     libpng
-    libX11
+    libx11
     libpthread-stubs
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ glib ];
diff --git a/pkgs/by-name/em/emmy-lua-code-style/package.nix b/pkgs/by-name/em/emmy-lua-code-style/package.nix
index 465ce8d01e37..0df147419dc4 100644
--- a/pkgs/by-name/em/emmy-lua-code-style/package.nix
+++ b/pkgs/by-name/em/emmy-lua-code-style/package.nix
@@ -6,14 +6,14 @@
   nix-update-script,
 }:
 
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "emmy-lua-code-style";
   version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "CppCXY";
     repo = "EmmyLuaCodeStyle";
-    tag = self.version;
+    tag = finalAttrs.version;
     hash = "sha256-FYtDO9ZL7MjC+vHzrylyYBQHTtef/GM9ipt//EcLr4w=";
   };
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation (self: {
 
   meta = {
     homepage = "https://github.com/CppCXY/EmmyLuaCodeStyle";
-    changelog = "https://github.com/CppCXY/EmmyLuaCodeStyle/releases/tag/${self.version}";
+    changelog = "https://github.com/CppCXY/EmmyLuaCodeStyle/releases/tag/${finalAttrs.version}";
     description = "Fast, powerful, and feature-rich Lua formatting and checking tool";
     mainProgram = "CodeFormat";
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/em/emptty/package.nix b/pkgs/by-name/em/emptty/package.nix
index d5a74025f909..3bc875b07e23 100644
--- a/pkgs/by-name/em/emptty/package.nix
+++ b/pkgs/by-name/em/emptty/package.nix
@@ -2,7 +2,7 @@
   buildGoModule,
   fetchFromGitHub,
   lib,
-  libX11,
+  libx11,
   pam,
   stdenv,
 }:
@@ -20,7 +20,7 @@ buildGoModule rec {
 
   buildInputs = [
     pam
-    libX11
+    libx11
   ];
 
   vendorHash = "sha256-PLyemAUcCz9H7+nAxftki3G7rQoEeyPzY3YUEj2RFn4=";
diff --git a/pkgs/by-name/em/empty-epsilon/package.nix b/pkgs/by-name/em/empty-epsilon/package.nix
index 5fa0663d91e3..0ec610733fd7 100644
--- a/pkgs/by-name/em/empty-epsilon/package.nix
+++ b/pkgs/by-name/em/empty-epsilon/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   sfml,
-  libX11,
+  libx11,
   glew,
   python3,
   glm_1_0_1,
@@ -41,7 +41,7 @@ let
     nativeBuildInputs = [ cmake ];
     buildInputs = [
       sfml
-      libX11
+      libx11
       glm_1_0_1
       SDL2
     ];
@@ -78,7 +78,7 @@ stdenv.mkDerivation {
     serious-proton
     sfml
     glew
-    libX11
+    libx11
     python3
     glm_1_0_1
     SDL2
diff --git a/pkgs/by-name/em/emulsion/package.nix b/pkgs/by-name/em/emulsion/package.nix
index 37501db0af43..6c230a9456ac 100644
--- a/pkgs/by-name/em/emulsion/package.nix
+++ b/pkgs/by-name/em/emulsion/package.nix
@@ -8,11 +8,11 @@
   pkg-config,
   python3,
   libGL,
-  libX11,
-  libXcursor,
-  libXi,
-  libXrandr,
-  libXxf86vm,
+  libx11,
+  libxcursor,
+  libxi,
+  libxrandr,
+  libxxf86vm,
   libxcb,
   libxkbcommon,
   wayland,
@@ -20,11 +20,11 @@
 let
   rpathLibs = [
     libGL
-    libX11
-    libXcursor
-    libXi
-    libXrandr
-    libXxf86vm
+    libx11
+    libxcursor
+    libxi
+    libxrandr
+    libxxf86vm
     libxcb
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
diff --git a/pkgs/by-name/en/endless-sky/package.nix b/pkgs/by-name/en/endless-sky/package.nix
index ed153ed6991a..f19a62b90bbb 100644
--- a/pkgs/by-name/en/endless-sky/package.nix
+++ b/pkgs/by-name/en/endless-sky/package.nix
@@ -7,7 +7,7 @@
   libpng,
   libjpeg,
   libogg,
-  libX11,
+  libx11,
   flac,
   glew,
   openal,
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
     libjpeg
     libogg
-    libX11
+    libx11
     flac
     glew
     openal
diff --git a/pkgs/by-name/en/ensemble-chorus/package.nix b/pkgs/by-name/en/ensemble-chorus/package.nix
index 17668f30ced8..a8569d929ca4 100644
--- a/pkgs/by-name/en/ensemble-chorus/package.nix
+++ b/pkgs/by-name/en/ensemble-chorus/package.nix
@@ -5,9 +5,9 @@
   fltk,
   alsa-lib,
   freetype,
-  libXrandr,
-  libXinerama,
-  libXcursor,
+  libxrandr,
+  libxinerama,
+  libxcursor,
   lv2,
   libjack2,
   cmake,
@@ -41,9 +41,9 @@ stdenv.mkDerivation {
     fltk
     alsa-lib
     freetype
-    libXrandr
-    libXinerama
-    libXcursor
+    libxrandr
+    libxinerama
+    libxcursor
     lv2
     libjack2
   ];
diff --git a/pkgs/by-name/es/espanso/package.nix b/pkgs/by-name/es/espanso/package.nix
index 5757ed9d1980..84130cbcb7aa 100644
--- a/pkgs/by-name/es/espanso/package.nix
+++ b/pkgs/by-name/es/espanso/package.nix
@@ -6,10 +6,10 @@
   pkg-config,
   extra-cmake-modules,
   dbus,
-  libX11,
+  libx11,
   libxcb,
-  libXi,
-  libXtst,
+  libxi,
+  libxtst,
   libnotify,
   libxkbcommon,
   libpng,
@@ -82,9 +82,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     wl-clipboard
   ]
   ++ lib.optionals x11Support [
-    libXi
-    libXtst
-    libX11
+    libxi
+    libxtst
+    libx11
     libxcb
     xclip
     xdotool
diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix
index c0edfc6bfcbe..c5aa4ee3dee8 100644
--- a/pkgs/by-name/es/esphome/package.nix
+++ b/pkgs/by-name/es/esphome/package.nix
@@ -33,14 +33,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "esphome";
-  version = "2026.1.3";
+  version = "2026.1.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "esphome";
     repo = "esphome";
     tag = version;
-    hash = "sha256-Y9n8nwHQeU7rWwgIXu93ufP1dTDIhJbSWPAnYVA3ZdI=";
+    hash = "sha256-j7PlHGLBY9M5jxzvOt6H+zr3nCNPpM/FCMLgevt6MnM=";
   };
 
   patches = [
@@ -95,6 +95,7 @@ python.pkgs.buildPythonApplication rec {
     pyparsing
     pyserial
     pyyaml
+    requests
     resvg-py
     ruamel-yaml
     tornado
diff --git a/pkgs/by-name/et/ete-unwrapped/package.nix b/pkgs/by-name/et/ete-unwrapped/package.nix
index eaa19f97dabd..1b396ad00ce0 100644
--- a/pkgs/by-name/et/ete-unwrapped/package.nix
+++ b/pkgs/by-name/et/ete-unwrapped/package.nix
@@ -11,7 +11,7 @@
   libogg,
   libpng,
   libtheora,
-  libX11,
+  libx11,
   lua5_4,
   minizip,
   openal,
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     libogg
     libpng
     libtheora
-    libX11
+    libx11
     lua5_4
     minizip
     openal
diff --git a/pkgs/by-name/et/etlegacy-unwrapped/package.nix b/pkgs/by-name/et/etlegacy-unwrapped/package.nix
index 86e0ad202eb4..dfbe335729c1 100644
--- a/pkgs/by-name/et/etlegacy-unwrapped/package.nix
+++ b/pkgs/by-name/et/etlegacy-unwrapped/package.nix
@@ -12,7 +12,7 @@
   libogg,
   libpng,
   libtheora,
-  libX11,
+  libx11,
   lua5_4,
   minizip,
   openal,
@@ -55,7 +55,7 @@ stdenv.mkDerivation {
     libogg
     libpng
     libtheora
-    libX11
+    libx11
     lua5_4
     minizip
     openal
diff --git a/pkgs/by-name/eu/eudic/package.nix b/pkgs/by-name/eu/eudic/package.nix
index a2c486582b6f..a76c544577bd 100644
--- a/pkgs/by-name/eu/eudic/package.nix
+++ b/pkgs/by-name/eu/eudic/package.nix
@@ -7,10 +7,10 @@
   dpkg,
   makeWrapper,
   libnotify,
-  libX11,
-  libXScrnSaver,
-  libXext,
-  libXtst,
+  libx11,
+  libxscrnsaver,
+  libxext,
+  libxtst,
   libuuid,
   libsecret,
   xdg-utils,
@@ -45,10 +45,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libnotify
-    libX11
-    libXScrnSaver
-    libXext
-    libXtst
+    libx11
+    libxscrnsaver
+    libxext
+    libxtst
     libuuid
     libsecret
     xdg-utils
diff --git a/pkgs/by-name/ev/evil-helix/package.nix b/pkgs/by-name/ev/evil-helix/package.nix
index e0fa61b724d6..692fe89ddeda 100644
--- a/pkgs/by-name/ev/evil-helix/package.nix
+++ b/pkgs/by-name/ev/evil-helix/package.nix
@@ -7,14 +7,14 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage (final: {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "evil-helix";
   version = "20250915";
 
   src = fetchFromGitHub {
     owner = "usagi-flow";
     repo = "evil-helix";
-    tag = "release-${final.version}";
+    tag = "release-${finalAttrs.version}";
     hash = "sha256-6kqKTZNS1RZwfxcFoa2uC7fUKcQ+KhT5KXusyCt59YQ=";
   };
 
diff --git a/pkgs/by-name/ex/exoscale-cli/package.nix b/pkgs/by-name/ex/exoscale-cli/package.nix
index 5fa9084f862d..75dd0eb45920 100644
--- a/pkgs/by-name/ex/exoscale-cli/package.nix
+++ b/pkgs/by-name/ex/exoscale-cli/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "exoscale-cli";
-  version = "1.91.0";
+  version = "1.92.0";
 
   src = fetchFromGitHub {
     owner = "exoscale";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "sha256-I8MzW81ai6qKN0Xk+/jHK7TcicUJdPwNE09McuxHwy4=";
+    sha256 = "sha256-EJtJOEAKlyUkLZqmmRDuZE9Sg2ANKH1NmikT9v6L+hY=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/ex/extremetuxracer/package.nix b/pkgs/by-name/ex/extremetuxracer/package.nix
index 8c4f315ce370..07de98eca837 100644
--- a/pkgs/by-name/ex/extremetuxracer/package.nix
+++ b/pkgs/by-name/ex/extremetuxracer/package.nix
@@ -4,16 +4,16 @@
   fetchurl,
   libGLU,
   libGL,
-  libX11,
+  libx11,
   xorgproto,
   tcl,
   libglut,
   freetype,
   sfml_2,
-  libXi,
-  libXmu,
-  libXext,
-  libXt,
+  libxi,
+  libxmu,
+  libxext,
+  libxt,
   libsm,
   libice,
   libpng,
@@ -38,16 +38,16 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libGLU
     libGL
-    libX11
+    libx11
     xorgproto
     tcl
     libglut
     freetype
     sfml_2
-    libXi
-    libXmu
-    libXext
-    libXt
+    libxi
+    libxmu
+    libxext
+    libxt
     libsm
     libice
     libpng
diff --git a/pkgs/by-name/ex/exult/package.nix b/pkgs/by-name/ex/exult/package.nix
index 795a56d2f1fa..02ebbe6e3810 100644
--- a/pkgs/by-name/ex/exult/package.nix
+++ b/pkgs/by-name/ex/exult/package.nix
@@ -10,7 +10,7 @@
   libogg,
   libtool,
   libvorbis,
-  libX11,
+  libx11,
   pkg-config,
   zlib,
   enableTools ? false,
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     SDL2
     libogg
     libvorbis
-    libX11
+    libx11
     zlib
   ];
 
diff --git a/pkgs/by-name/ez/ezquake/package.nix b/pkgs/by-name/ez/ezquake/package.nix
index a302fd01c7df..4506bdb27ddf 100644
--- a/pkgs/by-name/ez/ezquake/package.nix
+++ b/pkgs/by-name/ez/ezquake/package.nix
@@ -7,7 +7,7 @@
   jansson,
   lib,
   libGL,
-  libX11,
+  libx11,
   libjpeg,
   libpng,
   libsndfile,
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     expat
     jansson
     libGL
-    libX11
+    libx11
     libjpeg
     libpng
     libsndfile
diff --git a/pkgs/by-name/f3/f3d/package.nix b/pkgs/by-name/f3/f3d/package.nix
index 9c31664fdfca..600548ae87c1 100644
--- a/pkgs/by-name/f3/f3d/package.nix
+++ b/pkgs/by-name/f3/f3d/package.nix
@@ -6,7 +6,7 @@
   cmake,
   help2man,
   gzip,
-  libXt,
+  libxt,
   openusd,
   onetbb,
   vtk,
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
     python3Packages.pybind11
   ]
   ++ lib.optionals withUsd [
-    libXt
+    libxt
     openusd
     onetbb
   ];
diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix
index 73a772ce613f..d1b73964de59 100644
--- a/pkgs/by-name/fa/fabric-ai/package.nix
+++ b/pkgs/by-name/fa/fabric-ai/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "fabric-ai";
-  version = "1.4.396";
+  version = "1.4.400";
 
   src = fetchFromGitHub {
     owner = "danielmiessler";
     repo = "fabric";
     tag = "v${version}";
-    hash = "sha256-ZclAxFZK/mvzTnr1gn/rczCCJ05LeOXrACJ9yqy9jcg=";
+    hash = "sha256-pkB11lNOxpu9n5keG4m+veyiH+CCq4Myc3IqnA9MZg8=";
   };
 
-  vendorHash = "sha256-s7wm7RFbnh9yosWrK5hvrPECYY5nbu3QCdJVe67Sf3c=";
+  vendorHash = "sha256-kL1aCWNEgacKiYQf8LJYxCqmzlAgHi1ulcjrMOw513U=";
 
   # Fabric introduced plugin tests that fail in the nix build sandbox.
   doCheck = false;
diff --git a/pkgs/by-name/fa/factorio/package.nix b/pkgs/by-name/fa/factorio/package.nix
index e8893ae7f1ae..5e837a84b1e7 100644
--- a/pkgs/by-name/fa/factorio/package.nix
+++ b/pkgs/by-name/fa/factorio/package.nix
@@ -6,12 +6,12 @@
   libGL,
   libice,
   libsm,
-  libX11,
-  libXcursor,
-  libXext,
-  libXi,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxext,
+  libxi,
+  libxinerama,
+  libxrandr,
   libpulseaudio,
   libxkbcommon,
   makeDesktopItem,
@@ -244,12 +244,12 @@ let
         libGL
         libice
         libsm
-        libX11
-        libXcursor
-        libXext
-        libXi
-        libXinerama
-        libXrandr
+        libx11
+        libxcursor
+        libxext
+        libxi
+        libxinerama
+        libxrandr
         libpulseaudio
         libxkbcommon
         wayland
diff --git a/pkgs/by-name/fa/far2l/package.nix b/pkgs/by-name/fa/far2l/package.nix
index 5e305778c062..764eb5252960 100644
--- a/pkgs/by-name/fa/far2l/package.nix
+++ b/pkgs/by-name/fa/far2l/package.nix
@@ -19,7 +19,7 @@
   p7zip,
   xz,
   withTTYX ? true,
-  libX11,
+  libx11,
   withGUI ? true,
   wxGTK32,
   withUCD ? true,
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs =
-    lib.optional withTTYX libX11
+    lib.optional withTTYX libx11
     ++ lib.optional withGUI wxGTK32
     ++ lib.optional withUCD libuchardet
     ++ lib.optionals withColorer [
diff --git a/pkgs/by-name/fa/fast-float/package.nix b/pkgs/by-name/fa/fast-float/package.nix
index 6558a2dae15a..bf40ea6afe81 100644
--- a/pkgs/by-name/fa/fast-float/package.nix
+++ b/pkgs/by-name/fa/fast-float/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fast-float";
-  version = "8.2.2";
+  version = "8.2.3";
 
   src = fetchFromGitHub {
     owner = "fastfloat";
     repo = "fast_float";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-IZCZZayK3INU5P8HwZvWfOJuRfBrbPYuMQCjgCjHCWE=";
+    hash = "sha256-cQxIzfVNMG0UPEUw/4GYcRzmfAcBJLcswO+gqQ8t6lw=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix
index 60f149c76b01..4aa7b79b04e7 100644
--- a/pkgs/by-name/fa/fastfetch/package.nix
+++ b/pkgs/by-name/fa/fastfetch/package.nix
@@ -11,7 +11,7 @@
   glib,
   hwdata,
   imagemagick,
-  libXrandr,
+  libxrandr,
   libdrm,
   libelf,
   libglvnd,
@@ -168,7 +168,7 @@ stdenv.mkDerivation (finalAttrs: {
         ++ lib.optionals x11Support [
           # At least one of them sould be present in X11 sessions for better display detection and faster WM detection.
           # The *randr ones provide multi monitor support The libxcb* ones usually have better performance.
-          libXrandr
+          libxrandr
           libxcb
           # Required by libxcb messages
           libxau
diff --git a/pkgs/by-name/fa/fastmail-desktop/linux.nix b/pkgs/by-name/fa/fastmail-desktop/linux.nix
index 63d8fbeb2ef9..ca24c16f02d2 100644
--- a/pkgs/by-name/fa/fastmail-desktop/linux.nix
+++ b/pkgs/by-name/fa/fastmail-desktop/linux.nix
@@ -11,8 +11,8 @@
   autoPatchelfHook,
   makeWrapper,
   electron,
-  libXScrnSaver,
-  libXtst,
+  libxscrnsaver,
+  libxtst,
   libappindicator,
   libgcc,
   musl,
@@ -42,8 +42,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   ];
 
   libPath = lib.makeLibraryPath [
-    libXScrnSaver
-    libXtst
+    libxscrnsaver
+    libxtst
     libappindicator
   ];
 
diff --git a/pkgs/by-name/fb/fbida/package.nix b/pkgs/by-name/fb/fbida/package.nix
index 7bb852386840..36a76bf05353 100644
--- a/pkgs/by-name/fb/fbida/package.nix
+++ b/pkgs/by-name/fb/fbida/package.nix
@@ -17,7 +17,7 @@
   imagemagick,
   curl,
   sane-backends,
-  libXpm,
+  libxpm,
   libepoxy,
   pixman,
   poppler,
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
     curl
     sane-backends
     libdrm
-    libXpm
+    libxpm
     libepoxy
     pixman
     poppler
diff --git a/pkgs/by-name/fb/fbpanel/package.nix b/pkgs/by-name/fb/fbpanel/package.nix
index edbc4d6b3d29..85ab03cc543f 100644
--- a/pkgs/by-name/fb/fbpanel/package.nix
+++ b/pkgs/by-name/fb/fbpanel/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchFromGitHub,
   pkg-config,
-  libX11,
-  libXmu,
-  libXpm,
+  libx11,
+  libxmu,
+  libxpm,
   gtk2,
   libpng,
   libjpeg,
@@ -30,9 +30,9 @@ stdenv.mkDerivation {
     pypy2
   ];
   buildInputs = [
-    libX11
-    libXmu
-    libXpm
+    libx11
+    libxmu
+    libxpm
     gtk2
     libpng
     libjpeg
diff --git a/pkgs/by-name/fc/fceux/package.nix b/pkgs/by-name/fc/fceux/package.nix
index 8b9d74774649..bc75054d3b11 100644
--- a/pkgs/by-name/fc/fceux/package.nix
+++ b/pkgs/by-name/fc/fceux/package.nix
@@ -5,8 +5,8 @@
   cmake,
   fetchFromGitHub,
   ffmpeg,
-  libX11,
-  libXdmcp,
+  libx11,
+  libxdmcp,
   libxcb,
   lua5_1,
   minizip,
@@ -49,8 +49,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     SDL2
     ffmpeg
-    libX11
-    libXdmcp
+    libx11
+    libxdmcp
     libxcb
     lua5_1
     minizip
diff --git a/pkgs/by-name/fe/feishu/package.nix b/pkgs/by-name/fe/feishu/package.nix
index 74b12d3ff4a6..11bf3af92722 100644
--- a/pkgs/by-name/fe/feishu/package.nix
+++ b/pkgs/by-name/fe/feishu/package.nix
@@ -20,17 +20,17 @@
   gtk3,
   lib,
   libGL,
-  libX11,
-  libXScrnSaver,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXtst,
+  libx11,
+  libxscrnsaver,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxtst,
   libappindicator-gtk3,
   libcxx,
   libdbusmenu,
@@ -95,17 +95,17 @@ let
     glibc
     gnutls
     libGL
-    libX11
-    libXScrnSaver
-    libXcomposite
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
-    libXrandr
-    libXrender
-    libXtst
+    libx11
+    libxscrnsaver
+    libxcomposite
+    libxcursor
+    libxdamage
+    libxext
+    libxfixes
+    libxi
+    libxrandr
+    libxrender
+    libxtst
     libappindicator-gtk3
     libcxx
     libdbusmenu
@@ -152,8 +152,8 @@ stdenv.mkDerivation {
     # for autopatchelf
     alsa-lib
     cups
-    libXdamage
-    libXtst
+    libxdamage
+    libxtst
     libdrm
     libgcrypt
     libpulseaudio
diff --git a/pkgs/by-name/fe/ferrishot/package.nix b/pkgs/by-name/fe/ferrishot/package.nix
index 8ff68f9e5e72..11aba642b5d7 100644
--- a/pkgs/by-name/fe/ferrishot/package.nix
+++ b/pkgs/by-name/fe/ferrishot/package.nix
@@ -6,7 +6,7 @@
   makeBinaryWrapper,
   writableTmpDirAsHomeHook,
   libGL,
-  libX11,
+  libx11,
   libxkbcommon,
   libxcb,
   wayland,
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
         libGL
       ]
       ++ lib.optionals stdenv.hostPlatform.isLinux [
-        libX11
+        libx11
         libxkbcommon
         wayland
       ];
diff --git a/pkgs/by-name/fi/filtr/package.nix b/pkgs/by-name/fi/filtr/package.nix
index 09738ab1d6cd..6b3a72a9d94e 100644
--- a/pkgs/by-name/fi/filtr/package.nix
+++ b/pkgs/by-name/fi/filtr/package.nix
@@ -7,14 +7,14 @@
   alsa-lib,
   fontconfig,
   freetype,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXdmcp,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXtst,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxdmcp,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxtst,
   writableTmpDirAsHomeHook,
 
   buildVST3 ? true,
@@ -45,14 +45,14 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.isLinux [
     alsa-lib
-    libX11
-    libXcomposite
-    libXcursor
-    libXdmcp
-    libXext
-    libXinerama
-    libXrandr
-    libXtst
+    libx11
+    libxcomposite
+    libxcursor
+    libxdmcp
+    libxext
+    libxinerama
+    libxrandr
+    libxtst
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/fi/find-cursor/package.nix b/pkgs/by-name/fi/find-cursor/package.nix
index c13e901dc427..9a989cdd0945 100644
--- a/pkgs/by-name/fi/find-cursor/package.nix
+++ b/pkgs/by-name/fi/find-cursor/package.nix
@@ -2,11 +2,11 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXdamage,
-  libXrender,
-  libXcomposite,
-  libXext,
+  libx11,
+  libxdamage,
+  libxrender,
+  libxcomposite,
+  libxext,
   installShellFiles,
   git,
 }:
@@ -27,11 +27,11 @@ stdenv.mkDerivation (finalAttrs: {
     git
   ];
   buildInputs = [
-    libX11
-    libXdamage
-    libXrender
-    libXcomposite
-    libXext
+    libx11
+    libxdamage
+    libxrender
+    libxcomposite
+    libxext
   ];
   preInstall = "mkdir -p $out/share/man/man1";
   installFlags = [ "PREFIX=${placeholder "out"}" ];
diff --git a/pkgs/by-name/fi/fire/package.nix b/pkgs/by-name/fi/fire/package.nix
index 1c82e81a96a2..8891d587c8f7 100644
--- a/pkgs/by-name/fi/fire/package.nix
+++ b/pkgs/by-name/fi/fire/package.nix
@@ -9,11 +9,11 @@
   cmake,
   fontconfig,
   pkg-config,
-  libX11,
-  libXrandr,
-  libXinerama,
-  libXext,
-  libXcursor,
+  libx11,
+  libxrandr,
+  libxinerama,
+  libxext,
+  libxcursor,
   freetype,
   alsa-lib,
 
@@ -69,11 +69,11 @@ let
   ];
 
   x11Libs = [
-    libX11
-    libXrandr
-    libXinerama
-    libXext
-    libXcursor
+    libx11
+    libxrandr
+    libxinerama
+    libxext
+    libxcursor
   ];
 in
 stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/by-name/fl/fladder/package.nix b/pkgs/by-name/fl/fladder/package.nix
index 9a9f0b224a06..687042808b45 100644
--- a/pkgs/by-name/fl/fladder/package.nix
+++ b/pkgs/by-name/fl/fladder/package.nix
@@ -5,8 +5,8 @@
 
   alsa-lib,
   libdisplay-info,
-  libXpresent,
-  libXScrnSaver,
+  libxpresent,
+  libxscrnsaver,
   libepoxy,
   mpv-unwrapped,
 
@@ -50,8 +50,8 @@ flutter.buildFlutterApplication rec {
     alsa-lib
     libdisplay-info
     mpv-unwrapped
-    libXpresent
-    libXScrnSaver
+    libxpresent
+    libxscrnsaver
   ]
   ++ lib.optionals (targetFlutterPlatform == "linux") [
     libepoxy
diff --git a/pkgs/by-name/fl/flatpak/fix-fonts-icons.patch b/pkgs/by-name/fl/flatpak/fix-fonts-icons.patch
index 31a96d88b7dd..c94d7a84f4c9 100644
--- a/pkgs/by-name/fl/flatpak/fix-fonts-icons.patch
+++ b/pkgs/by-name/fl/flatpak/fix-fonts-icons.patch
@@ -15,7 +15,7 @@ index 94ad013..5c9f55e 100644
 +      realpath(source_path, path);
 +      if (g_str_has_prefix(path, "/nix/store/"))
 +        {
-+          *strchr(path + strlen("/nix/store/"), '/') = 0;
++          char * const p = strchr(path + strlen("/nix/store/"), '/'); if (p != 0) *p = 0;
 +          g_hash_table_add(closure, g_steal_pointer (&path));
 +        }
 +    }
diff --git a/pkgs/by-name/fl/flex-launcher/package.nix b/pkgs/by-name/fl/flex-launcher/package.nix
index da5906e6278a..0dea80a1c93e 100644
--- a/pkgs/by-name/fl/flex-launcher/package.nix
+++ b/pkgs/by-name/fl/flex-launcher/package.nix
@@ -4,7 +4,7 @@
   SDL2,
   SDL2_ttf,
   SDL2_image,
-  libX11,
+  libx11,
   cmake,
   validatePkgConfig,
   inih,
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     SDL2
     SDL2_ttf
     SDL2_image
-    libX11
+    libx11
     inih
   ];
 
diff --git a/pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix b/pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix
index a46775a3ac8e..858d1f0907d7 100644
--- a/pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix
+++ b/pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix
@@ -20,9 +20,9 @@
   boost,
   libGLU,
   libGL,
-  libX11,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxinerama,
+  libxrandr,
 }:
 
 stdenv.mkDerivation {
@@ -45,9 +45,9 @@ stdenv.mkDerivation {
 
   buildInputs =
     lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      libX11
-      libXinerama
-      libXrandr
+      libx11
+      libxinerama
+      libxrandr
       libGLU
       libGL
     ]
diff --git a/pkgs/by-name/fl/flightgear/package.nix b/pkgs/by-name/fl/flightgear/package.nix
index 055af0bbdb2c..52e11166b4d8 100644
--- a/pkgs/by-name/fl/flightgear/package.nix
+++ b/pkgs/by-name/fl/flightgear/package.nix
@@ -13,12 +13,12 @@
   plib,
   libsm,
   libunwind,
-  libX11,
+  libx11,
   xorgproto,
-  libXext,
-  libXi,
-  libXmu,
-  libXt,
+  libxext,
+  libxi,
+  libxmu,
+  libxt,
   simgear,
   zlib,
   boost,
@@ -82,12 +82,12 @@ stdenv.mkDerivation rec {
     plib
     libsm
     libunwind
-    libX11
+    libx11
     xorgproto
-    libXext
-    libXi
-    libXmu
-    libXt
+    libxext
+    libxi
+    libxmu
+    libxt
     (simgear.override { openscenegraph = openscenegraph; })
     zlib
     boost
diff --git a/pkgs/by-name/fl/floorp-bin-unwrapped/package.nix b/pkgs/by-name/fl/floorp-bin-unwrapped/package.nix
index 10514ec51d32..35b874442f70 100644
--- a/pkgs/by-name/fl/floorp-bin-unwrapped/package.nix
+++ b/pkgs/by-name/fl/floorp-bin-unwrapped/package.nix
@@ -8,7 +8,7 @@
   curl,
   dbus-glib,
   gtk3,
-  libXtst,
+  libxtst,
   libva,
   pciutils,
   pipewire,
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
     adwaita-icon-theme
     alsa-lib
     dbus-glib
-    libXtst
+    libxtst
   ];
 
   runtimeDependencies = [
diff --git a/pkgs/by-name/fl/flrig/package.nix b/pkgs/by-name/fl/flrig/package.nix
index 968a77ed0ab4..8385c9be5c2d 100644
--- a/pkgs/by-name/fl/flrig/package.nix
+++ b/pkgs/by-name/fl/flrig/package.nix
@@ -9,12 +9,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.09";
+  version = "2.0.10";
   pname = "flrig";
 
   src = fetchurl {
     url = "mirror://sourceforge/fldigi/flrig-${version}.tar.gz";
-    sha256 = "sha256-dvUh7PEGKvJ21aw4BFBLKDosE4RVtZPWb9XVHJRk9Z0=";
+    hash = "sha256-al8rh9T//tQQo1s6F2tdBOYO1N4/2lRQefNlbkLvQr0=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/fl/fltk_1_3/package.nix b/pkgs/by-name/fl/fltk_1_3/package.nix
index 2b2242107d8a..41762add1ce7 100644
--- a/pkgs/by-name/fl/fltk_1_3/package.nix
+++ b/pkgs/by-name/fl/fltk_1_3/package.nix
@@ -9,13 +9,13 @@
   libpng,
   fontconfig,
   freetype,
-  libX11,
-  libXext,
-  libXinerama,
-  libXfixes,
-  libXcursor,
-  libXft,
-  libXrender,
+  libx11,
+  libxext,
+  libxinerama,
+  libxfixes,
+  libxcursor,
+  libxft,
+  libxrender,
 
   withGL ? true,
   libGL,
@@ -91,13 +91,13 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
   ]
   ++ lib.optionals withXorg [
-    libX11
-    libXext
-    libXinerama
-    libXfixes
-    libXcursor
-    libXft
-    libXrender
+    libx11
+    libxext
+    libxinerama
+    libxfixes
+    libxcursor
+    libxft
+    libxrender
   ]
   ++ lib.optionals withCairo [
     cairo
diff --git a/pkgs/by-name/fl/fltk_1_4/package.nix b/pkgs/by-name/fl/fltk_1_4/package.nix
index b6da2c585748..e338af205131 100644
--- a/pkgs/by-name/fl/fltk_1_4/package.nix
+++ b/pkgs/by-name/fl/fltk_1_4/package.nix
@@ -9,13 +9,13 @@
   libpng,
   fontconfig,
   freetype,
-  libX11,
-  libXext,
-  libXinerama,
-  libXfixes,
-  libXcursor,
-  libXft,
-  libXrender,
+  libx11,
+  libxext,
+  libxinerama,
+  libxfixes,
+  libxcursor,
+  libxft,
+  libxrender,
 
   withGL ? true,
   libGL,
@@ -107,13 +107,13 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
   ]
   ++ lib.optionals withXorg [
-    libX11
-    libXext
-    libXinerama
-    libXfixes
-    libXcursor
-    libXft
-    libXrender
+    libx11
+    libxext
+    libxinerama
+    libxfixes
+    libxcursor
+    libxft
+    libxrender
   ]
   ++ lib.optionals withWayland [
     wayland
diff --git a/pkgs/by-name/fl/fluida-lv2/package.nix b/pkgs/by-name/fl/fluida-lv2/package.nix
index 71549bdd7721..c1ba67537dbc 100644
--- a/pkgs/by-name/fl/fluida-lv2/package.nix
+++ b/pkgs/by-name/fl/fluida-lv2/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   pkg-config,
-  libX11,
+  libx11,
   cairo,
   lv2,
   fluidsynth,
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     cairo
     fluidsynth
-    libX11
+    libx11
     lv2
   ];
 
diff --git a/pkgs/by-name/fl/fluxbox/package.nix b/pkgs/by-name/fl/fluxbox/package.nix
index 9f4f74085a5a..248be04fd1d0 100644
--- a/pkgs/by-name/fl/fluxbox/package.nix
+++ b/pkgs/by-name/fl/fluxbox/package.nix
@@ -5,13 +5,13 @@
   pkg-config,
   freetype,
   fribidi,
-  libXext,
-  libXft,
-  libXpm,
-  libXrandr,
-  libXrender,
+  libxext,
+  libxft,
+  libxpm,
+  libxrandr,
+  libxrender,
   xorgproto,
-  libXinerama,
+  libxinerama,
   imlib2,
 }:
 
@@ -39,13 +39,13 @@ stdenv.mkDerivation rec {
   buildInputs = [
     freetype
     fribidi
-    libXext
-    libXft
-    libXpm
-    libXrandr
-    libXrender
+    libxext
+    libxft
+    libxpm
+    libxrandr
+    libxrender
     xorgproto
-    libXinerama
+    libxinerama
     imlib2
   ];
 
diff --git a/pkgs/by-name/fo/focus/package.nix b/pkgs/by-name/fo/focus/package.nix
index ef46548cdbb6..10ffb2579d70 100644
--- a/pkgs/by-name/fo/focus/package.nix
+++ b/pkgs/by-name/fo/focus/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXinerama,
+  libx11,
+  libxinerama,
 }:
 
 stdenv.mkDerivation {
@@ -18,8 +18,8 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    libX11
-    libXinerama
+    libx11
+    libxinerama
   ];
 
   makeFlags = [ "PREFIX=\${out}" ];
diff --git a/pkgs/by-name/fo/fox/package.nix b/pkgs/by-name/fo/fox/package.nix
index 5862d1403b4f..a9ede51b9e9d 100644
--- a/pkgs/by-name/fo/fox/package.nix
+++ b/pkgs/by-name/fo/fox/package.nix
@@ -8,10 +8,10 @@
   zlib,
   bzip2,
   mesa_glu,
-  libXcursor,
-  libXext,
-  libXrandr,
-  libXft,
+  libxcursor,
+  libxext,
+  libxrandr,
+  libxft,
   cups,
 }:
 
@@ -31,10 +31,10 @@ stdenv.mkDerivation rec {
     zlib
     bzip2
     mesa_glu
-    libXcursor
-    libXext
-    libXrandr
-    libXft
+    libxcursor
+    libxext
+    libxrandr
+    libxft
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     cups
diff --git a/pkgs/by-name/fo/fox_1_6/package.nix b/pkgs/by-name/fo/fox_1_6/package.nix
index 0973212a551b..626ee91ebf53 100644
--- a/pkgs/by-name/fo/fox_1_6/package.nix
+++ b/pkgs/by-name/fo/fox_1_6/package.nix
@@ -7,13 +7,13 @@
   libtiff,
   zlib,
   bzip2,
-  libXcursor,
-  libXrandr,
+  libxcursor,
+  libxrandr,
   libGLU,
   libGL,
-  libXext,
-  libXft,
-  libXfixes,
+  libxext,
+  libxft,
+  libxfixes,
   mesa,
   xinput,
 }:
@@ -33,13 +33,13 @@ stdenv.mkDerivation rec {
     libtiff
     zlib
     bzip2
-    libXcursor
-    libXrandr
-    libXext
-    libXft
+    libxcursor
+    libxrandr
+    libxext
+    libxft
     libGLU
     libGL
-    libXfixes
+    libxfixes
     xinput
   ];
 
diff --git a/pkgs/by-name/fo/foxotron/package.nix b/pkgs/by-name/fo/foxotron/package.nix
index fceb3fd10547..3a9af09b7f09 100644
--- a/pkgs/by-name/fo/foxotron/package.nix
+++ b/pkgs/by-name/fo/foxotron/package.nix
@@ -8,12 +8,12 @@
   pkg-config,
   makeWrapper,
   zlib,
-  libX11,
-  libXrandr,
-  libXinerama,
-  libXcursor,
-  libXi,
-  libXext,
+  libx11,
+  libxrandr,
+  libxinerama,
+  libxcursor,
+  libxi,
+  libxext,
   libGLU,
   alsa-lib,
   fontconfig,
@@ -65,12 +65,12 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
-    libXrandr
-    libXinerama
-    libXcursor
-    libXi
-    libXext
+    libx11
+    libxrandr
+    libxinerama
+    libxcursor
+    libxi
+    libxext
     alsa-lib
     fontconfig
     libGLU
diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix
index c98d0a4cd32d..9bee57d7e7fd 100644
--- a/pkgs/by-name/fr/freecad/package.nix
+++ b/pkgs/by-name/fr/freecad/package.nix
@@ -13,7 +13,7 @@
   libGLU,
   libredwg,
   libspnav,
-  libXmu,
+  libxmu,
   medfile,
   ninja,
   ode,
@@ -81,7 +81,7 @@ freecad-utils.makeCustomizable (
       gts
       hdf5
       libGLU
-      libXmu
+      libxmu
       libspnav
       medfile
       ode
diff --git a/pkgs/by-name/fr/freeglut/package.nix b/pkgs/by-name/fr/freeglut/package.nix
index 028bb23b892a..047ff3810142 100644
--- a/pkgs/by-name/fr/freeglut/package.nix
+++ b/pkgs/by-name/fr/freeglut/package.nix
@@ -3,10 +3,10 @@
   stdenv,
   fetchurl,
   libice,
-  libXext,
-  libXi,
-  libXrandr,
-  libXxf86vm,
+  libxext,
+  libxi,
+  libxrandr,
+  libxxf86vm,
   libGLX,
   libGLU,
   cmake,
@@ -30,10 +30,10 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     libice
-    libXext
-    libXi
-    libXrandr
-    libXxf86vm
+    libxext
+    libxi
+    libxrandr
+    libxxf86vm
     libGLU
   ];
 
diff --git a/pkgs/by-name/fr/freenect/package.nix b/pkgs/by-name/fr/freenect/package.nix
index 437aa1f39da1..96de60571fe8 100644
--- a/pkgs/by-name/fr/freenect/package.nix
+++ b/pkgs/by-name/fr/freenect/package.nix
@@ -8,8 +8,8 @@
   libglut,
   libGLU,
   libGL,
-  libXi,
-  libXmu,
+  libxi,
+  libxmu,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -28,8 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
     libglut
     libGLU
     libGL
-    libXi
-    libXmu
+    libxi
+    libxmu
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fr/freepv/package.nix b/pkgs/by-name/fr/freepv/package.nix
index ef2d48c49ddc..8ccd3ff08afc 100644
--- a/pkgs/by-name/fr/freepv/package.nix
+++ b/pkgs/by-name/fr/freepv/package.nix
@@ -8,10 +8,10 @@
   libglut,
   zlib,
   cmake,
-  libX11,
+  libx11,
   libxml2,
   libpng,
-  libXxf86vm,
+  libxxf86vm,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -30,10 +30,10 @@ stdenv.mkDerivation (finalAttrs: {
     libGL
     libglut
     zlib
-    libX11
+    libx11
     libxml2
     libpng
-    libXxf86vm
+    libxxf86vm
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/fr/freerdp/package.nix b/pkgs/by-name/fr/freerdp/package.nix
index 5e28584f2659..67a1f72cbfff 100644
--- a/pkgs/by-name/fr/freerdp/package.nix
+++ b/pkgs/by-name/fr/freerdp/package.nix
@@ -19,17 +19,17 @@
   pkcs11helper,
   uriparser,
   zlib,
-  libX11,
-  libXcursor,
-  libXdamage,
-  libXdmcp,
-  libXext,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXrender,
-  libXtst,
-  libXv,
+  libx11,
+  libxcursor,
+  libxdamage,
+  libxdmcp,
+  libxext,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxrender,
+  libxtst,
+  libxv,
   libxkbcommon,
   libxkbfile,
   wayland,
@@ -117,17 +117,17 @@ stdenv.mkDerivation (finalAttrs: {
     ffmpeg
     glib
     icu
-    libX11
-    libXcursor
-    libXdamage
-    libXdmcp
-    libXext
-    libXi
-    libXinerama
-    libXrandr
-    libXrender
-    libXtst
-    libXv
+    libx11
+    libxcursor
+    libxdamage
+    libxdmcp
+    libxext
+    libxi
+    libxinerama
+    libxrandr
+    libxrender
+    libxtst
+    libxv
     libjpeg_turbo
     libkrb5
     libopus
diff --git a/pkgs/by-name/fr/freewheeling/package.nix b/pkgs/by-name/fr/freewheeling/package.nix
index 16d6e3104982..03c8aa94be87 100644
--- a/pkgs/by-name/fr/freewheeling/package.nix
+++ b/pkgs/by-name/fr/freewheeling/package.nix
@@ -16,7 +16,7 @@
   libsm,
   libsndfile,
   libogg,
-  libX11,
+  libx11,
   nettle,
 }:
 
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     libsndfile
     libogg
     libsm
-    libX11
+    libx11
     nettle
   ];
 
diff --git a/pkgs/by-name/fr/fricas/package.nix b/pkgs/by-name/fr/fricas/package.nix
index 3f76a5ff11a6..9eeadf410d0a 100644
--- a/pkgs/by-name/fr/fricas/package.nix
+++ b/pkgs/by-name/fr/fricas/package.nix
@@ -3,13 +3,13 @@
   stdenv,
   fetchFromGitHub,
   sbcl,
-  libX11,
-  libXpm,
+  libx11,
+  libxpm,
   libice,
   libsm,
-  libXt,
-  libXau,
-  libXdmcp,
+  libxt,
+  libxau,
+  libxdmcp,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     sbcl
-    libX11
-    libXpm
+    libx11
+    libxpm
     libice
     libsm
-    libXt
-    libXau
-    libXdmcp
+    libxt
+    libxau
+    libxdmcp
   ];
 
   # Remove when updating to next version
diff --git a/pkgs/by-name/fs/fsg/package.nix b/pkgs/by-name/fs/fsg/package.nix
index fd18ccd9f1a1..d99f163a996b 100644
--- a/pkgs/by-name/fs/fsg/package.nix
+++ b/pkgs/by-name/fs/fsg/package.nix
@@ -8,7 +8,7 @@
   libGLU,
   libGL,
   wxGTK32,
-  libX11,
+  libx11,
   xorgproto,
   runtimeShell,
 }:
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     libGLU
     libGL
     wxGTK32
-    libX11
+    libx11
     xorgproto
   ];
 
diff --git a/pkgs/by-name/ft/fte/package.nix b/pkgs/by-name/ft/fte/package.nix
index 83e4c33e04de..a06e3aee5abf 100644
--- a/pkgs/by-name/ft/fte/package.nix
+++ b/pkgs/by-name/ft/fte/package.nix
@@ -4,8 +4,8 @@
   fetchurl,
   unzip,
   perl,
-  libX11,
-  libXpm,
+  libx11,
+  libxpm,
   gpm,
   ncurses,
   slang,
@@ -33,8 +33,8 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ unzip ];
   buildInputs = [
     perl
-    libX11
-    libXpm
+    libx11
+    libxpm
     gpm
     ncurses
     slang
diff --git a/pkgs/by-name/fu/furnace/package.nix b/pkgs/by-name/fu/furnace/package.nix
index 09e633804f6c..0591915c2523 100644
--- a/pkgs/by-name/fu/furnace/package.nix
+++ b/pkgs/by-name/fu/furnace/package.nix
@@ -11,7 +11,7 @@
   fmt,
   freetype,
   libsndfile,
-  libX11,
+  libx11,
   libGL,
   rtmidi,
   SDL2,
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     # To offer scaling detection on X11, furnace checks if libX11.so is available via dlopen and uses some of its functions
     # But it's being linked against a versioned libX11.so.VERSION via SDL, so the unversioned one is not on the rpath
     substituteInPlace src/gui/scaling.cpp \
-      --replace-fail 'libX11.so' '${lib.getLib libX11}/lib/libX11.so'
+      --replace-fail 'libX11.so' '${lib.getLib libx11}/lib/libX11.so'
   '';
 
   nativeBuildInputs = [
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     # portaudio pkg-config is pulling this in as a link dependency, not set in propagatedBuildInputs
     alsa-lib
-    libX11
+    libx11
   ];
 
   cmakeFlags = [
diff --git a/pkgs/by-name/fv/fvwm2/package.nix b/pkgs/by-name/fv/fvwm2/package.nix
index d886799f2ab2..1fab11c2c4bd 100644
--- a/pkgs/by-name/fv/fvwm2/package.nix
+++ b/pkgs/by-name/fv/fvwm2/package.nix
@@ -7,11 +7,11 @@
   fontconfig,
   freetype,
   fribidi,
-  libXcursor,
-  libXft,
-  libXinerama,
-  libXpm,
-  libXt,
+  libxcursor,
+  libxft,
+  libxinerama,
+  libxpm,
+  libxt,
   libpng,
   librsvg,
   libstroke,
@@ -45,11 +45,11 @@ stdenv.mkDerivation (finalAttrs: {
     fontconfig
     freetype
     fribidi
-    libXcursor
-    libXft
-    libXinerama
-    libXpm
-    libXt
+    libxcursor
+    libxft
+    libxinerama
+    libxpm
+    libxt
     libpng
     librsvg
     libxslt
diff --git a/pkgs/by-name/fv/fvwm3/package.nix b/pkgs/by-name/fv/fvwm3/package.nix
index 41b13cffc17a..57e0fb1fd6a3 100644
--- a/pkgs/by-name/fv/fvwm3/package.nix
+++ b/pkgs/by-name/fv/fvwm3/package.nix
@@ -8,14 +8,14 @@
   freetype,
   fribidi,
   libsm,
-  libX11,
-  libXcursor,
-  libXft,
-  libXi,
-  libXinerama,
-  libXpm,
-  libXrandr,
-  libXt,
+  libx11,
+  libxcursor,
+  libxft,
+  libxi,
+  libxinerama,
+  libxpm,
+  libxrandr,
+  libxt,
   libevent,
   libintl,
   libpng,
@@ -53,14 +53,14 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
     fribidi
     libsm
-    libX11
-    libXcursor
-    libXft
-    libXi
-    libXinerama
-    libXpm
-    libXrandr
-    libXt
+    libx11
+    libxcursor
+    libxft
+    libxi
+    libxinerama
+    libxpm
+    libxrandr
+    libxt
     libevent
     libintl
     libpng
@@ -114,6 +114,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/fvwmorg/fvwm3/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.gpl2Plus;
     maintainers = [ ];
-    inherit (libX11.meta) platforms;
+    inherit (libx11.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/fy/fyne/package.nix b/pkgs/by-name/fy/fyne/package.nix
index b014cc4fb22b..6599037f632f 100644
--- a/pkgs/by-name/fy/fyne/package.nix
+++ b/pkgs/by-name/fy/fyne/package.nix
@@ -4,12 +4,12 @@
   fetchFromGitHub,
 
   libGL,
-  libX11,
-  libXcursor,
-  libXinerama,
-  libXi,
-  libXrandr,
-  libXxf86vm,
+  libx11,
+  libxcursor,
+  libxinerama,
+  libxi,
+  libxrandr,
+  libxxf86vm,
   pkg-config,
 }:
 
@@ -32,12 +32,12 @@ buildGoModule rec {
 
   buildInputs = [
     libGL
-    libX11
-    libXcursor
-    libXinerama
-    libXi
-    libXrandr
-    libXxf86vm
+    libx11
+    libxcursor
+    libxinerama
+    libxi
+    libxrandr
+    libxxf86vm
   ];
 
   doCheck = false;
diff --git a/pkgs/by-name/ga/gamehub/package.nix b/pkgs/by-name/ga/gamehub/package.nix
index 0cdae05284f4..c5f3ede58a80 100644
--- a/pkgs/by-name/ga/gamehub/package.nix
+++ b/pkgs/by-name/ga/gamehub/package.nix
@@ -16,7 +16,7 @@
   sqlite,
   # webkitgtk_4_0,
   libmanette,
-  libXtst,
+  libxtst,
   wrapGAppsHook3,
 }:
 
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     libgee
     libmanette
     libsoup_2_4
-    libXtst
+    libxtst
     sqlite
     # webkitgtk_4_0
   ];
diff --git a/pkgs/by-name/ga/gate12/package.nix b/pkgs/by-name/ga/gate12/package.nix
index 8b58b9ce722f..cf2eb205347e 100644
--- a/pkgs/by-name/ga/gate12/package.nix
+++ b/pkgs/by-name/ga/gate12/package.nix
@@ -7,14 +7,14 @@
   alsa-lib,
   fontconfig,
   freetype,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXdmcp,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXtst,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxdmcp,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxtst,
   writableTmpDirAsHomeHook,
 
   buildVST3 ? true,
@@ -45,14 +45,14 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.isLinux [
     alsa-lib
-    libX11
-    libXcomposite
-    libXcursor
-    libXdmcp
-    libXext
-    libXinerama
-    libXrandr
-    libXtst
+    libx11
+    libxcomposite
+    libxcursor
+    libxdmcp
+    libxext
+    libxinerama
+    libxrandr
+    libxtst
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/gc/gcs/package.nix b/pkgs/by-name/gc/gcs/package.nix
index 2a6fda48b895..6fba672a3fe6 100644
--- a/pkgs/by-name/gc/gcs/package.nix
+++ b/pkgs/by-name/gc/gcs/package.nix
@@ -6,12 +6,12 @@
   nix-update-script,
   pkg-config,
   libGL,
-  libX11,
-  libXcursor,
-  libXrandr,
-  libXinerama,
-  libXi,
-  libXxf86vm,
+  libx11,
+  libxcursor,
+  libxrandr,
+  libxinerama,
+  libxi,
+  libxxf86vm,
   mupdf,
   fontconfig,
   freetype,
@@ -42,12 +42,12 @@ buildGoModule rec {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     libGL
-    libX11
-    libXcursor
-    libXrandr
-    libXinerama
-    libXi
-    libXxf86vm
+    libx11
+    libxcursor
+    libxrandr
+    libxinerama
+    libxi
+    libxxf86vm
     fontconfig
     freetype
   ];
diff --git a/pkgs/by-name/gd/gd/package.nix b/pkgs/by-name/gd/gd/package.nix
index bb1a9c80bffe..550016b21900 100644
--- a/pkgs/by-name/gd/gd/package.nix
+++ b/pkgs/by-name/gd/gd/package.nix
@@ -12,7 +12,7 @@
   libwebp,
   libtiff,
   withXorg ? true,
-  libXpm,
+  libxpm,
   libavif,
   fontconfig,
   freetype,
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals withXorg [
     fontconfig
-    libXpm
+    libxpm
   ];
 
   outputs = [
diff --git a/pkgs/by-name/gd/gdk-pixbuf-xlib/package.nix b/pkgs/by-name/gd/gdk-pixbuf-xlib/package.nix
index 01ef50d256b9..0dcef5de2295 100644
--- a/pkgs/by-name/gd/gdk-pixbuf-xlib/package.nix
+++ b/pkgs/by-name/gd/gdk-pixbuf-xlib/package.nix
@@ -9,7 +9,7 @@
   docbook_xml_dtd_43,
   gtk-doc,
   gdk-pixbuf,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   propagatedBuildInputs = [
     gdk-pixbuf
-    libX11
+    libx11
   ];
 
   mesonFlags = [
diff --git a/pkgs/by-name/gd/gdm/package.nix b/pkgs/by-name/gd/gdm/package.nix
index ce03f3130dca..72a3fe6d97e4 100644
--- a/pkgs/by-name/gd/gdm/package.nix
+++ b/pkgs/by-name/gd/gdm/package.nix
@@ -11,8 +11,8 @@
   json-glib,
   itstool,
   accountsservice,
-  libX11,
-  libXdmcp,
+  libx11,
+  libxdmcp,
   libxcb,
   gnome,
   systemd,
@@ -85,8 +85,8 @@ stdenv.mkDerivation (finalAttrs: {
     json-glib
     gtk3
     keyutils
-    libX11
-    libXdmcp
+    libx11
+    libxdmcp
     libxcb
     libgudev
     libselinux
diff --git a/pkgs/by-name/ge/geant4/package.nix b/pkgs/by-name/ge/geant4/package.nix
index ef6f60a71c88..f62e4c0c4db6 100644
--- a/pkgs/by-name/ge/geant4/package.nix
+++ b/pkgs/by-name/ge/geant4/package.nix
@@ -11,10 +11,10 @@
   libGL,
   libGLU,
   libGLX,
-  libX11,
-  libXext,
-  libXmu,
-  libXpm,
+  libx11,
+  libxext,
+  libxmu,
+  libxpm,
   motif,
   python3,
   qt5,
@@ -87,11 +87,11 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs =
     lib.optionals enableOpenGLX11 [
       libGLU
-      libXext
-      libXmu
+      libxext
+      libxmu
     ]
     ++ lib.optionals enableInventor [
-      libXpm
+      libxpm
       coin3d
       soxt
       motif
@@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals enableOpenGLX11 [
     libGL
-    libX11
+    libx11
   ]
   ++ lib.optionals enableXM [ motif ]
   ++ lib.optionals enableQt [ qt5.qtbase ];
diff --git a/pkgs/by-name/ge/gem/package.nix b/pkgs/by-name/ge/gem/package.nix
index db8427984d0d..b45aec1b6187 100644
--- a/pkgs/by-name/ge/gem/package.nix
+++ b/pkgs/by-name/ge/gem/package.nix
@@ -10,7 +10,7 @@
   glew,
   libglut,
   libv4l,
-  libX11,
+  libx11,
   file,
 }:
 
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
     glew
     libglut
     libv4l
-    libX11
+    libx11
   ];
 
   meta = {
diff --git a/pkgs/by-name/ge/gemrb/package.nix b/pkgs/by-name/ge/gemrb/package.nix
index 9bfd3180426d..47a387596137 100644
--- a/pkgs/by-name/ge/gemrb/package.nix
+++ b/pkgs/by-name/ge/gemrb/package.nix
@@ -15,7 +15,7 @@
   libpng,
   libvlc,
   libvorbis,
-  libX11,
+  libx11,
   openal,
   python3,
   zlib,
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
     libvlc
     libvorbis
-    libX11
+    libx11
     openal
     python3
     zlib
diff --git a/pkgs/by-name/ge/genymotion/package.nix b/pkgs/by-name/ge/genymotion/package.nix
index 1cfe08fb9dd7..97b751b4e336 100644
--- a/pkgs/by-name/ge/genymotion/package.nix
+++ b/pkgs/by-name/ge/genymotion/package.nix
@@ -10,7 +10,7 @@
   libx11,
   libxkbcommon,
   xdg-utils,
-  libXrender,
+  libxrender,
   fontconfig,
   freetype,
   systemd,
@@ -20,9 +20,9 @@
   gtk3,
   pixman,
   # For glewinfo
-  libXmu,
-  libXi,
-  libXext,
+  libxmu,
+  libxi,
+  libxext,
 }:
 
 let
@@ -32,11 +32,11 @@ let
     glib
     libx11
     libxkbcommon
-    libXmu
-    libXi
-    libXext
+    libxmu
+    libxi
+    libxext
     libGL
-    libXrender
+    libxrender
     fontconfig
     freetype
     systemd
diff --git a/pkgs/by-name/ge/geogebra/package.nix b/pkgs/by-name/ge/geogebra/package.nix
index 2c4b3610c3f5..30e47e5149f9 100644
--- a/pkgs/by-name/ge/geogebra/package.nix
+++ b/pkgs/by-name/ge/geogebra/package.nix
@@ -86,7 +86,7 @@ let
     installPhase = ''
       install -D geogebra/* -t "$out/libexec/geogebra/"
 
-      # The bundled jogl (required for 3D graphics) links to libXxf86vm, and loads libGL at runtime
+      # The bundled jogl (required for 3D graphics) links to libxxf86vm, and loads libGL at runtime
       # OpenGL versions newer than 3.0 cause "javax.media.opengl.GLException: Not a GL2 implementation"
       makeWrapper "$out/libexec/geogebra/geogebra" "$out/bin/geogebra" \
         --prefix LD_LIBRARY_PATH : "${
diff --git a/pkgs/by-name/ge/geonkick/package.nix b/pkgs/by-name/ge/geonkick/package.nix
index 2083993f076d..5b3460b94508 100644
--- a/pkgs/by-name/ge/geonkick/package.nix
+++ b/pkgs/by-name/ge/geonkick/package.nix
@@ -8,7 +8,7 @@
   rapidjson,
   libjack2,
   lv2,
-  libX11,
+  libx11,
   cairo,
   openssl,
 }:
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     rapidjson
     libjack2
     lv2
-    libX11
+    libx11
     cairo
     openssl
   ];
diff --git a/pkgs/by-name/gf/gf/package.nix b/pkgs/by-name/gf/gf/package.nix
index 620bc0e4d4ca..a1c769d05769 100644
--- a/pkgs/by-name/gf/gf/package.nix
+++ b/pkgs/by-name/gf/gf/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   makeWrapper,
   fetchFromGitHub,
-  libX11,
+  libx11,
   pkg-config,
   gdb,
   freetype,
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
     pkg-config
   ];
   buildInputs = [
-    libX11
+    libx11
     gdb
   ]
   ++ lib.optional freetypeSupport freetype;
diff --git a/pkgs/by-name/gf/gfxreconstruct/package.nix b/pkgs/by-name/gf/gfxreconstruct/package.nix
index 67a11ffef607..dd0372e8cc34 100644
--- a/pkgs/by-name/gf/gfxreconstruct/package.nix
+++ b/pkgs/by-name/gf/gfxreconstruct/package.nix
@@ -7,7 +7,7 @@
   pkg-config,
   python3,
   wayland,
-  libX11,
+  libx11,
   libxcb,
   lz4,
   vulkan-loader,
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
+    libx11
     libxcb
     lz4
     python3
diff --git a/pkgs/by-name/gh/ghostty/package.nix b/pkgs/by-name/gh/ghostty/package.nix
index 41833530c66e..b3b2c749d78f 100644
--- a/pkgs/by-name/gh/ghostty/package.nix
+++ b/pkgs/by-name/gh/ghostty/package.nix
@@ -13,7 +13,7 @@
   gtk4-layer-shell,
   harfbuzz,
   libGL,
-  libX11,
+  libx11,
   libadwaita,
   ncurses,
   nixosTests,
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     # GTK frontend
     libadwaita
-    libX11
+    libx11
     gtk4-layer-shell
 
     # OpenGL renderer
diff --git a/pkgs/by-name/gh/ghq/package.nix b/pkgs/by-name/gh/ghq/package.nix
index 92079c5c0fed..cc11c8228832 100644
--- a/pkgs/by-name/gh/ghq/package.nix
+++ b/pkgs/by-name/gh/ghq/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "ghq";
-  version = "1.8.0";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "x-motemen";
     repo = "ghq";
     tag = "v${version}";
-    sha256 = "sha256-5BN96/RShfJpkfpJe0qrZVDuyFoAV9kgCiBv4REY/5Y=";
+    sha256 = "sha256-Iw8hu2QtnRgRbSTqtIPDmKbx5FcE2j68VfzP4egbZgY=";
   };
 
-  vendorHash = "sha256-jP2Ne/EhmE3tACY1+lHucgBt3VnT4gaQisE3/gVM5Ec=";
+  vendorHash = "sha256-RRxRwYTkveOZvvxAwpG9ie4+ZdUDDkZZfX5cNn0DAhA=";
 
   doCheck = false;
 
diff --git a/pkgs/by-name/gi/giada/package.nix b/pkgs/by-name/gi/giada/package.nix
index e680366bd2fc..8f9e3f2db030 100644
--- a/pkgs/by-name/gi/giada/package.nix
+++ b/pkgs/by-name/gi/giada/package.nix
@@ -14,8 +14,8 @@
   jack2,
   alsa-lib,
   libpulseaudio,
-  libXpm,
-  libXrandr,
+  libxpm,
+  libxrandr,
   flac,
   libogg,
   libvorbis,
@@ -64,8 +64,8 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     jack2
     libGL
-    libXpm
-    libXrandr
+    libxpm
+    libxrandr
     libogg
     libopus
     libpulseaudio
diff --git a/pkgs/by-name/gi/gifsicle/package.nix b/pkgs/by-name/gi/gifsicle/package.nix
index 17149ea57fd5..3ec03e9d824d 100644
--- a/pkgs/by-name/gi/gifsicle/package.nix
+++ b/pkgs/by-name/gi/gifsicle/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchurl,
   xorgproto,
-  libXt,
-  libX11,
+  libxt,
+  libx11,
   gifview ? false,
   static ? stdenv.hostPlatform.isStatic,
 }:
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = lib.optionals gifview [
     xorgproto
-    libXt
-    libX11
+    libxt
+    libx11
   ];
 
   configureFlags = lib.optional (!gifview) "--disable-gifview";
diff --git a/pkgs/by-name/gi/git/package.nix b/pkgs/by-name/gi/git/package.nix
index a1bc5aca526c..7740b9ef2d1f 100644
--- a/pkgs/by-name/gi/git/package.nix
+++ b/pkgs/by-name/gi/git/package.nix
@@ -600,5 +600,6 @@ stdenv.mkDerivation (finalAttrs: {
       zivarah
     ];
     mainProgram = "git";
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "git-scm" finalAttrs.version;
   };
 })
diff --git a/pkgs/by-name/gi/gitaly/git-data.json b/pkgs/by-name/gi/gitaly/git-data.json
new file mode 100644
index 000000000000..23a6985947eb
--- /dev/null
+++ b/pkgs/by-name/gi/gitaly/git-data.json
@@ -0,0 +1,5 @@
+{
+  "version": "2.52-a37bb2ae",
+  "rev": "a37bb2ae6c6659cf7cefd0412759fca5202a823d",
+  "hash": "sha256-7yUjXiaFwPG9o4n+IieYNTJKtzyawQFHooNrikpbiEM="
+}
diff --git a/pkgs/by-name/gi/gitaly/git.nix b/pkgs/by-name/gi/gitaly/git.nix
index d1413f72f94e..ce1a0a51858d 100644
--- a/pkgs/by-name/gi/gitaly/git.nix
+++ b/pkgs/by-name/gi/gitaly/git.nix
@@ -10,24 +10,19 @@
   pkg-config,
   openssl,
 }:
-
+let
+  data = lib.importJSON ./git-data.json;
+in
 stdenv.mkDerivation rec {
+  inherit (data) version;
   pname = "gitaly-git";
-  version = "2.50.1.gl1";
 
   # `src` attribute for nix-update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "git";
-    rev = "v${version}";
-    hash = "sha256-q+xQAVsatw0vS4iIgAxciAVVMr33BjG0yM4AvZrXB+8=";
+    inherit (data) rev hash;
     leaveDotGit = true;
-    # The build system clones the repo from the store (since it always expects
-    # to be able to clone in the makefiles) and it looks like nix doesn't leave
-    # the tag so we re-add it.
-    postFetch = ''
-      git -C $out tag v${version};
-    '';
   };
 
   # Use gitaly and their build system as source root
@@ -39,7 +34,7 @@ stdenv.mkDerivation rec {
 
   sourceRoot = src.name;
 
-  buildFlags = [ "git" ];
+  buildFlags = [ "install-git" ];
   GIT_REPO_URL = src;
   HOME = "/build";
 
diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix
index 53a247b130fc..58a6748bdc40 100644
--- a/pkgs/by-name/gi/gitaly/package.nix
+++ b/pkgs/by-name/gi/gitaly/package.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "18.6.4";
+  version = "18.8.3";
   package_version = "v${lib.versions.major version}";
   gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
 
@@ -21,10 +21,10 @@ let
       owner = "gitlab-org";
       repo = "gitaly";
       rev = "v${version}";
-      hash = "sha256-SH1NXP5OcJF2MCCSCEjCT2GXjHxy1i9QtPZZCJ92rY8=";
+      hash = "sha256-ALUOgSPl+tNh/hmnYq2Mfw7R0ECQ/ohUZZNnBeItQds=";
     };
 
-    vendorHash = "sha256-+5CTncYwtGlScFvVc3QaEScfuqMqvsjnGhggM1HMhNU=";
+    vendorHash = "sha256-CSjsxwumKUbp/tSewE8iAp4c3DH6V6fNY4OCgzjvHP0=";
 
     ldflags = [
       "-X ${gitaly_package}/internal/version.version=${version}"
diff --git a/pkgs/by-name/gi/gitea-mcp-server/package.nix b/pkgs/by-name/gi/gitea-mcp-server/package.nix
index c6303db442ee..ba5a46826e9e 100644
--- a/pkgs/by-name/gi/gitea-mcp-server/package.nix
+++ b/pkgs/by-name/gi/gitea-mcp-server/package.nix
@@ -5,14 +5,14 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "gitea-mcp-server";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitea {
     domain = "gitea.com";
     owner = "gitea";
     repo = "gitea-mcp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Qh+UD4V511y1PvM6TQ3dwDXx01FAR80b9wnhxXC/7X4=";
+    hash = "sha256-hnwzDyH+H86xzlaMwpVAltKiPJnkM38qNnM6mM5r/Yc=";
   };
 
   vendorHash = "sha256-N1Ct479Q5RH4TCxcSbIBoGDP/atBlWkxwBLJLk82juM=";
diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix
index 9091a57b7c83..4f39281009ae 100644
--- a/pkgs/by-name/gi/gitkraken/package.nix
+++ b/pkgs/by-name/gi/gitkraken/package.nix
@@ -26,17 +26,17 @@
   gtk3,
   krb5,
   libGL,
-  libX11,
-  libXScrnSaver,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXtst,
+  libx11,
+  libxscrnsaver,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxtst,
   libdrm,
   libgbm,
   libgnome-keyring,
@@ -110,15 +110,15 @@ let
       stdenv.cc.cc
       curlWithGnuTls
       udev
-      libX11
-      libXext
-      libXcursor
-      libXi
+      libx11
+      libxext
+      libxcursor
+      libxi
       libxcb
       glib
-      libXScrnSaver
+      libxscrnsaver
       libxkbfile
-      libXtst
+      libxtst
       nss
       nspr
       cups
@@ -126,16 +126,16 @@ let
       expat
       gdk-pixbuf
       dbus
-      libXdamage
-      libXrandr
+      libxdamage
+      libxrandr
       atk
       pango
       cairo
       freetype
       fontconfig
-      libXcomposite
-      libXfixes
-      libXrender
+      libxcomposite
+      libxfixes
+      libxrender
       gtk3
       libgnome-keyring
       openssl
diff --git a/pkgs/by-name/gi/gitlab-container-registry/package.nix b/pkgs/by-name/gi/gitlab-container-registry/package.nix
index a155a7502c4d..e6b81ca551b5 100644
--- a/pkgs/by-name/gi/gitlab-container-registry/package.nix
+++ b/pkgs/by-name/gi/gitlab-container-registry/package.nix
@@ -6,7 +6,7 @@
 
 buildGo124Module rec {
   pname = "gitlab-container-registry";
-  version = "4.34.0";
+  version = "4.36.0";
   rev = "v${version}-gitlab";
 
   # nixpkgs-update: no auto update
@@ -14,10 +14,10 @@ buildGo124Module rec {
     owner = "gitlab-org";
     repo = "container-registry";
     inherit rev;
-    hash = "sha256-KGw9kVsAePhEQ+kINgcMhGw7pSioOnqNWFnjQKu/XmY=";
+    hash = "sha256-Zp6zwSdgtDDKUDoF7EBLkcKZG5e68wI6x3QG8pwaDfM=";
   };
 
-  vendorHash = "sha256-g4h1m7b7dkdTcSfwTZH4Z5P9RBKme441Ucg4aPIqLSY=";
+  vendorHash = "sha256-DWuMsTOw/yjEfh7e8FLT4qhNU3TLOFlI6dcNx+OQuEs=";
 
   checkFlags =
     let
diff --git a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/code-parser.nix b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/code-parser.nix
index 22fbf4b0d894..f53d970e8896 100644
--- a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/code-parser.nix
+++ b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/code-parser.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gitlab-code-parser";
-  version = "0.20.2";
+  version = "0.21.1";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "rust/gitlab-code-parser";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JjWWlbSjbV9StDNI+aNExLcSNvLsuOPnqhyymEs8+Cg=";
+    hash = "sha256-aA1zwauomznayHVGRdoQYaaba8Mq39LzjSwrvVivN2E=";
   };
 
-  cargoHash = "sha256-pcWsVoC6076gdWTy3GgMXQIlKiGJZe2q7LSA9fVYxE8=";
+  cargoHash = "sha256-oiYV+o30NrLkewfEU0z8OzkaHFWExa2gbExewHBDxSo=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
index b8027fbdd3ee..bdce319bc005 100644
--- a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
+++ b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
@@ -11,17 +11,17 @@ let
 in
 buildGoModule rec {
   pname = "gitlab-elasticsearch-indexer";
-  version = "5.10.1";
+  version = "5.12.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-elasticsearch-indexer";
     rev = "v${version}";
-    hash = "sha256-UB3rR6Fk/5M8rpixyg7R0Zd5JZYpG4gEEDHXOQ4b3vI=";
+    hash = "sha256-dfDZIVDtCtph4zMS+3qT7dMlbUXZCIfr8rIBemHFMQ0=";
   };
 
-  vendorHash = "sha256-EM41vNyE4nkv5IcGyRXqn+d7EHGMju2e76KWfHuOTmY=";
+  vendorHash = "sha256-LwBc/eQ2AQan8SsH+kugAeUv4O31WOx3Qnd1tB580wY=";
 
   buildInputs = [ icu ];
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix
index 04734f79015f..dcf07aa22177 100644
--- a/pkgs/by-name/gi/gitlab-pages/package.nix
+++ b/pkgs/by-name/gi/gitlab-pages/package.nix
@@ -6,17 +6,17 @@
 
 buildGoModule rec {
   pname = "gitlab-pages";
-  version = "18.6.4";
+  version = "18.8.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-pages";
     rev = "v${version}";
-    hash = "sha256-FMXfF/NpwivtfZh+r7gcVXKFCeshxHBKRNFnbCxSz1U=";
+    hash = "sha256-OmIhZwNmuOGYpBe32EYXVw4nX7XArkxdj3uoP9qurN4=";
   };
 
-  vendorHash = "sha256-AL6V2LPzCGo/7IuY8msip35OScfocp3zO2ZzM8cZfnU=";
+  vendorHash = "sha256-AZIv/CU01OAbn5faE4EkSuDCakYzDjRprB5ox5tIlck=";
   subPackages = [ "." ];
 
   ldflags = [
diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix
index c46291eeab87..185e8eca8dc1 100644
--- a/pkgs/by-name/gi/gitlab-runner/package.nix
+++ b/pkgs/by-name/gi/gitlab-runner/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gitlab-runner";
-  version = "18.5.0";
+  version = "18.8.0";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xuRYnK5Ev2M/vrVWMHcTcK7LLwlQ30MVadMjA67fHpY=";
+    hash = "sha256-rS7+BUdec+Z4G/dd5D/NHe3gbELWicg0Nmgx4zJAIX4=";
   };
 
-  vendorHash = "sha256-5Gh9jQ4GkvtN8inEUphehbsnmfyQldvxjbxBkXQ63wc=";
+  vendorHash = "sha256-Br9TW+sg7PDOE2d8lVQ9Xv9+UD7JHzitdTOcyodHr+s=";
 
   # For patchShebangs
   buildInputs = [ bash ];
diff --git a/pkgs/by-name/gi/gitlab-shell/package.nix b/pkgs/by-name/gi/gitlab-shell/package.nix
index 1f66858b7722..479adbf67c0b 100644
--- a/pkgs/by-name/gi/gitlab-shell/package.nix
+++ b/pkgs/by-name/gi/gitlab-shell/package.nix
@@ -8,14 +8,14 @@
 
 buildGoModule rec {
   pname = "gitlab-shell";
-  version = "14.45.3";
+  version = "14.45.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-shell";
     rev = "v${version}";
-    hash = "sha256-S8LtWQgzyDKr4Jnk7Qn/pfLzZYYnVfZNVqNBFyqr5cM=";
+    hash = "sha256-D3keb81A7gyZbmJmCZJpyYFC1+JijwwbMngurAPTSKs=";
   };
 
   buildInputs = [
@@ -27,7 +27,7 @@ buildGoModule rec {
     ./remove-hardcoded-locations.patch
   ];
 
-  vendorHash = "sha256-Q3U0uuO+w+0GpDc7zEoiwUYsCIpXG+LOP822KNWR9Ww=";
+  vendorHash = "sha256-e8AXSryVZeVG+0cG7M3QAVCLSTdJEXLH8ZkLvCtWatU=";
 
   subPackages = [
     "cmd/gitlab-shell"
diff --git a/pkgs/by-name/gi/gitlab/data.json b/pkgs/by-name/gi/gitlab/data.json
index 71ef0bc847c8..a279d1c03545 100644
--- a/pkgs/by-name/gi/gitlab/data.json
+++ b/pkgs/by-name/gi/gitlab/data.json
@@ -1,17 +1,17 @@
 {
-  "version": "18.6.4",
-  "repo_hash": "0jj2wfh37p92dj6fnwv098qaaph9sblqc09mjrz6f5142ijlmxj9",
-  "yarn_hash": "19fhh3457mvls3g4swyzr2dh9q46z2zinjyw5v6sjjhfmrqs921d",
-  "frontend_islands_yarn_hash": "0m64xhlybjlax33k5rmj9kxcj1vzqqygybyz1yzzx9pd87570k2h",
+  "version": "18.8.3",
+  "repo_hash": "sha256-c9e6HhJ1ERXSMHYW+MHTVzxpqtUIfVHrlIUlCJ+zX0A=",
+  "yarn_hash": "sha256-s4+NpzynaR5ab1DlXRMmtOeFZCwpexMoWjwX00hnx5o=",
+  "frontend_islands_yarn_hash": "sha256-DiGj3eJMLnlWBTePwGmEvmY9d1Li3p/Y6h3GtZnsvhg=",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v18.6.4-ee",
+  "rev": "v18.8.3-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "18.6.4",
-    "GITLAB_KAS_VERSION": "18.6.4",
-    "GITLAB_PAGES_VERSION": "18.6.4",
-    "GITLAB_SHELL_VERSION": "14.45.3",
-    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.10.1",
-    "GITLAB_WORKHORSE_VERSION": "18.6.4"
+    "GITALY_SERVER_VERSION": "18.8.3",
+    "GITLAB_KAS_VERSION": "18.8.3",
+    "GITLAB_PAGES_VERSION": "18.8.3",
+    "GITLAB_SHELL_VERSION": "14.45.5",
+    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.12.2",
+    "GITLAB_WORKHORSE_VERSION": "18.8.3"
   }
 }
diff --git a/pkgs/by-name/gi/gitlab/ee-frontend-islands-yarn.lock b/pkgs/by-name/gi/gitlab/ee-frontend-islands-yarn.lock
new file mode 100644
index 000000000000..fa17788b5af2
--- /dev/null
+++ b/pkgs/by-name/gi/gitlab/ee-frontend-islands-yarn.lock
@@ -0,0 +1,5427 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@alloc/quick-lru@^5.2.0":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz#7bf68b20c0a350f936915fcae06f58e32007ce30"
+  integrity sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==
+
+"@ampproject/remapping@^2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4"
+  integrity sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.24"
+
+"@asamuzakjp/css-color@^3.2.0":
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@asamuzakjp/css-color/-/css-color-3.2.0.tgz#cc42f5b85c593f79f1fa4f25d2b9b321e61d1794"
+  integrity sha512-K1A6z8tS3XsmCMM86xoWdn7Fkdn9m6RSVtocUrJYIwZnFVkng/PvkEoWtOWmP+Scc6saYWHWZYbndEEXxl24jw==
+  dependencies:
+    "@csstools/css-calc" "^2.1.3"
+    "@csstools/css-color-parser" "^3.0.9"
+    "@csstools/css-parser-algorithms" "^3.0.4"
+    "@csstools/css-tokenizer" "^3.0.3"
+    lru-cache "^10.4.3"
+
+"@babel/code-frame@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.27.1.tgz#200f715e66d52a23b221a9435534a91cc13ad5be"
+  integrity sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.27.1"
+    js-tokens "^4.0.0"
+    picocolors "^1.1.1"
+
+"@babel/compat-data@^7.27.2":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.28.5.tgz#a8a4962e1567121ac0b3b487f52107443b455c7f"
+  integrity sha512-6uFXyCayocRbqhZOB+6XcuZbkMNimwfVGFji8CTZnCzOHVGvDqzvitu1re2AU5LROliz7eQPhB8CpAMvnx9EjA==
+
+"@babel/core@^7.24.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.28.5.tgz#4c81b35e51e1b734f510c99b07dfbc7bbbb48f7e"
+  integrity sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==
+  dependencies:
+    "@babel/code-frame" "^7.27.1"
+    "@babel/generator" "^7.28.5"
+    "@babel/helper-compilation-targets" "^7.27.2"
+    "@babel/helper-module-transforms" "^7.28.3"
+    "@babel/helpers" "^7.28.4"
+    "@babel/parser" "^7.28.5"
+    "@babel/template" "^7.27.2"
+    "@babel/traverse" "^7.28.5"
+    "@babel/types" "^7.28.5"
+    "@jridgewell/remapping" "^2.3.5"
+    convert-source-map "^2.0.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.3"
+    semver "^6.3.1"
+
+"@babel/generator@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.28.5.tgz#712722d5e50f44d07bc7ac9fe84438742dd61298"
+  integrity sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==
+  dependencies:
+    "@babel/parser" "^7.28.5"
+    "@babel/types" "^7.28.5"
+    "@jridgewell/gen-mapping" "^0.3.12"
+    "@jridgewell/trace-mapping" "^0.3.28"
+    jsesc "^3.0.2"
+
+"@babel/helper-annotate-as-pure@^7.27.3":
+  version "7.27.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz#f31fd86b915fc4daf1f3ac6976c59be7084ed9c5"
+  integrity sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==
+  dependencies:
+    "@babel/types" "^7.27.3"
+
+"@babel/helper-compilation-targets@^7.27.2":
+  version "7.27.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz#46a0f6efab808d51d29ce96858dd10ce8732733d"
+  integrity sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==
+  dependencies:
+    "@babel/compat-data" "^7.27.2"
+    "@babel/helper-validator-option" "^7.27.1"
+    browserslist "^4.24.0"
+    lru-cache "^5.1.1"
+    semver "^6.3.1"
+
+"@babel/helper-create-class-features-plugin@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.28.5.tgz#472d0c28028850968979ad89f173594a6995da46"
+  integrity sha512-q3WC4JfdODypvxArsJQROfupPBq9+lMwjKq7C33GhbFYJsufD0yd/ziwD+hJucLeWsnFPWZjsU2DNFqBPE7jwQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.27.3"
+    "@babel/helper-member-expression-to-functions" "^7.28.5"
+    "@babel/helper-optimise-call-expression" "^7.27.1"
+    "@babel/helper-replace-supers" "^7.27.1"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.27.1"
+    "@babel/traverse" "^7.28.5"
+    semver "^6.3.1"
+
+"@babel/helper-globals@^7.28.0":
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-globals/-/helper-globals-7.28.0.tgz#b9430df2aa4e17bc28665eadeae8aa1d985e6674"
+  integrity sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==
+
+"@babel/helper-member-expression-to-functions@^7.27.1", "@babel/helper-member-expression-to-functions@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.28.5.tgz#f3e07a10be37ed7a63461c63e6929575945a6150"
+  integrity sha512-cwM7SBRZcPCLgl8a7cY0soT1SptSzAlMH39vwiRpOQkJlh53r5hdHwLSCZpQdVLT39sZt+CRpNwYG4Y2v77atg==
+  dependencies:
+    "@babel/traverse" "^7.28.5"
+    "@babel/types" "^7.28.5"
+
+"@babel/helper-module-imports@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz#7ef769a323e2655e126673bb6d2d6913bbead204"
+  integrity sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==
+  dependencies:
+    "@babel/traverse" "^7.27.1"
+    "@babel/types" "^7.27.1"
+
+"@babel/helper-module-transforms@^7.27.1", "@babel/helper-module-transforms@^7.28.3":
+  version "7.28.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz#a2b37d3da3b2344fe085dab234426f2b9a2fa5f6"
+  integrity sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==
+  dependencies:
+    "@babel/helper-module-imports" "^7.27.1"
+    "@babel/helper-validator-identifier" "^7.27.1"
+    "@babel/traverse" "^7.28.3"
+
+"@babel/helper-optimise-call-expression@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.27.1.tgz#c65221b61a643f3e62705e5dd2b5f115e35f9200"
+  integrity sha512-URMGH08NzYFhubNSGJrpUEphGKQwMQYBySzat5cAByY1/YgIRkULnIy3tAMeszlL/so2HbeilYloUmSpd7GdVw==
+  dependencies:
+    "@babel/types" "^7.27.1"
+
+"@babel/helper-plugin-utils@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz#ddb2f876534ff8013e6c2b299bf4d39b3c51d44c"
+  integrity sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==
+
+"@babel/helper-replace-supers@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.27.1.tgz#b1ed2d634ce3bdb730e4b52de30f8cccfd692bc0"
+  integrity sha512-7EHz6qDZc8RYS5ElPoShMheWvEgERonFCs7IAonWLLUTXW59DP14bCZt89/GKyreYn8g3S83m21FelHKbeDCKA==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.27.1"
+    "@babel/helper-optimise-call-expression" "^7.27.1"
+    "@babel/traverse" "^7.27.1"
+
+"@babel/helper-skip-transparent-expression-wrappers@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.27.1.tgz#62bb91b3abba8c7f1fec0252d9dbea11b3ee7a56"
+  integrity sha512-Tub4ZKEXqbPjXgWLl2+3JpQAYBJ8+ikpQ2Ocj/q/r0LwE3UhENh7EUabyHjz2kCEsrRY83ew2DQdHluuiDQFzg==
+  dependencies:
+    "@babel/traverse" "^7.27.1"
+    "@babel/types" "^7.27.1"
+
+"@babel/helper-string-parser@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz#54da796097ab19ce67ed9f88b47bb2ec49367687"
+  integrity sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==
+
+"@babel/helper-validator-identifier@^7.27.1", "@babel/helper-validator-identifier@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz#010b6938fab7cb7df74aa2bbc06aa503b8fe5fb4"
+  integrity sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==
+
+"@babel/helper-validator-option@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz#fa52f5b1e7db1ab049445b421c4471303897702f"
+  integrity sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==
+
+"@babel/helpers@^7.28.4":
+  version "7.28.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.28.4.tgz#fe07274742e95bdf7cf1443593eeb8926ab63827"
+  integrity sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==
+  dependencies:
+    "@babel/template" "^7.27.2"
+    "@babel/types" "^7.28.4"
+
+"@babel/parser@8.0.0-alpha.12":
+  version "8.0.0-alpha.12"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-8.0.0-alpha.12.tgz#a72b15da8cf201e5e9984ab6ae1a5b63f32af6bc"
+  integrity sha512-AzWmrp4uJ+DcXVH0uoUpJVhRqxNirC0BbXsZ82AQuVod41CoaV5G+cwcvtYusrIIxv7BIJb6ce0dQ9L0wAl1iA==
+
+"@babel/parser@^7.25.4":
+  version "7.29.0"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.29.0.tgz#669ef345add7d057e92b7ed15f0bac07611831b6"
+  integrity sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==
+  dependencies:
+    "@babel/types" "^7.29.0"
+
+"@babel/parser@^7.27.2", "@babel/parser@^7.28.4", "@babel/parser@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.28.5.tgz#0b0225ee90362f030efd644e8034c99468893b08"
+  integrity sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==
+  dependencies:
+    "@babel/types" "^7.28.5"
+
+"@babel/plugin-syntax-jsx@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz#2f9beb5eff30fa507c5532d107daac7b888fa34c"
+  integrity sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.27.1"
+
+"@babel/plugin-syntax-typescript@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz#5147d29066a793450f220c63fa3a9431b7e6dd18"
+  integrity sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.27.1"
+
+"@babel/plugin-transform-modules-commonjs@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.27.1.tgz#8e44ed37c2787ecc23bdc367f49977476614e832"
+  integrity sha512-OJguuwlTYlN0gBZFRPqwOGNWssZjfIUdS7HMYtN8c1KmwpwHFBwTeFZrg9XZa+DFTitWOW5iTAG7tyCUPsCCyw==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.27.1"
+    "@babel/helper-plugin-utils" "^7.27.1"
+
+"@babel/plugin-transform-typescript@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.28.5.tgz#441c5f9a4a1315039516c6c612fc66d5f4594e72"
+  integrity sha512-x2Qa+v/CuEoX7Dr31iAfr0IhInrVOWZU/2vJMJ00FOR/2nM0BcBEclpaf9sWCDc+v5e9dMrhSH8/atq/kX7+bA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.27.3"
+    "@babel/helper-create-class-features-plugin" "^7.28.5"
+    "@babel/helper-plugin-utils" "^7.27.1"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.27.1"
+    "@babel/plugin-syntax-typescript" "^7.27.1"
+
+"@babel/preset-typescript@^7.24.1":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.28.5.tgz#540359efa3028236958466342967522fd8f2a60c"
+  integrity sha512-+bQy5WOI2V6LJZpPVxY+yp66XdZ2yifu0Mc1aP5CQKgjn4QM5IN2i5fAZ4xKop47pr8rpVhiAeu+nDQa12C8+g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.27.1"
+    "@babel/helper-validator-option" "^7.27.1"
+    "@babel/plugin-syntax-jsx" "^7.27.1"
+    "@babel/plugin-transform-modules-commonjs" "^7.27.1"
+    "@babel/plugin-transform-typescript" "^7.28.5"
+
+"@babel/template@^7.27.2":
+  version "7.27.2"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.27.2.tgz#fa78ceed3c4e7b63ebf6cb39e5852fca45f6809d"
+  integrity sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==
+  dependencies:
+    "@babel/code-frame" "^7.27.1"
+    "@babel/parser" "^7.27.2"
+    "@babel/types" "^7.27.1"
+
+"@babel/traverse@^7.27.1", "@babel/traverse@^7.28.3", "@babel/traverse@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.5.tgz#450cab9135d21a7a2ca9d2d35aa05c20e68c360b"
+  integrity sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==
+  dependencies:
+    "@babel/code-frame" "^7.27.1"
+    "@babel/generator" "^7.28.5"
+    "@babel/helper-globals" "^7.28.0"
+    "@babel/parser" "^7.28.5"
+    "@babel/template" "^7.27.2"
+    "@babel/types" "^7.28.5"
+    debug "^4.3.1"
+
+"@babel/types@^7.25.4", "@babel/types@^7.29.0":
+  version "7.29.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.29.0.tgz#9f5b1e838c446e72cf3cd4b918152b8c605e37c7"
+  integrity sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==
+  dependencies:
+    "@babel/helper-string-parser" "^7.27.1"
+    "@babel/helper-validator-identifier" "^7.28.5"
+
+"@babel/types@^7.27.1", "@babel/types@^7.27.3", "@babel/types@^7.28.4", "@babel/types@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.5.tgz#10fc405f60897c35f07e85493c932c7b5ca0592b"
+  integrity sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==
+  dependencies:
+    "@babel/helper-string-parser" "^7.27.1"
+    "@babel/helper-validator-identifier" "^7.28.5"
+
+"@bcoe/v8-coverage@^0.2.3":
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
+  integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
+
+"@bcoe/v8-coverage@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-1.0.2.tgz#bbe12dca5b4ef983a0d0af4b07b9bc90ea0ababa"
+  integrity sha512-6zABk/ECA/QYSCQ1NGiVwwbQerUCZ+TQbp64Q3AgmfNvurHH0j8TtXa1qbShXA6qqkpAj4V5W8pP6mLe1mcMqA==
+
+"@csstools/color-helpers@^5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@csstools/color-helpers/-/color-helpers-5.1.0.tgz#106c54c808cabfd1ab4c602d8505ee584c2996ef"
+  integrity sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==
+
+"@csstools/css-calc@^2.1.3", "@csstools/css-calc@^2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@csstools/css-calc/-/css-calc-2.1.4.tgz#8473f63e2fcd6e459838dd412401d5948f224c65"
+  integrity sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==
+
+"@csstools/css-color-parser@^3.0.9":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@csstools/css-color-parser/-/css-color-parser-3.1.0.tgz#4e386af3a99dd36c46fef013cfe4c1c341eed6f0"
+  integrity sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==
+  dependencies:
+    "@csstools/color-helpers" "^5.1.0"
+    "@csstools/css-calc" "^2.1.4"
+
+"@csstools/css-parser-algorithms@^3.0.4":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz#5755370a9a29abaec5515b43c8b3f2cf9c2e3076"
+  integrity sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==
+
+"@csstools/css-tokenizer@^3.0.3":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz#333fedabc3fd1a8e5d0100013731cf19e6a8c5d3"
+  integrity sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==
+
+"@dotenvx/dotenvx@^1.51.0":
+  version "1.51.0"
+  resolved "https://registry.yarnpkg.com/@dotenvx/dotenvx/-/dotenvx-1.51.0.tgz#6faf730e7cf532f0ecafdc87dc854d07e31c2915"
+  integrity sha512-CbMGzyOYSyFF7d4uaeYwO9gpSBzLTnMmSmTVpCZjvpJFV69qYbjYPpzNnCz1mb2wIvEhjWjRwQWuBzTO0jITww==
+  dependencies:
+    commander "^11.1.0"
+    dotenv "^17.2.1"
+    eciesjs "^0.4.10"
+    execa "^5.1.1"
+    fdir "^6.2.0"
+    ignore "^5.3.0"
+    object-treeify "1.1.33"
+    picomatch "^4.0.2"
+    which "^4.0.0"
+
+"@ecies/ciphers@^0.2.4":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@ecies/ciphers/-/ciphers-0.2.4.tgz#20a4e51f61d521e5e311eb49385d93d91087de51"
+  integrity sha512-t+iX+Wf5nRKyNzk8dviW3Ikb/280+aEJAnw9YXvCp2tYGPSkMki+NRY+8aNLmVFv3eNtMdvViPNOPxS8SZNP+w==
+
+"@emnapi/core@^1.5.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@emnapi/core/-/core-1.6.0.tgz#517f65d1c8270d5d5aa1aad660d5acb897430dca"
+  integrity sha512-zq/ay+9fNIJJtJiZxdTnXS20PllcYMX3OE23ESc4HK/bdYu3cOWYVhsOhVnXALfU/uqJIxn5NBPd9z4v+SfoSg==
+  dependencies:
+    "@emnapi/wasi-threads" "1.1.0"
+    tslib "^2.4.0"
+
+"@emnapi/runtime@^1.5.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.6.0.tgz#8fe297e0090f6e89a57a1f31f1c440bdbc3c01d8"
+  integrity sha512-obtUmAHTMjll499P+D9A3axeJFlhdjOWdKUNs/U6QIGT7V5RjcUW1xToAzjvmgTSQhDbYn/NwfTRoJcQ2rNBxA==
+  dependencies:
+    tslib "^2.4.0"
+
+"@emnapi/wasi-threads@1.1.0", "@emnapi/wasi-threads@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@emnapi/wasi-threads/-/wasi-threads-1.1.0.tgz#60b2102fddc9ccb78607e4a3cf8403ea69be41bf"
+  integrity sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ==
+  dependencies:
+    tslib "^2.4.0"
+
+"@esbuild/aix-ppc64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz#c7184a326533fcdf1b8ee0733e21c713b975575f"
+  integrity sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==
+
+"@esbuild/aix-ppc64@0.25.11":
+  version "0.25.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.25.11.tgz#2ae33300598132cc4cf580dbbb28d30fed3c5c49"
+  integrity sha512-Xt1dOL13m8u0WE8iplx9Ibbm+hFAO0GsU2P34UNoDGvZYkY8ifSiy6Zuc1lYxfG7svWE2fzqCUmFp5HCn51gJg==
+
+"@esbuild/android-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz#09d9b4357780da9ea3a7dfb833a1f1ff439b4052"
+  integrity sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==
+
+"@esbuild/android-arm64@0.25.11":
+  version "0.25.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.25.11.tgz#927708b3db5d739d6cb7709136924cc81bec9b03"
+  integrity sha512-9slpyFBc4FPPz48+f6jyiXOx/Y4v34TUeDDXJpZqAWQn/08lKGeD8aDp9TMn9jDz2CiEuHwfhRmGBvpnd/PWIQ==
+
+"@esbuild/android-arm@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.21.5.tgz#9b04384fb771926dfa6d7ad04324ecb2ab9b2e28"
+  integrity sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==
+
+"@esbuild/android-arm@0.25.11":
+  version "0.25.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.25.11.tgz#571f94e7f4068957ec4c2cfb907deae3d01b55ae"
+  integrity sha512-uoa7dU+Dt3HYsethkJ1k6Z9YdcHjTrSb5NUy66ZfZaSV8hEYGD5ZHbEMXnqLFlbBflLsl89Zke7CAdDJ4JI+Gg==
+
+"@esbuild/android-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.21.5.tgz#29918ec2db754cedcb6c1b04de8cd6547af6461e"
+  integrity sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==
+
+"@esbuild/android-x64@0.25.11":
+  version "0.25.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.25.11.tgz#8a3bf5cae6c560c7ececa3150b2bde76e0fb81e6"
+  integrity sha512-Sgiab4xBjPU1QoPEIqS3Xx+R2lezu0LKIEcYe6pftr56PqPygbB7+szVnzoShbx64MUupqoE0KyRlN7gezbl8g==
+
+"@esbuild/darwin-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz#e495b539660e51690f3928af50a76fb0a6ccff2a"
+  integrity sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==
+
+"@esbuild/darwin-arm64@0.25.11":
+  version "0.25.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.25.11.tgz#0a678c4ac4bf8717e67481e1a797e6c152f93c84"
+  integrity sha512-VekY0PBCukppoQrycFxUqkCojnTQhdec0vevUL/EDOCnXd9LKWqD/bHwMPzigIJXPhC59Vd1WFIL57SKs2mg4w==
+
+"@esbuild/darwin-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz#c13838fa57372839abdddc91d71542ceea2e1e22"
+  integrity sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==
+
+"@esbuild/darwin-x64@0.25.11":
+  version "0.25.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.25.11.tgz#70f5e925a30c8309f1294d407a5e5e002e0315fe"
+  integrity sha512-+hfp3yfBalNEpTGp9loYgbknjR695HkqtY3d3/JjSRUyPg/xd6q+mQqIb5qdywnDxRZykIHs3axEqU6l1+oWEQ==
+
+"@esbuild/freebsd-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz#646b989aa20bf89fd071dd5dbfad69a3542e550e"
+  integrity sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==
+
+"@esbuild/freebsd-arm64@0.25.11":
+  version "0.25.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.11.tgz#4ec1db687c5b2b78b44148025da9632397553e8a"
+  integrity sha512-CmKjrnayyTJF2eVuO//uSjl/K3KsMIeYeyN7FyDBjsR3lnSJHaXlVoAK8DZa7lXWChbuOk7NjAc7ygAwrnPBhA==
+
+"@esbuild/freebsd-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz#aa615cfc80af954d3458906e38ca22c18cf5c261"
+  integrity sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==
+
+"@esbuild/freebsd-x64@0.25.11":
+  version "0.25.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.25.11.tgz#4c81abd1b142f1e9acfef8c5153d438ca53f44bb"
+  integrity sha512-Dyq+5oscTJvMaYPvW3x3FLpi2+gSZTCE/1ffdwuM6G1ARang/mb3jvjxs0mw6n3Lsw84ocfo9CrNMqc5lTfGOw==
+
+"@esbuild/linux-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz#70ac6fa14f5cb7e1f7f887bcffb680ad09922b5b"
+  integrity sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==
+
+"@esbuild/linux-arm64@0.25.11":
+  version "0.25.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.25.11.tgz#69517a111acfc2b93aa0fb5eaeb834c0202ccda5"
+  integrity sha512-Qr8AzcplUhGvdyUF08A1kHU3Vr2O88xxP0Tm8GcdVOUm25XYcMPp2YqSVHbLuXzYQMf9Bh/iKx7YPqECs6ffLA==
+
+"@esbuild/linux-arm@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz#fc6fd11a8aca56c1f6f3894f2bea0479f8f626b9"
+  integrity sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==
+
+"@esbuild/linux-arm@0.25.11":
+  version "0.25.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.25.11.tgz#58dac26eae2dba0fac5405052b9002dac088d38f"
+  integrity sha512-TBMv6B4kCfrGJ8cUPo7vd6NECZH/8hPpBHHlYI3qzoYFvWu2AdTvZNuU/7hsbKWqu/COU7NIK12dHAAqBLLXgw==
+
+"@esbuild/linux-ia32@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz#3271f53b3f93e3d093d518d1649d6d68d346ede2"
+  integrity sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==
+
+"@esbuild/linux-ia32@0.25.11":
+  version "0.25.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.25.11.tgz#b89d4efe9bdad46ba944f0f3b8ddd40834268c2b"
+  integrity sha512-TmnJg8BMGPehs5JKrCLqyWTVAvielc615jbkOirATQvWWB1NMXY77oLMzsUjRLa0+ngecEmDGqt5jiDC6bfvOw==
+
+"@esbuild/linux-loong64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz#ed62e04238c57026aea831c5a130b73c0f9f26df"
+  integrity sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==
+
+"@esbuild/linux-loong64@0.25.11":
+  version "0.25.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.25.11.tgz#11f603cb60ad14392c3f5c94d64b3cc8b630fbeb"
+  integrity sha512-DIGXL2+gvDaXlaq8xruNXUJdT5tF+SBbJQKbWy/0J7OhU8gOHOzKmGIlfTTl6nHaCOoipxQbuJi7O++ldrxgMw==
+
+"@esbuild/linux-mips64el@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz#e79b8eb48bf3b106fadec1ac8240fb97b4e64cbe"
+  integrity sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==
+
+"@esbuild/linux-mips64el@0.25.11":
+  version "0.25.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.25.11.tgz#b7d447ff0676b8ab247d69dac40a5cf08e5eeaf5"
+  integrity sha512-Osx1nALUJu4pU43o9OyjSCXokFkFbyzjXb6VhGIJZQ5JZi8ylCQ9/LFagolPsHtgw6himDSyb5ETSfmp4rpiKQ==
+
+"@esbuild/linux-ppc64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz#5f2203860a143b9919d383ef7573521fb154c3e4"
+  integrity sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==
+
+"@esbuild/linux-ppc64@0.25.11":
+  version "0.25.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.25.11.tgz#b3a28ed7cc252a61b07ff7c8fd8a984ffd3a2f74"
+  integrity sha512-nbLFgsQQEsBa8XSgSTSlrnBSrpoWh7ioFDUmwo158gIm5NNP+17IYmNWzaIzWmgCxq56vfr34xGkOcZ7jX6CPw==
+
+"@esbuild/linux-riscv64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz#07bcafd99322d5af62f618cb9e6a9b7f4bb825dc"
+  integrity sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==
+
+"@esbuild/linux-riscv64@0.25.11":
+  version "0.25.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.25.11.tgz#ce75b08f7d871a75edcf4d2125f50b21dc9dc273"
+  integrity sha512-HfyAmqZi9uBAbgKYP1yGuI7tSREXwIb438q0nqvlpxAOs3XnZ8RsisRfmVsgV486NdjD7Mw2UrFSw51lzUk1ww==
+
+"@esbuild/linux-s390x@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz#b7ccf686751d6a3e44b8627ababc8be3ef62d8de"
+  integrity sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==
+
+"@esbuild/linux-s390x@0.25.11":
+  version "0.25.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.25.11.tgz#cd08f6c73b6b6ff9ccdaabbd3ff6ad3dca99c263"
+  integrity sha512-HjLqVgSSYnVXRisyfmzsH6mXqyvj0SA7pG5g+9W7ESgwA70AXYNpfKBqh1KbTxmQVaYxpzA/SvlB9oclGPbApw==
+
+"@esbuild/linux-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz#6d8f0c768e070e64309af8004bb94e68ab2bb3b0"
+  integrity sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==
+
+"@esbuild/linux-x64@0.25.11":
+  version "0.25.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.25.11.tgz#3c3718af31a95d8946ebd3c32bb1e699bdf74910"
+  integrity sha512-HSFAT4+WYjIhrHxKBwGmOOSpphjYkcswF449j6EjsjbinTZbp8PJtjsVK1XFJStdzXdy/jaddAep2FGY+wyFAQ==
+
+"@esbuild/netbsd-arm64@0.25.11":
+  version "0.25.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.11.tgz#b4c767082401e3a4e8595fe53c47cd7f097c8077"
+  integrity sha512-hr9Oxj1Fa4r04dNpWr3P8QKVVsjQhqrMSUzZzf+LZcYjZNqhA3IAfPQdEh1FLVUJSiu6sgAwp3OmwBfbFgG2Xg==
+
+"@esbuild/netbsd-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz#bbe430f60d378ecb88decb219c602667387a6047"
+  integrity sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==
+
+"@esbuild/netbsd-x64@0.25.11":
+  version "0.25.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.25.11.tgz#f2a930458ed2941d1f11ebc34b9c7d61f7a4d034"
+  integrity sha512-u7tKA+qbzBydyj0vgpu+5h5AeudxOAGncb8N6C9Kh1N4n7wU1Xw1JDApsRjpShRpXRQlJLb9wY28ELpwdPcZ7A==
+
+"@esbuild/openbsd-arm64@0.25.11":
+  version "0.25.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.11.tgz#b4ae93c75aec48bc1e8a0154957a05f0641f2dad"
+  integrity sha512-Qq6YHhayieor3DxFOoYM1q0q1uMFYb7cSpLD2qzDSvK1NAvqFi8Xgivv0cFC6J+hWVw2teCYltyy9/m/14ryHg==
+
+"@esbuild/openbsd-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz#99d1cf2937279560d2104821f5ccce220cb2af70"
+  integrity sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==
+
+"@esbuild/openbsd-x64@0.25.11":
+  version "0.25.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.25.11.tgz#b42863959c8dcf9b01581522e40012d2c70045e2"
+  integrity sha512-CN+7c++kkbrckTOz5hrehxWN7uIhFFlmS/hqziSFVWpAzpWrQoAG4chH+nN3Be+Kzv/uuo7zhX716x3Sn2Jduw==
+
+"@esbuild/openharmony-arm64@0.25.11":
+  version "0.25.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.11.tgz#b2e717141c8fdf6bddd4010f0912e6b39e1640f1"
+  integrity sha512-rOREuNIQgaiR+9QuNkbkxubbp8MSO9rONmwP5nKncnWJ9v5jQ4JxFnLu4zDSRPf3x4u+2VN4pM4RdyIzDty/wQ==
+
+"@esbuild/sunos-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz#08741512c10d529566baba837b4fe052c8f3487b"
+  integrity sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==
+
+"@esbuild/sunos-x64@0.25.11":
+  version "0.25.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.25.11.tgz#9fbea1febe8778927804828883ec0f6dd80eb244"
+  integrity sha512-nq2xdYaWxyg9DcIyXkZhcYulC6pQ2FuCgem3LI92IwMgIZ69KHeY8T4Y88pcwoLIjbed8n36CyKoYRDygNSGhA==
+
+"@esbuild/win32-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz#675b7385398411240735016144ab2e99a60fc75d"
+  integrity sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==
+
+"@esbuild/win32-arm64@0.25.11":
+  version "0.25.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.25.11.tgz#501539cedb24468336073383989a7323005a8935"
+  integrity sha512-3XxECOWJq1qMZ3MN8srCJ/QfoLpL+VaxD/WfNRm1O3B4+AZ/BnLVgFbUV3eiRYDMXetciH16dwPbbHqwe1uU0Q==
+
+"@esbuild/win32-ia32@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz#1bfc3ce98aa6ca9a0969e4d2af72144c59c1193b"
+  integrity sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==
+
+"@esbuild/win32-ia32@0.25.11":
+  version "0.25.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.25.11.tgz#8ac7229aa82cef8f16ffb58f1176a973a7a15343"
+  integrity sha512-3ukss6gb9XZ8TlRyJlgLn17ecsK4NSQTmdIXRASVsiS2sQ6zPPZklNJT5GR5tE/MUarymmy8kCEf5xPCNCqVOA==
+
+"@esbuild/win32-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz#acad351d582d157bb145535db2a6ff53dd514b5c"
+  integrity sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==
+
+"@esbuild/win32-x64@0.25.11":
+  version "0.25.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.25.11.tgz#5ecda6f3fe138b7e456f4e429edde33c823f392f"
+  integrity sha512-D7Hpz6A2L4hzsRpPaCYkQnGOotdUpDzSGRIv9I+1ITdHROSFUWW95ZPZWQmGka1Fg7W3zFJowyn9WGwMJ0+KPA==
+
+"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0", "@eslint-community/eslint-utils@^4.7.0":
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz#7308df158e064f0dd8b8fdb58aa14fa2a7f913b3"
+  integrity sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==
+  dependencies:
+    eslint-visitor-keys "^3.4.3"
+
+"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.6.1":
+  version "4.12.2"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.2.tgz#bccdf615bcf7b6e8db830ec0b8d21c9a25de597b"
+  integrity sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==
+
+"@eslint/eslintrc@^2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
+  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
+  dependencies:
+    ajv "^6.12.4"
+    debug "^4.3.2"
+    espree "^9.6.0"
+    globals "^13.19.0"
+    ignore "^5.2.0"
+    import-fresh "^3.2.1"
+    js-yaml "^4.1.0"
+    minimatch "^3.1.2"
+    strip-json-comments "^3.1.1"
+
+"@eslint/js@8.57.1":
+  version "8.57.1"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.1.tgz#de633db3ec2ef6a3c89e2f19038063e8a122e2c2"
+  integrity sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==
+
+"@eslint/js@^9.36.0":
+  version "9.38.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.38.0.tgz#f7aa9c7577577f53302c1d795643589d7709ebd1"
+  integrity sha512-UZ1VpFvXf9J06YG9xQBdnzU+kthors6KjhMAl6f4gH4usHyh31rUf2DLGInT8RFYIReYXNSydgPY0V2LuWgl7A==
+
+"@floating-ui/core@^1.7.3":
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.7.3.tgz#462d722f001e23e46d86fd2bd0d21b7693ccb8b7"
+  integrity sha512-sGnvb5dmrJaKEZ+LDIpguvdX3bDlEllmv4/ClQ9awcmCZrlx5jQyyMWFM5kBI+EyNOCDDiKk8il0zeuX3Zlg/w==
+  dependencies:
+    "@floating-ui/utils" "^0.2.10"
+
+"@floating-ui/dom@^1.6.13", "@floating-ui/dom@^1.7.4":
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.7.4.tgz#ee667549998745c9c3e3e84683b909c31d6c9a77"
+  integrity sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==
+  dependencies:
+    "@floating-ui/core" "^1.7.3"
+    "@floating-ui/utils" "^0.2.10"
+
+"@floating-ui/utils@^0.2.10":
+  version "0.2.10"
+  resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.10.tgz#a2a1e3812d14525f725d011a73eceb41fef5bc1c"
+  integrity sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==
+
+"@floating-ui/vue@^1.1.6":
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/@floating-ui/vue/-/vue-1.1.9.tgz#508c386bd3d595247f1dda8dbca00b76fe8fcaf9"
+  integrity sha512-BfNqNW6KA83Nexspgb9DZuz578R7HT8MZw1CfK9I6Ah4QReNWEJsXWHN+SdmOVLNGmTPDi+fDT535Df5PzMLbQ==
+  dependencies:
+    "@floating-ui/dom" "^1.7.4"
+    "@floating-ui/utils" "^0.2.10"
+    vue-demi ">=0.13.0"
+
+"@humanwhocodes/config-array@^0.13.0":
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.13.0.tgz#fb907624df3256d04b9aa2df50d7aa97ec648748"
+  integrity sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==
+  dependencies:
+    "@humanwhocodes/object-schema" "^2.0.3"
+    debug "^4.3.1"
+    minimatch "^3.0.5"
+
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
+
+"@humanwhocodes/object-schema@^2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
+  integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
+
+"@internationalized/date@^3.5.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@internationalized/date/-/date-3.10.0.tgz#056db64a4facdf48c6937ad498a882a8151d640a"
+  integrity sha512-oxDR/NTEJ1k+UFVQElaNIk65E/Z83HK1z1WI3lQyhTtnNg4R5oVXaPzK3jcpKG8UHKDVuDQHzn+wsxSz8RP3aw==
+  dependencies:
+    "@swc/helpers" "^0.5.0"
+
+"@internationalized/number@^3.5.0":
+  version "3.6.5"
+  resolved "https://registry.yarnpkg.com/@internationalized/number/-/number-3.6.5.tgz#1103f2832ca8d9dd3e4eecf95733d497791dbbbe"
+  integrity sha512-6hY4Kl4HPBvtfS62asS/R22JzNNy8vi/Ssev7x6EobfCp+9QIB2hKvI2EtbdJ0VSQacxVNtqhE/NmF/NZ0gm6g==
+  dependencies:
+    "@swc/helpers" "^0.5.0"
+
+"@isaacs/balanced-match@^4.0.1":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz#3081dadbc3460661b751e7591d7faea5df39dd29"
+  integrity sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==
+
+"@isaacs/brace-expansion@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz#4b3dabab7d8e75a429414a96bd67bf4c1d13e0f3"
+  integrity sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==
+  dependencies:
+    "@isaacs/balanced-match" "^4.0.1"
+
+"@isaacs/cliui@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
+  integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
+  dependencies:
+    string-width "^5.1.2"
+    string-width-cjs "npm:string-width@^4.2.0"
+    strip-ansi "^7.0.1"
+    strip-ansi-cjs "npm:strip-ansi@^6.0.1"
+    wrap-ansi "^8.1.0"
+    wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
+
+"@istanbuljs/schema@^0.1.2":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
+  integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
+
+"@jridgewell/gen-mapping@^0.3.12", "@jridgewell/gen-mapping@^0.3.5":
+  version "0.3.13"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz#6342a19f44347518c93e43b1ac69deb3c4656a1f"
+  integrity sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.5.0"
+    "@jridgewell/trace-mapping" "^0.3.24"
+
+"@jridgewell/remapping@^2.3.4", "@jridgewell/remapping@^2.3.5":
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/remapping/-/remapping-2.3.5.tgz#375c476d1972947851ba1e15ae8f123047445aa1"
+  integrity sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.24"
+
+"@jridgewell/resolve-uri@^3.1.0":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
+  integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
+
+"@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.5.0", "@jridgewell/sourcemap-codec@^1.5.5":
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz#6912b00d2c631c0d15ce1a7ab57cd657f2a8f8ba"
+  integrity sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==
+
+"@jridgewell/trace-mapping@^0.3.23", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.28", "@jridgewell/trace-mapping@^0.3.31":
+  version "0.3.31"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz#db15d6781c931f3a251a3dac39501c98a6082fd0"
+  integrity sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
+
+"@modelcontextprotocol/sdk@^1.20.1":
+  version "1.20.2"
+  resolved "https://registry.yarnpkg.com/@modelcontextprotocol/sdk/-/sdk-1.20.2.tgz#7c448a073164841814d34ec9c76bcc37f2d6ffdc"
+  integrity sha512-6rqTdFt67AAAzln3NOKsXRmv5ZzPkgbfaebKBqUbts7vK1GZudqnrun5a8d3M/h955cam9RHZ6Jb4Y1XhnmFPg==
+  dependencies:
+    ajv "^6.12.6"
+    content-type "^1.0.5"
+    cors "^2.8.5"
+    cross-spawn "^7.0.5"
+    eventsource "^3.0.2"
+    eventsource-parser "^3.0.0"
+    express "^5.0.1"
+    express-rate-limit "^7.5.0"
+    pkce-challenge "^5.0.0"
+    raw-body "^3.0.0"
+    zod "^3.23.8"
+    zod-to-json-schema "^3.24.1"
+
+"@napi-rs/wasm-runtime@^1.0.7":
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/@napi-rs/wasm-runtime/-/wasm-runtime-1.0.7.tgz#dcfea99a75f06209a235f3d941e3460a51e9b14c"
+  integrity sha512-SeDnOO0Tk7Okiq6DbXmmBODgOAb9dp9gjlphokTUxmt8U3liIP1ZsozBahH69j/RJv+Rfs6IwUKHTgQYJ/HBAw==
+  dependencies:
+    "@emnapi/core" "^1.5.0"
+    "@emnapi/runtime" "^1.5.0"
+    "@tybys/wasm-util" "^0.10.1"
+
+"@noble/ciphers@^1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@noble/ciphers/-/ciphers-1.3.0.tgz#f64b8ff886c240e644e5573c097f86e5b43676dc"
+  integrity sha512-2I0gnIVPtfnMw9ee9h1dJG7tp81+8Ob3OJb3Mv37rx5L40/b0i7djjCVvGOVqc9AEIQyvyu1i6ypKdFw8R8gQw==
+
+"@noble/curves@^1.9.7":
+  version "1.9.7"
+  resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.9.7.tgz#79d04b4758a43e4bca2cbdc62e7771352fa6b951"
+  integrity sha512-gbKGcRUYIjA3/zCCNaWDciTMFI0dCkvou3TL8Zmy5Nc7sJ47a0jtOeZoTaMxkuqRo9cRhjOdZJXegxYE5FN/xw==
+  dependencies:
+    "@noble/hashes" "1.8.0"
+
+"@noble/hashes@1.8.0", "@noble/hashes@^1.8.0":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.8.0.tgz#cee43d801fcef9644b11b8194857695acd5f815a"
+  integrity sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==
+
+"@nodelib/fs.scandir@2.1.5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
+  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
+  dependencies:
+    "@nodelib/fs.stat" "2.0.5"
+    run-parallel "^1.1.9"
+
+"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
+  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
+
+"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
+  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.5"
+    fastq "^1.6.0"
+
+"@one-ini/wasm@0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@one-ini/wasm/-/wasm-0.1.1.tgz#6013659736c9dbfccc96e8a9c2b3de317df39323"
+  integrity sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==
+
+"@pkgjs/parseargs@^0.11.0":
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
+  integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
+
+"@polka/url@^1.0.0-next.24":
+  version "1.0.0-next.29"
+  resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.29.tgz#5a40109a1ab5f84d6fd8fc928b19f367cbe7e7b1"
+  integrity sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==
+
+"@rolldown/pluginutils@1.0.0-beta.29":
+  version "1.0.0-beta.29"
+  resolved "https://registry.yarnpkg.com/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.29.tgz#f8fc9a8788757dccba0d3b7fee93183621773d4c"
+  integrity sha512-NIJgOsMjbxAXvoGq/X0gD7VPMQ8j9g0BiDaNjVNVjvl+iKXxL3Jre0v31RmBYeLEmkbj2s02v8vFTbUXi5XS2Q==
+
+"@rollup/rollup-android-arm-eabi@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.52.5.tgz#0f44a2f8668ed87b040b6fe659358ac9239da4db"
+  integrity sha512-8c1vW4ocv3UOMp9K+gToY5zL2XiiVw3k7f1ksf4yO1FlDFQ1C2u72iACFnSOceJFsWskc2WZNqeRhFRPzv+wtQ==
+
+"@rollup/rollup-android-arm-eabi@4.57.1":
+  version "4.57.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.57.1.tgz#add5e608d4e7be55bc3ca3d962490b8b1890e088"
+  integrity sha512-A6ehUVSiSaaliTxai040ZpZ2zTevHYbvu/lDoeAteHI8QnaosIzm4qwtezfRg1jOYaUmnzLX1AOD6Z+UJjtifg==
+
+"@rollup/rollup-android-arm64@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.52.5.tgz#25b9a01deef6518a948431564c987bcb205274f5"
+  integrity sha512-mQGfsIEFcu21mvqkEKKu2dYmtuSZOBMmAl5CFlPGLY94Vlcm+zWApK7F/eocsNzp8tKmbeBP8yXyAbx0XHsFNA==
+
+"@rollup/rollup-android-arm64@4.57.1":
+  version "4.57.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.57.1.tgz#10bd0382b73592beee6e9800a69401a29da625c4"
+  integrity sha512-dQaAddCY9YgkFHZcFNS/606Exo8vcLHwArFZ7vxXq4rigo2bb494/xKMMwRRQW6ug7Js6yXmBZhSBRuBvCCQ3w==
+
+"@rollup/rollup-darwin-arm64@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.52.5.tgz#8a102869c88f3780c7d5e6776afd3f19084ecd7f"
+  integrity sha512-takF3CR71mCAGA+v794QUZ0b6ZSrgJkArC+gUiG6LB6TQty9T0Mqh3m2ImRBOxS2IeYBo4lKWIieSvnEk2OQWA==
+
+"@rollup/rollup-darwin-arm64@4.57.1":
+  version "4.57.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.57.1.tgz#1e99ab04c0b8c619dd7bbde725ba2b87b55bfd81"
+  integrity sha512-crNPrwJOrRxagUYeMn/DZwqN88SDmwaJ8Cvi/TN1HnWBU7GwknckyosC2gd0IqYRsHDEnXf328o9/HC6OkPgOg==
+
+"@rollup/rollup-darwin-x64@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.52.5.tgz#8e526417cd6f54daf1d0c04cf361160216581956"
+  integrity sha512-W901Pla8Ya95WpxDn//VF9K9u2JbocwV/v75TE0YIHNTbhqUTv9w4VuQ9MaWlNOkkEfFwkdNhXgcLqPSmHy0fA==
+
+"@rollup/rollup-darwin-x64@4.57.1":
+  version "4.57.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.57.1.tgz#69e741aeb2839d2e8f0da2ce7a33d8bd23632423"
+  integrity sha512-Ji8g8ChVbKrhFtig5QBV7iMaJrGtpHelkB3lsaKzadFBe58gmjfGXAOfI5FV0lYMH8wiqsxKQ1C9B0YTRXVy4w==
+
+"@rollup/rollup-freebsd-arm64@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.52.5.tgz#0e7027054493f3409b1f219a3eac5efd128ef899"
+  integrity sha512-QofO7i7JycsYOWxe0GFqhLmF6l1TqBswJMvICnRUjqCx8b47MTo46W8AoeQwiokAx3zVryVnxtBMcGcnX12LvA==
+
+"@rollup/rollup-freebsd-arm64@4.57.1":
+  version "4.57.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.57.1.tgz#3736c232a999c7bef7131355d83ebdf9651a0839"
+  integrity sha512-R+/WwhsjmwodAcz65guCGFRkMb4gKWTcIeLy60JJQbXrJ97BOXHxnkPFrP+YwFlaS0m+uWJTstrUA9o+UchFug==
+
+"@rollup/rollup-freebsd-x64@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.52.5.tgz#72b204a920139e9ec3d331bd9cfd9a0c248ccb10"
+  integrity sha512-jr21b/99ew8ujZubPo9skbrItHEIE50WdV86cdSoRkKtmWa+DDr6fu2c/xyRT0F/WazZpam6kk7IHBerSL7LDQ==
+
+"@rollup/rollup-freebsd-x64@4.57.1":
+  version "4.57.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.57.1.tgz#227dcb8f466684070169942bd3998901c9bfc065"
+  integrity sha512-IEQTCHeiTOnAUC3IDQdzRAGj3jOAYNr9kBguI7MQAAZK3caezRrg0GxAb6Hchg4lxdZEI5Oq3iov/w/hnFWY9Q==
+
+"@rollup/rollup-linux-arm-gnueabihf@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.52.5.tgz#ab1b522ebe5b7e06c99504cc38f6cd8b808ba41c"
+  integrity sha512-PsNAbcyv9CcecAUagQefwX8fQn9LQ4nZkpDboBOttmyffnInRy8R8dSg6hxxl2Re5QhHBf6FYIDhIj5v982ATQ==
+
+"@rollup/rollup-linux-arm-gnueabihf@4.57.1":
+  version "4.57.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.57.1.tgz#ba004b30df31b724f99ce66e7128248bea17cb0c"
+  integrity sha512-F8sWbhZ7tyuEfsmOxwc2giKDQzN3+kuBLPwwZGyVkLlKGdV1nvnNwYD0fKQ8+XS6hp9nY7B+ZeK01EBUE7aHaw==
+
+"@rollup/rollup-linux-arm-musleabihf@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.52.5.tgz#f8cc30b638f1ee7e3d18eac24af47ea29d9beb00"
+  integrity sha512-Fw4tysRutyQc/wwkmcyoqFtJhh0u31K+Q6jYjeicsGJJ7bbEq8LwPWV/w0cnzOqR2m694/Af6hpFayLJZkG2VQ==
+
+"@rollup/rollup-linux-arm-musleabihf@4.57.1":
+  version "4.57.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.57.1.tgz#6929f3e07be6b6da5991f63c6b68b3e473d0a65a"
+  integrity sha512-rGfNUfn0GIeXtBP1wL5MnzSj98+PZe/AXaGBCRmT0ts80lU5CATYGxXukeTX39XBKsxzFpEeK+Mrp9faXOlmrw==
+
+"@rollup/rollup-linux-arm64-gnu@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.52.5.tgz#7af37a9e85f25db59dc8214172907b7e146c12cc"
+  integrity sha512-a+3wVnAYdQClOTlyapKmyI6BLPAFYs0JM8HRpgYZQO02rMR09ZcV9LbQB+NL6sljzG38869YqThrRnfPMCDtZg==
+
+"@rollup/rollup-linux-arm64-gnu@4.57.1":
+  version "4.57.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.57.1.tgz#06e89fd4a25d21fe5575d60b6f913c0e65297bfa"
+  integrity sha512-MMtej3YHWeg/0klK2Qodf3yrNzz6CGjo2UntLvk2RSPlhzgLvYEB3frRvbEF2wRKh1Z2fDIg9KRPe1fawv7C+g==
+
+"@rollup/rollup-linux-arm64-musl@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.52.5.tgz#a623eb0d3617c03b7a73716eb85c6e37b776f7e0"
+  integrity sha512-AvttBOMwO9Pcuuf7m9PkC1PUIKsfaAJ4AYhy944qeTJgQOqJYJ9oVl2nYgY7Rk0mkbsuOpCAYSs6wLYB2Xiw0Q==
+
+"@rollup/rollup-linux-arm64-musl@4.57.1":
+  version "4.57.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.57.1.tgz#fddabf395b90990d5194038e6cd8c00156ed8ac0"
+  integrity sha512-1a/qhaaOXhqXGpMFMET9VqwZakkljWHLmZOX48R0I/YLbhdxr1m4gtG1Hq7++VhVUmf+L3sTAf9op4JlhQ5u1Q==
+
+"@rollup/rollup-linux-loong64-gnu@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.52.5.tgz#76ea038b549c5c6c5f0d062942627c4066642ee2"
+  integrity sha512-DkDk8pmXQV2wVrF6oq5tONK6UHLz/XcEVow4JTTerdeV1uqPeHxwcg7aFsfnSm9L+OO8WJsWotKM2JJPMWrQtA==
+
+"@rollup/rollup-linux-loong64-gnu@4.57.1":
+  version "4.57.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.57.1.tgz#04c10bb764bbf09a3c1bd90432e92f58d6603c36"
+  integrity sha512-QWO6RQTZ/cqYtJMtxhkRkidoNGXc7ERPbZN7dVW5SdURuLeVU7lwKMpo18XdcmpWYd0qsP1bwKPf7DNSUinhvA==
+
+"@rollup/rollup-linux-loong64-musl@4.57.1":
+  version "4.57.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.57.1.tgz#f2450361790de80581d8687ea19142d8a4de5c0f"
+  integrity sha512-xpObYIf+8gprgWaPP32xiN5RVTi/s5FCR+XMXSKmhfoJjrpRAjCuuqQXyxUa/eJTdAE6eJ+KDKaoEqjZQxh3Gw==
+
+"@rollup/rollup-linux-ppc64-gnu@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.52.5.tgz#d9a4c3f0a3492bc78f6fdfe8131ac61c7359ccd5"
+  integrity sha512-W/b9ZN/U9+hPQVvlGwjzi+Wy4xdoH2I8EjaCkMvzpI7wJUs8sWJ03Rq96jRnHkSrcHTpQe8h5Tg3ZzUPGauvAw==
+
+"@rollup/rollup-linux-ppc64-gnu@4.57.1":
+  version "4.57.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.57.1.tgz#0474f4667259e407eee1a6d38e29041b708f6a30"
+  integrity sha512-4BrCgrpZo4hvzMDKRqEaW1zeecScDCR+2nZ86ATLhAoJ5FQ+lbHVD3ttKe74/c7tNT9c6F2viwB3ufwp01Oh2w==
+
+"@rollup/rollup-linux-ppc64-musl@4.57.1":
+  version "4.57.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.57.1.tgz#9f32074819eeb1ddbe51f50ea9dcd61a6745ec33"
+  integrity sha512-NOlUuzesGauESAyEYFSe3QTUguL+lvrN1HtwEEsU2rOwdUDeTMJdO5dUYl/2hKf9jWydJrO9OL/XSSf65R5+Xw==
+
+"@rollup/rollup-linux-riscv64-gnu@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.52.5.tgz#87ab033eebd1a9a1dd7b60509f6333ec1f82d994"
+  integrity sha512-sjQLr9BW7R/ZiXnQiWPkErNfLMkkWIoCz7YMn27HldKsADEKa5WYdobaa1hmN6slu9oWQbB6/jFpJ+P2IkVrmw==
+
+"@rollup/rollup-linux-riscv64-gnu@4.57.1":
+  version "4.57.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.57.1.tgz#3fdb9d4b1e29fb6b6a6da9f15654d42eb77b99b2"
+  integrity sha512-ptA88htVp0AwUUqhVghwDIKlvJMD/fmL/wrQj99PRHFRAG6Z5nbWoWG4o81Nt9FT+IuqUQi+L31ZKAFeJ5Is+A==
+
+"@rollup/rollup-linux-riscv64-musl@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.52.5.tgz#bda3eb67e1c993c1ba12bc9c2f694e7703958d9f"
+  integrity sha512-hq3jU/kGyjXWTvAh2awn8oHroCbrPm8JqM7RUpKjalIRWWXE01CQOf/tUNWNHjmbMHg/hmNCwc/Pz3k1T/j/Lg==
+
+"@rollup/rollup-linux-riscv64-musl@4.57.1":
+  version "4.57.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.57.1.tgz#1de780d64e6be0e3e8762035c22e0d8ea68df8ed"
+  integrity sha512-S51t7aMMTNdmAMPpBg7OOsTdn4tySRQvklmL3RpDRyknk87+Sp3xaumlatU+ppQ+5raY7sSTcC2beGgvhENfuw==
+
+"@rollup/rollup-linux-s390x-gnu@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.52.5.tgz#f7bc10fbe096ab44694233dc42a2291ed5453d4b"
+  integrity sha512-gn8kHOrku8D4NGHMK1Y7NA7INQTRdVOntt1OCYypZPRt6skGbddska44K8iocdpxHTMMNui5oH4elPH4QOLrFQ==
+
+"@rollup/rollup-linux-s390x-gnu@4.57.1":
+  version "4.57.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.57.1.tgz#1da022ffd2d9e9f0fd8344ea49e113001fbcac64"
+  integrity sha512-Bl00OFnVFkL82FHbEqy3k5CUCKH6OEJL54KCyx2oqsmZnFTR8IoNqBF+mjQVcRCT5sB6yOvK8A37LNm/kPJiZg==
+
+"@rollup/rollup-linux-x64-gnu@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.52.5.tgz#a151cb1234cc9b2cf5e8cfc02aa91436b8f9e278"
+  integrity sha512-hXGLYpdhiNElzN770+H2nlx+jRog8TyynpTVzdlc6bndktjKWyZyiCsuDAlpd+j+W+WNqfcyAWz9HxxIGfZm1Q==
+
+"@rollup/rollup-linux-x64-gnu@4.57.1":
+  version "4.57.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.57.1.tgz#78c16eef9520bd10e1ea7a112593bb58e2842622"
+  integrity sha512-ABca4ceT4N+Tv/GtotnWAeXZUZuM/9AQyCyKYyKnpk4yoA7QIAuBt6Hkgpw8kActYlew2mvckXkvx0FfoInnLg==
+
+"@rollup/rollup-linux-x64-musl@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.52.5.tgz#7859e196501cc3b3062d45d2776cfb4d2f3a9350"
+  integrity sha512-arCGIcuNKjBoKAXD+y7XomR9gY6Mw7HnFBv5Rw7wQRvwYLR7gBAgV7Mb2QTyjXfTveBNFAtPt46/36vV9STLNg==
+
+"@rollup/rollup-linux-x64-musl@4.57.1":
+  version "4.57.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.57.1.tgz#a7598591b4d9af96cb3167b50a5bf1e02dfea06c"
+  integrity sha512-HFps0JeGtuOR2convgRRkHCekD7j+gdAuXM+/i6kGzQtFhlCtQkpwtNzkNj6QhCDp7DRJ7+qC/1Vg2jt5iSOFw==
+
+"@rollup/rollup-openbsd-x64@4.57.1":
+  version "4.57.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.57.1.tgz#c51d48c07cd6c466560e5bed934aec688ce02614"
+  integrity sha512-H+hXEv9gdVQuDTgnqD+SQffoWoc0Of59AStSzTEj/feWTBAnSfSD3+Dql1ZruJQxmykT/JVY0dE8Ka7z0DH1hw==
+
+"@rollup/rollup-openharmony-arm64@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.52.5.tgz#85d0df7233734df31e547c1e647d2a5300b3bf30"
+  integrity sha512-QoFqB6+/9Rly/RiPjaomPLmR/13cgkIGfA40LHly9zcH1S0bN2HVFYk3a1eAyHQyjs3ZJYlXvIGtcCs5tko9Cw==
+
+"@rollup/rollup-openharmony-arm64@4.57.1":
+  version "4.57.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.57.1.tgz#f09921d0b2a0b60afbf3586d2a7a7f208ba6df17"
+  integrity sha512-4wYoDpNg6o/oPximyc/NG+mYUejZrCU2q+2w6YZqrAs2UcNUChIZXjtafAiiZSUc7On8v5NyNj34Kzj/Ltk6dQ==
+
+"@rollup/rollup-win32-arm64-msvc@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.52.5.tgz#e62357d00458db17277b88adbf690bb855cac937"
+  integrity sha512-w0cDWVR6MlTstla1cIfOGyl8+qb93FlAVutcor14Gf5Md5ap5ySfQ7R9S/NjNaMLSFdUnKGEasmVnu3lCMqB7w==
+
+"@rollup/rollup-win32-arm64-msvc@4.57.1":
+  version "4.57.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.57.1.tgz#08d491717135376e4a99529821c94ecd433d5b36"
+  integrity sha512-O54mtsV/6LW3P8qdTcamQmuC990HDfR71lo44oZMZlXU4tzLrbvTii87Ni9opq60ds0YzuAlEr/GNwuNluZyMQ==
+
+"@rollup/rollup-win32-ia32-msvc@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.52.5.tgz#fc7cd40f44834a703c1f1c3fe8bcc27ce476cd50"
+  integrity sha512-Aufdpzp7DpOTULJCuvzqcItSGDH73pF3ko/f+ckJhxQyHtp67rHw3HMNxoIdDMUITJESNE6a8uh4Lo4SLouOUg==
+
+"@rollup/rollup-win32-ia32-msvc@4.57.1":
+  version "4.57.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.57.1.tgz#b0c12aac1104a8b8f26a5e0098e5facbb3e3964a"
+  integrity sha512-P3dLS+IerxCT/7D2q2FYcRdWRl22dNbrbBEtxdWhXrfIMPP9lQhb5h4Du04mdl5Woq05jVCDPCMF7Ub0NAjIew==
+
+"@rollup/rollup-win32-x64-gnu@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.52.5.tgz#1a22acfc93c64a64a48c42672e857ee51774d0d3"
+  integrity sha512-UGBUGPFp1vkj6p8wCRraqNhqwX/4kNQPS57BCFc8wYh0g94iVIW33wJtQAx3G7vrjjNtRaxiMUylM0ktp/TRSQ==
+
+"@rollup/rollup-win32-x64-gnu@4.57.1":
+  version "4.57.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.57.1.tgz#b9cccef26f5e6fdc013bf3c0911a3c77428509d0"
+  integrity sha512-VMBH2eOOaKGtIJYleXsi2B8CPVADrh+TyNxJ4mWPnKfLB/DBUmzW+5m1xUrcwWoMfSLagIRpjUFeW5CO5hyciQ==
+
+"@rollup/rollup-win32-x64-msvc@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.52.5.tgz#1657f56326bbe0ac80eedc9f9c18fc1ddd24e107"
+  integrity sha512-TAcgQh2sSkykPRWLrdyy2AiceMckNf5loITqXxFI5VuQjS5tSuw3WlwdN8qv8vzjLAUTvYaH/mVjSFpbkFbpTg==
+
+"@rollup/rollup-win32-x64-msvc@4.57.1":
+  version "4.57.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.57.1.tgz#a03348e7b559c792b6277cc58874b89ef46e1e72"
+  integrity sha512-mxRFDdHIWRxg3UfIIAwCm6NzvxG0jDX/wBN6KsQFTvKFqqg9vTrWUE68qEjHt19A5wwx5X5aUi2zuZT7YR0jrA==
+
+"@standard-schema/spec@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@standard-schema/spec/-/spec-1.0.0.tgz#f193b73dc316c4170f2e82a881da0f550d551b9c"
+  integrity sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==
+
+"@swc/helpers@^0.5.0":
+  version "0.5.17"
+  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.17.tgz#5a7be95ac0f0bf186e7e6e890e7a6f6cda6ce971"
+  integrity sha512-5IKx/Y13RsYd+sauPb2x+U/xZikHjolzfuDgTAl/Tdf3Q8rslRvC19NKDLgAJQ6wsqADk10ntlv08nPFw/gO/A==
+  dependencies:
+    tslib "^2.8.0"
+
+"@tailwindcss/node@4.1.16":
+  version "4.1.16"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/node/-/node-4.1.16.tgz#4d0ca77955a7d03ed6afd68ebd798aed897298e0"
+  integrity sha512-BX5iaSsloNuvKNHRN3k2RcCuTEgASTo77mofW0vmeHkfrDWaoFAFvNHpEgtu0eqyypcyiBkDWzSMxJhp3AUVcw==
+  dependencies:
+    "@jridgewell/remapping" "^2.3.4"
+    enhanced-resolve "^5.18.3"
+    jiti "^2.6.1"
+    lightningcss "1.30.2"
+    magic-string "^0.30.19"
+    source-map-js "^1.2.1"
+    tailwindcss "4.1.16"
+
+"@tailwindcss/oxide-android-arm64@4.1.16":
+  version "4.1.16"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.1.16.tgz#9bd16c0a08db20d7c93907a9bd1564e0255307eb"
+  integrity sha512-8+ctzkjHgwDJ5caq9IqRSgsP70xhdhJvm+oueS/yhD5ixLhqTw9fSL1OurzMUhBwE5zK26FXLCz2f/RtkISqHA==
+
+"@tailwindcss/oxide-darwin-arm64@4.1.16":
+  version "4.1.16"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.16.tgz#72ac362b2c30a3912f8f0e8acbd4838918a1d11a"
+  integrity sha512-C3oZy5042v2FOALBZtY0JTDnGNdS6w7DxL/odvSny17ORUnaRKhyTse8xYi3yKGyfnTUOdavRCdmc8QqJYwFKA==
+
+"@tailwindcss/oxide-darwin-x64@4.1.16":
+  version "4.1.16"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.1.16.tgz#6193bafbb1a885795702f12bbef9cc5eb4cc550b"
+  integrity sha512-vjrl/1Ub9+JwU6BP0emgipGjowzYZMjbWCDqwA2Z4vCa+HBSpP4v6U2ddejcHsolsYxwL5r4bPNoamlV0xDdLg==
+
+"@tailwindcss/oxide-freebsd-x64@4.1.16":
+  version "4.1.16"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.1.16.tgz#0e2b064d71ba87a9001ac963be2752a8ddb64349"
+  integrity sha512-TSMpPYpQLm+aR1wW5rKuUuEruc/oOX3C7H0BTnPDn7W/eMw8W+MRMpiypKMkXZfwH8wqPIRKppuZoedTtNj2tg==
+
+"@tailwindcss/oxide-linux-arm-gnueabihf@4.1.16":
+  version "4.1.16"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.1.16.tgz#8e80c959eeda81a08ed955e23eb6d228287b9672"
+  integrity sha512-p0GGfRg/w0sdsFKBjMYvvKIiKy/LNWLWgV/plR4lUgrsxFAoQBFrXkZ4C0w8IOXfslB9vHK/JGASWD2IefIpvw==
+
+"@tailwindcss/oxide-linux-arm64-gnu@4.1.16":
+  version "4.1.16"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.1.16.tgz#d5f54910920fc5808122515f5208c5ecc1a40545"
+  integrity sha512-DoixyMmTNO19rwRPdqviTrG1rYzpxgyYJl8RgQvdAQUzxC1ToLRqtNJpU/ATURSKgIg6uerPw2feW0aS8SNr/w==
+
+"@tailwindcss/oxide-linux-arm64-musl@4.1.16":
+  version "4.1.16"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.1.16.tgz#67cdb932230ac47bf3bf5415ccc92417b27020ee"
+  integrity sha512-H81UXMa9hJhWhaAUca6bU2wm5RRFpuHImrwXBUvPbYb+3jo32I9VIwpOX6hms0fPmA6f2pGVlybO6qU8pF4fzQ==
+
+"@tailwindcss/oxide-linux-x64-gnu@4.1.16":
+  version "4.1.16"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.1.16.tgz#80ae0cfd8ebc970f239060ecdfdd07f6f6b14dce"
+  integrity sha512-ZGHQxDtFC2/ruo7t99Qo2TTIvOERULPl5l0K1g0oK6b5PGqjYMga+FcY1wIUnrUxY56h28FxybtDEla+ICOyew==
+
+"@tailwindcss/oxide-linux-x64-musl@4.1.16":
+  version "4.1.16"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.1.16.tgz#524e5b87e8e79a712de3d9bbb94d2fc2fa44391c"
+  integrity sha512-Oi1tAaa0rcKf1Og9MzKeINZzMLPbhxvm7rno5/zuP1WYmpiG0bEHq4AcRUiG2165/WUzvxkW4XDYCscZWbTLZw==
+
+"@tailwindcss/oxide-wasm32-wasi@4.1.16":
+  version "4.1.16"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.1.16.tgz#dc31d6bc1f6c1e8119a335ae3f28deb4d7c560f2"
+  integrity sha512-B01u/b8LteGRwucIBmCQ07FVXLzImWESAIMcUU6nvFt/tYsQ6IHz8DmZ5KtvmwxD+iTYBtM1xwoGXswnlu9v0Q==
+  dependencies:
+    "@emnapi/core" "^1.5.0"
+    "@emnapi/runtime" "^1.5.0"
+    "@emnapi/wasi-threads" "^1.1.0"
+    "@napi-rs/wasm-runtime" "^1.0.7"
+    "@tybys/wasm-util" "^0.10.1"
+    tslib "^2.4.0"
+
+"@tailwindcss/oxide-win32-arm64-msvc@4.1.16":
+  version "4.1.16"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.16.tgz#f1f810cdb49dae8071d5edf0db5cc0da2ec6a7e8"
+  integrity sha512-zX+Q8sSkGj6HKRTMJXuPvOcP8XfYON24zJBRPlszcH1Np7xuHXhWn8qfFjIujVzvH3BHU+16jBXwgpl20i+v9A==
+
+"@tailwindcss/oxide-win32-x64-msvc@4.1.16":
+  version "4.1.16"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.1.16.tgz#76dcda613578f06569c0a6015f39f12746a24dce"
+  integrity sha512-m5dDFJUEejbFqP+UXVstd4W/wnxA4F61q8SoL+mqTypId2T2ZpuxosNSgowiCnLp2+Z+rivdU0AqpfgiD7yCBg==
+
+"@tailwindcss/oxide@4.1.16":
+  version "4.1.16"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/oxide/-/oxide-4.1.16.tgz#6e94fa039eeddc173a9dc6ba5f8c5f54766b25cf"
+  integrity sha512-2OSv52FRuhdlgyOQqgtQHuCgXnS8nFSYRp2tJ+4WZXKgTxqPy7SMSls8c3mPT5pkZ17SBToGM5LHEJBO7miEdg==
+  optionalDependencies:
+    "@tailwindcss/oxide-android-arm64" "4.1.16"
+    "@tailwindcss/oxide-darwin-arm64" "4.1.16"
+    "@tailwindcss/oxide-darwin-x64" "4.1.16"
+    "@tailwindcss/oxide-freebsd-x64" "4.1.16"
+    "@tailwindcss/oxide-linux-arm-gnueabihf" "4.1.16"
+    "@tailwindcss/oxide-linux-arm64-gnu" "4.1.16"
+    "@tailwindcss/oxide-linux-arm64-musl" "4.1.16"
+    "@tailwindcss/oxide-linux-x64-gnu" "4.1.16"
+    "@tailwindcss/oxide-linux-x64-musl" "4.1.16"
+    "@tailwindcss/oxide-wasm32-wasi" "4.1.16"
+    "@tailwindcss/oxide-win32-arm64-msvc" "4.1.16"
+    "@tailwindcss/oxide-win32-x64-msvc" "4.1.16"
+
+"@tailwindcss/postcss@^4.1.12":
+  version "4.1.16"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/postcss/-/postcss-4.1.16.tgz#775a0531d377a595a70df4afacc6fc67f391a753"
+  integrity sha512-Qn3SFGPXYQMKR/UtqS+dqvPrzEeBZHrFA92maT4zijCVggdsXnDBMsPFJo1eArX3J+O+Gi+8pV4PkqjLCNBk3A==
+  dependencies:
+    "@alloc/quick-lru" "^5.2.0"
+    "@tailwindcss/node" "4.1.16"
+    "@tailwindcss/oxide" "4.1.16"
+    postcss "^8.4.41"
+    tailwindcss "4.1.16"
+
+"@tailwindcss/vite@^4.1.12":
+  version "4.1.16"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/vite/-/vite-4.1.16.tgz#bf6b5a58f932feeb1131720f8e15368f1a0ad17c"
+  integrity sha512-bbguNBcDxsRmi9nnlWJxhfDWamY3lmcyACHcdO1crxfzuLpOhHLLtEIN/nCbbAtj5rchUgQD17QVAKi1f7IsKg==
+  dependencies:
+    "@tailwindcss/node" "4.1.16"
+    "@tailwindcss/oxide" "4.1.16"
+    tailwindcss "4.1.16"
+
+"@tanstack/virtual-core@3.13.12":
+  version "3.13.12"
+  resolved "https://registry.yarnpkg.com/@tanstack/virtual-core/-/virtual-core-3.13.12.tgz#1dff176df9cc8f93c78c5e46bcea11079b397578"
+  integrity sha512-1YBOJfRHV4sXUmWsFSf5rQor4Ss82G8dQWLRbnk3GA4jeP8hQt1hxXh0tmflpC0dz3VgEv/1+qwPyLeWkQuPFA==
+
+"@tanstack/vue-virtual@^3.12.0":
+  version "3.13.12"
+  resolved "https://registry.yarnpkg.com/@tanstack/vue-virtual/-/vue-virtual-3.13.12.tgz#a66daac9e6822ce4bcba76a3954937440697c264"
+  integrity sha512-vhF7kEU9EXWXh+HdAwKJ2m3xaOnTTmgcdXcF2pim8g4GvI7eRrk2YRuV5nUlZnd/NbCIX4/Ja2OZu5EjJL06Ww==
+  dependencies:
+    "@tanstack/virtual-core" "3.13.12"
+
+"@ts-morph/common@~0.28.1":
+  version "0.28.1"
+  resolved "https://registry.yarnpkg.com/@ts-morph/common/-/common-0.28.1.tgz#10ec52182d5c310832b669af7784a34fc3da3ca1"
+  integrity sha512-W74iWf7ILp1ZKNYXY5qbddNaml7e9Sedv5lvU1V8lftlitkc9Pq1A+jlH23ltDgWYeZFFEqGCD1Ies9hqu3O+g==
+  dependencies:
+    minimatch "^10.0.1"
+    path-browserify "^1.0.1"
+    tinyglobby "^0.2.14"
+
+"@tybys/wasm-util@^0.10.1":
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/@tybys/wasm-util/-/wasm-util-0.10.1.tgz#ecddd3205cf1e2d5274649ff0eedd2991ed7f414"
+  integrity sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==
+  dependencies:
+    tslib "^2.4.0"
+
+"@types/chai@^5.2.2":
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-5.2.3.tgz#8e9cd9e1c3581fa6b341a5aed5588eb285be0b4a"
+  integrity sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==
+  dependencies:
+    "@types/deep-eql" "*"
+    assertion-error "^2.0.1"
+
+"@types/deep-eql@*":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@types/deep-eql/-/deep-eql-4.0.2.tgz#334311971d3a07121e7eb91b684a605e7eea9cbd"
+  integrity sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==
+
+"@types/estree@1.0.8", "@types/estree@^1.0.0":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.8.tgz#958b91c991b1867ced318bedea0e215ee050726e"
+  integrity sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==
+
+"@types/node@^22.12.0":
+  version "22.18.12"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.18.12.tgz#e165d87bc25d7bf6d3657035c914db7485de84fb"
+  integrity sha512-BICHQ67iqxQGFSzfCFTT7MRQ5XcBjG5aeKh5Ok38UBbPe5fxTyE+aHFxwVrGyr8GNlqFMLKD1D3P2K/1ks8tog==
+  dependencies:
+    undici-types "~6.21.0"
+
+"@types/web-bluetooth@^0.0.20":
+  version "0.0.20"
+  resolved "https://registry.yarnpkg.com/@types/web-bluetooth/-/web-bluetooth-0.0.20.tgz#f066abfcd1cbe66267cdbbf0de010d8a41b41597"
+  integrity sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==
+
+"@types/web-bluetooth@^0.0.21":
+  version "0.0.21"
+  resolved "https://registry.yarnpkg.com/@types/web-bluetooth/-/web-bluetooth-0.0.21.tgz#525433c784aed9b457aaa0ee3d92aeb71f346b63"
+  integrity sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA==
+
+"@typescript-eslint/eslint-plugin@8.46.2":
+  version "8.46.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.46.2.tgz#dc4ab93ee3d7e6c8e38820a0d6c7c93c7183e2dc"
+  integrity sha512-ZGBMToy857/NIPaaCucIUQgqueOiq7HeAKkhlvqVV4lm089zUFW6ikRySx2v+cAhKeUCPuWVHeimyk6Dw1iY3w==
+  dependencies:
+    "@eslint-community/regexpp" "^4.10.0"
+    "@typescript-eslint/scope-manager" "8.46.2"
+    "@typescript-eslint/type-utils" "8.46.2"
+    "@typescript-eslint/utils" "8.46.2"
+    "@typescript-eslint/visitor-keys" "8.46.2"
+    graphemer "^1.4.0"
+    ignore "^7.0.0"
+    natural-compare "^1.4.0"
+    ts-api-utils "^2.1.0"
+
+"@typescript-eslint/parser@8.46.2":
+  version "8.46.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.46.2.tgz#dd938d45d581ac8ffa9d8a418a50282b306f7ebf"
+  integrity sha512-BnOroVl1SgrPLywqxyqdJ4l3S2MsKVLDVxZvjI1Eoe8ev2r3kGDo+PcMihNmDE+6/KjkTubSJnmqGZZjQSBq/g==
+  dependencies:
+    "@typescript-eslint/scope-manager" "8.46.2"
+    "@typescript-eslint/types" "8.46.2"
+    "@typescript-eslint/typescript-estree" "8.46.2"
+    "@typescript-eslint/visitor-keys" "8.46.2"
+    debug "^4.3.4"
+
+"@typescript-eslint/project-service@8.46.2":
+  version "8.46.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.46.2.tgz#ab2f02a0de4da6a7eeb885af5e059be57819d608"
+  integrity sha512-PULOLZ9iqwI7hXcmL4fVfIsBi6AN9YxRc0frbvmg8f+4hQAjQ5GYNKK0DIArNo+rOKmR/iBYwkpBmnIwin4wBg==
+  dependencies:
+    "@typescript-eslint/tsconfig-utils" "^8.46.2"
+    "@typescript-eslint/types" "^8.46.2"
+    debug "^4.3.4"
+
+"@typescript-eslint/scope-manager@7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz#c928e7a9fc2c0b3ed92ab3112c614d6bd9951c83"
+  integrity sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==
+  dependencies:
+    "@typescript-eslint/types" "7.18.0"
+    "@typescript-eslint/visitor-keys" "7.18.0"
+
+"@typescript-eslint/scope-manager@8.46.2":
+  version "8.46.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.46.2.tgz#7d37df2493c404450589acb3b5d0c69cc0670a88"
+  integrity sha512-LF4b/NmGvdWEHD2H4MsHD8ny6JpiVNDzrSZr3CsckEgCbAGZbYM4Cqxvi9L+WqDMT+51Ozy7lt2M+d0JLEuBqA==
+  dependencies:
+    "@typescript-eslint/types" "8.46.2"
+    "@typescript-eslint/visitor-keys" "8.46.2"
+
+"@typescript-eslint/tsconfig-utils@8.46.2", "@typescript-eslint/tsconfig-utils@^8.46.2":
+  version "8.46.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.46.2.tgz#d110451cb93bbd189865206ea37ef677c196828c"
+  integrity sha512-a7QH6fw4S57+F5y2FIxxSDyi5M4UfGF+Jl1bCGd7+L4KsaUY80GsiF/t0UoRFDHAguKlBaACWJRmdrc6Xfkkag==
+
+"@typescript-eslint/type-utils@8.46.2":
+  version "8.46.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.46.2.tgz#802d027864e6fb752e65425ed09f3e089fb4d384"
+  integrity sha512-HbPM4LbaAAt/DjxXaG9yiS9brOOz6fabal4uvUmaUYe6l3K1phQDMQKBRUrr06BQkxkvIZVVHttqiybM9nJsLA==
+  dependencies:
+    "@typescript-eslint/types" "8.46.2"
+    "@typescript-eslint/typescript-estree" "8.46.2"
+    "@typescript-eslint/utils" "8.46.2"
+    debug "^4.3.4"
+    ts-api-utils "^2.1.0"
+
+"@typescript-eslint/types@7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.18.0.tgz#b90a57ccdea71797ffffa0321e744f379ec838c9"
+  integrity sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==
+
+"@typescript-eslint/types@8.46.2", "@typescript-eslint/types@^8.46.2":
+  version "8.46.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.46.2.tgz#2bad7348511b31e6e42579820e62b73145635763"
+  integrity sha512-lNCWCbq7rpg7qDsQrd3D6NyWYu+gkTENkG5IKYhUIcxSb59SQC/hEQ+MrG4sTgBVghTonNWq42bA/d4yYumldQ==
+
+"@typescript-eslint/typescript-estree@7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz#b5868d486c51ce8f312309ba79bdb9f331b37931"
+  integrity sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==
+  dependencies:
+    "@typescript-eslint/types" "7.18.0"
+    "@typescript-eslint/visitor-keys" "7.18.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    minimatch "^9.0.4"
+    semver "^7.6.0"
+    ts-api-utils "^1.3.0"
+
+"@typescript-eslint/typescript-estree@8.46.2":
+  version "8.46.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.46.2.tgz#ab547a27e4222bb6a3281cb7e98705272e2c7d08"
+  integrity sha512-f7rW7LJ2b7Uh2EiQ+7sza6RDZnajbNbemn54Ob6fRwQbgcIn+GWfyuHDHRYgRoZu1P4AayVScrRW+YfbTvPQoQ==
+  dependencies:
+    "@typescript-eslint/project-service" "8.46.2"
+    "@typescript-eslint/tsconfig-utils" "8.46.2"
+    "@typescript-eslint/types" "8.46.2"
+    "@typescript-eslint/visitor-keys" "8.46.2"
+    debug "^4.3.4"
+    fast-glob "^3.3.2"
+    is-glob "^4.0.3"
+    minimatch "^9.0.4"
+    semver "^7.6.0"
+    ts-api-utils "^2.1.0"
+
+"@typescript-eslint/utils@8.46.2":
+  version "8.46.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.46.2.tgz#b313d33d67f9918583af205bd7bcebf20f231732"
+  integrity sha512-sExxzucx0Tud5tE0XqR0lT0psBQvEpnpiul9XbGUB1QwpWJJAps1O/Z7hJxLGiZLBKMCutjTzDgmd1muEhBnVg==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.7.0"
+    "@typescript-eslint/scope-manager" "8.46.2"
+    "@typescript-eslint/types" "8.46.2"
+    "@typescript-eslint/typescript-estree" "8.46.2"
+
+"@typescript-eslint/utils@^7.7.1":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.18.0.tgz#bca01cde77f95fc6a8d5b0dbcbfb3d6ca4be451f"
+  integrity sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.4.0"
+    "@typescript-eslint/scope-manager" "7.18.0"
+    "@typescript-eslint/types" "7.18.0"
+    "@typescript-eslint/typescript-estree" "7.18.0"
+
+"@typescript-eslint/visitor-keys@7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz#0564629b6124d67607378d0f0332a0495b25e7d7"
+  integrity sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==
+  dependencies:
+    "@typescript-eslint/types" "7.18.0"
+    eslint-visitor-keys "^3.4.3"
+
+"@typescript-eslint/visitor-keys@8.46.2":
+  version "8.46.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.46.2.tgz#803fa298948c39acf810af21bdce6f8babfa9738"
+  integrity sha512-tUFMXI4gxzzMXt4xpGJEsBsTox0XbNQ1y94EwlD/CuZwFcQP79xfQqMhau9HsRc/J0cAPA/HZt1dZPtGn9V/7w==
+  dependencies:
+    "@typescript-eslint/types" "8.46.2"
+    eslint-visitor-keys "^4.2.1"
+
+"@ungap/structured-clone@^1.2.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.3.0.tgz#d06bbb384ebcf6c505fde1c3d0ed4ddffe0aaff8"
+  integrity sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==
+
+"@unovue/detypes@^0.8.5":
+  version "0.8.5"
+  resolved "https://registry.yarnpkg.com/@unovue/detypes/-/detypes-0.8.5.tgz#7e620319ad21a679dfdb18fcb7644b71041d6843"
+  integrity sha512-Yz4JeWOHGa+w/3YudVdng8hgN/VGW9cvp8xmFkmPPFzalGblLPPSpIRiwVo853yLstMZO2LLwe0vOoLAQsUQXw==
+  dependencies:
+    "@babel/core" "^7.24.5"
+    "@babel/preset-typescript" "^7.24.1"
+    "@vue/compiler-dom" "^3.4.27"
+    "@vue/compiler-sfc" "^3.4.27"
+    "@vuedx/template-ast-types" "0.7.1"
+    fast-glob "^3.3.2"
+    prettier "^3.2.5"
+    typescript "^5.4.5"
+
+"@vitejs/plugin-vue@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-6.0.1.tgz#4c7f559621af104a22255c6ace5626e6d8349689"
+  integrity sha512-+MaE752hU0wfPFJEUAIxqw18+20euHHdxVtMvbFcOEpjEyfqXH/5DCoTHiVJ0J29EhTJdoTkjEv5YBKU9dnoTw==
+  dependencies:
+    "@rolldown/pluginutils" "1.0.0-beta.29"
+
+"@vitest/coverage-v8@^2.1.0":
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/@vitest/coverage-v8/-/coverage-v8-2.1.9.tgz#060bebfe3705c1023bdc220e17fdea4bd9e2b24d"
+  integrity sha512-Z2cOr0ksM00MpEfyVE8KXIYPEcBFxdbLSs56L8PO0QQMxt/6bDj45uQfxoc96v05KW3clk7vvgP0qfDit9DmfQ==
+  dependencies:
+    "@ampproject/remapping" "^2.3.0"
+    "@bcoe/v8-coverage" "^0.2.3"
+    debug "^4.3.7"
+    istanbul-lib-coverage "^3.2.2"
+    istanbul-lib-report "^3.0.1"
+    istanbul-lib-source-maps "^5.0.6"
+    istanbul-reports "^3.1.7"
+    magic-string "^0.30.12"
+    magicast "^0.3.5"
+    std-env "^3.8.0"
+    test-exclude "^7.0.1"
+    tinyrainbow "^1.2.0"
+
+"@vitest/coverage-v8@^4.0.0":
+  version "4.0.14"
+  resolved "https://registry.yarnpkg.com/@vitest/coverage-v8/-/coverage-v8-4.0.14.tgz#1d8da6604dedb343c0bda7359a3d6b1ea97b290e"
+  integrity sha512-EYHLqN/BY6b47qHH7gtMxAg++saoGmsjWmAq9MlXxAz4M0NcHh9iOyKhBZyU4yxZqOd8Xnqp80/5saeitz4Cng==
+  dependencies:
+    "@bcoe/v8-coverage" "^1.0.2"
+    "@vitest/utils" "4.0.14"
+    ast-v8-to-istanbul "^0.3.8"
+    istanbul-lib-coverage "^3.2.2"
+    istanbul-lib-report "^3.0.1"
+    istanbul-lib-source-maps "^5.0.6"
+    istanbul-reports "^3.2.0"
+    magicast "^0.5.1"
+    obug "^2.1.1"
+    std-env "^3.10.0"
+    tinyrainbow "^3.0.3"
+
+"@vitest/expect@2.1.9":
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-2.1.9.tgz#b566ea20d58ea6578d8dc37040d6c1a47ebe5ff8"
+  integrity sha512-UJCIkTBenHeKT1TTlKMJWy1laZewsRIzYighyYiJKZreqtdxSos/S1t+ktRMQWu2CKqaarrkeszJx1cgC5tGZw==
+  dependencies:
+    "@vitest/spy" "2.1.9"
+    "@vitest/utils" "2.1.9"
+    chai "^5.1.2"
+    tinyrainbow "^1.2.0"
+
+"@vitest/expect@4.0.14":
+  version "4.0.14"
+  resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-4.0.14.tgz#4537af3f55ad78c7f1eba4bd3bdfadb22ae8a592"
+  integrity sha512-RHk63V3zvRiYOWAV0rGEBRO820ce17hz7cI2kDmEdfQsBjT2luEKB5tCOc91u1oSQoUOZkSv3ZyzkdkSLD7lKw==
+  dependencies:
+    "@standard-schema/spec" "^1.0.0"
+    "@types/chai" "^5.2.2"
+    "@vitest/spy" "4.0.14"
+    "@vitest/utils" "4.0.14"
+    chai "^6.2.1"
+    tinyrainbow "^3.0.3"
+
+"@vitest/mocker@2.1.9":
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/@vitest/mocker/-/mocker-2.1.9.tgz#36243b27351ca8f4d0bbc4ef91594ffd2dc25ef5"
+  integrity sha512-tVL6uJgoUdi6icpxmdrn5YNo3g3Dxv+IHJBr0GXHaEdTcw3F+cPKnsXFhli6nO+f/6SDKPHEK1UN+k+TQv0Ehg==
+  dependencies:
+    "@vitest/spy" "2.1.9"
+    estree-walker "^3.0.3"
+    magic-string "^0.30.12"
+
+"@vitest/mocker@4.0.14":
+  version "4.0.14"
+  resolved "https://registry.yarnpkg.com/@vitest/mocker/-/mocker-4.0.14.tgz#e38fa5e78aac8421fd38b1054a3fa3c8c2e35ccd"
+  integrity sha512-RzS5NujlCzeRPF1MK7MXLiEFpkIXeMdQ+rN3Kk3tDI9j0mtbr7Nmuq67tpkOJQpgyClbOltCXMjLZicJHsH5Cg==
+  dependencies:
+    "@vitest/spy" "4.0.14"
+    estree-walker "^3.0.3"
+    magic-string "^0.30.21"
+
+"@vitest/pretty-format@2.1.9", "@vitest/pretty-format@^2.1.9":
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/@vitest/pretty-format/-/pretty-format-2.1.9.tgz#434ff2f7611689f9ce70cd7d567eceb883653fdf"
+  integrity sha512-KhRIdGV2U9HOUzxfiHmY8IFHTdqtOhIzCpd8WRdJiE7D/HUcZVD0EgQCVjm+Q9gkUXWgBvMmTtZgIG48wq7sOQ==
+  dependencies:
+    tinyrainbow "^1.2.0"
+
+"@vitest/pretty-format@4.0.14":
+  version "4.0.14"
+  resolved "https://registry.yarnpkg.com/@vitest/pretty-format/-/pretty-format-4.0.14.tgz#ea47e561008298f0fa6ab2e56f35f18d9130b1e8"
+  integrity sha512-SOYPgujB6TITcJxgd3wmsLl+wZv+fy3av2PpiPpsWPZ6J1ySUYfScfpIt2Yv56ShJXR2MOA6q2KjKHN4EpdyRQ==
+  dependencies:
+    tinyrainbow "^3.0.3"
+
+"@vitest/runner@2.1.9":
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-2.1.9.tgz#cc18148d2d797fd1fd5908d1f1851d01459be2f6"
+  integrity sha512-ZXSSqTFIrzduD63btIfEyOmNcBmQvgOVsPNPe0jYtESiXkhd8u2erDLnMxmGrDCwHCCHE7hxwRDCT3pt0esT4g==
+  dependencies:
+    "@vitest/utils" "2.1.9"
+    pathe "^1.1.2"
+
+"@vitest/runner@4.0.14":
+  version "4.0.14"
+  resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-4.0.14.tgz#fa406dd854d29f41fc97b88a748f61b61b39172a"
+  integrity sha512-BsAIk3FAqxICqREbX8SetIteT8PiaUL/tgJjmhxJhCsigmzzH8xeadtp7LRnTpCVzvf0ib9BgAfKJHuhNllKLw==
+  dependencies:
+    "@vitest/utils" "4.0.14"
+    pathe "^2.0.3"
+
+"@vitest/snapshot@2.1.9":
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/@vitest/snapshot/-/snapshot-2.1.9.tgz#24260b93f798afb102e2dcbd7e61c6dfa118df91"
+  integrity sha512-oBO82rEjsxLNJincVhLhaxxZdEtV0EFHMK5Kmx5sJ6H9L183dHECjiefOAdnqpIgT5eZwT04PoggUnW88vOBNQ==
+  dependencies:
+    "@vitest/pretty-format" "2.1.9"
+    magic-string "^0.30.12"
+    pathe "^1.1.2"
+
+"@vitest/snapshot@4.0.14":
+  version "4.0.14"
+  resolved "https://registry.yarnpkg.com/@vitest/snapshot/-/snapshot-4.0.14.tgz#be9a10e71550ec22eabaf2be8f519a524ff2a31b"
+  integrity sha512-aQVBfT1PMzDSA16Y3Fp45a0q8nKexx6N5Amw3MX55BeTeZpoC08fGqEZqVmPcqN0ueZsuUQ9rriPMhZ3Mu19Ag==
+  dependencies:
+    "@vitest/pretty-format" "4.0.14"
+    magic-string "^0.30.21"
+    pathe "^2.0.3"
+
+"@vitest/spy@2.1.9":
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-2.1.9.tgz#cb28538c5039d09818b8bfa8edb4043c94727c60"
+  integrity sha512-E1B35FwzXXTs9FHNK6bDszs7mtydNi5MIfUWpceJ8Xbfb1gBMscAnwLbEu+B44ed6W3XjL9/ehLPHR1fkf1KLQ==
+  dependencies:
+    tinyspy "^3.0.2"
+
+"@vitest/spy@4.0.14":
+  version "4.0.14"
+  resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-4.0.14.tgz#b13c50b1a34a0bdc63ad4a3162b4e16b61960638"
+  integrity sha512-JmAZT1UtZooO0tpY3GRyiC/8W7dCs05UOq9rfsUUgEZEdq+DuHLmWhPsrTt0TiW7WYeL/hXpaE07AZ2RCk44hg==
+
+"@vitest/ui@^2.1.0":
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/@vitest/ui/-/ui-2.1.9.tgz#9e876cf3caf492dd6fddbd7f87b2d6bf7186a7a9"
+  integrity sha512-izzd2zmnk8Nl5ECYkW27328RbQ1nKvkm6Bb5DAaz1Gk59EbLkiCMa6OLT0NoaAYTjOFS6N+SMYW1nh4/9ljPiw==
+  dependencies:
+    "@vitest/utils" "2.1.9"
+    fflate "^0.8.2"
+    flatted "^3.3.1"
+    pathe "^1.1.2"
+    sirv "^3.0.0"
+    tinyglobby "^0.2.10"
+    tinyrainbow "^1.2.0"
+
+"@vitest/ui@^4.0.0":
+  version "4.0.14"
+  resolved "https://registry.yarnpkg.com/@vitest/ui/-/ui-4.0.14.tgz#f48ab72f96275a46fa7e88557f4d5069e58a7590"
+  integrity sha512-fvDz8o7SQpFLoSBo6Cudv+fE85/fPCkwTnLAN85M+Jv7k59w2mSIjT9Q5px7XwGrmYqqKBEYxh/09IBGd1E7AQ==
+  dependencies:
+    "@vitest/utils" "4.0.14"
+    fflate "^0.8.2"
+    flatted "^3.3.3"
+    pathe "^2.0.3"
+    sirv "^3.0.2"
+    tinyglobby "^0.2.15"
+    tinyrainbow "^3.0.3"
+
+"@vitest/utils@2.1.9":
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-2.1.9.tgz#4f2486de8a54acf7ecbf2c5c24ad7994a680a6c1"
+  integrity sha512-v0psaMSkNJ3A2NMrUEHFRzJtDPFn+/VWZ5WxImB21T9fjucJRmS7xCS3ppEnARb9y11OAzaD+P2Ps+b+BGX5iQ==
+  dependencies:
+    "@vitest/pretty-format" "2.1.9"
+    loupe "^3.1.2"
+    tinyrainbow "^1.2.0"
+
+"@vitest/utils@4.0.14":
+  version "4.0.14"
+  resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-4.0.14.tgz#67eeb19012e1bcbe853303100ae52690a09f4726"
+  integrity sha512-hLqXZKAWNg8pI+SQXyXxWCTOpA3MvsqcbVeNgSi8x/CSN2wi26dSzn1wrOhmCmFjEvN9p8/kLFRHa6PI8jHazw==
+  dependencies:
+    "@vitest/pretty-format" "4.0.14"
+    tinyrainbow "^3.0.3"
+
+"@volar/language-core@2.4.23":
+  version "2.4.23"
+  resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-2.4.23.tgz#deb6dbc5fdbafa9bb7ba691fc59cb196cdb856d3"
+  integrity sha512-hEEd5ET/oSmBC6pi1j6NaNYRWoAiDhINbT8rmwtINugR39loROSlufGdYMF9TaKGfz+ViGs1Idi3mAhnuPcoGQ==
+  dependencies:
+    "@volar/source-map" "2.4.23"
+
+"@volar/source-map@2.4.23":
+  version "2.4.23"
+  resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-2.4.23.tgz#d476e11a3a669d89858a5eb38b02342be39b0e44"
+  integrity sha512-Z1Uc8IB57Lm6k7q6KIDu/p+JWtf3xsXJqAX/5r18hYOTpJyBn0KXUR8oTJ4WFYOcDzWC9n3IflGgHowx6U6z9Q==
+
+"@volar/typescript@2.4.23":
+  version "2.4.23"
+  resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-2.4.23.tgz#b9b114ea01ad0ad977139edda0239fdafdb21ad7"
+  integrity sha512-lAB5zJghWxVPqfcStmAP1ZqQacMpe90UrP5RJ3arDyrhy4aCUQqmxPPLB2PWDKugvylmO41ljK7vZ+t6INMTag==
+  dependencies:
+    "@volar/language-core" "2.4.23"
+    path-browserify "^1.0.1"
+    vscode-uri "^3.0.8"
+
+"@vue-flow/background@^1.3.2":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@vue-flow/background/-/background-1.3.2.tgz#0c90cd05e5d60da017bbaf5a1c3eb6af7ed9b778"
+  integrity sha512-eJPhDcLj1wEo45bBoqTXw1uhl0yK2RaQGnEINqvvBsAFKh/camHJd5NPmOdS1w+M9lggc9igUewxaEd3iCQX2w==
+
+"@vue-flow/controls@^1.1.3":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@vue-flow/controls/-/controls-1.1.3.tgz#40866b553101fbef22d2b9a043965ed76fca4b2c"
+  integrity sha512-XCf+G+jCvaWURdFlZmOjifZGw3XMhN5hHlfMGkWh9xot+9nH9gdTZtn+ldIJKtarg3B21iyHU8JjKDhYcB6JMw==
+
+"@vue-flow/core@^1.47.0":
+  version "1.48.0"
+  resolved "https://registry.yarnpkg.com/@vue-flow/core/-/core-1.48.0.tgz#cdc855b13477edcab860f3c0296850c88fca73b5"
+  integrity sha512-keW9HGaEZEe4SKYtrzp5E+qSGJ5/z+9i2yRDtCr3o72IUnS0Ns1qQNsIbGGz0ygpKzg6LdtbVLWeYAvl3dzLQA==
+  dependencies:
+    "@vueuse/core" "^10.5.0"
+    d3-drag "^3.0.0"
+    d3-interpolate "^3.0.1"
+    d3-selection "^3.0.0"
+    d3-zoom "^3.0.0"
+
+"@vue-flow/minimap@^1.5.4":
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/@vue-flow/minimap/-/minimap-1.5.4.tgz#c9c3badea49d4166aa9cdc713017397d9df7574c"
+  integrity sha512-l4C+XTAXnRxsRpUdN7cAVFBennC1sVRzq4bDSpVK+ag7tdMczAnhFYGgbLkUw3v3sY6gokyWwMl8CDonp8eB2g==
+  dependencies:
+    d3-selection "^3.0.0"
+    d3-zoom "^3.0.0"
+
+"@vue/compiler-core@3.5.22", "@vue/compiler-core@^3.0.0":
+  version "3.5.22"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.5.22.tgz#bb8294a0dd31df540563cc6ffa0456f1f7687b97"
+  integrity sha512-jQ0pFPmZwTEiRNSb+i9Ow/I/cHv2tXYqsnHKKyCQ08irI2kdF5qmYedmF8si8mA7zepUFmJ2hqzS8CQmNOWOkQ==
+  dependencies:
+    "@babel/parser" "^7.28.4"
+    "@vue/shared" "3.5.22"
+    entities "^4.5.0"
+    estree-walker "^2.0.2"
+    source-map-js "^1.2.1"
+
+"@vue/compiler-dom@3.5.22", "@vue/compiler-dom@^3.4.27", "@vue/compiler-dom@^3.5.0":
+  version "3.5.22"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.5.22.tgz#6c9c2c9843520f6d3dbc685e5d0e1e12a2c04c56"
+  integrity sha512-W8RknzUM1BLkypvdz10OVsGxnMAuSIZs9Wdx1vzA3mL5fNMN15rhrSCLiTm6blWeACwUwizzPVqGJgOGBEN/hA==
+  dependencies:
+    "@vue/compiler-core" "3.5.22"
+    "@vue/shared" "3.5.22"
+
+"@vue/compiler-sfc@3.5.22", "@vue/compiler-sfc@^3.4.27", "@vue/compiler-sfc@^3.5":
+  version "3.5.22"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.5.22.tgz#663a8483b1dda8de83b6fa1aab38a52bf73dd965"
+  integrity sha512-tbTR1zKGce4Lj+JLzFXDq36K4vcSZbJ1RBu8FxcDv1IGRz//Dh2EBqksyGVypz3kXpshIfWKGOCcqpSbyGWRJQ==
+  dependencies:
+    "@babel/parser" "^7.28.4"
+    "@vue/compiler-core" "3.5.22"
+    "@vue/compiler-dom" "3.5.22"
+    "@vue/compiler-ssr" "3.5.22"
+    "@vue/shared" "3.5.22"
+    estree-walker "^2.0.2"
+    magic-string "^0.30.19"
+    postcss "^8.5.6"
+    source-map-js "^1.2.1"
+
+"@vue/compiler-ssr@3.5.22":
+  version "3.5.22"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.5.22.tgz#a0ef16e364731b25e79a13470569066af101320f"
+  integrity sha512-GdgyLvg4R+7T8Nk2Mlighx7XGxq/fJf9jaVofc3IL0EPesTE86cP/8DD1lT3h1JeZr2ySBvyqKQJgbS54IX1Ww==
+  dependencies:
+    "@vue/compiler-dom" "3.5.22"
+    "@vue/shared" "3.5.22"
+
+"@vue/language-core@3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@vue/language-core/-/language-core-3.1.2.tgz#0ab203a1f800d2b3143ee31f651841eb3c3db596"
+  integrity sha512-PyFDCqpdfYUT+oMLqcc61oHfJlC6yjhybaefwQjRdkchIihToOEpJ2Wu/Ebq2yrnJdd1EsaAvZaXVAqcxtnDxQ==
+  dependencies:
+    "@volar/language-core" "2.4.23"
+    "@vue/compiler-dom" "^3.5.0"
+    "@vue/shared" "^3.5.0"
+    alien-signals "^3.0.0"
+    muggle-string "^0.4.1"
+    path-browserify "^1.0.1"
+    picomatch "^4.0.2"
+
+"@vue/reactivity@3.5.22":
+  version "3.5.22"
+  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.5.22.tgz#9b26f8557c96df46c9a859914a2229f3ca5b8f4f"
+  integrity sha512-f2Wux4v/Z2pqc9+4SmgZC1p73Z53fyD90NFWXiX9AKVnVBEvLFOWCEgJD3GdGnlxPZt01PSlfmLqbLYzY/Fw4A==
+  dependencies:
+    "@vue/shared" "3.5.22"
+
+"@vue/runtime-core@3.5.22":
+  version "3.5.22"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.5.22.tgz#e004c1e35f423555a0e4c10646ef3e9d380643d1"
+  integrity sha512-EHo4W/eiYeAzRTN5PCextDUZ0dMs9I8mQ2Fy+OkzvRPUYQEyK9yAjbasrMCXbLNhF7P0OUyivLjIy0yc6VrLJQ==
+  dependencies:
+    "@vue/reactivity" "3.5.22"
+    "@vue/shared" "3.5.22"
+
+"@vue/runtime-dom@3.5.22":
+  version "3.5.22"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.5.22.tgz#01276cea7cb9ac2b9aba046adfb5903b494e2e7e"
+  integrity sha512-Av60jsryAkI023PlN7LsqrfPvwfxOd2yAwtReCjeuugTJTkgrksYJJstg1e12qle0NarkfhfFu1ox2D+cQotww==
+  dependencies:
+    "@vue/reactivity" "3.5.22"
+    "@vue/runtime-core" "3.5.22"
+    "@vue/shared" "3.5.22"
+    csstype "^3.1.3"
+
+"@vue/server-renderer@3.5.22":
+  version "3.5.22"
+  resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.5.22.tgz#d134e3409094044bd066d9803714677457756157"
+  integrity sha512-gXjo+ao0oHYTSswF+a3KRHZ1WszxIqO7u6XwNHqcqb9JfyIL/pbWrrh/xLv7jeDqla9u+LK7yfZKHih1e1RKAQ==
+  dependencies:
+    "@vue/compiler-ssr" "3.5.22"
+    "@vue/shared" "3.5.22"
+
+"@vue/shared@3.5.22", "@vue/shared@^3.5.0":
+  version "3.5.22"
+  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.5.22.tgz#9d56a1644a3becb8af1e34655928b0e288d827f8"
+  integrity sha512-F4yc6palwq3TT0u+FYf0Ns4Tfl9GRFURDN2gWG7L1ecIaS/4fCIuFOjMTnCyjsu/OK6vaDKLCrGAa+KvvH+h4w==
+
+"@vue/test-utils@^2.4.6":
+  version "2.4.6"
+  resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-2.4.6.tgz#7d534e70c4319d2a587d6a3b45a39e9695ade03c"
+  integrity sha512-FMxEjOpYNYiFe0GkaHsnJPXFHxQ6m4t8vI/ElPGpMWxZKpmRvQ33OIrvRXemy6yha03RxhOlQuy+gZMC3CQSow==
+  dependencies:
+    js-beautify "^1.14.9"
+    vue-component-type-helpers "^2.0.0"
+
+"@vue/tsconfig@^0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@vue/tsconfig/-/tsconfig-0.7.0.tgz#67044c847b7a137b8cbfd6b23104c36dbaf80d1d"
+  integrity sha512-ku2uNz5MaZ9IerPPUyOHzyjhXoX2kVJaVf7hL315DC17vS6IiZRmmCPfggNbU16QTvM80+uYYy3eYJB59WCtvg==
+
+"@vuedx/template-ast-types@0.7.1":
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/@vuedx/template-ast-types/-/template-ast-types-0.7.1.tgz#ccc75786a4fe1d1910f6c8d93d150d44ee1dabdc"
+  integrity sha512-Mqugk/F0lFN2u9bhimH6G1kSu2hhLi2WoqgCVxrMvgxm2kDc30DtdvVGRq+UgEmKVP61OudcMtZqkUoGQeFBUQ==
+  dependencies:
+    "@vue/compiler-core" "^3.0.0"
+
+"@vueuse/core@^10.5.0":
+  version "10.11.1"
+  resolved "https://registry.yarnpkg.com/@vueuse/core/-/core-10.11.1.tgz#15d2c0b6448d2212235b23a7ba29c27173e0c2c6"
+  integrity sha512-guoy26JQktXPcz+0n3GukWIy/JDNKti9v6VEMu6kV2sYBsWuGiTU8OWdg+ADfUbHg3/3DlqySDe7JmdHrktiww==
+  dependencies:
+    "@types/web-bluetooth" "^0.0.20"
+    "@vueuse/metadata" "10.11.1"
+    "@vueuse/shared" "10.11.1"
+    vue-demi ">=0.14.8"
+
+"@vueuse/core@^12.5.0":
+  version "12.8.2"
+  resolved "https://registry.yarnpkg.com/@vueuse/core/-/core-12.8.2.tgz#007c6dd29a7d1f6933e916e7a2f8ef3c3f968eaa"
+  integrity sha512-HbvCmZdzAu3VGi/pWYm5Ut+Kd9mn1ZHnn4L5G8kOQTPs/IwIAmJoBrmYk2ckLArgMXZj0AW3n5CAejLUO+PhdQ==
+  dependencies:
+    "@types/web-bluetooth" "^0.0.21"
+    "@vueuse/metadata" "12.8.2"
+    "@vueuse/shared" "12.8.2"
+    vue "^3.5.13"
+
+"@vueuse/metadata@10.11.1":
+  version "10.11.1"
+  resolved "https://registry.yarnpkg.com/@vueuse/metadata/-/metadata-10.11.1.tgz#209db7bb5915aa172a87510b6de2ca01cadbd2a7"
+  integrity sha512-IGa5FXd003Ug1qAZmyE8wF3sJ81xGLSqTqtQ6jaVfkeZ4i5kS2mwQF61yhVqojRnenVew5PldLyRgvdl4YYuSw==
+
+"@vueuse/metadata@12.8.2":
+  version "12.8.2"
+  resolved "https://registry.yarnpkg.com/@vueuse/metadata/-/metadata-12.8.2.tgz#6cb3a4e97cdcf528329eebc1bda73cd7f64318d3"
+  integrity sha512-rAyLGEuoBJ/Il5AmFHiziCPdQzRt88VxR+Y/A/QhJ1EWtWqPBBAxTAFaSkviwEuOEZNtW8pvkPgoCZQ+HxqW1A==
+
+"@vueuse/shared@10.11.1":
+  version "10.11.1"
+  resolved "https://registry.yarnpkg.com/@vueuse/shared/-/shared-10.11.1.tgz#62b84e3118ae6e1f3ff38f4fbe71b0c5d0f10938"
+  integrity sha512-LHpC8711VFZlDaYUXEBbFBCQ7GS3dVU9mjOhhMhXP6txTV4EhYQg/KGnQuvt/sPAtoUKq7VVUnL6mVtFoL42sA==
+  dependencies:
+    vue-demi ">=0.14.8"
+
+"@vueuse/shared@12.8.2", "@vueuse/shared@^12.5.0":
+  version "12.8.2"
+  resolved "https://registry.yarnpkg.com/@vueuse/shared/-/shared-12.8.2.tgz#b9e4611d0603629c8e151f982459da394e22f930"
+  integrity sha512-dznP38YzxZoNloI0qpEfpkms8knDtaoQ6Y/sfS0L7Yki4zh40LFHEhur0odJC6xTHG5dxWVPiUWBXn+wCG2s5w==
+  dependencies:
+    vue "^3.5.13"
+
+abbrev@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-2.0.0.tgz#cf59829b8b4f03f89dda2771cb7f3653828c89bf"
+  integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==
+
+accepts@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-2.0.0.tgz#bbcf4ba5075467f3f2131eab3cffc73c2f5d7895"
+  integrity sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==
+  dependencies:
+    mime-types "^3.0.0"
+    negotiator "^1.0.0"
+
+acorn-jsx@^5.3.2:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
+  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
+
+acorn@^8.15.0, acorn@^8.9.0:
+  version "8.15.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.15.0.tgz#a360898bc415edaac46c8241f6383975b930b816"
+  integrity sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==
+
+agent-base@^7.1.0, agent-base@^7.1.2:
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.4.tgz#e3cd76d4c548ee895d3c3fd8dc1f6c5b9032e7a8"
+  integrity sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==
+
+ajv@^6.12.4, ajv@^6.12.6:
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+ajv@^8.0.1:
+  version "8.17.1"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.17.1.tgz#37d9a5c776af6bc92d7f4f9510eba4c0a60d11a6"
+  integrity sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+    fast-uri "^3.0.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
+
+alien-signals@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/alien-signals/-/alien-signals-3.0.3.tgz#f54e89180e490a9577e4f6f7203720e4335a8715"
+  integrity sha512-2JXjom6R7ZwrISpUphLhf4htUq1aKRCennTJ6u9kFfr3sLmC9+I4CxxVi+McoFnIg+p1HnVrfLT/iCt4Dlz//Q==
+
+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+
+ansi-regex@^6.0.1:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.2.2.tgz#60216eea464d864597ce2832000738a0589650c1"
+  integrity sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==
+
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
+ansi-styles@^6.1.0:
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.3.tgz#c044d5dcc521a076413472597a1acb1f103c4041"
+  integrity sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==
+
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
+aria-hidden@^1.2.4:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/aria-hidden/-/aria-hidden-1.2.6.tgz#73051c9b088114c795b1ea414e9c0fff874ffc1a"
+  integrity sha512-ik3ZgC9dY/lYVVM++OISsaYDeg1tb0VtP5uL3ouh1koGOaUMDPpbFIei4JkFimWUFPn90sbMNMXQAIVOlnYKJA==
+  dependencies:
+    tslib "^2.0.0"
+
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+
+assertion-error@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-2.0.1.tgz#f641a196b335690b1070bf00b6e7593fec190bf7"
+  integrity sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==
+
+ast-types-x@1.18.0:
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/ast-types-x/-/ast-types-x-1.18.0.tgz#b668fde34668ed9b1cbfcdcd4670b984640a39ad"
+  integrity sha512-ZtfIlyTCmnAXPCQo4mSDtFsHL7L3q0sJfpVYPmy5uYPjs+fynzOuc1Cg6yQ9fF6h61RjEWtOlRFwV1Kc80Qs6A==
+  dependencies:
+    tslib "^2.0.1"
+
+"ast-types@npm:ast-types-x@1.18.0":
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/ast-types-x/-/ast-types-x-1.18.0.tgz#b668fde34668ed9b1cbfcdcd4670b984640a39ad"
+  integrity sha512-ZtfIlyTCmnAXPCQo4mSDtFsHL7L3q0sJfpVYPmy5uYPjs+fynzOuc1Cg6yQ9fF6h61RjEWtOlRFwV1Kc80Qs6A==
+  dependencies:
+    tslib "^2.0.1"
+
+ast-v8-to-istanbul@^0.3.8:
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/ast-v8-to-istanbul/-/ast-v8-to-istanbul-0.3.8.tgz#0a3faf070dc780dcebdf9d48af78dbd174a497a9"
+  integrity sha512-szgSZqUxI5T8mLKvS7WTjF9is+MVbOeLADU73IseOcrqhxr/VAvy6wfoVE39KnKzA7JRhjF5eUagNlHwvZPlKQ==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.31"
+    estree-walker "^3.0.3"
+    js-tokens "^9.0.1"
+
+astral-regex@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
+  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
+
+atob@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
+
+balanced-match@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+
+baseline-browser-mapping@^2.8.19:
+  version "2.8.20"
+  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.8.20.tgz#6766cf270f3668d20b6712b9c54cc911b87da714"
+  integrity sha512-JMWsdF+O8Orq3EMukbUN1QfbLK9mX2CkUmQBcW2T0s8OmdAUL5LLM/6wFwSrqXzlXB13yhyK9gTKS1rIizOduQ==
+
+body-parser@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-2.2.0.tgz#f7a9656de305249a715b549b7b8fd1ab9dfddcfa"
+  integrity sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==
+  dependencies:
+    bytes "^3.1.2"
+    content-type "^1.0.5"
+    debug "^4.4.0"
+    http-errors "^2.0.0"
+    iconv-lite "^0.6.3"
+    on-finished "^2.4.1"
+    qs "^6.14.0"
+    raw-body "^3.0.0"
+    type-is "^2.0.0"
+
+boolbase@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
+  integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
+
+brace-expansion@^1.1.7:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.12.tgz#ab9b454466e5a8cc3a187beaad580412a9c5b843"
+  integrity sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+brace-expansion@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.2.tgz#54fc53237a613d854c7bd37463aad17df87214e7"
+  integrity sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==
+  dependencies:
+    balanced-match "^1.0.0"
+
+braces@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
+  dependencies:
+    fill-range "^7.1.1"
+
+browserslist@^4.24.0:
+  version "4.27.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.27.0.tgz#755654744feae978fbb123718b2f139bc0fa6697"
+  integrity sha512-AXVQwdhot1eqLihwasPElhX2tAZiBjWdJ9i/Zcj2S6QYIjkx62OKSfnobkriB81C3l4w0rVy3Nt4jaTBltYEpw==
+  dependencies:
+    baseline-browser-mapping "^2.8.19"
+    caniuse-lite "^1.0.30001751"
+    electron-to-chromium "^1.5.238"
+    node-releases "^2.0.26"
+    update-browserslist-db "^1.1.4"
+
+bytes@3.1.2, bytes@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
+  integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
+
+c12@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/c12/-/c12-3.3.1.tgz#a100b50ecf1cd659b7bdcb2743f6ffe1dceb8a05"
+  integrity sha512-LcWQ01LT9tkoUINHgpIOv3mMs+Abv7oVCrtpMRi1PaapVEpWoMga5WuT7/DqFTu7URP9ftbOmimNw1KNIGh9DQ==
+  dependencies:
+    chokidar "^4.0.3"
+    confbox "^0.2.2"
+    defu "^6.1.4"
+    dotenv "^17.2.3"
+    exsolve "^1.0.7"
+    giget "^2.0.0"
+    jiti "^2.6.1"
+    ohash "^2.0.11"
+    pathe "^2.0.3"
+    perfect-debounce "^2.0.0"
+    pkg-types "^2.3.0"
+    rc9 "^2.1.2"
+
+cac@^6.7.14:
+  version "6.7.14"
+  resolved "https://registry.yarnpkg.com/cac/-/cac-6.7.14.tgz#804e1e6f506ee363cb0e3ccbb09cad5dd9870959"
+  integrity sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==
+
+call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6"
+  integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==
+  dependencies:
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+
+call-bound@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/call-bound/-/call-bound-1.0.4.tgz#238de935d2a2a692928c538c7ccfa91067fd062a"
+  integrity sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==
+  dependencies:
+    call-bind-apply-helpers "^1.0.2"
+    get-intrinsic "^1.3.0"
+
+callsites@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
+
+caniuse-lite@^1.0.30001751:
+  version "1.0.30001751"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001751.tgz#dacd5d9f4baeea841641640139d2b2a4df4226ad"
+  integrity sha512-A0QJhug0Ly64Ii3eIqHu5X51ebln3k4yTUkY1j8drqpWHVreg/VLijN48cZ1bYPiqOQuqpkIKnzr/Ul8V+p6Cw==
+
+chai@^5.1.2:
+  version "5.3.3"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-5.3.3.tgz#dd3da955e270916a4bd3f625f4b919996ada7e06"
+  integrity sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw==
+  dependencies:
+    assertion-error "^2.0.1"
+    check-error "^2.1.1"
+    deep-eql "^5.0.1"
+    loupe "^3.1.0"
+    pathval "^2.0.0"
+
+chai@^6.2.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-6.2.1.tgz#d1e64bc42433fbee6175ad5346799682060b5b6a"
+  integrity sha512-p4Z49OGG5W/WBCPSS/dH3jQ73kD6tiMmUM+bckNK6Jr5JHMG3k9bg/BvKR8lKmtVBKmOiuVaV2ws8s9oSbwysg==
+
+chalk@^4.0.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chalk@^5.3.0, chalk@^5.6.2:
+  version "5.6.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.6.2.tgz#b1238b6e23ea337af71c7f8a295db5af0c158aea"
+  integrity sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==
+
+check-error@^2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/check-error/-/check-error-2.1.3.tgz#2427361117b70cca8dc89680ead32b157019caf5"
+  integrity sha512-PAJdDJusoxnwm1VwW07VWwUN1sl7smmC3OKggvndJFadxxDRyFJBX/ggnu/KE4kQAB7a3Dp8f/YXC1FlUprWmA==
+
+chokidar@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-4.0.3.tgz#7be37a4c03c9aee1ecfe862a4a23b2c70c205d30"
+  integrity sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==
+  dependencies:
+    readdirp "^4.0.1"
+
+citty@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/citty/-/citty-0.1.6.tgz#0f7904da1ed4625e1a9ea7e0fa780981aab7c5e4"
+  integrity sha512-tskPPKEs8D2KPafUypv2gxwJP8h/OaJmC82QQGGDQcHvXX43xF2VDACcJVmZ0EuSxkpO9Kc4MlrA3q0+FG58AQ==
+  dependencies:
+    consola "^3.2.3"
+
+class-variance-authority@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/class-variance-authority/-/class-variance-authority-0.7.1.tgz#4008a798a0e4553a781a57ac5177c9fb5d043787"
+  integrity sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg==
+  dependencies:
+    clsx "^2.1.1"
+
+cli-cursor@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-5.0.0.tgz#24a4831ecf5a6b01ddeb32fb71a4b2088b0dce38"
+  integrity sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==
+  dependencies:
+    restore-cursor "^5.0.0"
+
+cli-progress@^3.12.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/cli-progress/-/cli-progress-3.12.0.tgz#807ee14b66bcc086258e444ad0f19e7d42577942"
+  integrity sha512-tRkV3HJ1ASwm19THiiLIXLO7Im7wlTuKnvkYaTkyoAPefqjNg7W7DHKUlGRxy9vxDvbyCYQkQozvptuMkGCg8A==
+  dependencies:
+    string-width "^4.2.3"
+
+cli-spinners@^3.2.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-3.3.0.tgz#2ba7c98b4f4662e67315b5634365661be8574440"
+  integrity sha512-/+40ljC3ONVnYIttjMWrlL51nItDAbBrq2upN8BPyvGU/2n5Oxw3tbNwORCaNuNqLJnxGqOfjUuhsv7l5Q4IsQ==
+
+clsx@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.1.1.tgz#eed397c9fd8bd882bfb18deab7102049a2f32999"
+  integrity sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==
+
+code-block-writer@^13.0.3:
+  version "13.0.3"
+  resolved "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-13.0.3.tgz#90f8a84763a5012da7af61319dd638655ae90b5b"
+  integrity sha512-Oofo0pq3IKnsFtuHqSF7TqBfr71aeyZDVJ0HpmqB7FBM2qEigL0iPONSCZSO9pE9dZTAxANe5XHG9Uy0YMv8cg==
+
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+combined-stream@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+  dependencies:
+    delayed-stream "~1.0.0"
+
+commander@^10.0.0:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
+  integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==
+
+commander@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-11.1.0.tgz#62fdce76006a68e5c1ab3314dc92e800eb83d906"
+  integrity sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==
+
+commander@^13.1.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-13.1.0.tgz#776167db68c78f38dcce1f9b8d7b8b9a488abf46"
+  integrity sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw==
+
+commander@^14.0.1:
+  version "14.0.2"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-14.0.2.tgz#b71fd37fe4069e4c3c7c13925252ada4eba14e8e"
+  integrity sha512-TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ==
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
+
+confbox@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/confbox/-/confbox-0.2.2.tgz#8652f53961c74d9e081784beed78555974a9c110"
+  integrity sha512-1NB+BKqhtNipMsov4xI/NnhCKp9XG9NamYp5PVm9klAT0fsrNPjaFICsCFhNhwZJKNh7zB/3q8qXz0E9oaMNtQ==
+
+config-chain@^1.1.13:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"
+  integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==
+  dependencies:
+    ini "^1.3.4"
+    proto-list "~1.2.1"
+
+consola@^3.2.3, consola@^3.4.0, consola@^3.4.2:
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/consola/-/consola-3.4.2.tgz#5af110145397bb67afdab77013fdc34cae590ea7"
+  integrity sha512-5IKcdX0nnYavi6G7TtOhwkYzyjfJlatbjMjuLSfE2kYT5pMDOilZ4OvMhi637CcDICTmz3wARPoyhqyX1Y+XvA==
+
+content-disposition@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-1.0.0.tgz#844426cb398f934caefcbb172200126bc7ceace2"
+  integrity sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==
+  dependencies:
+    safe-buffer "5.2.1"
+
+content-type@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
+  integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
+
+convert-hrtime@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/convert-hrtime/-/convert-hrtime-5.0.0.tgz#f2131236d4598b95de856926a67100a0a97e9fa3"
+  integrity sha512-lOETlkIeYSJWcbbcvjRKGxVMXJR+8+OQb/mTPbA4ObPMytYIsUbuOE0Jzy60hjARYszq1id0j8KgVhC+WGZVTg==
+
+convert-source-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
+  integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
+
+cookie-signature@^1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.2.2.tgz#57c7fc3cc293acab9fec54d73e15690ebe4a1793"
+  integrity sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==
+
+cookie@^0.7.1:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.2.tgz#556369c472a2ba910f2979891b526b3436237ed7"
+  integrity sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==
+
+cors@^2.8.5:
+  version "2.8.5"
+  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
+  integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
+  dependencies:
+    object-assign "^4"
+    vary "^1"
+
+cross-spawn@^7.0.2, cross-spawn@^7.0.3, cross-spawn@^7.0.5, cross-spawn@^7.0.6:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
+css-select@^5.1.0:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-5.2.2.tgz#01b6e8d163637bb2dd6c982ca4ed65863682786e"
+  integrity sha512-TizTzUddG/xYLA3NXodFM0fSbNizXjOKhqiQQwvhlspadZokn1KDy0NZFS0wuEubIYAV5/c1/lAr0TaaFXEXzw==
+  dependencies:
+    boolbase "^1.0.0"
+    css-what "^6.1.0"
+    domhandler "^5.0.2"
+    domutils "^3.0.1"
+    nth-check "^2.0.1"
+
+css-what@^6.1.0:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.2.2.tgz#cdcc8f9b6977719fdfbd1de7aec24abf756b9dea"
+  integrity sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA==
+
+css@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/css/-/css-3.0.0.tgz#4447a4d58fdd03367c516ca9f64ae365cee4aa5d"
+  integrity sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==
+  dependencies:
+    inherits "^2.0.4"
+    source-map "^0.6.1"
+    source-map-resolve "^0.6.0"
+
+cssesc@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
+  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
+
+cssstyle@^4.1.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-4.6.0.tgz#ea18007024e3167f4f105315f3ec2d982bf48ed9"
+  integrity sha512-2z+rWdzbbSZv6/rhtvzvqeZQHrBaqgogqt85sqFNbabZOuFbCVFb8kPeEtZjiKkbrm395irpNKiYeFeLiQnFPg==
+  dependencies:
+    "@asamuzakjp/css-color" "^3.2.0"
+    rrweb-cssom "^0.8.0"
+
+csstype@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
+  integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
+
+"d3-color@1 - 3":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-3.1.0.tgz#395b2833dfac71507f12ac2f7af23bf819de24e2"
+  integrity sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==
+
+"d3-dispatch@1 - 3":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-3.0.1.tgz#5fc75284e9c2375c36c839411a0cf550cbfc4d5e"
+  integrity sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==
+
+"d3-drag@2 - 3", d3-drag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-3.0.0.tgz#994aae9cd23c719f53b5e10e3a0a6108c69607ba"
+  integrity sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==
+  dependencies:
+    d3-dispatch "1 - 3"
+    d3-selection "3"
+
+"d3-ease@1 - 3":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-3.0.1.tgz#9658ac38a2140d59d346160f1f6c30fda0bd12f4"
+  integrity sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==
+
+"d3-interpolate@1 - 3", d3-interpolate@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-3.0.1.tgz#3c47aa5b32c5b3dfb56ef3fd4342078a632b400d"
+  integrity sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==
+  dependencies:
+    d3-color "1 - 3"
+
+"d3-selection@2 - 3", d3-selection@3, d3-selection@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-3.0.0.tgz#c25338207efa72cc5b9bd1458a1a41901f1e1b31"
+  integrity sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==
+
+"d3-timer@1 - 3":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-3.0.1.tgz#6284d2a2708285b1abb7e201eda4380af35e63b0"
+  integrity sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==
+
+"d3-transition@2 - 3":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-3.0.1.tgz#6869fdde1448868077fdd5989200cb61b2a1645f"
+  integrity sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==
+  dependencies:
+    d3-color "1 - 3"
+    d3-dispatch "1 - 3"
+    d3-ease "1 - 3"
+    d3-interpolate "1 - 3"
+    d3-timer "1 - 3"
+
+d3-zoom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-3.0.0.tgz#d13f4165c73217ffeaa54295cd6969b3e7aee8f3"
+  integrity sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==
+  dependencies:
+    d3-dispatch "1 - 3"
+    d3-drag "2 - 3"
+    d3-interpolate "1 - 3"
+    d3-selection "2 - 3"
+    d3-transition "2 - 3"
+
+data-urls@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-5.0.0.tgz#2f76906bce1824429ffecb6920f45a0b30f00dde"
+  integrity sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==
+  dependencies:
+    whatwg-mimetype "^4.0.0"
+    whatwg-url "^14.0.0"
+
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5, debug@^4.3.7, debug@^4.4.0:
+  version "4.4.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a"
+  integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==
+  dependencies:
+    ms "^2.1.3"
+
+decimal.js@^10.4.3:
+  version "10.6.0"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.6.0.tgz#e649a43e3ab953a72192ff5983865e509f37ed9a"
+  integrity sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==
+
+decode-uri-component@^0.2.0:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
+  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
+
+dedent@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.7.0.tgz#c1f9445335f0175a96587be245a282ff451446ca"
+  integrity sha512-HGFtf8yhuhGhqO07SV79tRp+br4MnbdjeVxotpn1QBl30pcLLCQjX5b2295ll0fv8RKDKsmWYrl05usHM9CewQ==
+
+deep-diff@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-1.0.2.tgz#afd3d1f749115be965e89c63edc7abb1506b9c26"
+  integrity sha512-aWS3UIVH+NPGCD1kki+DCU9Dua032iSsO43LqQpcs4R3+dVv7tX0qBGjiVHJHjplsoUM2XRO/KB92glqc68awg==
+
+deep-eql@^5.0.1:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-5.0.2.tgz#4b756d8d770a9257300825d52a2c2cff99c3a341"
+  integrity sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==
+
+deep-is@^0.1.3:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
+  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
+
+deepmerge@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
+  integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
+
+defu@^6.1.4:
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/defu/-/defu-6.1.4.tgz#4e0c9cf9ff68fe5f3d7f2765cc1a012dfdcb0479"
+  integrity sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
+
+depd@2.0.0, depd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
+  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
+
+destr@^2.0.3, destr@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/destr/-/destr-2.0.5.tgz#7d112ff1b925fb8d2079fac5bdb4a90973b51fdb"
+  integrity sha512-ugFTXCtDZunbzasqBxrK93Ik/DRYsO6S/fedkWEMKqt04xZ4csmnmwGDBAb07QWNaGMAmnTIemsYZCksjATwsA==
+
+detect-libc@^2.0.3:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.1.2.tgz#689c5dcdc1900ef5583a4cb9f6d7b473742074ad"
+  integrity sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==
+
+diff@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-8.0.2.tgz#712156a6dd288e66ebb986864e190c2fc9eddfae"
+  integrity sha512-sSuxWU5j5SR9QQji/o2qMvqRNYRDOcBTgsJ/DeCf4iSN4gW+gNMXM7wFIP+fdXZxoNiAnHUTGjCr+TSWXdRDKg==
+
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+  dependencies:
+    path-type "^4.0.0"
+
+doctrine@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
+  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
+  dependencies:
+    esutils "^2.0.2"
+
+dom-serializer@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53"
+  integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==
+  dependencies:
+    domelementtype "^2.3.0"
+    domhandler "^5.0.2"
+    entities "^4.2.0"
+
+domelementtype@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
+  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
+
+domhandler@^5.0.2, domhandler@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31"
+  integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==
+  dependencies:
+    domelementtype "^2.3.0"
+
+domutils@^3.0.1:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.2.2.tgz#edbfe2b668b0c1d97c24baf0f1062b132221bc78"
+  integrity sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==
+  dependencies:
+    dom-serializer "^2.0.0"
+    domelementtype "^2.3.0"
+    domhandler "^5.0.3"
+
+dotenv@^17.2.1, dotenv@^17.2.3:
+  version "17.2.3"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-17.2.3.tgz#ad995d6997f639b11065f419a22fabf567cdb9a2"
+  integrity sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==
+
+dunder-proto@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"
+  integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==
+  dependencies:
+    call-bind-apply-helpers "^1.0.1"
+    es-errors "^1.3.0"
+    gopd "^1.2.0"
+
+eastasianwidth@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
+  integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
+
+eciesjs@^0.4.10:
+  version "0.4.16"
+  resolved "https://registry.yarnpkg.com/eciesjs/-/eciesjs-0.4.16.tgz#cfa5ddb7b662855d580a8bf4826700dc37191c9a"
+  integrity sha512-dS5cbA9rA2VR4Ybuvhg6jvdmp46ubLn3E+px8cG/35aEDNclrqoCjg6mt0HYZ/M+OoESS3jSkCrqk1kWAEhWAw==
+  dependencies:
+    "@ecies/ciphers" "^0.2.4"
+    "@noble/ciphers" "^1.3.0"
+    "@noble/curves" "^1.9.7"
+    "@noble/hashes" "^1.8.0"
+
+editorconfig@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-1.0.4.tgz#040c9a8e9a6c5288388b87c2db07028aa89f53a3"
+  integrity sha512-L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==
+  dependencies:
+    "@one-ini/wasm" "0.1.1"
+    commander "^10.0.0"
+    minimatch "9.0.1"
+    semver "^7.5.3"
+
+ee-first@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
+
+electron-to-chromium@^1.5.238:
+  version "1.5.241"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.241.tgz#350a2cdcde43829d36af245a27167243e917c6ed"
+  integrity sha512-ILMvKX/ZV5WIJzzdtuHg8xquk2y0BOGlFOxBVwTpbiXqWIH0hamG45ddU4R3PQ0gYu+xgo0vdHXHli9sHIGb4w==
+
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
+emoji-regex@^9.2.2:
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
+  integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
+
+encodeurl@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58"
+  integrity sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==
+
+enhanced-resolve@^5.18.3:
+  version "5.18.3"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz#9b5f4c5c076b8787c78fe540392ce76a88855b44"
+  integrity sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==
+  dependencies:
+    graceful-fs "^4.2.4"
+    tapable "^2.2.0"
+
+entities@^4.2.0, entities@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
+  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
+
+entities@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-6.0.1.tgz#c28c34a43379ca7f61d074130b2f5f7020a30694"
+  integrity sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==
+
+es-define-property@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"
+  integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==
+
+es-errors@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
+  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
+
+es-module-lexer@^1.5.4, es-module-lexer@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.7.0.tgz#9159601561880a85f2734560a9099b2c31e5372a"
+  integrity sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==
+
+es-object-atoms@^1.0.0, es-object-atoms@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1"
+  integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==
+  dependencies:
+    es-errors "^1.3.0"
+
+es-set-tostringtag@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz#f31dbbe0c183b00a6d26eb6325c810c0fd18bd4d"
+  integrity sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==
+  dependencies:
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.6"
+    has-tostringtag "^1.0.2"
+    hasown "^2.0.2"
+
+esbuild@^0.21.3:
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.21.5.tgz#9ca301b120922959b766360d8ac830da0d02997d"
+  integrity sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==
+  optionalDependencies:
+    "@esbuild/aix-ppc64" "0.21.5"
+    "@esbuild/android-arm" "0.21.5"
+    "@esbuild/android-arm64" "0.21.5"
+    "@esbuild/android-x64" "0.21.5"
+    "@esbuild/darwin-arm64" "0.21.5"
+    "@esbuild/darwin-x64" "0.21.5"
+    "@esbuild/freebsd-arm64" "0.21.5"
+    "@esbuild/freebsd-x64" "0.21.5"
+    "@esbuild/linux-arm" "0.21.5"
+    "@esbuild/linux-arm64" "0.21.5"
+    "@esbuild/linux-ia32" "0.21.5"
+    "@esbuild/linux-loong64" "0.21.5"
+    "@esbuild/linux-mips64el" "0.21.5"
+    "@esbuild/linux-ppc64" "0.21.5"
+    "@esbuild/linux-riscv64" "0.21.5"
+    "@esbuild/linux-s390x" "0.21.5"
+    "@esbuild/linux-x64" "0.21.5"
+    "@esbuild/netbsd-x64" "0.21.5"
+    "@esbuild/openbsd-x64" "0.21.5"
+    "@esbuild/sunos-x64" "0.21.5"
+    "@esbuild/win32-arm64" "0.21.5"
+    "@esbuild/win32-ia32" "0.21.5"
+    "@esbuild/win32-x64" "0.21.5"
+
+esbuild@^0.25.0:
+  version "0.25.11"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.25.11.tgz#0f31b82f335652580f75ef6897bba81962d9ae3d"
+  integrity sha512-KohQwyzrKTQmhXDW1PjCv3Tyspn9n5GcY2RTDqeORIdIJY8yKIF7sTSopFmn/wpMPW4rdPXI0UE5LJLuq3bx0Q==
+  optionalDependencies:
+    "@esbuild/aix-ppc64" "0.25.11"
+    "@esbuild/android-arm" "0.25.11"
+    "@esbuild/android-arm64" "0.25.11"
+    "@esbuild/android-x64" "0.25.11"
+    "@esbuild/darwin-arm64" "0.25.11"
+    "@esbuild/darwin-x64" "0.25.11"
+    "@esbuild/freebsd-arm64" "0.25.11"
+    "@esbuild/freebsd-x64" "0.25.11"
+    "@esbuild/linux-arm" "0.25.11"
+    "@esbuild/linux-arm64" "0.25.11"
+    "@esbuild/linux-ia32" "0.25.11"
+    "@esbuild/linux-loong64" "0.25.11"
+    "@esbuild/linux-mips64el" "0.25.11"
+    "@esbuild/linux-ppc64" "0.25.11"
+    "@esbuild/linux-riscv64" "0.25.11"
+    "@esbuild/linux-s390x" "0.25.11"
+    "@esbuild/linux-x64" "0.25.11"
+    "@esbuild/netbsd-arm64" "0.25.11"
+    "@esbuild/netbsd-x64" "0.25.11"
+    "@esbuild/openbsd-arm64" "0.25.11"
+    "@esbuild/openbsd-x64" "0.25.11"
+    "@esbuild/openharmony-arm64" "0.25.11"
+    "@esbuild/sunos-x64" "0.25.11"
+    "@esbuild/win32-arm64" "0.25.11"
+    "@esbuild/win32-ia32" "0.25.11"
+    "@esbuild/win32-x64" "0.25.11"
+
+escalade@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
+  integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
+
+escape-html@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
+
+escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
+eslint-config-prettier@^10.1.8:
+  version "10.1.8"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-10.1.8.tgz#15734ce4af8c2778cc32f0b01b37b0b5cd1ecb97"
+  integrity sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==
+
+eslint-plugin-vitest@^0.5.4:
+  version "0.5.4"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-vitest/-/eslint-plugin-vitest-0.5.4.tgz#2838a40ee116ba7c15eb6132df31371d960e3bf5"
+  integrity sha512-um+odCkccAHU53WdKAw39MY61+1x990uXjSPguUCq3VcEHdqJrOb8OTMrbYlY6f9jAKx7x98kLVlIe3RJeJqoQ==
+  dependencies:
+    "@typescript-eslint/utils" "^7.7.1"
+
+eslint-plugin-vue@^10.5.0:
+  version "10.5.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-10.5.1.tgz#b172bab0b78100484e21726af138debb998a369f"
+  integrity sha512-SbR9ZBUFKgvWAbq3RrdCtWaW0IKm6wwUiApxf3BVTNfqUIo4IQQmreMg2iHFJJ6C/0wss3LXURBJ1OwS/MhFcQ==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.4.0"
+    natural-compare "^1.4.0"
+    nth-check "^2.1.1"
+    postcss-selector-parser "^6.0.15"
+    semver "^7.6.3"
+    xml-name-validator "^4.0.0"
+
+eslint-scope@^7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
+  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
+
+eslint-scope@^8.2.0:
+  version "8.4.0"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.4.0.tgz#88e646a207fad61436ffa39eb505147200655c82"
+  integrity sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
+
+eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
+  integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
+
+eslint-visitor-keys@^4.2.0, eslint-visitor-keys@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz#4cfea60fe7dd0ad8e816e1ed026c1d5251b512c1"
+  integrity sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==
+
+eslint@^8.57.1:
+  version "8.57.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.1.tgz#7df109654aba7e3bbe5c8eae533c5e461d3c6ca9"
+  integrity sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@eslint-community/regexpp" "^4.6.1"
+    "@eslint/eslintrc" "^2.1.4"
+    "@eslint/js" "8.57.1"
+    "@humanwhocodes/config-array" "^0.13.0"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@nodelib/fs.walk" "^1.2.8"
+    "@ungap/structured-clone" "^1.2.0"
+    ajv "^6.12.4"
+    chalk "^4.0.0"
+    cross-spawn "^7.0.2"
+    debug "^4.3.2"
+    doctrine "^3.0.0"
+    escape-string-regexp "^4.0.0"
+    eslint-scope "^7.2.2"
+    eslint-visitor-keys "^3.4.3"
+    espree "^9.6.1"
+    esquery "^1.4.2"
+    esutils "^2.0.2"
+    fast-deep-equal "^3.1.3"
+    file-entry-cache "^6.0.1"
+    find-up "^5.0.0"
+    glob-parent "^6.0.2"
+    globals "^13.19.0"
+    graphemer "^1.4.0"
+    ignore "^5.2.0"
+    imurmurhash "^0.1.4"
+    is-glob "^4.0.0"
+    is-path-inside "^3.0.3"
+    js-yaml "^4.1.0"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.4.1"
+    lodash.merge "^4.6.2"
+    minimatch "^3.1.2"
+    natural-compare "^1.4.0"
+    optionator "^0.9.3"
+    strip-ansi "^6.0.1"
+    text-table "^0.2.0"
+
+espree@^10.3.0:
+  version "10.4.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-10.4.0.tgz#d54f4949d4629005a1fa168d937c3ff1f7e2a837"
+  integrity sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==
+  dependencies:
+    acorn "^8.15.0"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^4.2.1"
+
+espree@^9.6.0, espree@^9.6.1:
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
+  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
+  dependencies:
+    acorn "^8.9.0"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^3.4.1"
+
+esquery@^1.4.2, esquery@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7"
+  integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==
+  dependencies:
+    estraverse "^5.1.0"
+
+esrecurse@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
+  dependencies:
+    estraverse "^5.2.0"
+
+estraverse@^5.1.0, estraverse@^5.2.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
+  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
+
+estree-walker@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
+  integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
+
+estree-walker@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-3.0.3.tgz#67c3e549ec402a487b4fc193d1953a524752340d"
+  integrity sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==
+  dependencies:
+    "@types/estree" "^1.0.0"
+
+esutils@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
+
+etag@^1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
+  integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
+
+eventsource-parser@^3.0.0, eventsource-parser@^3.0.1:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/eventsource-parser/-/eventsource-parser-3.0.6.tgz#292e165e34cacbc936c3c92719ef326d4aeb4e90"
+  integrity sha512-Vo1ab+QXPzZ4tCa8SwIHJFaSzy4R6SHf7BY79rFBDf0idraZWAkYrDjDj8uWaSm3S2TK+hJ7/t1CEmZ7jXw+pg==
+
+eventsource@^3.0.2:
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-3.0.7.tgz#1157622e2f5377bb6aef2114372728ba0c156989"
+  integrity sha512-CRT1WTyuQoD771GW56XEZFQ/ZoSfWid1alKGDYMmkt2yl8UXrVR4pspqWNEcqKvVIzg6PAltWjxcSSPrboA4iA==
+  dependencies:
+    eventsource-parser "^3.0.1"
+
+execa@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
+  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
+  dependencies:
+    cross-spawn "^7.0.3"
+    get-stream "^6.0.0"
+    human-signals "^2.1.0"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.1"
+    onetime "^5.1.2"
+    signal-exit "^3.0.3"
+    strip-final-newline "^2.0.0"
+
+expect-type@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/expect-type/-/expect-type-1.3.0.tgz#0d58ed361877a31bbc4dd6cf71bbfef7faf6bd68"
+  integrity sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==
+
+expect-type@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/expect-type/-/expect-type-1.2.2.tgz#c030a329fb61184126c8447585bc75a7ec6fbff3"
+  integrity sha512-JhFGDVJ7tmDJItKhYgJCGLOWjuK9vPxiXoUFLwLDc99NlmklilbiQJwoctZtt13+xMw91MCk/REan6MWHqDjyA==
+
+express-rate-limit@^7.5.0:
+  version "7.5.1"
+  resolved "https://registry.yarnpkg.com/express-rate-limit/-/express-rate-limit-7.5.1.tgz#8c3a42f69209a3a1c969890070ece9e20a879dec"
+  integrity sha512-7iN8iPMDzOMHPUYllBEsQdWVB6fPDMPqwjBaFrgr4Jgr/+okjvzAy+UHlYYL/Vs0OsOrMkwS6PJDkFlJwoxUnw==
+
+express@^5.0.1:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/express/-/express-5.1.0.tgz#d31beaf715a0016f0d53f47d3b4d7acf28c75cc9"
+  integrity sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==
+  dependencies:
+    accepts "^2.0.0"
+    body-parser "^2.2.0"
+    content-disposition "^1.0.0"
+    content-type "^1.0.5"
+    cookie "^0.7.1"
+    cookie-signature "^1.2.1"
+    debug "^4.4.0"
+    encodeurl "^2.0.0"
+    escape-html "^1.0.3"
+    etag "^1.8.1"
+    finalhandler "^2.1.0"
+    fresh "^2.0.0"
+    http-errors "^2.0.0"
+    merge-descriptors "^2.0.0"
+    mime-types "^3.0.0"
+    on-finished "^2.4.1"
+    once "^1.4.0"
+    parseurl "^1.3.3"
+    proxy-addr "^2.0.7"
+    qs "^6.14.0"
+    range-parser "^1.2.1"
+    router "^2.2.0"
+    send "^1.1.0"
+    serve-static "^2.2.0"
+    statuses "^2.0.1"
+    type-is "^2.0.1"
+    vary "^1.1.2"
+
+exsolve@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/exsolve/-/exsolve-1.0.7.tgz#3b74e4c7ca5c5f9a19c3626ca857309fa99f9e9e"
+  integrity sha512-VO5fQUzZtI6C+vx4w/4BWJpg3s/5l+6pRQEHzFRM8WFi4XffSP1Z+4qi7GbjWbvRQEbdIco5mIMq+zX4rPuLrw==
+
+fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
+
+fast-diff@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0"
+  integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==
+
+fast-glob@^3.2.9, fast-glob@^3.3.2:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.3.tgz#d06d585ce8dba90a16b0505c543c3ccfb3aeb818"
+  integrity sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.8"
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+
+fast-levenshtein@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
+
+fast-uri@^3.0.1:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.1.0.tgz#66eecff6c764c0df9b762e62ca7edcfb53b4edfa"
+  integrity sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==
+
+fastq@^1.6.0:
+  version "1.19.1"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.19.1.tgz#d50eaba803c8846a883c16492821ebcd2cda55f5"
+  integrity sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==
+  dependencies:
+    reusify "^1.0.4"
+
+fdir@^6.2.0, fdir@^6.5.0:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.5.0.tgz#ed2ab967a331ade62f18d077dae192684d50d350"
+  integrity sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==
+
+fflate@^0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.8.2.tgz#fc8631f5347812ad6028bbe4a2308b2792aa1dea"
+  integrity sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==
+
+file-entry-cache@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
+  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
+  dependencies:
+    flat-cache "^3.0.4"
+
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
+  dependencies:
+    to-regex-range "^5.0.1"
+
+finalhandler@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-2.1.0.tgz#72306373aa89d05a8242ed569ed86a1bff7c561f"
+  integrity sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q==
+  dependencies:
+    debug "^4.4.0"
+    encodeurl "^2.0.0"
+    escape-html "^1.0.3"
+    on-finished "^2.4.1"
+    parseurl "^1.3.3"
+    statuses "^2.0.1"
+
+find-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
+flat-cache@^3.0.4:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
+  integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==
+  dependencies:
+    flatted "^3.2.9"
+    keyv "^4.5.3"
+    rimraf "^3.0.2"
+
+flatted@^3.2.9, flatted@^3.3.1, flatted@^3.3.3:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.3.tgz#67c8fad95454a7c7abebf74bb78ee74a44023358"
+  integrity sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==
+
+foreground-child@^3.1.0, foreground-child@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.1.tgz#32e8e9ed1b68a3497befb9ac2b6adf92a638576f"
+  integrity sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==
+  dependencies:
+    cross-spawn "^7.0.6"
+    signal-exit "^4.0.1"
+
+form-data@^4.0.0:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.4.tgz#784cdcce0669a9d68e94d11ac4eea98088edd2c4"
+  integrity sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    es-set-tostringtag "^2.1.0"
+    hasown "^2.0.2"
+    mime-types "^2.1.12"
+
+forwarded@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
+  integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
+
+fresh@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fresh/-/fresh-2.0.0.tgz#8dd7df6a1b3a1b3a5cf186c05a5dd267622635a4"
+  integrity sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==
+
+fs-extra@^11.2.0, fs-extra@^11.3.2:
+  version "11.3.2"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.3.2.tgz#c838aeddc6f4a8c74dd15f85e11fe5511bfe02a4"
+  integrity sha512-Xr9F6z6up6Ws+NjzMCZc6WXg2YFRlrLP9NQDO3VQrWrfiojdhS56TzueT88ze0uBdCTwEIhQ3ptnmKeWGFAe0A==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
+
+fsevents@~2.3.2, fsevents@~2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
+  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
+
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
+
+function-timeout@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/function-timeout/-/function-timeout-1.0.2.tgz#e5a7b6ffa523756ff20e1231bbe37b5f373aadd5"
+  integrity sha512-939eZS4gJ3htTHAldmyyuzlrD58P03fHG49v2JfFXbV6OhvZKRC9j2yAtdHw/zrp2zXHuv05zMIy40F0ge7spA==
+
+fuzzysort@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/fuzzysort/-/fuzzysort-3.1.0.tgz#4d7832d8fa48ad381753eaa7a7aae9927bdc10a8"
+  integrity sha512-sR9BNCjBg6LNgwvxlBd0sBABvQitkLzoVY9MYYROQVX/FvfJ4Mai9LsGhDgd8qYdds0bY77VzYd5iuB+v5rwQQ==
+
+gensync@^1.0.0-beta.2:
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
+  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
+
+get-east-asian-width@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/get-east-asian-width/-/get-east-asian-width-1.4.0.tgz#9bc4caa131702b4b61729cb7e42735bc550c9ee6"
+  integrity sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q==
+
+get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01"
+  integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==
+  dependencies:
+    call-bind-apply-helpers "^1.0.2"
+    es-define-property "^1.0.1"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.1.1"
+    function-bind "^1.1.2"
+    get-proto "^1.0.1"
+    gopd "^1.2.0"
+    has-symbols "^1.1.0"
+    hasown "^2.0.2"
+    math-intrinsics "^1.1.0"
+
+get-own-enumerable-keys@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/get-own-enumerable-keys/-/get-own-enumerable-keys-1.0.0.tgz#59bbda0f7e7469c8c74086e08f79f1381b203899"
+  integrity sha512-PKsK2FSrQCyxcGHsGrLDcK0lx+0Ke+6e8KFFozA9/fIQLhQzPaRvJFdcz7+Axg3jUH/Mq+NI4xa5u/UT2tQskA==
+
+get-proto@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
+  integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==
+  dependencies:
+    dunder-proto "^1.0.1"
+    es-object-atoms "^1.0.0"
+
+get-stream@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
+  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
+
+get-tsconfig@^4.12.0:
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.13.0.tgz#fcdd991e6d22ab9a600f00e91c318707a5d9a0d7"
+  integrity sha512-1VKTZJCwBrvbd+Wn3AOgQP/2Av+TfTCOlE4AcRJE72W1ksZXbAx8PPBR9RzgTeSPzlPMHrbANMH3LbltH73wxQ==
+  dependencies:
+    resolve-pkg-maps "^1.0.0"
+
+giget@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/giget/-/giget-2.0.0.tgz#395fc934a43f9a7a29a29d55b99f23e30c14f195"
+  integrity sha512-L5bGsVkxJbJgdnwyuheIunkGatUF/zssUoxxjACCseZYAVbaqdh9Tsmmlkl8vYan09H7sbvKt4pS8GqKLBrEzA==
+  dependencies:
+    citty "^0.1.6"
+    consola "^3.4.0"
+    defu "^6.1.4"
+    node-fetch-native "^1.6.6"
+    nypm "^0.6.0"
+    pathe "^2.0.3"
+
+glob-parent@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
+glob-parent@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
+  dependencies:
+    is-glob "^4.0.3"
+
+glob@^10.4.1:
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.5.0.tgz#8ec0355919cd3338c28428a23d4f24ecc5fe738c"
+  integrity sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==
+  dependencies:
+    foreground-child "^3.1.0"
+    jackspeak "^3.1.2"
+    minimatch "^9.0.4"
+    minipass "^7.1.2"
+    package-json-from-dist "^1.0.0"
+    path-scurry "^1.11.1"
+
+glob@^10.4.2:
+  version "10.4.5"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956"
+  integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==
+  dependencies:
+    foreground-child "^3.1.0"
+    jackspeak "^3.1.2"
+    minimatch "^9.0.4"
+    minipass "^7.1.2"
+    package-json-from-dist "^1.0.0"
+    path-scurry "^1.11.1"
+
+glob@^11.0.0:
+  version "11.0.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-11.0.3.tgz#9d8087e6d72ddb3c4707b1d2778f80ea3eaefcd6"
+  integrity sha512-2Nim7dha1KVkaiF4q6Dj+ngPPMdfvLJEOpZk/jKiUAkqKebpGAWQXAq9z1xu9HKu5lWfqw/FASuccEjyznjPaA==
+  dependencies:
+    foreground-child "^3.3.1"
+    jackspeak "^4.1.1"
+    minimatch "^10.0.3"
+    minipass "^7.1.2"
+    package-json-from-dist "^1.0.0"
+    path-scurry "^2.0.0"
+
+glob@^7.1.3, glob@^7.1.6:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.1.1"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+globals@^13.19.0:
+  version "13.24.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
+  integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
+  dependencies:
+    type-fest "^0.20.2"
+
+globby@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
+  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
+  dependencies:
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.2.9"
+    ignore "^5.2.0"
+    merge2 "^1.4.1"
+    slash "^3.0.0"
+
+gonzales-pe@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.3.0.tgz#fe9dec5f3c557eead09ff868c65826be54d067b3"
+  integrity sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==
+  dependencies:
+    minimist "^1.2.5"
+
+gopd@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1"
+  integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==
+
+graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4:
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
+
+graphemer@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
+  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
+
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
+has-symbols@^1.0.3, has-symbols@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
+  integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==
+
+has-tostringtag@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"
+  integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==
+  dependencies:
+    has-symbols "^1.0.3"
+
+hasown@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
+  integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
+  dependencies:
+    function-bind "^1.1.2"
+
+he@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
+  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
+
+html-encoding-sniffer@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz#696df529a7cfd82446369dc5193e590a3735b448"
+  integrity sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==
+  dependencies:
+    whatwg-encoding "^3.1.1"
+
+html-escaper@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
+  integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
+
+http-errors@2.0.0, http-errors@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
+  integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
+  dependencies:
+    depd "2.0.0"
+    inherits "2.0.4"
+    setprototypeof "1.2.0"
+    statuses "2.0.1"
+    toidentifier "1.0.1"
+
+http-proxy-agent@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e"
+  integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==
+  dependencies:
+    agent-base "^7.1.0"
+    debug "^4.3.4"
+
+https-proxy-agent@^7.0.5:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz#da8dfeac7da130b05c2ba4b59c9b6cd66611a6b9"
+  integrity sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==
+  dependencies:
+    agent-base "^7.1.2"
+    debug "4"
+
+human-signals@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
+  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
+
+iconv-lite@0.6.3, iconv-lite@^0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
+  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
+iconv-lite@0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.7.0.tgz#c50cd80e6746ca8115eb98743afa81aa0e147a3e"
+  integrity sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
+identifier-regex@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/identifier-regex/-/identifier-regex-1.0.1.tgz#65fc1c16eebad54adcbec7eb9c99e8a926adfd29"
+  integrity sha512-ZrYyM0sozNPZlvBvE7Oq9Bn44n0qKGrYu5sQ0JzMUnjIhpgWYE2JB6aBoFwEYdPjqj7jPyxXTMJiHDOxDfd8yw==
+  dependencies:
+    reserved-identifiers "^1.0.0"
+
+ignore@^5.2.0, ignore@^5.3.0:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
+  integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
+
+ignore@^7.0.0:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-7.0.5.tgz#4cb5f6cd7d4c7ab0365738c7aea888baa6d7efd9"
+  integrity sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==
+
+import-fresh@^3.2.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.1.tgz#9cecb56503c0ada1f2741dbbd6546e4b13b57ccf"
+  integrity sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==
+  dependencies:
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@2.0.4, inherits@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+ini@^1.3.4:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
+
+ipaddr.js@1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
+  integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
+
+is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
+
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-identifier@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-identifier/-/is-identifier-1.0.1.tgz#76d66e7813e37cc85cc8263f04eaa558d1a5d2dc"
+  integrity sha512-HQ5v4rEJ7REUV54bCd2l5FaD299SGDEn2UPoVXaTHAyGviLq2menVUD2udi3trQ32uvB6LdAh/0ck2EuizrtpA==
+  dependencies:
+    identifier-regex "^1.0.0"
+    super-regex "^1.0.0"
+
+is-interactive@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-2.0.0.tgz#40c57614593826da1100ade6059778d597f16e90"
+  integrity sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+is-obj@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-3.0.0.tgz#b0889f1f9f8cb87e87df53a8d1230a2250f8b9be"
+  integrity sha512-IlsXEHOjtKhpN8r/tRFj2nDyTmHvcfNeu/nrRIcXE17ROeatXchkojffa1SpdqW4cr/Fj6QkEf/Gn4zf6KKvEQ==
+
+is-path-inside@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
+  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
+
+is-potential-custom-element-name@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
+  integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
+
+is-promise@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-4.0.0.tgz#42ff9f84206c1991d26debf520dd5c01042dd2f3"
+  integrity sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==
+
+is-regexp@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-3.1.0.tgz#0235eab9cda5b83f96ac4a263d8c32c9d5ad7422"
+  integrity sha512-rbku49cWloU5bSMI+zaRaXdQHXnthP6DZ/vLnfdSKyL4zUzuWnomtOEiZZOd+ioQ+avFo/qau3KPTc7Fjy1uPA==
+
+is-stream@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
+  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
+
+is-unicode-supported@^2.0.0, is-unicode-supported@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-2.1.0.tgz#09f0ab0de6d3744d48d265ebb98f65d11f2a9b3a"
+  integrity sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
+
+isexe@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-3.1.1.tgz#4a407e2bd78ddfb14bea0c27c6f7072dde775f0d"
+  integrity sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==
+
+istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz#2d166c4b0644d43a39f04bf6c2edd1e585f31756"
+  integrity sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==
+
+istanbul-lib-report@^3.0.0, istanbul-lib-report@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz#908305bac9a5bd175ac6a74489eafd0fc2445a7d"
+  integrity sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==
+  dependencies:
+    istanbul-lib-coverage "^3.0.0"
+    make-dir "^4.0.0"
+    supports-color "^7.1.0"
+
+istanbul-lib-source-maps@^5.0.6:
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz#acaef948df7747c8eb5fbf1265cb980f6353a441"
+  integrity sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.23"
+    debug "^4.1.1"
+    istanbul-lib-coverage "^3.0.0"
+
+istanbul-reports@^3.1.7, istanbul-reports@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.2.0.tgz#cb4535162b5784aa623cee21a7252cf2c807ac93"
+  integrity sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==
+  dependencies:
+    html-escaper "^2.0.0"
+    istanbul-lib-report "^3.0.0"
+
+jackspeak@^3.1.2:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.3.tgz#8833a9d89ab4acde6188942bd1c53b6390ed5a8a"
+  integrity sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==
+  dependencies:
+    "@isaacs/cliui" "^8.0.2"
+  optionalDependencies:
+    "@pkgjs/parseargs" "^0.11.0"
+
+jackspeak@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-4.1.1.tgz#96876030f450502047fc7e8c7fcf8ce8124e43ae"
+  integrity sha512-zptv57P3GpL+O0I7VdMJNBZCu+BPHVQUk55Ft8/QCJjTVxrnJHuVuX/0Bl2A6/+2oyR/ZMEuFKwmzqqZ/U5nPQ==
+  dependencies:
+    "@isaacs/cliui" "^8.0.2"
+
+jiti@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/jiti/-/jiti-2.6.1.tgz#178ef2fc9a1a594248c20627cd820187a4d78d92"
+  integrity sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==
+
+js-beautify@^1.14.9:
+  version "1.15.4"
+  resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.15.4.tgz#f579f977ed4c930cef73af8f98f3f0a608acd51e"
+  integrity sha512-9/KXeZUKKJwqCXUdBxFJ3vPh467OCckSBmYDwSK/EtV090K+iMJ7zx2S3HLVDIWFQdqMIsZWbnaGiba18aWhaA==
+  dependencies:
+    config-chain "^1.1.13"
+    editorconfig "^1.0.4"
+    glob "^10.4.2"
+    js-cookie "^3.0.5"
+    nopt "^7.2.1"
+
+js-cookie@^3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.5.tgz#0b7e2fd0c01552c58ba86e0841f94dc2557dcdbc"
+  integrity sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==
+
+js-tokens@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
+
+js-tokens@^9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-9.0.1.tgz#2ec43964658435296f6761b34e10671c2d9527f4"
+  integrity sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==
+
+js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
+jsdom@^25.0.0:
+  version "25.0.1"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-25.0.1.tgz#536ec685c288fc8a5773a65f82d8b44badcc73ef"
+  integrity sha512-8i7LzZj7BF8uplX+ZyOlIz86V6TAsSs+np6m1kpW9u0JWi4z/1t+FzcK1aek+ybTnAC4KhBL4uXCNT0wcUIeCw==
+  dependencies:
+    cssstyle "^4.1.0"
+    data-urls "^5.0.0"
+    decimal.js "^10.4.3"
+    form-data "^4.0.0"
+    html-encoding-sniffer "^4.0.0"
+    http-proxy-agent "^7.0.2"
+    https-proxy-agent "^7.0.5"
+    is-potential-custom-element-name "^1.0.1"
+    nwsapi "^2.2.12"
+    parse5 "^7.1.2"
+    rrweb-cssom "^0.7.1"
+    saxes "^6.0.0"
+    symbol-tree "^3.2.4"
+    tough-cookie "^5.0.0"
+    w3c-xmlserializer "^5.0.0"
+    webidl-conversions "^7.0.0"
+    whatwg-encoding "^3.1.1"
+    whatwg-mimetype "^4.0.0"
+    whatwg-url "^14.0.0"
+    ws "^8.18.0"
+    xml-name-validator "^5.0.0"
+
+jsesc@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.1.0.tgz#74d335a234f67ed19907fdadfac7ccf9d409825d"
+  integrity sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==
+
+json-buffer@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
+  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
+
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+
+json-schema-traverse@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
+  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
+
+json-stable-stringify-without-jsonify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
+
+json5@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
+
+jsonfile@^6.0.1:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.2.0.tgz#7c265bd1b65de6977478300087c99f1c84383f62"
+  integrity sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==
+  dependencies:
+    universalify "^2.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+keyv@^4.5.3:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
+  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
+  dependencies:
+    json-buffer "3.0.1"
+
+kleur@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
+  integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
+
+levn@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
+  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
+  dependencies:
+    prelude-ls "^1.2.1"
+    type-check "~0.4.0"
+
+lightningcss-android-arm64@1.30.2:
+  version "1.30.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-android-arm64/-/lightningcss-android-arm64-1.30.2.tgz#6966b7024d39c94994008b548b71ab360eb3a307"
+  integrity sha512-BH9sEdOCahSgmkVhBLeU7Hc9DWeZ1Eb6wNS6Da8igvUwAe0sqROHddIlvU06q3WyXVEOYDZ6ykBZQnjTbmo4+A==
+
+lightningcss-darwin-arm64@1.30.2:
+  version "1.30.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.30.2.tgz#a5fa946d27c029e48c7ff929e6e724a7de46eb2c"
+  integrity sha512-ylTcDJBN3Hp21TdhRT5zBOIi73P6/W0qwvlFEk22fkdXchtNTOU4Qc37SkzV+EKYxLouZ6M4LG9NfZ1qkhhBWA==
+
+lightningcss-darwin-x64@1.30.2:
+  version "1.30.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.30.2.tgz#5ce87e9cd7c4f2dcc1b713f5e8ee185c88d9b7cd"
+  integrity sha512-oBZgKchomuDYxr7ilwLcyms6BCyLn0z8J0+ZZmfpjwg9fRVZIR5/GMXd7r9RH94iDhld3UmSjBM6nXWM2TfZTQ==
+
+lightningcss-freebsd-x64@1.30.2:
+  version "1.30.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.30.2.tgz#6ae1d5e773c97961df5cff57b851807ef33692a5"
+  integrity sha512-c2bH6xTrf4BDpK8MoGG4Bd6zAMZDAXS569UxCAGcA7IKbHNMlhGQ89eRmvpIUGfKWNVdbhSbkQaWhEoMGmGslA==
+
+lightningcss-linux-arm-gnueabihf@1.30.2:
+  version "1.30.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.30.2.tgz#62c489610c0424151a6121fa99d77731536cdaeb"
+  integrity sha512-eVdpxh4wYcm0PofJIZVuYuLiqBIakQ9uFZmipf6LF/HRj5Bgm0eb3qL/mr1smyXIS1twwOxNWndd8z0E374hiA==
+
+lightningcss-linux-arm64-gnu@1.30.2:
+  version "1.30.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.30.2.tgz#2a3661b56fe95a0cafae90be026fe0590d089298"
+  integrity sha512-UK65WJAbwIJbiBFXpxrbTNArtfuznvxAJw4Q2ZGlU8kPeDIWEX1dg3rn2veBVUylA2Ezg89ktszWbaQnxD/e3A==
+
+lightningcss-linux-arm64-musl@1.30.2:
+  version "1.30.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.30.2.tgz#d7ddd6b26959245e026bc1ad9eb6aa983aa90e6b"
+  integrity sha512-5Vh9dGeblpTxWHpOx8iauV02popZDsCYMPIgiuw97OJ5uaDsL86cnqSFs5LZkG3ghHoX5isLgWzMs+eD1YzrnA==
+
+lightningcss-linux-x64-gnu@1.30.2:
+  version "1.30.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.30.2.tgz#5a89814c8e63213a5965c3d166dff83c36152b1a"
+  integrity sha512-Cfd46gdmj1vQ+lR6VRTTadNHu6ALuw2pKR9lYq4FnhvgBc4zWY1EtZcAc6EffShbb1MFrIPfLDXD6Xprbnni4w==
+
+lightningcss-linux-x64-musl@1.30.2:
+  version "1.30.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.30.2.tgz#808c2e91ce0bf5d0af0e867c6152e5378c049728"
+  integrity sha512-XJaLUUFXb6/QG2lGIW6aIk6jKdtjtcffUT0NKvIqhSBY3hh9Ch+1LCeH80dR9q9LBjG3ewbDjnumefsLsP6aiA==
+
+lightningcss-win32-arm64-msvc@1.30.2:
+  version "1.30.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.30.2.tgz#ab4a8a8a2e6a82a4531e8bbb6bf0ff161ee6625a"
+  integrity sha512-FZn+vaj7zLv//D/192WFFVA0RgHawIcHqLX9xuWiQt7P0PtdFEVaxgF9rjM/IRYHQXNnk61/H/gb2Ei+kUQ4xQ==
+
+lightningcss-win32-x64-msvc@1.30.2:
+  version "1.30.2"
+  resolved "https://registry.yarnpkg.com/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.30.2.tgz#f01f382c8e0a27e1c018b0bee316d210eac43b6e"
+  integrity sha512-5g1yc73p+iAkid5phb4oVFMB45417DkRevRbt/El/gKXJk4jid+vPFF/AXbxn05Aky8PapwzZrdJShv5C0avjw==
+
+lightningcss@1.30.2:
+  version "1.30.2"
+  resolved "https://registry.yarnpkg.com/lightningcss/-/lightningcss-1.30.2.tgz#4ade295f25d140f487d37256f4cd40dc607696d0"
+  integrity sha512-utfs7Pr5uJyyvDETitgsaqSyjCb2qNRAtuqUeWIAKztsOYdcACf2KtARYXg2pSvhkt+9NfoaNY7fxjl6nuMjIQ==
+  dependencies:
+    detect-libc "^2.0.3"
+  optionalDependencies:
+    lightningcss-android-arm64 "1.30.2"
+    lightningcss-darwin-arm64 "1.30.2"
+    lightningcss-darwin-x64 "1.30.2"
+    lightningcss-freebsd-x64 "1.30.2"
+    lightningcss-linux-arm-gnueabihf "1.30.2"
+    lightningcss-linux-arm64-gnu "1.30.2"
+    lightningcss-linux-arm64-musl "1.30.2"
+    lightningcss-linux-x64-gnu "1.30.2"
+    lightningcss-linux-x64-musl "1.30.2"
+    lightningcss-win32-arm64-msvc "1.30.2"
+    lightningcss-win32-x64-msvc "1.30.2"
+
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
+lodash-es@^4.17.21:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
+  integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
+
+lodash.merge@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+
+lodash.sortedlastindex@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/lodash.sortedlastindex/-/lodash.sortedlastindex-4.1.0.tgz#4569878196b450dac6aab4ceb0896ceed4a67255"
+  integrity sha512-s8xEQdsp2Tu5zUqVdFSe9C0kR8YlnAJYLqMdkh+pIRBRxF6/apWseLdHl3/+jv2I61dhPwtI/Ff+EqvCpc+N8w==
+
+lodash.truncate@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
+  integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==
+
+log-symbols@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-7.0.1.tgz#f52e68037d96f589fc572ff2193dc424d48c195b"
+  integrity sha512-ja1E3yCr9i/0hmBVaM0bfwDjnGy8I/s6PP4DFp+yP+a+mrHO4Rm7DtmnqROTUkHIkqffC84YY7AeqX6oFk0WFg==
+  dependencies:
+    is-unicode-supported "^2.0.0"
+    yoctocolors "^2.1.1"
+
+loupe@^3.1.0, loupe@^3.1.2:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/loupe/-/loupe-3.2.1.tgz#0095cf56dc5b7a9a7c08ff5b1a8796ec8ad17e76"
+  integrity sha512-CdzqowRJCeLU72bHvWqwRBBlLcMEtIvGrlvef74kMnV2AolS9Y8xUv1I0U/MNAWMhBlKIoyuEgoJ0t/bbwHbLQ==
+
+lru-cache@^10.2.0, lru-cache@^10.4.3:
+  version "10.4.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119"
+  integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
+
+lru-cache@^11.0.0:
+  version "11.2.2"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-11.2.2.tgz#40fd37edffcfae4b2940379c0722dc6eeaa75f24"
+  integrity sha512-F9ODfyqML2coTIsQpSkRHnLSZMtkU8Q+mSfcaIyKwy58u+8k5nvAYeiNhsyMARvzNcXJ9QfWVrcPsC9e9rAxtg==
+
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
+
+lucide-vue-next@^0.542.0:
+  version "0.542.0"
+  resolved "https://registry.yarnpkg.com/lucide-vue-next/-/lucide-vue-next-0.542.0.tgz#ff5287edc8da8043b716b0b91833de2fee9fc65e"
+  integrity sha512-cJfyhFoneDgYTouHwUJEutXaCW5EQuRrBsvfELudWnMiwfqvcEtpZTFZLdZ5Nrqow+znzn+Iyhu3KeYIfa3mEg==
+
+magic-string@^0.30.10, magic-string@^0.30.12, magic-string@^0.30.19, magic-string@^0.30.21:
+  version "0.30.21"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.21.tgz#56763ec09a0fa8091df27879fd94d19078c00d91"
+  integrity sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.5.5"
+
+magicast@^0.3.5:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/magicast/-/magicast-0.3.5.tgz#8301c3c7d66704a0771eb1bad74274f0ec036739"
+  integrity sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==
+  dependencies:
+    "@babel/parser" "^7.25.4"
+    "@babel/types" "^7.25.4"
+    source-map-js "^1.2.0"
+
+magicast@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/magicast/-/magicast-0.5.1.tgz#518959aea78851cd35d4bb0da92f780db3f606d3"
+  integrity sha512-xrHS24IxaLrvuo613F719wvOIv9xPHFWQHuvGUBmPnCA/3MQxKI3b+r7n1jAoDHmsbC5bRhTZYR77invLAxVnw==
+  dependencies:
+    "@babel/parser" "^7.28.5"
+    "@babel/types" "^7.28.5"
+    source-map-js "^1.2.1"
+
+make-dir@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e"
+  integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==
+  dependencies:
+    semver "^7.5.3"
+
+math-intrinsics@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"
+  integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==
+
+media-typer@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-1.1.0.tgz#6ab74b8f2d3320f2064b2a87a38e7931ff3a5561"
+  integrity sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==
+
+merge-descriptors@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-2.0.0.tgz#ea922f660635a2249ee565e0449f951e6b603808"
+  integrity sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==
+
+merge-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
+
+merge2@^1.3.0, merge2@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
+
+micromatch@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
+  dependencies:
+    braces "^3.0.3"
+    picomatch "^2.3.1"
+
+mime-db@1.52.0:
+  version "1.52.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
+
+mime-db@^1.54.0:
+  version "1.54.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.54.0.tgz#cddb3ee4f9c64530dff640236661d42cb6a314f5"
+  integrity sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==
+
+mime-types@^2.1.12:
+  version "2.1.35"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
+  dependencies:
+    mime-db "1.52.0"
+
+mime-types@^3.0.0, mime-types@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-3.0.1.tgz#b1d94d6997a9b32fd69ebaed0db73de8acb519ce"
+  integrity sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==
+  dependencies:
+    mime-db "^1.54.0"
+
+mimic-fn@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+
+mimic-function@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/mimic-function/-/mimic-function-5.0.1.tgz#acbe2b3349f99b9deaca7fb70e48b83e94e67076"
+  integrity sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==
+
+minimatch@9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.1.tgz#8a555f541cf976c622daf078bb28f29fb927c253"
+  integrity sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==
+  dependencies:
+    brace-expansion "^2.0.1"
+
+minimatch@^10.0.1, minimatch@^10.0.3:
+  version "10.0.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.0.3.tgz#cf7a0314a16c4d9ab73a7730a0e8e3c3502d47aa"
+  integrity sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==
+  dependencies:
+    "@isaacs/brace-expansion" "^5.0.0"
+
+minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimatch@^9.0.4:
+  version "9.0.5"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
+  integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
+  dependencies:
+    brace-expansion "^2.0.1"
+
+minimist@^1.2.5:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
+
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
+  integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
+
+mrmime@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-2.0.1.tgz#bc3e87f7987853a54c9850eeb1f1078cd44adddc"
+  integrity sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==
+
+ms@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
+muggle-string@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/muggle-string/-/muggle-string-0.4.1.tgz#3b366bd43b32f809dc20659534dd30e7c8a0d328"
+  integrity sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==
+
+nanoid@^3.3.11:
+  version "3.3.11"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b"
+  integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==
+
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
+
+negotiator@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-1.0.0.tgz#b6c91bb47172d69f93cfd7c357bbb529019b5f6a"
+  integrity sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==
+
+node-fetch-native@^1.6.6, node-fetch-native@^1.6.7:
+  version "1.6.7"
+  resolved "https://registry.yarnpkg.com/node-fetch-native/-/node-fetch-native-1.6.7.tgz#9d09ca63066cc48423211ed4caf5d70075d76a71"
+  integrity sha512-g9yhqoedzIUm0nTnTqAQvueMPVOuIY16bqgAJJC8XOOubYFNwz6IER9qs0Gq2Xd0+CecCKFjtdDTMA4u4xG06Q==
+
+node-html-parser@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/node-html-parser/-/node-html-parser-7.0.1.tgz#e3056550bae48517ebf161a0b0638f4b0123dfe3"
+  integrity sha512-KGtmPY2kS0thCWGK0VuPyOS+pBKhhe8gXztzA2ilAOhbUbxa9homF1bOyKvhGzMLXUoRds9IOmr/v5lr/lqNmA==
+  dependencies:
+    css-select "^5.1.0"
+    he "1.2.0"
+
+node-releases@^2.0.26:
+  version "2.0.26"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.26.tgz#fdfa272f2718a1309489d18aef4ef5ba7f5dfb52"
+  integrity sha512-S2M9YimhSjBSvYnlr5/+umAnPHE++ODwt5e2Ij6FoX45HA/s4vHdkDx1eax2pAPeAOqu4s9b7ppahsyEFdVqQA==
+
+nopt@^7.2.1:
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-7.2.1.tgz#1cac0eab9b8e97c9093338446eddd40b2c8ca1e7"
+  integrity sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==
+  dependencies:
+    abbrev "^2.0.0"
+
+npm-run-path@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
+  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
+  dependencies:
+    path-key "^3.0.0"
+
+nth-check@^2.0.1, nth-check@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d"
+  integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==
+  dependencies:
+    boolbase "^1.0.0"
+
+nwsapi@^2.2.12:
+  version "2.2.22"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.22.tgz#109f9530cda6c156d6a713cdf5939e9f0de98b9d"
+  integrity sha512-ujSMe1OWVn55euT1ihwCI1ZcAaAU3nxUiDwfDQldc51ZXaB9m2AyOn6/jh1BLe2t/G8xd6uKG1UBF2aZJeg2SQ==
+
+nypm@^0.6.0, nypm@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/nypm/-/nypm-0.6.2.tgz#467512024948398fafa73cea30a3ed9efc5af071"
+  integrity sha512-7eM+hpOtrKrBDCh7Ypu2lJ9Z7PNZBdi/8AT3AX8xoCj43BBVHD0hPSTEvMtkMpfs8FCqBGhxB+uToIQimA111g==
+  dependencies:
+    citty "^0.1.6"
+    consola "^3.4.2"
+    pathe "^2.0.3"
+    pkg-types "^2.3.0"
+    tinyexec "^1.0.1"
+
+object-assign@^4:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
+
+object-inspect@^1.13.3:
+  version "1.13.4"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.4.tgz#8375265e21bc20d0fa582c22e1b13485d6e00213"
+  integrity sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==
+
+object-treeify@1.1.33:
+  version "1.1.33"
+  resolved "https://registry.yarnpkg.com/object-treeify/-/object-treeify-1.1.33.tgz#f06fece986830a3cba78ddd32d4c11d1f76cdf40"
+  integrity sha512-EFVjAYfzWqWsBMRHPMAXLCDIJnpMhdWAqR7xG6M6a2cs6PMFpl/+Z20w9zDW4vkxOFfddegBKq9Rehd0bxWE7A==
+
+obug@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/obug/-/obug-2.1.1.tgz#2cba74ff241beb77d63055ddf4cd1e9f90b538be"
+  integrity sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ==
+
+ofetch@^1.4.1:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/ofetch/-/ofetch-1.5.0.tgz#442e6c04f41ab2f6bbc59aab8439b1ce8f6f44ba"
+  integrity sha512-A7llJ7eZyziA5xq9//3ZurA8OhFqtS99K5/V1sLBJ5j137CM/OAjlbA/TEJXBuOWwOfLqih+oH5U3ran4za1FQ==
+  dependencies:
+    destr "^2.0.5"
+    node-fetch-native "^1.6.7"
+    ufo "^1.6.1"
+
+ohash@^2.0.11:
+  version "2.0.11"
+  resolved "https://registry.yarnpkg.com/ohash/-/ohash-2.0.11.tgz#60b11e8cff62ca9dee88d13747a5baa145f5900b"
+  integrity sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ==
+
+on-finished@^2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
+  integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
+  dependencies:
+    ee-first "1.1.1"
+
+once@^1.3.0, once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
+  dependencies:
+    wrappy "1"
+
+onetime@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
+  dependencies:
+    mimic-fn "^2.1.0"
+
+onetime@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-7.0.0.tgz#9f16c92d8c9ef5120e3acd9dd9957cceecc1ab60"
+  integrity sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==
+  dependencies:
+    mimic-function "^5.0.0"
+
+optionator@^0.9.3:
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734"
+  integrity sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==
+  dependencies:
+    deep-is "^0.1.3"
+    fast-levenshtein "^2.0.6"
+    levn "^0.4.1"
+    prelude-ls "^1.2.1"
+    type-check "^0.4.0"
+    word-wrap "^1.2.5"
+
+ora@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-9.0.0.tgz#945236f5ce78a024cf4c25df6c46ecd09ab6e685"
+  integrity sha512-m0pg2zscbYgWbqRR6ABga5c3sZdEon7bSgjnlXC64kxtxLOyjRcbbUkLj7HFyy/FTD+P2xdBWu8snGhYI0jc4A==
+  dependencies:
+    chalk "^5.6.2"
+    cli-cursor "^5.0.0"
+    cli-spinners "^3.2.0"
+    is-interactive "^2.0.0"
+    is-unicode-supported "^2.1.0"
+    log-symbols "^7.0.1"
+    stdin-discarder "^0.2.2"
+    string-width "^8.1.0"
+    strip-ansi "^7.1.2"
+
+p-limit@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+  dependencies:
+    yocto-queue "^0.1.0"
+
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
+
+package-json-from-dist@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz#4f1471a010827a86f94cfd9b0727e36d267de505"
+  integrity sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==
+
+parent-module@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
+  dependencies:
+    callsites "^3.0.0"
+
+parse5@^7.1.2:
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.3.0.tgz#d7e224fa72399c7a175099f45fc2ad024b05ec05"
+  integrity sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==
+  dependencies:
+    entities "^6.0.0"
+
+parseurl@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
+
+path-browserify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd"
+  integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==
+
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
+
+path-key@^3.0.0, path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
+path-scurry@^1.11.1:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2"
+  integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==
+  dependencies:
+    lru-cache "^10.2.0"
+    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
+
+path-scurry@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-2.0.0.tgz#9f052289f23ad8bf9397a2a0425e7b8615c58580"
+  integrity sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==
+  dependencies:
+    lru-cache "^11.0.0"
+    minipass "^7.1.2"
+
+path-to-regexp@^8.0.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-8.3.0.tgz#aa818a6981f99321003a08987d3cec9c3474cd1f"
+  integrity sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==
+
+path-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+
+pathe@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/pathe/-/pathe-1.1.2.tgz#6c4cb47a945692e48a1ddd6e4094d170516437ec"
+  integrity sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==
+
+pathe@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/pathe/-/pathe-2.0.3.tgz#3ecbec55421685b70a9da872b2cff3e1cbed1716"
+  integrity sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==
+
+pathval@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pathval/-/pathval-2.0.1.tgz#8855c5a2899af072d6ac05d11e46045ad0dc605d"
+  integrity sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==
+
+perfect-debounce@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/perfect-debounce/-/perfect-debounce-2.0.0.tgz#0ff94f1ecbe0a6bca4b1703a2ed08bbe43739aa7"
+  integrity sha512-fkEH/OBiKrqqI/yIgjR92lMfs2K8105zt/VT6+7eTjNwisrsh47CeIED9z58zI7DfKdH3uHAn25ziRZn3kgAow==
+
+picocolors@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
+  integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
+
+picomatch@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
+  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
+
+picomatch@^4.0.2, picomatch@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.3.tgz#796c76136d1eead715db1e7bad785dedd695a042"
+  integrity sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==
+
+pkce-challenge@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/pkce-challenge/-/pkce-challenge-5.0.0.tgz#c3a405cb49e272094a38e890a2b51da0228c4d97"
+  integrity sha512-ueGLflrrnvwB3xuo/uGob5pd5FN7l0MsLf0Z87o/UQmRtwjvfylfc9MurIxRAWywCYTgrvpXBcqjV4OfCYGCIQ==
+
+pkg-types@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-2.3.0.tgz#037f2c19bd5402966ff6810e32706558cb5b5726"
+  integrity sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==
+  dependencies:
+    confbox "^0.2.2"
+    exsolve "^1.0.7"
+    pathe "^2.0.3"
+
+postcss-less@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-6.0.0.tgz#463b34c60f53b648c237f569aeb2e09149d85af4"
+  integrity sha512-FPX16mQLyEjLzEuuJtxA8X3ejDLNGGEG503d2YGZR5Ask1SpDN8KmZUMpzCvyalWRywAn1n1VOA5dcqfCLo5rg==
+
+postcss-sass@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/postcss-sass/-/postcss-sass-0.5.0.tgz#a599717eef90165d267e6a974c66c2ed15376b77"
+  integrity sha512-qtu8awh1NMF3o9j/x9j3EZnd+BlF66X6NZYl12BdKoG2Z4hmydOt/dZj2Nq+g0kfk2pQy3jeYFBmvG9DBwynGQ==
+  dependencies:
+    gonzales-pe "^4.3.0"
+    postcss "^8.2.14"
+
+postcss-scss@^4.0.9:
+  version "4.0.9"
+  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-4.0.9.tgz#a03c773cd4c9623cb04ce142a52afcec74806685"
+  integrity sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==
+
+postcss-selector-parser@^6.0.15:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz#27ecb41fb0e3b6ba7a1ec84fff347f734c7929de"
+  integrity sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==
+  dependencies:
+    cssesc "^3.0.0"
+    util-deprecate "^1.0.2"
+
+postcss-styl@^0.12.3:
+  version "0.12.3"
+  resolved "https://registry.yarnpkg.com/postcss-styl/-/postcss-styl-0.12.3.tgz#1d705ac8a08fb77ad15fde0b5f9bd62db8588956"
+  integrity sha512-8I7Cd8sxiEITIp32xBK4K/Aj1ukX6vuWnx8oY/oAH35NfQI4OZaY5nd68Yx8HeN5S49uhQ6DL0rNk0ZBu/TaLg==
+  dependencies:
+    debug "^4.1.1"
+    fast-diff "^1.2.0"
+    lodash.sortedlastindex "^4.1.0"
+    postcss "^7.0.27 || ^8.0.0"
+    stylus "^0.57.0"
+
+"postcss@^7.0.27 || ^8.0.0", postcss@^8.2.14, postcss@^8.4.38, postcss@^8.4.41, postcss@^8.4.43, postcss@^8.5.6:
+  version "8.5.6"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.6.tgz#2825006615a619b4f62a9e7426cc120b349a8f3c"
+  integrity sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==
+  dependencies:
+    nanoid "^3.3.11"
+    picocolors "^1.1.1"
+    source-map-js "^1.2.1"
+
+prelude-ls@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
+  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
+
+prettier@^3.2.5, prettier@^3.6.2:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.6.2.tgz#ccda02a1003ebbb2bfda6f83a074978f608b9393"
+  integrity sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==
+
+prompts@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
+  integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==
+  dependencies:
+    kleur "^3.0.3"
+    sisteransi "^1.0.5"
+
+proto-list@~1.2.1:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
+  integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==
+
+proxy-addr@^2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
+  integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
+  dependencies:
+    forwarded "0.2.0"
+    ipaddr.js "1.9.1"
+
+punycode@^2.1.0, punycode@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
+  integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
+
+qs@^6.14.0:
+  version "6.14.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.14.0.tgz#c63fa40680d2c5c941412a0e899c89af60c0a930"
+  integrity sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==
+  dependencies:
+    side-channel "^1.1.0"
+
+queue-microtask@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
+
+range-parser@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
+
+raw-body@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-3.0.1.tgz#ced5cd79a77bbb0496d707f2a0f9e1ae3aecdcb1"
+  integrity sha512-9G8cA+tuMS75+6G/TzW8OtLzmBDMo8p1JRxN5AZ+LAp8uxGA8V8GZm4GQ4/N5QNQEnLmg6SS7wyuSmbKepiKqA==
+  dependencies:
+    bytes "3.1.2"
+    http-errors "2.0.0"
+    iconv-lite "0.7.0"
+    unpipe "1.0.0"
+
+rc9@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/rc9/-/rc9-2.1.2.tgz#6282ff638a50caa0a91a31d76af4a0b9cbd1080d"
+  integrity sha512-btXCnMmRIBINM2LDZoEmOogIZU7Qe7zn4BpomSKZ/ykbLObuBdvG+mFq11DL6fjH1DRwHhrlgtYWG96bJiC7Cg==
+  dependencies:
+    defu "^6.1.4"
+    destr "^2.0.3"
+
+readdirp@^4.0.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-4.1.2.tgz#eb85801435fbf2a7ee58f19e0921b068fc69948d"
+  integrity sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==
+
+recast-x@1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/recast-x/-/recast-x-1.0.5.tgz#38778db267a36a97f2ebe31cab90b21aa3b8236e"
+  integrity sha512-CkfWKhQiYsMQYaWUkHdERXUxT2jJLBoa5y7zFv3dUAE7Ly5oU/0hsqrENyEfrCL03pDsQYbnoz17Cbagx/c2OA==
+  dependencies:
+    ast-types "npm:ast-types-x@1.18.0"
+    source-map "~0.6.1"
+    tiny-invariant "^1.3.3"
+    tslib "^2.0.1"
+
+reka-ui@^2.5.0, reka-ui@^2.5.1:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/reka-ui/-/reka-ui-2.6.0.tgz#3b96712744decb9da8f4b1af79d16a499c84b826"
+  integrity sha512-NrGMKrABD97l890mFS3TNUzB0BLUfbL3hh0NjcJRIUSUljb288bx3Mzo31nOyUcdiiW0HqFGXJwyCBh9cWgb0w==
+  dependencies:
+    "@floating-ui/dom" "^1.6.13"
+    "@floating-ui/vue" "^1.1.6"
+    "@internationalized/date" "^3.5.0"
+    "@internationalized/number" "^3.5.0"
+    "@tanstack/vue-virtual" "^3.12.0"
+    "@vueuse/core" "^12.5.0"
+    "@vueuse/shared" "^12.5.0"
+    aria-hidden "^1.2.4"
+    defu "^6.1.4"
+    ohash "^2.0.11"
+
+require-from-string@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
+  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
+
+reserved-identifiers@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/reserved-identifiers/-/reserved-identifiers-1.2.0.tgz#d2982cd698e317dd3dced1ee1c52412dbd64fc64"
+  integrity sha512-yE7KUfFvaBFzGPs5H3Ops1RevfUEsDc5Iz65rOwWg4lE8HJSYtle77uul3+573457oHvBKuHYDl/xqUkKpEEdw==
+
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
+
+resolve-pkg-maps@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f"
+  integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==
+
+restore-cursor@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-5.1.0.tgz#0766d95699efacb14150993f55baf0953ea1ebe7"
+  integrity sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==
+  dependencies:
+    onetime "^7.0.0"
+    signal-exit "^4.1.0"
+
+reusify@^1.0.4:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.1.0.tgz#0fe13b9522e1473f51b558ee796e08f11f9b489f"
+  integrity sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==
+
+rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
+rollup@^4.20.0:
+  version "4.57.1"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.57.1.tgz#947f70baca32db2b9c594267fe9150aa316e5a88"
+  integrity sha512-oQL6lgK3e2QZeQ7gcgIkS2YZPg5slw37hYufJ3edKlfQSGGm8ICoxswK15ntSzF/a8+h7ekRy7k7oWc3BQ7y8A==
+  dependencies:
+    "@types/estree" "1.0.8"
+  optionalDependencies:
+    "@rollup/rollup-android-arm-eabi" "4.57.1"
+    "@rollup/rollup-android-arm64" "4.57.1"
+    "@rollup/rollup-darwin-arm64" "4.57.1"
+    "@rollup/rollup-darwin-x64" "4.57.1"
+    "@rollup/rollup-freebsd-arm64" "4.57.1"
+    "@rollup/rollup-freebsd-x64" "4.57.1"
+    "@rollup/rollup-linux-arm-gnueabihf" "4.57.1"
+    "@rollup/rollup-linux-arm-musleabihf" "4.57.1"
+    "@rollup/rollup-linux-arm64-gnu" "4.57.1"
+    "@rollup/rollup-linux-arm64-musl" "4.57.1"
+    "@rollup/rollup-linux-loong64-gnu" "4.57.1"
+    "@rollup/rollup-linux-loong64-musl" "4.57.1"
+    "@rollup/rollup-linux-ppc64-gnu" "4.57.1"
+    "@rollup/rollup-linux-ppc64-musl" "4.57.1"
+    "@rollup/rollup-linux-riscv64-gnu" "4.57.1"
+    "@rollup/rollup-linux-riscv64-musl" "4.57.1"
+    "@rollup/rollup-linux-s390x-gnu" "4.57.1"
+    "@rollup/rollup-linux-x64-gnu" "4.57.1"
+    "@rollup/rollup-linux-x64-musl" "4.57.1"
+    "@rollup/rollup-openbsd-x64" "4.57.1"
+    "@rollup/rollup-openharmony-arm64" "4.57.1"
+    "@rollup/rollup-win32-arm64-msvc" "4.57.1"
+    "@rollup/rollup-win32-ia32-msvc" "4.57.1"
+    "@rollup/rollup-win32-x64-gnu" "4.57.1"
+    "@rollup/rollup-win32-x64-msvc" "4.57.1"
+    fsevents "~2.3.2"
+
+rollup@^4.43.0:
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.52.5.tgz#96982cdcaedcdd51b12359981f240f94304ec235"
+  integrity sha512-3GuObel8h7Kqdjt0gxkEzaifHTqLVW56Y/bjN7PSQtkKr0w3V/QYSdt6QWYtd7A1xUtYQigtdUfgj1RvWVtorw==
+  dependencies:
+    "@types/estree" "1.0.8"
+  optionalDependencies:
+    "@rollup/rollup-android-arm-eabi" "4.52.5"
+    "@rollup/rollup-android-arm64" "4.52.5"
+    "@rollup/rollup-darwin-arm64" "4.52.5"
+    "@rollup/rollup-darwin-x64" "4.52.5"
+    "@rollup/rollup-freebsd-arm64" "4.52.5"
+    "@rollup/rollup-freebsd-x64" "4.52.5"
+    "@rollup/rollup-linux-arm-gnueabihf" "4.52.5"
+    "@rollup/rollup-linux-arm-musleabihf" "4.52.5"
+    "@rollup/rollup-linux-arm64-gnu" "4.52.5"
+    "@rollup/rollup-linux-arm64-musl" "4.52.5"
+    "@rollup/rollup-linux-loong64-gnu" "4.52.5"
+    "@rollup/rollup-linux-ppc64-gnu" "4.52.5"
+    "@rollup/rollup-linux-riscv64-gnu" "4.52.5"
+    "@rollup/rollup-linux-riscv64-musl" "4.52.5"
+    "@rollup/rollup-linux-s390x-gnu" "4.52.5"
+    "@rollup/rollup-linux-x64-gnu" "4.52.5"
+    "@rollup/rollup-linux-x64-musl" "4.52.5"
+    "@rollup/rollup-openharmony-arm64" "4.52.5"
+    "@rollup/rollup-win32-arm64-msvc" "4.52.5"
+    "@rollup/rollup-win32-ia32-msvc" "4.52.5"
+    "@rollup/rollup-win32-x64-gnu" "4.52.5"
+    "@rollup/rollup-win32-x64-msvc" "4.52.5"
+    fsevents "~2.3.2"
+
+router@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/router/-/router-2.2.0.tgz#019be620b711c87641167cc79b99090f00b146ef"
+  integrity sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==
+  dependencies:
+    debug "^4.4.0"
+    depd "^2.0.0"
+    is-promise "^4.0.0"
+    parseurl "^1.3.3"
+    path-to-regexp "^8.0.0"
+
+rrweb-cssom@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.7.1.tgz#c73451a484b86dd7cfb1e0b2898df4b703183e4b"
+  integrity sha512-TrEMa7JGdVm0UThDJSx7ddw5nVm3UJS9o9CCIZ72B1vSyEZoziDqBYP3XIoi/12lKrJR8rE3jeFHMok2F/Mnsg==
+
+rrweb-cssom@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz#3021d1b4352fbf3b614aaeed0bc0d5739abe0bc2"
+  integrity sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==
+
+run-parallel@^1.1.9:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
+  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
+  dependencies:
+    queue-microtask "^1.2.2"
+
+safe-buffer@5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
+"safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
+sax@~1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+
+saxes@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5"
+  integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==
+  dependencies:
+    xmlchars "^2.2.0"
+
+semver@^6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
+
+semver@^7.5.3, semver@^7.6.0, semver@^7.6.3, semver@^7.7.3:
+  version "7.7.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.3.tgz#4b5f4143d007633a8dc671cd0a6ef9147b8bb946"
+  integrity sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==
+
+send@^1.1.0, send@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/send/-/send-1.2.0.tgz#32a7554fb777b831dfa828370f773a3808d37212"
+  integrity sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==
+  dependencies:
+    debug "^4.3.5"
+    encodeurl "^2.0.0"
+    escape-html "^1.0.3"
+    etag "^1.8.1"
+    fresh "^2.0.0"
+    http-errors "^2.0.0"
+    mime-types "^3.0.1"
+    ms "^2.1.3"
+    on-finished "^2.4.1"
+    range-parser "^1.2.1"
+    statuses "^2.0.1"
+
+serve-static@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-2.2.0.tgz#9c02564ee259bdd2251b82d659a2e7e1938d66f9"
+  integrity sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ==
+  dependencies:
+    encodeurl "^2.0.0"
+    escape-html "^1.0.3"
+    parseurl "^1.3.3"
+    send "^1.2.0"
+
+setprototypeof@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
+  integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
+
+shadcn-vue@^2.2.0:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/shadcn-vue/-/shadcn-vue-2.3.2.tgz#620e4f57ad83175dfb43b44e960f8521b22f2ce0"
+  integrity sha512-2li6UKRMQw9YCoeLjoynp+whNfTy/HFCPJSTzRO98MbCc59tyo3QsON74QRv6DnYTeC1JDEGLW4bK+ICNQE+uw==
+  dependencies:
+    "@dotenvx/dotenvx" "^1.51.0"
+    "@modelcontextprotocol/sdk" "^1.20.1"
+    "@unovue/detypes" "^0.8.5"
+    "@vue/compiler-sfc" "^3.5"
+    c12 "^3.3.1"
+    commander "^14.0.1"
+    consola "^3.4.2"
+    dedent "^1.7.0"
+    deepmerge "^4.3.1"
+    diff "^8.0.2"
+    fs-extra "^11.3.2"
+    fuzzysort "^3.1.0"
+    get-tsconfig "^4.12.0"
+    magic-string "^0.30.19"
+    nypm "^0.6.2"
+    ofetch "^1.4.1"
+    ora "^9.0.0"
+    pathe "^2.0.3"
+    postcss "^8.5.6"
+    prompts "^2.4.2"
+    reka-ui "^2.5.1"
+    semver "^7.7.3"
+    stringify-object "^6.0.0"
+    tailwindcss "^4.1.14"
+    tinyexec "^1.0.1"
+    tinyglobby "^0.2.15"
+    ts-morph "^27.0.2"
+    undici "^7.16.0"
+    vue-metamorph "^3.3.3"
+    zod "^3.25.76"
+    zod-to-json-schema "^3.24.6"
+
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
+side-channel-list@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad"
+  integrity sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==
+  dependencies:
+    es-errors "^1.3.0"
+    object-inspect "^1.13.3"
+
+side-channel-map@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/side-channel-map/-/side-channel-map-1.0.1.tgz#d6bb6b37902c6fef5174e5f533fab4c732a26f42"
+  integrity sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==
+  dependencies:
+    call-bound "^1.0.2"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.5"
+    object-inspect "^1.13.3"
+
+side-channel-weakmap@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz#11dda19d5368e40ce9ec2bdc1fb0ecbc0790ecea"
+  integrity sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==
+  dependencies:
+    call-bound "^1.0.2"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.5"
+    object-inspect "^1.13.3"
+    side-channel-map "^1.0.1"
+
+side-channel@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.0.tgz#c3fcff9c4da932784873335ec9765fa94ff66bc9"
+  integrity sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==
+  dependencies:
+    es-errors "^1.3.0"
+    object-inspect "^1.13.3"
+    side-channel-list "^1.0.0"
+    side-channel-map "^1.0.1"
+    side-channel-weakmap "^1.0.2"
+
+siginfo@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/siginfo/-/siginfo-2.0.0.tgz#32e76c70b79724e3bb567cb9d543eb858ccfaf30"
+  integrity sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==
+
+signal-exit@^3.0.3:
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
+  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
+
+signal-exit@^4.0.1, signal-exit@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
+  integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
+
+sirv@^3.0.0, sirv@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/sirv/-/sirv-3.0.2.tgz#f775fccf10e22a40832684848d636346f41cd970"
+  integrity sha512-2wcC/oGxHis/BoHkkPwldgiPSYcpZK3JU28WoMVv55yHJgcZ8rlXvuG9iZggz+sU1d4bRgIGASwyWqjxu3FM0g==
+  dependencies:
+    "@polka/url" "^1.0.0-next.24"
+    mrmime "^2.0.0"
+    totalist "^3.0.0"
+
+sisteransi@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
+  integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
+
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
+slice-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
+  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
+  dependencies:
+    ansi-styles "^4.0.0"
+    astral-regex "^2.0.0"
+    is-fullwidth-code-point "^3.0.0"
+
+source-map-js@^1.2.0, source-map-js@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
+  integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==
+
+source-map-resolve@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2"
+  integrity sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==
+  dependencies:
+    atob "^2.1.2"
+    decode-uri-component "^0.2.0"
+
+source-map@^0.6.1, source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+source-map@^0.7.3:
+  version "0.7.6"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.6.tgz#a3658ab87e5b6429c8a1f3ba0083d4c61ca3ef02"
+  integrity sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==
+
+stackback@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/stackback/-/stackback-0.0.2.tgz#1ac8a0d9483848d1695e418b6d031a3c3ce68e3b"
+  integrity sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==
+
+statuses@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
+  integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
+
+statuses@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.2.tgz#8f75eecef765b5e1cfcdc080da59409ed424e382"
+  integrity sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==
+
+std-env@^3.10.0, std-env@^3.8.0:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.10.0.tgz#d810b27e3a073047b2b5e40034881f5ea6f9c83b"
+  integrity sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg==
+
+stdin-discarder@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/stdin-discarder/-/stdin-discarder-0.2.2.tgz#390037f44c4ae1a1ae535c5fe38dc3aba8d997be"
+  integrity sha512-UhDfHmA92YAlNnCfhmq0VeNL5bDbiZGg7sZ2IvPsXubGkiNa9EC+tUTsjBRsYUAz87btI6/1wf4XoVvQ3uRnmQ==
+
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^4.1.0, string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^5.0.1, string-width@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
+  integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
+  dependencies:
+    eastasianwidth "^0.2.0"
+    emoji-regex "^9.2.2"
+    strip-ansi "^7.0.1"
+
+string-width@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-8.1.0.tgz#9e9fb305174947cf45c30529414b5da916e9e8d1"
+  integrity sha512-Kxl3KJGb/gxkaUMOjRsQ8IrXiGW75O4E3RPjFIINOVH8AMl2SQ/yWdTzWwF3FevIX9LcMAjJW+GRwAlAbTSXdg==
+  dependencies:
+    get-east-asian-width "^1.3.0"
+    strip-ansi "^7.1.0"
+
+stringify-object@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-6.0.0.tgz#1f6a11ada4b8619657c1780816f278a186b5bcac"
+  integrity sha512-6f94vIED6vmJJfh3lyVsVWxCYSfI5uM+16ntED/Ql37XIyV6kj0mRAAiTeMMc/QLYIaizC3bUprQ8pQnDDrKfA==
+  dependencies:
+    get-own-enumerable-keys "^1.0.0"
+    is-identifier "^1.0.1"
+    is-obj "^3.0.0"
+    is-regexp "^3.1.0"
+
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^7.0.1, strip-ansi@^7.1.0, strip-ansi@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.2.tgz#132875abde678c7ea8d691533f2e7e22bb744dba"
+  integrity sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==
+  dependencies:
+    ansi-regex "^6.0.1"
+
+strip-final-newline@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
+  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
+
+strip-json-comments@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
+
+stylus@^0.57.0:
+  version "0.57.0"
+  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.57.0.tgz#a46f04f426c19ceef54abb1a9d189fd4e886df41"
+  integrity sha512-yOI6G8WYfr0q8v8rRvE91wbxFU+rJPo760Va4MF6K0I6BZjO4r+xSynkvyPBP9tV1CIEUeRsiidjIs2rzb1CnQ==
+  dependencies:
+    css "^3.0.0"
+    debug "^4.3.2"
+    glob "^7.1.6"
+    safer-buffer "^2.1.2"
+    sax "~1.2.4"
+    source-map "^0.7.3"
+
+super-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/super-regex/-/super-regex-1.0.0.tgz#dd90d944a925a1083e7d8570919b21cb76e3d925"
+  integrity sha512-CY8u7DtbvucKuquCmOFEKhr9Besln7n9uN8eFbwcoGYWXOMW07u2o8njWaiXt11ylS3qoGF55pILjRmPlbodyg==
+  dependencies:
+    function-timeout "^1.0.1"
+    time-span "^5.1.0"
+
+supports-color@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+  dependencies:
+    has-flag "^4.0.0"
+
+symbol-tree@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
+  integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
+
+table@^6.8.2:
+  version "6.9.0"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.9.0.tgz#50040afa6264141c7566b3b81d4d82c47a8668f5"
+  integrity sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==
+  dependencies:
+    ajv "^8.0.1"
+    lodash.truncate "^4.4.2"
+    slice-ansi "^4.0.0"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+
+tailwind-merge@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-3.3.1.tgz#a7e7db7c714f6020319e626ecfb7e7dac8393a4b"
+  integrity sha512-gBXpgUm/3rp1lMZZrM/w7D8GKqshif0zAymAhbCyIt8KMe+0v9DQ7cdYLR4FHH/cKpdTXb+A/tKKU3eolfsI+g==
+
+tailwindcss@4.1.16, tailwindcss@^4.1.12, tailwindcss@^4.1.14:
+  version "4.1.16"
+  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-4.1.16.tgz#c32179f98725eb551e5c1189813a3db437ad5a7f"
+  integrity sha512-pONL5awpaQX4LN5eiv7moSiSPd/DLDzKVRJz8Q9PgzmAdd1R4307GQS2ZpfiN7ZmekdQrfhZZiSE5jkLR4WNaA==
+
+tapable@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.3.0.tgz#7e3ea6d5ca31ba8e078b560f0d83ce9a14aa8be6"
+  integrity sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==
+
+test-exclude@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-7.0.1.tgz#20b3ba4906ac20994e275bbcafd68d510264c2a2"
+  integrity sha512-pFYqmTw68LXVjeWJMST4+borgQP2AyMNbg1BpZh9LbyhUeNkeaPF9gzfPGUAnSMV3qPYdWUwDIjjCLiSDOl7vg==
+  dependencies:
+    "@istanbuljs/schema" "^0.1.2"
+    glob "^10.4.1"
+    minimatch "^9.0.4"
+
+text-table@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
+
+time-span@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/time-span/-/time-span-5.1.0.tgz#80c76cf5a0ca28e0842d3f10a4e99034ce94b90d"
+  integrity sha512-75voc/9G4rDIJleOo4jPvN4/YC4GRZrY8yy1uU4lwrB3XEQbWve8zXoO5No4eFrGcTAMYyoY67p8jRQdtA1HbA==
+  dependencies:
+    convert-hrtime "^5.0.0"
+
+tiny-invariant@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.3.tgz#46680b7a873a0d5d10005995eb90a70d74d60127"
+  integrity sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==
+
+tinybench@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/tinybench/-/tinybench-2.9.0.tgz#103c9f8ba6d7237a47ab6dd1dcff77251863426b"
+  integrity sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==
+
+tinyexec@^0.3.1, tinyexec@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/tinyexec/-/tinyexec-0.3.2.tgz#941794e657a85e496577995c6eef66f53f42b3d2"
+  integrity sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==
+
+tinyexec@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/tinyexec/-/tinyexec-1.0.1.tgz#70c31ab7abbb4aea0a24f55d120e5990bfa1e0b1"
+  integrity sha512-5uC6DDlmeqiOwCPmK9jMSdOuZTh8bU39Ys6yidB+UTt5hfZUPGAypSgFRiEp+jbi9qH40BLDvy85jIU88wKSqw==
+
+tinyglobby@^0.2.10, tinyglobby@^0.2.14, tinyglobby@^0.2.15:
+  version "0.2.15"
+  resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.15.tgz#e228dd1e638cea993d2fdb4fcd2d4602a79951c2"
+  integrity sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==
+  dependencies:
+    fdir "^6.5.0"
+    picomatch "^4.0.3"
+
+tinypool@^1.0.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/tinypool/-/tinypool-1.1.1.tgz#059f2d042bd37567fbc017d3d426bdd2a2612591"
+  integrity sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==
+
+tinyrainbow@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/tinyrainbow/-/tinyrainbow-1.2.0.tgz#5c57d2fc0fb3d1afd78465c33ca885d04f02abb5"
+  integrity sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==
+
+tinyrainbow@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/tinyrainbow/-/tinyrainbow-3.0.3.tgz#984a5b1c1b25854a9b6bccbe77964d0593d1ea42"
+  integrity sha512-PSkbLUoxOFRzJYjjxHJt9xro7D+iilgMX/C9lawzVuYiIdcihh9DXmVibBe8lmcFrRi/VzlPjBxbN7rH24q8/Q==
+
+tinyspy@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/tinyspy/-/tinyspy-3.0.2.tgz#86dd3cf3d737b15adcf17d7887c84a75201df20a"
+  integrity sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==
+
+tldts-core@^6.1.86:
+  version "6.1.86"
+  resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-6.1.86.tgz#a93e6ed9d505cb54c542ce43feb14c73913265d8"
+  integrity sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==
+
+tldts@^6.1.32:
+  version "6.1.86"
+  resolved "https://registry.yarnpkg.com/tldts/-/tldts-6.1.86.tgz#087e0555b31b9725ee48ca7e77edc56115cd82f7"
+  integrity sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ==
+  dependencies:
+    tldts-core "^6.1.86"
+
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
+toidentifier@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
+  integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
+
+totalist@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/totalist/-/totalist-3.0.1.tgz#ba3a3d600c915b1a97872348f79c127475f6acf8"
+  integrity sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==
+
+tough-cookie@^5.0.0:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-5.1.2.tgz#66d774b4a1d9e12dc75089725af3ac75ec31bed7"
+  integrity sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==
+  dependencies:
+    tldts "^6.1.32"
+
+tr46@^5.1.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-5.1.1.tgz#96ae867cddb8fdb64a49cc3059a8d428bcf238ca"
+  integrity sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==
+  dependencies:
+    punycode "^2.3.1"
+
+ts-api-utils@^1.3.0:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.4.3.tgz#bfc2215fe6528fecab2b0fba570a2e8a4263b064"
+  integrity sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==
+
+ts-api-utils@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-2.1.0.tgz#595f7094e46eed364c13fd23e75f9513d29baf91"
+  integrity sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==
+
+ts-morph@^27.0.2:
+  version "27.0.2"
+  resolved "https://registry.yarnpkg.com/ts-morph/-/ts-morph-27.0.2.tgz#7b2fcce6822eeca3942fa6c601f159d5920b1422"
+  integrity sha512-fhUhgeljcrdZ+9DZND1De1029PrE+cMkIP7ooqkLRTrRLTqcki2AstsyJm0vRNbTbVCNJ0idGlbBrfqc7/nA8w==
+  dependencies:
+    "@ts-morph/common" "~0.28.1"
+    code-block-writer "^13.0.3"
+
+tslib@^2.0.0, tslib@^2.0.1, tslib@^2.4.0, tslib@^2.8.0:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
+  integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
+
+tw-animate-css@^1.3.8:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/tw-animate-css/-/tw-animate-css-1.4.0.tgz#b4a06f68244cba39428aa47e65e6e4c0babc21ee"
+  integrity sha512-7bziOlRqH0hJx80h/3mbicLW7o8qLsH5+RaLR2t+OHM3D0JlWGODQKQ4cxbK7WlvmUxpcj6Kgu6EKqjrGFe3QQ==
+
+type-check@^0.4.0, type-check@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
+  dependencies:
+    prelude-ls "^1.2.1"
+
+type-fest@^0.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
+  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
+
+type-is@^2.0.0, type-is@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-2.0.1.tgz#64f6cf03f92fce4015c2b224793f6bdd4b068c97"
+  integrity sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==
+  dependencies:
+    content-type "^1.0.5"
+    media-typer "^1.1.0"
+    mime-types "^3.0.0"
+
+typescript-eslint@^8.46.2:
+  version "8.46.2"
+  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.46.2.tgz#da1adec683ba93a1b6c3850a4efb0922ffbc627d"
+  integrity sha512-vbw8bOmiuYNdzzV3lsiWv6sRwjyuKJMQqWulBOU7M0RrxedXledX8G8kBbQeiOYDnTfiXz0Y4081E1QMNB6iQg==
+  dependencies:
+    "@typescript-eslint/eslint-plugin" "8.46.2"
+    "@typescript-eslint/parser" "8.46.2"
+    "@typescript-eslint/typescript-estree" "8.46.2"
+    "@typescript-eslint/utils" "8.46.2"
+
+typescript@^5.4.5, typescript@^5.9.3:
+  version "5.9.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.3.tgz#5b4f59e15310ab17a216f5d6cf53ee476ede670f"
+  integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==
+
+ufo@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.6.1.tgz#ac2db1d54614d1b22c1d603e3aef44a85d8f146b"
+  integrity sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA==
+
+undici-types@~6.21.0:
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb"
+  integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==
+
+undici@^7.16.0:
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-7.16.0.tgz#cb2a1e957726d458b536e3f076bf51f066901c1a"
+  integrity sha512-QEg3HPMll0o3t2ourKwOeUAZ159Kn9mx5pnzHRQO8+Wixmh88YdZRiIwat0iNzNNXn0yoEtXJqFpyW7eM8BV7g==
+
+universalify@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
+  integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==
+
+unpipe@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
+
+update-browserslist-db@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.4.tgz#7802aa2ae91477f255b86e0e46dbc787a206ad4a"
+  integrity sha512-q0SPT4xyU84saUX+tomz1WLkxUbuaJnR1xWt17M7fJtEJigJeWUNGUqrauFXsHnqev9y9JTRGwk13tFBuKby4A==
+  dependencies:
+    escalade "^3.2.0"
+    picocolors "^1.1.1"
+
+uri-js@^4.2.2:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
+  dependencies:
+    punycode "^2.1.0"
+
+util-deprecate@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
+
+vary@^1, vary@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
+
+vite-node@2.1.9:
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/vite-node/-/vite-node-2.1.9.tgz#549710f76a643f1c39ef34bdb5493a944e4f895f"
+  integrity sha512-AM9aQ/IPrW/6ENLQg3AGY4K1N2TGZdR5e4gu/MmmR2xR3Ll1+dib+nook92g4TV3PXVyeyxdWwtaCAiUL0hMxA==
+  dependencies:
+    cac "^6.7.14"
+    debug "^4.3.7"
+    es-module-lexer "^1.5.4"
+    pathe "^1.1.2"
+    vite "^5.0.0"
+
+vite@^5.0.0:
+  version "5.4.21"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.21.tgz#84a4f7c5d860b071676d39ba513c0d598fdc7027"
+  integrity sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==
+  dependencies:
+    esbuild "^0.21.3"
+    postcss "^8.4.43"
+    rollup "^4.20.0"
+  optionalDependencies:
+    fsevents "~2.3.3"
+
+"vite@^6.0.0 || ^7.0.0":
+  version "7.2.4"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-7.2.4.tgz#a3a09c7e25487612ecc1119c7d412c73da35bd4e"
+  integrity sha512-NL8jTlbo0Tn4dUEXEsUg8KeyG/Lkmc4Fnzb8JXN/Ykm9G4HNImjtABMJgkQoVjOBN/j2WAwDTRytdqJbZsah7w==
+  dependencies:
+    esbuild "^0.25.0"
+    fdir "^6.5.0"
+    picomatch "^4.0.3"
+    postcss "^8.5.6"
+    rollup "^4.43.0"
+    tinyglobby "^0.2.15"
+  optionalDependencies:
+    fsevents "~2.3.3"
+
+vite@^7.1.2:
+  version "7.1.12"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-7.1.12.tgz#8b29a3f61eba23bcb93fc9ec9af4a3a1e83eecdb"
+  integrity sha512-ZWyE8YXEXqJrrSLvYgrRP7p62OziLW7xI5HYGWFzOvupfAlrLvURSzv/FyGyy0eidogEM3ujU+kUG1zuHgb6Ug==
+  dependencies:
+    esbuild "^0.25.0"
+    fdir "^6.5.0"
+    picomatch "^4.0.3"
+    postcss "^8.5.6"
+    rollup "^4.43.0"
+    tinyglobby "^0.2.15"
+  optionalDependencies:
+    fsevents "~2.3.3"
+
+vitest@^2.1.0:
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/vitest/-/vitest-2.1.9.tgz#7d01ffd07a553a51c87170b5e80fea3da7fb41e7"
+  integrity sha512-MSmPM9REYqDGBI8439mA4mWhV5sKmDlBKWIYbA3lRb2PTHACE0mgKwA8yQ2xq9vxDTuk4iPrECBAEW2aoFXY0Q==
+  dependencies:
+    "@vitest/expect" "2.1.9"
+    "@vitest/mocker" "2.1.9"
+    "@vitest/pretty-format" "^2.1.9"
+    "@vitest/runner" "2.1.9"
+    "@vitest/snapshot" "2.1.9"
+    "@vitest/spy" "2.1.9"
+    "@vitest/utils" "2.1.9"
+    chai "^5.1.2"
+    debug "^4.3.7"
+    expect-type "^1.1.0"
+    magic-string "^0.30.12"
+    pathe "^1.1.2"
+    std-env "^3.8.0"
+    tinybench "^2.9.0"
+    tinyexec "^0.3.1"
+    tinypool "^1.0.1"
+    tinyrainbow "^1.2.0"
+    vite "^5.0.0"
+    vite-node "2.1.9"
+    why-is-node-running "^2.3.0"
+
+vitest@^4.0.0:
+  version "4.0.14"
+  resolved "https://registry.yarnpkg.com/vitest/-/vitest-4.0.14.tgz#69f550e3b3e666671948da18e5d50939d5a22e5d"
+  integrity sha512-d9B2J9Cm9dN9+6nxMnnNJKJCtcyKfnHj15N6YNJfaFHRLua/d3sRKU9RuKmO9mB0XdFtUizlxfz/VPbd3OxGhw==
+  dependencies:
+    "@vitest/expect" "4.0.14"
+    "@vitest/mocker" "4.0.14"
+    "@vitest/pretty-format" "4.0.14"
+    "@vitest/runner" "4.0.14"
+    "@vitest/snapshot" "4.0.14"
+    "@vitest/spy" "4.0.14"
+    "@vitest/utils" "4.0.14"
+    es-module-lexer "^1.7.0"
+    expect-type "^1.2.2"
+    magic-string "^0.30.21"
+    obug "^2.1.1"
+    pathe "^2.0.3"
+    picomatch "^4.0.3"
+    std-env "^3.10.0"
+    tinybench "^2.9.0"
+    tinyexec "^0.3.2"
+    tinyglobby "^0.2.15"
+    tinyrainbow "^3.0.3"
+    vite "^6.0.0 || ^7.0.0"
+    why-is-node-running "^2.3.0"
+
+vscode-uri@^3.0.8:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.1.0.tgz#dd09ec5a66a38b5c3fffc774015713496d14e09c"
+  integrity sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==
+
+vue-component-type-helpers@^2.0.0:
+  version "2.2.12"
+  resolved "https://registry.yarnpkg.com/vue-component-type-helpers/-/vue-component-type-helpers-2.2.12.tgz#5014787aad185a22f460ad469cc51f14524308bc"
+  integrity sha512-YbGqHZ5/eW4SnkPNR44mKVc6ZKQoRs/Rux1sxC6rdwXb4qpbOSYfDr9DsTHolOTGmIKgM9j141mZbBeg05R1pw==
+
+vue-demi@>=0.13.0, vue-demi@>=0.14.8:
+  version "0.14.10"
+  resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.14.10.tgz#afc78de3d6f9e11bf78c55e8510ee12814522f04"
+  integrity sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==
+
+vue-eslint-parser@^10.1.0:
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-10.2.0.tgz#cb53f89b14c7f5bf6a95c9532e3b2961ab619d61"
+  integrity sha512-CydUvFOQKD928UzZhTp4pr2vWz1L+H99t7Pkln2QSPdvmURT0MoC4wUccfCnuEaihNsu9aYYyk+bep8rlfkUXw==
+  dependencies:
+    debug "^4.4.0"
+    eslint-scope "^8.2.0"
+    eslint-visitor-keys "^4.2.0"
+    espree "^10.3.0"
+    esquery "^1.6.0"
+    semver "^7.6.3"
+
+vue-metamorph@^3.3.3:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/vue-metamorph/-/vue-metamorph-3.3.3.tgz#05ecf901da36de9c2e7cd25d3d5ea3df824e3be7"
+  integrity sha512-NPeDg2/ZL4lDJsC/PjEfFq+Ln3Rr7cX86AQo4bI5V6ziUTZOMY93HyIwKHW37BrIf4YB97llrGtvM+eMhwr1jw==
+  dependencies:
+    "@babel/parser" "8.0.0-alpha.12"
+    ast-types-x "1.18.0"
+    chalk "^5.3.0"
+    cli-progress "^3.12.0"
+    commander "^13.1.0"
+    deep-diff "^1.0.2"
+    fs-extra "^11.2.0"
+    glob "^11.0.0"
+    lodash-es "^4.17.21"
+    magic-string "^0.30.10"
+    micromatch "^4.0.8"
+    node-html-parser "^7.0.1"
+    postcss "^8.4.38"
+    postcss-less "^6.0.0"
+    postcss-sass "^0.5.0"
+    postcss-scss "^4.0.9"
+    postcss-styl "^0.12.3"
+    recast-x "1.0.5"
+    table "^6.8.2"
+    vue-eslint-parser "^10.1.0"
+
+vue-tsc@^3.0.5:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-3.1.2.tgz#f83019ed112b5bcc995904a7a4e5791760b580a5"
+  integrity sha512-3fd4DY0rFczs5f+VB3OhcLU83V6+3Puj2yLBe0Ak65k7ERk+STVNKaOAi0EBo6Lc15UiJB6LzU6Mxy4+h/pKew==
+  dependencies:
+    "@volar/typescript" "2.4.23"
+    "@vue/language-core" "3.1.2"
+
+vue@^3.5.13, vue@^3.5.18:
+  version "3.5.22"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-3.5.22.tgz#2b8ddb94ee4b640ef12fe7f6efe1cf16f3b582e7"
+  integrity sha512-toaZjQ3a/G/mYaLSbV+QsQhIdMo9x5rrqIpYRObsJ6T/J+RyCSFwN2LHNVH9v8uIcljDNa3QzPVdv3Y6b9hAJQ==
+  dependencies:
+    "@vue/compiler-dom" "3.5.22"
+    "@vue/compiler-sfc" "3.5.22"
+    "@vue/runtime-dom" "3.5.22"
+    "@vue/server-renderer" "3.5.22"
+    "@vue/shared" "3.5.22"
+
+w3c-xmlserializer@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz#f925ba26855158594d907313cedd1476c5967f6c"
+  integrity sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==
+  dependencies:
+    xml-name-validator "^5.0.0"
+
+webidl-conversions@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a"
+  integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==
+
+whatwg-encoding@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz#d0f4ef769905d426e1688f3e34381a99b60b76e5"
+  integrity sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==
+  dependencies:
+    iconv-lite "0.6.3"
+
+whatwg-mimetype@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz#bc1bf94a985dc50388d54a9258ac405c3ca2fc0a"
+  integrity sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==
+
+whatwg-url@^14.0.0:
+  version "14.2.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-14.2.0.tgz#4ee02d5d725155dae004f6ae95c73e7ef5d95663"
+  integrity sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==
+  dependencies:
+    tr46 "^5.1.0"
+    webidl-conversions "^7.0.0"
+
+which@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
+which@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/which/-/which-4.0.0.tgz#cd60b5e74503a3fbcfbf6cd6b4138a8bae644c1a"
+  integrity sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==
+  dependencies:
+    isexe "^3.1.1"
+
+why-is-node-running@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/why-is-node-running/-/why-is-node-running-2.3.0.tgz#a3f69a97107f494b3cdc3bdddd883a7d65cebf04"
+  integrity sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==
+  dependencies:
+    siginfo "^2.0.0"
+    stackback "0.0.2"
+
+word-wrap@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
+  integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
+
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrap-ansi@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
+  integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
+  dependencies:
+    ansi-styles "^6.1.0"
+    string-width "^5.0.1"
+    strip-ansi "^7.0.1"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
+
+ws@^8.18.0:
+  version "8.18.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.3.tgz#b56b88abffde62791c639170400c93dcb0c95472"
+  integrity sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==
+
+xml-name-validator@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835"
+  integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==
+
+xml-name-validator@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-5.0.0.tgz#82be9b957f7afdacf961e5980f1bf227c0bf7673"
+  integrity sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==
+
+xmlchars@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
+  integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
+
+yallist@^3.0.2:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
+
+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+
+yoctocolors@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/yoctocolors/-/yoctocolors-2.1.2.tgz#d795f54d173494e7d8db93150cec0ed7f678c83a"
+  integrity sha512-CzhO+pFNo8ajLM2d2IW/R93ipy99LWjtwblvC1RsoSUMZgyLbYFr221TnSNT7GjGdYui6P459mw9JH/g/zW2ug==
+
+zod-to-json-schema@^3.24.1, zod-to-json-schema@^3.24.6:
+  version "3.24.6"
+  resolved "https://registry.yarnpkg.com/zod-to-json-schema/-/zod-to-json-schema-3.24.6.tgz#5920f020c4d2647edfbb954fa036082b92c9e12d"
+  integrity sha512-h/z3PKvcTcTetyjl1fkj79MHNEjm+HpD6NXheWjzOekY7kV+lwDYnHw+ivHkijnCSMz1yJaWBD9vu/Fcmk+vEg==
+
+zod@^3.23.8, zod@^3.25.76:
+  version "3.25.76"
+  resolved "https://registry.yarnpkg.com/zod/-/zod-3.25.76.tgz#26841c3f6fd22a6a2760e7ccb719179768471e34"
+  integrity sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==
diff --git a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
index c7da31f2b288..b12e9cd3d042 100644
--- a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
@@ -10,7 +10,7 @@ in
 buildGoModule rec {
   pname = "gitlab-workhorse";
 
-  version = "18.6.4";
+  version = "18.8.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
@@ -22,7 +22,7 @@ buildGoModule rec {
 
   sourceRoot = "${src.name}/workhorse";
 
-  vendorHash = "sha256-FCaqoDS6qbKs4Uy8X76cco24HIRxf9gsnQpIjJOHba0=";
+  vendorHash = "sha256-MfEVR8kfNvP1wAmd6PjVIcfiNojHyMmDvWjdDlnd/P0=";
   buildInputs = [ git ];
   ldflags = [ "-X main.Version=${version}" ];
   doCheck = false;
diff --git a/pkgs/by-name/gi/gitlab/package.nix b/pkgs/by-name/gi/gitlab/package.nix
index a78e89ebeeb5..a244ea5474d0 100644
--- a/pkgs/by-name/gi/gitlab/package.nix
+++ b/pkgs/by-name/gi/gitlab/package.nix
@@ -47,7 +47,7 @@ let
     owner = data.owner;
     repo = data.repo;
     rev = data.rev;
-    sha256 = data.repo_hash;
+    hash = data.repo_hash;
   };
 
   rubyEnv = bundlerEnv rec {
@@ -108,6 +108,54 @@ let
         '';
       };
 
+      gitlab_query_language = attrs: {
+        cargoDeps = rustPlatform.fetchCargoVendor {
+          src = stdenv.mkDerivation {
+            inherit (buildRubyGem { inherit (attrs) gemName version source; })
+              name
+              src
+              unpackPhase
+              nativeBuildInputs
+              ;
+            installPhase = ''
+              mkdir -p $out
+              cp -R ext $out
+              cp Cargo.* $out
+            '';
+          };
+          hash = "sha256-XGeFht5QRYb4Cu3n9nt4euUeNXHh1kJ6pQ5LJjnVhzc=";
+        };
+
+        dontBuild = false;
+
+        nativeBuildInputs = [
+          cargo
+          rustc
+          rustPlatform.cargoSetupHook
+          rustPlatform.bindgenHook
+        ];
+
+        # The gem builder wrongly copies Cargo.lock within the gem, while it's missing in the outer rust project
+        # before rustc ran.
+        # This fixes this and makes the rustc invocation work.
+        preInstall = ''
+          export CARGO_HOME="$PWD/../.cargo/"
+          # Unpack
+          tar xvf $gempkg
+          # Modify
+          gzip -d data.tar.gz
+          chmod +w data.tar
+          mv Cargo.lock ./ext/gitlab_query_language
+          tar rf data.tar ./ext/gitlab_query_language/Cargo.lock
+          # Repack
+          gzip data.tar
+          tar -cf $gempkg data.tar.gz metadata.gz
+        '';
+        postInstall = ''
+          find $out -type f -name .rustc_info.json -delete
+        '';
+      };
+
       static_holmes = attrs: {
         nativeBuildInputs = [
           icu
@@ -143,11 +191,13 @@ let
 
     yarnOfflineCache = fetchYarnDeps {
       yarnLock = src + "/yarn.lock";
-      sha256 = data.yarn_hash;
+      hash = data.yarn_hash;
     };
     frontendIslandsYarnOfflineCache = fetchYarnDeps {
-      yarnLock = src + "/ee/frontend_islands/yarn.lock";
-      sha256 = data.frontend_islands_yarn_hash;
+      # Revert to this when GitLab fixes their frontend_islands yarn.lock
+      # yarnLock = src + "/ee/frontend_islands/yarn.lock";
+      yarnLock = ./ee-frontend-islands-yarn.lock;
+      hash = data.frontend_islands_yarn_hash;
     };
 
     nativeBuildInputs = [
@@ -170,6 +220,14 @@ let
       # [1]: https://gitlab.com/gitlab-org/gitlab/-/commit/99c0fac52b10cd9df62bbe785db799352a2d9028
       ./Remove-unsupported-database-names.patch
     ];
+
+    # Remove once GitLab fixed their frontend_islands yarn.lock
+    postPatch = ''
+      rm ee/frontend_islands/yarn.lock
+      cp ${./ee-frontend-islands-yarn.lock} ee/frontend_islands/yarn.lock
+      chmod 777 ee/frontend_islands/yarn.lock
+    '';
+
     # One of the patches uses this variable - if it's unset, execution
     # of rake tasks fails.
     GITLAB_LOG_PATH = "log";
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
index 694acd16fc0a..9026b832bb45 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
@@ -21,42 +21,35 @@ end
 
 extend ignore_feature_category
 
-gem 'bundler-checksum', '~> 0.1.0', path: 'gems/bundler-checksum', require: false, feature_category: :shared
+gem 'bundler-checksum', '~> 0.1.0', path: 'gems/bundler-checksum', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # See https://docs.gitlab.com/ee/development/gemfile.html#upgrade-rails for guidelines when upgrading Rails
-
-if next?
-  gem 'rails', '~> 7.2.3', feature_category: :shared
-else
-  gem 'rails', '~> 7.1.6', feature_category: :shared
-end
+gem 'rails', '~> 7.2.3', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Pin Zeitwerk until https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/9408 is fixed
-gem 'zeitwerk', '= 2.6.18', feature_category: :shared
+gem 'zeitwerk', '= 2.6.18', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab', feature_category: :shared
-# This can be dropped after upgrading to Rails 7.2: https://github.com/rails/rails/pull/49674
-gem 'mutex_m', '~> 0.3', feature_category: :shared
+gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 # Need by Rails
-gem 'drb', '~> 2.2', feature_category: :shared
+gem 'drb', '~> 2.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-gem 'bootsnap', '~> 1.18.6', require: false, feature_category: :shared
+gem 'bootsnap', '~> 1.18.6', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Avoid the precompiled native gems because Omnibus needs to build this to ensure
 # LD_LIBRARY_PATH is correct: https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7730
 if RUBY_PLATFORM.include?('darwin')
-  gem 'ffi', '~> 1.17.2', feature_category: :shared
+  gem 'ffi', '~> 1.17.3', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 else
-  gem 'ffi', '~> 1.17.2', force_ruby_platform: true, feature_category: :shared
+  gem 'ffi', '~> 1.17.3', force_ruby_platform: true, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 end
 
-gem 'openssl', '~> 3.3.2', feature_category: :shared
+gem 'openssl', '~> 3.3.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-gem 'gitlab-safe_request_store', path: 'gems/gitlab-safe_request_store', feature_category: :shared
+gem 'gitlab-safe_request_store', path: 'gems/gitlab-safe_request_store', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # GitLab Monorepo Gems
 group :monorepo do
-  gem 'gitlab-utils', path: 'gems/gitlab-utils', feature_category: :shared
+  gem 'gitlab-utils', path: 'gems/gitlab-utils', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 end
 
 gem 'gitlab-backup-cli', path: 'gems/gitlab-backup-cli', require: 'gitlab/backup/cli', feature_category: :backup_restore
@@ -64,30 +57,30 @@ gem 'gitlab-backup-cli', path: 'gems/gitlab-backup-cli', require: 'gitlab/backup
 gem 'gitlab-secret_detection', '< 1.0', feature_category: :secret_detection
 
 # Responders respond_to and respond_with
-gem 'responders', '~> 3.0', feature_category: :shared
+gem 'responders', '~> 3.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-gem 'sprockets', '~> 3.7.0', feature_category: :shared
-gem 'sprockets-rails', '~>  3.5.1', feature_category: :shared
+gem 'sprockets', '~> 3.7.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'sprockets-rails', '~>  3.5.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-gem 'view_component', '~> 3.23.2', feature_category: :shared
+gem 'view_component', '~> 3.23.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Supported DBs
 gem 'pg', '~> 1.6.1', feature_category: :database
 
 gem 'rugged', '~> 1.6', feature_category: :gitaly
 
-gem 'faraday', '~> 2', feature_category: :shared
-gem 'faraday-retry', '~> 2', feature_category: :shared
+gem 'faraday', '~> 2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'faraday-retry', '~> 2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 # Logger is a dependency of Faraday, but Logger 1.6.0 does not work with Chef.
-gem 'logger', '~> 1.7.0', feature_category: :shared
+gem 'logger', '~> 1.7.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 gem 'marginalia', '~> 1.11.1', feature_category: :database
 
 # Authorization
-gem 'declarative_policy', '~> 2.0.1', feature_category: :shared
+gem 'declarative_policy', '~> 2.0.1', feature_category: :permissions
 
 # For source code paths mapping
-gem 'coverband', '6.1.5', require: false, feature_category: :shared
+gem 'coverband', '6.1.5', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Authentication libraries
 gem 'devise', '~> 4.9.3', feature_category: :system_access
@@ -97,7 +90,7 @@ gem 'bcrypt', '~> 3.1', '>= 3.1.14', feature_category: :system_access
 gem 'doorkeeper', '~> 5.8', '>= 5.8.1', feature_category: :system_access
 gem 'doorkeeper-openid_connect', '~> 1.8.10', feature_category: :system_access
 gem 'doorkeeper-device_authorization_grant', '~> 1.0.0', feature_category: :system_access
-gem 'rexml', '~> 3.4.0', feature_category: :shared
+gem 'rexml', '~> 3.4.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 gem 'ruby-saml', '~> 1.18', feature_category: :system_access
 gem 'omniauth-saml', '~> 2.2.1', feature_category: :system_access
 gem 'omniauth', '~> 2.1.0', feature_category: :system_access
@@ -134,8 +127,9 @@ gem 'invisible_captcha', '~> 2.3.0', feature_category: :insider_threat
 # Two-factor authentication
 gem 'devise-two-factor', '~> 4.1.1', feature_category: :system_access
 gem 'rqrcode', '~> 2.2', feature_category: :system_access
+gem 'webauthn', '~> 3.0', feature_category: :system_access
 
-gem 'attr_encrypted', '~> 4.2', feature_category: :shared
+gem 'attr_encrypted', '~> 4.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # GitLab Pages
 gem 'validates_hostname', '~> 1.0.13', feature_category: :pages
@@ -144,10 +138,10 @@ gem 'rubyzip', '~> 2.4.0', require: 'zip', feature_category: :pages
 gem 'acme-client', '~> 2.0.19', feature_category: :pages
 
 # Browser detection
-gem 'browser', '~> 5.3.1', feature_category: :shared
+gem 'browser', '~> 5.3.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # OS detection for usage ping
-gem 'ohai', '~> 18.1', feature_category: :product_analytics
+gem 'ohai', '~> 19.1.16', feature_category: :product_analytics
 
 # GPG
 gem 'gpgme', '~> 2.0.24', feature_category: :source_code_management
@@ -156,7 +150,7 @@ gem 'gpgme', '~> 2.0.24', feature_category: :source_code_management
 # GitLab fork with several improvements to original library. For full list of changes
 # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
 gem 'gitlab_omniauth-ldap', '~> 2.3.0', require: 'omniauth-ldap', feature_category: :system_access
-gem 'net-ldap', '~> 0.17.1', feature_category: :system_access
+gem 'net-ldap', '~> 0.20.0', feature_category: :system_access
 
 # API
 gem 'grape', '~> 2.0.0', feature_category: :api
@@ -165,7 +159,7 @@ gem 'grape-swagger', '~> 2.1.2', group: [:development, :test], feature_category:
 gem 'grape-swagger-entity', '~> 0.5.5', group: [:development, :test], feature_category: :api
 gem 'grape-path-helpers', '~> 2.0.1', feature_category: :api
 gem 'gitlab-grape-openapi', path: 'gems/gitlab-grape-openapi', feature_category: :api
-gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared
+gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # GraphQL API
 gem 'graphql', '2.5.11', feature_category: :api
@@ -184,63 +178,63 @@ gem 'gitlab-duo-workflow-service-client', '~> 0.6',
   feature_category: :duo_agent_platform
 
 # Generate Fake data
-gem 'ffaker', '~> 2.24', feature_category: :shared
+gem 'ffaker', '~> 2.24', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-gem 'hashie', '~> 5.0.0', feature_category: :shared
+gem 'hashie', '~> 5.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Pagination
-gem 'kaminari', '~> 1.2.2', feature_category: :shared
+gem 'kaminari', '~> 1.2.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # HAML
-gem 'hamlit', '~> 3.0.0', feature_category: :shared
+gem 'hamlit', '~> 3.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Files attachments
-gem 'carrierwave', '~> 1.3', feature_category: :shared
-gem 'mini_magick', '~> 4.12', feature_category: :shared
-gem 'marcel', '~> 1.0.4', feature_category: :shared
+gem 'carrierwave', '~> 1.3', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'mini_magick', '~> 4.12', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'marcel', '~> 1.0.4', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # PDF generation
 gem 'prawn', feature_category: :vulnerability_management
 gem 'prawn-svg', feature_category: :vulnerability_management
 
 # for backups
-gem 'fog-aws', '~> 3.26', feature_category: :shared
-gem 'fog-core', '~> 2.5', feature_category: :shared
-gem 'fog-google', '~> 1.25', require: 'fog/google', feature_category: :shared
-gem 'fog-local', '~> 0.8', feature_category: :shared
+gem 'fog-aws', '~> 3.26', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'fog-core', '~> 2.5', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'fog-google', '~> 1.25', require: 'fog/google', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'fog-local', '~> 0.8', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 # NOTE:
 # the fog-aliyun gem since v0.4 pulls in aliyun-sdk transitively, which monkey-patches
 # the rest-client gem to drop the Content-Length header field for chunked transfers,
 # which may have knock-on effects on other features using `RestClient`.
 # We may want to update this dependency if this is ever addressed upstream, e.g. via
 # https://github.com/aliyun/aliyun-oss-ruby-sdk/pull/93
-gem 'fog-aliyun', '~> 0.4', feature_category: :shared
-gem 'gitlab-fog-azure-rm', '~> 2.4.0', require: 'fog/azurerm', feature_category: :shared
+gem 'fog-aliyun', '~> 0.4', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'gitlab-fog-azure-rm', '~> 2.4.0', require: 'fog/azurerm', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # for Google storage
 
 # Need this specific version of google-apis-storage_v1 so that fog-google will utilize the updated list_objects with
 # match_glob support in google-apis-core 0.11.1. Because of this we also have to bump google-cloud-storage to 1.45.0.
-gem 'google-apis-storage_v1', '~> 0.29', feature_category: :shared
-gem 'google-cloud-storage', '~> 1.57.0', feature_category: :shared
+gem 'google-apis-storage_v1', '~> 0.29', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'google-cloud-storage', '~> 1.57.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 # We need >= 0.11.1 because that's when match_glob support is added to list_objects
-gem 'google-apis-core', '~> 0.18.0', '>= 0.18.0', feature_category: :shared
-gem 'google-apis-compute_v1', '~> 0.129.0', feature_category: :shared
-gem 'google-apis-container_v1', '~> 0.100.0', feature_category: :shared
-gem 'google-apis-container_v1beta1', '~> 0.91.0', feature_category: :shared
-gem 'google-apis-cloudbilling_v1', '~> 0.22.0', feature_category: :shared
-gem 'google-apis-cloudresourcemanager_v1', '~> 0.44.0', feature_category: :shared
-gem 'google-apis-iam_v1', '~> 0.79.0', feature_category: :shared
-gem 'google-apis-serviceusage_v1', '~> 0.28.0', feature_category: :shared
-gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0', feature_category: :shared
-gem 'google-apis-androidpublisher_v3', '~> 0.86.0', feature_category: :shared
+gem 'google-apis-core', '~> 0.18.0', '>= 0.18.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'google-apis-compute_v1', '~> 0.129.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'google-apis-container_v1', '~> 0.100.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'google-apis-container_v1beta1', '~> 0.91.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'google-apis-cloudbilling_v1', '~> 0.22.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'google-apis-cloudresourcemanager_v1', '~> 0.44.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'google-apis-iam_v1', '~> 0.79.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'google-apis-serviceusage_v1', '~> 0.28.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'google-apis-androidpublisher_v3', '~> 0.86.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-gem 'googleauth', '~> 1.14', feature_category: :shared
-gem 'google-cloud-artifact_registry-v1', '~> 0.11.0', feature_category: :shared
-gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared
+gem 'googleauth', '~> 1.14', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'google-cloud-artifact_registry-v1', '~> 0.11.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Seed data
-gem 'seed-fu', '~> 2.3.7', feature_category: :shared
+gem 'seed-fu', '~> 2.3.7', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Search
 gem 'elasticsearch-model', '~> 7.2', feature_category: :global_search
@@ -259,7 +253,6 @@ gem 'gitlab-active-context', path: 'gems/gitlab-active-context', require: 'activ
 
 # Markdown and HTML processing
 gem 'html-pipeline', '~> 2.14.3', feature_category: :markdown
-gem 'deckar01-task_list', '2.3.4', feature_category: :markdown
 gem 'gitlab-markup', '~> 2.0.0', require: 'github/markup', feature_category: :markdown
 gem 'commonmarker', '~> 0.23.10', feature_category: :markdown
 gem 'kramdown', '~> 2.5.0', feature_category: :markdown
@@ -271,9 +264,9 @@ gem 'asciidoctor', '~> 2.0.18', feature_category: :markdown
 gem 'asciidoctor-include-ext', '~> 0.4.0', require: false, feature_category: :markdown
 gem 'asciidoctor-plantuml', '~> 0.0.16', feature_category: :markdown
 gem 'asciidoctor-kroki', '~> 0.10.0', require: false, feature_category: :markdown
-gem 'rouge', '~> 4.6.1', feature_category: :shared
+gem 'rouge', '~> 4.7.0', feature_category: :markdown
 gem 'truncato', '~> 0.7.13', feature_category: :team_planning
-gem 'nokogiri', '~> 1.18', feature_category: :shared
+gem 'nokogiri', '~> 1.18', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 gem 'gitlab-glfm-markdown', '~> 0.0.39', feature_category: :markdown
 gem 'tanuki_emoji', '~> 0.13', feature_category: :markdown
 gem 'unicode-emoji', '~> 4.0', feature_category: :markdown
@@ -282,25 +275,25 @@ gem 'unicode-emoji', '~> 4.0', feature_category: :markdown
 gem 'icalendar', '~> 2.10.1', feature_category: :team_planning
 
 # Diffs
-gem 'diffy', '~> 3.4', feature_category: :shared
+gem 'diffy', '~> 3.4', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 gem 'diff_match_patch', '~> 0.1.0', path: 'vendor/gems/diff_match_patch', feature_category: :team_planning
 
 # Application server
-gem 'rack', '~> 2.2.9', feature_category: :shared
+gem 'rack', '~> 2.2.9', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 # https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually
-gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base', feature_category: :shared
+gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 group :puma do
-  gem 'puma', '= 6.6.1', require: false, feature_category: :shared
-  gem 'sd_notify', '~> 0.1.0', require: false, feature_category: :shared
+  gem 'puma', '~> 7.1', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+  gem 'sd_notify', '~> 0.1.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 end
 
 # State machine
-gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared
+gem 'state_machines-activerecord', '~> 0.100.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Background jobs
-gem 'sidekiq', '~> 7.3.9', feature_category: :scalability
-gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability
+gem 'sidekiq', path: 'vendor/gems/sidekiq', require: 'sidekiq', feature_category: :scalability
+gem 'sidekiq-cron', '~> 2.3.0', feature_category: :scalability
 gem 'gitlab-sidekiq-fetcher',
   path: 'vendor/gems/sidekiq-reliable-fetch',
   require: 'sidekiq-reliable-fetch',
@@ -310,35 +303,35 @@ gem 'gitlab-sidekiq-fetcher',
 gem 'fugit', '~> 1.11.1', feature_category: :continuous_integration
 
 # HTTP requests
-gem 'httparty', '~> 0.23.0', feature_category: :shared
+gem 'httparty', '~> 0.23.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Colored output to console
-gem 'rainbow', '~> 3.0', feature_category: :shared
+gem 'rainbow', '~> 3.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Progress bar
-gem 'ruby-progressbar', '~> 1.10', feature_category: :shared
+gem 'ruby-progressbar', '~> 1.10', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Linear-time regex library for untrusted regular expressions
-gem 're2', '~> 2.15', feature_category: :shared
+gem 're2', '~> 2.15', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Misc
 
 gem 'semver_dialects', '~> 3.7', feature_category: :software_composition_analysis
-gem 'version_sorter', '~> 2.3', feature_category: :shared
-gem 'csv_builder', path: 'gems/csv_builder', feature_category: :shared
+gem 'version_sorter', '~> 2.3', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'csv_builder', path: 'gems/csv_builder', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Export Ruby Regex to Javascript
-gem 'js_regex', '~> 3.8', feature_category: :shared
+gem 'js_regex', '~> 3.8', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # User agent parsing
-gem 'device_detector', feature_category: :shared
+gem 'device_detector', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Redis
 gem 'redis', '~> 5.4.1', feature_category: :redis
 gem 'redis-client', '~> 0.25', feature_category: :redis
 gem 'redis-cluster-client', '~> 0.13', feature_category: :redis
 gem 'redis-clustering', '~> 5.4.0', feature_category: :redis
-gem 'connection_pool', '~> 2.5.3', feature_category: :shared
+gem 'connection_pool', '~> 2.5.3', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Redis session store
 gem 'redis-actionpack', '~> 5.5.0', feature_category: :redis
@@ -351,48 +344,48 @@ gem 'atlassian-jwt', '~> 0.2.1', feature_category: :integrations
 gem 'slack-messenger', '~> 2.3.5', feature_category: :integrations
 
 # Kubernetes integration
-gem 'kubeclient', '~> 4.12.0', feature_category: :shared
+gem 'kubeclient', '~> 4.12.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # AI
-gem 'circuitbox', '2.0.0', feature_category: :shared
+gem 'circuitbox', '2.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Sanitize user input
-gem 'sanitize', '~> 6.0.2', feature_category: :shared
-gem 'babosa', '~> 2.0', feature_category: :shared
+gem 'sanitize', '~> 6.0.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'babosa', '~> 2.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Sanitizes SVG input
-gem 'loofah', '~> 2.24.0', feature_category: :shared
+gem 'loofah', '~> 2.24.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Used to provide license templates
-gem 'licensee', '~> 9.16', feature_category: :shared
+gem 'licensee', '~> 9.16', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Detect and convert string character encoding
-gem 'charlock_holmes', '~> 0.7.9', feature_category: :shared
+gem 'charlock_holmes', '~> 0.7.9', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Detect mime content type from content
-gem 'ruby-magic', '~> 0.6', feature_category: :shared
+gem 'ruby-magic', '~> 0.6', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Faster blank
-gem 'fast_blank', '~> 1.0.1', feature_category: :shared
+gem 'fast_blank', '~> 1.0.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Parse time & duration
-gem 'gitlab-chronic', '~> 0.10.5', feature_category: :shared
-gem 'gitlab_chronic_duration', '~> 0.12', feature_category: :shared
+gem 'gitlab-chronic', '~> 0.10.5', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'gitlab_chronic_duration', '~> 0.12', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-gem 'rack-proxy', '~> 0.7.7', feature_category: :shared
+gem 'rack-proxy', '~> 0.7.7', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-gem 'cssbundling-rails', '1.4.3', feature_category: :shared
-gem 'terser', '1.0.2', feature_category: :shared
+gem 'cssbundling-rails', '1.4.3', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'terser', '1.0.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-gem 'click_house-client', '0.8.2', feature_category: :database
-gem 'addressable', '~> 2.8', feature_category: :shared
-gem 'gon', '~> 6.5.0', feature_category: :shared
-gem 'request_store', '~> 1.7.0', feature_category: :shared
-gem 'base32', '~> 0.3.0', feature_category: :shared
-gem 'gitlab-license', '~> 2.6', feature_category: :shared
+gem 'click_house-client', '0.8.6', feature_category: :database
+gem 'addressable', '~> 2.8', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'gon', '~> 6.5.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'request_store', '~> 1.7.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'base32', '~> 0.3.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'gitlab-license', '~> 2.6', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Protect against bruteforcing
-gem 'rack-attack', '~> 6.8.0', feature_category: :shared
+gem 'rack-attack', '~> 6.8.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Sentry integration
 gem 'sentry-ruby', '~> 5.23.0', feature_category: :observability
@@ -403,12 +396,12 @@ gem 'sentry-sidekiq', '~> 5.23.0', feature_category: :observability
 #
 gem 'pg_query', '~> 6.1.0', feature_category: :database
 
-gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation', feature_category: :shared
-gem 'gitlab-http', path: 'gems/gitlab-http', feature_category: :shared
+gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'gitlab-http', path: 'gems/gitlab-http', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 gem 'premailer-rails', '~> 1.12.0', feature_category: :notifications
-gem 'gitlab-labkit', '~> 0.42.2', feature_category: :shared
-gem 'thrift', '~> 0.22.0', feature_category: :shared
+gem 'gitlab-labkit', '~> 1.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'thrift', '~> 0.22.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # I18n
 gem 'rails-i18n', '~> 7.0', '>= 7.0.9', feature_category: :internationalization
@@ -418,31 +411,31 @@ gem 'gettext', '~> 3.5', '>= 3.5.1',
   group: [:development, :test],
   feature_category: :internationalization
 
-gem 'batch-loader', '~> 2.0.5', feature_category: :shared
+gem 'batch-loader', '~> 2.0.5', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-gem 'tty-prompt', '~> 0.23', require: false, feature_category: :shared
+gem 'tty-prompt', '~> 0.23', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Perf bar
-gem 'peek', '~> 1.1', feature_category: :shared
+gem 'peek', '~> 1.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Snowplow events trackin
 gem 'snowplow-tracker', '~> 0.8.0', feature_category: :product_analytics
 
 # Metrics
-gem 'webrick', '~> 1.9.0', require: false, feature_category: :shared
-gem 'prometheus-client-mmap', '~> 1.2.9', require: 'prometheus/client', feature_category: :shared
+gem 'webrick', '~> 1.9.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'prometheus-client-mmap', '~> 1.2.9', require: 'prometheus/client', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Event-driven reactor for Ruby
 # Required manually in config/initializers/require_async_gem
-gem 'async', '~> 2.32.0', require: false, feature_category: :shared
-gem 'io-event', '~> 1.12', require: false, feature_category: :shared
+gem 'async', '~> 2.32.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'io-event', '~> 1.12', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Security report schemas used to validate CI job artifacts of security jobs
 gem 'gitlab-security_report_schemas', '0.1.3.min15.0.0.max15.2.3', feature_category: :vulnerability_management
 
 # Frontend bundling
-gem 'vite_rails', '~> 3.0.17', feature_category: :shared
-gem 'vite_ruby', '~> 3.9.0', feature_category: :shared
+gem 'vite_rails', '~> 3.0.17', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'vite_ruby', '~> 3.9.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # OpenTelemetry
 group :opentelemetry do
@@ -474,80 +467,77 @@ group :opentelemetry do
   gem 'opentelemetry-instrumentation-sidekiq', feature_category: :observability
 end
 
-gem 'warning', '~> 1.5.0', feature_category: :shared
+gem 'warning', '~> 1.5.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 group :development do
   gem 'lefthook', '~> 1.13.0', require: false, feature_category: :tooling
   gem 'rubocop', feature_category: :tooling, require: false
-  gem 'debug', '~> 1.11.0', feature_category: :shared
+  gem 'debug', '~> 1.11.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-  gem 'solargraph', '~> 0.54.0', require: false, feature_category: :shared
-  gem 'solargraph-rspec', '~> 0.5.1', require: false, feature_category: :shared
+  gem 'solargraph', '~> 0.54.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+  gem 'solargraph-rspec', '~> 0.5.1', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-  gem 'letter_opener_web', '~> 3.0.0', feature_category: :shared
-  gem 'lookbook', '~> 2.3', feature_category: :shared
+  gem 'letter_opener_web', '~> 3.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+  gem 'lookbook', '~> 2.3', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-  # Better errors handler
-  gem 'better_errors', '~> 2.10.1', feature_category: :shared
+  gem 'sprite-factory', '~> 1.7', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-  gem 'sprite-factory', '~> 1.7', feature_category: :shared
+  gem 'listen', '~> 3.7', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-  gem 'listen', '~> 3.7', feature_category: :shared
-
-  gem 'ruby-lsp', "~> 0.26.0", require: false, feature_category: :tooling
+  gem 'ruby-lsp', "~> 0.26.4", require: false, feature_category: :tooling
 
   gem 'ruby-lsp-rails', "~> 0.4.8", feature_category: :tooling
 
-  gem 'ruby-lsp-rspec', "~> 0.1.27", require: false, feature_category: :tooling
+  gem 'ruby-lsp-rspec', "~> 0.1.28", require: false, feature_category: :tooling
 
   gem 'gdk-toogle', '~> 0.9', '>= 0.9.5', require: 'toogle', feature_category: :tooling
 
   # Used by
   # * `lib/tasks/gitlab/security/update_banned_ssh_keys.rake`
   # * `lib/tasks/gitlab/db/migration_squash.rake`
-  gem 'git', '~> 1.8', feature_category: :shared
+  gem 'git', '~> 1.8', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 end
 
 group :development, :test do
-  gem 'deprecation_toolkit', '~> 2.2.3', require: false, feature_category: :shared
-  gem 'bullet', '~> 8.0.0', feature_category: :shared
-  gem 'parser', '= 3.3.10.0', feature_category: :shared
-  gem 'pry-byebug', feature_category: :shared
-  gem 'pry-rails', '~> 0.3.9', feature_category: :shared
-  gem 'pry-shell', '~> 0.6.4', feature_category: :shared
+  gem 'deprecation_toolkit', '~> 2.2.3', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+  gem 'bullet', '~> 8.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+  gem 'parser', '= 3.3.10.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+  gem 'pry-byebug', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+  gem 'pry-rails', '~> 0.3.9', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+  gem 'pry-shell', '~> 0.6.4', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-  gem 'amazing_print', require: false, feature_category: :shared
+  gem 'amazing_print', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
   gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database
-  gem 'rspec-rails', '~> 7.1.0', feature_category: :shared
+  gem 'rspec-rails', '~> 7.1.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
   gem 'factory_bot_rails', '~> 6.5.0', feature_category: :tooling
 
   # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
-  gem 'minitest', '~> 5.11.0', feature_category: :shared
+  gem 'minitest', '~> 5.11.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-  gem 'spring', '~> 4.3.0', feature_category: :shared
-  gem 'spring-commands-rspec', '~> 1.0.4', feature_category: :shared
+  gem 'spring', '~> 4.3.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+  gem 'spring-commands-rspec', '~> 1.0.4', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
   gem 'gitlab-styles', '~> 13.1.0', feature_category: :tooling, require: false
   gem 'haml_lint', '~> 0.58', feature_category: :tooling, require: false
 
   # Benchmarking & profiling
-  gem 'benchmark-ips', '~> 2.14.0', require: false, feature_category: :shared
-  gem 'benchmark-memory', '~> 0.1', require: false, feature_category: :shared
+  gem 'benchmark-ips', '~> 2.14.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+  gem 'benchmark-memory', '~> 0.1', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
   gem 'knapsack', '~> 4.0.0', feature_category: :tooling
   gem 'gitlab-crystalball', '~> 1.1.0', require: false, feature_category: :tooling
   gem 'test_file_finder', '~> 0.3.1', feature_category: :tooling
 
-  gem 'simple_po_parser', '~> 1.1.6', require: false, feature_category: :shared
+  gem 'simple_po_parser', '~> 1.1.6', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-  gem 'png_quantizator', '~> 0.2.1', require: false, feature_category: :shared
+  gem 'png_quantizator', '~> 0.2.1', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-  gem 'parallel', '~> 1.19', require: false, feature_category: :shared
+  gem 'parallel', '~> 1.19', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-  gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup', feature_category: :shared
+  gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-  gem 'pact', '~> 1.64', feature_category: :shared
+  gem 'pact', '~> 1.64', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
   gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling
 
@@ -567,12 +557,12 @@ end
 
 # Gems required in omnibus-gitlab pipeline
 group :development, :test, :omnibus do
-  gem 'license_finder', '~> 7.0', require: false, feature_category: :shared
+  gem 'license_finder', '~> 7.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 end
 
 # Gems required in various pipelines
 group :development, :test, :monorepo do
-  gem 'gitlab-rspec', path: 'gems/gitlab-rspec', feature_category: :shared
+  gem 'gitlab-rspec', path: 'gems/gitlab-rspec', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
   gem 'gitlab-rspec_flaky', path: 'gems/gitlab-rspec_flaky', feature_category: :tooling
 end
 
@@ -587,95 +577,95 @@ group :test do
   gem 'capybara-screenshot', '~> 1.0.26', feature_category: :test_platform
   gem 'selenium-webdriver', '~> 4.21', '>= 4.21.1', feature_category: :test_platform
 
-  gem 'graphlyte', '~> 1.0.0', feature_category: :shared
+  gem 'graphlyte', '~> 1.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
   # Upload CI metrics to a GCP BigQuery instance
   #
   # We only use this gem in CI.
   gem 'google-cloud-bigquery', '~> 1.0', feature_category: :tooling
 
-  gem 'shoulda-matchers', '~> 6.4.0', require: false, feature_category: :shared
-  gem 'email_spec', '~> 2.3.0', feature_category: :shared
-  gem 'webmock', '~> 3.25.0', feature_category: :shared
-  gem 'rails-controller-testing', feature_category: :shared
-  gem 'concurrent-ruby', '~> 1.1', feature_category: :shared
-  gem 'test-prof', '~> 1.4.0', feature_category: :tooling
-  gem 'rspec_junit_formatter', feature_category: :shared
-  gem 'guard-rspec', feature_category: :shared
+  gem 'shoulda-matchers', '~> 6.4.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+  gem 'email_spec', '~> 2.3.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+  gem 'webmock', '~> 3.25.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+  gem 'rails-controller-testing', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+  gem 'concurrent-ruby', '~> 1.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+  gem 'test-prof', '~> 1.5.0', feature_category: :tooling
+  gem 'rspec_junit_formatter', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+  gem 'guard-rspec', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
   gem 'axe-core-rspec', '~> 4.10.0', feature_category: :tooling
-  gem 'state_machines-rspec', '~> 0.6', feature_category: :shared
+  gem 'state_machines-rspec', '~> 0.6', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
   # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
-  gem 'derailed_benchmarks', require: false, feature_category: :shared
+  gem 'derailed_benchmarks', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-  gem 'gitlab_quality-test_tooling', '~> 3.1.0', require: false, feature_category: :tooling
+  gem 'gitlab_quality-test_tooling', '~> 3.3.0', require: false, feature_category: :tooling
 end
 
 gem 'octokit', '~> 9.0', feature_category: :importers
 # Needed by octokit: https://github.com/octokit/octokit.rb/pull/1688
 gem 'faraday-multipart', '~> 1.0', feature_category: :importers
 
-gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :shared
+gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-gem 'email_reply_trimmer', '~> 0.1', feature_category: :shared
-gem 'html2text', feature_category: :shared
+gem 'email_reply_trimmer', '~> 0.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'html2text', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-gem 'stackprof', '~> 0.2.26', require: false, feature_category: :shared
-gem 'rbtrace', '~> 0.4', require: false, feature_category: :shared
-gem 'memory_profiler', '~> 1.0', require: false, feature_category: :shared
+gem 'stackprof', '~> 0.2.26', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'rbtrace', '~> 0.4', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'memory_profiler', '~> 1.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # OAuth
 gem 'oauth2', '~> 2.0', feature_category: :system_access
 
 # Health check
-gem 'health_check', '~> 3.0', feature_category: :shared
+gem 'health_check', '~> 3.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # System information
-gem 'vmstat', '~> 2.3.0', feature_category: :shared
-gem 'sys-filesystem', '~> 1.4.3', feature_category: :shared
+gem 'vmstat', '~> 2.3.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'sys-filesystem', '~> 1.4.3', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # NTP client
-gem 'net-ntp', feature_category: :shared
+gem 'net-ntp', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # SSH keys support
-gem 'ssh_data', '~> 2.0', feature_category: :shared
+gem 'ssh_data', '~> 2.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Spamcheck GRPC protocol definitions
 gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat
 
 # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 18.6.0.pre.rc1', feature_category: :gitaly
+gem 'gitaly', '~> 18.7.0.pre.rc1', feature_category: :gitaly
 
 # KAS GRPC protocol definitions
 gem 'gitlab-kas-grpc', '~> 18.5.0-rc4', feature_category: :deployment_management
 
-gem 'grpc', '~> 1.76.0', feature_category: :shared
+gem 'grpc', '~> 1.76.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared
+gem 'google-protobuf', '>= 3.25', '< 5.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-gem 'toml-rb', '~> 2.2.0', feature_category: :shared
+gem 'toml-rb', '~> 4.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Feature toggles
-gem 'flipper', '~> 0.28.0', feature_category: :shared
-gem 'flipper-active_record', '~> 0.28.0', feature_category: :shared
-gem 'flipper-active_support_cache_store', '~> 0.28.0', feature_category: :shared
-gem 'unleash', '~> 3.2.2', feature_category: :shared
-gem 'gitlab-experiment', '~> 1.0.0', feature_category: :shared
+gem 'flipper', '~> 0.28.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'flipper-active_record', '~> 0.28.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'flipper-active_support_cache_store', '~> 0.28.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'unleash', '~> 3.2.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'gitlab-experiment', '~> 1.2.0', feature_category: :acquisition
 
 # Structured logging
-gem 'lograge', '~> 0.5', feature_category: :shared
+gem 'lograge', '~> 0.5', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 gem 'grape_logging', '~> 1.8', '>= 1.8.4', feature_category: :api
 
 # DNS Lookup
-gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :shared
+gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Countries list
-gem 'countries', '~> 4.0.0', feature_category: :shared
+gem 'countries', '~> 4.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-gem 'retriable', '~> 3.1.2', feature_category: :shared
+gem 'retriable', '~> 3.1.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # LRU cache
-gem 'lru_redux', feature_category: :shared
+gem 'lru_redux', feature_category: :importers
 
 # Locked as long as quoted-printable encoding issues are not resolved
 # Monkey-patched in `config/initializers/mail_encoding_patch.rb`
@@ -684,40 +674,38 @@ gem 'lru_redux', feature_category: :shared
 # `config/initializers/mail_starttls_patch.rb` has also been patched to
 # fix STARTTLS handling until https://github.com/mikel/mail/pull/1536 is
 # released.
-gem 'mail', '= 2.9.0', feature_category: :shared
-gem 'mail-smtp_pool', '~> 0.1.0', path: 'gems/mail-smtp_pool', require: false, feature_category: :shared
+gem 'mail', '= 2.9.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'mail-smtp_pool', '~> 0.1.0', path: 'gems/mail-smtp_pool', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer', feature_category: :shared
+gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # File encryption
-gem 'lockbox', '~> 1.4.0', feature_category: :shared
+gem 'lockbox', '~> 1.4.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Email validation
-gem 'valid_email', '~> 0.1', feature_category: :shared
+gem 'valid_email', '~> 0.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # JSON
-gem 'jsonb_accessor', '~> 1.4', feature_category: :shared
-gem 'json', '~> 2.13.0', feature_category: :shared
-gem 'json_schemer', '~> 2.3.0', feature_category: :shared
-gem 'oj', '~> 3.16.0', '>=3.16.10', feature_category: :shared
-gem 'oj-introspect', '~> 0.8', feature_category: :shared
-gem 'multi_json', '~> 1.17.0', feature_category: :shared
-gem 'yajl-ruby', '~> 1.4.3', require: 'yajl', feature_category: :shared
-
-gem 'webauthn', '~> 3.0', feature_category: :shared
+gem 'jsonb_accessor', '~> 1.4', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'json', '~> 2.13.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'json_schemer', '~> 2.3.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'oj', '~> 3.16.0', '>=3.16.10', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'oj-introspect', '~> 0.8', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'multi_json', '~> 1.17.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'yajl-ruby', '~> 1.4.3', require: 'yajl', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # IPAddress utilities
-gem 'ipaddress', '~> 0.8.3', feature_category: :shared
+gem 'ipaddress', '~> 0.8.3', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-gem 'parslet', '~> 1.8', feature_category: :shared
+gem 'parslet', '~> 1.8', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-gem 'ipynbdiff', path: 'gems/ipynbdiff', require: 'ipynb_diff', feature_category: :shared
+gem 'ipynbdiff', path: 'gems/ipynbdiff', require: 'ipynb_diff', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-gem 'ed25519', '~> 1.4.0', feature_category: :shared
+gem 'ed25519', '~> 1.4.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Error Tracking OpenAPI client
 # See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature
-gem 'error_tracking_open_api', path: 'gems/error_tracking_open_api', feature_category: :shared
+gem 'error_tracking_open_api', path: 'gems/error_tracking_open_api', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Vulnerability advisories
 gem 'cvss-suite', '~> 3.3.0', require: 'cvss_suite', feature_category: :software_composition_analysis
@@ -726,7 +714,7 @@ gem 'cvss-suite', '~> 3.3.0', require: 'cvss_suite', feature_category: :software
 gem 'arr-pm', '~> 0.0.12', feature_category: :package_registry
 
 # Remote Development
-gem 'devfile', '~> 0.4.8', feature_category: :workspaces
+gem 'devfile', '~> 0.5.0', feature_category: :workspaces
 gem 'hashdiff', '~> 1.2.0', feature_category: :workspaces
 
 # Apple plist parsing
@@ -738,27 +726,29 @@ gem 'telesignenterprise', '~> 2.6', feature_category: :insider_threat
 
 # NOTE: In Ruby 3.4 base64 was moved out of the stdlib
 # This gem was added while upgrading `telesignenterprise` to 2.6.0 to ensure compatibility with Ruby 3.4
-gem "base64", "~> 0.2.0", feature_category: :shared
+gem "base64", "~> 0.2.0", feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # BufferedIO patch
-gem 'net-protocol', '~> 0.2.2', feature_category: :shared
-gem "nkf", "~> 0.2.0", feature_category: :shared
+gem 'net-protocol', '~> 0.2.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem "nkf", "~> 0.2.0", feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # This is locked to 0.6.0 because we patch Net::HTTP#connect in
 # gems/gitlab-http/lib/net_http/connect_patch.rb.
 # It can be upgraded but care must be taken to preserve the patch.
-gem 'net-http', '= 0.6.0', feature_category: :shared
-# This is locked to 0.13.0 because the default parser changes from RFC2396 to RFC3986,
-# which can be removed after Rails 7.2 upgrade
-# See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/173142#note_2277952450
-gem 'uri', '= 0.13.3', feature_category: :shared
+gem 'net-http', '= 0.6.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+
+gem 'uri', '~> 1.1.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 gem 'duo_api', '~> 1.3', feature_category: :system_access
 
 gem 'gitlab-sdk', '~> 0.3.0', feature_category: :application_instrumentation
 
-gem 'paper_trail', '~> 16.0', feature_category: :shared
+gem 'paper_trail', '~> 16.0', feature_category: :workspaces
 
 gem "i18n_data", "~> 0.13.1", feature_category: :system_access
 
-gem "gitlab-cloud-connector", "~> 1.35", require: 'gitlab/cloud_connector', feature_category: :plan_provisioning
+gem "gitlab-cloud-connector", "~> 1.40", require: 'gitlab/cloud_connector', feature_category: :plan_provisioning
+
+gem "gvltools", "~> 0.4.0", feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+
+gem 'gitlab_query_language', '~> 0.20.11', feature_category: :integrations
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
index 493894c88546..d369b2afc16c 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
@@ -47,7 +47,7 @@ PATH
       concurrent-ruby (~> 1.1)
       faraday (~> 2)
       google-cloud-storage_transfer (~> 1.2.0)
-      google-protobuf (~> 3.25, >= 3.25.3)
+      google-protobuf (>= 3.25, < 5.0)
       googleauth (~> 1.14)
       grpc (~> 1.75)
       json (~> 2.7)
@@ -101,6 +101,7 @@ PATH
     gitlab-rspec (0.1.0)
       activerecord (>= 6.1, < 8)
       activesupport (>= 6.1, < 8)
+      gitlab_quality-test_tooling (>= 3.1, < 4)
       rspec (~> 3.0)
 
 PATH
@@ -162,7 +163,7 @@ PATH
   remote: vendor/gems/gitlab-topology-service-client
   specs:
     gitlab-topology-service-client (0.1)
-      google-protobuf (~> 3)
+      google-protobuf (>= 3.25, < 5.0)
       grpc
 
 PATH
@@ -201,6 +202,16 @@ PATH
       json (>= 2.5)
       sidekiq (~> 7.0)
 
+PATH
+  remote: vendor/gems/sidekiq
+  specs:
+    sidekiq (7.3.9)
+      base64
+      connection_pool (>= 2.3.0)
+      logger
+      rack (>= 2.2.4)
+      redis-client (>= 0.22.2)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -209,89 +220,83 @@ GEM
       nkf
       rexml
     RedCloth (4.3.4)
-    acme-client (2.0.26)
+    acme-client (2.0.30)
       base64 (~> 0.2)
       faraday (>= 1.0, < 3.0.0)
       faraday-retry (>= 1.0, < 3.0.0)
-    actioncable (7.1.6)
-      actionpack (= 7.1.6)
-      activesupport (= 7.1.6)
+    actioncable (7.2.3)
+      actionpack (= 7.2.3)
+      activesupport (= 7.2.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.6)
-      actionpack (= 7.1.6)
-      activejob (= 7.1.6)
-      activerecord (= 7.1.6)
-      activestorage (= 7.1.6)
-      activesupport (= 7.1.6)
-      mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.1.6)
-      actionpack (= 7.1.6)
-      actionview (= 7.1.6)
-      activejob (= 7.1.6)
-      activesupport (= 7.1.6)
-      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
+    actionmailbox (7.2.3)
+      actionpack (= 7.2.3)
+      activejob (= 7.2.3)
+      activerecord (= 7.2.3)
+      activestorage (= 7.2.3)
+      activesupport (= 7.2.3)
+      mail (>= 2.8.0)
+    actionmailer (7.2.3)
+      actionpack (= 7.2.3)
+      actionview (= 7.2.3)
+      activejob (= 7.2.3)
+      activesupport (= 7.2.3)
+      mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.6)
-      actionview (= 7.1.6)
-      activesupport (= 7.1.6)
+    actionpack (7.2.3)
+      actionview (= 7.2.3)
+      activesupport (= 7.2.3)
       cgi
       nokogiri (>= 1.8.5)
       racc
-      rack (>= 2.2.4)
+      rack (>= 2.2.4, < 3.3)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.6)
-      actionpack (= 7.1.6)
-      activerecord (= 7.1.6)
-      activestorage (= 7.1.6)
-      activesupport (= 7.1.6)
+      useragent (~> 0.16)
+    actiontext (7.2.3)
+      actionpack (= 7.2.3)
+      activerecord (= 7.2.3)
+      activestorage (= 7.2.3)
+      activesupport (= 7.2.3)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.6)
-      activesupport (= 7.1.6)
+    actionview (7.2.3)
+      activesupport (= 7.2.3)
       builder (~> 3.1)
       cgi
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.1.6)
-      activesupport (= 7.1.6)
+    activejob (7.2.3)
+      activesupport (= 7.2.3)
       globalid (>= 0.3.6)
-    activemodel (7.1.6)
-      activesupport (= 7.1.6)
-    activerecord (7.1.6)
-      activemodel (= 7.1.6)
-      activesupport (= 7.1.6)
+    activemodel (7.2.3)
+      activesupport (= 7.2.3)
+    activerecord (7.2.3)
+      activemodel (= 7.2.3)
+      activesupport (= 7.2.3)
       timeout (>= 0.4.0)
-    activestorage (7.1.6)
-      actionpack (= 7.1.6)
-      activejob (= 7.1.6)
-      activerecord (= 7.1.6)
-      activesupport (= 7.1.6)
+    activestorage (7.2.3)
+      actionpack (= 7.2.3)
+      activejob (= 7.2.3)
+      activerecord (= 7.2.3)
+      activesupport (= 7.2.3)
       marcel (~> 1.0)
-    activesupport (7.1.6)
+    activesupport (7.2.3)
       base64
       benchmark (>= 0.3)
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
       logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
       securerandom (>= 0.3)
-      tzinfo (~> 2.0)
+      tzinfo (~> 2.0, >= 2.0.5)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     aes_key_wrap (1.1.0)
@@ -312,7 +317,7 @@ GEM
       jwt (>= 1.4)
       zeitwerk (>= 2.6.7)
     arr-pm (0.0.12)
-    asciidoctor (2.0.23)
+    asciidoctor (2.0.26)
     asciidoctor-include-ext (0.4.0)
       asciidoctor (>= 1.5.6, < 3.0.0)
     asciidoctor-kroki (0.10.0)
@@ -380,10 +385,6 @@ GEM
       memory_profiler (~> 1)
     benchmark-perf (0.6.0)
     benchmark-trend (0.4.0)
-    better_errors (2.10.1)
-      erubi (>= 1.0.0)
-      rack (>= 0.9.0)
-      rouge (>= 1.0.0)
     bigdecimal (3.2.3)
     bindata (2.4.11)
     binding_of_caller (1.0.0)
@@ -434,7 +435,7 @@ GEM
       cork
       nap
       open4 (~> 1.3)
-    click_house-client (0.8.2)
+    click_house-client (0.8.6)
       activerecord (>= 7.0, < 9.0)
       activesupport (>= 7.0, < 9.0)
       addressable (~> 2.8)
@@ -465,6 +466,9 @@ GEM
       safe_yaml (~> 1.0.0)
     crass (1.0.6)
     creole (0.5.0)
+    cronex (0.15.0)
+      tzinfo
+      unicode (>= 0.4.4.5)
     css_parser (1.14.0)
       addressable
     cssbundling-rails (1.4.3)
@@ -497,8 +501,6 @@ GEM
       irb (~> 1.10)
       reline (>= 0.3.8)
     debug_inspector (1.1.0)
-    deckar01-task_list (2.3.4)
-      html-pipeline (~> 2.0)
     declarative (0.0.20)
     declarative_policy (2.0.1)
     deprecation_toolkit (2.2.4)
@@ -523,7 +525,7 @@ GEM
       thor (>= 0.19, < 2)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    devfile (0.4.8)
+    devfile (0.5.0)
     device_detector (1.1.3)
     devise (4.9.4)
       bcrypt (~> 3.0)
@@ -644,7 +646,7 @@ GEM
       prime
       racc
     ffaker (2.25.0)
-    ffi (1.17.2)
+    ffi (1.17.3)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
@@ -670,7 +672,7 @@ GEM
       fog-json
       ipaddress (~> 0.8)
       xml-simple (~> 1.1)
-    fog-aws (3.33.0)
+    fog-aws (3.33.1)
       base64 (>= 0.2, < 0.4)
       fog-core (~> 2.6)
       fog-json (~> 1.1)
@@ -680,7 +682,7 @@ GEM
       excon (~> 1.0)
       formatador (>= 0.2, < 2.0)
       mime-types
-    fog-google (1.25.0)
+    fog-google (1.26.0)
       addressable (>= 2.7.0)
       fog-core (~> 2.5)
       fog-json (~> 1.2)
@@ -707,14 +709,16 @@ GEM
       et-orbi (~> 1, >= 1.2.11)
       raabro (~> 1.4)
     fuzzyurl (0.9.0)
-    gapic-common (0.20.0)
+    gapic-common (1.2.0)
       faraday (>= 1.9, < 3.a)
       faraday-retry (>= 1.0, < 3.a)
-      google-protobuf (~> 3.14)
-      googleapis-common-protos (>= 1.3.12, < 2.a)
-      googleapis-common-protos-types (>= 1.3.1, < 2.a)
-      googleauth (~> 1.0)
-      grpc (~> 1.36)
+      google-cloud-env (~> 2.2)
+      google-logging-utils (~> 0.1)
+      google-protobuf (~> 4.26)
+      googleapis-common-protos (~> 1.6)
+      googleapis-common-protos-types (~> 1.15)
+      googleauth (~> 1.12)
+      grpc (~> 1.66)
     gdk-toogle (0.9.5)
       haml
       rails (>= 7.0.4.2)
@@ -732,15 +736,15 @@ GEM
     git (1.19.1)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    gitaly (18.6.0.pre.rc1)
+    gitaly (18.7.0)
       grpc (~> 1.0)
     gitlab (4.19.0)
       httparty (~> 0.20)
       terminal-table (>= 1.5.1)
     gitlab-chronic (0.10.6)
       numerizer (~> 0.2)
-    gitlab-cloud-connector (1.36.0)
-      activesupport (~> 7.0)
+    gitlab-cloud-connector (1.40.0)
+      activesupport (>= 7.0)
       jwt (~> 2.9)
     gitlab-crystalball (1.1.1)
       git (< 4)
@@ -749,7 +753,7 @@ GEM
       danger (>= 9.3.0)
       danger-gitlab (>= 8.0.0)
       rake (~> 13.0)
-    gitlab-experiment (1.0.0)
+    gitlab-experiment (1.2.0)
       activesupport (>= 3.0)
       request_store (>= 1.0)
     gitlab-fog-azure-rm (2.4.0)
@@ -765,11 +769,11 @@ GEM
       rb_sys (~> 0.9.109)
     gitlab-kas-grpc (18.5.0.pre.rc4)
       grpc (~> 1.0)
-    gitlab-labkit (0.42.2)
+    gitlab-labkit (1.0.1)
       actionpack (>= 5.0.0, < 8.1.0)
       activesupport (>= 5.0.0, < 8.1.0)
-      google-protobuf (~> 3)
-      grpc (>= 1.62)
+      google-protobuf (>= 3.25, < 5.0)
+      grpc (>= 1.75)
       jaeger-client (~> 1.1.0)
       json-schema (~> 5.1)
       opentracing (~> 0.4)
@@ -790,14 +794,14 @@ GEM
       activesupport (>= 5.2.0)
       rake (~> 13.0)
       snowplow-tracker (~> 0.8.0)
-    gitlab-secret_detection (0.38.0)
+    gitlab-secret_detection (0.39.1)
       grpc (>= 1.63.0, < 2)
       grpc_reflection (~> 0.1)
       parallel (~> 1)
       re2 (~> 2.7)
       sentry-ruby (~> 5.22)
       stackprof (~> 0.2.27)
-      toml-rb (~> 2.2)
+      toml-rb (~> 4.1)
     gitlab-security_report_schemas (0.1.3.min15.0.0.max15.2.3)
       activesupport (>= 6, < 8)
       json_schemer (~> 2.3.0)
@@ -818,7 +822,7 @@ GEM
       omniauth (>= 1.3, < 3)
       pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
       rubyntlm (~> 0.5)
-    gitlab_quality-test_tooling (3.1.0)
+    gitlab_quality-test_tooling (3.3.0)
       activesupport (>= 7.0)
       amatch (~> 0.4.1)
       fog-google (~> 1.24, >= 1.24.1)
@@ -831,6 +835,8 @@ GEM
       rspec-parameterized (>= 1.0, < 3.0)
       table_print (= 1.5.7)
       zeitwerk (>= 2, < 3)
+    gitlab_query_language (0.20.11)
+      rb_sys (~> 0.9.91)
     globalid (1.1.0)
       activesupport (>= 5.0)
     gon (6.5.0)
@@ -889,9 +895,9 @@ GEM
       google-cloud-core (~> 1.6)
       googleauth (~> 1.9)
       mini_mime (~> 1.0)
-    google-cloud-common (1.1.0)
-      google-protobuf (~> 3.14)
-      googleapis-common-protos-types (~> 1.2)
+    google-cloud-common (1.9.0)
+      google-protobuf (>= 3.18, < 5.a)
+      googleapis-common-protos-types (~> 1.20)
     google-cloud-compute-v1 (2.6.0)
       gapic-common (>= 0.20.0, < 2.a)
       google-cloud-common (~> 1.0)
@@ -921,11 +927,13 @@ GEM
       gapic-common (>= 0.20.0, < 2.a)
       google-cloud-errors (~> 1.0)
     google-logging-utils (0.1.0)
-    google-protobuf (3.25.8)
-    googleapis-common-protos (1.4.0)
-      google-protobuf (~> 3.14)
-      googleapis-common-protos-types (~> 1.2)
-      grpc (~> 1.27)
+    google-protobuf (4.33.2)
+      bigdecimal
+      rake (>= 13)
+    googleapis-common-protos (1.7.0)
+      google-protobuf (>= 3.18, < 5.a)
+      googleapis-common-protos-types (~> 1.7)
+      grpc (~> 1.41)
     googleapis-common-protos-types (1.20.0)
       google-protobuf (>= 3.18, < 5.a)
     googleauth (1.14.0)
@@ -980,11 +988,12 @@ GEM
     grpc (1.76.0)
       google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
-    grpc-google-iam-v1 (1.5.0)
-      google-protobuf (~> 3.18)
-      googleapis-common-protos (~> 1.4)
+    grpc-google-iam-v1 (1.11.0)
+      google-protobuf (>= 3.18, < 5.a)
+      googleapis-common-protos (~> 1.7.0)
       grpc (~> 1.41)
-    grpc_reflection (0.1.1)
+    grpc_reflection (0.4.0)
+      google-protobuf (>= 4.31.0)
       grpc
     gssapi (1.3.1)
       ffi (>= 1.0.1)
@@ -1002,6 +1011,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
+    gvltools (0.4.0)
     haml (5.2.2)
       temple (>= 0.8.0)
       tilt
@@ -1168,7 +1178,7 @@ GEM
     loofah (2.24.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    lookbook (2.3.4)
+    lookbook (2.3.13)
       activemodel
       css_parser
       htmlbeautifier (~> 1.3)
@@ -1209,7 +1219,7 @@ GEM
       tomlrb
     mixlib-log (3.2.3)
       ffi (>= 1.15.5)
-    mixlib-shellout (3.2.7)
+    mixlib-shellout (3.3.9)
       chef-utils
     mize (0.6.1)
     msgpack (1.5.4)
@@ -1231,7 +1241,9 @@ GEM
     net-imap (0.5.9)
       date
       net-protocol
-    net-ldap (0.17.1)
+    net-ldap (0.20.0)
+      base64
+      ostruct
     net-ntp (2.1.3)
     net-pop (0.1.2)
       net-protocol
@@ -1266,20 +1278,21 @@ GEM
     octokit (9.2.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
-    ohai (18.1.18)
-      chef-config (>= 14.12, < 19)
-      chef-utils (>= 16.0, < 19)
-      ffi (~> 1.9)
+    ohai (19.1.16)
+      base64
+      chef-config (>= 14.12, < 20)
+      chef-utils (>= 16.0, < 20)
+      ffi (>= 1.15.5)
       ffi-yajl (~> 2.2)
       ipaddress
       mixlib-cli (>= 1.7.0)
       mixlib-config (>= 2.0, < 4.0)
       mixlib-log (>= 2.0.1, < 4.0)
-      mixlib-shellout (~> 3.2, >= 3.2.5)
+      mixlib-shellout (~> 3.3.6)
       plist (~> 3.1)
       train-core
       wmi-lite (~> 1.0)
-    oj (3.16.11)
+    oj (3.16.13)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     oj-introspect (0.8.0)
@@ -1537,7 +1550,7 @@ GEM
       date
       stringio
     public_suffix (6.0.1)
-    puma (6.6.1)
+    puma (7.1.0)
       nio4r (~> 2.0)
     pyu-ruby-sasl (0.0.3.3)
     raabro (1.4.0)
@@ -1568,20 +1581,20 @@ GEM
     rackup (1.0.1)
       rack (< 3)
       webrick
-    rails (7.1.6)
-      actioncable (= 7.1.6)
-      actionmailbox (= 7.1.6)
-      actionmailer (= 7.1.6)
-      actionpack (= 7.1.6)
-      actiontext (= 7.1.6)
-      actionview (= 7.1.6)
-      activejob (= 7.1.6)
-      activemodel (= 7.1.6)
-      activerecord (= 7.1.6)
-      activestorage (= 7.1.6)
-      activesupport (= 7.1.6)
+    rails (7.2.3)
+      actioncable (= 7.2.3)
+      actionmailbox (= 7.2.3)
+      actionmailer (= 7.2.3)
+      actionpack (= 7.2.3)
+      actiontext (= 7.2.3)
+      actionview (= 7.2.3)
+      activejob (= 7.2.3)
+      activemodel (= 7.2.3)
+      activerecord (= 7.2.3)
+      activestorage (= 7.2.3)
+      activesupport (= 7.2.3)
       bundler (>= 1.15.0)
-      railties (= 7.1.6)
+      railties (= 7.2.3)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -1596,11 +1609,11 @@ GEM
     rails-i18n (7.0.10)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (7.1.6)
-      actionpack (= 7.1.6)
-      activesupport (= 7.1.6)
+    railties (7.2.3)
+      actionpack (= 7.2.3)
+      activesupport (= 7.2.3)
       cgi
-      irb
+      irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
@@ -1623,7 +1636,7 @@ GEM
     rchardet (1.8.0)
     rdoc (6.13.0)
       psych (>= 4.0.0)
-    re2 (2.20.0)
+    re2 (2.21.0)
       mini_portile2 (~> 2.8.9)
     recaptcha (5.12.3)
       json
@@ -1673,7 +1686,7 @@ GEM
     rexml (3.4.4)
     rinku (2.0.0)
     rotp (6.3.0)
-    rouge (4.6.1)
+    rouge (4.7.0)
     rqrcode (2.2.0)
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
@@ -1754,13 +1767,13 @@ GEM
     rubocop-rspec_rails (2.30.0)
       rubocop (~> 1.61)
       rubocop-rspec (~> 3, >= 3.0.1)
-    ruby-lsp (0.26.1)
+    ruby-lsp (0.26.4)
       language_server-protocol (~> 3.17.0)
       prism (>= 1.2, < 2.0)
       rbs (>= 3, < 5)
     ruby-lsp-rails (0.4.8)
       ruby-lsp (>= 0.26.0, < 0.27.0)
-    ruby-lsp-rspec (0.1.27)
+    ruby-lsp-rspec (0.1.28)
       ruby-lsp (~> 0.26.0)
     ruby-magic (0.6.0)
       mini_portile2 (~> 2.8)
@@ -1814,16 +1827,11 @@ GEM
     shellany (0.0.1)
     shoulda-matchers (6.4.0)
       activesupport (>= 5.2.0)
-    sidekiq (7.3.9)
-      base64
-      connection_pool (>= 2.3.0)
-      logger
-      rack (>= 2.2.4)
-      redis-client (>= 0.22.2)
-    sidekiq-cron (1.12.0)
-      fugit (~> 1.8)
+    sidekiq-cron (2.3.1)
+      cronex (>= 0.13.0)
+      fugit (~> 1.8, >= 1.11.1)
       globalid (>= 1.0.1)
-      sidekiq (>= 6)
+      sidekiq (>= 6.5.0)
     sigdump (0.2.5)
     signet (0.19.0)
       addressable (~> 2.8)
@@ -1889,13 +1897,13 @@ GEM
       base64 (~> 0.1)
     ssrf_filter (1.0.8)
     stackprof (0.2.27)
-    state_machines (0.5.0)
-    state_machines-activemodel (0.8.0)
-      activemodel (>= 5.1)
-      state_machines (>= 0.5.0)
-    state_machines-activerecord (0.8.0)
-      activerecord (>= 5.1)
-      state_machines-activemodel (>= 0.8.0)
+    state_machines (0.100.4)
+    state_machines-activemodel (0.101.0)
+      activemodel (>= 7.2)
+      state_machines (>= 0.100.4)
+    state_machines-activerecord (0.100.0)
+      activerecord (>= 7.2)
+      state_machines-activemodel (>= 0.100.0)
     state_machines-rspec (0.6.0)
       activesupport
       rspec (~> 3.3)
@@ -1929,7 +1937,7 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     terser (1.0.2)
       execjs (>= 0.3.0, < 3)
-    test-prof (1.4.4)
+    test-prof (1.5.0)
     test_file_finder (0.3.1)
       faraday (>= 1.0, < 3.0, != 2.0.0)
     text (1.3.1)
@@ -1941,8 +1949,9 @@ GEM
     timfel-krb5-auth (0.8.3)
     tins (1.31.1)
       sync
-    toml-rb (2.2.0)
+    toml-rb (4.1.0)
       citrus (~> 3.0, > 3.0)
+      racc (~> 1.7)
     tomlrb (1.3.0)
     tpm-key_attestation (0.12.0)
       bindata (~> 2.4)
@@ -1998,6 +2007,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
+    unicode (0.4.4.5)
     unicode-display_width (2.4.2)
     unicode-emoji (4.0.4)
     unicode_utils (1.4.0)
@@ -2007,7 +2017,8 @@ GEM
     unparser (0.6.7)
       diff-lcs (~> 1.3)
       parser (>= 3.2.0)
-    uri (0.13.3)
+    uri (1.1.1)
+    useragent (0.16.11)
     valid_email (0.1.3)
       activemodel
       mail (>= 2.6.1)
@@ -2111,7 +2122,6 @@ DEPENDENCIES
   bcrypt (~> 3.1, >= 3.1.14)
   benchmark-ips (~> 2.14.0)
   benchmark-memory (~> 0.1)
-  better_errors (~> 2.10.1)
   bootsnap (~> 1.18.6)
   browser (~> 5.3.1)
   bullet (~> 8.0.0)
@@ -2121,7 +2131,7 @@ DEPENDENCIES
   carrierwave (~> 1.3)
   charlock_holmes (~> 0.7.9)
   circuitbox (= 2.0.0)
-  click_house-client (= 0.8.2)
+  click_house-client (= 0.8.6)
   commonmarker (~> 0.23.10)
   concurrent-ruby (~> 1.1)
   connection_pool (~> 2.5.3)
@@ -2133,11 +2143,10 @@ DEPENDENCIES
   cvss-suite (~> 3.3.0)
   database_cleaner-active_record (~> 2.2.0)
   debug (~> 1.11.0)
-  deckar01-task_list (= 2.3.4)
   declarative_policy (~> 2.0.1)
   deprecation_toolkit (~> 2.2.3)
   derailed_benchmarks
-  devfile (~> 0.4.8)
+  devfile (~> 0.5.0)
   device_detector
   devise (~> 4.9.3)
   devise-pbkdf2-encryptable (~> 0.0.0)!
@@ -2164,7 +2173,7 @@ DEPENDENCIES
   faraday_middleware-aws-sigv4 (~> 1.0.1)
   fast_blank (~> 1.0.1)
   ffaker (~> 2.24)
-  ffi (~> 1.17.2)
+  ffi (~> 1.17.3)
   flipper (~> 0.28.0)
   flipper-active_record (~> 0.28.0)
   flipper-active_support_cache_store (~> 0.28.0)
@@ -2178,22 +2187,22 @@ DEPENDENCIES
   gettext (~> 3.5, >= 3.5.1)
   gettext_i18n_rails (~> 1.13.0)
   git (~> 1.8)
-  gitaly (~> 18.6.0.pre.rc1)
+  gitaly (~> 18.7.0.pre.rc1)
   gitlab-active-context!
   gitlab-backup-cli!
   gitlab-chronic (~> 0.10.5)
-  gitlab-cloud-connector (~> 1.35)
+  gitlab-cloud-connector (~> 1.40)
   gitlab-crystalball (~> 1.1.0)
   gitlab-dangerfiles (~> 4.10.0)
   gitlab-duo-workflow-service-client (~> 0.6)!
-  gitlab-experiment (~> 1.0.0)
+  gitlab-experiment (~> 1.2.0)
   gitlab-fog-azure-rm (~> 2.4.0)
   gitlab-glfm-markdown (~> 0.0.39)
   gitlab-grape-openapi!
   gitlab-housekeeper!
   gitlab-http!
   gitlab-kas-grpc (~> 18.5.0.pre.rc4)
-  gitlab-labkit (~> 0.42.2)
+  gitlab-labkit (~> 1.0.0)
   gitlab-license (~> 2.6)
   gitlab-mail_room (~> 0.0.24)
   gitlab-markup (~> 2.0.0)
@@ -2211,7 +2220,8 @@ DEPENDENCIES
   gitlab-utils!
   gitlab_chronic_duration (~> 0.12)
   gitlab_omniauth-ldap (~> 2.3.0)
-  gitlab_quality-test_tooling (~> 3.1.0)
+  gitlab_quality-test_tooling (~> 3.3.0)
+  gitlab_query_language (~> 0.20.11)
   gon (~> 6.5.0)
   google-apis-androidpublisher_v3 (~> 0.86.0)
   google-apis-cloudbilling_v1 (~> 0.22.0)
@@ -2228,7 +2238,7 @@ DEPENDENCIES
   google-cloud-bigquery (~> 1.0)
   google-cloud-compute-v1 (~> 2.6.0)
   google-cloud-storage (~> 1.57.0)
-  google-protobuf (~> 3.25, >= 3.25.3)
+  google-protobuf (>= 3.25, < 5.0)
   googleauth (~> 1.14)
   gpgme (~> 2.0.24)
   grape (~> 2.0.0)
@@ -2243,6 +2253,7 @@ DEPENDENCIES
   grpc (~> 1.76.0)
   gssapi (~> 1.3.1)
   guard-rspec
+  gvltools (~> 0.4.0)
   haml_lint (~> 0.58)
   hamlit (~> 3.0.0)
   hashdiff (~> 1.2.0)
@@ -2287,16 +2298,15 @@ DEPENDENCIES
   mini_magick (~> 4.12)
   minitest (~> 5.11.0)
   multi_json (~> 1.17.0)
-  mutex_m (~> 0.3)
   net-http (= 0.6.0)
-  net-ldap (~> 0.17.1)
+  net-ldap (~> 0.20.0)
   net-ntp
   net-protocol (~> 0.2.2)
   nkf (~> 0.2.0)
   nokogiri (~> 1.18)
   oauth2 (~> 2.0)
   octokit (~> 9.0)
-  ohai (~> 18.1)
+  ohai (~> 19.1.16)
   oj (~> 3.16.0, >= 3.16.10)
   oj-introspect (~> 0.8)
   omniauth (~> 2.1.0)
@@ -2356,14 +2366,14 @@ DEPENDENCIES
   pry-byebug
   pry-rails (~> 0.3.9)
   pry-shell (~> 0.6.4)
-  puma (= 6.6.1)
+  puma (~> 7.1)
   rack (~> 2.2.9)
   rack-attack (~> 6.8.0)
   rack-cors (~> 2.0.1)
   rack-oauth2 (~> 2.2.1)
   rack-proxy (~> 0.7.7)
   rack-timeout (~> 0.7.0)
-  rails (~> 7.1.6)
+  rails (~> 7.2.3)
   rails-controller-testing
   rails-i18n (~> 7.0, >= 7.0.9)
   rainbow (~> 3.0)
@@ -2379,7 +2389,7 @@ DEPENDENCIES
   responders (~> 3.0)
   retriable (~> 3.1.2)
   rexml (~> 3.4.0)
-  rouge (~> 4.6.1)
+  rouge (~> 4.7.0)
   rqrcode (~> 2.2)
   rspec-benchmark (~> 0.6.0)
   rspec-parameterized (~> 1.0, >= 1.0.2)
@@ -2388,9 +2398,9 @@ DEPENDENCIES
   rspec_junit_formatter
   rspec_profiling (~> 0.0.9)
   rubocop
-  ruby-lsp (~> 0.26.0)
+  ruby-lsp (~> 0.26.4)
   ruby-lsp-rails (~> 0.4.8)
-  ruby-lsp-rspec (~> 0.1.27)
+  ruby-lsp-rspec (~> 0.1.28)
   ruby-magic (~> 0.6)
   ruby-progressbar (~> 1.10)
   ruby-saml (~> 1.18)
@@ -2405,8 +2415,8 @@ DEPENDENCIES
   sentry-ruby (~> 5.23.0)
   sentry-sidekiq (~> 5.23.0)
   shoulda-matchers (~> 6.4.0)
-  sidekiq (~> 7.3.9)
-  sidekiq-cron (~> 1.12.0)
+  sidekiq!
+  sidekiq-cron (~> 2.3.0)
   sigdump (~> 0.2.4)
   simple_po_parser (~> 1.1.6)
   simplecov (~> 0.22)
@@ -2424,24 +2434,24 @@ DEPENDENCIES
   sprockets-rails (~> 3.5.1)
   ssh_data (~> 2.0)
   stackprof (~> 0.2.26)
-  state_machines-activerecord (~> 0.8.0)
+  state_machines-activerecord (~> 0.100.0)
   state_machines-rspec (~> 0.6)
   sys-filesystem (~> 1.4.3)
   tanuki_emoji (~> 0.13)
   telesignenterprise (~> 2.6)
   terser (= 1.0.2)
-  test-prof (~> 1.4.0)
+  test-prof (~> 1.5.0)
   test_file_finder (~> 0.3.1)
   thrift (~> 0.22.0)
   timfel-krb5-auth (~> 0.8)
-  toml-rb (~> 2.2.0)
+  toml-rb (~> 4.1)
   truncato (~> 0.7.13)
   tty-prompt (~> 0.23)
   typhoeus (~> 1.4.0)
   undercover (~> 0.7.0)
   unicode-emoji (~> 4.0)
   unleash (~> 3.2.2)
-  uri (= 0.13.3)
+  uri (~> 1.1.1)
   valid_email (~> 0.1)
   validates_hostname (~> 1.0.13)
   version_sorter (~> 2.3)
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
index 93a3ab931a76..f7e808cff9c6 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
@@ -9,10 +9,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1g93cpxhk3n0lp42accb7b76km2di300lw9zpsrb2rigvnjmw3h6";
+      sha256 = "05h6ly5jpdpvx18fvz8ryr86z0bxv3xkr9w0wg6l7qgmrdpqk1zx";
       type = "gem";
     };
-    version = "2.0.26";
+    version = "2.0.30";
   };
   actioncable = {
     dependencies = [
@@ -30,10 +30,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1nn30fnsbqhx3yyy6vf7wxcqz3fnv7rkrbi010b5414119gqshmd";
+      sha256 = "1yfl7blz9zlww0al921kmyqsmsx8gdphqjnszp5fgpzi8nr1fpg1";
       type = "gem";
     };
-    version = "7.1.6";
+    version = "7.2.3";
   };
   actionmailbox = {
     dependencies = [
@@ -43,9 +43,6 @@ src: {
       "activestorage"
       "activesupport"
       "mail"
-      "net-imap"
-      "net-pop"
-      "net-smtp"
     ];
     groups = [
       "default"
@@ -55,10 +52,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0cgpq8xn5apfrx89pc3phwcayqvhy10kb0sm8pqsaiy1isnminfy";
+      sha256 = "0pjdrdlv14mzq24qx95hpxhfza0k72qc3qymaa6x1wihqfkz1fqn";
       type = "gem";
     };
-    version = "7.1.6";
+    version = "7.2.3";
   };
   actionmailer = {
     dependencies = [
@@ -67,9 +64,6 @@ src: {
       "activejob"
       "activesupport"
       "mail"
-      "net-imap"
-      "net-pop"
-      "net-smtp"
       "rails-dom-testing"
     ];
     groups = [
@@ -80,10 +74,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0wyj251glxf2n00k6yc29r8dbys9b03mr8x5knd2kgb6xhh68zxh";
+      sha256 = "1f4axhrdhk9z3hjv6xzxqyj7c3y17mn7kz1li1fv5lm6aaw4dmk8";
       type = "gem";
     };
-    version = "7.1.6";
+    version = "7.2.3";
   };
   actionpack = {
     dependencies = [
@@ -97,6 +91,7 @@ src: {
       "rack-test"
       "rails-dom-testing"
       "rails-html-sanitizer"
+      "useragent"
     ];
     groups = [
       "default"
@@ -106,10 +101,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1sq328ark8wa4c8x3y3nsv9qfysjbnn3bv8ily83dz6wdyijv91z";
+      sha256 = "1kq7fbgb5yfsjd1na2ghc7assk18ca24kbvsx90p0xwm8v3f851a";
       type = "gem";
     };
-    version = "7.1.6";
+    version = "7.2.3";
   };
   actiontext = {
     dependencies = [
@@ -128,10 +123,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0rky5702sixkxb04fmpsyycqdv49kpn7nsl68v5whz6n5m15gmkr";
+      sha256 = "0ds0m7qp55qkprhdkzpxrvbfiam95s58xj7555hf5d5pnzpxkzx6";
       type = "gem";
     };
-    version = "7.1.6";
+    version = "7.2.3";
   };
   actionview = {
     dependencies = [
@@ -151,10 +146,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0rpmxm1vvga9jjym371h9q26wi4gdxf80xra5c3awr84z60ps50i";
+      sha256 = "1cpc91crvavdgvc3jqj1nqr9q6s581bm64894pbh8f5l85x7shhz";
       type = "gem";
     };
-    version = "7.1.6";
+    version = "7.2.3";
   };
   activejob = {
     dependencies = [
@@ -169,10 +164,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1fyc5paw29kwc6v5mqvpvd8354y3c4z3l8nrkls0hij93l2wvn8d";
+      sha256 = "1c7zwmhkg9fpkl2isiggs9b2xbf8jf0hhbvmjfgbcrz25m3n8jg4";
       type = "gem";
     };
-    version = "7.1.6";
+    version = "7.2.3";
   };
   activemodel = {
     dependencies = [ "activesupport" ];
@@ -185,10 +180,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "08g7lar9g9bqlvmhyc8bsvp0kzs18hhqiz1zksbbaq5530052bzp";
+      sha256 = "1nrr8w3hxkssgx13bcph8lb876hg57w01fbapy7fj4ijp6p6dbxv";
       type = "gem";
     };
-    version = "7.1.6";
+    version = "7.2.3";
   };
   activerecord = {
     dependencies = [
@@ -205,10 +200,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0yghfgk627mc5gf5p549ilhs2hvjs5ms81dvkrixhzn9gz6ri8hs";
+      sha256 = "1mx087zngip62400z44p969l6fja1fjxliq6kym6npzbii3vgb3g";
       type = "gem";
     };
-    version = "7.1.6";
+    version = "7.2.3";
   };
   activerecord-gitlab = {
     dependencies = [ "activerecord" ];
@@ -236,10 +231,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "167k9fgv7ymvrk737mf5zwfl8za7qhxajgdwkhypifljcn7cn6ig";
+      sha256 = "0bya6k7i8s6538fa4j2c0a0xrf6kggg8mhrwnkkqj356zaxj452c";
       type = "gem";
     };
-    version = "7.1.6";
+    version = "7.2.3";
   };
   activesupport = {
     dependencies = [
@@ -252,7 +247,6 @@ src: {
       "i18n"
       "logger"
       "minitest"
-      "mutex_m"
       "securerandom"
       "tzinfo"
     ];
@@ -265,10 +259,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0z1szpkxgxkq4ckgl4n51y2g3bi9f5a3wri2lci4j71vh45184kz";
+      sha256 = "043vbilaw855c91n5l7g0k0wxj63kngj911685qy74xc1mvwjxan";
       type = "gem";
     };
-    version = "7.1.6";
+    version = "7.2.3";
   };
   addressable = {
     dependencies = [ "public_suffix" ];
@@ -405,10 +399,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1wyxgwmnz9bw377r3lba26b090hbsq9qnbw8575a1prpy83qh82j";
+      sha256 = "1hbin3j8wynl2fpqa3d6vb932pyngyfn8j2q6gbbn1n23z7srqqn";
       type = "gem";
     };
-    version = "2.0.23";
+    version = "2.0.26";
   };
   asciidoctor-include-ext = {
     dependencies = [ "asciidoctor" ];
@@ -820,21 +814,6 @@ src: {
     };
     version = "0.4.0";
   };
-  better_errors = {
-    dependencies = [
-      "erubi"
-      "rack"
-      "rouge"
-    ];
-    groups = [ "development" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0wqazisnn6hn1wsza412xribpw5wzx6b5z5p4mcpfgizr6xg367p";
-      type = "gem";
-    };
-    version = "2.10.1";
-  };
   bigdecimal = {
     groups = [
       "coverage"
@@ -1165,10 +1144,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1k35sm731qmxznzyhjcbqlypf070radmd4ai0i8yn4dzl4bmdqj9";
+      sha256 = "0n598bfralfx7isgf22f6k28zy5ijrywdzgxk4brp30q5ad31rgm";
       type = "gem";
     };
-    version = "0.8.2";
+    version = "0.8.6";
   };
   coderay = {
     groups = [
@@ -1371,6 +1350,20 @@ src: {
     };
     version = "0.5.0";
   };
+  cronex = {
+    dependencies = [
+      "tzinfo"
+      "unicode"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "11i1psgzcqzj4a7p62vy56i5p8s00d29y9rf9wf9blpshph99ir1";
+      type = "gem";
+    };
+    version = "0.15.0";
+  };
   css_parser = {
     dependencies = [ "addressable" ];
     groups = [
@@ -1558,17 +1551,6 @@ src: {
     };
     version = "1.1.0";
   };
-  deckar01-task_list = {
-    dependencies = [ "html-pipeline" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0rqn9jh45gsw045c6fm05875bpj2xbhnff5m5drmk9wy01zdrav6";
-      type = "gem";
-    };
-    version = "2.3.4";
-  };
   declarative = {
     groups = [ "default" ];
     platforms = [ ];
@@ -1651,10 +1633,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1nnd5jbasxvk9wjjy68yymd98ah8wjzkrpskvs74djl8rj8yzj6j";
+      sha256 = "1kycnkmlfzch27kcwr8ch7756rjvv1plvv34idllnsrykvhknzka";
       type = "gem";
     };
-    version = "0.4.8";
+    version = "0.5.0";
   };
   device_detector = {
     groups = [ "default" ];
@@ -2396,15 +2378,16 @@ src: {
       "default"
       "development"
       "kerberos"
+      "monorepo"
       "test"
     ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "19kdyjg3kv7x0ad4xsd4swy5izsbb1vl1rpb6qqcqisr5s23awi9";
+      sha256 = "0k1xaqw2jk13q3ss7cnyvkp8fzp75dk4kazysrxgfd1rpgvkk7qf";
       type = "gem";
     };
-    version = "1.17.2";
+    version = "1.17.3";
   };
   ffi-compiler = {
     dependencies = [
@@ -2544,10 +2527,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "18m71bpib6x9shbjhmzww28pas15abngah7vmrkfigfnw5ccsjyf";
+      sha256 = "19crlx2pnyxa8ncv874gz652hxh6yd9lr1354yznrgkqv5p37ir0";
       type = "gem";
     };
-    version = "3.33.0";
+    version = "3.33.1";
   };
   fog-core = {
     dependencies = [
@@ -2585,15 +2568,17 @@ src: {
     ];
     groups = [
       "default"
+      "development"
+      "monorepo"
       "test"
     ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "13z1ghq9ifd1n2yp1srf7r03hw7y5hl52frarbb8x4zmmfqa7bjq";
+      sha256 = "1bf6sxq6wym9hg4y1ln4bjmgi7fwmaalim70hhdadj4862nxwbr3";
       type = "gem";
     };
-    version = "1.25.0";
+    version = "1.26.0";
   };
   fog-json = {
     dependencies = [
@@ -2688,6 +2673,8 @@ src: {
     dependencies = [
       "faraday"
       "faraday-retry"
+      "google-cloud-env"
+      "google-logging-utils"
       "google-protobuf"
       "googleapis-common-protos"
       "googleapis-common-protos-types"
@@ -2698,10 +2685,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0rlka373b2iva4dz2diz2zx7jyx617hwqvnfx2hs5xs0nh24fc5g";
+      sha256 = "1phdqrnzf849ds03qmsfn4c3wqnfd5rjc17w1vcfxmxyxcgfqxxl";
       type = "gem";
     };
-    version = "0.20.0";
+    version = "1.2.0";
   };
   gdk-toogle = {
     dependencies = [
@@ -2802,10 +2789,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0xn347pk7zkks3zhzi73s2zg8ps5cbc8z6y0k678iafpsbnj0ayc";
+      sha256 = "0kkbkaqjbpriw8380hhcs0fgad14ny1j070g764sqblg0wdhspwi";
       type = "gem";
     };
-    version = "18.6.0.pre.rc1";
+    version = "18.7.0";
   };
   gitlab = {
     dependencies = [
@@ -2899,10 +2886,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0x5qk0llskwk50qirlpmi1z4jfywfm3m1d6j9d0hsncjlphawyyy";
+      sha256 = "0wkffbl793jvkjw3qdfqfb1j4adsvyakdv7sc0g3cdp2q6lrrmah";
       type = "gem";
     };
-    version = "1.36.0";
+    version = "1.40.0";
   };
   gitlab-crystalball = {
     dependencies = [
@@ -2959,10 +2946,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1fgar7p0rpi0ycqdccrzxz8lvxzm78zi95xy642jy09hbpjnzxwz";
+      sha256 = "0rvfwrb4pp1x8drax4riz1ich9h9xbpsxv15y7vi7wapi6zl0pa7";
       type = "gem";
     };
-    version = "1.0.0";
+    version = "1.2.0";
   };
   gitlab-fog-azure-rm = {
     dependencies = [
@@ -3070,10 +3057,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0pa92lw9s9nz4xdv4hlh381niq8kj4lxdpafnkjhimfka8iibb63";
+      sha256 = "1cpc2cq1dwzp19plk9nms2qblk82w2j1xlmz4b38v2csx8lladbg";
       type = "gem";
     };
-    version = "0.42.2";
+    version = "1.0.1";
   };
   gitlab-license = {
     groups = [ "default" ];
@@ -3127,6 +3114,7 @@ src: {
     dependencies = [
       "activerecord"
       "activesupport"
+      "gitlab_quality-test_tooling"
       "rspec"
     ];
     groups = [
@@ -3213,10 +3201,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0v22xi0pvdnpzszlqhlc5xi547amlrs7a9s6qzygc07mnwbvzihj";
+      sha256 = "02h049krvlxg9ya8h1ljrdv0mws843cyv8kxf8g9ww46w7kbaaxb";
       type = "gem";
     };
-    version = "0.38.0";
+    version = "0.39.1";
   };
   gitlab-security_report_schemas = {
     dependencies = [
@@ -3339,14 +3327,29 @@ src: {
       "table_print"
       "zeitwerk"
     ];
-    groups = [ "test" ];
+    groups = [
+      "development"
+      "monorepo"
+      "test"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1x2nxiii42f74mhd8bmmf58nfqyrxxqvkhd6h5hv0vjm9vrb030c";
+      sha256 = "05fmy56vcya6z6kpbw0vpyilc7aw4k2y1slcifb44wdalwkrbf7x";
       type = "gem";
     };
-    version = "3.1.0";
+    version = "3.3.0";
+  };
+  gitlab_query_language = {
+    dependencies = [ "rb_sys" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "06al6my37q7mxjdjvzk4qlyj1lklrwny8zrz6400m5013wrgm00y";
+      type = "gem";
+    };
+    version = "0.20.11";
   };
   globalid = {
     dependencies = [ "activesupport" ];
@@ -3622,10 +3625,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1yxmdxx933q48397jsczsmpshr4b61izv3spnhvzxd24s67v13bk";
+      sha256 = "0b58lwr678swr2cgyahvr7bhjjnv34q5p3ph3mbhady2067894x5";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "1.9.0";
   };
   google-cloud-compute-v1 = {
     dependencies = [
@@ -3756,6 +3759,10 @@ src: {
     version = "0.1.0";
   };
   google-protobuf = {
+    dependencies = [
+      "bigdecimal"
+      "rake"
+    ];
     groups = [
       "default"
       "development"
@@ -3765,10 +3772,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1dsj349xm6jmd94xix8bgdn5m8jqqk9bsivlm9fll8ifa008ab0h";
+      sha256 = "0583agdf2jvnq78scf8008bddrmbybn27ylyydg6bza2qvb510bl";
       type = "gem";
     };
-    version = "3.25.8";
+    version = "4.33.2";
   };
   googleapis-common-protos = {
     dependencies = [
@@ -3780,10 +3787,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "10p3kl9xdxl4xsijkj2l6qn525xchkbfhx3ch603ammibbxq08ys";
+      sha256 = "0hcj5hxihv6jxfzw3bpp3yih2yippg50sknnkaw6n340w6ww115n";
       type = "gem";
     };
-    version = "1.4.0";
+    version = "1.7.0";
   };
   googleapis-common-protos-types = {
     dependencies = [ "google-protobuf" ];
@@ -4013,21 +4020,24 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0kip34n9604j2cc9rkplv5ljq0n8f4aizix4yr8rginsa38md8yf";
+      sha256 = "131n7w17zb5gl6pk8lv7zd95fi507bj327snn4f00giva2lah2lg";
       type = "gem";
     };
-    version = "1.5.0";
+    version = "1.11.0";
   };
   grpc_reflection = {
-    dependencies = [ "grpc" ];
+    dependencies = [
+      "google-protobuf"
+      "grpc"
+    ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0yq9344fbjgkzxb54chwf26sf62iv5zv57js7dihg94lyw9dyixw";
+      sha256 = "1kzhwgj3kqghaicx6x8x29srfdm3n78v7022dabiz0j9y11yglvj";
       type = "gem";
     };
-    version = "0.1.1";
+    version = "0.4.0";
   };
   gssapi = {
     dependencies = [ "ffi" ];
@@ -4091,6 +4101,16 @@ src: {
     };
     version = "4.7.3";
   };
+  gvltools = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0pln2rk28z4yvfpsl56hprhzla77xapppwnlbfc2n6lk8bzjnq6w";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
   haml = {
     dependencies = [
       "temple"
@@ -5032,10 +5052,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "01bni0dlqc9blb1akqsna39l2wb9a9dgv75mqhihrb0lnng4qj0n";
+      sha256 = "08bd7wvwhi1kk687bsa94pslcdbnf8nqmmr2q9bv11vspahh9ymc";
       type = "gem";
     };
-    version = "2.3.4";
+    version = "2.3.13";
   };
   lru_redux = {
     groups = [ "default" ];
@@ -5318,10 +5338,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0zkwg76y96nkh1mv0k92ybq46cr06v1wmic16129ls3yqzwx3xj6";
+      sha256 = "126k9zgxwj726gi0q0ywj4kdzf1gfm8z16i1nn7dw9kmn3imxpqf";
       type = "gem";
     };
-    version = "3.2.7";
+    version = "3.3.9";
   };
   mize = {
     groups = [
@@ -5510,14 +5530,18 @@ src: {
     version = "0.5.9";
   };
   net-ldap = {
+    dependencies = [
+      "base64"
+      "ostruct"
+    ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1ycw0qsw3hap8svakl0i30jkj0ffd4lpyrn17a1j0w8mz5ainmsj";
+      sha256 = "0wjkrvcwnxa6ggq0nfz004f1blm1c67fv7c6614sraak0wshn25j";
       type = "gem";
     };
-    version = "0.17.1";
+    version = "0.20.0";
   };
   net-ntp = {
     groups = [ "default" ];
@@ -5751,6 +5775,7 @@ src: {
   };
   ohai = {
     dependencies = [
+      "base64"
       "chef-config"
       "chef-utils"
       "ffi"
@@ -5768,10 +5793,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1w0zrk1n6n7jl493k4vv5xaiszbmxsmaffy9xvykbfawjjb83vj2";
+      sha256 = "1p8yimcg2wz7sqf8s6slla2izdclris4cgyyhm8j4kvbchcmix5y";
       type = "gem";
     };
-    version = "18.1.18";
+    version = "19.1.16";
   };
   oj = {
     dependencies = [
@@ -5782,10 +5807,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1cajn3ylwhby1x51d9hbchm964qwb5zp63f7sfdm55n85ffn1ara";
+      sha256 = "00q33rm7lpfc319pf6him05ak76gfy7i04iiddrz317q7swbq55i";
       type = "gem";
     };
-    version = "3.16.11";
+    version = "3.16.13";
   };
   oj-introspect = {
     dependencies = [ "oj" ];
@@ -7047,10 +7072,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "07pajhv7pqz82kcjc6017y4d0hwz5kp746cydpx1npd79r56xddr";
+      sha256 = "1pa9zpr51kqnsq549p6apvnr95s9flx6bnwqii24s8jg2b5i0p74";
       type = "gem";
     };
-    version = "6.6.1";
+    version = "7.1.0";
   };
   pyu-ruby-sasl = {
     groups = [ "default" ];
@@ -7252,10 +7277,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0w3librd55ifs5za27afch673zyqycd7kka2fnnxmqqda5g362ls";
+      sha256 = "1zwvc2fa0hm27ygfz1yc2bs52h4wzj1nhpv6cip6g28i2gmi564s";
       type = "gem";
     };
-    version = "7.1.6";
+    version = "7.2.3";
   };
   rails-controller-testing = {
     dependencies = [
@@ -7345,10 +7370,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "076ywx2xs824c8bgy0fgshlfxri6v3sb3x7yy08nv9mc5rzyj41a";
+      sha256 = "08h44mkf91861agp7xw778gqpf5mppydsfgphgkj7wp6pyk11c3f";
       type = "gem";
     };
-    version = "7.1.6";
+    version = "7.2.3";
   };
   rainbow = {
     groups = [
@@ -7492,10 +7517,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1hpkh647ffsqhnj4ps85n2v4d116fg3250m9y7pcnc55lxl6nda5";
+      sha256 = "1q86axcrrl9sh7wgnc70mb8kcyg2qjb67a2wm2qhfh9jqx12k4xg";
       type = "gem";
     };
-    version = "2.20.0";
+    version = "2.21.0";
   };
   recaptcha = {
     dependencies = [ "json" ];
@@ -7804,10 +7829,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1pkp5icgm7s10b2n6b2pzbdsfiv0l5sxqyizx55qdmlpaxnk8xah";
+      sha256 = "0fd77qcz603mli4lyi97cjzkv02hsfk60m495qv5qcn02mkqk9fv";
       type = "gem";
     };
-    version = "4.6.1";
+    version = "4.7.0";
   };
   rqrcode = {
     dependencies = [
@@ -8212,10 +8237,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "050qg73g4qs3xza441nafy7610daa3k4ra0pbi3sdlawy9fwfh6i";
+      sha256 = "1xx96yfi5aqm1d3aps2nl5mls0vnm8xwvw75vy1ik3vc0rm09cqw";
       type = "gem";
     };
-    version = "0.26.1";
+    version = "0.26.4";
   };
   ruby-lsp-rails = {
     dependencies = [ "ruby-lsp" ];
@@ -8234,10 +8259,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "09wqhrrkfhbjy8yxkp1bn9rmrdcjp85j3lisvwp1qp7jz18yk0bm";
+      sha256 = "14gl3g8gg8p8zknd07hkzrrgaqqq184pj7l3nw7dgih8pbzv7cqd";
       type = "gem";
     };
-    version = "0.1.27";
+    version = "0.1.28";
   };
   ruby-magic = {
     dependencies = [ "mini_portile2" ];
@@ -8580,14 +8605,14 @@ src: {
     groups = [ "default" ];
     platforms = [ ];
     source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "19xm4s49hq0kpfbmvhnjskzmfjjxw5d5sm7350mh12gg3lp7220i";
-      type = "gem";
+      path = "${src}/vendor/gems/sidekiq";
+      type = "path";
     };
     version = "7.3.9";
   };
   sidekiq-cron = {
     dependencies = [
+      "cronex"
       "fugit"
       "globalid"
       "sidekiq"
@@ -8596,10 +8621,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0v09lg8kza19jmigqv5hx2ibhm75j6pa639sfy4bv2208l50hqv6";
+      sha256 = "1b2aqj17izziipb6wvsa8jr60ng8w8mal7acfkf316i8faikvawn";
       type = "gem";
     };
-    version = "1.12.0";
+    version = "2.3.1";
   };
   sigdump = {
     groups = [
@@ -8946,14 +8971,17 @@ src: {
     version = "0.2.27";
   };
   state_machines = {
-    groups = [ "default" ];
+    groups = [
+      "default"
+      "test"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "00mi16hg3rhkxz4y58s173cbnjlba41y9bfcim90p4ja6yfj9ri3";
+      sha256 = "0r95flfng5wnb8qhr6mq0rivw40xnlwmz2p1izfnj586pdg5aknx";
       type = "gem";
     };
-    version = "0.5.0";
+    version = "0.100.4";
   };
   state_machines-activemodel = {
     dependencies = [
@@ -8964,10 +8992,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0b4dffzlj38adin6gm0ky72r5c507qdb1jprnm7h9gnlj2qxlcp9";
+      sha256 = "0bgprpi8kcaqd27ymm4b2ixfxswrr54kjqya00d2pgm4bazwd637";
       type = "gem";
     };
-    version = "0.8.0";
+    version = "0.101.0";
   };
   state_machines-activerecord = {
     dependencies = [
@@ -8978,10 +9006,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1dmaf4f4cg3gamzgga3gamp0kv9lvianqzr9103dw0xbp00vfbq7";
+      sha256 = "1ddyhj1y49yfa3czg3847zxhyjn6if4yhfaivs96sb7kyds3y8dj";
       type = "gem";
     };
-    version = "0.8.0";
+    version = "0.100.0";
   };
   state_machines-rspec = {
     dependencies = [
@@ -9207,10 +9235,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1vsk2ca9kfrxhyd2xiiyr28hmxkh9vd8j2vwl5f1yfnkv4z52n8s";
+      sha256 = "1s7asi66mhpraw3p8a5aciwzi2iwwsiwj0a97b7x5z8ncbi7nj6s";
       type = "gem";
     };
-    version = "1.4.4";
+    version = "1.5.0";
   };
   test_file_finder = {
     dependencies = [ "faraday" ];
@@ -9334,15 +9362,18 @@ src: {
     version = "1.31.1";
   };
   toml-rb = {
-    dependencies = [ "citrus" ];
+    dependencies = [
+      "citrus"
+      "racc"
+    ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "19nr4wr5accc6l2y3avn7b02lqmk9035zxq42234k7fcqd5cbqm1";
+      sha256 = "0ijqv5c212n9hcnhk028i2cyyr1jdyjq6jzh3f406iwyak26wi8l";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "4.1.0";
   };
   tomlrb = {
     groups = [ "default" ];
@@ -9638,6 +9669,16 @@ src: {
     };
     version = "0.0.8.2";
   };
+  unicode = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1mx9lwzy021lpcqql5kn4yi20njhf5h7c7wxm2fx51p1r2zr9wj2";
+      type = "gem";
+    };
+    version = "0.4.4.5";
+  };
   unicode-display_width = {
     groups = [
       "danger"
@@ -9720,15 +9761,30 @@ src: {
       "danger"
       "default"
       "development"
+      "monorepo"
       "test"
     ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "19qy5sdl7c7h793r8dy8r06avz7y4srwqvaxlhvj8q3kbg0naigd";
+      sha256 = "1ijpbj7mdrq7rhpq2kb51yykhrs2s54wfs6sm9z3icgz4y6sb7rp";
       type = "gem";
     };
-    version = "0.13.3";
+    version = "1.1.1";
+  };
+  useragent = {
+    groups = [
+      "default"
+      "development"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0i1q2xdjam4d7gwwc35lfnz0wyyzvnca0zslcfxm9fabml9n83kh";
+      type = "gem";
+    };
+    version = "0.16.11";
   };
   valid_email = {
     dependencies = [
diff --git a/pkgs/by-name/gi/gitlab/update.py b/pkgs/by-name/gi/gitlab/update.py
index 7440493f65ab..2c8f64524ff6 100755
--- a/pkgs/by-name/gi/gitlab/update.py
+++ b/pkgs/by-name/gi/gitlab/update.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#! nix-shell -I nixpkgs=../../../.. -i python3 -p bundix bundler nix-update nix python3 python3Packages.requests python3Packages.click python3Packages.click-log python3Packages.packaging prefetch-yarn-deps git go
+#! nix-shell -I nixpkgs=../../../.. -i python3 -p bundix bundler nix-update nix nurl python3 python3Packages.requests python3Packages.click python3Packages.click-log python3Packages.packaging prefetch-yarn-deps git go
 
 import click
 import click_log
@@ -49,28 +49,38 @@ class GitLabRepo:
             reverse=True,
         )
         return versions
+
     def get_git_hash(self, rev: str):
-        return (
+        prefetch_output = (
             subprocess.check_output(
                 [
-                    "nix-prefetch-url",
+                    "nix",
+                    "store",
+                    "prefetch-file",
                     "--unpack",
+                    "--json",
                     f"https://gitlab.com/{self.owner}/{self.repo}/-/archive/{rev}/{self.repo}-{rev}.tar.gz",
                 ]
             )
             .decode("utf-8")
             .strip()
         )
+        return json.loads(prefetch_output)["hash"]
 
     def get_yarn_hash(self, rev: str, yarn_lock_path="yarn.lock"):
         with tempfile.TemporaryDirectory() as tmp_dir:
             with open(tmp_dir + "/yarn.lock", "w") as f:
                 f.write(self.get_file(yarn_lock_path, rev))
-            return (
+            hash = (
                 subprocess.check_output(["prefetch-yarn-deps", tmp_dir + "/yarn.lock"])
                 .decode("utf-8")
                 .strip()
             )
+            return (
+                subprocess.check_output(["nix-hash", "--type", "sha256", "--to-sri", hash])
+                .decode("utf-8")
+                .strip()
+            )
 
     @staticmethod
     def rev2version(tag: str) -> str:
@@ -182,21 +192,6 @@ def update_rubyenv():
         cwd=rubyenv_dir,
     )
 
-    # Un-vendor sidekiq
-    #
-    # The sidekiq dependency was vendored to maintain compatibility with Redis 6.0 (as
-    # stated in this [comment]) but unfortunately, it seems to cause a crash in the
-    # application, as noted in this [upstream issue].
-    #
-    # We can safely swap out the dependency, as our Redis release in nixpkgs is >= 7.0.
-    #
-    # [comment]: https://gitlab.com/gitlab-org/gitlab/-/issues/468435#note_1979750600
-    # [upstream issue]: https://gitlab.com/gitlab-org/gitlab/-/issues/468435
-    subprocess.check_output(
-        ["sed", "-i", "s|gem 'sidekiq', path: 'vendor/gems/sidekiq', require: 'sidekiq'|gem 'sidekiq', '~> 7.3.9'|g", "Gemfile"],
-        cwd=rubyenv_dir,
-    )
-
     # Fetch vendored dependencies temporarily in order to build the gemset.nix
     subprocess.check_output(["mkdir", "-p", "vendor/gems", "gems"], cwd=rubyenv_dir)
     subprocess.check_output(
@@ -254,15 +249,57 @@ def update_gitaly():
     data = _get_data_json()
     gitaly_server_version = data['passthru']['GITALY_SERVER_VERSION']
     repo = GitLabRepo(repo="gitaly")
-    gitaly_dir = pathlib.Path(__file__).parent / 'gitaly'
 
     makefile = repo.get_file("Makefile", f"v{gitaly_server_version}")
     makefile += "\nprint-%:;@echo $($*)\n"
 
-    git_version = subprocess.run(["make", "-f", "-", "print-GIT_VERSION"], check=True, input=makefile, text=True, capture_output=True).stdout.strip()
-
+    git_rev = subprocess.run(["make", "-f", "-", "print-GIT_VERSION"], check=True, input=makefile, text=True, capture_output=True).stdout.strip()
     _call_nix_update("gitaly", gitaly_server_version)
-    _call_nix_update("gitaly.git", git_version)
+
+    # Gitaly Git currently uses just a commit without any tag making nix-update impossible to use.
+    git_repo = GitLabRepo(repo="git")
+    git_version_generator = git_repo.get_file("GIT-VERSION-GEN", git_rev)
+    git_major_minor = None
+    for line in git_version_generator.splitlines():
+        if line.startswith("DEF_VER="):
+           git_major_minor = line.strip("DEF_VER=v").split(".GIT")[0]
+           break
+    if not git_major_minor:
+        raise RuntimeError("Could not find gitaly's git version.")
+
+    git_data_file_path = NIXPKGS_PATH / "pkgs" / "by-name" / "gi" / "gitaly" / "git-data.json"
+
+    git_repo_hash = (
+        subprocess.check_output(
+            [
+                "nurl",
+                "--fetcher",
+                "fetchFromGitLab",
+                "-n",
+                NIXPKGS_PATH,
+                "-H",
+                "-a",
+                "leaveDotGit",
+                "true",
+                "https://gitlab.com/gitlab-org/git",
+                git_rev
+            ]
+        )
+        .decode("utf-8")
+        .strip()
+    )
+    git_data = {
+        # We use the commit hash here as part of the dervations' version because it would be quite hard to find out
+        # the actual commit date, and even than we don't want to have `unstable` as part of the derivation as GitLab
+        # considers this git version stable.
+        "version": f"{git_major_minor}-{git_rev[:8]}",
+        "rev": git_rev,
+        "hash": git_repo_hash
+    }
+    with open(git_data_file_path.as_posix(), "w") as f:
+        json.dump(git_data, f, indent=2)
+        f.write("\n")
+
 
 
 @cli.command("update-gitlab-pages")
diff --git a/pkgs/by-name/gk/gkrellm/package.nix b/pkgs/by-name/gk/gkrellm/package.nix
index 806d99f17a1d..724f5afaf7f9 100644
--- a/pkgs/by-name/gk/gkrellm/package.nix
+++ b/pkgs/by-name/gk/gkrellm/package.nix
@@ -6,7 +6,7 @@
   pkg-config,
   glib,
   gtk2,
-  libX11,
+  libx11,
   libsm,
   libice,
   which,
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     gettext
     glib
     gtk2
-    libX11
+    libx11
     libsm
     libice
   ];
@@ -43,12 +43,12 @@ stdenv.mkDerivation (finalAttrs: {
   hardeningDisable = [ "format" ];
 
   # Makefiles are patched to fix references to `/usr/X11R6' and to add
-  # `-lX11' to make sure libX11's store path is in the RPATH.
+  # `-lX11' to make sure libx11's store path is in the RPATH.
   postPatch = ''
     echo "patching makefiles..."
     for i in Makefile src/Makefile server/Makefile
     do
-      sed -i "$i" -e "s|/usr/X11R6|${libX11.dev}|g ; s|-lICE|-lX11 -lICE|g"
+      sed -i "$i" -e "s|/usr/X11R6|${libx11.dev}|g ; s|-lICE|-lX11 -lICE|g"
     done
   '';
 
diff --git a/pkgs/by-name/gl/gl-gsync-demo/package.nix b/pkgs/by-name/gl/gl-gsync-demo/package.nix
index b8ce7e582627..b1cd39c7faa8 100644
--- a/pkgs/by-name/gl/gl-gsync-demo/package.nix
+++ b/pkgs/by-name/gl/gl-gsync-demo/package.nix
@@ -1,10 +1,10 @@
 {
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
   libglut,
   glew,
-  libXext,
+  libxext,
   linuxPackages,
   lib,
 }:
@@ -25,11 +25,11 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    libX11
+    libx11
     libglut
     glew
     libXNVCtrl
-    libXext
+    libxext
   ];
 
   installPhase = ''
diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix
index ed0cc426b952..17740012dc8a 100644
--- a/pkgs/by-name/gl/glab/package.nix
+++ b/pkgs/by-name/gl/glab/package.nix
@@ -13,13 +13,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "glab";
-  version = "1.81.0";
+  version = "1.82.0";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-L6KFxxg9zW1EZZ0nDd9ft3TsXV4M1P1AhK1/Gg5+4Xk=";
+    hash = "sha256-fn0aBYO60oQp3fAskGRNsMuB3kWuKrZ7h/WSji4LwQs=";
     leaveDotGit = true;
     postFetch = ''
       cd "$out"
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
     '';
   };
 
-  vendorHash = "sha256-Vn3PE28+OlXoB/5UNXIe/BVfhxY1YiOuJEiPSkoyZ30=";
+  vendorHash = "sha256-um/TyXu5O3qF/DludixdZJM3ZQDjchOk3AfopOfF2vA=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/gl/glamoroustoolkit/package.nix b/pkgs/by-name/gl/glamoroustoolkit/package.nix
index 11aec019f8e3..0e3e6ae66d79 100644
--- a/pkgs/by-name/gl/glamoroustoolkit/package.nix
+++ b/pkgs/by-name/gl/glamoroustoolkit/package.nix
@@ -11,12 +11,12 @@
   freetype,
   glib,
   gtk3,
-  libX11,
-  libXcursor,
-  libXext,
-  libXi,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxcursor,
+  libxext,
+  libxi,
+  libxrandr,
+  libxrender,
   libxkbcommon,
   libgit2,
   libglvnd,
@@ -86,12 +86,12 @@ stdenv.mkDerivation (finalAttrs: {
         freetype
         glib
         gtk3
-        libX11
-        libXcursor
-        libXext
-        libXi
-        libXrandr
-        libXrender
+        libx11
+        libxcursor
+        libxext
+        libxi
+        libxrandr
+        libxrender
         libxkbcommon
         libglvnd
         libuuid
diff --git a/pkgs/by-name/gl/glava/package.nix b/pkgs/by-name/gl/glava/package.nix
index ca8691ca493a..3c3e1f120c48 100644
--- a/pkgs/by-name/gl/glava/package.nix
+++ b/pkgs/by-name/gl/glava/package.nix
@@ -4,13 +4,13 @@
   writeScript,
   fetchFromGitHub,
   libGL,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   python3,
-  libXrandr,
-  libXrender,
+  libxrandr,
+  libxrender,
   libpulseaudio,
-  libXcomposite,
+  libxcomposite,
   enableGlfw ? false,
   glfw,
   runtimeShell,
@@ -46,12 +46,12 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
-    libXext
-    libXrandr
-    libXrender
+    libx11
+    libxext
+    libxrandr
+    libxrender
     libpulseaudio
-    libXcomposite
+    libxcomposite
   ]
   ++ optional enableGlfw glfw;
 
diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix
index f2e519bf5364..f1d7fd657272 100644
--- a/pkgs/by-name/gl/glaze/package.nix
+++ b/pkgs/by-name/gl/glaze/package.nix
@@ -9,14 +9,14 @@
   enableInterop ? true,
 }:
 
-stdenv.mkDerivation (final: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "glaze";
   version = "7.0.0";
 
   src = fetchFromGitHub {
     owner = "stephenberry";
     repo = "glaze";
-    tag = "v${final.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-bYXXQmrVnrBTW/r+fgRBPYfKGPtHvEDw0Sk6BYTMm/4=";
   };
 
diff --git a/pkgs/by-name/gl/gle/package.nix b/pkgs/by-name/gl/gle/package.nix
index f769cf015daa..aeef9dcd1248 100644
--- a/pkgs/by-name/gl/gle/package.nix
+++ b/pkgs/by-name/gl/gle/package.nix
@@ -4,11 +4,11 @@
   fetchFromGitHub,
   autoreconfHook,
   libglut,
-  libX11,
-  libXt,
-  libXmu,
-  libXi,
-  libXext,
+  libx11,
+  libxt,
+  libxmu,
+  libxi,
+  libxext,
   libGL,
   libGLU,
 }:
@@ -21,11 +21,11 @@ stdenv.mkDerivation rec {
     libGLU
     libGL
     libglut
-    libX11
-    libXt
-    libXmu
-    libXi
-    libXext
+    libx11
+    libxt
+    libxmu
+    libxi
+    libxext
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gl/glew/package.nix b/pkgs/by-name/gl/glew/package.nix
index 5efd402f1f02..bc9265b05632 100644
--- a/pkgs/by-name/gl/glew/package.nix
+++ b/pkgs/by-name/gl/glew/package.nix
@@ -5,9 +5,9 @@
   fetchpatch,
   cmake,
   libGLU,
-  libXmu,
-  libXi,
-  libXext,
+  libxmu,
+  libxi,
+  libxext,
   enableEGL ? (!stdenv.hostPlatform.isDarwin),
   testers,
   mesa,
@@ -51,9 +51,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
   buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    libXmu
-    libXi
-    libXext
+    libxmu
+    libxi
+    libxext
   ];
   propagatedBuildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGLU ]; # GL/glew.h includes GL/glu.h
 
diff --git a/pkgs/by-name/gl/glew_1_10/package.nix b/pkgs/by-name/gl/glew_1_10/package.nix
index 9a9489e1065c..5160b95ef95d 100644
--- a/pkgs/by-name/gl/glew_1_10/package.nix
+++ b/pkgs/by-name/gl/glew_1_10/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchurl,
   libGLU,
-  libXmu,
-  libXi,
-  libXext,
+  libxmu,
+  libxi,
+  libxext,
   testers,
   mesa,
 }:
@@ -20,9 +20,9 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    libXmu
-    libXi
-    libXext
+    libxmu
+    libxi
+    libxext
   ];
   propagatedBuildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGLU ]; # GL/glew.h includes GL/glu.h
 
diff --git a/pkgs/by-name/gl/glfw2/package.nix b/pkgs/by-name/gl/glfw2/package.nix
index ab12c967942f..fb59752adba1 100644
--- a/pkgs/by-name/gl/glfw2/package.nix
+++ b/pkgs/by-name/gl/glfw2/package.nix
@@ -4,8 +4,8 @@
   fetchurl,
   libGLU,
   libGL,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -20,8 +20,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libGLU
     libGL
-    libX11
-    libXext
+    libx11
+    libxext
   ];
 
   buildPhase = ''
diff --git a/pkgs/by-name/gl/glfw3/package.nix b/pkgs/by-name/gl/glfw3/package.nix
index 66598b737222..19893ccf8590 100644
--- a/pkgs/by-name/gl/glfw3/package.nix
+++ b/pkgs/by-name/gl/glfw3/package.nix
@@ -6,13 +6,13 @@
   pkg-config,
   libGL,
   vulkan-loader,
-  libXrandr,
-  libXinerama,
-  libXcursor,
-  libX11,
-  libXi,
-  libXext,
-  libXxf86vm,
+  libxrandr,
+  libxinerama,
+  libxcursor,
+  libx11,
+  libxi,
+  libxext,
+  libxxf86vm,
   fixDarwinDylibNames,
   wayland,
   wayland-scanner,
@@ -60,13 +60,13 @@ stdenv.mkDerivation {
     wayland
     wayland-protocols
     libxkbcommon
-    libX11
-    libXrandr
-    libXinerama
-    libXcursor
-    libXi
-    libXext
-    libXxf86vm
+    libx11
+    libxrandr
+    libxinerama
+    libxcursor
+    libxi
+    libxext
+    libxxf86vm
   ];
 
   postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
diff --git a/pkgs/by-name/gl/glmark2/package.nix b/pkgs/by-name/gl/glmark2/package.nix
index 004b11f3ee32..84176ed6cc96 100644
--- a/pkgs/by-name/gl/glmark2/package.nix
+++ b/pkgs/by-name/gl/glmark2/package.nix
@@ -9,7 +9,7 @@
   wayland-scanner,
   libjpeg,
   libpng,
-  libX11,
+  libx11,
   libGL,
   libdrm,
   udev,
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libjpeg
     libpng
-    libX11
+    libx11
     libdrm
     udev
     wayland
diff --git a/pkgs/by-name/gl/glpaper/package.nix b/pkgs/by-name/gl/glpaper/package.nix
index ae19243afdb8..d5e986399fcb 100644
--- a/pkgs/by-name/gl/glpaper/package.nix
+++ b/pkgs/by-name/gl/glpaper/package.nix
@@ -6,7 +6,7 @@
   ninja,
   pkg-config,
   wayland,
-  libX11,
+  libx11,
   libGL,
 }:
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
   ];
   buildInputs = [
     wayland
-    libX11 # required by libglvnd
+    libx11 # required by libglvnd
     libGL
   ];
 
diff --git a/pkgs/by-name/gl/glslviewer/package.nix b/pkgs/by-name/gl/glslviewer/package.nix
index 8f323914fee7..1ee1a89b8b1e 100644
--- a/pkgs/by-name/gl/glslviewer/package.nix
+++ b/pkgs/by-name/gl/glslviewer/package.nix
@@ -5,12 +5,12 @@
   lib,
   fetchFromGitHub,
   pkg-config,
-  libX11,
-  libXrandr,
-  libXinerama,
-  libXcursor,
-  libXi,
-  libXext,
+  libx11,
+  libxrandr,
+  libxinerama,
+  libxcursor,
+  libxi,
+  libxext,
   libGLU,
   ffmpeg_7,
   ncurses,
@@ -32,12 +32,12 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
   buildInputs = [
-    libX11
-    libXrandr
-    libXinerama
-    libXcursor
-    libXi
-    libXext
+    libx11
+    libxrandr
+    libxinerama
+    libxcursor
+    libxi
+    libxext
     libGLU
     ncurses
     ffmpeg_7
diff --git a/pkgs/by-name/gl/glui/package.nix b/pkgs/by-name/gl/glui/package.nix
index e45437749789..d3569d97177d 100644
--- a/pkgs/by-name/gl/glui/package.nix
+++ b/pkgs/by-name/gl/glui/package.nix
@@ -5,10 +5,10 @@
   libglut,
   libGL,
   libGLU,
-  libX11,
-  libXext,
-  libXi,
-  libXmu,
+  libx11,
+  libxext,
+  libxi,
+  libxmu,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -26,10 +26,10 @@ stdenv.mkDerivation (finalAttrs: {
     libglut
     libGLU
     libGL
-    libXmu
-    libXext
-    libX11
-    libXi
+    libxmu
+    libxext
+    libx11
+    libxi
   ];
 
   installPhase = ''
diff --git a/pkgs/by-name/gm/gmic/package.nix b/pkgs/by-name/gm/gmic/package.nix
index 05e039b4cd15..02d74a40179b 100644
--- a/pkgs/by-name/gm/gmic/package.nix
+++ b/pkgs/by-name/gm/gmic/package.nix
@@ -15,8 +15,8 @@
   gnused,
   graphicsmagick,
   jq,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   libjpeg,
   libpng,
   libtiff,
@@ -67,8 +67,8 @@ stdenv.mkDerivation (finalAttrs: {
     cimg
     fftw
     graphicsmagick
-    libX11
-    libXext
+    libx11
+    libxext
     libjpeg
     libpng
     libtiff
diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix
index 3ffad3a901a7..4c1debd66865 100644
--- a/pkgs/by-name/gn/gnome-shell/package.nix
+++ b/pkgs/by-name/gn/gnome-shell/package.nix
@@ -61,8 +61,8 @@
   lcms2,
   libgbm,
   libGL,
-  libXi,
-  libX11,
+  libxi,
+  libx11,
   libxkbcommon,
   libsoup_3,
   libxml2,
@@ -168,8 +168,8 @@ stdenv.mkDerivation (finalAttrs: {
     lcms2 # required by mutter-clutter
     libgbm
     libGL # for egl, required by mutter-clutter
-    libXi # required by libmutter
-    libX11
+    libxi # required by libmutter
+    libx11
     libxkbcommon
     libsoup_3
     libxml2
diff --git a/pkgs/by-name/gn/gnustep-back/package.nix b/pkgs/by-name/gn/gnustep-back/package.nix
index 3db12b924fda..0682ff350431 100644
--- a/pkgs/by-name/gn/gnustep-back/package.nix
+++ b/pkgs/by-name/gn/gnustep-back/package.nix
@@ -6,8 +6,8 @@
   fontconfig,
   freetype,
   gnustep-gui,
-  libXft,
-  libXmu,
+  libxft,
+  libxmu,
   pkg-config,
   wrapGNUstepAppsHook,
 }:
@@ -30,8 +30,8 @@ clangStdenv.mkDerivation (finalAttrs: {
     cairo
     fontconfig
     freetype
-    libXft
-    libXmu
+    libxft
+    libxmu
   ];
 
   propagatedBuildInputs = [ gnustep-gui ];
diff --git a/pkgs/by-name/gn/gnutls/package.nix b/pkgs/by-name/gn/gnutls/package.nix
index 98f58a62e3f1..cb61a8d837b0 100644
--- a/pkgs/by-name/gn/gnutls/package.nix
+++ b/pkgs/by-name/gn/gnutls/package.nix
@@ -243,5 +243,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.lgpl21Plus;
     maintainers = with lib.maintainers; [ vcunat ];
     platforms = lib.platforms.all;
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "gnu" version;
   };
 }
diff --git a/pkgs/by-name/go/go-ios/package.nix b/pkgs/by-name/go/go-ios/package.nix
index 859bf07534fd..cdc4390e4071 100644
--- a/pkgs/by-name/go/go-ios/package.nix
+++ b/pkgs/by-name/go/go-ios/package.nix
@@ -12,13 +12,13 @@
 
 buildGoModule rec {
   pname = "go-ios";
-  version = "1.0.193";
+  version = "1.0.202";
 
   src = fetchFromGitHub {
     owner = "danielpaulus";
     repo = "go-ios";
     rev = "v${version}";
-    sha256 = "sha256-l5ob2wnUOHgR8awPkCBKPCFBEQhrDflN+scUXm7290o=";
+    sha256 = "sha256-GC0wNOnfT9eCDKvqVKbmuMOumRb4BN1uHAOoEOLwNYc=";
   };
 
   proxyVendor = true;
diff --git a/pkgs/by-name/go/golly/package.nix b/pkgs/by-name/go/golly/package.nix
index 4372f564c8c2..e6b1c27668c1 100644
--- a/pkgs/by-name/go/golly/package.nix
+++ b/pkgs/by-name/go/golly/package.nix
@@ -8,7 +8,7 @@
   zlib,
   libGLU,
   libGL,
-  libX11,
+  libx11,
   SDL2,
 }:
 stdenv.mkDerivation (finalAttrs: {
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
     libGLU
     libGL
-    libX11
+    libx11
     SDL2
   ];
 
diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index 6e36774da1b8..9ec67da5b56d 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -25,20 +25,20 @@
   libdrm,
   libglvnd,
   libkrb5,
-  libX11,
+  libx11,
   libxcb,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
   libxkbcommon,
-  libXrandr,
-  libXrender,
-  libXScrnSaver,
+  libxrandr,
+  libxrender,
+  libxscrnsaver,
   libxshmfence,
-  libXtst,
+  libxtst,
   libgbm,
   nspr,
   nss,
@@ -135,20 +135,20 @@ let
     libglvnd
     libkrb5
     libpng
-    libX11
+    libx11
     libxcb
-    libXcomposite
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
+    libxcomposite
+    libxcursor
+    libxdamage
+    libxext
+    libxfixes
+    libxi
     libxkbcommon
-    libXrandr
-    libXrender
-    libXScrnSaver
+    libxrandr
+    libxrender
+    libxscrnsaver
     libxshmfence
-    libXtst
+    libxtst
     libgbm
     nspr
     nss
diff --git a/pkgs/by-name/go/gopher64/package.nix b/pkgs/by-name/go/gopher64/package.nix
index ae604f8b3169..77353e284318 100644
--- a/pkgs/by-name/go/gopher64/package.nix
+++ b/pkgs/by-name/go/gopher64/package.nix
@@ -7,10 +7,10 @@
 
   bzip2,
   libGL,
-  libX11,
-  libXcursor,
+  libx11,
+  libxcursor,
   libxkbcommon,
-  libXi,
+  libxi,
   moltenvk,
   sdl3,
   wayland,
@@ -77,9 +77,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     libxkbcommon
 
     # for X11
-    libX11
-    libXcursor
-    libXi
+    libx11
+    libxcursor
+    libxi
 
     # for wayland
     wayland
diff --git a/pkgs/by-name/go/gorilla-bin/package.nix b/pkgs/by-name/go/gorilla-bin/package.nix
index fb7a79e47675..366fe54ae811 100644
--- a/pkgs/by-name/go/gorilla-bin/package.nix
+++ b/pkgs/by-name/go/gorilla-bin/package.nix
@@ -4,13 +4,13 @@
   patchelf,
   lib,
   stdenv,
-  libXft,
-  libX11,
+  libxft,
+  libx11,
   freetype,
   fontconfig,
-  libXrender,
-  libXScrnSaver,
-  libXext,
+  libxrender,
+  libxscrnsaver,
+  libxext,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -37,13 +37,13 @@ stdenv.mkDerivation (finalAttrs: {
     let
       interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")";
       libPath = lib.makeLibraryPath [
-        libXft
-        libX11
+        libxft
+        libx11
         freetype
         fontconfig
-        libXrender
-        libXScrnSaver
-        libXext
+        libxrender
+        libxscrnsaver
+        libxext
       ];
     in
     ''
diff --git a/pkgs/by-name/go/gossip/package.nix b/pkgs/by-name/go/gossip/package.nix
index 6665a892c2d1..e6fca7f05e49 100644
--- a/pkgs/by-name/go/gossip/package.nix
+++ b/pkgs/by-name/go/gossip/package.nix
@@ -17,11 +17,11 @@
   wayland,
   wayland-scanner,
   nix-update-script,
-  libX11,
+  libx11,
   libxcb,
-  libXcursor,
-  libXi,
-  libXrandr,
+  libxcursor,
+  libxi,
+  libxrandr,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -67,11 +67,11 @@ rustPlatform.buildRustPackage rec {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     wayland
-    libX11
+    libx11
     libxcb
-    libXcursor
-    libXi
-    libXrandr
+    libxcursor
+    libxi
+    libxrandr
   ];
 
   # Tests rely on local files, so disable them. (I'm too lazy to patch it.)
diff --git a/pkgs/by-name/go/gotraceui/package.nix b/pkgs/by-name/go/gotraceui/package.nix
index 8f12dbd7d1b0..10571d3ea43f 100644
--- a/pkgs/by-name/go/gotraceui/package.nix
+++ b/pkgs/by-name/go/gotraceui/package.nix
@@ -4,10 +4,10 @@
   pkg-config,
   buildGoModule,
   libGL,
-  libX11,
+  libx11,
   libxcb,
-  libXcursor,
-  libXfixes,
+  libxcursor,
+  libxfixes,
   libxkbcommon,
   vulkan-headers,
   wayland,
@@ -42,10 +42,10 @@ buildGoModule rec {
     vulkan-headers
     libxkbcommon
     wayland
-    libX11
+    libx11
     libxcb
-    libXcursor
-    libXfixes
+    libxcursor
+    libxfixes
     libGL
   ];
 
diff --git a/pkgs/by-name/go/gource/package.nix b/pkgs/by-name/go/gource/package.nix
index 1e607fa64232..dbd58d2911c3 100644
--- a/pkgs/by-name/go/gource/package.nix
+++ b/pkgs/by-name/go/gource/package.nix
@@ -13,7 +13,7 @@
   glew,
   libGLU,
   libGL,
-  libX11,
+  libx11,
   boost,
   glm,
   tinyxml,
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     SDL2_image
     libGLU
     libGL
-    libX11
+    libx11
     boost
     glm
     freetype
diff --git a/pkgs/by-name/gp/gpsd/package.nix b/pkgs/by-name/gp/gpsd/package.nix
index 66df5e3c6b95..7de5ff821643 100644
--- a/pkgs/by-name/gp/gpsd/package.nix
+++ b/pkgs/by-name/gp/gpsd/package.nix
@@ -18,11 +18,11 @@
   # optional deps for GUI packages
   guiSupport ? true,
   dbus-glib,
-  libX11,
-  libXt,
-  libXpm,
-  libXaw,
-  libXext,
+  libx11,
+  libxt,
+  libxpm,
+  libxaw,
+  libxext,
   gobject-introspection,
   pango,
   gdk-pixbuf,
@@ -66,11 +66,11 @@ stdenv.mkDerivation (finalAttrs: {
     atk
     dbus-glib
     gdk-pixbuf
-    libX11
-    libXaw
-    libXext
-    libXpm
-    libXt
+    libx11
+    libxaw
+    libxext
+    libxpm
+    libxt
     pango
   ];
 
diff --git a/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix b/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
index b8ef955e7427..2b43dcf66328 100644
--- a/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
+++ b/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
@@ -14,8 +14,8 @@
   libdrm,
   gpu-screen-recorder,
   libglvnd,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
   wayland,
   wrapGAppsHook3,
   wrapperDir ? "/run/wrappers/bin",
@@ -46,8 +46,8 @@ stdenv.mkDerivation rec {
     libayatana-appindicator
     libpulseaudio
     libdrm
-    libX11
-    libXrandr
+    libx11
+    libxrandr
     wayland
   ];
 
diff --git a/pkgs/by-name/gp/gpu-screen-recorder/package.nix b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
index 4d294f23e875..efc7ff91bd6d 100644
--- a/pkgs/by-name/gp/gpu-screen-recorder/package.nix
+++ b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
@@ -7,7 +7,7 @@
   ninja,
   addDriverRunpath,
   pkg-config,
-  libXcomposite,
+  libxcomposite,
   libpulseaudio,
   dbus,
   ffmpeg,
@@ -18,10 +18,10 @@
   libdrm,
   libva,
   libglvnd,
-  libXdamage,
-  libXi,
-  libXrandr,
-  libXfixes,
+  libxdamage,
+  libxi,
+  libxrandr,
+  libxfixes,
   wrapperDir ? "/run/wrappers/bin",
   gitUpdater,
 }:
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libXcomposite
+    libxcomposite
     libpulseaudio
     dbus
     ffmpeg
@@ -54,10 +54,10 @@ stdenv.mkDerivation rec {
     vulkan-headers
     libdrm
     libva
-    libXdamage
-    libXi
-    libXrandr
-    libXfixes
+    libxdamage
+    libxi
+    libxrandr
+    libxfixes
   ];
 
   mesonFlags = [
diff --git a/pkgs/by-name/gp/gpustat/package.nix b/pkgs/by-name/gp/gpustat/package.nix
index 75d1c5edd71f..1993c888667b 100644
--- a/pkgs/by-name/gp/gpustat/package.nix
+++ b/pkgs/by-name/gp/gpustat/package.nix
@@ -5,10 +5,10 @@
   pkg-config,
   fontconfig,
   libGL,
-  libX11,
-  libXcursor,
-  libXi,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxi,
+  libxrandr,
   cmake,
   libxkbcommon,
   wayland,
@@ -37,10 +37,10 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [
     fontconfig
     libGL
-    libX11
-    libXcursor
-    libXi
-    libXrandr
+    libx11
+    libxcursor
+    libxi
+    libxrandr
     libxkbcommon
     wayland
   ];
diff --git a/pkgs/by-name/gr/graphicsmagick/package.nix b/pkgs/by-name/gr/graphicsmagick/package.nix
index 10cfc0cba3d5..adbcdf648be2 100644
--- a/pkgs/by-name/gr/graphicsmagick/package.nix
+++ b/pkgs/by-name/gr/graphicsmagick/package.nix
@@ -8,7 +8,7 @@
   freetype,
   ghostscript,
   graphviz,
-  libX11,
+  libx11,
   libjpeg,
   libpng,
   libtiff,
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
     ghostscript
     graphviz
-    libX11
+    libx11
     libjpeg
     libpng
     libtiff
diff --git a/pkgs/by-name/gr/groff/package.nix b/pkgs/by-name/gr/groff/package.nix
index d9928a2354aa..5cffbb9c666b 100644
--- a/pkgs/by-name/gr/groff/package.nix
+++ b/pkgs/by-name/gr/groff/package.nix
@@ -6,10 +6,10 @@
   enableGhostscript ? false,
   ghostscript,
   gawk,
-  libX11,
-  libXaw,
-  libXt,
-  libXmu, # for postscript and html output
+  libx11,
+  libxaw,
+  libxt,
+  libxmu, # for postscript and html output
   enableHtml ? false,
   psutils,
   netpbm, # for html output
@@ -87,10 +87,10 @@ stdenv.mkDerivation rec {
   ++ lib.optionals enableGhostscript [
     ghostscript
     gawk
-    libX11
-    libXaw
-    libXt
-    libXmu
+    libx11
+    libxaw
+    libxt
+    libxmu
   ]
   ++ lib.optionals enableHtml [
     psutils
diff --git a/pkgs/by-name/gt/gthumb/package.nix b/pkgs/by-name/gt/gthumb/package.nix
index 32235dd82c6a..f1b48466b7a8 100644
--- a/pkgs/by-name/gt/gthumb/package.nix
+++ b/pkgs/by-name/gt/gthumb/package.nix
@@ -18,7 +18,7 @@
   libjxl,
   librsvg,
   libwebp,
-  libX11,
+  libx11,
   lcms2,
   bison,
   brasero,
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
     librsvg
     libtiff
     libwebp
-    libX11
+    libx11
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/gt/gtk2/package.nix b/pkgs/by-name/gt/gtk2/package.nix
index c8c62632c9ef..18db8a17783d 100644
--- a/pkgs/by-name/gt/gtk2/package.nix
+++ b/pkgs/by-name/gt/gtk2/package.nix
@@ -12,13 +12,13 @@
   gettext,
   glib,
   gobject-introspection,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxrender,
   pango,
   perl,
   pkg-config,
@@ -89,16 +89,16 @@ stdenv.mkDerivation (finalAttrs: {
     pango
   ]
   ++ lib.optionals (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin) [
-    libXcomposite
-    libXcursor
-    libXi
-    libXrandr
-    libXrender
+    libxcomposite
+    libxcursor
+    libxi
+    libxrandr
+    libxrender
   ]
-  ++ lib.optional xineramaSupport libXinerama
+  ++ lib.optional xineramaSupport libxinerama
   ++ lib.optional cupsSupport cups
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    libXdamage
+    libxdamage
   ];
 
   preConfigure = lib.optionalString (
diff --git a/pkgs/by-name/gu/guile-colorized/package.nix b/pkgs/by-name/gu/guile-colorized/package.nix
new file mode 100644
index 000000000000..90a24df13f24
--- /dev/null
+++ b/pkgs/by-name/gu/guile-colorized/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  fetchgit,
+  stdenv,
+  guile,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "guile-colorized";
+  version = "0-unstable-2019-12-05";
+
+  src = fetchgit {
+    url = "https://gitlab.com/NalaGinrut/guile-colorized";
+    rev = "1625a79f0e31849ebd537e2a58793fb45678c58f";
+    hash = "sha256-MxRFt3dPOBA/u2RbdnwWCfS6qjnVYtiuV7K+B6SFp4w=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ guile ];
+  buildInputs = [ guile ];
+
+  preConfigure = ''
+    export GUILE_AUTO_COMPILE=0
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    site_dir="$out/share/guile/3.0"
+    lib_dir="$out/lib/guile/3.0/site-ccache"
+
+    export GUILE_LOAD_PATH=.:$site_dir:...:$GUILE_LOAD_PATH
+    export GUILE_LOAD_COMPILED_PATH=.:$lib_dir:...:$GUILE_LOAD_COMPILE
+
+    mkdir -p $site_dir/ice-9
+    cp $src/ice-9/colorized.scm $site_dir/ice-9
+    guild compile $site_dir/ice-9/colorized.scm -o $lib_dir/ice-9/colorized.go
+
+    runHook postBuild
+  '';
+
+  dontInstall = true;
+
+  meta = {
+    description = "Colorized REPL for GNU Guile";
+    homepage = "https://gitlab.com/NalaGinrut/guile-colorized/";
+    license = lib.licenses.gpl3Plus;
+    platforms = guile.meta.platforms;
+    maintainers = with lib.maintainers; [ nemin ];
+  };
+})
diff --git a/pkgs/by-name/gu/gummy/package.nix b/pkgs/by-name/gu/gummy/package.nix
index ca89df1aa601..9bd5b6abb824 100644
--- a/pkgs/by-name/gu/gummy/package.nix
+++ b/pkgs/by-name/gu/gummy/package.nix
@@ -4,8 +4,8 @@
   fetchFromCodeberg,
   testers,
   cmake,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   sdbus-cpp,
   udev,
   libxcb-image,
@@ -39,8 +39,8 @@ stdenv.mkDerivation (finalAttrs: {
     cli11
     ddcutil
     fmt
-    libX11
-    libXext
+    libx11
+    libxext
     nlohmann_json
     sdbus-cpp
     spdlog
diff --git a/pkgs/by-name/gv/gv/package.nix b/pkgs/by-name/gv/gv/package.nix
index 5efb38dbda01..ba93f4ac7d45 100644
--- a/pkgs/by-name/gv/gv/package.nix
+++ b/pkgs/by-name/gv/gv/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libXext,
+  libxext,
   Xaw3d,
   ghostscriptX,
   perl,
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    libXext
+    libxext
     Xaw3d
     ghostscriptX
     perl
diff --git a/pkgs/by-name/gw/gwyddion/package.nix b/pkgs/by-name/gw/gwyddion/package.nix
index e237516fda1b..367303383de2 100644
--- a/pkgs/by-name/gw/gwyddion/package.nix
+++ b/pkgs/by-name/gw/gwyddion/package.nix
@@ -15,7 +15,7 @@
   libxml2,
   libwebpSupport ? true,
   libwebp,
-  # libXmu is not used if libunique is.
+  # libxmu is not used if libunique is.
   libXmuSupport ? false,
   libxmu,
   libxsltSupport ? true,
diff --git a/pkgs/by-name/gx/gxemul/package.nix b/pkgs/by-name/gx/gxemul/package.nix
index 1ce5a012ad74..a7dca9bc284d 100644
--- a/pkgs/by-name/gx/gxemul/package.nix
+++ b/pkgs/by-name/gx/gxemul/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    libX11
+    libx11
   ];
 
   patches = [
diff --git a/pkgs/by-name/ha/hackedbox/package.nix b/pkgs/by-name/ha/hackedbox/package.nix
index 6c2b87cf48f4..a53d96c0ff3e 100644
--- a/pkgs/by-name/ha/hackedbox/package.nix
+++ b/pkgs/by-name/ha/hackedbox/package.nix
@@ -6,13 +6,13 @@
   freetype,
   fribidi,
   imlib2,
-  libX11,
-  libXext,
-  libXft,
-  libXinerama,
-  libXpm,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxext,
+  libxft,
+  libxinerama,
+  libxpm,
+  libxrandr,
+  libxrender,
   pkg-config,
   xorgproto,
 }:
@@ -39,19 +39,19 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
     fribidi
     imlib2
-    libX11
-    libXext
-    libXft
-    libXinerama
-    libXpm
-    libXrandr
-    libXrender
+    libx11
+    libxext
+    libxft
+    libxinerama
+    libxpm
+    libxrandr
+    libxrender
     xorgproto
   ];
 
   configureFlags = [
-    "--x-includes=${libX11.dev}/include"
-    "--x-libraries=${libX11.out}/lib"
+    "--x-includes=${libx11.dev}/include"
+    "--x-libraries=${libx11.out}/lib"
   ];
 
   meta = {
@@ -59,6 +59,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/museoa/hackedbox/";
     license = lib.licenses.gpl2Plus;
     maintainers = [ ];
-    inherit (libX11.meta) platforms;
+    inherit (libx11.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix
index 027865351458..45b27c7afb96 100644
--- a/pkgs/by-name/ha/halloy/package.nix
+++ b/pkgs/by-name/ha/halloy/package.nix
@@ -21,16 +21,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "halloy";
-  version = "2026.1.1";
+  version = "2026.2";
 
   src = fetchFromGitHub {
     owner = "squidowl";
     repo = "halloy";
     tag = version;
-    hash = "sha256-qQ6hNpOqI3yC26KqYYq42KjJw/bMzaXACpGyIXE2axo=";
+    hash = "sha256-xx4r6vdUeh0yr986+Z67xtViQA7mMpsXmTohu3jIwMs=";
   };
 
-  cargoHash = "sha256-LPVOm/96qWR93I0+wYp4M4P4R5Es0LdRM3y62WLU1u4=";
+  cargoHash = "sha256-86v1GjMkzP5Gc+6/evBw2XpMitBfazLAhNB4AQ7yPNs=";
 
   nativeBuildInputs = [
     copyDesktopItems
diff --git a/pkgs/by-name/ha/hardinfo2/package.nix b/pkgs/by-name/ha/hardinfo2/package.nix
index d28c1dd8dfff..358e27218788 100644
--- a/pkgs/by-name/ha/hardinfo2/package.nix
+++ b/pkgs/by-name/ha/hardinfo2/package.nix
@@ -25,8 +25,8 @@
   libsysprof-capture,
   libthai,
   libxkbcommon,
-  libXdmcp,
-  libXtst,
+  libxdmcp,
+  libxtst,
   pcre2,
   sqlite,
   util-linux,
@@ -100,8 +100,8 @@ stdenv.mkDerivation (finalAttrs: {
     pcre2
     sqlite
     util-linux
-    libXdmcp
-    libXtst
+    libxdmcp
+    libxtst
     vulkan-headers
     wayland
   ];
diff --git a/pkgs/by-name/ha/hasura-cli/package.nix b/pkgs/by-name/ha/hasura-cli/package.nix
index 6c872dbb534a..b574b334b612 100644
--- a/pkgs/by-name/ha/hasura-cli/package.nix
+++ b/pkgs/by-name/ha/hasura-cli/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "hasura";
-  version = "2.48.10";
+  version = "2.48.11";
 
   src = fetchFromGitHub {
     owner = "hasura";
     repo = "graphql-engine";
     rev = "v${version}";
-    sha256 = "sha256-L4H9Jbddyp/p4y7aUXhwzGxiroRHNLmHRu5fBlvNrqI=";
+    sha256 = "sha256-ySZ2dbu3W7JfsE20r9AUG4/JbI5DN9MS7lPe8NXjpQ0=";
   };
   modRoot = "./cli";
 
diff --git a/pkgs/by-name/ha/hax11/package.nix b/pkgs/by-name/ha/hax11/package.nix
index 44b9839975dc..b3abacbe9fb4 100644
--- a/pkgs/by-name/ha/hax11/package.nix
+++ b/pkgs/by-name/ha/hax11/package.nix
@@ -2,8 +2,8 @@
   lib,
   multiStdenv,
   fetchFromGitHub,
-  libX11,
-  libXxf86vm,
+  libx11,
+  libxxf86vm,
   xorgproto,
   unstableGitUpdater,
 }:
@@ -25,8 +25,8 @@ multiStdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXxf86vm
+    libx11
+    libxxf86vm
     xorgproto
   ];
 
diff --git a/pkgs/by-name/he/helix-gpt/package.nix b/pkgs/by-name/he/helix-gpt/package.nix
deleted file mode 100644
index f6c3f3eeb8da..000000000000
--- a/pkgs/by-name/he/helix-gpt/package.nix
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  bun,
-  makeBinaryWrapper,
-}:
-let
-  pin = lib.importJSON ./pin.json;
-  src = fetchFromGitHub {
-    owner = "leona";
-    repo = "helix-gpt";
-    rev = pin.version;
-    hash = pin.srcHash;
-  };
-  node_modules = stdenv.mkDerivation {
-    pname = "helix-gpt-node_modules";
-    inherit src;
-    version = pin.version;
-    impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
-      "GIT_PROXY_COMMAND"
-      "SOCKS_SERVER"
-    ];
-    nativeBuildInputs = [ bun ];
-    dontConfigure = true;
-    buildPhase = ''
-      bun install --no-progress --frozen-lockfile
-    '';
-    installPhase = ''
-      mkdir -p $out/node_modules
-
-      cp -R ./node_modules $out
-    '';
-    outputHash = pin."${stdenv.system}";
-    outputHashAlgo = "sha256";
-    outputHashMode = "recursive";
-  };
-in
-stdenv.mkDerivation {
-  pname = "helix-gpt";
-  version = pin.version;
-  inherit src;
-  nativeBuildInputs = [ makeBinaryWrapper ];
-
-  dontConfigure = true;
-  dontBuild = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin
-
-    ln -s ${node_modules}/node_modules $out
-    cp -R ./* $out
-
-    # bun is referenced naked in the package.json generated script
-    makeBinaryWrapper ${bun}/bin/bun $out/bin/helix-gpt \
-      --prefix PATH : ${lib.makeBinPath [ bun ]} \
-      --add-flags "run --prefer-offline --no-install --cwd $out ./src/app.ts"
-
-    runHook postInstall
-  '';
-
-  meta = {
-    homepage = "https://github.com/leona/helix-gpt";
-    changelog = "https://github.com/leona/helix-gpt/releases/tag/${src.rev}";
-    description = "Code completion LSP for Helix with support for Copilot + OpenAI";
-    mainProgram = "helix-gpt";
-    maintainers = with lib.maintainers; [ happysalada ];
-    license = with lib.licenses; [ mit ];
-    platforms = [
-      "x86_64-linux"
-      "x86_64-darwin"
-      "aarch64-darwin"
-      "aarch64-linux"
-    ];
-  };
-}
diff --git a/pkgs/by-name/he/helix-gpt/pin.json b/pkgs/by-name/he/helix-gpt/pin.json
deleted file mode 100644
index c9b18a14cee5..000000000000
--- a/pkgs/by-name/he/helix-gpt/pin.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "version": "0.34",
-  "srcHash": "sha256-F2E+B4kKLpX4g/iCv0i71hSx4xdV6fdkwksslELdZUQ=",
-  "x86_64-linux": "sha256-V/h1tAoKo4fLlR/QmzZb7LpeIab2lmE792rQpWDdMXw=",
-  "x86_64-darwin": "sha256-Pd/nC15uYjwZPvrIfcQRljAuGQiIBDAKSShB1C+eevY=",
-  "aarch64-darwin": "sha256-Pd/nC15uYjwZPvrIfcQRljAuGQiIBDAKSShB1C+eevY=",
-  "aarch64-linux": "sha256-V/h1tAoKo4fLlR/QmzZb7LpeIab2lmE792rQpWDdMXw="
-}
diff --git a/pkgs/by-name/he/helix/package.nix b/pkgs/by-name/he/helix/package.nix
index b71f940fe492..4221b653127c 100644
--- a/pkgs/by-name/he/helix/package.nix
+++ b/pkgs/by-name/he/helix/package.nix
@@ -10,7 +10,7 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage (final: {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "helix";
   version = "25.07.1";
   outputs = [
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (final: {
   # This release tarball includes source code for the tree-sitter grammars,
   # which is not ordinarily part of the repository.
   src = fetchzip {
-    url = "https://github.com/helix-editor/helix/releases/download/${final.version}/helix-${final.version}-source.tar.xz";
+    url = "https://github.com/helix-editor/helix/releases/download/${finalAttrs.version}/helix-${finalAttrs.version}-source.tar.xz";
     hash = "sha256-Pj/lfcQXRWqBOTTWt6+Gk61F9F1UmeCYr+26hGdG974=";
     stripRoot = false;
   };
@@ -77,7 +77,7 @@ rustPlatform.buildRustPackage (final: {
   meta = {
     description = "Post-modern modal text editor";
     homepage = "https://helix-editor.com";
-    changelog = "https://github.com/helix-editor/helix/blob/${final.version}/CHANGELOG.md";
+    changelog = "https://github.com/helix-editor/helix/blob/${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mpl20;
     mainProgram = "hx";
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/he/herbe/package.nix b/pkgs/by-name/he/herbe/package.nix
index 9c74d9aacd1a..450058e2e44b 100644
--- a/pkgs/by-name/he/herbe/package.nix
+++ b/pkgs/by-name/he/herbe/package.nix
@@ -2,8 +2,8 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  libX11,
-  libXft,
+  libx11,
+  libxft,
   freetype,
   patches ? [ ],
   extraLibs ? [ ],
@@ -27,8 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   buildInputs = [
-    libX11
-    libXft
+    libx11
+    libxft
     freetype
   ]
   ++ extraLibs;
diff --git a/pkgs/by-name/he/herbstluftwm/package.nix b/pkgs/by-name/he/herbstluftwm/package.nix
index b33d446464d6..202fef89c74c 100644
--- a/pkgs/by-name/he/herbstluftwm/package.nix
+++ b/pkgs/by-name/he/herbstluftwm/package.nix
@@ -5,14 +5,14 @@
   cmake,
   pkg-config,
   python3,
-  libX11,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXft,
-  libXrender,
-  libXdmcp,
-  libXfixes,
+  libx11,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxft,
+  libxrender,
+  libxdmcp,
+  libxfixes,
   freetype,
   asciidoc,
   xdotool,
@@ -53,14 +53,14 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXext
-    libXinerama
-    libXrandr
-    libXft
-    libXrender
-    libXdmcp
-    libXfixes
+    libx11
+    libxext
+    libxinerama
+    libxrandr
+    libxft
+    libxrender
+    libxdmcp
+    libxfixes
     freetype
   ];
 
diff --git a/pkgs/by-name/hi/higan/package.nix b/pkgs/by-name/hi/higan/package.nix
index 994250f2426a..79523e2ded29 100644
--- a/pkgs/by-name/hi/higan/package.nix
+++ b/pkgs/by-name/hi/higan/package.nix
@@ -7,8 +7,8 @@
   gtksourceview3,
   libGL,
   libGLU,
-  libX11,
-  libXv,
+  libx11,
+  libxv,
   libao,
   libicns,
   libpulseaudio,
@@ -50,8 +50,8 @@ stdenv.mkDerivation (finalAttrs: {
     gtksourceview3
     libGL
     libGLU
-    libX11
-    libXv
+    libx11
+    libxv
     libpulseaudio
     openal
     udev
diff --git a/pkgs/by-name/hi/highlight-pointer/package.nix b/pkgs/by-name/hi/highlight-pointer/package.nix
index d65dfc7a81e2..8a6bcb591d60 100644
--- a/pkgs/by-name/hi/highlight-pointer/package.nix
+++ b/pkgs/by-name/hi/highlight-pointer/package.nix
@@ -2,10 +2,10 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
   libxi,
   libxfixes,
-  libXext,
+  libxext,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -20,8 +20,8 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
-    libXext
+    libx11
+    libxext
     libxi
     libxfixes
   ];
diff --git a/pkgs/by-name/hi/highscore-desmume/package.nix b/pkgs/by-name/hi/highscore-desmume/package.nix
index 1ab7b2d51d1b..cb0450113577 100644
--- a/pkgs/by-name/hi/highscore-desmume/package.nix
+++ b/pkgs/by-name/hi/highscore-desmume/package.nix
@@ -7,7 +7,7 @@
   pkg-config,
   libhighscore,
   libGL,
-  libX11,
+  libx11,
   SDL2,
   libpcap,
   unstableGitUpdater,
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libhighscore
     libGL
-    libX11
+    libx11
     SDL2
     libpcap
   ];
diff --git a/pkgs/by-name/hi/highscore-mednafen/package.nix b/pkgs/by-name/hi/highscore-mednafen/package.nix
index af5b3a86db61..29deded80c82 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-28";
+  version = "0-unstable-2026-01-31";
 
   src = fetchFromGitHub {
     owner = "highscore-emu";
     repo = "mednafen-highscore";
-    rev = "2e8e49ee3155b2497b6a79f815f097e46e23ac0e";
-    hash = "sha256-XGJpKQIBJ0Xu7w9FPc8xw8EKRLb5Y+0bhy8z8OuPOIg=";
+    rev = "f1646bbc664837f5b2ecbfb32cc5c42101466bfd";
+    hash = "sha256-YHVV6/8JTESLtGA5jFozE5IhXHB4RaUaT2yvFd7wGo8=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/highscore";
diff --git a/pkgs/by-name/hi/hime/package.nix b/pkgs/by-name/hi/hime/package.nix
index 82e5f2e999db..adc4e2d01a51 100644
--- a/pkgs/by-name/hi/hime/package.nix
+++ b/pkgs/by-name/hi/hime/package.nix
@@ -6,7 +6,7 @@
   gtk2,
   gtk3,
   qt5,
-  libXtst,
+  libxtst,
   lib,
   libchewing,
   unixtools,
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     unixtools.whereis
   ];
   buildInputs = [
-    libXtst
+    libxtst
     gtk2
     gtk3
     qt5.qtbase
diff --git a/pkgs/by-name/hs/hsetroot/package.nix b/pkgs/by-name/hs/hsetroot/package.nix
index 1c24340c9d6e..b16fd3225385 100644
--- a/pkgs/by-name/hs/hsetroot/package.nix
+++ b/pkgs/by-name/hs/hsetroot/package.nix
@@ -4,8 +4,8 @@
   fetchFromGitHub,
   pkg-config,
   imlib2,
-  libX11,
-  libXinerama,
+  libx11,
+  libxinerama,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -22,8 +22,8 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     imlib2
-    libX11
-    libXinerama
+    libx11
+    libxinerama
   ];
 
   postPatch = lib.optionalString (!stdenv.cc.isGNU) ''
diff --git a/pkgs/by-name/ht/htmlhint/package.nix b/pkgs/by-name/ht/htmlhint/package.nix
index ed973a24d631..c9e4a5d9ca8a 100644
--- a/pkgs/by-name/ht/htmlhint/package.nix
+++ b/pkgs/by-name/ht/htmlhint/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "htmlhint";
-  version = "1.8.0";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "htmlhint";
     repo = "HTMLHint";
     rev = "v${version}";
-    hash = "sha256-zRn6fqziqgp3cOPZfkmN+KP84bgjdPmaHD7n6rtiHVA=";
+    hash = "sha256-uzOdp9SkYQ1SKQqM3DrvKsMAyMw+7s74lNR2jOgLAIM=";
   };
 
-  npmDepsHash = "sha256-L/yVM/HoBewzoADn9M+c2Er5LFEiZXajYIK8fvsDdio=";
+  npmDepsHash = "sha256-Ii73v3Yt10GBwvdxNTy4bmU0RxRGfMaEewP8gdC2OEc=";
 
   meta = {
     changelog = "https://github.com/htmlhint/HTMLHint/blob/${src.rev}/CHANGELOG.md";
diff --git a/pkgs/by-name/hu/hubstaff/package.nix b/pkgs/by-name/hu/hubstaff/package.nix
index 776493e07b5a..d1a490cc76c9 100644
--- a/pkgs/by-name/hu/hubstaff/package.nix
+++ b/pkgs/by-name/hu/hubstaff/package.nix
@@ -4,20 +4,20 @@
   fetchurl,
   unzip,
   makeWrapper,
-  libX11,
+  libx11,
   zlib,
   libsm,
   libice,
-  libXext,
+  libxext,
   freetype,
-  libXrender,
+  libxrender,
   fontconfig,
-  libXft,
-  libXinerama,
-  libXcursor,
+  libxft,
+  libxinerama,
+  libxcursor,
   cairo,
-  libXfixes,
-  libXScrnSaver,
+  libxfixes,
+  libxscrnsaver,
   libnotify,
   glib,
   gtk3,
@@ -36,25 +36,25 @@ let
   sha256 = "sha256:0cv6b5rx1bjizwa22xlzmljwgcvm1mqyng79qqrdzmd0xy7c02pi";
 
   rpath = lib.makeLibraryPath [
-    libX11
+    libx11
     zlib
     libsm
     libice
-    libXext
+    libxext
     freetype
-    libXrender
+    libxrender
     fontconfig
-    libXft
-    libXinerama
+    libxft
+    libxinerama
     stdenv.cc.cc
     libnotify
     glib
     gtk3
     libappindicator-gtk3
     curl
-    libXfixes
-    libXScrnSaver
-    libXcursor
+    libxfixes
+    libxscrnsaver
+    libxcursor
     cairo
   ];
 
diff --git a/pkgs/by-name/hu/hugin/package.nix b/pkgs/by-name/hu/hugin/package.nix
index 4b658c31aef3..053b9c7f8f83 100644
--- a/pkgs/by-name/hu/hugin/package.nix
+++ b/pkgs/by-name/hu/hugin/package.nix
@@ -19,9 +19,9 @@
   libjpeg,
   libpng,
   libtiff,
-  libX11,
-  libXi,
-  libXmu,
+  libx11,
+  libxi,
+  libxmu,
   libGLU,
   libGL,
   openexr,
@@ -57,9 +57,9 @@ stdenv.mkDerivation (finalAttrs: {
     libjpeg
     libpng
     libtiff
-    libX11
-    libXi
-    libXmu
+    libx11
+    libxi
+    libxmu
     libGLU
     libGL
     openexr
diff --git a/pkgs/by-name/hw/hwloc/package.nix b/pkgs/by-name/hw/hwloc/package.nix
index 602b0a5d2a5e..9aad772e8f49 100644
--- a/pkgs/by-name/hw/hwloc/package.nix
+++ b/pkgs/by-name/hw/hwloc/package.nix
@@ -9,7 +9,7 @@
   pciutils,
   numactl,
   x11Support ? false,
-  libX11,
+  libx11,
   cairo,
   config,
   enableCuda ? config.cudaSupport,
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     "--enable-netloc"
   ];
 
-  # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo.
+  # XXX: libx11 is not directly needed, but needed as a propagated dep of Cairo.
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals x11Support [
     cairo
-    libX11
+    libx11
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ numactl ]
   ++ lib.optionals enableCuda [ cudaPackages.cuda_cudart ];
diff --git a/pkgs/by-name/hy/hybridreverb2/package.nix b/pkgs/by-name/hy/hybridreverb2/package.nix
index 20eb1f6fe840..af49089fd471 100644
--- a/pkgs/by-name/hy/hybridreverb2/package.nix
+++ b/pkgs/by-name/hy/hybridreverb2/package.nix
@@ -8,11 +8,11 @@
   alsa-lib,
   libjack2,
   freetype,
-  libX11,
+  libx11,
   gtk3,
   pcre,
   libpthread-stubs,
-  libXdmcp,
+  libxdmcp,
   libxkbcommon,
   libepoxy,
   at-spi2-core,
@@ -56,11 +56,11 @@ stdenv.mkDerivation rec {
     alsa-lib
     libjack2
     freetype
-    libX11
+    libx11
     gtk3
     pcre
     libpthread-stubs
-    libXdmcp
+    libxdmcp
     libxkbcommon
     libepoxy
     at-spi2-core
diff --git a/pkgs/by-name/hy/hyper/package.nix b/pkgs/by-name/hy/hyper/package.nix
index 18e5a4999363..bc8b874c38d9 100644
--- a/pkgs/by-name/hy/hyper/package.nix
+++ b/pkgs/by-name/hy/hyper/package.nix
@@ -12,17 +12,17 @@
   freetype,
   fontconfig,
   dbus,
-  libXi,
-  libXcursor,
-  libXdamage,
-  libXrandr,
-  libXcomposite,
-  libXext,
-  libXfixes,
-  libXrender,
-  libX11,
-  libXtst,
-  libXScrnSaver,
+  libxi,
+  libxcursor,
+  libxdamage,
+  libxrandr,
+  libxcomposite,
+  libxext,
+  libxfixes,
+  libxrender,
+  libx11,
+  libxtst,
+  libxscrnsaver,
   libxcb,
   nss,
   nspr,
@@ -52,18 +52,18 @@ let
     freetype
     fontconfig
     dbus
-    libXi
-    libXcursor
-    libXdamage
-    libXrandr
-    libXcomposite
-    libXext
-    libXfixes
+    libxi
+    libxcursor
+    libxdamage
+    libxrandr
+    libxcomposite
+    libxext
+    libxfixes
     libxcb
-    libXrender
-    libX11
-    libXtst
-    libXScrnSaver
+    libxrender
+    libx11
+    libxtst
+    libxscrnsaver
     nss
     nspr
     alsa-lib
diff --git a/pkgs/by-name/hy/hyperspeedcube/package.nix b/pkgs/by-name/hy/hyperspeedcube/package.nix
index 4a2676384e38..c79a762cdc8a 100644
--- a/pkgs/by-name/hy/hyperspeedcube/package.nix
+++ b/pkgs/by-name/hy/hyperspeedcube/package.nix
@@ -14,12 +14,12 @@
   harfbuzz,
   lib,
   libGL,
-  libX11,
+  libx11,
   libxcb,
-  libXcursor,
-  libXi,
+  libxcursor,
+  libxi,
   libxkbcommon,
-  libXrandr,
+  libxrandr,
   makeWrapper,
   mold,
   pango,
@@ -86,10 +86,10 @@ rustPlatform.buildRustPackage rec {
     wayland
 
     # WINIT_UNIX_BACKEND=x11
-    libXcursor
-    libXrandr
-    libXi
-    libX11
+    libxcursor
+    libxrandr
+    libxi
+    libx11
 
     vulkan-headers
     vulkan-loader
diff --git a/pkgs/by-name/hy/hyprpicker/package.nix b/pkgs/by-name/hy/hyprpicker/package.nix
index e640542cd6d1..147def6b9ac3 100644
--- a/pkgs/by-name/hy/hyprpicker/package.nix
+++ b/pkgs/by-name/hy/hyprpicker/package.nix
@@ -15,7 +15,7 @@
   wayland,
   wayland-protocols,
   wayland-scanner,
-  libXdmcp,
+  libxdmcp,
   debug ? false,
 }:
 gcc15Stdenv.mkDerivation (finalAttrs: {
@@ -47,7 +47,7 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
     wayland
     wayland-protocols
     wayland-scanner
-    libXdmcp
+    libxdmcp
   ];
 
   postInstall = ''
diff --git a/pkgs/by-name/hy/hyprwire/package.nix b/pkgs/by-name/hy/hyprwire/package.nix
index 6e8f3ac5c692..8b299b0f2a5e 100644
--- a/pkgs/by-name/hy/hyprwire/package.nix
+++ b/pkgs/by-name/hy/hyprwire/package.nix
@@ -11,13 +11,13 @@
 
 gcc15Stdenv.mkDerivation (finalAttrs: {
   pname = "hyprwire";
-  version = "0.2.1";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprwire";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-INI9AVrQG5nJZFvGPSiUZ9FEUZJLfGdsqjF1QSak7Gc=";
+    hash = "sha256-PR/KER+yiHabFC/h1Wjb+9fR2Uy0lWM3Qld7jPVaWkk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/hy/hypseus-singe/package.nix b/pkgs/by-name/hy/hypseus-singe/package.nix
index b4756ca76dc1..87a042e3d807 100644
--- a/pkgs/by-name/hy/hypseus-singe/package.nix
+++ b/pkgs/by-name/hy/hypseus-singe/package.nix
@@ -15,18 +15,18 @@
   libmpeg2,
   libvorbis,
   libzip,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hypseus-singe";
-  version = "2.11.6";
+  version = "2.11.7";
 
   src = fetchFromGitHub {
     owner = "DirtBagXon";
     repo = "hypseus-singe";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fSqlpzA2NUY1Sk+OTj9SmeRfQ+nqY9iAa3vTwr4OV9Q=";
+    hash = "sha256-/Jt4w6LQ/EdZ1kmXlu08clDu+uYRL/UlgEyxa+BXooM=";
   };
 
   patches = [ ./use-shared-mpeg2.patch ];
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     libzip
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
+    libx11
   ];
 
   env.NIX_CFLAGS_COMPILE = toString [
diff --git a/pkgs/by-name/ia/iat/package.nix b/pkgs/by-name/ia/iat/package.nix
index 1443a257b941..7818ff845001 100644
--- a/pkgs/by-name/ia/iat/package.nix
+++ b/pkgs/by-name/ia/iat/package.nix
@@ -4,12 +4,12 @@
   fetchurl,
 }:
 
-stdenv.mkDerivation (finalAttr: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "iat";
   version = "0.1.7";
 
   src = fetchurl {
-    url = "mirror://sourceforge/iat.berlios/iat-${finalAttr.version}.tar.gz";
+    url = "mirror://sourceforge/iat.berlios/iat-${finalAttrs.version}.tar.gz";
     hash = "sha256-sl1X/eKKArLYfNSf0UeLA5rb2DY1GHmmVP6hTCd2SyE=";
   };
 
diff --git a/pkgs/by-name/ic/icbm3d/package.nix b/pkgs/by-name/ic/icbm3d/package.nix
index 270e57c3045d..26e2c53d517f 100644
--- a/pkgs/by-name/ic/icbm3d/package.nix
+++ b/pkgs/by-name/ic/icbm3d/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-mtQcFU70dpV3GiaHXVQVvO3LE5NSseIXXzhtIGsAOP0=";
   };
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; # fix darwin and cross-compiled builds
 
diff --git a/pkgs/by-name/ic/icesl/package.nix b/pkgs/by-name/ic/icesl/package.nix
index a3a1bfae3d96..b319368f0247 100644
--- a/pkgs/by-name/ic/icesl/package.nix
+++ b/pkgs/by-name/ic/icesl/package.nix
@@ -3,14 +3,14 @@
   lib,
   fetchzip,
   libglut,
-  libXmu,
-  libXi,
-  libX11,
+  libxmu,
+  libxi,
+  libx11,
   libice,
   libGLU,
   libGL,
   libsm,
-  libXext,
+  libxext,
   glibc,
   lua,
   luabind,
@@ -21,15 +21,15 @@
 }:
 let
   lpath = lib.makeLibraryPath [
-    libXmu
-    libXi
-    libX11
+    libxmu
+    libxi
+    libx11
     libglut
     libice
     libGLU
     libGL
     libsm
-    libXext
+    libxext
     glibc
     lua
     glfw
diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix
index bfa10432754d..99793c5c76c7 100644
--- a/pkgs/by-name/ic/icewm/package.nix
+++ b/pkgs/by-name/ic/icewm/package.nix
@@ -16,16 +16,16 @@
   imlib2,
   libice,
   libsm,
-  libX11,
-  libXcomposite,
-  libXdamage,
-  libXdmcp,
-  libXext,
-  libXfixes,
-  libXft,
-  libXinerama,
-  libXpm,
-  libXrandr,
+  libx11,
+  libxcomposite,
+  libxdamage,
+  libxdmcp,
+  libxext,
+  libxfixes,
+  libxft,
+  libxinerama,
+  libxpm,
+  libxrandr,
   libjpeg,
   libogg,
   libpng,
@@ -73,16 +73,16 @@ gccStdenv.mkDerivation (finalAttrs: {
     imlib2
     libice
     libsm
-    libX11
-    libXcomposite
-    libXdamage
-    libXdmcp
-    libXext
-    libXfixes
-    libXft
-    libXinerama
-    libXpm
-    libXrandr
+    libx11
+    libxcomposite
+    libxdamage
+    libxdmcp
+    libxext
+    libxfixes
+    libxft
+    libxinerama
+    libxpm
+    libxrandr
     libjpeg
     libogg
     libpng
diff --git a/pkgs/by-name/ic/ico/package.nix b/pkgs/by-name/ic/ico/package.nix
index ad1f3cd95c88..50c55c513238 100644
--- a/pkgs/by-name/ic/ico/package.nix
+++ b/pkgs/by-name/ic/ico/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   pkg-config,
-  libX11,
+  libx11,
   xorgproto,
   writeScript,
 }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    libX11
+    libx11
     xorgproto
   ];
 
diff --git a/pkgs/by-name/ic/icon-lang/package.nix b/pkgs/by-name/ic/icon-lang/package.nix
index d3a351d2afcc..97fb6773e4d9 100644
--- a/pkgs/by-name/ic/icon-lang/package.nix
+++ b/pkgs/by-name/ic/icon-lang/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXt,
+  libx11,
+  libxt,
   withGraphics ? true,
 }:
 
@@ -18,8 +18,8 @@ stdenv.mkDerivation {
   };
 
   buildInputs = lib.optionals withGraphics [
-    libX11
-    libXt
+    libx11
+    libxt
   ];
 
   configurePhase =
diff --git a/pkgs/by-name/ic/icon-slicer/package.nix b/pkgs/by-name/ic/icon-slicer/package.nix
index 34d08cce01f7..30ca2802cf14 100644
--- a/pkgs/by-name/ic/icon-slicer/package.nix
+++ b/pkgs/by-name/ic/icon-slicer/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [ gdk-pixbuf ];
 
   meta = {
-    description = "Utility for generating icon themes and libXcursor cursor themes";
+    description = "Utility for generating icon themes and libxcursor cursor themes";
     homepage = "https://www.freedesktop.org/wiki/Software/icon-slicer/";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ zaninime ];
diff --git a/pkgs/by-name/id/ideamaker/package.nix b/pkgs/by-name/id/ideamaker/package.nix
index 087d701ea053..f99e76615b63 100644
--- a/pkgs/by-name/id/ideamaker/package.nix
+++ b/pkgs/by-name/id/ideamaker/package.nix
@@ -14,7 +14,7 @@
   libpsl,
   libsForQt5,
   libredirect,
-  libX11,
+  libx11,
   lz4,
   makeDesktopItem,
   makeWrapper,
@@ -87,7 +87,7 @@ stdenv.mkDerivation {
     wrapProgram $out/bin/ideamaker \
       --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
       --set QT_XKB_CONFIG_ROOT "${xkeyboard-config}/share/X11/xkb" \
-      --set QTCOMPOSE "${libX11.out}/share/X11/locale" \
+      --set QTCOMPOSE "${libx11.out}/share/X11/locale" \
       --set KDEDIRS "$HOME/.nix-profile:/nix/var/nix/profiles/default" \
       --set NIX_REDIRECTS /usr/share=$out/share/
   '';
diff --git a/pkgs/by-name/im/imapsync/package.nix b/pkgs/by-name/im/imapsync/package.nix
index 580650d4856f..fb90b09245f1 100644
--- a/pkgs/by-name/im/imapsync/package.nix
+++ b/pkgs/by-name/im/imapsync/package.nix
@@ -5,24 +5,27 @@
   perl,
   perlPackages,
   stdenv,
+  procps,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "imapsync";
-  version = "2.290";
+  version = "2.314";
 
   src = fetchurl {
     url = "https://imapsync.lamiral.info/dist/old_releases/${finalAttrs.version}/imapsync-${finalAttrs.version}.tgz";
-    hash = "sha256-uFhTxnaUDP793isfpF/7T8d4AnXDL4uN6zU8igY+EFE=";
+    hash = "sha256-NOFxXGWEiJ/zvZwKzC+rJURGKCvtqQyOWnGoOzpZ28o=";
   };
 
   postPatch = ''
     sed -i -e s@/usr@$out@ Makefile
-    substituteInPlace INSTALL.d/prerequisites_imapsync --replace "PAR::Packer" ""
+    substituteInPlace INSTALL.d/prerequisites_imapsync --replace-fail "PAR::Packer" ""
   '';
 
   postInstall = ''
-    wrapProgram $out/bin/imapsync --set PERL5LIB $PERL5LIB
+    wrapProgram $out/bin/imapsync \
+      --set PERL5LIB $PERL5LIB \
+      --prefix PATH : ${lib.makeBinPath [ procps ]}
   '';
 
   nativeBuildInputs = [ makeWrapper ];
@@ -33,9 +36,12 @@ stdenv.mkDerivation (finalAttrs: {
     CryptOpenSSLRSA
     DataUniqid
     DistCheckConflicts
+    EmailAddress
     EncodeIMAPUTF7
     FileCopyRecursive
     FileTail
+    HTTPDaemon
+    HTTPDaemonSSL
     IOSocketINET6
     IOTee
     JSONWebToken
@@ -43,8 +49,9 @@ stdenv.mkDerivation (finalAttrs: {
     MailIMAPClient
     ModuleImplementation
     ModuleScanDeps
-    NetServer
     NTLM
+    NetDNS
+    NetServer
     PackageStash
     PackageStashXS
     ProcProcessTable
@@ -64,13 +71,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Mail folder synchronizer between IMAP servers";
-    mainProgram = "imapsync";
-    homepage = "https://imapsync.lamiral.info/";
+    homepage = "https://imapsync.lamiral.info";
     license = lib.licenses.nlpl;
     maintainers = with lib.maintainers; [
       pSub
       motiejus
     ];
     platforms = lib.platforms.unix;
+    mainProgram = "imapsync";
   };
 })
diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix
index c32d82f786a0..21c83053013d 100644
--- a/pkgs/by-name/im/immich/package.nix
+++ b/pkgs/by-name/im/immich/package.nix
@@ -115,20 +115,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "immich";
-  version = "2.5.3";
+  version = "2.5.5";
 
   src = fetchFromGitHub {
     owner = "immich-app";
     repo = "immich";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9jZ2Jpsce56O0kcpugvpn6tDKnNAqu6v/87sH0fdzfs=";
+    hash = "sha256-wAZcgAazfEy5dJhlut4cHGOj+qWrvF9vD6sxAswuhVU=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
     fetcherVersion = 3;
-    hash = "sha256-+2rm184Hb+S75VyDn3FU36M/3SH2hUDYbKotIGopmvU=";
+    hash = "sha256-kJBX0hoDijs5IjS37oUDVv61t4vXTF6e3lmZIy/lQ/o=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/im/imwheel/package.nix b/pkgs/by-name/im/imwheel/package.nix
index 4ef9ffbfb422..a7d0d803d7ca 100644
--- a/pkgs/by-name/im/imwheel/package.nix
+++ b/pkgs/by-name/im/imwheel/package.nix
@@ -2,12 +2,12 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXext,
-  libXi,
-  libXmu,
-  libXt,
-  libXtst,
+  libx11,
+  libxext,
+  libxi,
+  libxmu,
+  libxt,
+  libxtst,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -20,12 +20,12 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
-    libXext
-    libXi
-    libXmu
-    libXt
-    libXtst
+    libx11
+    libxext
+    libxi
+    libxmu
+    libxt
+    libxtst
   ];
 
   env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
diff --git a/pkgs/by-name/in/infamousPlugins/package.nix b/pkgs/by-name/in/infamousPlugins/package.nix
index 23d0fc4498db..483fdaddfd72 100644
--- a/pkgs/by-name/in/infamousPlugins/package.nix
+++ b/pkgs/by-name/in/infamousPlugins/package.nix
@@ -7,8 +7,8 @@
   cmake,
   lv2,
   libpthread-stubs,
-  libXdmcp,
-  libXft,
+  libxdmcp,
+  libxft,
   ntk,
   pcre,
   fftwFloat,
@@ -34,8 +34,8 @@ stdenv.mkDerivation (finalAttrs: {
     cairomm
     lv2
     libpthread-stubs
-    libXdmcp
-    libXft
+    libxdmcp
+    libxft
     ntk
     pcre
     fftwFloat
diff --git a/pkgs/by-name/in/inlyne/package.nix b/pkgs/by-name/in/inlyne/package.nix
index bbfe5db25c18..19606d2a8267 100644
--- a/pkgs/by-name/in/inlyne/package.nix
+++ b/pkgs/by-name/in/inlyne/package.nix
@@ -33,12 +33,13 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [
     installShellFiles
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [
     pkg-config
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+  buildInputs = [
+    oniguruma
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
     fontconfig
     libxcursor
     libxi
@@ -47,7 +48,6 @@ rustPlatform.buildRustPackage rec {
     wayland
     libxkbcommon
     openssl
-    oniguruma
   ];
 
   # use system oniguruma since the bundled one fails to build with gcc15
diff --git a/pkgs/by-name/in/input-leap/package.nix b/pkgs/by-name/in/input-leap/package.nix
index 1432e0a04cc2..b34f38cce804 100644
--- a/pkgs/by-name/in/input-leap/package.nix
+++ b/pkgs/by-name/in/input-leap/package.nix
@@ -6,12 +6,12 @@
   curl,
   libice,
   libsm,
-  libX11,
-  libXdmcp,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXtst,
+  libx11,
+  libxdmcp,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxtst,
   libei,
   libportal,
   openssl,
@@ -49,12 +49,12 @@ stdenv.mkDerivation (finalAttrs: {
     curl
     qt6.qtbase
     avahi'
-    libX11
-    libXext
-    libXtst
-    libXinerama
-    libXrandr
-    libXdmcp
+    libx11
+    libxext
+    libxtst
+    libxinerama
+    libxrandr
+    libxdmcp
     libice
     libsm
   ]
diff --git a/pkgs/by-name/in/intel-gpu-tools/package.nix b/pkgs/by-name/in/intel-gpu-tools/package.nix
index 7ee4a89e01c0..404cbdc30ff2 100644
--- a/pkgs/by-name/in/intel-gpu-tools/package.nix
+++ b/pkgs/by-name/in/intel-gpu-tools/package.nix
@@ -27,10 +27,10 @@
   liboping,
   libpciaccess,
   libunwind,
-  libX11,
-  libXext,
-  libXrandr,
-  libXv,
+  libx11,
+  libxext,
+  libxrandr,
+  libxv,
   openssl,
   peg,
   procps,
@@ -78,10 +78,10 @@ stdenv.mkDerivation (finalAttrs: {
     liboping
     libpciaccess
     libunwind
-    libX11
-    libXext
-    libXrandr
-    libXv
+    libx11
+    libxext
+    libxrandr
+    libxv
     openssl
     peg
     procps
diff --git a/pkgs/by-name/in/intel-media-driver/package.nix b/pkgs/by-name/in/intel-media-driver/package.nix
index c56d7df90fec..3a6d74444ec8 100644
--- a/pkgs/by-name/in/intel-media-driver/package.nix
+++ b/pkgs/by-name/in/intel-media-driver/package.nix
@@ -10,7 +10,7 @@
   intel-gmmlib,
   libdrm,
   enableX11 ? stdenv.hostPlatform.isLinux,
-  libX11,
+  libx11,
   # for passhtru.tests
   pkgsi686Linux,
 }:
@@ -65,10 +65,10 @@ stdenv.mkDerivation (finalAttrs: {
     intel-gmmlib
     libdrm
   ]
-  ++ lib.optional enableX11 libX11;
+  ++ lib.optional enableX11 libx11;
 
   postFixup = lib.optionalString enableX11 ''
-    patchelf --set-rpath "$(patchelf --print-rpath $out/lib/dri/iHD_drv_video.so):${lib.makeLibraryPath [ libX11 ]}" \
+    patchelf --set-rpath "$(patchelf --print-rpath $out/lib/dri/iHD_drv_video.so):${lib.makeLibraryPath [ libx11 ]}" \
       $out/lib/dri/iHD_drv_video.so
   '';
 
diff --git a/pkgs/by-name/in/intel-media-sdk/package.nix b/pkgs/by-name/in/intel-media-sdk/package.nix
index ed5d7f982ea6..18509b93aa2d 100644
--- a/pkgs/by-name/in/intel-media-sdk/package.nix
+++ b/pkgs/by-name/in/intel-media-sdk/package.nix
@@ -8,9 +8,9 @@
   libdrm,
   libpciaccess,
   libva,
-  libX11,
-  libXau,
-  libXdmcp,
+  libx11,
+  libxau,
+  libxdmcp,
   libpthread-stubs,
   fetchpatch,
 }:
@@ -46,9 +46,9 @@ stdenv.mkDerivation rec {
     libdrm
     libva
     libpciaccess
-    libX11
-    libXau
-    libXdmcp
+    libx11
+    libxau
+    libxdmcp
     libpthread-stubs
   ];
   nativeCheckInputs = [ gtest ];
diff --git a/pkgs/by-name/in/intel-vaapi-driver/package.nix b/pkgs/by-name/in/intel-vaapi-driver/package.nix
index 748a36fb5ddc..b461933e2d85 100644
--- a/pkgs/by-name/in/intel-vaapi-driver/package.nix
+++ b/pkgs/by-name/in/intel-vaapi-driver/package.nix
@@ -10,10 +10,10 @@
   intel-gpu-tools,
   libdrm,
   libva,
-  libX11,
+  libx11,
   libGL,
   wayland,
-  libXext,
+  libxext,
   enableHybridCodec ? false,
   vaapi-intel-hybrid,
   enableGui ? true,
@@ -58,8 +58,8 @@ stdenv.mkDerivation {
     libva
   ]
   ++ lib.optionals enableGui [
-    libX11
-    libXext
+    libx11
+    libxext
     libGL
     wayland
   ]
diff --git a/pkgs/by-name/io/io/package.nix b/pkgs/by-name/io/io/package.nix
index 1bce2be773cb..8155d0e95f6c 100644
--- a/pkgs/by-name/io/io/package.nix
+++ b/pkgs/by-name/io/io/package.nix
@@ -30,7 +30,7 @@
   glfw,
   pkg-config,
   libpthread-stubs,
-  libXdmcp,
+  libxdmcp,
   libmemcached,
 }:
 
@@ -88,7 +88,7 @@ stdenv.mkDerivation {
     glfw
     openssl
     libpthread-stubs
-    libXdmcp
+    libxdmcp
     libmemcached
     python3
   ];
diff --git a/pkgs/by-name/it/itgmania/package.nix b/pkgs/by-name/it/itgmania/package.nix
index cbb5a65e8b50..5883d16b1bac 100644
--- a/pkgs/by-name/it/itgmania/package.nix
+++ b/pkgs/by-name/it/itgmania/package.nix
@@ -15,7 +15,7 @@
   libpulseaudio,
   libusb-compat-0_1,
   libvorbis,
-  libXtst,
+  libxtst,
   udev,
   makeWrapper,
   makeDesktopItem,
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpulseaudio
     libusb-compat-0_1
     libvorbis
-    libXtst
+    libxtst
     udev
   ];
 
diff --git a/pkgs/by-name/iv/ivm/package.nix b/pkgs/by-name/iv/ivm/package.nix
index d27d928130dd..5291768b236a 100644
--- a/pkgs/by-name/iv/ivm/package.nix
+++ b/pkgs/by-name/iv/ivm/package.nix
@@ -13,14 +13,14 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage (finalAttr: {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ivm";
   version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "inko-lang";
     repo = "ivm";
-    tag = "v${finalAttr.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-pqqUvHK6mPrK1Mir2ILANxtih9OrAKDJPE0nRWc5JOY=";
   };
 
diff --git a/pkgs/by-name/ja/jaaa/package.nix b/pkgs/by-name/ja/jaaa/package.nix
index b2364cda5418..75f06338142d 100644
--- a/pkgs/by-name/ja/jaaa/package.nix
+++ b/pkgs/by-name/ja/jaaa/package.nix
@@ -5,9 +5,9 @@
   alsa-lib,
   libclthreads,
   libclxclient,
-  libX11,
-  libXft,
-  libXrender,
+  libx11,
+  libxft,
+  libxrender,
   fftwFloat,
   libjack2,
   zita-alsa-pcmi,
@@ -26,9 +26,9 @@ stdenv.mkDerivation rec {
     alsa-lib
     libclthreads
     libclxclient
-    libX11
-    libXft
-    libXrender
+    libx11
+    libxft
+    libxrender
     fftwFloat
     libjack2
     zita-alsa-pcmi
diff --git a/pkgs/by-name/ja/jack-example-tools/package.nix b/pkgs/by-name/ja/jack-example-tools/package.nix
index 19fddc33c8ef..6bbce59554ce 100644
--- a/pkgs/by-name/ja/jack-example-tools/package.nix
+++ b/pkgs/by-name/ja/jack-example-tools/package.nix
@@ -20,14 +20,14 @@
   enableAlsa ? stdenv.hostPlatform.isLinux,
 }:
 
-stdenv.mkDerivation (final: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "jack-example-tools";
   version = "4";
 
   src = fetchFromGitHub {
     owner = "jackaudio";
     repo = "jack-example-tools";
-    rev = "tags/${final.version}";
+    rev = "tags/${finalAttrs.version}";
     hash = "sha256-5jmynNxwNVLxEZ1MaqQUG6kRwipDkjhrdDCbZHtmAHk=";
   };
 
diff --git a/pkgs/by-name/ja/jack_oscrolloscope/package.nix b/pkgs/by-name/ja/jack_oscrolloscope/package.nix
index 19109b1e21aa..f5ed0a899b76 100644
--- a/pkgs/by-name/ja/jack_oscrolloscope/package.nix
+++ b/pkgs/by-name/ja/jack_oscrolloscope/package.nix
@@ -6,7 +6,7 @@
   libjack2,
   libGLU,
   libGL,
-  libX11,
+  libx11,
   pkg-config,
 }:
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     libjack2
     libGLU
     libGL
-    libX11
+    libx11
   ];
 
   installPhase = ''
diff --git a/pkgs/by-name/ja/jameica/package.nix b/pkgs/by-name/ja/jameica/package.nix
index b32d1573ac61..e41386949f13 100644
--- a/pkgs/by-name/ja/jameica/package.nix
+++ b/pkgs/by-name/ja/jameica/package.nix
@@ -11,7 +11,7 @@
   jre,
   gtk3,
   glib,
-  libXtst,
+  libxtst,
 }:
 
 let
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     gtk3
     glib
-    libXtst
+    libxtst
   ];
 
   dontWrapGApps = true;
diff --git a/pkgs/by-name/ja/japa/package.nix b/pkgs/by-name/ja/japa/package.nix
index 2bc752b7d51f..cf173725a08d 100644
--- a/pkgs/by-name/ja/japa/package.nix
+++ b/pkgs/by-name/ja/japa/package.nix
@@ -7,8 +7,8 @@
   fftwFloat,
   libclthreads,
   libclxclient,
-  libX11,
-  libXft,
+  libx11,
+  libxft,
   zita-alsa-pcmi,
 }:
 
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
     fftwFloat
     libclthreads
     libclxclient
-    libX11
-    libXft
+    libx11
+    libxft
     zita-alsa-pcmi
   ];
 
diff --git a/pkgs/by-name/ja/java-service-wrapper/package.nix b/pkgs/by-name/ja/java-service-wrapper/package.nix
index 964756fa5323..b86338695317 100644
--- a/pkgs/by-name/ja/java-service-wrapper/package.nix
+++ b/pkgs/by-name/ja/java-service-wrapper/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "java-service-wrapper";
-  version = "3.6.3";
+  version = "3.6.4";
 
   src = fetchurl {
     url = "https://wrapper.tanukisoftware.com/download/${finalAttrs.version}/wrapper_${finalAttrs.version}_src.tar.gz";
-    hash = "sha256-e8Wtie0ho5tKTtVI3+kvxYeu1A5sdQWacTCfuAQv9YA=";
+    hash = "sha256-+yLgXYnwpqErzV/Y1HQqtCy/ulMk42eoeBCmpn9ZWhI=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/je/jed/package.nix b/pkgs/by-name/je/jed/package.nix
index bb04f21a1131..91ee3fc4c605 100644
--- a/pkgs/by-name/je/jed/package.nix
+++ b/pkgs/by-name/je/jed/package.nix
@@ -4,9 +4,9 @@
   fetchzip,
   pkg-config,
   gpm,
-  libXext,
-  libXft,
-  libXt,
+  libxext,
+  libxft,
+  libxt,
   ncurses5,
   slang,
 }:
@@ -23,9 +23,9 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     gpm
-    libXext
-    libXft
-    libXt
+    libxext
+    libxft
+    libxt
     ncurses5
     slang
   ];
diff --git a/pkgs/by-name/ji/jitsi-meet-electron/package.nix b/pkgs/by-name/ji/jitsi-meet-electron/package.nix
index c34485efbfa0..dde44cd63630 100644
--- a/pkgs/by-name/ji/jitsi-meet-electron/package.nix
+++ b/pkgs/by-name/ji/jitsi-meet-electron/package.nix
@@ -7,9 +7,9 @@
   makeDesktopItem,
   makeWrapper,
   libpng,
-  libX11,
-  libXi,
-  libXtst,
+  libx11,
+  libxi,
+  libxtst,
   zlib,
   electron,
 }:
@@ -35,9 +35,9 @@ buildNpmPackage rec {
   # robotjs node-gyp dependencies
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     libpng
-    libX11
-    libXi
-    libXtst
+    libx11
+    libxi
+    libxtst
     zlib
   ];
 
diff --git a/pkgs/by-name/jo/josm/package.nix b/pkgs/by-name/jo/josm/package.nix
index aec05a600f8b..882672bbc36b 100644
--- a/pkgs/by-name/jo/josm/package.nix
+++ b/pkgs/by-name/jo/josm/package.nix
@@ -6,7 +6,7 @@
   makeWrapper,
   unzip,
   jre,
-  libXxf86vm,
+  libxxf86vm,
   extraJavaOpts ? "-Djosm.restart=true -Djava.net.useSystemProxies=true",
 }:
 let
@@ -57,7 +57,7 @@ stdenv.mkDerivation {
         # Add libXxf86vm to path because it is needed by at least Kendzi3D plugin
         makeWrapper ${jre}/bin/java $out/bin/josm \
           --add-flags "${baseJavaOpts} ${extraJavaOpts} -jar $out/share/josm/josm.jar" \
-          --prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib' \
+          --prefix LD_LIBRARY_PATH ":" '${libxxf86vm}/lib' \
           --prefix _JAVA_AWT_WM_NONREPARENTING : 1 \
           --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp"
       '';
diff --git a/pkgs/by-name/ju/juce/package.nix b/pkgs/by-name/ju/juce/package.nix
index f57300ec78f8..71c8986e3be7 100644
--- a/pkgs/by-name/ju/juce/package.nix
+++ b/pkgs/by-name/ju/juce/package.nix
@@ -21,11 +21,11 @@
   libsepol,
   libthai,
   libdatrie,
-  libXdmcp,
+  libxdmcp,
   lerc,
   libxkbcommon,
   libepoxy,
-  libXtst,
+  libxtst,
   sqlite,
   fontconfig,
   versionCheckHook,
@@ -74,9 +74,9 @@ stdenv.mkDerivation (finalAttrs: {
     util-linuxMinimal
     libselinux
     libsepol
-    libXdmcp
+    libxdmcp
     libxkbcommon
-    libXtst
+    libxtst
   ];
 
   propagatedBuildInputs = [ fontconfig ];
diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix
index efc1a874b18e..0bbbedbb38c4 100644
--- a/pkgs/by-name/ju/jujutsu/package.nix
+++ b/pkgs/by-name/ju/jujutsu/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "jujutsu";
-  version = "0.37.0";
+  version = "0.38.0";
 
   src = fetchFromGitHub {
     owner = "jj-vcs";
     repo = "jj";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KN8hukahS+/RowmQoaUrfxCKFT9YUhaIXzh84cBV1Ck=";
+    hash = "sha256-FXbQyKmh/CG/TsRi9yq9L8bVbQ39u6PRLZIet3d/bjA=";
   };
 
-  cargoHash = "sha256-rk3Qft9g67rG0m6rPd4d++wDM5RiRrJAIHdUOQhn9bg=";
+  cargoHash = "sha256-VvgGnAPCvcBmbP2Aw7tdJcjfo+011u4Pqx1pKiiWISA=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/ka/kafka-cmak/package.nix b/pkgs/by-name/ka/kafka-cmak/package.nix
index 04dd46debff8..073e9f5794ae 100644
--- a/pkgs/by-name/ka/kafka-cmak/package.nix
+++ b/pkgs/by-name/ka/kafka-cmak/package.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
-  name = "CMAK";
+  pname = "kafka-cmak";
   version = "3.0.0.6";
 
   src = fetchzip {
diff --git a/pkgs/by-name/ka/kando/package.nix b/pkgs/by-name/ka/kando/package.nix
index 285f5bbd9e11..333d90f3fa09 100644
--- a/pkgs/by-name/ka/kando/package.nix
+++ b/pkgs/by-name/ka/kando/package.nix
@@ -15,9 +15,9 @@
   makeDesktopItem,
 
   libxkbcommon,
-  libX11,
-  libXtst,
-  libXi,
+  libx11,
+  libxtst,
+  libxi,
   wayland,
 }:
 
@@ -53,9 +53,9 @@ buildNpmPackage.override { inherit nodejs; } rec {
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     libxkbcommon
-    libX11
-    libXtst
-    libXi
+    libx11
+    libxtst
+    libxi
     wayland
   ];
 
diff --git a/pkgs/by-name/ka/katawa-shoujo/package.nix b/pkgs/by-name/ka/katawa-shoujo/package.nix
index 289896146572..f89a73117923 100644
--- a/pkgs/by-name/ka/katawa-shoujo/package.nix
+++ b/pkgs/by-name/ka/katawa-shoujo/package.nix
@@ -15,10 +15,10 @@
   devendorImageLibs ? !stdenvNoCC.hostPlatform.isDarwin,
   libjpeg,
   libpng12,
-  libX11,
-  libXext,
-  libXi,
-  libXmu,
+  libx11,
+  libxext,
+  libxi,
+  libxmu,
   runtimeShell,
   SDL_compat,
   SDL_image,
@@ -80,10 +80,10 @@ stdenv.mkDerivation rec {
     libpng12
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
-    libXext
-    libXi
-    libXmu
+    libx11
+    libxext
+    libxi
+    libxmu
     libGL
     libGLU
   ];
diff --git a/pkgs/by-name/ka/katriawm/package.nix b/pkgs/by-name/ka/katriawm/package.nix
index 280a856daa0e..f11363f8db67 100644
--- a/pkgs/by-name/ka/katriawm/package.nix
+++ b/pkgs/by-name/ka/katriawm/package.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   fetchzip,
-  libX11,
-  libXft,
-  libXrandr,
+  libx11,
+  libxft,
+  libxrandr,
   pkg-config,
   gitUpdater,
 }:
@@ -21,9 +21,9 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    libX11
-    libXft
-    libXrandr
+    libx11
+    libxft
+    libxrandr
   ];
 
   outputs = [
@@ -56,6 +56,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     mainProgram = "katriawm";
     maintainers = [ ];
-    inherit (libX11.meta) platforms;
+    inherit (libx11.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/kd/kdocker/package.nix b/pkgs/by-name/kd/kdocker/package.nix
index 7882e270c90b..502f3cc50adb 100644
--- a/pkgs/by-name/kd/kdocker/package.nix
+++ b/pkgs/by-name/kd/kdocker/package.nix
@@ -3,7 +3,7 @@
   lib,
   fetchFromGitHub,
   cmake,
-  libX11,
+  libx11,
   libxcb,
   perl, # For pod2man
   qt6,
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     libxcb
     qt6.qtbase
   ];
diff --git a/pkgs/by-name/ke/keepassxc/package.nix b/pkgs/by-name/ke/keepassxc/package.nix
index 7e839cfc5d01..3f6e3e6e7d1a 100644
--- a/pkgs/by-name/ke/keepassxc/package.nix
+++ b/pkgs/by-name/ke/keepassxc/package.nix
@@ -10,8 +10,8 @@
   botan3,
   curl,
   darwinMinVersionHook,
-  libXi,
-  libXtst,
+  libxi,
+  libxtst,
   libargon2,
   libusb1,
   minizip,
@@ -140,8 +140,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     botan3
     curl
-    libXi
-    libXtst
+    libxi
+    libxtst
     libargon2
     libsForQt5.qtbase
     libsForQt5.qtsvg
diff --git a/pkgs/by-name/ke/keeweb/package.nix b/pkgs/by-name/ke/keeweb/package.nix
index 5cea9880f834..50229cc3c924 100644
--- a/pkgs/by-name/ke/keeweb/package.nix
+++ b/pkgs/by-name/ke/keeweb/package.nix
@@ -19,12 +19,12 @@
   libsecret,
   libappindicator,
   xdotool,
-  libX11,
-  libXcomposite,
-  libXext,
-  libXrandr,
-  libXScrnSaver,
-  libXtst,
+  libx11,
+  libxcomposite,
+  libxext,
+  libxrandr,
+  libxscrnsaver,
+  libxtst,
   libxshmfence,
 }:
 let
@@ -55,12 +55,12 @@ let
     libGL
     nss
     udev
-    libX11
-    libXcomposite
-    libXext
-    libXrandr
-    libXScrnSaver
-    libXtst
+    libx11
+    libxcomposite
+    libxext
+    libxrandr
+    libxscrnsaver
+    libxtst
     libxshmfence
     gnome-keyring
     libgbm
diff --git a/pkgs/by-name/ke/keybinder3/package.nix b/pkgs/by-name/ke/keybinder3/package.nix
index 085e678931cf..e115f8c57398 100644
--- a/pkgs/by-name/ke/keybinder3/package.nix
+++ b/pkgs/by-name/ke/keybinder3/package.nix
@@ -11,9 +11,9 @@
   gtk3,
   gtk3-x11,
   gtk3' ? (if stdenv.hostPlatform.isDarwin then gtk3-x11 else gtk3),
-  libX11,
-  libXext,
-  libXrender,
+  libx11,
+  libxext,
+  libxrender,
   gobject-introspection,
 }:
 
@@ -40,9 +40,9 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     gtk3'
-    libX11
-    libXext
-    libXrender
+    libx11
+    libxext
+    libxrender
   ];
 
   preConfigure = ''
diff --git a/pkgs/by-name/ke/keyguard/package.nix b/pkgs/by-name/ke/keyguard/package.nix
index affd683a2b1a..763d6c23fb2e 100644
--- a/pkgs/by-name/ke/keyguard/package.nix
+++ b/pkgs/by-name/ke/keyguard/package.nix
@@ -5,8 +5,8 @@
   gradle_9,
   jdk21,
   fontconfig,
-  libXinerama,
-  libXrandr,
+  libxinerama,
+  libxrandr,
   file,
   gtk3,
   glib,
@@ -63,8 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     fontconfig
-    libXinerama
-    libXrandr
+    libxinerama
+    libxrandr
     file
     gtk3
     glib
diff --git a/pkgs/by-name/ke/keyleds/package.nix b/pkgs/by-name/ke/keyleds/package.nix
index f29637f71734..f330f549b258 100644
--- a/pkgs/by-name/ke/keyleds/package.nix
+++ b/pkgs/by-name/ke/keyleds/package.nix
@@ -6,8 +6,8 @@
   cmake,
   pkg-config,
   libuv,
-  libX11,
-  libXi,
+  libx11,
+  libxi,
   libyaml,
   luajit,
   udev,
@@ -44,8 +44,8 @@ stdenv.mkDerivation {
 
   buildInputs = [
     libuv
-    libX11
-    libXi
+    libx11
+    libxi
     libyaml
     luajit
     udev
diff --git a/pkgs/by-name/ke/keym/package.nix b/pkgs/by-name/ke/keym/package.nix
index c6cb1835755d..4e9c12b4b39f 100644
--- a/pkgs/by-name/ke/keym/package.nix
+++ b/pkgs/by-name/ke/keym/package.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXtst,
-  libXi,
+  libx11,
+  libxtst,
+  libxi,
 }:
 
 stdenv.mkDerivation {
@@ -19,9 +19,9 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    libX11
-    libXtst
-    libXi
+    libx11
+    libxtst
+    libxi
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/ke/keymapper/package.nix b/pkgs/by-name/ke/keymapper/package.nix
index 6db4e03ef204..3038e31e864b 100644
--- a/pkgs/by-name/ke/keymapper/package.nix
+++ b/pkgs/by-name/ke/keymapper/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   dbus,
-  libX11,
+  libx11,
   libusb1,
   pkg-config,
   udev,
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
     dbus
     wayland
     wayland-scanner
-    libX11
+    libx11
     udev
     libusb1
     libxkbcommon
diff --git a/pkgs/by-name/ke/keynav/package.nix b/pkgs/by-name/ke/keynav/package.nix
index 200419bd2b18..568698e78b43 100644
--- a/pkgs/by-name/ke/keynav/package.nix
+++ b/pkgs/by-name/ke/keynav/package.nix
@@ -3,13 +3,13 @@
   stdenv,
   fetchFromGitHub,
   pkg-config,
-  libX11,
+  libx11,
   xorgproto,
-  libXtst,
-  libXi,
-  libXext,
-  libXinerama,
-  libXrandr,
+  libxtst,
+  libxi,
+  libxext,
+  libxinerama,
+  libxrandr,
   glib,
   cairo,
   xdotool,
@@ -31,13 +31,13 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    libX11
+    libx11
     xorgproto
-    libXtst
-    libXi
-    libXext
-    libXinerama
-    libXrandr
+    libxtst
+    libxi
+    libxext
+    libxinerama
+    libxrandr
     glib
     cairo
     xdotool
diff --git a/pkgs/by-name/ke/keyspersecond/package.nix b/pkgs/by-name/ke/keyspersecond/package.nix
index 940760e086aa..4651eea230af 100644
--- a/pkgs/by-name/ke/keyspersecond/package.nix
+++ b/pkgs/by-name/ke/keyspersecond/package.nix
@@ -8,12 +8,12 @@
   makeWrapper,
   jre,
   libGL,
-  libX11,
-  libXtst,
+  libx11,
+  libxtst,
   libxkbcommon,
   libxcb,
-  libXt,
-  libXinerama,
+  libxt,
+  libxinerama,
 }:
 
 let
@@ -23,12 +23,12 @@ let
     # used by the Java2D OpenGL backend
     libGL
     # jnativehook dependencies
-    libX11
-    libXtst
+    libx11
+    libxtst
     libxkbcommon
     libxcb
-    libXt
-    libXinerama
+    libxt
+    libxinerama
   ];
 in
 stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/by-name/ki/kicad/base.nix b/pkgs/by-name/ki/kicad/base.nix
index 3dcee6002355..ebc51c125c9c 100644
--- a/pkgs/by-name/ki/kicad/base.nix
+++ b/pkgs/by-name/ki/kicad/base.nix
@@ -7,7 +7,7 @@
   zlib,
   wxGTK,
   gtk3,
-  libX11,
+  libx11,
   gettext,
   glew,
   glm,
@@ -19,7 +19,7 @@
   doxygen,
   graphviz,
   libpthread-stubs,
-  libXdmcp,
+  libxdmcp,
   unixODBC,
   libgit2,
   libsecret,
@@ -37,7 +37,7 @@
   libepoxy,
   dbus,
   at-spi2-core,
-  libXtst,
+  libxtst,
   pcre2,
   libdeflate,
 
@@ -149,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: {
     libepoxy
     dbus
     at-spi2-core
-    libXtst
+    libxtst
     pcre2
   ];
 
@@ -157,10 +157,10 @@ stdenv.mkDerivation (finalAttrs: {
     libGLU
     libGL
     zlib
-    libX11
+    libx11
     wxGTK
     gtk3
-    libXdmcp
+    libxdmcp
     gettext
     glew
     glm
diff --git a/pkgs/by-name/ki/kismet/package.nix b/pkgs/by-name/ki/kismet/package.nix
index 43677310ba31..4f992ffb2e60 100644
--- a/pkgs/by-name/ki/kismet/package.nix
+++ b/pkgs/by-name/ki/kismet/package.nix
@@ -32,14 +32,14 @@
   zlib,
 }:
 
-stdenv.mkDerivation (finalPackage: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "kismet";
   version = "2025-09-R1";
 
   src = fetchFromGitHub {
     owner = "kismetwireless";
     repo = "kismet";
-    tag = "kismet-${finalPackage.version}";
+    tag = "kismet-${finalAttrs.version}";
     hash = "sha256-bwgeBIa5P1he0azWBu1YTXS9EGlHdJK8hS6A5Rj9XU4=";
   };
 
diff --git a/pkgs/by-name/ki/kisslicer/package.nix b/pkgs/by-name/ki/kisslicer/package.nix
index 23cf751efb42..23c714442b44 100644
--- a/pkgs/by-name/ki/kisslicer/package.nix
+++ b/pkgs/by-name/ki/kisslicer/package.nix
@@ -1,6 +1,6 @@
 {
   fetchzip,
-  libX11,
+  libx11,
   libGLU,
   libGL,
   makeWrapper,
@@ -14,7 +14,7 @@ let
     libGLU
     libGL
     stdenv.cc.cc
-    libX11
+    libx11
   ];
 
   inidir = "\\\${XDG_CONFIG_HOME:-\\$HOME/.config}/kisslicer";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libGLU
     libGL
-    libX11
+    libx11
   ];
 
   installPhase = ''
diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix
index d5d1425396a8..9cd9d0ed1757 100644
--- a/pkgs/by-name/ki/kitty/package.nix
+++ b/pkgs/by-name/ki/kitty/package.nix
@@ -11,13 +11,13 @@
   imagemagick,
   libstartup_notification,
   libGL,
-  libX11,
-  libXrandr,
-  libXinerama,
-  libXcursor,
+  libx11,
+  libxrandr,
+  libxinerama,
+  libxcursor,
   libxkbcommon,
-  libXi,
-  libXext,
+  libxi,
+  libxext,
   wayland-protocols,
   wayland,
   xxHash,
@@ -87,13 +87,13 @@ buildPythonApplication rec {
     fontconfig
     libunistring
     libcanberra
-    libX11
-    libXrandr
-    libXinerama
-    libXcursor
+    libx11
+    libxrandr
+    libxinerama
+    libxcursor
     libxkbcommon
-    libXi
-    libXext
+    libxi
+    libxext
     wayland-protocols
     wayland
     dbus
diff --git a/pkgs/by-name/kl/klassy/package.nix b/pkgs/by-name/kl/klassy/package.nix
index 2cff91c1a4d5..9dd723c02331 100644
--- a/pkgs/by-name/kl/klassy/package.nix
+++ b/pkgs/by-name/kl/klassy/package.nix
@@ -9,13 +9,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "klassy";
-  version = "6.4.breeze6.4.0";
+  version = "6.5";
 
   src = fetchFromGitHub {
     owner = "paulmcauley";
     repo = "klassy";
-    tag = finalAttrs.version;
-    hash = "sha256-+bYS2Upr84BS0IdA0HlCK0FF05yIMVbRvB8jlN5EOUM=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-zf+RO+GolA9Gnf1/izIG7jCSu8Qlo0d0kRc90llMRIc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/km/kmscon/package.nix b/pkgs/by-name/km/kmscon/package.nix
index d5cf8dd13ee0..61a5d5e7ae97 100644
--- a/pkgs/by-name/km/kmscon/package.nix
+++ b/pkgs/by-name/km/kmscon/package.nix
@@ -19,6 +19,7 @@
   bash,
   buildPackages,
   nix-update-script,
+  nixosTests,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "kmscon";
@@ -63,7 +64,10 @@ stdenv.mkDerivation (finalAttrs: {
     ./sandbox.patch # Generate system units where they should be (nix store) instead of /etc/systemd/system
   ];
 
-  passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
+  passthru = {
+    tests.kmscon = nixosTests.kmscon;
+    updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
+  };
 
   meta = {
     description = "KMS/DRM based System Console";
diff --git a/pkgs/by-name/km/kmscube/package.nix b/pkgs/by-name/km/kmscube/package.nix
index 4448040458c2..30cdae1ff66c 100644
--- a/pkgs/by-name/km/kmscube/package.nix
+++ b/pkgs/by-name/km/kmscube/package.nix
@@ -5,7 +5,7 @@
   meson,
   ninja,
   libdrm,
-  libX11,
+  libx11,
   libGL,
   libgbm,
   pkg-config,
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
   ];
   buildInputs = [
     libdrm
-    libX11
+    libx11
     libGL
     libgbm
   ]
diff --git a/pkgs/by-name/ko/kodelife/package.nix b/pkgs/by-name/ko/kodelife/package.nix
index 28f583e53c1b..aea9552ba359 100644
--- a/pkgs/by-name/ko/kodelife/package.nix
+++ b/pkgs/by-name/ko/kodelife/package.nix
@@ -10,14 +10,14 @@
   avahi,
   gst_all_1,
   libxcb,
-  libX11,
-  libXcursor,
-  libXext,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXrender,
-  libXxf86vm,
+  libx11,
+  libxcursor,
+  libxext,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxrender,
+  libxxf86vm,
   libglvnd,
   zenity,
 }:
@@ -27,14 +27,14 @@ let
     curl
     avahi
     libxcb
-    libX11
-    libXcursor
-    libXext
-    libXi
-    libXinerama
-    libXrandr
-    libXrender
-    libXxf86vm
+    libx11
+    libxcursor
+    libxext
+    libxi
+    libxinerama
+    libxrandr
+    libxrender
+    libxxf86vm
     libglvnd
   ];
 
diff --git a/pkgs/by-name/ko/kool/package.nix b/pkgs/by-name/ko/kool/package.nix
index a0d8ceefeb91..39ba2a3fe4f0 100644
--- a/pkgs/by-name/ko/kool/package.nix
+++ b/pkgs/by-name/ko/kool/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "kool";
-  version = "3.5.3";
+  version = "3.6.0";
 
   src = fetchFromGitHub {
     owner = "kool-dev";
     repo = "kool";
     rev = version;
-    hash = "sha256-pZ667bDyRWIrImBNHyhkOGl/22gjHKX6KsVSTckS1U4=";
+    hash = "sha256-81UhlEAk8ZNC/G6tV2g8+VZVVrLJVV6Dji2pjmWIYb8=";
   };
 
   vendorHash = "sha256-IqUkIf0uk4iUTedTO5xRzjmJwHS+p6apo4E0WEEU6cc=";
diff --git a/pkgs/by-name/ko/koules/package.nix b/pkgs/by-name/ko/koules/package.nix
index 8ab67925116b..f289b63cbe45 100644
--- a/pkgs/by-name/ko/koules/package.nix
+++ b/pkgs/by-name/ko/koules/package.nix
@@ -7,8 +7,8 @@
   gccmakedep,
   imake,
   installShellFiles,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   makeDesktopItem,
 }:
 
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
     copyDesktopItems
   ];
   buildInputs = [
-    libX11
-    libXext
+    libx11
+    libxext
   ];
 
   # Debian maintains lots of patches for koules. Let's include all of them.
diff --git a/pkgs/by-name/kr/kryoptic/package.nix b/pkgs/by-name/kr/kryoptic/package.nix
index c3d23ad99f7e..c48f562a4a55 100644
--- a/pkgs/by-name/kr/kryoptic/package.nix
+++ b/pkgs/by-name/kr/kryoptic/package.nix
@@ -13,14 +13,14 @@
   withPostQuantum ? true,
 }:
 
-rustPlatform.buildRustPackage (finalPackage: {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "kryoptic";
   version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "latchset";
     repo = "kryoptic";
-    tag = "v${finalPackage.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-tP2BZkGCZqfLNLZ/mYAVkICWKTM1EbL7lbw+Mnx4VTk=";
   };
 
diff --git a/pkgs/by-name/ks/ksuperkey/package.nix b/pkgs/by-name/ks/ksuperkey/package.nix
index f5355613147b..528385678b4f 100644
--- a/pkgs/by-name/ks/ksuperkey/package.nix
+++ b/pkgs/by-name/ks/ksuperkey/package.nix
@@ -2,11 +2,11 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXtst,
+  libx11,
+  libxtst,
   pkg-config,
   xorgproto,
-  libXi,
+  libxi,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -24,10 +24,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    libX11
-    libXtst
+    libx11
+    libxtst
     xorgproto
-    libXi
+    libxi
   ];
 
   meta = {
diff --git a/pkgs/by-name/ku/kubectl-cnpg/package.nix b/pkgs/by-name/ku/kubectl-cnpg/package.nix
index 4382a9bbc792..811fae0ec5be 100644
--- a/pkgs/by-name/ku/kubectl-cnpg/package.nix
+++ b/pkgs/by-name/ku/kubectl-cnpg/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "kubectl-cnpg";
-  version = "1.28.0";
+  version = "1.28.1";
 
   src = fetchFromGitHub {
     owner = "cloudnative-pg";
     repo = "cloudnative-pg";
     rev = "v${version}";
-    hash = "sha256-uIIy4zSf6ply859aHVvlujqBWpN18FLZh+Vye3fbSoY=";
+    hash = "sha256-9NfjrVF0OtDLaGD5PPFSZcI8V3Vy/yOTm/JwnE3kMZE=";
   };
 
-  vendorHash = "sha256-Hl7cYZbs+rDS2+1ojgCUhLfBVGQ+ZhAApRczkUYOwVY=";
+  vendorHash = "sha256-QNtKtHTxOgm6EbOSvA2iUE0hjltwTBNkA1mIC3N+AbM=";
 
   subPackages = [ "cmd/kubectl-cnpg" ];
 
diff --git a/pkgs/by-name/ku/kubectl-gadget/package.nix b/pkgs/by-name/ku/kubectl-gadget/package.nix
index 1a21bfa44748..e5711ccce6a8 100644
--- a/pkgs/by-name/ku/kubectl-gadget/package.nix
+++ b/pkgs/by-name/ku/kubectl-gadget/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "kubectl-gadget";
-  version = "0.48.1";
+  version = "0.49.0";
 
   src = fetchFromGitHub {
     owner = "inspektor-gadget";
     repo = "inspektor-gadget";
     tag = "v${version}";
-    hash = "sha256-brYWsPd8RDBiFoXhbnNf8R0cgnHws1Wh5bc8y0s2U3k=";
+    hash = "sha256-BXkBxfe9/UgqllaF2canR/mkSPeLUERhF33KIilXQHw=";
   };
 
-  vendorHash = "sha256-FLWpvCHeZUnlGZM1lxNoArqfSP2iQuYnhBRtD2ymclI=";
+  vendorHash = "sha256-IIRSEqE+cXpQGt3Z9U7fhSuspj5y2l4aRdjY5HnQCbU=";
 
   env.CGO_ENABLED = 0;
 
diff --git a/pkgs/by-name/ku/kubefirst/package.nix b/pkgs/by-name/ku/kubefirst/package.nix
index cd5c1958eb7d..1df53e05977f 100644
--- a/pkgs/by-name/ku/kubefirst/package.nix
+++ b/pkgs/by-name/ku/kubefirst/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "kubefirst";
-  version = "2.10.4";
+  version = "2.10.5";
 
   src = fetchFromGitHub {
     owner = "konstructio";
     repo = "kubefirst";
     tag = "v${version}";
-    hash = "sha256-9uecbFdixMRAqFJyyDFwtGBylYXSxiqs+Suj/W2gEHA=";
+    hash = "sha256-2rxvUbf94cG/56ri3GXKpHSoqSXg2cfu5wpm4UUjpVE=";
   };
 
-  vendorHash = "sha256-1u34cuPUY/5fYd073UhRUu/5/1nhPadTI06+3o+uE7w=";
+  vendorHash = "sha256-/su9f8JVXaJrC7/rcX1LK/amolVmkRAtPF1bqzxcKh8=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/la/lagrange/package.nix b/pkgs/by-name/la/lagrange/package.nix
index 411bbf927419..6e56d69abb23 100644
--- a/pkgs/by-name/la/lagrange/package.nix
+++ b/pkgs/by-name/la/lagrange/package.nix
@@ -9,7 +9,7 @@
   harfbuzz,
   libogg,
   libwebp,
-  libX11,
+  libx11,
   mpg123,
   opusfile,
   SDL2,
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     harfbuzz
     libogg
     libwebp
-    libX11
+    libx11
     mpg123
     opusfile
     SDL2
diff --git a/pkgs/by-name/la/lan-mouse/package.nix b/pkgs/by-name/la/lan-mouse/package.nix
index cbc18165f481..97acca9f355b 100644
--- a/pkgs/by-name/la/lan-mouse/package.nix
+++ b/pkgs/by-name/la/lan-mouse/package.nix
@@ -6,8 +6,8 @@
   glib,
   gtk4,
   libadwaita,
-  libX11,
-  libXtst,
+  libx11,
+  libxtst,
   pkg-config,
   wrapGAppsHook4,
 }:
@@ -43,8 +43,8 @@ rustPlatform.buildRustPackage rec {
     glib
     gtk4
     libadwaita
-    libX11
-    libXtst
+    libx11
+    libxtst
   ];
 
   cargoHash = "sha256-+UXRBYfbkb114mwDGj36oG5ZT3TQtcEzsbyZvtWTMxM=";
diff --git a/pkgs/by-name/la/larswm/package.nix b/pkgs/by-name/la/larswm/package.nix
index dd931bcd187b..73948297e8f5 100644
--- a/pkgs/by-name/la/larswm/package.nix
+++ b/pkgs/by-name/la/larswm/package.nix
@@ -4,9 +4,9 @@
   fetchurl,
   imake,
   gccmakedep,
-  libX11,
-  libXext,
-  libXmu,
+  libx11,
+  libxext,
+  libxmu,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -23,9 +23,9 @@ stdenv.mkDerivation (finalAttrs: {
     gccmakedep
   ];
   buildInputs = [
-    libX11
-    libXext
-    libXmu
+    libx11
+    libxext
+    libxmu
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/lc/lcdproc/package.nix b/pkgs/by-name/lc/lcdproc/package.nix
index 05b27dca1f42..306126129217 100644
--- a/pkgs/by-name/lc/lcdproc/package.nix
+++ b/pkgs/by-name/lc/lcdproc/package.nix
@@ -8,7 +8,7 @@
   pkg-config,
   doxygen,
   freetype,
-  libX11,
+  libx11,
   libftdi,
   libusb-compat-0_1,
   libusb1,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     freetype
-    libX11
+    libx11
     libftdi
     libusb-compat-0_1
     libusb1
diff --git a/pkgs/by-name/le/leftwm/package.nix b/pkgs/by-name/le/leftwm/package.nix
index bd1a16e573d5..92e9fb6bd7c7 100644
--- a/pkgs/by-name/le/leftwm/package.nix
+++ b/pkgs/by-name/le/leftwm/package.nix
@@ -2,14 +2,14 @@
   lib,
   fetchFromGitHub,
   rustPlatform,
-  libX11,
-  libXinerama,
+  libx11,
+  libxinerama,
 }:
 
 let
   rpathLibs = [
-    libXinerama
-    libX11
+    libxinerama
+    libx11
   ];
 in
 
diff --git a/pkgs/by-name/le/lesbar/package.nix b/pkgs/by-name/le/lesbar/package.nix
index 9fe4547fcc35..89ea84e41098 100644
--- a/pkgs/by-name/le/lesbar/package.nix
+++ b/pkgs/by-name/le/lesbar/package.nix
@@ -4,7 +4,7 @@
   fetchFromSourcehut,
   pkg-config,
   scdoc,
-  libX11,
+  libx11,
   cairo,
   pango,
 }:
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     cairo
     pango
   ];
diff --git a/pkgs/by-name/li/libagar/package.nix b/pkgs/by-name/li/libagar/package.nix
index 990d06a0e75d..8d5fb0023923 100644
--- a/pkgs/by-name/li/libagar/package.nix
+++ b/pkgs/by-name/li/libagar/package.nix
@@ -10,7 +10,7 @@
   mandoc,
   libpng,
   libjpeg,
-  libXinerama,
+  libxinerama,
   freetype,
   SDL,
   libGL,
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     bsdbuild
     perl
-    libXinerama
+    libxinerama
     SDL
     libGL
     libmysqlclient
diff --git a/pkgs/by-name/li/libaosd/package.nix b/pkgs/by-name/li/libaosd/package.nix
index 658c9d287dee..30b7fa1fcdef 100644
--- a/pkgs/by-name/li/libaosd/package.nix
+++ b/pkgs/by-name/li/libaosd/package.nix
@@ -5,8 +5,8 @@
   pkg-config,
   cairo,
   pango,
-  libX11,
-  libXcomposite,
+  libx11,
+  libxcomposite,
   autoconf,
   automake,
 }:
@@ -30,8 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     cairo
     pango
-    libX11
-    libXcomposite
+    libx11
+    libxcomposite
   ];
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/li/libapplewm/package.nix b/pkgs/by-name/li/libapplewm/package.nix
index 82b2ec2a2a6f..0150a23b88f9 100644
--- a/pkgs/by-name/li/libapplewm/package.nix
+++ b/pkgs/by-name/li/libapplewm/package.nix
@@ -6,8 +6,8 @@
   autoreconfHook,
   util-macros,
   xorgproto,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   testers,
 }:
 stdenv.mkDerivation (finalAttrs: {
@@ -32,8 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     xorgproto
-    libX11
-    libXext
+    libx11
+    libxext
   ];
 
   passthru = {
diff --git a/pkgs/by-name/li/libarchive/package.nix b/pkgs/by-name/li/libarchive/package.nix
index b622460ec1b8..363a8ac3ab3c 100644
--- a/pkgs/by-name/li/libarchive/package.nix
+++ b/pkgs/by-name/li/libarchive/package.nix
@@ -143,6 +143,7 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.all;
     inherit (acl.meta) badPlatforms;
     pkgConfigModules = [ "libarchive" ];
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "libarchive" finalAttrs.version;
   };
 
   passthru.tests = {
diff --git a/pkgs/by-name/li/libcap/package.nix b/pkgs/by-name/li/libcap/package.nix
index b56fe54f295c..c9c5813a16c1 100644
--- a/pkgs/by-name/li/libcap/package.nix
+++ b/pkgs/by-name/li/libcap/package.nix
@@ -143,5 +143,6 @@ stdenv.mkDerivation rec {
       "libcap"
       "libpsx"
     ];
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "libcap_project" version;
   };
 }
diff --git a/pkgs/by-name/li/libclipboard/package.nix b/pkgs/by-name/li/libclipboard/package.nix
index b58a54f0e8e0..19ea043d8432 100644
--- a/pkgs/by-name/li/libclipboard/package.nix
+++ b/pkgs/by-name/li/libclipboard/package.nix
@@ -4,8 +4,8 @@
   cmake,
   pkg-config,
   libxcb,
-  libXau,
-  libXdmcp,
+  libxau,
+  libxdmcp,
   lib,
 }:
 
@@ -27,8 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libxcb
-    libXau
-    libXdmcp
+    libxau
+    libxdmcp
   ];
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/li/libclxclient/package.nix b/pkgs/by-name/li/libclxclient/package.nix
index 8c904f4cf5c9..93963da5de64 100644
--- a/pkgs/by-name/li/libclxclient/package.nix
+++ b/pkgs/by-name/li/libclxclient/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchurl,
   libclthreads,
-  libX11,
-  libXft,
+  libx11,
+  libxft,
   xorgproto,
   pkg-config,
 }:
@@ -20,14 +20,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libclthreads
-    libX11
-    libXft
+    libx11
+    libxft
     xorgproto
   ];
 
   nativeBuildInputs = [ pkg-config ];
 
-  env.NIX_CFLAGS_COMPILE = "-I${xorgproto}/include -I${libXft.dev}/include";
+  env.NIX_CFLAGS_COMPILE = "-I${xorgproto}/include -I${libxft.dev}/include";
 
   patchPhase = ''
     cd source
diff --git a/pkgs/by-name/li/libdatachannel/package.nix b/pkgs/by-name/li/libdatachannel/package.nix
index 734852b1b749..f0f60aac75b3 100644
--- a/pkgs/by-name/li/libdatachannel/package.nix
+++ b/pkgs/by-name/li/libdatachannel/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libdatachannel";
-  version = "0.23.2";
+  version = "0.24.1";
 
   src = fetchFromGitHub {
     owner = "paullouisageneau";
     repo = "libdatachannel";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-76rlnO0wr7xQAGCc0GmpHQldzHKnZ8NZWpHmrE70h/c=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-rYksY3AJb5LFSGg/yr+cNFYQIRChPocDXeA8xaMCtzQ=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/li/libepoxy/package.nix b/pkgs/by-name/li/libepoxy/package.nix
index c10f2392279d..5d3c8acf681a 100644
--- a/pkgs/by-name/li/libepoxy/package.nix
+++ b/pkgs/by-name/li/libepoxy/package.nix
@@ -8,7 +8,7 @@
   util-macros,
   python3,
   libGL,
-  libX11,
+  libx11,
   x11Support ? !stdenv.hostPlatform.isDarwin,
   testers,
 }:
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
       libGL
     ]
     ++ lib.optionals x11Support [
-      libX11
+      libx11
     ];
 
   mesonFlags = [
diff --git a/pkgs/by-name/li/libfakeXinerama/package.nix b/pkgs/by-name/li/libfakeXinerama/package.nix
index 51f16727c4ec..2b74488e75c6 100644
--- a/pkgs/by-name/li/libfakeXinerama/package.nix
+++ b/pkgs/by-name/li/libfakeXinerama/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXinerama,
+  libx11,
+  libxinerama,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -16,8 +16,8 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
-    libXinerama
+    libx11
+    libxinerama
   ];
 
   buildPhase = ''
diff --git a/pkgs/by-name/li/libfakekey/package.nix b/pkgs/by-name/li/libfakekey/package.nix
index fc7e30f5c145..0f4d564ce059 100644
--- a/pkgs/by-name/li/libfakekey/package.nix
+++ b/pkgs/by-name/li/libfakekey/package.nix
@@ -5,9 +5,9 @@
   automake,
   autoconf,
   libtool,
-  libX11,
-  libXi,
-  libXtst,
+  libx11,
+  libxi,
+  libxtst,
   pkg-config,
   xorgproto,
 }:
@@ -32,9 +32,9 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXi
-    libXtst
+    libx11
+    libxi
+    libxtst
     xorgproto
   ];
 
diff --git a/pkgs/by-name/li/libfm/package.nix b/pkgs/by-name/li/libfm/package.nix
index 6b2eacdc2b2c..d2adc4e3ccaa 100644
--- a/pkgs/by-name/li/libfm/package.nix
+++ b/pkgs/by-name/li/libfm/package.nix
@@ -23,13 +23,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = if extraOnly then "libfm-extra" else "libfm";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = "libfm";
     tag = finalAttrs.version;
-    hash = "sha256-dmu5ygPuZe2YWAzIVPx5zskQeB51hXcLbMczxWgCr78=";
+    hash = "sha256-HOx3L5IYPD/3Ez5Sb3nshfisIt1cIZJmdfGE6+q5gWE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libfyaml/package.nix b/pkgs/by-name/li/libfyaml/package.nix
index 98fe0d0af9da..cae530843a22 100644
--- a/pkgs/by-name/li/libfyaml/package.nix
+++ b/pkgs/by-name/li/libfyaml/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libfyaml";
-  version = "0.9.3";
+  version = "0.9.4";
 
   src = fetchFromGitHub {
     owner = "pantoniou";
     repo = "libfyaml";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-bq8ikZMI92Cn0TMGmQwyZpKt+8D4E8FrbrwAD7dK6Ws=";
+    hash = "sha256-DgXNnmFGZ6a7ELK1SsxPkc5mcVO9w/4uMkhjnqj3CUI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libgcrypt/package.nix b/pkgs/by-name/li/libgcrypt/package.nix
index 929628238989..9317da7494fd 100644
--- a/pkgs/by-name/li/libgcrypt/package.nix
+++ b/pkgs/by-name/li/libgcrypt/package.nix
@@ -125,5 +125,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.lgpl2Plus;
     platforms = lib.platforms.all;
     maintainers = [ ];
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "gnupg" version;
   };
 }
diff --git a/pkgs/by-name/li/libgdiplus/package.nix b/pkgs/by-name/li/libgdiplus/package.nix
index f8b64f9af93a..48f55c136e3c 100644
--- a/pkgs/by-name/li/libgdiplus/package.nix
+++ b/pkgs/by-name/li/libgdiplus/package.nix
@@ -10,7 +10,7 @@
   giflib,
   libjpeg,
   libpng,
-  libXrender,
+  libxrender,
   libexif,
   autoreconfHook,
 }:
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     giflib
     libjpeg
     libpng
-    libXrender
+    libxrender
     libexif
   ];
 
diff --git a/pkgs/by-name/li/libglvnd/package.nix b/pkgs/by-name/li/libglvnd/package.nix
index 4da13406f394..dafa348a8c2c 100644
--- a/pkgs/by-name/li/libglvnd/package.nix
+++ b/pkgs/by-name/li/libglvnd/package.nix
@@ -7,8 +7,8 @@
   pkg-config,
   python3,
   addDriverRunpath,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   xorgproto,
 }:
 
@@ -41,8 +41,8 @@ stdenv.mkDerivation rec {
     addDriverRunpath
   ];
   buildInputs = [
-    libX11
-    libXext
+    libx11
+    libxext
     xorgproto
   ];
 
diff --git a/pkgs/by-name/li/libmatchbox/package.nix b/pkgs/by-name/li/libmatchbox/package.nix
index 9eedb7d2d29d..11dbcb0a86fb 100644
--- a/pkgs/by-name/li/libmatchbox/package.nix
+++ b/pkgs/by-name/li/libmatchbox/package.nix
@@ -6,9 +6,9 @@
   libice,
   libjpeg,
   libpng,
-  libX11,
-  libXext,
-  libXft,
+  libx11,
+  libxext,
+  libxft,
   pango,
   pkg-config,
 }:
@@ -25,9 +25,9 @@ stdenv.mkDerivation (finalAttrs: {
     libice
     libjpeg
     libpng
-    libX11
-    libXext
-    libXft
+    libx11
+    libxext
+    libxft
     pango
   ];
 
diff --git a/pkgs/by-name/li/libmediainfo/package.nix b/pkgs/by-name/li/libmediainfo/package.nix
index 41d2852f60b7..7dd51e377221 100644
--- a/pkgs/by-name/li/libmediainfo/package.nix
+++ b/pkgs/by-name/li/libmediainfo/package.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libmediainfo";
-  version = "25.10";
+  version = "26.01";
 
   src = fetchurl {
     url = "https://mediaarea.net/download/source/libmediainfo/${finalAttrs.version}/libmediainfo_${finalAttrs.version}.tar.xz";
-    hash = "sha256-rRPZeXsEbOOdDGWm+B0q7yQpc0whhlpqTFksfAHySd0=";
+    hash = "sha256-vNPSzBLPEIyg+60HVoswMlfnKv2P9z0Fz+a3qg5mocU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libngspice/package.nix b/pkgs/by-name/li/libngspice/package.nix
index 8ea656c325cc..54f3548d1ebc 100644
--- a/pkgs/by-name/li/libngspice/package.nix
+++ b/pkgs/by-name/li/libngspice/package.nix
@@ -6,8 +6,8 @@
   bison,
   fftw,
   withNgshared ? true,
-  libXaw,
-  libXext,
+  libxaw,
+  libxext,
   llvmPackages,
   readline,
 }:
@@ -49,8 +49,8 @@ stdenv.mkDerivation (finalAttrs: {
     readline
   ]
   ++ lib.optionals (!withNgshared) [
-    libXaw
-    libXext
+    libxaw
+    libxext
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     llvmPackages.openmp
diff --git a/pkgs/by-name/li/libnl/package.nix b/pkgs/by-name/li/libnl/package.nix
index f4f2761ea3c3..8931b841a88e 100644
--- a/pkgs/by-name/li/libnl/package.nix
+++ b/pkgs/by-name/li/libnl/package.nix
@@ -72,5 +72,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.lgpl21;
     maintainers = with lib.maintainers; [ fpletz ];
     platforms = lib.platforms.linux;
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "libnl_project" finalAttrs.version;
   };
 })
diff --git a/pkgs/by-name/li/libnvme/package.nix b/pkgs/by-name/li/libnvme/package.nix
index 464309842280..f58a2d176c04 100644
--- a/pkgs/by-name/li/libnvme/package.nix
+++ b/pkgs/by-name/li/libnvme/package.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libnvme";
-  version = "1.15";
+  version = "1.16.1";
 
   outputs = [ "out" ] ++ lib.optionals withDocs [ "man" ];
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "linux-nvme";
     repo = "libnvme";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-PdSlynwOjC9SkUh3H6doEgHwwBry5Ti5XjRoS2bc5a0=";
+    hash = "sha256-/9snTFixG8bBAWPDJNiOmMEMmNnN451CdJqfp2y1lR4=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/li/libplacebo/package.nix b/pkgs/by-name/li/libplacebo/package.nix
index dee8248139b6..fb3fbdf3b7a2 100644
--- a/pkgs/by-name/li/libplacebo/package.nix
+++ b/pkgs/by-name/li/libplacebo/package.nix
@@ -12,7 +12,7 @@
   shaderc,
   lcms2,
   libGL,
-  libX11,
+  libx11,
   libunwind,
   libdovi,
   xxHash,
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     shaderc
     lcms2
     libGL
-    libX11
+    libx11
     libunwind
     libdovi
     xxHash
diff --git a/pkgs/by-name/li/libplacebo_5/package.nix b/pkgs/by-name/li/libplacebo_5/package.nix
index edf63e277800..79b4daf6b438 100644
--- a/pkgs/by-name/li/libplacebo_5/package.nix
+++ b/pkgs/by-name/li/libplacebo_5/package.nix
@@ -12,7 +12,7 @@
   shaderc,
   lcms2,
   libGL,
-  libX11,
+  libx11,
   libunwind,
   libdovi,
 }:
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     shaderc
     lcms2
     libGL
-    libX11
+    libx11
     libunwind
     libdovi
   ];
diff --git a/pkgs/by-name/li/librearp-lv2/package.nix b/pkgs/by-name/li/librearp-lv2/package.nix
index a1a0900ee3f1..5dd04fdf4c07 100644
--- a/pkgs/by-name/li/librearp-lv2/package.nix
+++ b/pkgs/by-name/li/librearp-lv2/package.nix
@@ -9,9 +9,9 @@
   libxcb-cursor,
   libxcb-keysyms,
   libxcb-util,
-  libXrandr,
-  libXinerama,
-  libXcursor,
+  libxrandr,
+  libxinerama,
+  libxcursor,
   alsa-lib,
   libjack2,
   lv2,
@@ -41,9 +41,9 @@ stdenv.mkDerivation (finalAttrs: {
     libxcb-cursor
     libxcb-keysyms
     libxcb-util
-    libXrandr
-    libXinerama
-    libXcursor
+    libxrandr
+    libxinerama
+    libxcursor
     alsa-lib
     libjack2
     lv2
diff --git a/pkgs/by-name/li/librearp/package.nix b/pkgs/by-name/li/librearp/package.nix
index e1bc9b01086c..52fe1e03ffce 100644
--- a/pkgs/by-name/li/librearp/package.nix
+++ b/pkgs/by-name/li/librearp/package.nix
@@ -9,9 +9,9 @@
   libxcb-cursor,
   libxcb-keysyms,
   libxcb-util,
-  libXrandr,
-  libXinerama,
-  libXcursor,
+  libxrandr,
+  libxinerama,
+  libxcursor,
   alsa-lib,
   libjack2,
   lv2,
@@ -41,9 +41,9 @@ stdenv.mkDerivation (finalAttrs: {
     libxcb-cursor
     libxcb-keysyms
     libxcb-util
-    libXrandr
-    libXinerama
-    libXcursor
+    libxrandr
+    libxinerama
+    libxcursor
     alsa-lib
     libjack2
     lv2
diff --git a/pkgs/by-name/li/librelane/package.nix b/pkgs/by-name/li/librelane/package.nix
index 58646cd16ff8..f37403654c4c 100644
--- a/pkgs/by-name/li/librelane/package.nix
+++ b/pkgs/by-name/li/librelane/package.nix
@@ -22,14 +22,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "librelane";
-  version = "3.0.0.dev49";
+  version = "3.0.0.dev50";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "librelane";
     repo = "librelane";
     tag = finalAttrs.version;
-    hash = "sha256-g6bQMg9W0gbvJzVvO4ESeAtswbBoUVY3NXLK4UdOcGs=";
+    hash = "sha256-YDLX/aZEutoJ9Nu0aLvvDLwGH3HEGP+vtHdPFDbjEEU=";
   };
 
   build-system = [
diff --git a/pkgs/by-name/li/libresprite/package.nix b/pkgs/by-name/li/libresprite/package.nix
index 3c5735df67c2..f3a635d2779a 100644
--- a/pkgs/by-name/li/libresprite/package.nix
+++ b/pkgs/by-name/li/libresprite/package.nix
@@ -14,7 +14,7 @@
   libpng,
   libwebp,
   libarchive,
-  libX11,
+  libx11,
   pixman,
   tinyxml-2,
   libxi,
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
     libwebp
     libarchive
-    libX11
+    libx11
     pixman
     tinyxml-2
     zlib
diff --git a/pkgs/by-name/li/libressl/default.nix b/pkgs/by-name/li/libressl/default.nix
index 2667f2c1bf97..7a266936f6c4 100644
--- a/pkgs/by-name/li/libressl/default.nix
+++ b/pkgs/by-name/li/libressl/default.nix
@@ -108,6 +108,7 @@ let
         badPlatforms = with lib.systems.inspect.patterns; [
           (lib.recursiveUpdate isPower64 isLittleEndian)
         ];
+        identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "openbsd" version;
       };
     };
   # https://github.com/libressl/portable/pull/1206
diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix
index 242ff18a6a31..e061889648c8 100644
--- a/pkgs/by-name/li/libretro-shaders-slang/package.nix
+++ b/pkgs/by-name/li/libretro-shaders-slang/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "libretro-shaders-slang";
-  version = "0-unstable-2026-01-22";
+  version = "0-unstable-2026-02-06";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "slang-shaders";
-    rev = "a38704e29b8241788d91c64e935862a6e86a2a47";
-    hash = "sha256-UBMtUlrbJ+8qh56X1ks19HZCKm1FLmp2bWcNpQJIwdc=";
+    rev = "476a4c7226f87dca4ed67635746ebfaa91851a82";
+    hash = "sha256-zO9/9OEU5TMokjPdvkKtB4LI/Bf+mDQOtsg0k9dZ99c=";
   };
 
   dontConfigure = true;
diff --git a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix
index 16856faf3ed8..f8f1bdc5adb5 100644
--- a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix
+++ b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix
@@ -9,7 +9,7 @@
   curl,
   dbus-glib,
   gtk3,
-  libXtst,
+  libxtst,
   libva,
   pciutils,
   pipewire,
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
     adwaita-icon-theme
     alsa-lib
     dbus-glib
-    libXtst
+    libxtst
   ];
 
   runtimeDependencies = [
diff --git a/pkgs/applications/networking/browsers/librewolf/librewolf.nix b/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/librewolf/librewolf.nix
rename to pkgs/by-name/li/librewolf-unwrapped/librewolf.nix
diff --git a/pkgs/applications/networking/browsers/librewolf/default.nix b/pkgs/by-name/li/librewolf-unwrapped/package.nix
similarity index 95%
rename from pkgs/applications/networking/browsers/librewolf/default.nix
rename to pkgs/by-name/li/librewolf-unwrapped/package.nix
index ccb39de0dc8d..e8ca16d5a5c1 100644
--- a/pkgs/applications/networking/browsers/librewolf/default.nix
+++ b/pkgs/by-name/li/librewolf-unwrapped/package.nix
@@ -29,7 +29,6 @@ in
     description = "Fork of Firefox, focused on privacy, security and freedom";
     homepage = "https://librewolf.net/";
     maintainers = with lib.maintainers; [
-      # Also update ci/OWNERS entry when changing maintainers
       squalus
       dwrege
       fpletz
diff --git a/pkgs/by-name/li/librewolf-unwrapped/src.json b/pkgs/by-name/li/librewolf-unwrapped/src.json
new file mode 100644
index 000000000000..4d1c9d1380f4
--- /dev/null
+++ b/pkgs/by-name/li/librewolf-unwrapped/src.json
@@ -0,0 +1,11 @@
+{
+  "packageVersion": "147.0.3-2",
+  "source": {
+    "rev": "147.0.3-2",
+    "hash": "sha256-Gnsk+dY0B0j/0npy//y/UItKvPrI9HELrH86x0QklBk="
+  },
+  "firefox": {
+    "version": "147.0.3",
+    "hash": "sha512-N+OcR9aU7M3Ku32KCkz+GwKGCpf2BGU/Nkxg9OmHlv/H8carUSJrLlA0pLSAXMxuw5g/DYMMnzZpLfLsJhJz2Q=="
+  }
+}
diff --git a/pkgs/applications/networking/browsers/librewolf/src.nix b/pkgs/by-name/li/librewolf-unwrapped/src.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/librewolf/src.nix
rename to pkgs/by-name/li/librewolf-unwrapped/src.nix
diff --git a/pkgs/applications/networking/browsers/librewolf/update.nix b/pkgs/by-name/li/librewolf-unwrapped/update.nix
similarity index 97%
rename from pkgs/applications/networking/browsers/librewolf/update.nix
rename to pkgs/by-name/li/librewolf-unwrapped/update.nix
index 8833c2bcf1db..db09200e5520 100644
--- a/pkgs/applications/networking/browsers/librewolf/update.nix
+++ b/pkgs/by-name/li/librewolf-unwrapped/update.nix
@@ -36,7 +36,7 @@ writeScript "update-librewolf" ''
   latestTag=$(curl "https://codeberg.org/api/v1/repos/librewolf/source/tags?page=1&limit=1" | jq -r .[0].name)
   echo "latestTag=$latestTag"
 
-  srcJson=pkgs/applications/networking/browsers/librewolf/src.json
+  srcJson=pkgs/by-name/li/librewolf-unwrapped/src.json
   localRev=$(jq -r .source.rev < $srcJson)
   echo "localRev=$localRev"
 
diff --git a/pkgs/by-name/li/libsbml/package.nix b/pkgs/by-name/li/libsbml/package.nix
index 95486537dec2..9f491de86d62 100644
--- a/pkgs/by-name/li/libsbml/package.nix
+++ b/pkgs/by-name/li/libsbml/package.nix
@@ -10,14 +10,14 @@
   python ? null,
   withPython ? false,
 }:
-stdenv.mkDerivation (attrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libsbml";
   version = "5.20.4";
 
   src = fetchFromGitHub {
     owner = "sbmlteam";
     repo = "libsbml";
-    rev = "v${attrs.version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-qWTN033YU4iWzt+mXQaP5W/6IF5nebF4PwNVkyL8wTg=";
   };
 
diff --git a/pkgs/by-name/li/libseccomp/package.nix b/pkgs/by-name/li/libseccomp/package.nix
index 049304bb00a6..222bda60e16a 100644
--- a/pkgs/by-name/li/libseccomp/package.nix
+++ b/pkgs/by-name/li/libseccomp/package.nix
@@ -92,5 +92,6 @@ stdenv.mkDerivation (finalAttrs: {
       "sparc64-linux"
     ];
     maintainers = with lib.maintainers; [ thoughtpolice ];
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "libseccomp_project" finalAttrs.version;
   };
 })
diff --git a/pkgs/by-name/li/libspnav/package.nix b/pkgs/by-name/li/libspnav/package.nix
index bd054ce43b9b..6dcc44e0ae0e 100644
--- a/pkgs/by-name/li/libspnav/package.nix
+++ b/pkgs/by-name/li/libspnav/package.nix
@@ -2,7 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-4ESzH2pMTGoDI/AAX8Iz/MVhxQD8q5cg9I91ryUi5Ys=";
   };
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   configureFlags = [ "--disable-debug" ];
   makeFlags = [
diff --git a/pkgs/by-name/li/libssh/package.nix b/pkgs/by-name/li/libssh/package.nix
index a3068241012b..cafa225067c8 100644
--- a/pkgs/by-name/li/libssh/package.nix
+++ b/pkgs/by-name/li/libssh/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   # Don’t build examples, which are not installed and require additional dependencies not
-  # included in `buildInputs` such as libX11.
+  # included in `buildInputs` such as libx11.
   cmakeFlags = [ "-DWITH_EXAMPLES=OFF" ];
 
   buildInputs = [
diff --git a/pkgs/by-name/li/libstartup_notification/package.nix b/pkgs/by-name/li/libstartup_notification/package.nix
index a1a00404d835..2e8d138d36b9 100644
--- a/pkgs/by-name/li/libstartup_notification/package.nix
+++ b/pkgs/by-name/li/libstartup_notification/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
   libxcb,
   pkg-config,
   libxcb-util,
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    libX11
+    libx11
     libxcb
     libxcb-util
   ];
diff --git a/pkgs/by-name/li/libstrangle/package.nix b/pkgs/by-name/li/libstrangle/package.nix
index 1a2fb56ea598..a4bf68ab9bb9 100644
--- a/pkgs/by-name/li/libstrangle/package.nix
+++ b/pkgs/by-name/li/libstrangle/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitLab,
   fetchpatch,
   libGL,
-  libX11,
+  libx11,
 }:
 
 stdenv_32bit.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv_32bit.mkDerivation rec {
 
   buildInputs = [
     libGL
-    libX11
+    libx11
   ];
 
   src = fetchFromGitLab {
diff --git a/pkgs/by-name/li/libstroke/package.nix b/pkgs/by-name/li/libstroke/package.nix
index 5f15eedd1d19..895cb7959902 100644
--- a/pkgs/by-name/li/libstroke/package.nix
+++ b/pkgs/by-name/li/libstroke/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   automake,
   autoconf,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     automake
     autoconf
   ];
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   # libstroke ships with an ancient config.sub that doesn't know about x86_64, so regenerate it.
   # Also, modern automake doesn't like things and returns error code 63.  But it generates the file.
diff --git a/pkgs/by-name/li/libuiohook/package.nix b/pkgs/by-name/li/libuiohook/package.nix
index 8ae36f2c475f..63008f738ad5 100644
--- a/pkgs/by-name/li/libuiohook/package.nix
+++ b/pkgs/by-name/li/libuiohook/package.nix
@@ -5,7 +5,7 @@
   nixosTests,
   cmake,
   pkg-config,
-  libX11,
+  libx11,
   libxcb,
   libxkbcommon,
   xinput,
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    libX11
+    libx11
     libxcb
     libxkbcommon
     xinput
diff --git a/pkgs/by-name/li/libunicode/package.nix b/pkgs/by-name/li/libunicode/package.nix
index c1cfd06efdf6..4d3713ef1d4f 100644
--- a/pkgs/by-name/li/libunicode/package.nix
+++ b/pkgs/by-name/li/libunicode/package.nix
@@ -19,14 +19,14 @@ let
     stripRoot = false;
   };
 in
-stdenv.mkDerivation (final: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libunicode";
   version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "contour-terminal";
     repo = "libunicode";
-    tag = "v${final.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-J8qawT1oiUO9xTVEMQvsY0K2NtIfkUq9PoCbFt6wqek=";
   };
 
diff --git a/pkgs/by-name/li/libuv/package.nix b/pkgs/by-name/li/libuv/package.nix
index b70e9909dca3..b5eab694e9f0 100644
--- a/pkgs/by-name/li/libuv/package.nix
+++ b/pkgs/by-name/li/libuv/package.nix
@@ -210,6 +210,7 @@ stdenv.mkDerivation (finalAttrs: {
       bsd3
       cc-by-40
     ];
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "libuv" finalAttrs.version;
   };
 
 })
diff --git a/pkgs/by-name/li/libvdpau-va-gl/package.nix b/pkgs/by-name/li/libvdpau-va-gl/package.nix
index e380334562de..3cf6844260b3 100644
--- a/pkgs/by-name/li/libvdpau-va-gl/package.nix
+++ b/pkgs/by-name/li/libvdpau-va-gl/package.nix
@@ -4,11 +4,11 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  libX11,
+  libx11,
   libpthread-stubs,
-  libXau,
-  libXdmcp,
-  libXext,
+  libxau,
+  libxdmcp,
+  libxext,
   libvdpau,
   glib,
   libva,
@@ -32,11 +32,11 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     libpthread-stubs
-    libXau
-    libXdmcp
-    libXext
+    libxau
+    libxdmcp
+    libxext
     libvdpau
     glib
     libva
diff --git a/pkgs/by-name/li/libvibrant/package.nix b/pkgs/by-name/li/libvibrant/package.nix
index 3e7579fa56d1..2967df353a2b 100644
--- a/pkgs/by-name/li/libvibrant/package.nix
+++ b/pkgs/by-name/li/libvibrant/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
   linuxPackages,
 }:
 
@@ -24,8 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXrandr
+    libx11
+    libxrandr
     linuxPackages.nvidia_x11.settings.libXNVCtrl
   ];
 
diff --git a/pkgs/by-name/li/libxcb-cursor/package.nix b/pkgs/by-name/li/libxcb-cursor/package.nix
index 0afb6ae53ea3..c6068d05b232 100644
--- a/pkgs/by-name/li/libxcb-cursor/package.nix
+++ b/pkgs/by-name/li/libxcb-cursor/package.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    description = "XCB port of libXcursor";
+    description = "XCB port of libxcursor";
     homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor";
     license = lib.licenses.x11;
     maintainers = with lib.maintainers; [ lovek323 ];
diff --git a/pkgs/by-name/li/libxcomp/package.nix b/pkgs/by-name/li/libxcomp/package.nix
index 4d72ddc306da..b714c622d7ec 100644
--- a/pkgs/by-name/li/libxcomp/package.nix
+++ b/pkgs/by-name/li/libxcomp/package.nix
@@ -6,7 +6,7 @@
   pkg-config,
   libjpeg,
   libpng,
-  libX11,
+  libx11,
   zlib,
 }:
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libjpeg
     libpng
-    libX11
+    libx11
     zlib
   ];
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libxext/package.nix b/pkgs/by-name/li/libxext/package.nix
index 1b0843881116..1701f3ecf19b 100644
--- a/pkgs/by-name/li/libxext/package.nix
+++ b/pkgs/by-name/li/libxext/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   pkg-config,
-  libX11,
+  libx11,
   xorgproto,
   libxau,
   writeScript,
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    libX11
+    libx11
     xorgproto
   ];
   propagatedBuildInputs = [
diff --git a/pkgs/by-name/li/libxfce4windowing/package.nix b/pkgs/by-name/li/libxfce4windowing/package.nix
index 34a5b7a020d7..755b4e07c9dc 100644
--- a/pkgs/by-name/li/libxfce4windowing/package.nix
+++ b/pkgs/by-name/li/libxfce4windowing/package.nix
@@ -13,8 +13,8 @@
   gtk3,
   libdisplay-info,
   libwnck,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
   wayland,
   wayland-protocols,
   wlr-protocols,
@@ -71,8 +71,8 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     libdisplay-info
     libwnck
-    libX11
-    libXrandr
+    libx11
+    libxrandr
     wayland
     wayland-protocols
     wlr-protocols
diff --git a/pkgs/by-name/li/libxfixes/package.nix b/pkgs/by-name/li/libxfixes/package.nix
index 026a2d4259ec..995e1632509c 100644
--- a/pkgs/by-name/li/libxfixes/package.nix
+++ b/pkgs/by-name/li/libxfixes/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   pkg-config,
   xorgproto,
-  libX11,
+  libx11,
   writeScript,
   testers,
 }:
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     xorgproto
-    libX11
+    libx11
   ];
 
   passthru = {
diff --git a/pkgs/by-name/li/libxft/package.nix b/pkgs/by-name/li/libxft/package.nix
index 3f5955be00ac..f26a9585c48f 100644
--- a/pkgs/by-name/li/libxft/package.nix
+++ b/pkgs/by-name/li/libxft/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "X FreeType library";
     longDescription = ''
-      libXft is the client side font rendering library, using libfreetype, libX11, and the
+      libxft is the client side font rendering library, using libfreetype, libx11, and the
       X Render extension to display anti-aliased text.
     '';
     homepage = "https://gitlab.freedesktop.org/xorg/lib/libxft";
diff --git a/pkgs/by-name/li/libxkbcommon_8/package.nix b/pkgs/by-name/li/libxkbcommon_8/package.nix
index 899b321079e7..99accf6f6af6 100644
--- a/pkgs/by-name/li/libxkbcommon_8/package.nix
+++ b/pkgs/by-name/li/libxkbcommon_8/package.nix
@@ -11,7 +11,7 @@
   libxcb,
   libxml2,
   python3,
-  libX11,
+  libx11,
   # To enable the "interactive-wayland" subcommand of xkbcli. This is the
   # wayland equivalent of `xev` on X11.
   xvfb,
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
   mesonFlags = [
     "-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb"
     "-Dxkb-config-extra-path=/etc/xkb" # default=$sysconfdir/xkb ($out/etc)
-    "-Dx-locale-root=${libX11.out}/share/X11/locale"
+    "-Dx-locale-root=${libx11.out}/share/X11/locale"
     "-Denable-docs=true"
     "-Denable-wayland=${lib.boolToString withWaylandTools}"
   ];
diff --git a/pkgs/by-name/li/libxslt/package.nix b/pkgs/by-name/li/libxslt/package.nix
index 1718598b01e7..6de4895cf7bc 100644
--- a/pkgs/by-name/li/libxslt/package.nix
+++ b/pkgs/by-name/li/libxslt/package.nix
@@ -101,5 +101,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [ jtojnar ];
     broken = pythonSupport && !libxml2.pythonSupport; # see #73102 for why this is not an assert
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "xmlsoft" finalAttrs.version;
   };
 })
diff --git a/pkgs/by-name/li/libxv/package.nix b/pkgs/by-name/li/libxv/package.nix
index df8cd9625aaa..2694b2266ed8 100644
--- a/pkgs/by-name/li/libxv/package.nix
+++ b/pkgs/by-name/li/libxv/package.nix
@@ -4,8 +4,8 @@
   fetchurl,
   pkg-config,
   xorgproto,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   writeScript,
   testers,
 }:
@@ -30,8 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     xorgproto
-    libX11
-    libXext
+    libx11
+    libxext
   ];
 
   configureFlags = lib.optional (
diff --git a/pkgs/by-name/li/libxvmc/package.nix b/pkgs/by-name/li/libxvmc/package.nix
index 7ce4d196f44b..d6bbc15c7ab4 100644
--- a/pkgs/by-name/li/libxvmc/package.nix
+++ b/pkgs/by-name/li/libxvmc/package.nix
@@ -4,9 +4,9 @@
   fetchurl,
   pkg-config,
   xorgproto,
-  libX11,
-  libXext,
-  libXv,
+  libx11,
+  libxext,
+  libxv,
   writeScript,
   testers,
 }:
@@ -31,9 +31,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     xorgproto
-    libX11
-    libXext
-    libXv
+    libx11
+    libxext
+    libxv
   ];
 
   propagatedBuildInputs = [ xorgproto ];
diff --git a/pkgs/by-name/li/libxxf86dga/package.nix b/pkgs/by-name/li/libxxf86dga/package.nix
index 4dc5b64c16a4..20fa91a5f2af 100644
--- a/pkgs/by-name/li/libxxf86dga/package.nix
+++ b/pkgs/by-name/li/libxxf86dga/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchurl,
   pkg-config,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   xorgproto,
   writeScript,
   testers,
@@ -23,8 +23,8 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    libX11
-    libXext
+    libx11
+    libxext
     xorgproto
   ];
 
diff --git a/pkgs/by-name/li/libxxf86vm/package.nix b/pkgs/by-name/li/libxxf86vm/package.nix
index 7f605d782e09..c3e6cf66883e 100644
--- a/pkgs/by-name/li/libxxf86vm/package.nix
+++ b/pkgs/by-name/li/libxxf86vm/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchurl,
   pkg-config,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   xorgproto,
   writeScript,
   testers,
@@ -28,8 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    libX11
-    libXext
+    libx11
+    libxext
     xorgproto
   ];
 
diff --git a/pkgs/by-name/li/lightdm-slick-greeter/package.nix b/pkgs/by-name/li/lightdm-slick-greeter/package.nix
index 4a680551a75a..364cf7824910 100644
--- a/pkgs/by-name/li/lightdm-slick-greeter/package.nix
+++ b/pkgs/by-name/li/lightdm-slick-greeter/package.nix
@@ -13,8 +13,8 @@
   pixman,
   libcanberra,
   libgnomekbd,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   linkFarm,
   lightdm-slick-greeter,
   numlockx,
@@ -48,8 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
     pixman
     libcanberra
     libgnomekbd # needed by XApp.KbdLayoutController
-    libX11
-    libXext
+    libx11
+    libxext
   ];
 
   pythonPath = [
diff --git a/pkgs/by-name/li/lightdm/package.nix b/pkgs/by-name/li/lightdm/package.nix
index 49931a0ba5ed..3b250902fc43 100644
--- a/pkgs/by-name/li/lightdm/package.nix
+++ b/pkgs/by-name/li/lightdm/package.nix
@@ -13,7 +13,7 @@
   libtool,
   libxcb,
   glib,
-  libXdmcp,
+  libxdmcp,
   itstool,
   intltool,
   libxklavier,
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
     accountsservice
     audit
     glib
-    libXdmcp
+    libxdmcp
     libgcrypt
     libxcb
     libxklavier
diff --git a/pkgs/by-name/li/lightlocker/package.nix b/pkgs/by-name/li/lightlocker/package.nix
index 57cb6296927a..1f155094a21c 100644
--- a/pkgs/by-name/li/lightlocker/package.nix
+++ b/pkgs/by-name/li/lightlocker/package.nix
@@ -10,10 +10,10 @@
   glib,
   intltool,
   dbus-glib,
-  libX11,
-  libXScrnSaver,
-  libXxf86vm,
-  libXext,
+  libx11,
+  libxscrnsaver,
+  libxxf86vm,
+  libxext,
   systemd,
   pantheon,
   wrapGAppsHook3,
@@ -47,10 +47,10 @@ stdenv.mkDerivation rec {
     dbus-glib
     glib
     gtk3
-    libX11
-    libXScrnSaver
-    libXext
-    libXxf86vm
+    libx11
+    libxscrnsaver
+    libxext
+    libxxf86vm
     systemd
   ];
 
diff --git a/pkgs/by-name/li/lightum/package.nix b/pkgs/by-name/li/lightum/package.nix
index 59fe1ec552a1..3bcd461a098b 100644
--- a/pkgs/by-name/li/lightum/package.nix
+++ b/pkgs/by-name/li/lightum/package.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXScrnSaver,
-  libXext,
+  libx11,
+  libxscrnsaver,
+  libxext,
   glib,
   dbus,
   pkg-config,
@@ -27,9 +27,9 @@ stdenv.mkDerivation {
   buildInputs = [
     dbus
     glib
-    libX11
-    libXScrnSaver
-    libXext
+    libx11
+    libxscrnsaver
+    libxext
     systemd
   ];
 
diff --git a/pkgs/by-name/li/lincity-ng/package.nix b/pkgs/by-name/li/lincity-ng/package.nix
index 734b8868105c..61f963b1ba88 100644
--- a/pkgs/by-name/li/lincity-ng/package.nix
+++ b/pkgs/by-name/li/lincity-ng/package.nix
@@ -10,7 +10,7 @@
   lib,
   libwebp,
   libtiff,
-  libX11,
+  libx11,
   libxml2,
   libxmlxx5,
   libxslt,
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     SDL2_image
     SDL2_mixer
     SDL2_ttf
-    libX11
+    libx11
     libwebp
     libtiff
     libxmlxx5
diff --git a/pkgs/by-name/li/lincity/package.nix b/pkgs/by-name/li/lincity/package.nix
index 3082377791e9..bb3cd8da3b08 100644
--- a/pkgs/by-name/li/lincity/package.nix
+++ b/pkgs/by-name/li/lincity/package.nix
@@ -4,8 +4,8 @@
   fetchurl,
   fetchpatch,
   gettext,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   xorgproto,
   libice,
   libsm,
@@ -28,8 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
     libice
     libpng12
     libsm
-    libX11
-    libXext
+    libx11
+    libxext
     xorgproto
     zlib
   ];
diff --git a/pkgs/by-name/li/linenoise/package.nix b/pkgs/by-name/li/linenoise/package.nix
index ed7560ca8fae..8192e1af23a1 100644
--- a/pkgs/by-name/li/linenoise/package.nix
+++ b/pkgs/by-name/li/linenoise/package.nix
@@ -6,15 +6,15 @@
   fixDarwinDylibNames,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "linenoise";
-  version = "1.0-34-g93b2db9";
+  version = "2.0";
 
   src = fetchFromGitHub {
     owner = "antirez";
     repo = "linenoise";
-    rev = "1.0-34-g93b2db9";
-    hash = "sha256-GsrYg16gpjHkkmpCU3yGzqNS/buZl+JoWALLvwzmT4A=";
+    tag = finalAttrs.version;
+    hash = "sha256-lqJ/ecw7Q4QyDVXVFrxHL5EbNZOHpy5WruQn4VNibNA=";
   };
 
   nativeBuildInputs = [
@@ -54,4 +54,4 @@ stdenv.mkDerivation {
     platforms = lib.platforms.unix;
     license = lib.licenses.bsd2;
   };
-}
+})
diff --git a/pkgs/by-name/li/links2/package.nix b/pkgs/by-name/li/links2/package.nix
index bbc99d936845..dae295f20689 100644
--- a/pkgs/by-name/li/links2/package.nix
+++ b/pkgs/by-name/li/links2/package.nix
@@ -18,9 +18,9 @@
   enableDirectFB ? false,
   directfb,
   enableX11 ? (!stdenv.hostPlatform.isDarwin),
-  libX11,
-  libXt,
-  libXau, # GUI support
+  libx11,
+  libxt,
+  libxau, # GUI support
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -46,9 +46,9 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ gpm ]
   ++ lib.optionals enableX11 [
-    libX11
-    libXau
-    libXt
+    libx11
+    libxau
+    libxt
   ]
   ++ lib.optionals enableDirectFB [ directfb ];
 
diff --git a/pkgs/by-name/li/linux-pam/package.nix b/pkgs/by-name/li/linux-pam/package.nix
index 9559bae721c5..5e1fdfd4a7ce 100644
--- a/pkgs/by-name/li/linux-pam/package.nix
+++ b/pkgs/by-name/li/linux-pam/package.nix
@@ -140,5 +140,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.linux;
     license = lib.licenses.bsd3;
     badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ];
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "linux-pam" finalAttrs.version;
   };
 })
diff --git a/pkgs/by-name/li/linux-wallpaperengine/package.nix b/pkgs/by-name/li/linux-wallpaperengine/package.nix
index 8ae41a2c0c0d..324684d1e879 100644
--- a/pkgs/by-name/li/linux-wallpaperengine/package.nix
+++ b/pkgs/by-name/li/linux-wallpaperengine/package.nix
@@ -18,11 +18,11 @@
   glm,
   gmp,
   kissfftFloat,
-  libXau,
-  libXdmcp,
-  libXpm,
-  libXrandr,
-  libXxf86vm,
+  libxau,
+  libxdmcp,
+  libxpm,
+  libxrandr,
+  libxxf86vm,
   libdecor,
   libffi,
   libglut,
@@ -80,11 +80,11 @@ stdenv.mkDerivation (finalAttrs: {
     glm
     gmp
     kissfftFloat
-    libXau
-    libXdmcp
-    libXpm
-    libXrandr
-    libXxf86vm
+    libxau
+    libxdmcp
+    libxpm
+    libxrandr
+    libxxf86vm
     libdecor
     libffi
     libglut
diff --git a/pkgs/by-name/li/liquidwar/package.nix b/pkgs/by-name/li/liquidwar/package.nix
index e784fcbb960b..db0bb6b939fe 100644
--- a/pkgs/by-name/li/liquidwar/package.nix
+++ b/pkgs/by-name/li/liquidwar/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchurl,
   xorgproto,
-  libX11,
-  libXrender,
+  libx11,
+  libxrender,
   gmp,
   libjpeg,
   libpng,
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     xorgproto
-    libX11
+    libx11
     gmp
     guile_2_0
     libjpeg
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
     libogg
     libvorbis
     csound
-    libXrender
+    libxrender
     libcaca
     cunit
     libtool
diff --git a/pkgs/by-name/li/lirc/package.nix b/pkgs/by-name/li/lirc/package.nix
index bef5a9bbcbc4..95f3c0d223c3 100644
--- a/pkgs/by-name/li/lirc/package.nix
+++ b/pkgs/by-name/li/lirc/package.nix
@@ -16,7 +16,7 @@
   libftdi1,
   libice,
   libsm,
-  libX11,
+  libx11,
 }:
 
 let
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
     libftdi1
     libice
     libsm
-    libX11
+    libx11
   ];
 
   DEVINPUT_HEADER = "${linuxHeaders}/include/linux/input-event-codes.h";
diff --git a/pkgs/by-name/li/lisgd/package.nix b/pkgs/by-name/li/lisgd/package.nix
index e20df90c02b0..aa4aacd13494 100644
--- a/pkgs/by-name/li/lisgd/package.nix
+++ b/pkgs/by-name/li/lisgd/package.nix
@@ -4,7 +4,7 @@
   fetchFromSourcehut,
   writeText,
   libinput,
-  libX11,
+  libx11,
   wayland,
   conf ? null,
   patches ? [ ],
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libinput
-    libX11
+    libx11
     wayland
   ];
 
diff --git a/pkgs/by-name/li/listres/package.nix b/pkgs/by-name/li/listres/package.nix
index b473b29f671f..f4fb53abc6c6 100644
--- a/pkgs/by-name/li/listres/package.nix
+++ b/pkgs/by-name/li/listres/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    description = "Utility to list X resources for a widget written using a toolkit based on libXt";
+    description = "Utility to list X resources for a widget written using a toolkit based on libxt";
     homepage = "https://gitlab.freedesktop.org/xorg/app/listres";
     license = lib.licenses.x11;
     mainProgram = "listres";
diff --git a/pkgs/by-name/ll/llpp/package.nix b/pkgs/by-name/ll/llpp/package.nix
index 36b71ef91c8f..1632a39bde40 100644
--- a/pkgs/by-name/ll/llpp/package.nix
+++ b/pkgs/by-name/ll/llpp/package.nix
@@ -6,7 +6,7 @@
   ocaml,
   pkg-config,
   mupdf,
-  libX11,
+  libx11,
   jbig2dec,
   openjpeg,
   libjpeg,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     mupdf
-    libX11
+    libx11
     freetype
     zlib
     gumbo
diff --git a/pkgs/by-name/lo/logiops/package.nix b/pkgs/by-name/lo/logiops/package.nix
index 369cd824a4d3..3378b7812278 100644
--- a/pkgs/by-name/lo/logiops/package.nix
+++ b/pkgs/by-name/lo/logiops/package.nix
@@ -10,14 +10,14 @@
   libconfig,
 }:
 
-stdenv.mkDerivation (oldAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "logiops";
   version = "0.3.5";
 
   src = fetchFromGitHub {
     owner = "PixlOne";
     repo = "logiops";
-    tag = "v${oldAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-GAnlPqjIFGyOWwYFs7gth2m9ITc1jyiaW0sWwQ2zFOs=";
     # In v0.3.0, the `ipcgull` submodule was added as a dependency
     # https://github.com/PixlOne/logiops/releases/tag/v0.3.0
@@ -40,7 +40,7 @@ stdenv.mkDerivation (oldAttrs: {
   ];
 
   cmakeFlags = [
-    "-DLOGIOPS_VERSION=${oldAttrs.version}"
+    "-DLOGIOPS_VERSION=${finalAttrs.version}"
     "-DDBUS_SYSTEM_POLICY_INSTALL_DIR=${placeholder "out"}/share/dbus-1/system.d"
   ];
 
diff --git a/pkgs/by-name/lo/logstalgia/package.nix b/pkgs/by-name/lo/logstalgia/package.nix
index 9af9fa3ee0e2..a8657d651482 100644
--- a/pkgs/by-name/lo/logstalgia/package.nix
+++ b/pkgs/by-name/lo/logstalgia/package.nix
@@ -12,7 +12,7 @@
   glew,
   libGLU,
   libGL,
-  libX11,
+  libx11,
   boost,
   glm,
   freetype,
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     ftgl
     libpng
     libjpeg
-    libX11
+    libx11
     pcre2
     SDL2_image
     libGLU
diff --git a/pkgs/by-name/lo/looking-glass-client/package.nix b/pkgs/by-name/lo/looking-glass-client/package.nix
index 00d152b715cb..4860b936c30f 100644
--- a/pkgs/by-name/lo/looking-glass-client/package.nix
+++ b/pkgs/by-name/lo/looking-glass-client/package.nix
@@ -14,16 +14,16 @@
   libGL,
   nanosvg,
 
-  libX11,
+  libx11,
   libxkbcommon,
-  libXext,
-  libXrandr,
-  libXi,
-  libXScrnSaver,
-  libXinerama,
-  libXcursor,
-  libXpresent,
-  libXdmcp,
+  libxext,
+  libxrandr,
+  libxi,
+  libxscrnsaver,
+  libxinerama,
+  libxcursor,
+  libxpresent,
+  libxdmcp,
 
   wayland,
   wayland-protocols,
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     libGL
     freefont_ttf
     spice-protocol
@@ -75,14 +75,14 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals xorgSupport [
     libxkbcommon
-    libXi
-    libXScrnSaver
-    libXinerama
-    libXcursor
-    libXpresent
-    libXext
-    libXrandr
-    libXdmcp
+    libxi
+    libxscrnsaver
+    libxinerama
+    libxcursor
+    libxpresent
+    libxext
+    libxrandr
+    libxdmcp
   ]
   ++ lib.optionals waylandSupport [
     libxkbcommon
diff --git a/pkgs/by-name/lo/lorien/package.nix b/pkgs/by-name/lo/lorien/package.nix
index 614d46b80c6e..f7795d8020d2 100644
--- a/pkgs/by-name/lo/lorien/package.nix
+++ b/pkgs/by-name/lo/lorien/package.nix
@@ -14,14 +14,14 @@
   libGL,
   libGLU,
   libpulseaudio,
-  libX11,
-  libXcursor,
-  libXext,
-  libXfixes,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxcursor,
+  libxext,
+  libxfixes,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxrender,
   zlib,
   udev, # for libudev
 }:
@@ -56,14 +56,14 @@ stdenv.mkDerivation rec {
     alsa-lib
     libGL
     libGLU
-    libX11
-    libXcursor
-    libXext
-    libXfixes
-    libXi
-    libXinerama
-    libXrandr
-    libXrender
+    libx11
+    libxcursor
+    libxext
+    libxfixes
+    libxi
+    libxinerama
+    libxrandr
+    libxrender
     zlib
     udev
   ];
diff --git a/pkgs/by-name/lo/louvre/package.nix b/pkgs/by-name/lo/louvre/package.nix
index bff58b111ab2..122e9bb7a5cc 100644
--- a/pkgs/by-name/lo/louvre/package.nix
+++ b/pkgs/by-name/lo/louvre/package.nix
@@ -10,8 +10,8 @@
   libdrm,
   libGL,
   libinput,
-  libX11,
-  libXcursor,
+  libx11,
+  libxcursor,
   libxkbcommon,
   libgbm,
   pixman,
@@ -52,8 +52,8 @@ stdenv.mkDerivation (finalAttrs: {
     libdrm
     libGL
     libinput
-    libX11
-    libXcursor
+    libx11
+    libxcursor
     libxkbcommon
     libgbm
     pixman
diff --git a/pkgs/by-name/lr/lrcget/fix-tauri-version-mismatch.patch b/pkgs/by-name/lr/lrcget/fix-tauri-version-mismatch.patch
new file mode 100644
index 000000000000..875eea6a0854
--- /dev/null
+++ b/pkgs/by-name/lr/lrcget/fix-tauri-version-mismatch.patch
@@ -0,0 +1,254 @@
+diff --git a/package-lock.json b/package-lock.json
+index 5ddd914..8d4a12a 100644
+--- a/package-lock.json
++++ b/package-lock.json
+@@ -9,11 +9,11 @@
+       "version": "0.0.0",
+       "dependencies": {
+         "@tanstack/vue-virtual": "^3.1.2",
+-        "@tauri-apps/api": "^2.1.1",
+-        "@tauri-apps/plugin-dialog": "^2.2.0",
+-        "@tauri-apps/plugin-global-shortcut": "^2.2.0",
+-        "@tauri-apps/plugin-os": "^2.2.0",
+-        "@tauri-apps/plugin-shell": "^2.2.0",
++        "@tauri-apps/api": "2.8.0",
++        "@tauri-apps/plugin-dialog": "2.4.0",
++        "@tauri-apps/plugin-global-shortcut": "^2.3.0",
++        "@tauri-apps/plugin-os": "^2.3.0",
++        "@tauri-apps/plugin-shell": "^2.3.0",
+         "codemirror": "^6.0.1",
+         "floating-vue": "^5.2.2",
+         "lodash": "^4.17.21",
+@@ -381,9 +381,9 @@
+       }
+     },
+     "node_modules/@tauri-apps/api": {
+-      "version": "2.1.1",
+-      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.1.1.tgz",
+-      "integrity": "sha512-fzUfFFKo4lknXGJq8qrCidkUcKcH2UHhfaaCNt4GzgzGaW2iS26uFOg4tS3H4P8D6ZEeUxtiD5z0nwFF0UN30A==",
++      "version": "2.8.0",
++      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.8.0.tgz",
++      "integrity": "sha512-ga7zdhbS2GXOMTIZRT0mYjKJtR9fivsXzsyq5U3vjDL0s6DTMwYRm0UHNjzTY5dh4+LSC68Sm/7WEiimbQNYlw==",
+       "license": "Apache-2.0 OR MIT",
+       "funding": {
+         "type": "opencollective",
+@@ -590,39 +590,39 @@
+       }
+     },
+     "node_modules/@tauri-apps/plugin-dialog": {
+-      "version": "2.2.0",
+-      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.2.0.tgz",
+-      "integrity": "sha512-6bLkYK68zyK31418AK5fNccCdVuRnNpbxquCl8IqgFByOgWFivbiIlvb79wpSXi0O+8k8RCSsIpOquebusRVSg==",
++      "version": "2.4.0",
++      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.4.0.tgz",
++      "integrity": "sha512-OvXkrEBfWwtd8tzVCEXIvRfNEX87qs2jv6SqmVPiHcJjBhSF/GUvjqUNIDmKByb5N8nvDqVUM7+g1sXwdC/S9w==",
+       "license": "MIT OR Apache-2.0",
+       "dependencies": {
+-        "@tauri-apps/api": "^2.0.0"
++        "@tauri-apps/api": "^2.8.0"
+       }
+     },
+     "node_modules/@tauri-apps/plugin-global-shortcut": {
+-      "version": "2.2.0",
+-      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-global-shortcut/-/plugin-global-shortcut-2.2.0.tgz",
+-      "integrity": "sha512-clI9Bg/BcxWXNDK+ij601o1qC2WxMEy8ovhGgEW5Ai17oPy0KK8uwzmc59KiVnOYKpBWHCUPqBxG+KBNUFXgzw==",
++      "version": "2.3.1",
++      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-global-shortcut/-/plugin-global-shortcut-2.3.1.tgz",
++      "integrity": "sha512-vr40W2N6G63dmBPaha1TsBQLLURXG538RQbH5vAm0G/ovVZyXJrmZR1HF1W+WneNloQvwn4dm8xzwpEXRW560g==",
+       "license": "MIT OR Apache-2.0",
+       "dependencies": {
+-        "@tauri-apps/api": "^2.0.0"
++        "@tauri-apps/api": "^2.8.0"
+       }
+     },
+     "node_modules/@tauri-apps/plugin-os": {
+-      "version": "2.2.0",
+-      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-os/-/plugin-os-2.2.0.tgz",
+-      "integrity": "sha512-HszbCdbisMlu5QhCNAN8YIWyz2v33abAWha6+uvV2CKX8P5VSct/y+kEe22JeyqrxCnWlQ3DRx7s49Byg7/0EA==",
++      "version": "2.3.2",
++      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-os/-/plugin-os-2.3.2.tgz",
++      "integrity": "sha512-n+nXWeuSeF9wcEsSPmRnBEGrRgOy6jjkSU+UVCOV8YUGKb2erhDOxis7IqRXiRVHhY8XMKks00BJ0OAdkpf6+A==",
+       "license": "MIT OR Apache-2.0",
+       "dependencies": {
+-        "@tauri-apps/api": "^2.0.0"
++        "@tauri-apps/api": "^2.8.0"
+       }
+     },
+     "node_modules/@tauri-apps/plugin-shell": {
+-      "version": "2.2.0",
+-      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.2.0.tgz",
+-      "integrity": "sha512-iC3Ic1hLmasoboG7BO+7p+AriSoqAwKrIk+Hpk+S/bjTQdXqbl2GbdclghI4gM32X0bls7xHzIFqhRdrlvJeaA==",
++      "version": "2.3.4",
++      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.3.4.tgz",
++      "integrity": "sha512-ktsRWf8wHLD17aZEyqE8c5x98eNAuTizR1FSX475zQ4TxaiJnhwksLygQz+AGwckJL5bfEP13nWrlTNQJUpKpA==",
+       "license": "MIT OR Apache-2.0",
+       "dependencies": {
+-        "@tauri-apps/api": "^2.0.0"
++        "@tauri-apps/api": "^2.8.0"
+       }
+     },
+     "node_modules/@types/web-bluetooth": {
+@@ -1043,6 +1043,7 @@
+           "url": "https://tidelift.com/funding/github/npm/browserslist"
+         }
+       ],
++      "peer": true,
+       "dependencies": {
+         "caniuse-lite": "^1.0.30001400",
+         "electron-to-chromium": "^1.4.251",
+@@ -1124,6 +1125,7 @@
+       "version": "6.0.1",
+       "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz",
+       "integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==",
++      "peer": true,
+       "dependencies": {
+         "@codemirror/autocomplete": "^6.0.0",
+         "@codemirror/commands": "^6.0.0",
+@@ -1681,6 +1683,7 @@
+       "version": "7.6.2",
+       "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.2.tgz",
+       "integrity": "sha512-9FhUxK1hVju2+AiQIDJ5Dd//9R2n2RAfJ0qfhF4IHGHgcoEUTMpbTeG/zbEuwaiYXfuAH6XE0/aCyxDdRM+W5w==",
++      "peer": true,
+       "dependencies": {
+         "tabbable": "^6.2.0"
+       }
+@@ -2147,6 +2150,7 @@
+           "url": "https://github.com/sponsors/ai"
+         }
+       ],
++      "peer": true,
+       "dependencies": {
+         "nanoid": "^3.3.7",
+         "picocolors": "^1.1.0",
+@@ -2721,6 +2725,7 @@
+       "resolved": "https://registry.npmjs.org/vite/-/vite-3.1.8.tgz",
+       "integrity": "sha512-m7jJe3nufUbuOfotkntGFupinL/fmuTNuQmiVE7cH2IZMuf4UbfbGYMUT3jVWgGYuRVLY9j8NnrRqgw5rr5QTg==",
+       "dev": true,
++      "peer": true,
+       "dependencies": {
+         "esbuild": "^0.15.9",
+         "postcss": "^8.4.16",
+@@ -2761,6 +2766,7 @@
+       "version": "3.5.10",
+       "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.10.tgz",
+       "integrity": "sha512-Vy2kmJwHPlouC/tSnIgXVg03SG+9wSqT1xu1Vehc+ChsXsRd7jLkKgMltVEFOzUdBr3uFwBCG+41LJtfAcBRng==",
++      "peer": true,
+       "dependencies": {
+         "@vue/compiler-dom": "3.5.10",
+         "@vue/compiler-sfc": "3.5.10",
+@@ -3221,9 +3227,9 @@
+       }
+     },
+     "@tauri-apps/api": {
+-      "version": "2.1.1",
+-      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.1.1.tgz",
+-      "integrity": "sha512-fzUfFFKo4lknXGJq8qrCidkUcKcH2UHhfaaCNt4GzgzGaW2iS26uFOg4tS3H4P8D6ZEeUxtiD5z0nwFF0UN30A=="
++      "version": "2.8.0",
++      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.8.0.tgz",
++      "integrity": "sha512-ga7zdhbS2GXOMTIZRT0mYjKJtR9fivsXzsyq5U3vjDL0s6DTMwYRm0UHNjzTY5dh4+LSC68Sm/7WEiimbQNYlw=="
+     },
+     "@tauri-apps/cli": {
+       "version": "2.1.0",
+@@ -3314,35 +3320,35 @@
+       "optional": true
+     },
+     "@tauri-apps/plugin-dialog": {
+-      "version": "2.2.0",
+-      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.2.0.tgz",
+-      "integrity": "sha512-6bLkYK68zyK31418AK5fNccCdVuRnNpbxquCl8IqgFByOgWFivbiIlvb79wpSXi0O+8k8RCSsIpOquebusRVSg==",
++      "version": "2.4.0",
++      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.4.0.tgz",
++      "integrity": "sha512-OvXkrEBfWwtd8tzVCEXIvRfNEX87qs2jv6SqmVPiHcJjBhSF/GUvjqUNIDmKByb5N8nvDqVUM7+g1sXwdC/S9w==",
+       "requires": {
+-        "@tauri-apps/api": "^2.0.0"
++        "@tauri-apps/api": "^2.8.0"
+       }
+     },
+     "@tauri-apps/plugin-global-shortcut": {
+-      "version": "2.2.0",
+-      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-global-shortcut/-/plugin-global-shortcut-2.2.0.tgz",
+-      "integrity": "sha512-clI9Bg/BcxWXNDK+ij601o1qC2WxMEy8ovhGgEW5Ai17oPy0KK8uwzmc59KiVnOYKpBWHCUPqBxG+KBNUFXgzw==",
++      "version": "2.3.1",
++      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-global-shortcut/-/plugin-global-shortcut-2.3.1.tgz",
++      "integrity": "sha512-vr40W2N6G63dmBPaha1TsBQLLURXG538RQbH5vAm0G/ovVZyXJrmZR1HF1W+WneNloQvwn4dm8xzwpEXRW560g==",
+       "requires": {
+-        "@tauri-apps/api": "^2.0.0"
++        "@tauri-apps/api": "^2.8.0"
+       }
+     },
+     "@tauri-apps/plugin-os": {
+-      "version": "2.2.0",
+-      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-os/-/plugin-os-2.2.0.tgz",
+-      "integrity": "sha512-HszbCdbisMlu5QhCNAN8YIWyz2v33abAWha6+uvV2CKX8P5VSct/y+kEe22JeyqrxCnWlQ3DRx7s49Byg7/0EA==",
++      "version": "2.3.2",
++      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-os/-/plugin-os-2.3.2.tgz",
++      "integrity": "sha512-n+nXWeuSeF9wcEsSPmRnBEGrRgOy6jjkSU+UVCOV8YUGKb2erhDOxis7IqRXiRVHhY8XMKks00BJ0OAdkpf6+A==",
+       "requires": {
+-        "@tauri-apps/api": "^2.0.0"
++        "@tauri-apps/api": "^2.8.0"
+       }
+     },
+     "@tauri-apps/plugin-shell": {
+-      "version": "2.2.0",
+-      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.2.0.tgz",
+-      "integrity": "sha512-iC3Ic1hLmasoboG7BO+7p+AriSoqAwKrIk+Hpk+S/bjTQdXqbl2GbdclghI4gM32X0bls7xHzIFqhRdrlvJeaA==",
++      "version": "2.3.4",
++      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.3.4.tgz",
++      "integrity": "sha512-ktsRWf8wHLD17aZEyqE8c5x98eNAuTizR1FSX475zQ4TxaiJnhwksLygQz+AGwckJL5bfEP13nWrlTNQJUpKpA==",
+       "requires": {
+-        "@tauri-apps/api": "^2.0.0"
++        "@tauri-apps/api": "^2.8.0"
+       }
+     },
+     "@types/web-bluetooth": {
+@@ -3586,6 +3592,7 @@
+       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
+       "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
+       "dev": true,
++      "peer": true,
+       "requires": {
+         "caniuse-lite": "^1.0.30001400",
+         "electron-to-chromium": "^1.4.251",
+@@ -3636,6 +3643,7 @@
+       "version": "6.0.1",
+       "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz",
+       "integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==",
++      "peer": true,
+       "requires": {
+         "@codemirror/autocomplete": "^6.0.0",
+         "@codemirror/commands": "^6.0.0",
+@@ -3965,6 +3973,7 @@
+       "version": "7.6.2",
+       "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.2.tgz",
+       "integrity": "sha512-9FhUxK1hVju2+AiQIDJ5Dd//9R2n2RAfJ0qfhF4IHGHgcoEUTMpbTeG/zbEuwaiYXfuAH6XE0/aCyxDdRM+W5w==",
++      "peer": true,
+       "requires": {
+         "tabbable": "^6.2.0"
+       }
+@@ -4285,6 +4294,7 @@
+       "version": "8.4.47",
+       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
+       "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
++      "peer": true,
+       "requires": {
+         "nanoid": "^3.3.7",
+         "picocolors": "^1.1.0",
+@@ -4638,6 +4648,7 @@
+       "resolved": "https://registry.npmjs.org/vite/-/vite-3.1.8.tgz",
+       "integrity": "sha512-m7jJe3nufUbuOfotkntGFupinL/fmuTNuQmiVE7cH2IZMuf4UbfbGYMUT3jVWgGYuRVLY9j8NnrRqgw5rr5QTg==",
+       "dev": true,
++      "peer": true,
+       "requires": {
+         "esbuild": "^0.15.9",
+         "fsevents": "~2.3.2",
+@@ -4650,6 +4661,7 @@
+       "version": "3.5.10",
+       "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.10.tgz",
+       "integrity": "sha512-Vy2kmJwHPlouC/tSnIgXVg03SG+9wSqT1xu1Vehc+ChsXsRd7jLkKgMltVEFOzUdBr3uFwBCG+41LJtfAcBRng==",
++      "peer": true,
+       "requires": {
+         "@vue/compiler-dom": "3.5.10",
+         "@vue/compiler-sfc": "3.5.10",
+-- 
+2.51.2
+
diff --git a/pkgs/by-name/lr/lrcget/package.nix b/pkgs/by-name/lr/lrcget/package.nix
index d0fe49afd5b2..05809e139915 100644
--- a/pkgs/by-name/lr/lrcget/package.nix
+++ b/pkgs/by-name/lr/lrcget/package.nix
@@ -22,24 +22,27 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "lrcget";
-  version = "0.9.3";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "tranxuanthang";
     repo = "lrcget";
     tag = version;
-    hash = "sha256-3dBjQ1fO1q8JCQFvvV8LWBCD8cKFkFmm8ufC/Xihmj4=";
+    hash = "sha256-4XeOIOV8QyJheVN98u/jo8H+n9AIzvVJITCk9d+kpFA=";
   };
 
   patches = [
     # needed to not attempt codesigning on darwin
     ./remove-signing-identity.patch
+
+    # Update NPM package versions to fix https://github.com/tranxuanthang/lrcget/issues/309
+    ./fix-tauri-version-mismatch.patch
   ];
 
   cargoRoot = "src-tauri";
   buildAndTestSubdir = "src-tauri";
 
-  cargoHash = "sha256-Nu1N96OrLG/D2/1vbU229jLVNZuKIiCSwDJA25hlqFM=";
+  cargoHash = "sha256-EjciD794MqUnp3CVloOPugbSfcxgfy7TdCUOlK6P+sk=";
 
   # FIXME: This is a workaround, because we have a git dependency node_modules/lrc-kit contains install scripts
   # but has no lockfile, which is something that will probably break.
@@ -47,8 +50,8 @@ rustPlatform.buildRustPackage rec {
 
   npmDeps = fetchNpmDeps {
     name = "lrcget-${version}-npm-deps";
-    inherit src forceGitDeps;
-    hash = "sha256-N48+C3NNPYg/rOpnRNmkZfZU/ZHp8imrG/tiDaMGsCE=";
+    inherit src forceGitDeps patches;
+    hash = "sha256-iaxNrZLcb9qM5EPRtzoXw6izZBeS/rqgGaZpA2A2oho=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ls/lsp-plugins/package.nix b/pkgs/by-name/ls/lsp-plugins/package.nix
index e7f52ff234e4..bd5df5a9eab2 100644
--- a/pkgs/by-name/ls/lsp-plugins/package.nix
+++ b/pkgs/by-name/ls/lsp-plugins/package.nix
@@ -8,7 +8,7 @@
   ladspaH,
   libGL,
   libGLU,
-  libXrandr,
+  libxrandr,
   libsndfile,
   lv2,
   php84,
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
     ladspaH
     libGL
     libGLU
-    libXrandr
+    libxrandr
     libsndfile
     lv2
   ];
diff --git a/pkgs/by-name/lu/luastatus/package.nix b/pkgs/by-name/lu/luastatus/package.nix
index 826d2dba15e7..1c64f5602cf3 100644
--- a/pkgs/by-name/lu/luastatus/package.nix
+++ b/pkgs/by-name/lu/luastatus/package.nix
@@ -13,8 +13,8 @@
   glib,
   libnl,
   udev,
-  libXau,
-  libXdmcp,
+  libxau,
+  libxdmcp,
   pcre2,
   pcre,
   util-linux,
@@ -23,7 +23,7 @@
   lua5,
   docutils,
   libxcb,
-  libX11,
+  libx11,
   libxcb-util,
   libxcb-wm,
 }:
@@ -47,11 +47,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libxcb
-    libX11
+    libx11
     libxcb-util
     libxcb-wm
-    libXdmcp
-    libXau
+    libxdmcp
+    libxau
     libpulseaudio
     libnl
     libselinux
diff --git a/pkgs/by-name/lu/ludusavi/package.nix b/pkgs/by-name/lu/ludusavi/package.nix
index 0700b10caae6..7a3eeb487c45 100644
--- a/pkgs/by-name/lu/ludusavi/package.nix
+++ b/pkgs/by-name/lu/ludusavi/package.nix
@@ -12,10 +12,10 @@
   fontconfig,
   freetype,
   libGL,
-  libX11,
-  libXcursor,
-  libXrandr,
-  libXi,
+  libx11,
+  libxcursor,
+  libxrandr,
+  libxi,
   libxkbcommon,
   vulkan-loader,
   wayland,
@@ -57,10 +57,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildInputs = [
     fontconfig
     freetype
-    libX11
-    libXcursor
-    libXrandr
-    libXi
+    libx11
+    libxcursor
+    libxrandr
+    libxi
     cairo
     pango
     atkmm
@@ -93,10 +93,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
         bzip2
         fontconfig
         freetype
-        libX11
-        libXcursor
-        libXrandr
-        libXi
+        libx11
+        libxcursor
+        libxrandr
+        libxi
         libxkbcommon
         vulkan-loader
         wayland
diff --git a/pkgs/by-name/lu/lukesmithxyz-st/package.nix b/pkgs/by-name/lu/lukesmithxyz-st/package.nix
index 6f27f920ad99..08d170cc084f 100644
--- a/pkgs/by-name/lu/lukesmithxyz-st/package.nix
+++ b/pkgs/by-name/lu/lukesmithxyz-st/package.nix
@@ -4,9 +4,9 @@
   fetchFromGitHub,
   fontconfig,
   harfbuzz,
-  libX11,
-  libXext,
-  libXft,
+  libx11,
+  libxext,
+  libxft,
   ncurses,
   pkg-config,
 }:
@@ -28,9 +28,9 @@ stdenv.mkDerivation {
   buildInputs = [
     fontconfig
     harfbuzz
-    libX11
-    libXext
-    libXft
+    libx11
+    libxext
+    libxft
     ncurses
   ];
 
diff --git a/pkgs/by-name/lu/lunacy/package.nix b/pkgs/by-name/lu/lunacy/package.nix
index 231d32a5f13a..3a313604b531 100644
--- a/pkgs/by-name/lu/lunacy/package.nix
+++ b/pkgs/by-name/lu/lunacy/package.nix
@@ -7,12 +7,12 @@
   zlib,
   libgcc,
   fontconfig,
-  libX11,
+  libx11,
   lttng-ust,
   icu,
   libice,
   libsm,
-  libXcursor,
+  libxcursor,
   openssl,
   imagemagick,
   makeWrapper,
@@ -37,8 +37,8 @@ stdenv.mkDerivation (finalAttrs: {
     # Runtime deps
     libice
     libsm
-    libX11
-    libXcursor
+    libx11
+    libxcursor
   ];
 
   nativeBuildInputs = [
@@ -65,8 +65,8 @@ stdenv.mkDerivation (finalAttrs: {
   runtimeDependencies = [
     libice
     libsm
-    libX11
-    libXcursor
+    libx11
+    libxcursor
   ];
 
   dontBuild = true;
diff --git a/pkgs/by-name/lw/lwm/package.nix b/pkgs/by-name/lw/lwm/package.nix
index a26ba20cdbd3..27278afd0a63 100644
--- a/pkgs/by-name/lw/lwm/package.nix
+++ b/pkgs/by-name/lw/lwm/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchurl,
   imake,
-  libX11,
+  libx11,
   libsm,
-  libXext,
+  libxext,
   libice,
 }:
 
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ imake ];
 
   buildInputs = [
-    libX11
+    libx11
     libsm
-    libXext
+    libxext
     libice
   ];
 
diff --git a/pkgs/by-name/lx/lxappearance/package.nix b/pkgs/by-name/lx/lxappearance/package.nix
index 4897e6613d8a..8e083b830e76 100644
--- a/pkgs/by-name/lx/lxappearance/package.nix
+++ b/pkgs/by-name/lx/lxappearance/package.nix
@@ -5,7 +5,7 @@
   autoreconfHook,
   intltool,
   pkg-config,
-  libX11,
+  libx11,
   gtk2,
   gtk3,
   libxslt,
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     (if withGtk3 then gtk3 else gtk2)
   ];
 
diff --git a/pkgs/by-name/lx/lxpanel/package.nix b/pkgs/by-name/lx/lxpanel/package.nix
index dd55e41bb898..d23c0eed34a5 100644
--- a/pkgs/by-name/lx/lxpanel/package.nix
+++ b/pkgs/by-name/lx/lxpanel/package.nix
@@ -12,12 +12,12 @@
   keybinder3,
   gtk2-x11,
   gtk3,
-  libX11,
+  libx11,
   libfm,
   libwnck,
   libwnck2,
-  libXmu,
-  libXpm,
+  libxmu,
+  libxpm,
   cairo,
   gdk-pixbuf,
   gdk-pixbuf-xlib,
@@ -55,11 +55,11 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     (if withGtk3 then keybinder3 else keybinder)
     (if withGtk3 then gtk3 else gtk2-x11)
-    libX11
+    libx11
     (libfm.override { inherit withGtk3; })
     (if withGtk3 then libwnck else libwnck2)
-    libXmu
-    libXpm
+    libxmu
+    libxpm
     cairo
     gdk-pixbuf
     gdk-pixbuf-xlib.dev
diff --git a/pkgs/by-name/lx/lxrandr/package.nix b/pkgs/by-name/lx/lxrandr/package.nix
index 2399a5c327d9..70a386945c48 100644
--- a/pkgs/by-name/lx/lxrandr/package.nix
+++ b/pkgs/by-name/lx/lxrandr/package.nix
@@ -5,7 +5,7 @@
   pkg-config,
   intltool,
   gtk2,
-  libX11,
+  libx11,
   xrandr,
   withGtk3 ? false,
   gtk3,
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [ ./respect-xml-catalog-files-var.patch ];
 
   buildInputs = [
-    libX11
+    libx11
     xrandr
     (if withGtk3 then gtk3 else gtk2)
   ];
diff --git a/pkgs/by-name/lx/lxsession/package.nix b/pkgs/by-name/lx/lxsession/package.nix
index fc73628cf152..f15d5dc90ad9 100644
--- a/pkgs/by-name/lx/lxsession/package.nix
+++ b/pkgs/by-name/lx/lxsession/package.nix
@@ -11,7 +11,7 @@
   pkg-config,
   wrapGAppsHook3,
   gtk2-x11,
-  libX11,
+  libx11,
   polkit,
   vala,
 }:
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     gtk2-x11
-    libX11
+    libx11
     polkit
     vala
   ];
diff --git a/pkgs/by-name/lz/lz4/package.nix b/pkgs/by-name/lz/lz4/package.nix
index 285df98c5d22..39b19d2b9ea5 100644
--- a/pkgs/by-name/lz/lz4/package.nix
+++ b/pkgs/by-name/lz/lz4/package.nix
@@ -76,5 +76,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.all;
     mainProgram = "lz4";
     maintainers = [ lib.maintainers.tobim ];
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "lz4_project" finalAttrs.version;
   };
 })
diff --git a/pkgs/by-name/ma/maa-assistant-arknights/package.nix b/pkgs/by-name/ma/maa-assistant-arknights/package.nix
index 40ceab5fdd91..6692daa5419d 100644
--- a/pkgs/by-name/ma/maa-assistant-arknights/package.nix
+++ b/pkgs/by-name/ma/maa-assistant-arknights/package.nix
@@ -18,14 +18,14 @@ let
   fastdeploy = callPackage ./fastdeploy-ppocr.nix { };
   sources = lib.importJSON ./pin.json;
 in
-stdenv.mkDerivation (finalAttr: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "maa-assistant-arknights" + lib.optionalString isBeta "-beta";
   version = if isBeta then sources.beta.version else sources.stable.version;
 
   src = fetchFromGitHub {
     owner = "MaaAssistantArknights";
     repo = "MaaAssistantArknights";
-    rev = "v${finalAttr.version}";
+    rev = "v${finalAttrs.version}";
     hash = if isBeta then sources.beta.hash else sources.stable.hash;
   };
 
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttr: {
     (lib.cmakeBool "INSTALL_PYTHON" true)
     (lib.cmakeBool "INSTALL_RESOURCE" true)
     (lib.cmakeBool "USE_MAADEPS" false)
-    (lib.cmakeFeature "MAA_VERSION" "v${finalAttr.version}")
+    (lib.cmakeFeature "MAA_VERSION" "v${finalAttrs.version}")
   ];
 
   passthru.updateScript = ./update.sh;
@@ -73,8 +73,8 @@ stdenv.mkDerivation (finalAttr: {
   '';
 
   postInstall = ''
-    mkdir -p $out/share/${finalAttr.pname}
-    mv $out/{Python,resource} $out/share/${finalAttr.pname}
+    mkdir -p $out/share/${finalAttrs.pname}
+    mv $out/{Python,resource} $out/share/${finalAttrs.pname}
   '';
 
   meta = {
diff --git a/pkgs/by-name/ma/magic-vlsi/package.nix b/pkgs/by-name/ma/magic-vlsi/package.nix
index 874014e873d6..51ddcae2e638 100644
--- a/pkgs/by-name/ma/magic-vlsi/package.nix
+++ b/pkgs/by-name/ma/magic-vlsi/package.nix
@@ -7,7 +7,7 @@
   python3,
   m4,
   cairo,
-  libX11,
+  libx11,
   mesa,
   mesa_glu,
   ncurses,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     cairo
-    libX11
+    libx11
     m4
     mesa_glu
     ncurses
diff --git a/pkgs/by-name/ma/maim/package.nix b/pkgs/by-name/ma/maim/package.nix
index 068045540b59..9dfbbad7191c 100644
--- a/pkgs/by-name/ma/maim/package.nix
+++ b/pkgs/by-name/ma/maim/package.nix
@@ -11,11 +11,11 @@
   libGLU,
   libGL,
   glm,
-  libX11,
-  libXext,
-  libXfixes,
-  libXrandr,
-  libXcomposite,
+  libx11,
+  libxext,
+  libxfixes,
+  libxrandr,
+  libxcomposite,
   slop,
   icu,
 }:
@@ -45,11 +45,11 @@ stdenv.mkDerivation rec {
     libGLU
     libGL
     glm
-    libX11
-    libXext
-    libXfixes
-    libXrandr
-    libXcomposite
+    libx11
+    libxext
+    libxfixes
+    libxrandr
+    libxcomposite
     slop
     icu
   ];
diff --git a/pkgs/by-name/ma/makeself/package.nix b/pkgs/by-name/ma/makeself/package.nix
index de67c34ec017..00539e126ba5 100644
--- a/pkgs/by-name/ma/makeself/package.nix
+++ b/pkgs/by-name/ma/makeself/package.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation rec {
   pname = "makeself";
-  version = "2.6.0";
+  version = "2.7.1";
 
   src = fetchFromGitHub {
     owner = "megastep";
     repo = "makeself";
     tag = "release-${version}";
     fetchSubmodules = true;
-    hash = "sha256-F5lx8B2C8CsEUXQPQTK1q8PAMf5yzIEAqq3zbYnseTs=";
+    hash = "sha256-X35vdzsfAQWAHMvlQSxCeu7IgUNVvnOQaakS27SXlFA=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ma/mamba/package.nix b/pkgs/by-name/ma/mamba/package.nix
index d6af2ccfc0fb..d12b7cb7f624 100644
--- a/pkgs/by-name/ma/mamba/package.nix
+++ b/pkgs/by-name/ma/mamba/package.nix
@@ -6,7 +6,7 @@
   xxd,
   cairo,
   fluidsynth,
-  libX11,
+  libx11,
   libjack2,
   alsa-lib,
   liblo,
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     cairo
     fluidsynth
-    libX11
+    libx11
     libjack2
     alsa-lib
     liblo
diff --git a/pkgs/by-name/ma/mangowc/package.nix b/pkgs/by-name/ma/mangowc/package.nix
index 1a0bb75f0a1d..30cc9815ddf0 100644
--- a/pkgs/by-name/ma/mangowc/package.nix
+++ b/pkgs/by-name/ma/mangowc/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  libX11,
+  libx11,
   libinput,
   libxcb,
   libxkbcommon,
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     libGL
   ]
   ++ lib.optionals enableXWayland [
-    libX11
+    libx11
     libxcb-wm
     xwayland
   ];
diff --git a/pkgs/by-name/ma/marvin/package.nix b/pkgs/by-name/ma/marvin/package.nix
index dced5f900a67..a657dbf416ca 100644
--- a/pkgs/by-name/ma/marvin/package.nix
+++ b/pkgs/by-name/ma/marvin/package.nix
@@ -11,11 +11,11 @@
   openjdk17,
   freetype,
   fontconfig,
-  libXi,
-  libX11,
-  libXext,
-  libXtst,
-  libXrender,
+  libxi,
+  libx11,
+  libxext,
+  libxtst,
+  libxrender,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -36,11 +36,11 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     freetype
     fontconfig
-    libXi
-    libX11
-    libXext
-    libXtst
-    libXrender
+    libxi
+    libx11
+    libxext
+    libxtst
+    libxrender
   ];
 
   unpackPhase = ''
diff --git a/pkgs/by-name/ma/master_me/package.nix b/pkgs/by-name/ma/master_me/package.nix
index 433a684780f2..700d724a87a9 100644
--- a/pkgs/by-name/ma/master_me/package.nix
+++ b/pkgs/by-name/ma/master_me/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchFromGitHub,
   libGL,
-  libX11,
-  libXext,
-  libXrandr,
+  libx11,
+  libxext,
+  libxrandr,
   pkg-config,
   python3,
 }:
@@ -27,9 +27,9 @@ stdenv.mkDerivation (finalAttrs: {
     python3
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
-    libXext
-    libXrandr
+    libx11
+    libxext
+    libxrandr
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/ma/matchbox/package.nix b/pkgs/by-name/ma/matchbox/package.nix
index 804dffdda545..24a20f657b60 100644
--- a/pkgs/by-name/ma/matchbox/package.nix
+++ b/pkgs/by-name/ma/matchbox/package.nix
@@ -5,8 +5,8 @@
   fetchpatch,
   pkg-config,
   libmatchbox,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libmatchbox ];
-  NIX_LDFLAGS = "-lX11 -L${libX11}/lib -lXext -L${libXext}/lib";
+  NIX_LDFLAGS = "-lX11 -L${libx11}/lib -lXext -L${libxext}/lib";
 
   src = fetchurl {
     url = "https://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${finalAttrs.version}/matchbox-window-manager-${finalAttrs.version}.tar.bz2";
diff --git a/pkgs/by-name/ma/material-maker/package.nix b/pkgs/by-name/ma/material-maker/package.nix
index 8a3714fc9b94..aea2a41e93c2 100644
--- a/pkgs/by-name/ma/material-maker/package.nix
+++ b/pkgs/by-name/ma/material-maker/package.nix
@@ -5,14 +5,14 @@
   godot3-headless,
   godot3-export-templates,
   libglvnd,
-  libX11,
-  libXcursor,
-  libXext,
-  libXfixes,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxcursor,
+  libxext,
+  libxfixes,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxrender,
   nix-update-script,
 }:
 
@@ -32,14 +32,14 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libglvnd
 
-    libXinerama
-    libXcursor
-    libXext
-    libXrandr
-    libXrender
-    libX11
-    libXi
-    libXfixes
+    libxinerama
+    libxcursor
+    libxext
+    libxrandr
+    libxrender
+    libx11
+    libxi
+    libxfixes
   ];
 
   buildPhase = ''
diff --git a/pkgs/by-name/ma/matrix-brandy/package.nix b/pkgs/by-name/ma/matrix-brandy/package.nix
index 3bdd3760e413..77bd151b1175 100644
--- a/pkgs/by-name/ma/matrix-brandy/package.nix
+++ b/pkgs/by-name/ma/matrix-brandy/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
   nix-update-script,
   SDL,
 }:
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     SDL
   ];
 
diff --git a/pkgs/by-name/mc/mc/package.nix b/pkgs/by-name/mc/mc/package.nix
index 8d96a6db3423..9bff29d93e5e 100644
--- a/pkgs/by-name/mc/mc/package.nix
+++ b/pkgs/by-name/mc/mc/package.nix
@@ -19,7 +19,7 @@
   coreutils,
   darwin,
   x11Support ? true,
-  libX11,
+  libx11,
 
   # updater only
   writeScript,
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     slang
     zip
   ]
-  ++ lib.optionals x11Support [ libX11 ]
+  ++ lib.optionals x11Support [ libx11 ]
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
     e2fsprogs
     gpm
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
   postFixup = lib.optionalString ((!stdenv.hostPlatform.isDarwin) && x11Support) ''
     # libX11.so is loaded dynamically so autopatch doesn't detect it
     patchelf \
-      --add-needed ${libX11}/lib/libX11.so \
+      --add-needed ${libx11}/lib/libX11.so \
       $out/bin/mc
   '';
 
diff --git a/pkgs/by-name/mc/mcaimi-st/package.nix b/pkgs/by-name/mc/mcaimi-st/package.nix
index 12740a89e103..62b03e0d9e00 100644
--- a/pkgs/by-name/mc/mcaimi-st/package.nix
+++ b/pkgs/by-name/mc/mcaimi-st/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchFromGitHub,
   fontconfig,
-  libX11,
-  libXext,
-  libXft,
+  libx11,
+  libxext,
+  libxft,
   ncurses,
   pkg-config,
   nix-update-script,
@@ -27,9 +27,9 @@ stdenv.mkDerivation {
   ];
   buildInputs = [
     fontconfig
-    libX11
-    libXext
-    libXft
+    libx11
+    libxext
+    libxft
     ncurses
   ];
 
diff --git a/pkgs/by-name/md/mdk-sdk/package.nix b/pkgs/by-name/md/mdk-sdk/package.nix
index 670eb6f0f4c8..4eaf6acd652c 100644
--- a/pkgs/by-name/md/mdk-sdk/package.nix
+++ b/pkgs/by-name/md/mdk-sdk/package.nix
@@ -5,7 +5,7 @@
   autoPatchelfHook,
   alsa-lib,
   gcc-unwrapped,
-  libX11,
+  libx11,
   libcxx,
   libdrm,
   libgbm,
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     alsa-lib
     gcc-unwrapped
-    libX11
+    libx11
     libcxx
     libdrm
     libgbm
diff --git a/pkgs/by-name/md/mdsf/package.nix b/pkgs/by-name/md/mdsf/package.nix
index b0b1cdfa5d0a..b4b0ba1a4586 100644
--- a/pkgs/by-name/md/mdsf/package.nix
+++ b/pkgs/by-name/md/mdsf/package.nix
@@ -9,7 +9,7 @@
 }:
 let
   pname = "mdsf";
-  version = "0.11.0";
+  version = "0.11.1";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage {
     owner = "hougesen";
     repo = "mdsf";
     tag = "v${version}";
-    hash = "sha256-hz28Aj4sD4/bA6T1ZUW50SzYV6dmM04vSgYwNSWyaVg=";
+    hash = "sha256-UfLgrukVYqkUKBI7CNLIkANO1md6ArrbSIh+f0F3bek=";
   };
 
-  cargoHash = "sha256-dTQucEYGpsBhKonLJRtQziXkbEGkHL+w9FMi9+iLvnw=";
+  cargoHash = "sha256-dohbFCxoPPXZa6mKkDNmdkqH3T52hHiRTDgQJTJHfYU=";
 
   # many tests fail for various reasons of which most depend on the build sandbox
   doCheck = false;
diff --git a/pkgs/by-name/me/mednafen/package.nix b/pkgs/by-name/me/mednafen/package.nix
index 8596d5c1c4b4..45368d567d9f 100644
--- a/pkgs/by-name/me/mednafen/package.nix
+++ b/pkgs/by-name/me/mednafen/package.nix
@@ -8,7 +8,7 @@
   libglut,
   libGL,
   libGLU,
-  libX11,
+  libx11,
   libcdio,
   libiconv,
   libjack2,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     alsa-lib
     libGL
     libGLU
-    libX11
+    libx11
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     libiconv
diff --git a/pkgs/by-name/me/meh/package.nix b/pkgs/by-name/me/meh/package.nix
index 9c5dd2792fc0..e3b3e0e54b78 100644
--- a/pkgs/by-name/me/meh/package.nix
+++ b/pkgs/by-name/me/meh/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   libjpeg,
   libpng,
   giflib,
@@ -28,8 +28,8 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    libXext
-    libX11
+    libxext
+    libx11
     libjpeg
     libpng
     giflib
diff --git a/pkgs/by-name/me/mesa-demos/package.nix b/pkgs/by-name/me/mesa-demos/package.nix
index c219ee98c21b..7600b3c29fe2 100644
--- a/pkgs/by-name/me/mesa-demos/package.nix
+++ b/pkgs/by-name/me/mesa-demos/package.nix
@@ -5,9 +5,9 @@
   libglut,
   libGL,
   libGLU,
-  libX11,
+  libx11,
   libxcb,
-  libXext,
+  libxext,
   libgbm,
   mesa,
   meson,
@@ -45,9 +45,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libglut
-    libX11
+    libx11
     libxcb
-    libXext
+    libxext
     libGL
     libGLU
     libgbm
diff --git a/pkgs/by-name/me/mesen/package.nix b/pkgs/by-name/me/mesen/package.nix
index 0fc87dc8ce19..8f5287167819 100644
--- a/pkgs/by-name/me/mesen/package.nix
+++ b/pkgs/by-name/me/mesen/package.nix
@@ -6,7 +6,7 @@
   fetchFromGitHub,
   wrapGAppsHook3,
   gtk3,
-  libX11,
+  libx11,
   SDL2,
 }:
 
@@ -62,7 +62,7 @@ buildDotnetModule rec {
 
     nativeBuildInputs = [ SDL2 ];
 
-    buildInputs = [ SDL2 ] ++ lib.optionals clangStdenv.hostPlatform.isLinux [ libX11 ];
+    buildInputs = [ SDL2 ] ++ lib.optionals clangStdenv.hostPlatform.isLinux [ libx11 ];
 
     makeFlags = [ "core" ];
 
diff --git a/pkgs/by-name/me/meshtasticd/package.nix b/pkgs/by-name/me/meshtasticd/package.nix
index 8c7a1efa6c16..1dfadd574f69 100644
--- a/pkgs/by-name/me/meshtasticd/package.nix
+++ b/pkgs/by-name/me/meshtasticd/package.nix
@@ -9,7 +9,7 @@
   writableTmpDirAsHomeHook,
   bluez,
   i2c-tools,
-  libX11,
+  libx11,
   libgpiod_1,
   libinput,
   libusb1,
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     bluez
     i2c-tools
-    libX11
+    libx11
     libgpiod_1
     libinput
     libusb1
@@ -81,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
     mkdir -p platformio-deps-native
     cp -ar ${platformio-deps-native}/. platformio-deps-native
     chmod +w -R platformio-deps-native
+    rm -f platformio-deps-native/core/appstate.json
 
     export PLATFORMIO_CORE_DIR=platformio-deps-native/core
     export PLATFORMIO_LIBDEPS_DIR=platformio-deps-native/libdeps
diff --git a/pkgs/by-name/me/methane/package.nix b/pkgs/by-name/me/methane/package.nix
index c326b69df65c..052d245f6216 100644
--- a/pkgs/by-name/me/methane/package.nix
+++ b/pkgs/by-name/me/methane/package.nix
@@ -15,11 +15,11 @@
   openal,
   quesoglc,
   clanlib,
-  libXrender,
+  libxrender,
   libmikmod,
   alsa-lib,
   nix-update-script,
-  libXinerama,
+  libxinerama,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -50,8 +50,8 @@ stdenv.mkDerivation (finalAttrs: {
     openal
     quesoglc
     clanlib
-    libXrender
-    libXinerama
+    libxrender
+    libxinerama
     libmikmod
     alsa-lib
   ];
diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index f4165829168f..8d777aa030af 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -25,20 +25,20 @@
   libdrm,
   libglvnd,
   libkrb5,
-  libX11,
+  libx11,
   libxcb,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
   libxkbcommon,
-  libXrandr,
-  libXrender,
-  libXScrnSaver,
+  libxrandr,
+  libxrender,
+  libxscrnsaver,
   libxshmfence,
-  libXtst,
+  libxtst,
   libgbm,
   nspr,
   nss,
@@ -122,20 +122,20 @@ let
     libglvnd
     libkrb5
     libpng
-    libX11
+    libx11
     libxcb
-    libXcomposite
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
+    libxcomposite
+    libxcursor
+    libxdamage
+    libxext
+    libxfixes
+    libxi
     libxkbcommon
-    libXrandr
-    libXrender
-    libXScrnSaver
+    libxrandr
+    libxrender
+    libxscrnsaver
     libxshmfence
-    libXtst
+    libxtst
     libgbm
     nspr
     nss
diff --git a/pkgs/by-name/mi/mid2key/package.nix b/pkgs/by-name/mi/mid2key/package.nix
index f5c3624b4464..619d21e91625 100644
--- a/pkgs/by-name/mi/mid2key/package.nix
+++ b/pkgs/by-name/mi/mid2key/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchFromGitHub,
   alsa-lib,
-  libX11,
-  libXi,
-  libXtst,
+  libx11,
+  libxi,
+  libxtst,
   xorgproto,
 }:
 
@@ -22,9 +22,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     alsa-lib
-    libX11
-    libXi
-    libXtst
+    libx11
+    libxi
+    libxtst
     xorgproto
   ];
 
diff --git a/pkgs/by-name/mi/midivisualizer/package.nix b/pkgs/by-name/mi/midivisualizer/package.nix
index 2a6fce4ddcf9..3153073f5bf4 100644
--- a/pkgs/by-name/mi/midivisualizer/package.nix
+++ b/pkgs/by-name/mi/midivisualizer/package.nix
@@ -4,13 +4,13 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  libX11,
+  libx11,
   libnotify,
   glfw,
   makeWrapper,
-  libXrandr,
-  libXinerama,
-  libXcursor,
+  libxrandr,
+  libxinerama,
+  libxcursor,
   gtk3,
   ffmpeg-full,
 }:
@@ -38,10 +38,10 @@ stdenv.mkDerivation (finalAttrs: {
     libnotify
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
-    libXrandr
-    libXinerama
-    libXcursor
+    libx11
+    libxrandr
+    libxinerama
+    libxcursor
     gtk3
   ];
 
diff --git a/pkgs/by-name/mi/minilibx/package.nix b/pkgs/by-name/mi/minilibx/package.nix
index bb42d6b52701..2014f4b70b59 100644
--- a/pkgs/by-name/mi/minilibx/package.nix
+++ b/pkgs/by-name/mi/minilibx/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchFromGitHub,
   installShellFiles,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   unstableGitUpdater,
 }:
 
@@ -30,8 +30,8 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    libX11
-    libXext
+    libx11
+    libxext
   ];
 
   dontConfigure = true;
diff --git a/pkgs/by-name/mi/minimacy/package.nix b/pkgs/by-name/mi/minimacy/package.nix
index c627ffaba3f9..d1e640ac43bb 100644
--- a/pkgs/by-name/mi/minimacy/package.nix
+++ b/pkgs/by-name/mi/minimacy/package.nix
@@ -5,8 +5,8 @@
   fetchFromGitHub,
   libGL,
   libGLU,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   makeBinaryWrapper,
 }:
 
@@ -29,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
-    libX11
-    libXext
+    libx11
+    libxext
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json
index 3e9e5da10c18..b9e148da8261 100644
--- a/pkgs/by-name/mi/mirrord/manifest.json
+++ b/pkgs/by-name/mi/mirrord/manifest.json
@@ -1,21 +1,21 @@
 {
-  "version": "3.184.0",
+  "version": "3.185.1",
   "assets": {
     "x86_64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.184.0/mirrord_linux_x86_64",
-      "hash": "sha256-/1LTDzulmiMzoobMUyADv+MWthoL/slQldgImUFikC4="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.185.1/mirrord_linux_x86_64",
+      "hash": "sha256-zDhN3KtvyFdGeZYZRnjKFCDiGSnIezXrBISOq1hR3Yg="
     },
     "aarch64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.184.0/mirrord_linux_aarch64",
-      "hash": "sha256-zlpLCuJO+gouYYCBZ2Oo711QIvSfDXX/81JyyL3vdKE="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.185.1/mirrord_linux_aarch64",
+      "hash": "sha256-8Cylh5Pq0uxPLCu1H/JsfxvRgipF3bTOpsbkLL50OXY="
     },
     "aarch64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.184.0/mirrord_mac_universal",
-      "hash": "sha256-iHTWgj18BDrvW0PCriWZdkMKA0V0D828xoaD3mSHTac="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.185.1/mirrord_mac_universal",
+      "hash": "sha256-EUScHFfJpqB9v1qjrMzF+Itfs4rTQzj5XPUDod2xiJU="
     },
     "x86_64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.184.0/mirrord_mac_universal",
-      "hash": "sha256-iHTWgj18BDrvW0PCriWZdkMKA0V0D828xoaD3mSHTac="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.185.1/mirrord_mac_universal",
+      "hash": "sha256-EUScHFfJpqB9v1qjrMzF+Itfs4rTQzj5XPUDod2xiJU="
     }
   }
 }
diff --git a/pkgs/by-name/mi/mitscheme/package.nix b/pkgs/by-name/mi/mitscheme/package.nix
index fb14fd822560..8f311d6c15ce 100644
--- a/pkgs/by-name/mi/mitscheme/package.nix
+++ b/pkgs/by-name/mi/mitscheme/package.nix
@@ -13,7 +13,7 @@
   ghostscript,
   ncurses,
   enableX11 ? false,
-  libX11,
+  libx11,
 }:
 
 let
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
     })
   ];
 
-  buildInputs = [ ncurses ] ++ lib.optionals enableX11 [ libX11 ];
+  buildInputs = [ ncurses ] ++ lib.optionals enableX11 [ libx11 ];
 
   configurePhase = ''
     runHook preConfigure
diff --git a/pkgs/by-name/mj/mjpegtools/package.nix b/pkgs/by-name/mj/mjpegtools/package.nix
index e89cdfcd91f8..157948c85891 100644
--- a/pkgs/by-name/mj/mjpegtools/package.nix
+++ b/pkgs/by-name/mj/mjpegtools/package.nix
@@ -6,7 +6,7 @@
   libdv,
   libjpeg,
   libpng,
-  libX11,
+  libx11,
   pkg-config,
   SDL,
   SDL_gfx,
@@ -16,7 +16,7 @@
 # TODO:
 # - make dependencies optional
 # - libpng-apng as alternative to libpng?
-# - libXxf86dga support? checking for XF86DGAQueryExtension in -lXxf86dga... no
+# - libxxf86dga support? checking for XF86DGAQueryExtension in -lXxf86dga... no
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mjpegtools";
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals (!withMinimal) [
     gtk2
-    libX11
+    libx11
     SDL
     SDL_gfx
   ];
diff --git a/pkgs/by-name/ml/mlt/package.nix b/pkgs/by-name/ml/mlt/package.nix
index 8d641d776061..3fb58e3c3516 100644
--- a/pkgs/by-name/ml/mlt/package.nix
+++ b/pkgs/by-name/ml/mlt/package.nix
@@ -14,7 +14,7 @@
   libsamplerate,
   libvorbis,
   libxml2,
-  libX11,
+  libx11,
   makeWrapper,
   movit,
   opencv4,
@@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals enableSDL2 [
     SDL2
-    libX11
+    libx11
   ];
 
   outputs = [
diff --git a/pkgs/by-name/ml/mlterm/package.nix b/pkgs/by-name/ml/mlterm/package.nix
index 9aadc0117a08..a6232340a0b6 100644
--- a/pkgs/by-name/ml/mlterm/package.nix
+++ b/pkgs/by-name/ml/mlterm/package.nix
@@ -43,8 +43,8 @@
     xft = enableX11;
     cairo = true;
   },
-  libX11,
-  libXft,
+  libx11,
+  libxft,
   cairo,
   # List of external tools to create, this default list includes all default
   # tools, as recorded on release 3.9.3.
@@ -134,10 +134,10 @@ stdenv.mkDerivation (finalAttrs: {
     gdk-pixbuf
   ]
   ++ lib.optionals enableTypeEngines.xcore [
-    libX11
+    libx11
   ]
   ++ lib.optionals enableTypeEngines.xft [
-    libXft
+    libxft
   ]
   ++ lib.optionals enableTypeEngines.cairo [
     cairo
diff --git a/pkgs/by-name/ml/mlvwm/package.nix b/pkgs/by-name/ml/mlvwm/package.nix
index ef442ca930a7..1705496ec0c2 100644
--- a/pkgs/by-name/ml/mlvwm/package.nix
+++ b/pkgs/by-name/ml/mlvwm/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchFromGitHub,
   gccmakedep,
-  libX11,
-  libXext,
-  libXpm,
+  libx11,
+  libxext,
+  libxpm,
   imake,
   installShellFiles,
 }:
@@ -25,9 +25,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     gccmakedep
-    libX11
-    libXext
-    libXpm
+    libx11
+    libxext
+    libxpm
     imake
   ];
 
diff --git a/pkgs/by-name/mo/monado/package.nix b/pkgs/by-name/mo/monado/package.nix
index c6485a846c2b..1312e6132f3f 100644
--- a/pkgs/by-name/mo/monado/package.nix
+++ b/pkgs/by-name/mo/monado/package.nix
@@ -26,11 +26,11 @@
   libuv,
   libuvc,
   libv4l,
-  libXau,
+  libxau,
   libxcb,
-  libXdmcp,
-  libXext,
-  libXrandr,
+  libxdmcp,
+  libxext,
+  libxrandr,
   nix-update-script,
   onnxruntime,
   opencv4,
@@ -108,11 +108,11 @@ stdenv.mkDerivation (finalAttrs: {
     libuv
     libuvc
     libv4l
-    libXau
+    libxau
     libxcb
-    libXdmcp
-    libXext
-    libXrandr
+    libxdmcp
+    libxext
+    libxrandr
     onnxruntime
     opencv4
     openvr
diff --git a/pkgs/by-name/mo/monero-cli/package.nix b/pkgs/by-name/mo/monero-cli/package.nix
index 0c32c4b96592..b97182b23ccb 100644
--- a/pkgs/by-name/mo/monero-cli/package.nix
+++ b/pkgs/by-name/mo/monero-cli/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch2,
   cmake,
   pkg-config,
   boost186,
@@ -40,13 +39,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "monero-cli";
-  version = "0.18.4.4";
+  version = "0.18.4.5";
 
   src = fetchFromGitHub {
     owner = "monero-project";
     repo = "monero";
     rev = "v${version}";
-    hash = "sha256-NH15PKlkm9Hpt25iIuUQmhDg+X3Qo+yUAbDY4LNnZdM=";
+    hash = "sha256-8ObxMPBpH5uonpb7E/PEfuq++7R4MU0k1khsott5J88=";
   };
 
   patches = [
diff --git a/pkgs/by-name/mo/monero-gui/package.nix b/pkgs/by-name/mo/monero-gui/package.nix
index 93441d2028c5..efc61cd2ab54 100644
--- a/pkgs/by-name/mo/monero-gui/package.nix
+++ b/pkgs/by-name/mo/monero-gui/package.nix
@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation rec {
   pname = "monero-gui";
-  version = "0.18.4.4";
+  version = "0.18.4.5";
 
   src = fetchFromGitHub {
     owner = "monero-project";
     repo = "monero-gui";
     rev = "v${version}";
-    hash = "sha256-5jtGC0G6M3zEMedLSNIllNjpFPMEAG/5NxvnCxqO9gI=";
+    hash = "sha256-K275qry6PWeEh3g0EofkD8E4pO5uWGFoAGzdkj9kuvA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/mo/motif/package.nix b/pkgs/by-name/mo/motif/package.nix
index bd7e3ef456a8..e3b051b9faf2 100644
--- a/pkgs/by-name/mo/motif/package.nix
+++ b/pkgs/by-name/mo/motif/package.nix
@@ -7,18 +7,18 @@
   pkg-config,
   libtool,
   xbitmaps,
-  libXext,
-  libXft,
-  libXrender,
-  libXmu,
-  libXt,
+  libxext,
+  libxft,
+  libxrender,
+  libxmu,
+  libxt,
   expat,
   libjpeg,
   libpng,
   libiconv,
   flex,
-  libXp,
-  libXau,
+  libxp,
+  libxau,
   demoSupport ? false,
 }:
 # refer to the gentoo package
@@ -36,11 +36,11 @@ stdenv.mkDerivation rec {
     flex
     libtool
     xbitmaps
-    libXext
-    libXft
-    libXrender
-    libXmu
-    libXt
+    libxext
+    libxft
+    libxrender
+    libxmu
+    libxt
     expat
     libjpeg
     libpng
@@ -53,8 +53,8 @@ stdenv.mkDerivation rec {
   ];
 
   propagatedBuildInputs = [
-    libXp
-    libXau
+    libxp
+    libxau
   ];
 
   strictDeps = true;
diff --git a/pkgs/by-name/mo/mouse-actions-gui/package.nix b/pkgs/by-name/mo/mouse-actions-gui/package.nix
index ed2e60f79afb..0c284d120cce 100644
--- a/pkgs/by-name/mo/mouse-actions-gui/package.nix
+++ b/pkgs/by-name/mo/mouse-actions-gui/package.nix
@@ -11,7 +11,7 @@
 
   pkg-config,
   wrapGAppsHook3,
-  libXtst,
+  libxtst,
   libevdev,
   udevCheckHook,
   gtk3,
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [
     # Base deps
-    libXtst
+    libxtst
     libevdev
 
     # Tauri deps
diff --git a/pkgs/by-name/mo/mouse-actions/package.nix b/pkgs/by-name/mo/mouse-actions/package.nix
index ac712cf10a92..8bad10e3929a 100644
--- a/pkgs/by-name/mo/mouse-actions/package.nix
+++ b/pkgs/by-name/mo/mouse-actions/package.nix
@@ -3,9 +3,9 @@
   fetchFromGitHub,
   rustPlatform,
   pkg-config,
-  libX11,
-  libXi,
-  libXtst,
+  libx11,
+  libxi,
+  libxtst,
   libevdev,
   udevCheckHook,
 }:
@@ -26,9 +26,9 @@ rustPlatform.buildRustPackage rec {
   doInstallCheck = true;
 
   buildInputs = [
-    libX11
-    libXi
-    libXtst
+    libx11
+    libxi
+    libxtst
     libevdev
   ];
 
diff --git a/pkgs/by-name/mo/movit/package.nix b/pkgs/by-name/mo/movit/package.nix
index 8a2b23539cfc..12e8be4d619f 100644
--- a/pkgs/by-name/mo/movit/package.nix
+++ b/pkgs/by-name/mo/movit/package.nix
@@ -9,7 +9,7 @@
   eigen,
   libepoxy,
   libGL,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation rec {
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     fftw
     gtest
     libGL
-    libX11
+    libx11
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/by-name/mp/mpv-unwrapped/package.nix b/pkgs/by-name/mp/mpv-unwrapped/package.nix
index 19b44bbc49a6..bb33b4791262 100644
--- a/pkgs/by-name/mp/mpv-unwrapped/package.nix
+++ b/pkgs/by-name/mp/mpv-unwrapped/package.nix
@@ -13,11 +13,11 @@
   freetype,
   lcms2,
   libGL,
-  libX11,
-  libXScrnSaver,
-  libXext,
-  libXpresent,
-  libXrandr,
+  libx11,
+  libxscrnsaver,
+  libxext,
+  libxpresent,
+  libxrandr,
   libarchive,
   libass,
   libbluray,
@@ -217,12 +217,12 @@ stdenv.mkDerivation (finalAttrs: {
     libxkbcommon
   ]
   ++ lib.optionals x11Support [
-    libX11
-    libXext
+    libx11
+    libxext
     libGL
-    libXrandr
-    libXpresent
-    libXScrnSaver
+    libxrandr
+    libxpresent
+    libxscrnsaver
   ]
   ++ lib.optionals zimgSupport [ zimg ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ nv-codec-headers-11 ];
diff --git a/pkgs/by-name/mr/mrtrix/package.nix b/pkgs/by-name/mr/mrtrix/package.nix
index 07345b1933ad..1936641b9e44 100644
--- a/pkgs/by-name/mr/mrtrix/package.nix
+++ b/pkgs/by-name/mr/mrtrix/package.nix
@@ -14,8 +14,8 @@
   qt5,
   libGL,
   libGLU,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   less,
   withGui ? true,
 }:
@@ -51,8 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals withGui [
     libGL
     libGLU
-    libX11
-    libXext
+    libx11
+    libxext
     qt5.qtbase
     qt5.qtsvg
   ];
diff --git a/pkgs/by-name/mu/muffin/package.nix b/pkgs/by-name/mu/muffin/package.nix
index eac0caef6cee..ced42dbf9e84 100644
--- a/pkgs/by-name/mu/muffin/package.nix
+++ b/pkgs/by-name/mu/muffin/package.nix
@@ -22,9 +22,9 @@
   libstartup_notification,
   libwacom,
   libxcvt,
-  libXdamage,
+  libxdamage,
   libxkbcommon,
-  libXtst,
+  libxtst,
   mesa-gl-headers,
   meson,
   ninja,
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
     libstartup_notification
     libwacom
     libxcvt
-    libXdamage
+    libxdamage
     libxkbcommon
     pipewire
     udev
@@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [
     # required for pkg-config to detect muffin-clutter
     json-glib
-    libXtst
+    libxtst
     graphene
     mesa-gl-headers
   ];
diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix
index 0328a37e924c..6a7ce182683d 100644
--- a/pkgs/by-name/mu/mullvad-browser/package.nix
+++ b/pkgs/by-name/mu/mullvad-browser/package.nix
@@ -21,11 +21,11 @@
   glib,
   gtk3,
   libxcb,
-  libX11,
-  libXext,
-  libXrender,
-  libXt,
-  libXtst,
+  libx11,
+  libxext,
+  libxrender,
+  libxt,
+  libxtst,
   libgbm,
   pango,
   pciutils,
@@ -73,11 +73,11 @@ let
       glib
       gtk3
       libxcb
-      libX11
-      libXext
-      libXrender
-      libXt
-      libXtst
+      libx11
+      libxext
+      libxrender
+      libxt
+      libxtst
       libgbm
       pango
       pciutils
@@ -149,7 +149,7 @@ stdenv.mkDerivation rec {
     gtk3
     alsa-lib
     dbus-glib
-    libXtst
+    libxtst
   ];
 
   # Firefox uses "relrhack" to manually process relocations from a fixed offset
diff --git a/pkgs/by-name/mu/multimon-ng/package.nix b/pkgs/by-name/mu/multimon-ng/package.nix
index 04ceaa43ed4a..0aa1fa6efe24 100644
--- a/pkgs/by-name/mu/multimon-ng/package.nix
+++ b/pkgs/by-name/mu/multimon-ng/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   libpulseaudio,
-  libX11,
+  libx11,
   makeWrapper,
   sox,
   fetchpatch,
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     libpulseaudio
-    libX11
+    libx11
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/mu/mup/package.nix b/pkgs/by-name/mu/mup/package.nix
index 6942b8bff92a..280e8d9ec1ed 100644
--- a/pkgs/by-name/mu/mup/package.nix
+++ b/pkgs/by-name/mu/mup/package.nix
@@ -9,8 +9,8 @@
   groff,
   netpbm,
   fltk,
-  libXinerama,
-  libXpm,
+  libxinerama,
+  libxpm,
   libjpeg,
 }:
 
@@ -39,8 +39,8 @@ stdenv.mkDerivation {
 
   buildInputs = [
     fltk
-    libXinerama
-    libXpm
+    libxinerama
+    libxpm
     libjpeg
   ];
 
diff --git a/pkgs/by-name/mu/mupdf/package.nix b/pkgs/by-name/mu/mupdf/package.nix
index 492322fd7f9b..337500cde283 100644
--- a/pkgs/by-name/mu/mupdf/package.nix
+++ b/pkgs/by-name/mu/mupdf/package.nix
@@ -17,10 +17,10 @@
   libjpeg,
   gumbo,
   enableX11 ? (!stdenv.hostPlatform.isDarwin),
-  libX11,
-  libXext,
-  libXi,
-  libXrandr,
+  libx11,
+  libxext,
+  libxi,
+  libxrandr,
   enableCurl ? true,
   curl,
   openssl,
@@ -160,10 +160,10 @@ stdenv.mkDerivation rec {
     gumbo
   ]
   ++ lib.optionals enableX11 [
-    libX11
-    libXext
-    libXi
-    libXrandr
+    libx11
+    libxext
+    libxi
+    libxrandr
   ]
   ++ lib.optionals enableCurl [
     curl
diff --git a/pkgs/by-name/mu/mupen64plus/package.nix b/pkgs/by-name/mu/mupen64plus/package.nix
index 4700710bd4a6..da19784ff502 100644
--- a/pkgs/by-name/mu/mupen64plus/package.nix
+++ b/pkgs/by-name/mu/mupen64plus/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   patches = [
-    # Remove unused SDL2 header that erroneously adds libX11 dependency
+    # Remove unused SDL2 header that erroneously adds libx11 dependency
     ./remove-unused-header.patch
   ];
 
diff --git a/pkgs/by-name/mu/muse-sounds-manager/package.nix b/pkgs/by-name/mu/muse-sounds-manager/package.nix
index c99e4a7ca42d..f7d4af0e6e87 100644
--- a/pkgs/by-name/mu/muse-sounds-manager/package.nix
+++ b/pkgs/by-name/mu/muse-sounds-manager/package.nix
@@ -6,10 +6,10 @@
   fontconfig,
   zlib,
   icu,
-  libX11,
-  libXext,
-  libXi,
-  libXrandr,
+  libx11,
+  libxext,
+  libxi,
+  libxrandr,
   libice,
   libsm,
   openssl,
@@ -48,10 +48,10 @@ stdenv.mkDerivation rec {
 
   runtimeDependencies = map lib.getLib [
     icu
-    libX11
-    libXext
-    libXi
-    libXrandr
+    libx11
+    libxext
+    libxi
+    libxrandr
     libice
     libsm
     openssl
diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix
index b070d0e0a709..d5c70318d9b5 100644
--- a/pkgs/by-name/mu/mutter/package.nix
+++ b/pkgs/by-name/mu/mutter/package.nix
@@ -19,19 +19,19 @@
   libadwaita,
   libxcvt,
   libGL,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
   xkeyboard_config,
   libxkbcommon,
   libxcb,
-  libXrandr,
-  libXinerama,
-  libXau,
+  libxrandr,
+  libxinerama,
+  libxau,
   libinput,
   libdrm,
   libgbm,
@@ -161,19 +161,19 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-protocols
     # X11 client
     gtk4
-    libX11
-    libXcomposite
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
+    libx11
+    libxcomposite
+    libxcursor
+    libxdamage
+    libxext
+    libxfixes
+    libxi
     xkeyboard_config
     libxkbcommon
     libxcb
-    libXrandr
-    libXinerama
-    libXau
+    libxrandr
+    libxinerama
+    libxau
 
     # for gdctl and gnome-service-client shebangs
     (python3.withPackages (pp: [
diff --git a/pkgs/by-name/mu/mutter48/package.nix b/pkgs/by-name/mu/mutter48/package.nix
index f52fdde8852a..c7e82ef4e7a6 100644
--- a/pkgs/by-name/mu/mutter48/package.nix
+++ b/pkgs/by-name/mu/mutter48/package.nix
@@ -19,21 +19,21 @@
   libxcvt,
   libGL,
   libice,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
-  libXtst,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
+  libxtst,
   libxkbfile,
   xkeyboard_config,
   libxkbcommon,
   libxcb,
-  libXrandr,
-  libXinerama,
-  libXau,
+  libxrandr,
+  libxinerama,
+  libxau,
   libinput,
   libdrm,
   libgbm,
@@ -159,21 +159,21 @@ stdenv.mkDerivation (finalAttrs: {
     # X11 client
     gtk4
     libice
-    libX11
-    libXcomposite
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
-    libXtst
+    libx11
+    libxcomposite
+    libxcursor
+    libxdamage
+    libxext
+    libxfixes
+    libxi
+    libxtst
     libxkbfile
     xkeyboard_config
     libxkbcommon
     libxcb
-    libXrandr
-    libXinerama
-    libXau
+    libxrandr
+    libxinerama
+    libxau
 
     # for gdctl shebang
     (python3.withPackages (pp: [
diff --git a/pkgs/by-name/my/mygui/package.nix b/pkgs/by-name/my/mygui/package.nix
index 2bf15b582ceb..11d724fafad1 100644
--- a/pkgs/by-name/my/mygui/package.nix
+++ b/pkgs/by-name/my/mygui/package.nix
@@ -13,7 +13,7 @@
   ogre,
   libGL,
   libGLU,
-  libX11,
+  libx11,
 }:
 
 let
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     libGLU
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
+    libx11
   ];
 
   # Tools are disabled due to compilation failures.
diff --git a/pkgs/by-name/na/nano/package.nix b/pkgs/by-name/na/nano/package.nix
index 4273405a1456..abc61d66afd3 100644
--- a/pkgs/by-name/na/nano/package.nix
+++ b/pkgs/by-name/na/nano/package.nix
@@ -31,11 +31,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "nano";
-  version = "8.7";
+  version = "8.7.1";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
-    hash = "sha256-r9KHqmcsSLjhqT/bbGWIRT1SdRDZZoIraH8oNfDZhuk=";
+    hash = "sha256-dvDcskjy4vElHU7NIP0w+0AKNgo6N8bDQOClLC0c3t8=";
   };
 
   nativeBuildInputs = [ texinfo ] ++ lib.optional enableNls gettext;
diff --git a/pkgs/by-name/na/nas/package.nix b/pkgs/by-name/na/nas/package.nix
index 7bdcdad85e25..47f539375b6f 100644
--- a/pkgs/by-name/na/nas/package.nix
+++ b/pkgs/by-name/na/nas/package.nix
@@ -6,11 +6,11 @@
   flex,
   gccmakedep,
   imake,
-  libXau,
-  libXaw,
-  libXext,
-  libXpm,
-  libXt,
+  libxau,
+  libxaw,
+  libxext,
+  libxpm,
+  libxt,
   xorg-cf-files,
   xorgproto,
 }:
@@ -32,11 +32,11 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libXau
-    libXaw
-    libXext
-    libXpm
-    libXt
+    libxau
+    libxaw
+    libxext
+    libxpm
+    libxt
     xorgproto
   ];
 
diff --git a/pkgs/by-name/na/navicat-premium/package.nix b/pkgs/by-name/na/navicat-premium/package.nix
index 6f6ef0986194..256433776093 100644
--- a/pkgs/by-name/na/navicat-premium/package.nix
+++ b/pkgs/by-name/na/navicat-premium/package.nix
@@ -15,7 +15,7 @@
   glibc,
   harfbuzz,
   libGL,
-  libX11,
+  libx11,
   libgpg-error,
   libselinux,
   libxcb,
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
     glibc
     harfbuzz
     libGL
-    libX11
+    libx11
     libgpg-error
     libselinux
     libxcb
@@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
           glibc
           harfbuzz
           libGL
-          libX11
+          libx11
           libgpg-error
           libselinux
           libxcb
diff --git a/pkgs/by-name/nc/ncps/package.nix b/pkgs/by-name/nc/ncps/package.nix
index b926379be6d0..3b4ca8918f1f 100644
--- a/pkgs/by-name/nc/ncps/package.nix
+++ b/pkgs/by-name/nc/ncps/package.nix
@@ -33,13 +33,13 @@ let
 
   finalAttrs = {
     pname = "ncps";
-    version = "0.8.2";
+    version = "0.8.4";
 
     src = fetchFromGitHub {
       owner = "kalbasit";
       repo = "ncps";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-1VWEN1HYV52H/LCfAvFv3R9DxQbHNRnyay3p2BY8dCg=";
+      hash = "sha256-GJnWVhn8SZY5IJbBSuq1j8qV06/kdHhcVu6QhnTsk0Y=";
     };
 
     vendorHash = "sha256-AcgC+zTS3eVsbcs0jim4zDBGc3lIjwPbdVT7/KQ9Lkc=";
diff --git a/pkgs/by-name/ne/nedit/package.nix b/pkgs/by-name/ne/nedit/package.nix
index 81182fbc6a04..93f45ad00070 100644
--- a/pkgs/by-name/ne/nedit/package.nix
+++ b/pkgs/by-name/ne/nedit/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchurl,
   motif,
-  libXpm,
-  libXt,
+  libxpm,
+  libxt,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     motif
-    libXpm
-    libXt
+    libxpm
+    libxt
   ];
 
   # the linux config works fine on darwin too!
diff --git a/pkgs/by-name/ne/neowall/package.nix b/pkgs/by-name/ne/neowall/package.nix
index 01833a78b437..01e133723568 100644
--- a/pkgs/by-name/ne/neowall/package.nix
+++ b/pkgs/by-name/ne/neowall/package.nix
@@ -4,8 +4,8 @@
   fetchFromGitHub,
   lib,
   libGL,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
   libpng,
   libjpeg,
   wayland,
@@ -37,8 +37,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     wayland
     wayland-protocols
-    libX11
-    libXrandr
+    libx11
+    libxrandr
     libGL
     libpng
     libjpeg
diff --git a/pkgs/by-name/ne/netavark/package.nix b/pkgs/by-name/ne/netavark/package.nix
index 2e3851939770..ed954974e1af 100644
--- a/pkgs/by-name/ne/netavark/package.nix
+++ b/pkgs/by-name/ne/netavark/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "netavark";
-  version = "1.17.1";
+  version = "1.17.2";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "netavark";
     rev = "v${version}";
-    hash = "sha256-KLN1Y2C43dTZlm1VNZq49/zQY55iAPf5V7KK5zjC2dw=";
+    hash = "sha256-FdJNcHYK6Jc1dNqcUr5Ne8dv1dzlHRhcjoldiihrov8=";
   };
 
-  cargoHash = "sha256-Ac8/0MgvDZ3djUlKOv3yT3aCPkxbNPnFM8ZId6yN354=";
+  cargoHash = "sha256-wp/1lWc3OfNQt74m8DtpuFO/Mf07+M7numq2FMEkeGo=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/ne/netbird-dashboard/package.nix b/pkgs/by-name/ne/netbird-dashboard/package.nix
index 83aa10953964..e9bb20998dd4 100644
--- a/pkgs/by-name/ne/netbird-dashboard/package.nix
+++ b/pkgs/by-name/ne/netbird-dashboard/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "netbird-dashboard";
-  version = "2.27.1";
+  version = "2.31.0";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "dashboard";
     rev = "v${version}";
-    hash = "sha256-XVB3zgdfgApqNwMdZMung4qLZOPfsaWdpqlFUz5z9ZU=";
+    hash = "sha256-vpxMPoF0xn5UzY1Yo5Y2NAfmwC21Z6Ogv+C30JKyj0E=";
   };
 
-  npmDepsHash = "sha256-e4Uxy1bwR3a+thIkaNWpAwDvIJyTbM5TwVy+YVD0CQQ=";
+  npmDepsHash = "sha256-IyNVeoEusQlxOYzYe9xIwtHepDRyjUfKHGNNR8LoOSA=";
   npmFlags = [ "--legacy-peer-deps" ];
 
   installPhase = ''
diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix
index 8fe4a576c4ae..904557bf3060 100644
--- a/pkgs/by-name/ne/netbird/package.nix
+++ b/pkgs/by-name/ne/netbird/package.nix
@@ -9,9 +9,9 @@
   pkg-config,
   gtk3,
   libayatana-appindicator,
-  libX11,
-  libXcursor,
-  libXxf86vm,
+  libx11,
+  libxcursor,
+  libxxf86vm,
   versionCheckHook,
   netbird-management,
   netbird-relay,
@@ -84,9 +84,9 @@ buildGoModule (finalAttrs: {
   buildInputs = lib.optionals (stdenv.hostPlatform.isLinux && componentName == "ui") [
     gtk3
     libayatana-appindicator
-    libX11
-    libXcursor
-    libXxf86vm
+    libx11
+    libxcursor
+    libxxf86vm
   ];
 
   subPackages = [ component.module ];
diff --git a/pkgs/by-name/ne/netclient/package.nix b/pkgs/by-name/ne/netclient/package.nix
index 645aba44e5d1..939ed9b7abb2 100644
--- a/pkgs/by-name/ne/netclient/package.nix
+++ b/pkgs/by-name/ne/netclient/package.nix
@@ -2,7 +2,7 @@
   buildGoModule,
   fetchFromGitHub,
   lib,
-  libX11,
+  libx11,
   stdenv,
 }:
 
@@ -19,7 +19,7 @@ buildGoModule rec {
 
   vendorHash = "sha256-OzIp6tVVVh4xWuzaGI4FasCz5dMZQmRxeLqZhg/AgN0=";
 
-  buildInputs = lib.optional stdenv.hostPlatform.isLinux libX11;
+  buildInputs = lib.optional stdenv.hostPlatform.isLinux libx11;
 
   meta = {
     description = "Automated WireGuard® Management Client";
diff --git a/pkgs/by-name/ne/nethack/package.nix b/pkgs/by-name/ne/nethack/package.nix
index 4f1f7b44ccc2..e8bfefd11403 100644
--- a/pkgs/by-name/ne/nethack/package.nix
+++ b/pkgs/by-name/ne/nethack/package.nix
@@ -12,9 +12,9 @@
   buildPackages,
   x11Mode ? false,
   qtMode ? false,
-  libXaw,
-  libXext,
-  libXpm,
+  libxaw,
+  libxext,
+  libxpm,
   bdftopcf,
   mkfontdir,
   pkg-config,
@@ -76,9 +76,9 @@ stdenvUsed.mkDerivation (finalAttrs: {
     ncurses
   ]
   ++ lib.optionals x11Mode [
-    libXaw
-    libXext
-    libXpm
+    libxaw
+    libxext
+    libxpm
   ]
   ++ lib.optionals qtMode [
     gzip
diff --git a/pkgs/by-name/ne/netpbm/package.nix b/pkgs/by-name/ne/netpbm/package.nix
index 49ea197daf58..3c45aaed917e 100644
--- a/pkgs/by-name/ne/netpbm/package.nix
+++ b/pkgs/by-name/ne/netpbm/package.nix
@@ -13,7 +13,7 @@
   makeWrapper,
   libtiff,
   enableX11 ? false,
-  libX11,
+  libx11,
   buildPackages,
 }:
 
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     libtiff
     jbigkit
   ]
-  ++ lib.optional enableX11 libX11;
+  ++ lib.optional enableX11 libx11;
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/ne/netsurf-browser/package.nix b/pkgs/by-name/ne/netsurf-browser/package.nix
index 48529d3c09c1..3b1c8b8932a0 100644
--- a/pkgs/by-name/ne/netsurf-browser/package.nix
+++ b/pkgs/by-name/ne/netsurf-browser/package.nix
@@ -9,8 +9,8 @@
   gperf,
   gtk2,
   gtk3,
-  libXcursor,
-  libXrandr,
+  libxcursor,
+  libxrandr,
   libidn,
   libjpeg,
   libjxl,
@@ -73,8 +73,8 @@ stdenv.mkDerivation (finalAttrs: {
     check
     curl
     gperf
-    libXcursor
-    libXrandr
+    libxcursor
+    libxrandr
     libidn
     libjpeg
     libjxl
diff --git a/pkgs/by-name/ne/networkmanager/package.nix b/pkgs/by-name/ne/networkmanager/package.nix
index e814fd6ce5ee..fca3f75c8426 100644
--- a/pkgs/by-name/ne/networkmanager/package.nix
+++ b/pkgs/by-name/ne/networkmanager/package.nix
@@ -249,5 +249,6 @@ stdenv.mkDerivation (finalAttrs: {
       # Mandatory shared libraries.
       lib.systems.inspect.platformPatterns.isStatic
     ];
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "gnome" finalAttrs.version;
   };
 })
diff --git a/pkgs/by-name/ne/neverball/package.nix b/pkgs/by-name/ne/neverball/package.nix
index 4f048d68a04b..580e67bfbaca 100644
--- a/pkgs/by-name/ne/neverball/package.nix
+++ b/pkgs/by-name/ne/neverball/package.nix
@@ -7,7 +7,7 @@
   libGL,
   libpng,
   libjpeg,
-  libX11,
+  libx11,
   SDL2_ttf,
   libvorbis,
   gettext,
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     physfs
   ]
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    libX11
+    libx11
   ];
 
   dontPatchELF = true;
diff --git a/pkgs/by-name/ne/nexuiz/package.nix b/pkgs/by-name/ne/nexuiz/package.nix
index 7a608b453b8d..33a11b640692 100644
--- a/pkgs/by-name/ne/nexuiz/package.nix
+++ b/pkgs/by-name/ne/nexuiz/package.nix
@@ -13,13 +13,13 @@
   libogg,
   libmodplug,
   # glx
-  libX11,
+  libx11,
   libGLU,
   libGL,
-  libXpm,
-  libXext,
-  libXxf86vm,
-  libXxf86dga,
+  libxpm,
+  libxext,
+  libxxf86vm,
+  libxxf86dga,
   alsa-lib,
   # sdl
   SDL,
@@ -48,13 +48,13 @@ stdenv.mkDerivation {
   ];
   buildInputs = [
     # glx
-    libX11
+    libx11
     libGLU
     libGL
-    libXpm
-    libXext
-    libXxf86vm
-    libXxf86dga
+    libxpm
+    libxext
+    libxxf86vm
+    libxxf86dga
     alsa-lib
     # sdl
     SDL
diff --git a/pkgs/by-name/ni/nice-dcv-client/package.nix b/pkgs/by-name/ni/nice-dcv-client/package.nix
index 21e6ca1f9f54..f27c4c5b6fb9 100644
--- a/pkgs/by-name/ni/nice-dcv-client/package.nix
+++ b/pkgs/by-name/ni/nice-dcv-client/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   glib,
-  libX11,
+  libx11,
   gst_all_1,
   libepoxy,
   pango,
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     libxml2
     libva
     e2fsprogs
-    libX11
+    libx11
     openssl
     pcsclite
     gtk3
diff --git a/pkgs/by-name/ni/nix-index/package.nix b/pkgs/by-name/ni/nix-index/package.nix
index 075d3fb8fb3b..7e11396574df 100644
--- a/pkgs/by-name/ni/nix-index/package.nix
+++ b/pkgs/by-name/ni/nix-index/package.nix
@@ -7,7 +7,7 @@
 }:
 
 symlinkJoin {
-  inherit (nix-index-unwrapped) name meta;
+  inherit (nix-index-unwrapped) pname version meta;
 
   paths = [ nix-index-unwrapped ];
 
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/nixos-rebuild.8.scd b/pkgs/by-name/ni/nixos-rebuild-ng/nixos-rebuild.8.scd
index bc7f09e036d1..43b8c233e290 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/nixos-rebuild.8.scd
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/nixos-rebuild.8.scd
@@ -272,6 +272,9 @@ It must be one of the following:
 	When set, *nixos-rebuild* prefixes activation commands with sudo.
 	Setting this option allows deploying as a non-root user.
 
+	You can set sudo options by defining the NIX_SUDOOPTS environment
+	variable.
+
 *--ask-sudo-password*, *-S*
 	When set, *nixos-rebuild* will ask for sudo password for remote
 	activation (i.e.: on *--target-host*) at the start of the build process.
@@ -339,6 +342,9 @@ NIX_PATH
 NIX_SSHOPTS
 	Additional options to be passed to ssh on the command line.
 
+NIX_SUDOOPTS
+	Additional options to be passed to sudo on the command line.
+
 # FILES
 
 /etc/nixos/flake.nix
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py
index 902797189c69..4a03e86ed4e9 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py
@@ -142,7 +142,8 @@ def run_wrapper(
         if extra_env:
             env = os.environ | extra_env
         if sudo:
-            run_args = ["sudo", *run_args]
+            sudo_args = shlex.split(os.getenv("NIX_SUDOOPTS", ""))
+            run_args = ["sudo", *sudo_args, *run_args]
 
     logger.debug(
         "calling run with args=%r, kwargs=%r, extra_env=%r",
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py
index 84b5c084bf38..b11e039adf60 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py
@@ -160,3 +160,21 @@ def test_ssh_host() -> None:
         remote = m.Remote.from_arg(host_input, None, False)
         assert remote is not None
         assert remote.ssh_host() == expected
+
+
+@patch("subprocess.run", autospec=True)
+def test_custom_sudo_args(mock_run: Any) -> None:
+    with patch.dict(p.os.environ, {"NIX_SUDOOPTS": "--custom sudo --args"}):
+        p.run_wrapper(
+            ["test"],
+            check=False,
+            sudo=True,
+        )
+    mock_run.assert_called_with(
+        ["sudo", "--custom", "sudo", "--args", "test"],
+        check=False,
+        env=None,
+        input=None,
+        text=True,
+        errors="surrogateescape",
+    )
diff --git a/pkgs/by-name/no/noriskclient-launcher/package.nix b/pkgs/by-name/no/noriskclient-launcher/package.nix
index 19dfce8d4c5a..9bd592d1f03e 100644
--- a/pkgs/by-name/no/noriskclient-launcher/package.nix
+++ b/pkgs/by-name/no/noriskclient-launcher/package.nix
@@ -17,11 +17,11 @@
   libGL,
   libjack2,
   libpulseaudio,
-  libX11,
-  libXcursor,
-  libXext,
-  libXrandr,
-  libXxf86vm,
+  libx11,
+  libxcursor,
+  libxext,
+  libxrandr,
+  libxxf86vm,
   noriskclient-launcher-unwrapped,
   pipewire,
   stdenv,
@@ -54,11 +54,11 @@ symlinkJoin {
 
       # glfw
       libGL
-      libX11
-      libXcursor
-      libXext
-      libXrandr
-      libXxf86vm
+      libx11
+      libxcursor
+      libxext
+      libxrandr
+      libxxf86vm
 
       # narrator support
       flite
diff --git a/pkgs/by-name/no/notion/package.nix b/pkgs/by-name/no/notion/package.nix
index fd823a4bd993..60993705765a 100644
--- a/pkgs/by-name/no/notion/package.nix
+++ b/pkgs/by-name/no/notion/package.nix
@@ -7,11 +7,11 @@
   gettext,
   groff,
   libsm,
-  libX11,
-  libXext,
-  libXft,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxext,
+  libxft,
+  libxinerama,
+  libxrandr,
   lua,
   makeWrapper,
   pkg-config,
@@ -51,11 +51,11 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     fontconfig
     libsm
-    libX11
-    libXext
-    libXft
-    libXinerama
-    libXrandr
+    libx11
+    libxext
+    libxft
+    libxinerama
+    libxrandr
     lua
     readline
   ];
diff --git a/pkgs/by-name/np/np2kai/package.nix b/pkgs/by-name/np/np2kai/package.nix
index b067bfb29ad9..5525d71aa349 100644
--- a/pkgs/by-name/np/np2kai/package.nix
+++ b/pkgs/by-name/np/np2kai/package.nix
@@ -10,7 +10,7 @@
   glib,
   gtk2,
   libusb1,
-  libX11,
+  libx11,
   openssl,
   pkg-config,
   SDL2,
@@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
     glib
     gtk2
-    libX11
+    libx11
   ];
 
   cmakeFlags = [
diff --git a/pkgs/by-name/ns/nsxiv/package.nix b/pkgs/by-name/ns/nsxiv/package.nix
index 6cfd8644b8af..f5742eff6f31 100644
--- a/pkgs/by-name/ns/nsxiv/package.nix
+++ b/pkgs/by-name/ns/nsxiv/package.nix
@@ -4,7 +4,7 @@
   fetchFromCodeberg,
   giflib,
   imlib2Full,
-  libXft,
+  libxft,
   libexif,
   libwebp,
   libinotify-kqueue,
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     giflib
     imlib2Full
-    libXft
+    libxft
     libexif
     libwebp
   ]
diff --git a/pkgs/by-name/nt/ntk/package.nix b/pkgs/by-name/nt/ntk/package.nix
index 518ab796b8f7..8aa84895cac5 100644
--- a/pkgs/by-name/nt/ntk/package.nix
+++ b/pkgs/by-name/nt/ntk/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cairo,
   libjpeg,
-  libXft,
+  libxft,
   pkg-config,
   python3,
   wafHook,
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     cairo
     libjpeg
-    libXft
+    libxft
     python3
   ];
 
diff --git a/pkgs/by-name/nu/nuget/package.nix b/pkgs/by-name/nu/nuget/package.nix
index fd28bbc90ba1..800e37bd700b 100644
--- a/pkgs/by-name/nu/nuget/package.nix
+++ b/pkgs/by-name/nu/nuget/package.nix
@@ -6,14 +6,14 @@
   lib,
 }:
 
-stdenv.mkDerivation (attrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "Nuget";
   version = "6.6.1.2";
 
   src = fetchFromGitHub {
     owner = "mono";
     repo = "linux-packaging-nuget";
-    rev = "upstream/${attrs.version}.bin";
+    rev = "upstream/${finalAttrs.version}.bin";
     hash = "sha256-9/dSeVshHbpYIgGE/8OzrB4towrWVB3UxDi8Esmbu7Y=";
   };
 
@@ -24,14 +24,14 @@ stdenv.mkDerivation (attrs: {
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/lib/${attrs.pname}
-    cp -r . $out/lib/${attrs.pname}/
+    mkdir -p $out/lib/${finalAttrs.pname}
+    cp -r . $out/lib/${finalAttrs.pname}/
 
     mkdir -p $out/bin
     makeWrapper \
       "${mono}/bin/mono" \
       "$out/bin/nuget" \
-      --add-flags "$out/lib/${attrs.pname}/nuget.exe"
+      --add-flags "$out/lib/${finalAttrs.pname}/nuget.exe"
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/nu/numlockx/package.nix b/pkgs/by-name/nu/numlockx/package.nix
index 9c50ce5d7c82..c02817dae95f 100644
--- a/pkgs/by-name/nu/numlockx/package.nix
+++ b/pkgs/by-name/nu/numlockx/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchFromGitHub,
   autoconf,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
 }:
 
 stdenv.mkDerivation {
@@ -19,8 +19,8 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    libX11
-    libXext
+    libx11
+    libxext
     autoconf
   ];
 
diff --git a/pkgs/by-name/nw/nwg-look/package.nix b/pkgs/by-name/nw/nwg-look/package.nix
index af6c19cfef97..7ef2f8822e9e 100644
--- a/pkgs/by-name/nw/nwg-look/package.nix
+++ b/pkgs/by-name/nw/nwg-look/package.nix
@@ -8,7 +8,7 @@
   cairo,
   gtk3,
   xcur2png,
-  libX11,
+  libx11,
   zlib,
 }:
 
@@ -39,7 +39,7 @@ buildGoModule rec {
     glib
     cairo
     xcur2png
-    libX11.dev
+    libx11.dev
     zlib
     gtk3
   ];
diff --git a/pkgs/by-name/oc/ocelot-desktop/package.nix b/pkgs/by-name/oc/ocelot-desktop/package.nix
index d1191f8acb6c..c0e1e4e98c40 100644
--- a/pkgs/by-name/oc/ocelot-desktop/package.nix
+++ b/pkgs/by-name/oc/ocelot-desktop/package.nix
@@ -15,11 +15,11 @@
   libpulseaudio,
   pipewire,
   libGL,
-  libX11,
-  libXcursor,
-  libXext,
-  libXrandr,
-  libXxf86vm,
+  libx11,
+  libxcursor,
+  libxext,
+  libxrandr,
+  libxxf86vm,
 
   # runtime (path)
   xrandr,
@@ -63,11 +63,11 @@ stdenv.mkDerivation (finalAttrs: {
 
         # lwjgl
         libGL
-        libX11
-        libXcursor
-        libXext
-        libXrandr
-        libXxf86vm
+        libx11
+        libxcursor
+        libxext
+        libxrandr
+        libxxf86vm
       ];
       runtimePrograms = lib.optionals stdenv.hostPlatform.isLinux [
         # https://github.com/LWJGL/lwjgl/issues/128
diff --git a/pkgs/by-name/oc/oculante/package.nix b/pkgs/by-name/oc/oculante/package.nix
index 747f389c98f7..1d13a79da25f 100644
--- a/pkgs/by-name/oc/oculante/package.nix
+++ b/pkgs/by-name/oc/oculante/package.nix
@@ -7,10 +7,10 @@
   openssl,
   fontconfig,
   nasm,
-  libX11,
-  libXcursor,
-  libXrandr,
-  libXi,
+  libx11,
+  libxcursor,
+  libxrandr,
+  libxi,
   libGL,
   libxkbcommon,
   wayland,
@@ -51,10 +51,10 @@ rustPlatform.buildRustPackage rec {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     libGL
-    libX11
-    libXcursor
-    libXi
-    libXrandr
+    libx11
+    libxcursor
+    libxi
+    libxrandr
     gtk3
     libxkbcommon
     wayland
diff --git a/pkgs/by-name/od/odin2/package.nix b/pkgs/by-name/od/odin2/package.nix
index 29fd530cf778..b155af5d7573 100644
--- a/pkgs/by-name/od/odin2/package.nix
+++ b/pkgs/by-name/od/odin2/package.nix
@@ -8,11 +8,11 @@
   freetype,
   libjack2,
   lv2,
-  libX11,
-  libXcursor,
-  libXext,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxext,
+  libxinerama,
+  libxrandr,
   libGL,
   gcc-unwrapped,
   copyDesktopItems,
@@ -43,11 +43,11 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
     libjack2
     lv2
-    libX11
-    libXcursor
-    libXext
-    libXinerama
-    libXrandr
+    libx11
+    libxcursor
+    libxext
+    libxinerama
+    libxrandr
     libGL
   ];
 
diff --git a/pkgs/by-name/oh/oh-my-git/package.nix b/pkgs/by-name/oh/oh-my-git/package.nix
index 496984eb0178..26cfeef71534 100644
--- a/pkgs/by-name/oh/oh-my-git/package.nix
+++ b/pkgs/by-name/oh/oh-my-git/package.nix
@@ -11,14 +11,14 @@
   godot3-export-templates,
   godot3-headless,
   libGLU,
-  libX11,
-  libXcursor,
-  libXext,
-  libXfixes,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxcursor,
+  libxext,
+  libxfixes,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxrender,
   libglvnd,
   libpulseaudio,
   perl,
@@ -48,14 +48,14 @@ stdenv.mkDerivation rec {
     gcc-unwrapped.lib
     git
     libGLU
-    libX11
-    libXcursor
-    libXext
-    libXfixes
-    libXi
-    libXinerama
-    libXrandr
-    libXrender
+    libx11
+    libxcursor
+    libxext
+    libxfixes
+    libxi
+    libxinerama
+    libxrandr
+    libxrender
     libglvnd
     libpulseaudio
     perl
diff --git a/pkgs/by-name/oi/oilrush/package.nix b/pkgs/by-name/oi/oilrush/package.nix
index e68c990512be..b7ead76c4a7b 100644
--- a/pkgs/by-name/oi/oilrush/package.nix
+++ b/pkgs/by-name/oi/oilrush/package.nix
@@ -3,11 +3,11 @@
   stdenv,
   config,
   fetchurl,
-  libX11,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxrender,
   fontconfig,
   freetype,
   openal,
@@ -47,9 +47,9 @@ stdenv.mkDerivation {
     patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${
       makeLibraryPath [
         stdenv.cc.cc
-        libX11
-        libXext
-        libXrender
+        libx11
+        libxext
+        libxrender
         fontconfig
         freetype
       ]
@@ -62,9 +62,9 @@ stdenv.mkDerivation {
     patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${
       makeLibraryPath [
         stdenv.cc.cc
-        libX11
-        libXext
-        libXrender
+        libx11
+        libxext
+        libxrender
         fontconfig
         freetype
       ]
@@ -75,9 +75,9 @@ stdenv.mkDerivation {
     patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${
       makeLibraryPath [
         stdenv.cc.cc
-        libX11
-        libXext
-        libXrender
+        libx11
+        libxext
+        libxrender
         fontconfig
         freetype
       ]
@@ -90,20 +90,20 @@ stdenv.mkDerivation {
     patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${
       makeLibraryPath [
         stdenv.cc.cc
-        libX11
-        libXext
-        libXinerama
-        libXrandr
+        libx11
+        libxext
+        libxinerama
+        libxrandr
       ]
     }\
              libUnigine_$arch.so
     patchelf --set-rpath ${lib.getLib stdenv.cc.cc}/lib64:${
       makeLibraryPath [
         stdenv.cc.cc
-        libX11
-        libXext
-        libXinerama
-        libXrandr
+        libx11
+        libxext
+        libxinerama
+        libxrandr
       ]
     }\
              OilRush_$arch
diff --git a/pkgs/by-name/oi/ois/package.nix b/pkgs/by-name/oi/ois/package.nix
index e34157871dd4..e619fa6f72ad 100644
--- a/pkgs/by-name/oi/ois/package.nix
+++ b/pkgs/by-name/oi/ois/package.nix
@@ -3,7 +3,7 @@
   lib,
   fetchFromGitHub,
   cmake,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libX11 ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libx11 ];
 
   cmakeFlags = [
     "-DCMAKE_INSTALL_LIBDIR=lib"
diff --git a/pkgs/by-name/ol/olvid/package.nix b/pkgs/by-name/ol/olvid/package.nix
index d1f591ec3938..31a93fe6ce18 100644
--- a/pkgs/by-name/ol/olvid/package.nix
+++ b/pkgs/by-name/ol/olvid/package.nix
@@ -3,11 +3,11 @@
   lib,
   fetchurl,
   zlib,
-  libXext,
-  libX11,
-  libXrender,
-  libXtst,
-  libXi,
+  libxext,
+  libx11,
+  libxrender,
+  libxtst,
+  libxi,
   freetype,
   alsa-lib,
   jdk21,
@@ -80,11 +80,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     zlib
-    libXext
-    libX11
-    libXrender
-    libXtst
-    libXi
+    libxext
+    libx11
+    libxrender
+    libxtst
+    libxi
     freetype
     alsa-lib
   ];
diff --git a/pkgs/by-name/on/oneko/package.nix b/pkgs/by-name/on/oneko/package.nix
index 8eae793e0dec..c43f40b3fac6 100644
--- a/pkgs/by-name/on/oneko/package.nix
+++ b/pkgs/by-name/on/oneko/package.nix
@@ -4,8 +4,8 @@
   fetchFromGitHub,
   imake,
   gccmakedep,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -23,8 +23,8 @@ stdenv.mkDerivation (finalAttrs: {
     gccmakedep
   ];
   buildInputs = [
-    libX11
-    libXext
+    libx11
+    libxext
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/op/open-english-wordnet/package.nix b/pkgs/by-name/op/open-english-wordnet/package.nix
index e4e753d59169..9caa355a0b27 100644
--- a/pkgs/by-name/op/open-english-wordnet/package.nix
+++ b/pkgs/by-name/op/open-english-wordnet/package.nix
@@ -7,14 +7,14 @@
   stdenvNoCC,
 }:
 
-stdenvNoCC.mkDerivation (self: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "open-english-wordnet";
   version = "2022";
 
   src = fetchFromGitHub {
     owner = "globalwordnet";
     repo = "english-wordnet";
-    rev = "${self.version}-edition";
+    rev = "${finalAttrs.version}-edition";
     hash = "sha256-a1fWIp39uuJZL1aFX/r+ttLB1+kwh/XPHwphgENTQ5M=";
   };
 
@@ -49,14 +49,14 @@ stdenvNoCC.mkDerivation (self: {
     python scripts/merge.py
 
     echo Compressing
-    gzip --best --no-name --stdout ./wn.xml > 'oewn:${self.version}.xml.gz'
+    gzip --best --no-name --stdout ./wn.xml > 'oewn:${finalAttrs.version}.xml.gz'
 
     runHook postBuild
   '';
 
   installPhase = ''
     runHook preInstall
-    install -Dt $out/share/wordnet 'oewn:${self.version}.xml.gz'
+    install -Dt $out/share/wordnet 'oewn:${finalAttrs.version}.xml.gz'
     runHook postInstall
   '';
 
diff --git a/pkgs/by-name/op/open-vm-tools/package.nix b/pkgs/by-name/op/open-vm-tools/package.nix
index cede42911834..8d0823306974 100644
--- a/pkgs/by-name/op/open-vm-tools/package.nix
+++ b/pkgs/by-name/op/open-vm-tools/package.nix
@@ -16,13 +16,13 @@
   procps,
   libtirpc,
   rpcsvc-proto,
-  libX11,
-  libXext,
-  libXinerama,
-  libXi,
-  libXrender,
-  libXrandr,
-  libXtst,
+  libx11,
+  libxext,
+  libxinerama,
+  libxi,
+  libxrender,
+  libxrandr,
+  libxtst,
   libxcrypt,
   libxml2,
   pkg-config,
@@ -98,13 +98,13 @@ stdenv.mkDerivation (finalAttrs: {
     gdk-pixbuf-xlib
     gtk3
     gtkmm3
-    libX11
-    libXext
-    libXinerama
-    libXi
-    libXrender
-    libXrandr
-    libXtst
+    libx11
+    libxext
+    libxinerama
+    libxi
+    libxrender
+    libxrandr
+    libxtst
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/op/openbao/package.nix b/pkgs/by-name/op/openbao/package.nix
index aca2c8584063..6b9a6c5cf908 100644
--- a/pkgs/by-name/op/openbao/package.nix
+++ b/pkgs/by-name/op/openbao/package.nix
@@ -14,16 +14,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "openbao";
-  version = "2.4.4";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "openbao";
     repo = "openbao";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-V3lYm+FWqy0x7dTIE/Ii6W29BlspwBLlFFVIyohZzE8=";
+    hash = "sha256-4w+CkYhFS/P9ZeHiR2daK+DujqCKzF/aUAZbMcHqvyk=";
   };
 
-  vendorHash = "sha256-JlUvnY5UlIuSxjtejjIcQTwFdQcMJrRWH5qNKIio2Jo=";
+  vendorHash = "sha256-3QNiw3q0dhgWeGFBq4a5GCE3bIIa4YiJRKMU+Hakvx0=";
 
   proxyVendor = true;
 
diff --git a/pkgs/by-name/op/openbao/ui.nix b/pkgs/by-name/op/openbao/ui.nix
index cfb8e311e1cd..0a6e634e2b5e 100644
--- a/pkgs/by-name/op/openbao/ui.nix
+++ b/pkgs/by-name/op/openbao/ui.nix
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   offlineCache = yarn.fetchYarnBerryDeps {
     inherit (finalAttrs) src sourceRoot;
-    hash = "sha256-ZG/br4r2YzPPgsysx7MBy1WtUBkar1U84nkKecZ5bvU=";
+    hash = "sha256-XK3ZVnzOTbFzrpPgaz1cx7okTycLhrvBHk9P2Nwv1cg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/op/openboard/package.nix b/pkgs/by-name/op/openboard/package.nix
index 5117c2e7f18f..7af17060a913 100644
--- a/pkgs/by-name/op/openboard/package.nix
+++ b/pkgs/by-name/op/openboard/package.nix
@@ -22,8 +22,8 @@
   lame,
   fdk_aac,
   libass,
-  libXext,
-  libXfixes,
+  libxext,
+  libxfixes,
 }:
 
 let
@@ -89,8 +89,8 @@ stdenv.mkDerivation (finalAttrs: {
     fdk_aac
     libass
     quazip
-    libXext
-    libXfixes
+    libxext
+    libxfixes
   ];
 
   meta = {
diff --git a/pkgs/by-name/op/openbox/package.nix b/pkgs/by-name/op/openbox/package.nix
index 0929d85f8aef..bf1f1f274351 100644
--- a/pkgs/by-name/op/openbox/package.nix
+++ b/pkgs/by-name/op/openbox/package.nix
@@ -7,10 +7,10 @@
   pkg-config,
   python3,
   libxml2,
-  libXinerama,
-  libXcursor,
-  libXau,
-  libXrandr,
+  libxinerama,
+  libxcursor,
+  libxau,
+  libxrandr,
   libice,
   libsm,
   imlib2,
@@ -32,10 +32,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libxml2
-    libXinerama
-    libXcursor
-    libXau
-    libXrandr
+    libxinerama
+    libxcursor
+    libxau
+    libxrandr
     libice
     libsm
     libstartup_notification
diff --git a/pkgs/by-name/op/opencascade-occt/package.nix b/pkgs/by-name/op/opencascade-occt/package.nix
index 72f84459a5f4..18ec7d85ef52 100644
--- a/pkgs/by-name/op/opencascade-occt/package.nix
+++ b/pkgs/by-name/op/opencascade-occt/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
   fetchpatch,
   cmake,
   ninja,
@@ -10,39 +10,39 @@
   tk,
   libGL,
   libGLU,
-  libXext,
-  libXmu,
-  libXi,
+  libxext,
+  libxmu,
+  libxi,
   vtk,
   withVtk ? false,
-
-  # used in passthru.tests
   opencascade-occt,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "opencascade-occt";
-  version = "7.8.1";
-  commit = "V${builtins.replaceStrings [ "." ] [ "_" ] version}";
+  version = "7.9.3";
 
-  src = fetchurl {
-    name = "occt-${commit}.tar.gz";
-    url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz";
-    hash = "sha256-AGMZqTLLjXbzJFW/RSTsohAGV8sMxlUmdU/Y2oOzkk8=";
+  src = fetchFromGitHub {
+    owner = "Open-Cascade-SAS";
+    repo = "OCCT";
+    tag = "V${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
+    hash = "sha256-Zp4m+f1wrzynoCrzIwvYELUXsY/NQIBY+HFk5UteufI=";
   };
 
-  patches = [
+  patches = lib.optionals (lib.versionOlder finalAttrs.version "7.9") [
     # fix compilation on darwin against latest version of freetype
     # https://gitlab.freedesktop.org/freetype/freetype/-/merge_requests/330
     (fetchpatch {
       url = "https://github.com/Open-Cascade-SAS/OCCT/commit/7236e83dcc1e7284e66dc61e612154617ef715d6.diff";
       hash = "sha256-NoC2mE3DG78Y0c9UWonx1vmXoU4g5XxFUT3eVXqLU60=";
     })
-
-    # patch does not apply against 7.9+, it was submitted upstream for future
-    # inclusion: https://github.com/Open-Cascade-SAS/OCCT/pull/683
-    ./vtk-draw-conditional-glx.patch
   ];
 
+  # Exclude TKIVtkDraw toolkits cause VTK has no glx support on darwin
+  postPatch = lib.optionalString (withVtk && stdenv.hostPlatform.isDarwin) ''
+    substituteInPlace adm/MODULES \
+      --replace-fail "TKIVtkDraw" ""
+  '';
+
   nativeBuildInputs = [
     cmake
     ninja
@@ -53,9 +53,9 @@ stdenv.mkDerivation rec {
     tk
     libGL
     libGLU
-    libXext
-    libXmu
-    libXi
+    libxext
+    libxmu
+    libxi
     rapidjson
   ]
   ++ lib.optional withVtk vtk;
@@ -89,4 +89,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ amiloradovsky ];
     platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/op/opencascade-occt/vtk-draw-conditional-glx.patch b/pkgs/by-name/op/opencascade-occt/vtk-draw-conditional-glx.patch
deleted file mode 100644
index 76993ae6046f..000000000000
--- a/pkgs/by-name/op/opencascade-occt/vtk-draw-conditional-glx.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 86905287dc..19214e8f2d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -623,5 +623,9 @@ if (USE_VTK)
-   add_definitions (-DHAVE_VTK)
-   set (OCCT_VTK_USED_TARGETS "" CACHE INTERNAL "" FORCE)
-   OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/vtk")
-+  if (DEFINED VTK_USE_X AND NOT VTK_USE_X)
-+      message (STATUS "Info: TKIVtkDraw toolkits excluded due to VTK has no glx support")
-+      list (REMOVE_ITEM BUILD_TOOLKITS TKIVtkDraw)
-+  endif()
- else()
-   OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_VTK")
diff --git a/pkgs/by-name/op/opencode-desktop/package.nix b/pkgs/by-name/op/opencode-desktop/package.nix
index 4e49e03d8919..83127971a25e 100644
--- a/pkgs/by-name/op/opencode-desktop/package.nix
+++ b/pkgs/by-name/op/opencode-desktop/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ;
 
   cargoRoot = "packages/desktop/src-tauri";
-  cargoHash = "sha256-bLM/ZcUaaswFrg+WogY81HnTn5do/7tu+JA/+tJNmMw=";
+  cargoHash = "sha256-zdqquibtTpMAoY9qjzjGNnq3+GFXKYGj9K3+hKpcsag=";
   buildAndTestSubdir = finalAttrs.cargoRoot;
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index a5ff12e39de5..5061a54891f0 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -14,12 +14,12 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "1.1.47";
+  version = "1.1.53";
   src = fetchFromGitHub {
     owner = "anomalyco";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-f6TVxKV9q2yEQ9r9VCTttXLqpOrYdTEKDUJs+MuQJCQ=";
+    hash = "sha256-VddWpvtoDJlbbesJL6VlP99/NJqkHbN8Rdv1XccNRZM=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {
@@ -70,9 +70,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
     outputHash =
       if stdenvNoCC.hostPlatform.isDarwin then
-        "sha256-BJmyALnZEiAnC8+bsri5Me1Z0Vtf6A/27e7Eve4IvDo="
+        "sha256-m0vAVv8zS8RgU6YpEVbf6l6vilkU+CP/PtAD6U5g/F8="
       else
-        "sha256-zkinMkPR1hCBbB5BIuqozQZDpjX4eiFXjM6lpwUx1fM=";
+        "sha256-S69x2yRym+h0hbc6wHFOeTxYi9nbBgEJGaZKhUbmdxI=";
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };
diff --git a/pkgs/by-name/op/opencsg/package.nix b/pkgs/by-name/op/opencsg/package.nix
index e7c97b1efdd6..134d6af97caf 100644
--- a/pkgs/by-name/op/opencsg/package.nix
+++ b/pkgs/by-name/op/opencsg/package.nix
@@ -7,9 +7,9 @@
   libGL,
   libglut,
   glew,
-  libXmu,
-  libXext,
-  libX11,
+  libxmu,
+  libxext,
+  libx11,
   fixDarwinDylibNames,
 }:
 
@@ -33,9 +33,9 @@ stdenv.mkDerivation (finalAttrs: {
     libGLU
     libGL
     libglut
-    libXmu
-    libXext
-    libX11
+    libxmu
+    libxext
+    libx11
   ];
 
   doCheck = false;
diff --git a/pkgs/by-name/op/opengist/package.nix b/pkgs/by-name/op/opengist/package.nix
index 619f32ddba22..d96f4f34f286 100644
--- a/pkgs/by-name/op/opengist/package.nix
+++ b/pkgs/by-name/op/opengist/package.nix
@@ -13,13 +13,13 @@
 buildGoModule (finalAttrs: {
   pname = "opengist";
 
-  version = "1.12.0";
+  version = "1.12.1";
 
   src = fetchFromGitHub {
     owner = "thomiceli";
     repo = "opengist";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-18anU/D8EvwA8Ind+GGhw9nSdcbo1l5K98cFie8hBCk=";
+    hash = "sha256-vjNrcT4IaCB+QRvvPo0oeLtFgmYXk5DDs5gYvzk4ddo=";
   };
 
   frontend = buildNpmPackage {
diff --git a/pkgs/by-name/op/opengothic/package.nix b/pkgs/by-name/op/opengothic/package.nix
index 60750ff5d4d6..53013299c158 100644
--- a/pkgs/by-name/op/opengothic/package.nix
+++ b/pkgs/by-name/op/opengothic/package.nix
@@ -4,8 +4,8 @@
   fetchFromGitHub,
   glslang,
   lib,
-  libX11,
-  libXcursor,
+  libx11,
+  libxcursor,
   libglvnd,
   makeWrapper,
   ninja,
@@ -36,8 +36,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     alsa-lib
-    libX11
-    libXcursor
+    libx11
+    libxcursor
     libglvnd
     vulkan-headers
     vulkan-loader
diff --git a/pkgs/by-name/op/opengrok/package.nix b/pkgs/by-name/op/opengrok/package.nix
index 7d0ed3c8949c..d586801f8ba6 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.10";
+  version = "1.14.11";
 
   # binary distribution
   src = fetchurl {
     url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz";
-    hash = "sha256-3ZxbbTSrXzUNHQp5cC81zznucpJ2nHp+0U01tJ+/Cu0=";
+    hash = "sha256-05Aw44JmTHyy6JRWPk5+gv5BDN/W1ci0ddjPfvww0zI=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/op/openjfx/package.nix b/pkgs/by-name/op/openjfx/package.nix
index d8521cfc1268..3cd764dfda16 100644
--- a/pkgs/by-name/op/openjfx/package.nix
+++ b/pkgs/by-name/op/openjfx/package.nix
@@ -15,8 +15,8 @@
 
   gtk2,
   gtk3,
-  libXtst,
-  libXxf86vm,
+  libxtst,
+  libxxf86vm,
   glib,
   alsa-lib,
   ffmpeg_7,
@@ -107,8 +107,8 @@ stdenv.mkDerivation {
   buildInputs = [
     gtk2
     gtk3
-    libXtst
-    libXxf86vm
+    libxtst
+    libxxf86vm
     glib
     alsa-lib
     (if atLeast21 then ffmpeg_7 else ffmpeg_7-headless)
diff --git a/pkgs/by-name/op/openjk/package.nix b/pkgs/by-name/op/openjk/package.nix
index bd40403d56e7..aa4d8c125669 100644
--- a/pkgs/by-name/op/openjk/package.nix
+++ b/pkgs/by-name/op/openjk/package.nix
@@ -9,7 +9,7 @@
   zlib,
   libpng,
   libGL,
-  libX11,
+  libx11,
   SDL2,
   unstableGitUpdater,
 }:
@@ -65,7 +65,7 @@ stdenv.mkDerivation {
     zlib
     libpng
     libGL
-    libX11
+    libx11
     SDL2
   ];
 
diff --git a/pkgs/by-name/op/openlierox/package.nix b/pkgs/by-name/op/openlierox/package.nix
index 471d8986e18a..b45e72e2418a 100644
--- a/pkgs/by-name/op/openlierox/package.nix
+++ b/pkgs/by-name/op/openlierox/package.nix
@@ -6,7 +6,7 @@
   pkg-config,
   curl,
   gd,
-  libX11,
+  libx11,
   libxml2,
   libzip,
   SDL,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     curl
     gd
-    libX11
+    libx11
     libxml2
     libzip
     SDL
diff --git a/pkgs/by-name/op/openmsx/package.nix b/pkgs/by-name/op/openmsx/package.nix
index 734522bea203..89e0ff2e760d 100644
--- a/pkgs/by-name/op/openmsx/package.nix
+++ b/pkgs/by-name/op/openmsx/package.nix
@@ -15,7 +15,7 @@
   libpng,
   libtheora,
   libvorbis,
-  libX11,
+  libx11,
   python3,
   tcl,
   zlib,
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     SDL2
     SDL2_image
     SDL2_ttf
-    libX11
+    libx11
     alsa-lib
     freetype
     glew
diff --git a/pkgs/by-name/op/openmw/package.nix b/pkgs/by-name/op/openmw/package.nix
index f3f3a15aece9..4e723af9d831 100644
--- a/pkgs/by-name/op/openmw/package.nix
+++ b/pkgs/by-name/op/openmw/package.nix
@@ -10,7 +10,7 @@
   cmake,
   collada-dom,
   ffmpeg,
-  libXt,
+  libxt,
   lua,
   luajit,
   lz4,
@@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
     boost
     collada-dom
     ffmpeg
-    libXt
+    libxt
     (if isAarch64Linux then lua else luajit)
     lz4
     mygui
diff --git a/pkgs/by-name/op/openrw/package.nix b/pkgs/by-name/op/openrw/package.nix
index 9b847782b465..70ad5386fb75 100644
--- a/pkgs/by-name/op/openrw/package.nix
+++ b/pkgs/by-name/op/openrw/package.nix
@@ -16,7 +16,7 @@
   libGL,
   libGLU,
   libmad,
-  libX11,
+  libx11,
   openal,
 
   unstableGitUpdater,
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
     libGL
     libGLU
     libmad
-    libX11
+    libx11
     openal
   ];
 
diff --git a/pkgs/by-name/op/opensc/package.nix b/pkgs/by-name/op/opensc/package.nix
index bd4183cec054..5487b6ef17d7 100644
--- a/pkgs/by-name/op/opensc/package.nix
+++ b/pkgs/by-name/op/opensc/package.nix
@@ -10,7 +10,7 @@
   libiconv,
   pcsclite,
   libassuan,
-  libXt,
+  libxt,
   docbook_xsl,
   libxslt,
   docbook_xml_dtd_412,
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     readline
     openssl
     libassuan
-    libXt
+    libxt
     libiconv
     docbook_xml_dtd_412
   ]
diff --git a/pkgs/by-name/op/openscenegraph/package.nix b/pkgs/by-name/op/openscenegraph/package.nix
index a06eefd84fac..95e35c44172c 100644
--- a/pkgs/by-name/op/openscenegraph/package.nix
+++ b/pkgs/by-name/op/openscenegraph/package.nix
@@ -7,9 +7,9 @@
   cmake,
   pkg-config,
   doxygen,
-  libX11,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxinerama,
+  libxrandr,
   libGLU,
   libGL,
   glib,
@@ -79,9 +79,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs =
     lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      libX11
-      libXinerama
-      libXrandr
+      libx11
+      libxinerama
+      libxrandr
       libGLU
       libGL
     ]
diff --git a/pkgs/by-name/op/openspades/package.nix b/pkgs/by-name/op/openspades/package.nix
index d71d264e5d20..4379fbe12e2c 100644
--- a/pkgs/by-name/op/openspades/package.nix
+++ b/pkgs/by-name/op/openspades/package.nix
@@ -19,7 +19,7 @@
   openal,
   opusfile,
   libogg,
-  libXext,
+  libxext,
 }:
 
 stdenv.mkDerivation rec {
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     opusfile
     openal
     libogg
-    libXext
+    libxext
   ];
 
   patches = [
diff --git a/pkgs/by-name/op/opensubdiv/package.nix b/pkgs/by-name/op/opensubdiv/package.nix
index 87c68e669c23..ed7e9e9d0b3e 100644
--- a/pkgs/by-name/op/opensubdiv/package.nix
+++ b/pkgs/by-name/op/opensubdiv/package.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "opensubdiv";
-  version = "3.6.1";
+  version = "3.7.0";
 
   src = fetchFromGitHub {
     owner = "PixarAnimationStudios";
     repo = "OpenSubdiv";
     tag = "v${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
-    hash = "sha256-/22SeMzNNnrUgmPGpgbQwoYthdAdhRa615VhVJOvP9o=";
+    hash = "sha256-yWi+SaJfyMHPnc8hhrMZ4W6cBRkFOhRehXg3BqSGPcM=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/op/opentabletdriver/package.nix b/pkgs/by-name/op/opentabletdriver/package.nix
index 04a3730acb58..f3b81bd51a94 100644
--- a/pkgs/by-name/op/opentabletdriver/package.nix
+++ b/pkgs/by-name/op/opentabletdriver/package.nix
@@ -10,8 +10,8 @@
   libappindicator,
   libevdev,
   libnotify,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
   makeDesktopItem,
   nixosTests,
   udev,
@@ -60,8 +60,8 @@ buildDotnetModule (finalAttrs: {
     libappindicator
     libevdev
     libnotify
-    libX11
-    libXrandr
+    libx11
+    libxrandr
     udev
   ];
 
diff --git a/pkgs/by-name/op/openterface-qt/package.nix b/pkgs/by-name/op/openterface-qt/package.nix
index da78f25d07b3..a23e80556e6e 100644
--- a/pkgs/by-name/op/openterface-qt/package.nix
+++ b/pkgs/by-name/op/openterface-qt/package.nix
@@ -20,13 +20,13 @@ let
     KERNEL=="hidraw*", ATTRS{idVendor}=="534d", ATTRS{idProduct}=="2109", TAG+="uaccess"
   '';
 in
-stdenv.mkDerivation (final: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "openterface-qt";
   version = "0.3.18";
   src = fetchFromGitHub {
     owner = "TechxArtisanStudio";
     repo = "Openterface_QT";
-    rev = "${final.version}";
+    rev = "${finalAttrs.version}";
     hash = "sha256-yD71UOi6iRd9N3NeASUzqoeHMcTYIqkysAfxRm7GkOA=";
   };
   nativeBuildInputs = [
@@ -62,8 +62,8 @@ stdenv.mkDerivation (final: {
     (makeDesktopItem {
       name = "openterfaceQT";
       exec = "openterfaceQT";
-      icon = final.pname;
-      comment = final.meta.description;
+      icon = finalAttrs.pname;
+      comment = finalAttrs.meta.description;
       desktopName = "Openterface QT";
       categories = [ "Utility" ];
     })
diff --git a/pkgs/by-name/op/opentrack/package.nix b/pkgs/by-name/op/opentrack/package.nix
index ff563f2c97bb..3f0e59c1947a 100644
--- a/pkgs/by-name/op/opentrack/package.nix
+++ b/pkgs/by-name/op/opentrack/package.nix
@@ -12,7 +12,7 @@
   opencv4,
   procps,
   eigen,
-  libXdmcp,
+  libxdmcp,
   libevdev,
   makeDesktopItem,
   wineWowPackages,
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     finalAttrs.aruco
     eigen
-    libXdmcp
+    libxdmcp
     libevdev
     onnxruntime
     opencv4
diff --git a/pkgs/by-name/op/openutau/package.nix b/pkgs/by-name/op/openutau/package.nix
index f4d23ff32d6e..c6cd7004a650 100644
--- a/pkgs/by-name/op/openutau/package.nix
+++ b/pkgs/by-name/op/openutau/package.nix
@@ -8,7 +8,7 @@
   dbus,
   fontconfig,
   portaudio,
-  libXi,
+  libxi,
   copyDesktopItems,
   makeDesktopItem,
 }:
@@ -61,7 +61,7 @@ buildDotnetModule rec {
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
     fontconfig
-    libXi
+    libxi
   ];
 
   dotnetInstallFlags = [ "-p:PublishReadyToRun=false" ];
diff --git a/pkgs/by-name/op/openxr-loader/package.nix b/pkgs/by-name/op/openxr-loader/package.nix
index 3b9232e3934a..12cb9367e534 100644
--- a/pkgs/by-name/op/openxr-loader/package.nix
+++ b/pkgs/by-name/op/openxr-loader/package.nix
@@ -4,9 +4,9 @@
   fetchFromGitHub,
   cmake,
   python3,
-  libX11,
-  libXxf86vm,
-  libXrandr,
+  libx11,
+  libxxf86vm,
+  libxrandr,
   vulkan-headers,
   libGL,
   vulkan-loader,
@@ -36,9 +36,9 @@ stdenv.mkDerivation (finalAttrs: {
     vulkan-loader
   ]
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    libX11
-    libXxf86vm
-    libXrandr
+    libx11
+    libxxf86vm
+    libxrandr
     wayland
   ];
 
diff --git a/pkgs/by-name/os/osmid/package.nix b/pkgs/by-name/os/osmid/package.nix
index 0c40e5df6095..86d9bf8368e8 100644
--- a/pkgs/by-name/os/osmid/package.nix
+++ b/pkgs/by-name/os/osmid/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   alsa-lib,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     alsa-lib
-    libX11
+    libx11
   ];
 
   installPhase = ''
diff --git a/pkgs/by-name/ou/outfly/package.nix b/pkgs/by-name/ou/outfly/package.nix
index 527f94a2dbc4..100b5810e37d 100644
--- a/pkgs/by-name/ou/outfly/package.nix
+++ b/pkgs/by-name/ou/outfly/package.nix
@@ -9,10 +9,10 @@
   libGL,
   vulkan-loader,
   wayland,
-  libXrandr,
-  libXcursor,
-  libX11,
-  libXi,
+  libxrandr,
+  libxcursor,
+  libx11,
+  libxi,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -28,15 +28,15 @@ rustPlatform.buildRustPackage rec {
   runtimeInputs = [
     libxkbcommon
     libGL
-    libXrandr
-    libX11
+    libxrandr
+    libx11
     vulkan-loader
   ];
 
   buildInputs = [
     alsa-lib.dev
-    libXcursor
-    libXi
+    libxcursor
+    libxi
     wayland
   ];
 
diff --git a/pkgs/by-name/ov/ovftool/package.nix b/pkgs/by-name/ov/ovftool/package.nix
index fe4888375a97..1caa02e0bf16 100644
--- a/pkgs/by-name/ov/ovftool/package.nix
+++ b/pkgs/by-name/ov/ovftool/package.nix
@@ -95,7 +95,7 @@ let
     };
   });
 in
-stdenv.mkDerivation (final: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ovftool";
   inherit (ovftoolSystem) version;
 
@@ -109,7 +109,7 @@ stdenv.mkDerivation (final: {
         See the following URL for terms of using this software:
         ${mkBaseUrl ovftoolId}
 
-        Use `${final.pname}.override { acceptBroadcomEula = true; }` if you accept Broadcom's terms
+        Use `${finalAttrs.pname}.override { acceptBroadcomEula = true; }` if you accept Broadcom's terms
         and would like to use this package.
       '';
 
diff --git a/pkgs/by-name/ox/oxefmsynth/package.nix b/pkgs/by-name/ox/oxefmsynth/package.nix
index 54d4ff87250c..d2e6eea997d8 100644
--- a/pkgs/by-name/ox/oxefmsynth/package.nix
+++ b/pkgs/by-name/ox/oxefmsynth/package.nix
@@ -2,7 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  libX11,
+  libx11,
   vst2-sdk,
 }:
 stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   buildFlags = [ "VSTSDK_PATH=${vst2-sdk}" ];
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   installPhase = ''
     mkdir -p $out/lib/lxvst
diff --git a/pkgs/by-name/ox/oxwm/package.nix b/pkgs/by-name/ox/oxwm/package.nix
index e9de0f4fa38c..9f33f1a1b745 100644
--- a/pkgs/by-name/ox/oxwm/package.nix
+++ b/pkgs/by-name/ox/oxwm/package.nix
@@ -3,9 +3,9 @@
   rustPlatform,
   fetchFromGitHub,
   pkg-config,
-  libX11,
-  libXft,
-  libXrender,
+  libx11,
+  libxft,
+  libxrender,
   freetype,
   fontconfig,
   versionCheckHook,
@@ -26,9 +26,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    libX11
-    libXft
-    libXrender
+    libx11
+    libxft
+    libxrender
     freetype
     fontconfig
   ];
diff --git a/pkgs/by-name/p1/p11-kit/package.nix b/pkgs/by-name/p1/p11-kit/package.nix
index 44e53de8e77d..dcdc9549c38a 100644
--- a/pkgs/by-name/p1/p11-kit/package.nix
+++ b/pkgs/by-name/p1/p11-kit/package.nix
@@ -101,5 +101,6 @@ stdenv.mkDerivation rec {
     ];
     license = lib.licenses.bsd3;
     mainProgram = "p11-kit";
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "p11-kit_project" version;
   };
 }
diff --git a/pkgs/by-name/pa/pa_applet/package.nix b/pkgs/by-name/pa/pa_applet/package.nix
index 227f1bdd374b..c32aabca6e67 100644
--- a/pkgs/by-name/pa/pa_applet/package.nix
+++ b/pkgs/by-name/pa/pa_applet/package.nix
@@ -9,7 +9,7 @@
   autoconf,
   automake,
   libnotify,
-  libX11,
+  libx11,
   xf86-input-evdev,
 }:
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
     libpulseaudio
     glibc
     libnotify
-    libX11
+    libx11
     xf86-input-evdev
   ];
 
diff --git a/pkgs/by-name/pa/pacman/package.nix b/pkgs/by-name/pa/pacman/package.nix
index e73805e5e1a9..d4faa6298245 100644
--- a/pkgs/by-name/pa/pacman/package.nix
+++ b/pkgs/by-name/pa/pacman/package.nix
@@ -39,7 +39,7 @@
   sysHookDir ? "/usr/share/libalpm/hooks/",
 }:
 
-stdenv.mkDerivation (final: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pacman";
   version = "7.0.0";
 
@@ -47,7 +47,7 @@ stdenv.mkDerivation (final: {
     domain = "gitlab.archlinux.org";
     owner = "pacman";
     repo = "pacman";
-    rev = "v${final.version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-ejOBxN2HjV4dZwFA7zvPz3JUJa0xiJ/jZ+evEQYG1Mc=";
   };
 
@@ -132,7 +132,7 @@ stdenv.mkDerivation (final: {
   meta = {
     description = "Simple library-based package manager";
     homepage = "https://archlinux.org/pacman/";
-    changelog = "https://gitlab.archlinux.org/pacman/pacman/-/raw/v${final.version}/NEWS";
+    changelog = "https://gitlab.archlinux.org/pacman/pacman/-/raw/v${finalAttrs.version}/NEWS";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
     mainProgram = "pacman";
diff --git a/pkgs/by-name/pa/pango/package.nix b/pkgs/by-name/pa/pango/package.nix
index 15951f311426..0f6edca0299a 100644
--- a/pkgs/by-name/pa/pango/package.nix
+++ b/pkgs/by-name/pa/pango/package.nix
@@ -18,7 +18,7 @@
   python3,
   docutils,
   x11Support ? !stdenv.hostPlatform.isDarwin,
-  libXft,
+  libxft,
   withIntrospection ?
     lib.meta.availableOn stdenv.hostPlatform gobject-introspection
     && stdenv.hostPlatform.emulatorAvailable buildPackages,
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
     harfbuzz
   ]
   ++ lib.optionals x11Support [
-    libXft
+    libxft
   ];
 
   mesonFlags = [
diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index 24690fe25769..252e7a0bc612 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -30,13 +30,13 @@
   lndir,
 }:
 let
-  version = "2.20.5";
+  version = "2.20.6";
 
   src = fetchFromGitHub {
     owner = "paperless-ngx";
     repo = "paperless-ngx";
     tag = "v${version}";
-    hash = "sha256-EZaAn55gilvTitAo0p7U3BeqNI9iYIWg147BbO2fp9M=";
+    hash = "sha256-rTkkvSkgYQtT9KglXsyf4SWwjoJWtX5YwcVUbEbLac0=";
   };
 
   python = python3.override {
diff --git a/pkgs/by-name/pa/paperview/package.nix b/pkgs/by-name/pa/paperview/package.nix
index 8330fce65dea..174f9bd2065a 100644
--- a/pkgs/by-name/pa/paperview/package.nix
+++ b/pkgs/by-name/pa/paperview/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
   SDL2,
 }:
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     SDL2
-    libX11
+    libx11
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/pa/pappl/package.nix b/pkgs/by-name/pa/pappl/package.nix
index 9be4f86eb3e9..15a4ac9cf02b 100644
--- a/pkgs/by-name/pa/pappl/package.nix
+++ b/pkgs/by-name/pa/pappl/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pappl";
-  version = "1.4.9";
+  version = "1.4.10";
 
   src = fetchFromGitHub {
     owner = "michaelrsweet";
     repo = "pappl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XHFYwl129iD5rKC1P/roFlX+03uFE8ofwQRIEkUuOCc=";
+    hash = "sha256-nSjJLmkM730edY+rzxY7JSvwJoQdJiW/XBBsD+TY2ys=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/pa/pari/package.nix b/pkgs/by-name/pa/pari/package.nix
index 1c46403914c6..4f0c3f7f6f8c 100644
--- a/pkgs/by-name/pa/pari/package.nix
+++ b/pkgs/by-name/pa/pari/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   gmp,
-  libX11,
+  libx11,
   libpthread-stubs,
   perl,
   readline,
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gmp
-    libX11
+    libx11
     perl
     readline
     texliveBasic
diff --git a/pkgs/by-name/pa/parole/package.nix b/pkgs/by-name/pa/parole/package.nix
index f3a5c0de09ae..27de3d3d79d8 100644
--- a/pkgs/by-name/pa/parole/package.nix
+++ b/pkgs/by-name/pa/parole/package.nix
@@ -12,7 +12,7 @@
   glib,
   gtk3,
   libnotify,
-  libX11,
+  libx11,
   libxfce4ui,
   libxfce4util,
   taglib,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     gtk3
     libnotify
-    libX11
+    libx11
     libxfce4ui
     libxfce4util
     taglib
diff --git a/pkgs/by-name/pa/partio/package.nix b/pkgs/by-name/pa/partio/package.nix
index 821a1472a285..e85bcdb60ccd 100644
--- a/pkgs/by-name/pa/partio/package.nix
+++ b/pkgs/by-name/pa/partio/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "partio";
-  version = "1.19.0";
+  version = "1.20.0";
 
   src = fetchFromGitHub {
     owner = "wdas";
     repo = "partio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-p3mpxP0slHIQ75UtNAr5PcSOaSt9UyGR/MyOZ2GoXdU=";
+    hash = "sha256-uzMp3jj0HUB6vOjc/uvvT4Bmi6xp0qz4OYPG+bmlgaM=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/pa/patcher9x/package.nix b/pkgs/by-name/pa/patcher9x/package.nix
index 78f8abe489ad..6785d18ad69e 100644
--- a/pkgs/by-name/pa/patcher9x/package.nix
+++ b/pkgs/by-name/pa/patcher9x/package.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
 }:
 
-stdenv.mkDerivation (finalAttr: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "patcher9x";
   version = "0.8.50";
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttr: {
     (fetchFromGitHub {
       owner = "JHRobotics";
       repo = "patcher9x";
-      rev = "v${finalAttr.version}";
+      rev = "v${finalAttrs.version}";
       hash = "sha256-TZw2+R7Dzojzxzal1Wp8jhe5gwU4CfZDROITi5Z+auo=";
       name = "src";
     })
diff --git a/pkgs/by-name/pc/pcl/package.nix b/pkgs/by-name/pc/pcl/package.nix
index 059c5938036d..30e8b651e70b 100644
--- a/pkgs/by-name/pc/pcl/package.nix
+++ b/pkgs/by-name/pc/pcl/package.nix
@@ -11,7 +11,7 @@
 
   # buildInputs
   eigen,
-  libXt,
+  libxt,
   libpcap,
   libusb1,
   llvmPackages,
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     eigen
-    libXt
+    libxt
     libpcap
     qt6.qtbase
     libusb1
diff --git a/pkgs/by-name/pc/pcloud/package.nix b/pkgs/by-name/pc/pcloud/package.nix
index 0f0f637c8f12..62199f8631e3 100644
--- a/pkgs/by-name/pc/pcloud/package.nix
+++ b/pkgs/by-name/pc/pcloud/package.nix
@@ -32,7 +32,7 @@
   gsettings-desktop-schemas,
   gtk3,
   libdbusmenu-gtk2,
-  libXdamage,
+  libxdamage,
   nss,
   udev,
 }:
@@ -73,7 +73,7 @@ stdenv.mkDerivation {
     fuse
     gtk3
     libdbusmenu-gtk2
-    libXdamage
+    libxdamage
     nss
     udev
   ];
diff --git a/pkgs/by-name/pc/pcmanfm/package.nix b/pkgs/by-name/pc/pcmanfm/package.nix
index 34fdbfe53b48..5c55366879e7 100644
--- a/pkgs/by-name/pc/pcmanfm/package.nix
+++ b/pkgs/by-name/pc/pcmanfm/package.nix
@@ -6,7 +6,7 @@
   glib,
   intltool,
   libfm,
-  libX11,
+  libx11,
   pango,
   pkg-config,
   wrapGAppsHook3,
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     gtk
     libfm'
-    libX11
+    libx11
     pango
     adwaita-icon-theme
   ];
diff --git a/pkgs/by-name/pc/pcmanx-gtk2/package.nix b/pkgs/by-name/pc/pcmanx-gtk2/package.nix
index 5829245c19ff..72ce2a596bdc 100644
--- a/pkgs/by-name/pc/pcmanx-gtk2/package.nix
+++ b/pkgs/by-name/pc/pcmanx-gtk2/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   gtk2,
-  libXft,
+  libxft,
   intltool,
   automake,
   autoconf,
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     gtk2
-    libXft
+    libxft
     libtool
   ];
 
diff --git a/pkgs/by-name/pc/pcsx2/package.nix b/pkgs/by-name/pc/pcsx2/package.nix
index 48c583437036..da40c9eb4b8a 100644
--- a/pkgs/by-name/pc/pcsx2/package.nix
+++ b/pkgs/by-name/pc/pcsx2/package.nix
@@ -8,7 +8,7 @@
   extra-cmake-modules,
   ffmpeg,
   gtk3,
-  libXrandr,
+  libxrandr,
   libaio,
   libbacktrace,
   libpcap,
@@ -91,7 +91,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     libbacktrace
     libpcap
     libwebp
-    libXrandr
+    libxrandr
     lz4
     qtbase
     qtsvg
diff --git a/pkgs/by-name/pe/pekwm/package.nix b/pkgs/by-name/pe/pekwm/package.nix
index b8dbf284a0b5..0f3f0dea03d7 100644
--- a/pkgs/by-name/pe/pekwm/package.nix
+++ b/pkgs/by-name/pe/pekwm/package.nix
@@ -5,11 +5,11 @@
   gawk,
   cmake,
   gnugrep,
-  libXext,
-  libXft,
-  libXinerama,
-  libXpm,
-  libXrandr,
+  libxext,
+  libxft,
+  libxinerama,
+  libxpm,
+  libxrandr,
   libjpeg,
   libpng,
   pkg-config,
@@ -34,11 +34,11 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libXext
-    libXft
-    libXinerama
-    libXpm
-    libXrandr
+    libxext
+    libxft
+    libxinerama
+    libxpm
+    libxrandr
     libjpeg
     libpng
   ];
diff --git a/pkgs/by-name/ph/phrase-cli/package.nix b/pkgs/by-name/ph/phrase-cli/package.nix
index a0bfc27d0188..8db018f829c4 100644
--- a/pkgs/by-name/ph/phrase-cli/package.nix
+++ b/pkgs/by-name/ph/phrase-cli/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "phrase-cli";
-  version = "2.55.1";
+  version = "2.55.2";
 
   src = fetchFromGitHub {
     owner = "phrase";
     repo = "phrase-cli";
     rev = version;
-    sha256 = "sha256-hcq6ZCWeKRmjshLYXNDOULWXyPc/N6vNf9at7A1b7h0=";
+    sha256 = "sha256-8Gn9B+A5w80T3Yw+mg0tAI1IsdeCRe4ToNU168nP/yQ=";
   };
 
   vendorHash = "sha256-dpB8m02juic883lCwLwIL9356AHpzNy9td0s/e4UeDA=";
diff --git a/pkgs/by-name/pi/picom/package.nix b/pkgs/by-name/pi/picom/package.nix
index c3579e63b692..61efbb593b3c 100644
--- a/pkgs/by-name/pi/picom/package.nix
+++ b/pkgs/by-name/pi/picom/package.nix
@@ -10,10 +10,10 @@
   libev,
   libGL,
   libepoxy,
-  libX11,
+  libx11,
   libxcb,
   libxdg_basedir,
-  libXext,
+  libxext,
   libxml2,
   libxslt,
   makeWrapper,
@@ -65,10 +65,10 @@ stdenv.mkDerivation (finalAttrs: {
     libev
     libGL
     libepoxy
-    libX11
+    libx11
     libxcb
     libxdg_basedir
-    libXext
+    libxext
     libxml2
     libxslt
     pcre2
diff --git a/pkgs/by-name/pi/piglit/package.nix b/pkgs/by-name/pi/piglit/package.nix
index 527bced7afb8..a761cf3c950a 100644
--- a/pkgs/by-name/pi/piglit/package.nix
+++ b/pkgs/by-name/pi/piglit/package.nix
@@ -19,9 +19,9 @@
   wayland,
   wayland-protocols,
   wayland-scanner,
-  libXau,
-  libX11,
-  libXrender,
+  libxau,
+  libx11,
+  libxrender,
   libxcb,
   libxkbcommon,
   mesa,
@@ -47,9 +47,9 @@ stdenv.mkDerivation {
     libGL
     libGLU
     libglvnd
-    libXau
-    libX11
-    libXrender
+    libxau
+    libx11
+    libxrender
     libxcb
     libxkbcommon
     (python3.withPackages (
diff --git a/pkgs/by-name/pi/pikchr/package.nix b/pkgs/by-name/pi/pikchr/package.nix
index 97a0185323a2..903f2e0634d3 100644
--- a/pkgs/by-name/pi/pikchr/package.nix
+++ b/pkgs/by-name/pi/pikchr/package.nix
@@ -10,12 +10,12 @@
 stdenv.mkDerivation {
   pname = "pikchr";
   # To update, use the last check-in in https://pikchr.org/home/timeline?r=trunk
-  version = "0-unstable-2025-02-28";
+  version = "0-unstable-2026-01-02";
 
   src = fetchfossil {
     url = "https://pikchr.org/home";
-    rev = "b7fbd56c4eb82ab9";
-    hash = "sha256-7oW1IYYk3YKPjOUPP6qYIdR0oGo9pRDDlyu30J4B3bI=";
+    rev = "ec28d04c3ec6fb76";
+    hash = "sha256-L9o/CIomXfotltoBdDsm5uocBVj4UnkGBk6ySySmvaw=";
   };
 
   # can't open generated html files
@@ -48,6 +48,8 @@ stdenv.mkDerivation {
 
   doCheck = true;
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
     description = "PIC-like markup language for diagrams in technical documentation";
     homepage = "https://pikchr.org";
diff --git a/pkgs/by-name/pi/pikchr/update.sh b/pkgs/by-name/pi/pikchr/update.sh
new file mode 100755
index 000000000000..c565ab5cce6b
--- /dev/null
+++ b/pkgs/by-name/pi/pikchr/update.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p common-updater-scripts jq gawk
+
+set -euo pipefail
+
+nixpkgs="$(git rev-parse --show-toplevel)"
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
+# Build and run nix-prefetch-fossil from the local nixpkgs
+prefetch_fossil="$(nix-build "$nixpkgs" -A nix-prefetch-scripts --no-out-link 2>/dev/null)/bin/nix-prefetch-fossil"
+
+echo "Fetching latest pikchr revision..." >&2
+
+# Run nix-prefetch-fossil and capture output
+output=$("$prefetch_fossil" https://pikchr.org/home trunk 2>&1)
+
+# Extract JSON from output (it's at the end after the blank line)
+json_output=$(echo "$output" | gawk '/^{/{p=1} p')
+
+# Extract revision, hash, and date
+full_rev=$(echo "$json_output" | jq -r '.rev')
+new_rev="${full_rev:0:16}"  # Use 16-char prefix for consistency
+new_hash=$(echo "$json_output" | jq -r '.hash')
+commit_date=$(echo "$json_output" | jq -r '.date')
+
+# Fallback to current date if extraction fails
+if [ -z "$commit_date" ] || [ "$commit_date" = "null" ]; then
+    commit_date=$(date +%Y-%m-%d)
+fi
+new_version="0-unstable-$commit_date"
+
+echo "Updating pikchr to $new_version (rev $new_rev)" >&2
+
+# Use update-source-version from the nixpkgs root
+(
+    cd "$nixpkgs"
+    update-source-version pikchr "$new_version" "$new_hash" \
+        --file="pkgs/by-name/pi/pikchr/package.nix" \
+        --rev="$new_rev"
+)
diff --git a/pkgs/by-name/pi/pinentry-dmenu/package.nix b/pkgs/by-name/pi/pinentry-dmenu/package.nix
index 1e7237d52d6f..8d5648edbb18 100644
--- a/pkgs/by-name/pi/pinentry-dmenu/package.nix
+++ b/pkgs/by-name/pi/pinentry-dmenu/package.nix
@@ -4,9 +4,9 @@
   fetchFromGitHub,
   fontconfig,
   gpgme,
-  libX11,
-  libXinerama,
-  libXft,
+  libx11,
+  libxinerama,
+  libxft,
   pkg-config,
   zlib,
   writeText,
@@ -33,9 +33,9 @@ stdenv.mkDerivation (finalAttrs: {
     libassuan
     libconfig
     libgpg-error
-    libX11
-    libXinerama
-    libXft
+    libx11
+    libxinerama
+    libxft
   ];
 
   preConfigure = ''
diff --git a/pkgs/by-name/pi/pioneer/package.nix b/pkgs/by-name/pi/pioneer/package.nix
index 9493de285ec8..be4a82878171 100644
--- a/pkgs/by-name/pi/pioneer/package.nix
+++ b/pkgs/by-name/pi/pioneer/package.nix
@@ -13,7 +13,7 @@
   libpng,
   libsigcxx,
   libvorbis,
-  libX11,
+  libx11,
   lua5_2,
   libgbm,
   SDL2,
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
     libsigcxx
     libvorbis
-    libX11
+    libx11
     lua5_2
     libgbm
     SDL2
diff --git a/pkgs/by-name/pi/pipeworld/package.nix b/pkgs/by-name/pi/pipeworld/package.nix
index 016d371dcbc9..9f8835de61b9 100644
--- a/pkgs/by-name/pi/pipeworld/package.nix
+++ b/pkgs/by-name/pi/pipeworld/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 }:
 
-stdenvNoCC.mkDerivation (finalPackages: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "pipeworld";
   version = "0-unstable-2023-02-05";
 
diff --git a/pkgs/by-name/pi/pix/package.nix b/pkgs/by-name/pi/pix/package.nix
index a34dfd0ff0bd..0d528588167f 100644
--- a/pkgs/by-name/pi/pix/package.nix
+++ b/pkgs/by-name/pi/pix/package.nix
@@ -20,7 +20,7 @@
   gsettings-desktop-schemas,
   librsvg,
   libwebp,
-  libX11,
+  libx11,
   lcms2,
   bison,
   flex,
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
     libsecret
     libtiff
     libwebp
-    libX11
+    libx11
     xapp
   ];
 
diff --git a/pkgs/by-name/pi/pixieditor/package.nix b/pkgs/by-name/pi/pixieditor/package.nix
index 1a48c79d4fc2..7221d9d3564d 100644
--- a/pkgs/by-name/pi/pixieditor/package.nix
+++ b/pkgs/by-name/pi/pixieditor/package.nix
@@ -13,13 +13,13 @@
   vulkan-loader,
   openssl,
   libGL,
-  libX11,
+  libx11,
   libice,
   libsm,
-  libXi,
-  libXcursor,
-  libXext,
-  libXrandr,
+  libxi,
+  libxcursor,
+  libxext,
+  libxrandr,
 
   makeDesktopItem,
   copyDesktopItems,
@@ -102,13 +102,13 @@ buildDotnetModule (finalAttrs: {
     vulkan-loader
     openssl
     libGL
-    libX11
+    libx11
     libice
     libsm
-    libXi
-    libXcursor
-    libXext
-    libXrandr
+    libxi
+    libxcursor
+    libxext
+    libxrandr
   ];
 
   desktopItems = [
diff --git a/pkgs/by-name/pl/plank/package.nix b/pkgs/by-name/pl/plank/package.nix
index 27df4260ac74..f5f528ce2955 100644
--- a/pkgs/by-name/pl/plank/package.nix
+++ b/pkgs/by-name/pl/plank/package.nix
@@ -10,9 +10,9 @@
   gnome-common,
   gtk3,
   libwnck,
-  libX11,
-  libXfixes,
-  libXi,
+  libx11,
+  libxfixes,
+  libxi,
   pango,
   gettext,
   pkg-config,
@@ -55,9 +55,9 @@ stdenv.mkDerivation rec {
     gnome-menus
     dconf
     gtk3
-    libX11
-    libXfixes
-    libXi
+    libx11
+    libxfixes
+    libxi
     libdbusmenu-gtk3
     libgee
     libwnck
diff --git a/pkgs/by-name/pl/platformio-core/package.nix b/pkgs/by-name/pl/platformio-core/package.nix
index f14cbc5fa303..8f2c6cee1962 100644
--- a/pkgs/by-name/pl/platformio-core/package.nix
+++ b/pkgs/by-name/pl/platformio-core/package.nix
@@ -31,7 +31,7 @@ in
 with python3Packages;
 buildPythonApplication rec {
   pname = "platformio";
-  version = "6.1.18";
+  version = "6.1.19";
   pyproject = true;
 
   # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964
@@ -39,7 +39,7 @@ buildPythonApplication rec {
     owner = "platformio";
     repo = "platformio-core";
     tag = "v${version}";
-    hash = "sha256-h9/xDWXCoGHQ9r2f/ZzAtwTAs4qzDrvVAQ2kuLS9Lk8=";
+    hash = "sha256-9pv2fbShddfYqBFxsQEj7nU1e772gUQEQINXRO/RMcQ=";
   };
 
   outputs = [
@@ -94,6 +94,7 @@ buildPythonApplication rec {
     intelhex
     lockfile
     marshmallow
+    packaging
     pip
     pyelftools
     pyparsing
@@ -131,6 +132,11 @@ buildPythonApplication rec {
     mkdir -p $udev/lib/udev/rules.d
     cp platformio/assets/system/99-platformio-udev.rules $udev/lib/udev/rules.d/99-platformio-udev.rules
 
+    # Avoid platformio writing state into /build/.home when generating completions.
+    export HOME=$TMPDIR
+    export PLATFORMIO_CORE_DIR=$TMPDIR/platformio-core
+    mkdir -p "$PLATFORMIO_CORE_DIR"
+
     installShellCompletion --cmd platformio \
       --bash <(_PLATFORMIO_COMPLETE=bash_source $out/bin/platformio) \
       --zsh <(_PLATFORMIO_COMPLETE=zsh_source $out/bin/platformio) \
diff --git a/pkgs/by-name/pl/platformio-core/use-local-spdx-license-list.patch b/pkgs/by-name/pl/platformio-core/use-local-spdx-license-list.patch
index 6496699a799c..8ae00149ecfb 100644
--- a/pkgs/by-name/pl/platformio-core/use-local-spdx-license-list.patch
+++ b/pkgs/by-name/pl/platformio-core/use-local-spdx-license-list.patch
@@ -6,7 +6,7 @@ index 47efae59..6c2cfaed 100644
      @staticmethod
      @memoized(expire="1h")
      def load_spdx_licenses():
--        version = "3.26.0"
+-        version = "3.27.0"
 -        spdx_data_url = (
 -            "https://raw.githubusercontent.com/spdx/license-list-data/"
 -            f"v{version}/json/licenses.json"
diff --git a/pkgs/by-name/pl/plausible/package.nix b/pkgs/by-name/pl/plausible/package.nix
index 75fdf91ad317..ed170e31d665 100644
--- a/pkgs/by-name/pl/plausible/package.nix
+++ b/pkgs/by-name/pl/plausible/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
-  beamPackages,
+  beam27Packages,
+  elixir_1_18,
   buildNpmPackage,
   rustPlatform,
   fetchFromGitHub,
@@ -111,6 +112,8 @@ let
         done
       '';
 
+  beamPackages = beam27Packages.extend (self: super: { elixir = elixir_1_18; });
+
 in
 beamPackages.mixRelease rec {
   inherit
diff --git a/pkgs/by-name/pl/plib/package.nix b/pkgs/by-name/pl/plib/package.nix
index 4cd1730d0362..96dd966d2f13 100644
--- a/pkgs/by-name/pl/plib/package.nix
+++ b/pkgs/by-name/pl/plib/package.nix
@@ -7,11 +7,11 @@
   libGL,
   libglut,
   SDL,
-  libXi,
+  libxi,
   libsm,
-  libXmu,
-  libXext,
-  libX11,
+  libxmu,
+  libxext,
+  libx11,
 }:
 
 stdenv.mkDerivation rec {
@@ -52,11 +52,11 @@ stdenv.mkDerivation rec {
     SDL
 
     # The following libs ought to be propagated build inputs of Mesa.
-    libXi
+    libxi
     libsm
-    libXmu
-    libXext
-    libX11
+    libxmu
+    libxext
+    libx11
   ];
 
   meta = {
diff --git a/pkgs/by-name/pl/ploticus/package.nix b/pkgs/by-name/pl/ploticus/package.nix
index ecb3e6861fa2..c197e67729dd 100644
--- a/pkgs/by-name/pl/ploticus/package.nix
+++ b/pkgs/by-name/pl/ploticus/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   zlib,
-  libX11,
+  libx11,
   libpng,
   libjpeg,
   gd,
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     zlib
-    libX11
+    libx11
     libpng
     gd
     freetype
diff --git a/pkgs/by-name/pl/plplot/package.nix b/pkgs/by-name/pl/plplot/package.nix
index 19ee4b47b317..b9edce149bcc 100644
--- a/pkgs/by-name/pl/plplot/package.nix
+++ b/pkgs/by-name/pl/plplot/package.nix
@@ -36,11 +36,13 @@ stdenv.mkDerivation rec {
     ];
 
   passthru = {
-    libX11 = libx11;
     inherit
       enableWX
       enableXWin
+      libx11
       ;
+    # backwards compat
+    libX11 = libx11;
   };
 
   cmakeFlags = [
diff --git a/pkgs/by-name/pl/plugdata/package.nix b/pkgs/by-name/pl/plugdata/package.nix
index d64452d3c066..dad6332508d3 100644
--- a/pkgs/by-name/pl/plugdata/package.nix
+++ b/pkgs/by-name/pl/plugdata/package.nix
@@ -9,14 +9,14 @@
   cmake,
   pkg-config,
   alsa-lib,
-  libX11,
-  libXcursor,
-  libXext,
-  libXinerama,
-  libXrender,
-  libXrandr,
-  libXdmcp,
-  libXtst,
+  libx11,
+  libxcursor,
+  libxext,
+  libxinerama,
+  libxrender,
+  libxrandr,
+  libxdmcp,
+  libxtst,
   xvfb,
   freetype,
   fontconfig,
@@ -63,14 +63,14 @@ stdenv.mkDerivation (finalAttrs: {
     libGL
     libGLU
     libxkbcommon
-    libX11
-    libXcursor
-    libXext
-    libXinerama
-    libXrender
-    libXrandr
-    libXdmcp
-    libXtst
+    libx11
+    libxcursor
+    libxext
+    libxinerama
+    libxrender
+    libxrandr
+    libxdmcp
+    libxtst
     xvfb
     libjack2
     expat
diff --git a/pkgs/by-name/pl/pluginval/package.nix b/pkgs/by-name/pl/pluginval/package.nix
index cf982a0ceabf..368b21b753d5 100644
--- a/pkgs/by-name/pl/pluginval/package.nix
+++ b/pkgs/by-name/pl/pluginval/package.nix
@@ -7,14 +7,14 @@
   alsa-lib,
   fontconfig,
   freetype,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXdmcp,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXtst,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxdmcp,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxtst,
   ladspaH,
 }:
 
@@ -38,14 +38,14 @@ stdenv.mkDerivation (finalAttrs: {
     alsa-lib
     fontconfig
     freetype
-    libX11
-    libXcomposite
-    libXcursor
-    libXdmcp
-    libXext
-    libXinerama
-    libXrandr
-    libXtst
+    libx11
+    libxcomposite
+    libxcursor
+    libxdmcp
+    libxext
+    libxinerama
+    libxrandr
+    libxtst
     ladspaH
   ];
 
diff --git a/pkgs/by-name/pm/pmars/package.nix b/pkgs/by-name/pm/pmars/package.nix
index 2bb2830f97eb..0a90a61c5ef3 100644
--- a/pkgs/by-name/pm/pmars/package.nix
+++ b/pkgs/by-name/pm/pmars/package.nix
@@ -3,7 +3,7 @@
   lib,
   fetchzip,
   installShellFiles,
-  libX11,
+  libx11,
   ncurses,
   pkg-config,
   enableXwinGraphics ? false,
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ installShellFiles ] ++ lib.optionals (pkgConfigLibs != [ ]) [ pkg-config ];
 
   buildInputs =
-    lib.optionals enableXwinGraphics [ libX11 ] ++ lib.optionals (!enableXwinGraphics) [ ncurses ];
+    lib.optionals enableXwinGraphics [ libx11 ] ++ lib.optionals (!enableXwinGraphics) [ ncurses ];
 
   preConfigure = ''
     cd src
diff --git a/pkgs/by-name/pm/pmenu/package.nix b/pkgs/by-name/pm/pmenu/package.nix
index 71319a7a532a..ae99c1069430 100644
--- a/pkgs/by-name/pm/pmenu/package.nix
+++ b/pkgs/by-name/pm/pmenu/package.nix
@@ -5,11 +5,11 @@
   writeText,
   fontconfig,
   imlib2,
-  libX11,
-  libXext,
-  libXft,
-  libXinerama,
-  libXrender,
+  libx11,
+  libxext,
+  libxft,
+  libxinerama,
+  libxrender,
   conf ? null,
 }:
 
@@ -27,11 +27,11 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     fontconfig
     imlib2
-    libX11
-    libXext
-    libXft
-    libXinerama
-    libXrender
+    libx11
+    libxext
+    libxft
+    libxinerama
+    libxrender
   ];
 
   postPatch =
diff --git a/pkgs/by-name/pn/pnmixer/package.nix b/pkgs/by-name/pn/pnmixer/package.nix
index e5ea31043a16..a8046dc4f78e 100644
--- a/pkgs/by-name/pn/pnmixer/package.nix
+++ b/pkgs/by-name/pn/pnmixer/package.nix
@@ -9,7 +9,7 @@
   gtk3,
   glib,
   libnotify,
-  libX11,
+  libx11,
   pcre,
 }:
 
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     glib
     libnotify
-    libX11
+    libx11
     pcre
   ];
 
diff --git a/pkgs/by-name/po/pocketbase/package.nix b/pkgs/by-name/po/pocketbase/package.nix
index f09dbe0f1410..5cc0d0a26afb 100644
--- a/pkgs/by-name/po/pocketbase/package.nix
+++ b/pkgs/by-name/po/pocketbase/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "pocketbase";
-  version = "0.36.1";
+  version = "0.36.2";
 
   src = fetchFromGitHub {
     owner = "pocketbase";
     repo = "pocketbase";
     rev = "v${version}";
-    hash = "sha256-mDQhsVvO6rj5zkbFOKdM/d0+BWa0Flfdx2kEGqjFeWg=";
+    hash = "sha256-+gayRZ9iwKSb4xW3LVvd6CFms0koHrv7DF1J5O8FvGY=";
   };
 
-  vendorHash = "sha256-8Y5nYDR2RKd2S41yelvz0EooPJkZGv+xp7JA4QQGDA8=";
+  vendorHash = "sha256-OZ2jAOdi/g7yVAPfXTPRxsjBtUi43i8B1k2ANet1SO8=";
 
   # This is the released subpackage from upstream repo
   subPackages = [ "examples/base" ];
diff --git a/pkgs/by-name/po/polar-bookshelf/package.nix b/pkgs/by-name/po/polar-bookshelf/package.nix
index ac8498bf66e7..027e03d335e7 100644
--- a/pkgs/by-name/po/polar-bookshelf/package.nix
+++ b/pkgs/by-name/po/polar-bookshelf/package.nix
@@ -14,18 +14,18 @@
   glib,
   at-spi2-atk,
   dbus,
-  libX11,
+  libx11,
   libxcb,
-  libXi,
-  libXcursor,
-  libXdamage,
-  libXrandr,
-  libXcomposite,
-  libXext,
-  libXfixes,
-  libXrender,
-  libXtst,
-  libXScrnSaver,
+  libxi,
+  libxcursor,
+  libxdamage,
+  libxrandr,
+  libxcomposite,
+  libxext,
+  libxfixes,
+  libxrender,
+  libxtst,
+  libxscrnsaver,
   nss,
   nspr,
   alsa-lib,
@@ -64,18 +64,18 @@ stdenv.mkDerivation rec {
     gdk-pixbuf
     at-spi2-atk
     dbus
-    libX11
+    libx11
     libxcb
-    libXi
-    libXcursor
-    libXdamage
-    libXrandr
-    libXcomposite
-    libXext
-    libXfixes
-    libXrender
-    libXtst
-    libXScrnSaver
+    libxi
+    libxcursor
+    libxdamage
+    libxrandr
+    libxcomposite
+    libxext
+    libxfixes
+    libxrender
+    libxtst
+    libxscrnsaver
     nss
     nspr
     alsa-lib
diff --git a/pkgs/by-name/po/polar-bookshelf1/package.nix b/pkgs/by-name/po/polar-bookshelf1/package.nix
index 3cb13af1e229..b1e62094171f 100644
--- a/pkgs/by-name/po/polar-bookshelf1/package.nix
+++ b/pkgs/by-name/po/polar-bookshelf1/package.nix
@@ -18,17 +18,17 @@
   glibc,
   gsettings-desktop-schemas,
   gtk3,
-  libX11,
-  libXScrnSaver,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXtst,
+  libx11,
+  libxscrnsaver,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxtst,
   libnghttp2,
   libudev0-shim,
   libxcb,
@@ -62,17 +62,17 @@ stdenv.mkDerivation rec {
     glib
     gsettings-desktop-schemas
     gtk3
-    libX11
-    libXScrnSaver
-    libXcomposite
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
-    libXrandr
-    libXrender
-    libXtst
+    libx11
+    libxscrnsaver
+    libxcomposite
+    libxcursor
+    libxdamage
+    libxext
+    libxfixes
+    libxi
+    libxrandr
+    libxrender
+    libxtst
     libxcb
     nspr
     nss
diff --git a/pkgs/by-name/po/polybar/package.nix b/pkgs/by-name/po/polybar/package.nix
index 6adee06b5ff5..d1375d9d8e20 100644
--- a/pkgs/by-name/po/polybar/package.nix
+++ b/pkgs/by-name/po/polybar/package.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
   fetchpatch,
   libuv,
-  libXdmcp,
+  libxdmcp,
   libpthread-stubs,
   libxcb,
   pcre,
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     cairo
     libuv
-    libXdmcp
+    libxdmcp
     libpthread-stubs
     libxcb
     pcre
diff --git a/pkgs/by-name/po/polyglot/package.nix b/pkgs/by-name/po/polyglot/package.nix
index b16d15ee409a..9b4c5afa479f 100644
--- a/pkgs/by-name/po/polyglot/package.nix
+++ b/pkgs/by-name/po/polyglot/package.nix
@@ -7,7 +7,7 @@
   maven,
   libGL,
   xdg-utils,
-  libXxf86vm,
+  libxxf86vm,
   zip,
   zlib,
 }:
@@ -60,7 +60,7 @@ maven.buildMavenPackage rec {
       --prefix LD_LIBRARY_PATH : "${
         lib.makeLibraryPath [
           libGL
-          libXxf86vm
+          libxxf86vm
         ]
       }"
 
diff --git a/pkgs/by-name/po/pong3d/package.nix b/pkgs/by-name/po/pong3d/package.nix
index 944ba4f0e253..d9aebcadbd02 100644
--- a/pkgs/by-name/po/pong3d/package.nix
+++ b/pkgs/by-name/po/pong3d/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
 
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
        #include <string.h>"
   '';
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   makeFlags = [
     "PREFIX=$(out)"
diff --git a/pkgs/by-name/po/poptracker/package.nix b/pkgs/by-name/po/poptracker/package.nix
index 4fbf258da2a5..c542b9f09a8a 100644
--- a/pkgs/by-name/po/poptracker/package.nix
+++ b/pkgs/by-name/po/poptracker/package.nix
@@ -6,7 +6,7 @@
   SDL2,
   SDL2_ttf,
   SDL2_image,
-  libX11,
+  libx11,
   openssl,
   zlib,
   which,
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
     SDL2
     SDL2_ttf
     SDL2_image
-    libX11
+    libx11
     openssl
     zlib
   ];
diff --git a/pkgs/by-name/po/portablemc/package.nix b/pkgs/by-name/po/portablemc/package.nix
index 3959d20e8fad..812b6fa2f9f9 100644
--- a/pkgs/by-name/po/portablemc/package.nix
+++ b/pkgs/by-name/po/portablemc/package.nix
@@ -6,11 +6,11 @@
   installShellFiles,
   jre,
 
-  libX11,
-  libXext,
-  libXcursor,
-  libXrandr,
-  libXxf86vm,
+  libx11,
+  libxext,
+  libxcursor,
+  libxrandr,
+  libxxf86vm,
   libpulseaudio,
   libGL,
   glfw,
@@ -31,11 +31,11 @@ let
     (lib.getLib stdenv.cc.cc)
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
-    libXext
-    libXcursor
-    libXrandr
-    libXxf86vm
+    libx11
+    libxext
+    libxcursor
+    libxrandr
+    libxxf86vm
 
     # lwjgl
     libpulseaudio
diff --git a/pkgs/by-name/po/poselib/package.nix b/pkgs/by-name/po/poselib/package.nix
index da1cb4a5709d..62bb49b067e2 100644
--- a/pkgs/by-name/po/poselib/package.nix
+++ b/pkgs/by-name/po/poselib/package.nix
@@ -8,14 +8,14 @@
   pkg-config,
 }:
 
-stdenv.mkDerivation (final: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "poselib";
   version = "2.0.5";
 
   src = fetchFromGitHub {
     owner = "PoseLib";
     repo = "PoseLib";
-    rev = "v${final.version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-fARRKT2UoPuuk9FOOsBdrACwGiGXWg/mLV4R0QIjeak=";
   };
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation (final: {
   meta = {
     description = "A collection of minimal solvers for camera pose estimation";
     homepage = "https://github.com/PoseLib/PoseLib";
-    changelog = "https://github.com/PoseLib/PoseLib/releases/tag/v${final.version}";
+    changelog = "https://github.com/PoseLib/PoseLib/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.bsd3;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ usertam ];
diff --git a/pkgs/by-name/po/postman/linux.nix b/pkgs/by-name/po/postman/linux.nix
index 441f1a224a49..4e1fae54e7f6 100644
--- a/pkgs/by-name/po/postman/linux.nix
+++ b/pkgs/by-name/po/postman/linux.nix
@@ -17,17 +17,17 @@
   gdk-pixbuf,
   glib,
   gtk3,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXScrnSaver,
-  libXtst,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxscrnsaver,
+  libxtst,
   libdrm,
   libgbm,
   libGL,
@@ -125,18 +125,18 @@ stdenv.mkDerivation {
           libGL
           libsecret
           libuuid
-          libX11
-          libXcomposite
-          libXcursor
-          libXdamage
-          libXext
-          libXfixes
-          libXi
-          libXrandr
-          libXrender
-          libXScrnSaver
+          libx11
+          libxcomposite
+          libxcursor
+          libxdamage
+          libxext
+          libxfixes
+          libxi
+          libxrandr
+          libxrender
+          libxscrnsaver
           libxkbcommon
-          libXtst
+          libxtst
           nspr
           nss
           pango
diff --git a/pkgs/by-name/po/povray/package.nix b/pkgs/by-name/po/povray/package.nix
index dd99c2ef343f..a1b284a9a339 100644
--- a/pkgs/by-name/po/povray/package.nix
+++ b/pkgs/by-name/po/povray/package.nix
@@ -6,7 +6,7 @@
   automake,
   boost,
   zlib,
-  libX11,
+  libx11,
   libice,
   libsm,
   libpng,
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     boost
-    libX11
+    libx11
     libice
     libsm
     libpng
diff --git a/pkgs/by-name/pp/ppsspp/package.nix b/pkgs/by-name/pp/ppsspp/package.nix
index deb57e13697c..1bc3b1a69348 100644
--- a/pkgs/by-name/pp/ppsspp/package.nix
+++ b/pkgs/by-name/pp/ppsspp/package.nix
@@ -9,7 +9,7 @@
   libffi,
   libsForQt5,
   libzip,
-  libX11,
+  libx11,
   makeDesktopItem,
   makeWrapper,
   pkg-config,
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     SDL2
-    libX11
+    libx11
     glew
     libzip
     zlib
diff --git a/pkgs/by-name/pq/pq-cli/package.nix b/pkgs/by-name/pq/pq-cli/package.nix
index 225ee762b0d7..59ade259277c 100644
--- a/pkgs/by-name/pq/pq-cli/package.nix
+++ b/pkgs/by-name/pq/pq-cli/package.nix
@@ -30,6 +30,7 @@ python3Packages.buildPythonApplication rec {
   ];
 
   pythonRelaxDeps = [
+    "urwid"
     "urwid-readline"
   ];
 
diff --git a/pkgs/by-name/pr/premid/package.nix b/pkgs/by-name/pr/premid/package.nix
index 32d24b9cb0cb..5f4bff2fcb04 100644
--- a/pkgs/by-name/pr/premid/package.nix
+++ b/pkgs/by-name/pr/premid/package.nix
@@ -24,17 +24,17 @@
   libnotify,
   libpulseaudio,
   libuuid,
-  libX11,
-  libXScrnSaver,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXtst,
+  libx11,
+  libxscrnsaver,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxtst,
   libxcb,
   libxshmfence,
   libgbm,
@@ -66,10 +66,10 @@ stdenv.mkDerivation rec {
     cups
     libdrm
     libuuid
-    libXdamage
-    libX11
-    libXScrnSaver
-    libXtst
+    libxdamage
+    libx11
+    libxscrnsaver
+    libxtst
     libxcb
     libxshmfence
     libgbm
@@ -101,23 +101,23 @@ stdenv.mkDerivation rec {
     glib
     gtk3
     libnotify
-    libX11
-    libXcomposite
+    libx11
+    libxcomposite
     libuuid
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
-    libXrandr
-    libXrender
-    libXtst
+    libxcursor
+    libxdamage
+    libxext
+    libxfixes
+    libxi
+    libxrandr
+    libxrender
+    libxtst
     nspr
     nss
     libxcb
     pango
     systemd
-    libXScrnSaver
+    libxscrnsaver
     libappindicator-gtk3
     libdbusmenu
   ];
diff --git a/pkgs/by-name/pr/previewqt/package.nix b/pkgs/by-name/pr/previewqt/package.nix
index ce17ed00c8b3..a167d85ead6a 100644
--- a/pkgs/by-name/pr/previewqt/package.nix
+++ b/pkgs/by-name/pr/previewqt/package.nix
@@ -10,6 +10,8 @@
   mpv,
   pkg-config,
   qt6Packages,
+  withSyntaxHighlighting ? stdenv.hostPlatform.isLinux,
+  kdePackages,
   resvg,
   stdenv,
   vips,
@@ -17,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "previewqt";
-  version = "4.0";
+  version = "5.0";
 
   src = fetchFromGitLab {
     owner = "lspies";
     repo = "previewqt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wzMo5igLTVxUo3E8X2mRbOTuhW3CS4fISgVntgPbZlY=";
+    hash = "sha256-OvLJWuLrd7A9px0fF2pRN5frLF4Q5PCG/PxKjdLmC/g=";
   };
 
   nativeBuildInputs = [
@@ -49,6 +51,9 @@ stdenv.mkDerivation (finalAttrs: {
     qt6Packages.qtsvg
     qt6Packages.qttools
     qt6Packages.qtwebengine
+  ]
+  ++ lib.optionals withSyntaxHighlighting [
+    kdePackages.syntax-highlighting
   ];
 
   strictDeps = true;
@@ -56,6 +61,8 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     (lib.cmakeBool "WITH_DEVIL" false)
     (lib.cmakeBool "WITH_FREEIMAGE" false)
+    (lib.cmakeBool "WITH_KF6SYNTAXHIGHLIGHT" withSyntaxHighlighting)
+    (lib.cmakeBool "WITH_ADAPTSOURCE" (!withSyntaxHighlighting))
   ];
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
diff --git a/pkgs/by-name/pr/primusLib/package.nix b/pkgs/by-name/pr/primusLib/package.nix
index 77f37052f1bb..9294249a419b 100644
--- a/pkgs/by-name/pr/primusLib/package.nix
+++ b/pkgs/by-name/pr/primusLib/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   fetchpatch,
-  libX11,
+  libx11,
   libGL,
   linuxPackages,
   nvidia_x11 ? linuxPackages.nvidia_x11.override { libsOnly = true; },
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     libGL
   ];
 
diff --git a/pkgs/by-name/pr/prismlauncher/package.nix b/pkgs/by-name/pr/prismlauncher/package.nix
index b1a27bcfbb9f..d443d52220e1 100644
--- a/pkgs/by-name/pr/prismlauncher/package.nix
+++ b/pkgs/by-name/pr/prismlauncher/package.nix
@@ -10,11 +10,11 @@
   kdePackages,
   lib,
   libGL,
-  libX11,
-  libXcursor,
-  libXext,
-  libXrandr,
-  libXxf86vm,
+  libx11,
+  libxcursor,
+  libxext,
+  libxrandr,
+  libxxf86vm,
   libjack2,
   libpulseaudio,
   libusb1,
@@ -89,11 +89,11 @@ symlinkJoin {
 
         ## glfw
         libGL
-        libX11
-        libXcursor
-        libXext
-        libXrandr
-        libXxf86vm
+        libx11
+        libxcursor
+        libxext
+        libxrandr
+        libxxf86vm
 
         udev # oshi
 
diff --git a/pkgs/by-name/pr/projectm-sdl-cpp/package.nix b/pkgs/by-name/pr/projectm-sdl-cpp/package.nix
index af73b1487eaf..54cfc3a09066 100644
--- a/pkgs/by-name/pr/projectm-sdl-cpp/package.nix
+++ b/pkgs/by-name/pr/projectm-sdl-cpp/package.nix
@@ -5,7 +5,7 @@
   cmake,
   libprojectm,
   libGL,
-  libX11,
+  libx11,
   poco,
   utf8proc,
   SDL2,
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
     poco
     utf8proc
     libGL
-    libX11
+    libx11
     SDL2
   ];
 
diff --git a/pkgs/by-name/pr/proteus/package.nix b/pkgs/by-name/pr/proteus/package.nix
index 191ddd8d7773..2e772294e5c9 100644
--- a/pkgs/by-name/pr/proteus/package.nix
+++ b/pkgs/by-name/pr/proteus/package.nix
@@ -8,12 +8,12 @@
   alsa-lib,
   freetype,
   libjack2,
-  libX11,
-  libXext,
-  libXcursor,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxext,
+  libxcursor,
+  libxinerama,
+  libxrandr,
+  libxrender,
 }:
 
 stdenv.mkDerivation rec {
@@ -37,12 +37,12 @@ stdenv.mkDerivation rec {
     alsa-lib
     freetype
     libjack2
-    libX11
-    libXext
-    libXcursor
-    libXinerama
-    libXrandr
-    libXrender
+    libx11
+    libxext
+    libxcursor
+    libxinerama
+    libxrandr
+    libxrender
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/ps/psitransfer/package.nix b/pkgs/by-name/ps/psitransfer/package.nix
index 2bb2ea0e3398..43a3c95ab235 100644
--- a/pkgs/by-name/ps/psitransfer/package.nix
+++ b/pkgs/by-name/ps/psitransfer/package.nix
@@ -8,22 +8,22 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "psitransfer";
-  version = "2.3.2";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "psi-4ward";
     repo = "psitransfer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-i2W3sOOxXM5UHxB20EjpOhmu08PQvaflIC4+Qk+ZnIQ=";
+    hash = "sha256-ikpdqcubqVFbjjQUlrL5Cn3MTsOhkw48dtgLowGv0ho=";
   };
 
-  npmDepsHash = "sha256-cd9Qkw3uOvpQVoLRPphjKjPsBomxaBwdM+ZlhLwJqYM=";
+  npmDepsHash = "sha256-4jKbDzjwWMJAGEjb2FwGv0wZw6SS0ZnlLWrTDX88zv0=";
 
   app = buildNpmPackage {
     pname = "psitransfer-app";
     inherit (finalAttrs) version src;
 
-    npmDepsHash = "sha256-j8eUi3HP6gfjIDD5lli5ypHcpWaOaFLKENe5IYQzchk=";
+    npmDepsHash = "sha256-PpUO1u7TcH8ZcTekLcGOn07EnCHqUlbEMS/YzMLSMAs=";
 
     postPatch = ''
       # https://github.com/psi-4ward/psitransfer/pull/284
diff --git a/pkgs/by-name/pt/ptcpdump/package.nix b/pkgs/by-name/pt/ptcpdump/package.nix
index d392993454f4..3e2d5d21b2dc 100644
--- a/pkgs/by-name/pt/ptcpdump/package.nix
+++ b/pkgs/by-name/pt/ptcpdump/package.nix
@@ -6,14 +6,14 @@
   libpcap,
 }:
 
-buildGoModule (finalAttr: {
+buildGoModule (finalAttrs: {
   pname = "ptcpdump";
   version = "0.37.0";
 
   src = fetchFromGitHub {
     owner = "mozillazg";
     repo = "ptcpdump";
-    tag = "v${finalAttr.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-ouH7VFWSCOElbmbSWAkmM4dtNVp545mC/FnoNAFtaEw=";
   };
 
@@ -24,7 +24,7 @@ buildGoModule (finalAttr: {
   tags = [ "dynamic" ];
 
   ldflags = [
-    "-X github.com/mozillazg/ptcpdump/internal.Version=v${finalAttr.version}"
+    "-X github.com/mozillazg/ptcpdump/internal.Version=v${finalAttrs.version}"
   ];
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
diff --git a/pkgs/by-name/pu/punes/package.nix b/pkgs/by-name/pu/punes/package.nix
index 8d3f22283aad..decc5d20c9d8 100644
--- a/pkgs/by-name/pu/punes/package.nix
+++ b/pkgs/by-name/pu/punes/package.nix
@@ -9,8 +9,8 @@
   ffmpeg,
   libGLU,
   alsa-lib,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
   sndio,
   libsForQt5,
   qt6Packages,
@@ -83,8 +83,8 @@ stdenv.mkDerivation (finalAttrs: {
   ])
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
-    libX11
-    libXrandr
+    libx11
+    libxrandr
   ]
   ++ lib.optionals stdenv.hostPlatform.isBSD [
     sndio
diff --git a/pkgs/by-name/pw/pwsafe/package.nix b/pkgs/by-name/pw/pwsafe/package.nix
index 9c5dc2e8d9fb..5187b3bfc81b 100644
--- a/pkgs/by-name/pw/pwsafe/package.nix
+++ b/pkgs/by-name/pw/pwsafe/package.nix
@@ -8,10 +8,10 @@
   gettext,
   perl,
   wxGTK32,
-  libXext,
-  libXi,
-  libXt,
-  libXtst,
+  libxext,
+  libxi,
+  libxt,
+  libxtst,
   xercesc,
   qrencode,
   libuuid,
@@ -54,10 +54,10 @@ stdenv.mkDerivation (finalAttrs: {
     file
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libXext
-    libXi
-    libXt
-    libXtst
+    libxext
+    libxi
+    libxt
+    libxtst
     libuuid
     libyubikey
     yubikey-personalization
diff --git a/pkgs/by-name/py/pyenv/package.nix b/pkgs/by-name/py/pyenv/package.nix
index efd57643936a..f9e346a7c6e7 100644
--- a/pkgs/by-name/py/pyenv/package.nix
+++ b/pkgs/by-name/py/pyenv/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pyenv";
-  version = "2.6.20";
+  version = "2.6.22";
 
   src = fetchFromGitHub {
     owner = "pyenv";
     repo = "pyenv";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gbj7WI1OVfqDre5PdqEI3yVo/J5YyCexhL/bCa8aEK4=";
+    hash = "sha256-F4SZeF9YriAog88hRH/3GWajPtpBTBjEiVgqpxoFS/I=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/qd/qdelay/package.nix b/pkgs/by-name/qd/qdelay/package.nix
index d0240b9d0087..834d2ab4416a 100644
--- a/pkgs/by-name/qd/qdelay/package.nix
+++ b/pkgs/by-name/qd/qdelay/package.nix
@@ -7,14 +7,14 @@
   alsa-lib,
   fontconfig,
   freetype,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXdmcp,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXtst,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxdmcp,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxtst,
   writableTmpDirAsHomeHook,
 
   buildVST3 ? true,
@@ -45,14 +45,14 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.isLinux [
     alsa-lib
-    libX11
-    libXcomposite
-    libXcursor
-    libXdmcp
-    libXext
-    libXinerama
-    libXrandr
-    libXtst
+    libx11
+    libxcomposite
+    libxcursor
+    libxdmcp
+    libxext
+    libxinerama
+    libxrandr
+    libxtst
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/qe/qemacs/package.nix b/pkgs/by-name/qe/qemacs/package.nix
index 62f841ea1b03..a9fe44745baa 100644
--- a/pkgs/by-name/qe/qemacs/package.nix
+++ b/pkgs/by-name/qe/qemacs/package.nix
@@ -6,9 +6,9 @@
   which,
   texi2html,
   enableX11 ? true,
-  libX11,
-  libXext,
-  libXv,
+  libx11,
+  libxext,
+  libxv,
   libpng,
 }:
 
@@ -35,9 +35,9 @@ stdenv.mkDerivation {
   ];
   buildInputs = lib.optionals enableX11 [
     libpng
-    libX11
-    libXext
-    libXv
+    libx11
+    libxext
+    libxv
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/tools/misc/qmake2cmake/fix-locations.patch b/pkgs/by-name/qm/qmake2cmake/fix-locations.patch
similarity index 100%
rename from pkgs/tools/misc/qmake2cmake/fix-locations.patch
rename to pkgs/by-name/qm/qmake2cmake/fix-locations.patch
diff --git a/pkgs/tools/misc/qmake2cmake/default.nix b/pkgs/by-name/qm/qmake2cmake/package.nix
similarity index 70%
rename from pkgs/tools/misc/qmake2cmake/default.nix
rename to pkgs/by-name/qm/qmake2cmake/package.nix
index f81f93f11d5c..139e55abb42c 100644
--- a/pkgs/tools/misc/qmake2cmake/default.nix
+++ b/pkgs/by-name/qm/qmake2cmake/package.nix
@@ -1,18 +1,11 @@
 {
   lib,
-  buildPythonPackage,
+  python3Packages,
   fetchgit,
-  packaging,
-  platformdirs,
-  portalocker,
-  pyparsing,
-  setuptools,
-  sympy,
-  pytestCheckHook,
   writableTmpDirAsHomeHook,
 }:
 
-buildPythonPackage {
+python3Packages.buildPythonPackage {
   pname = "qmake2cmake";
   version = "1.0.8";
   pyproject = true;
@@ -28,18 +21,18 @@ buildPythonPackage {
     ./fix-locations.patch
   ];
 
-  build-system = [ setuptools ];
+  build-system = [ python3Packages.setuptools ];
 
   dependencies = [
-    packaging
-    platformdirs
-    portalocker
-    pyparsing
-    sympy
+    python3Packages.packaging
+    python3Packages.platformdirs
+    python3Packages.portalocker
+    python3Packages.pyparsing
+    python3Packages.sympy
   ];
 
   nativeCheckInputs = [
-    pytestCheckHook
+    python3Packages.pytestCheckHook
     writableTmpDirAsHomeHook
   ];
 
diff --git a/pkgs/by-name/qm/qmplay2/package.nix b/pkgs/by-name/qm/qmplay2/package.nix
index 383cd0c4a0ff..1799ab01f934 100644
--- a/pkgs/by-name/qm/qmplay2/package.nix
+++ b/pkgs/by-name/qm/qmplay2/package.nix
@@ -7,8 +7,8 @@
   ffmpeg,
   fribidi,
   game-music-emu,
-  libXdmcp,
-  libXv,
+  libxdmcp,
+  libxv,
   libass,
   libcddb,
   libcdio,
@@ -61,8 +61,8 @@ stdenv.mkDerivation (finalAttrs: {
     ffmpeg
     fribidi
     game-music-emu
-    libXdmcp
-    libXv
+    libxdmcp
+    libxv
     libass
     libcddb
     libcdio
diff --git a/pkgs/by-name/qt/qtox/package.nix b/pkgs/by-name/qt/qtox/package.nix
index a63ce14c9b86..b18baac11b9d 100644
--- a/pkgs/by-name/qt/qtox/package.nix
+++ b/pkgs/by-name/qt/qtox/package.nix
@@ -8,8 +8,8 @@
   kdePackages,
   libtoxcore,
   libpthread-stubs,
-  libXdmcp,
-  libXScrnSaver,
+  libxdmcp,
+  libxscrnsaver,
   ffmpeg,
   filter-audio,
   libexif,
@@ -38,8 +38,8 @@ stdenv.mkDerivation (finalAttrs: {
     kdePackages.sonnet
     libtoxcore
     libpthread-stubs
-    libXdmcp
-    libXScrnSaver
+    libxdmcp
+    libxscrnsaver
     ffmpeg
     filter-audio
     libexif
diff --git a/pkgs/by-name/qu/quake3e/package.nix b/pkgs/by-name/qu/quake3e/package.nix
index 60d99d7b5643..25f05d36891a 100644
--- a/pkgs/by-name/qu/quake3e/package.nix
+++ b/pkgs/by-name/qu/quake3e/package.nix
@@ -5,12 +5,12 @@
   makeWrapper,
   curl,
   libGL,
-  libX11,
-  libXxf86dga,
+  libx11,
+  libxxf86dga,
   alsa-lib,
-  libXrandr,
-  libXxf86vm,
-  libXext,
+  libxrandr,
+  libxxf86vm,
+  libxext,
   SDL2,
   glibc,
   copyDesktopItems,
@@ -37,12 +37,12 @@ stdenv.mkDerivation {
   buildInputs = [
     curl
     libGL
-    libX11
-    libXxf86dga
+    libx11
+    libxxf86dga
     alsa-lib
-    libXrandr
-    libXxf86vm
-    libXext
+    libxrandr
+    libxxf86vm
+    libxext
     SDL2
     glibc
   ];
@@ -53,10 +53,10 @@ stdenv.mkDerivation {
     sed -i -e 's#OpenGLLib = dlopen( dllname#OpenGLLib = dlopen( "${libGL}/lib/libGL.so"#' code/unix/linux_qgl.c
     sed -i -e 's#Sys_LoadLibrary( "libpthread.so.0" )#Sys_LoadLibrary( "${glibc}/lib/libpthread.so.0" )#' code/unix/linux_snd.c
     sed -i -e 's#Sys_LoadLibrary( "libasound.so.2" )#Sys_LoadLibrary( "${alsa-lib}/lib/libasound.so.2" )#' code/unix/linux_snd.c
-    sed -i -e 's#Sys_LoadLibrary( "libXxf86dga.so.1" )#Sys_LoadLibrary( "${libXxf86dga}/lib/libXxf86dga.so.1" )#' code/unix/x11_dga.c
-    sed -i -e 's#Sys_LoadLibrary( "libXrandr.so.2" )#Sys_LoadLibrary( "${libXrandr}/lib/libXrandr.so.2" )#' code/unix/x11_randr.c
-    sed -i -e 's#Sys_LoadLibrary( "libXxf86vm.so.1" )#Sys_LoadLibrary( "${libXxf86vm}/lib/libXxf86vm.so.1" )#' code/unix/x11_randr.c
-    sed -i -e 's#Sys_LoadLibrary( "libXxf86vm.so.1" )#Sys_LoadLibrary( "${libXxf86vm}/lib/libXxf86vm.so.1" )#' code/unix/x11_vidmode.c
+    sed -i -e 's#Sys_LoadLibrary( "libXxf86dga.so.1" )#Sys_LoadLibrary( "${libxxf86dga}/lib/libXxf86dga.so.1" )#' code/unix/x11_dga.c
+    sed -i -e 's#Sys_LoadLibrary( "libXrandr.so.2" )#Sys_LoadLibrary( "${libxrandr}/lib/libXrandr.so.2" )#' code/unix/x11_randr.c
+    sed -i -e 's#Sys_LoadLibrary( "libXxf86vm.so.1" )#Sys_LoadLibrary( "${libxxf86vm}/lib/libXxf86vm.so.1" )#' code/unix/x11_randr.c
+    sed -i -e 's#Sys_LoadLibrary( "libXxf86vm.so.1" )#Sys_LoadLibrary( "${libxxf86vm}/lib/libXxf86vm.so.1" )#' code/unix/x11_vidmode.c
     sed -i -e 's#"libcurl.so.4"#"${curl.out}/lib/libcurl.so.4"#' code/client/cl_curl.h
   '';
 
diff --git a/pkgs/by-name/qu/quartus-prime-lite/package.nix b/pkgs/by-name/qu/quartus-prime-lite/package.nix
index 1e43f5fce8c6..85bfe90885e4 100644
--- a/pkgs/by-name/qu/quartus-prime-lite/package.nix
+++ b/pkgs/by-name/qu/quartus-prime-lite/package.nix
@@ -78,14 +78,14 @@ buildFHSEnv rec {
       # This seems ugly - can we override `libpng = libpng12` for all `pkgs`?
       freetype = pkgs.freetype.override { libpng = libpng12; };
       fontconfig = pkgs.fontconfig.override { inherit freetype; };
-      libXft = pkgs.libxft.override { inherit freetype fontconfig; };
+      libxft = pkgs.libxft.override { inherit freetype fontconfig; };
     in
     [
       # questa requirements
       libxml2
       ncurses5
       unixODBC
-      libXft
+      libxft
       # common requirements
       freetype
       fontconfig
diff --git a/pkgs/by-name/qu/quartz-wm/package.nix b/pkgs/by-name/qu/quartz-wm/package.nix
index 324533c5cc29..ef06bf4f0af4 100644
--- a/pkgs/by-name/qu/quartz-wm/package.nix
+++ b/pkgs/by-name/qu/quartz-wm/package.nix
@@ -6,11 +6,11 @@
   pixman,
   pkg-config,
   util-macros,
-  libXinerama,
+  libxinerama,
   libapplewm,
   xorgproto,
-  libXrandr,
-  libXext,
+  libxrandr,
+  libxext,
 }:
 
 clangStdenv.mkDerivation (finalAttrs: {
@@ -30,11 +30,11 @@ clangStdenv.mkDerivation (finalAttrs: {
     util-macros
   ];
   buildInputs = [
-    libXinerama
+    libxinerama
     libapplewm
     xorgproto
-    libXrandr
-    libXext
+    libxrandr
+    libxext
     pixman
   ];
 
diff --git a/pkgs/by-name/qu/qucs-s/package.nix b/pkgs/by-name/qu/qucs-s/package.nix
index 7196354b1176..2bcc4611adf1 100644
--- a/pkgs/by-name/qu/qucs-s/package.nix
+++ b/pkgs/by-name/qu/qucs-s/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   flex,
   bison,
-  libX11,
+  libx11,
   cmake,
   gperf,
   adms,
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       qtwayland
-      libX11
+      libx11
     ]
     ++ kernels;
 
diff --git a/pkgs/by-name/qu/quesoglc/package.nix b/pkgs/by-name/qu/quesoglc/package.nix
index 6bde1ed4e46e..6d093a62ed6f 100644
--- a/pkgs/by-name/qu/quesoglc/package.nix
+++ b/pkgs/by-name/qu/quesoglc/package.nix
@@ -8,7 +8,7 @@
   freetype,
   fontconfig,
   fribidi,
-  libX11,
+  libx11,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "quesoglc";
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
     fontconfig
     fribidi
-    libX11
+    libx11
   ];
 
   # required for cross builds
diff --git a/pkgs/by-name/qw/qwen-code/package.nix b/pkgs/by-name/qw/qwen-code/package.nix
index 6d1a4bfbb252..03a9b3427d3d 100644
--- a/pkgs/by-name/qw/qwen-code/package.nix
+++ b/pkgs/by-name/qw/qwen-code/package.nix
@@ -14,16 +14,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "qwen-code";
-  version = "0.4.0";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "QwenLM";
     repo = "qwen-code";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-B7dL0pWSCPwPKwwTHycgC3/qHB66AUWZc62sen7U/7c=";
+    hash = "sha256-gMMJNlzh8wE8Y80d8BsuM79SMtrX27vNsRtR3w2Cw2I=";
   };
 
-  npmDepsHash = "sha256-SPb+TSi4MCiAr9ruS1Idg3KfTbX6gtMK7f/+vdnabt8=";
+  npmDepsHash = "sha256-dnS+/8dxHvqqyP4K8M9dwUoNKI7OcRQMlQtBlAO8G3A=";
 
   # npm 11 incompatible with fetchNpmDeps
   # https://github.com/NixOS/nixpkgs/issues/474535
diff --git a/pkgs/by-name/ra/radiance-vj/package.nix b/pkgs/by-name/ra/radiance-vj/package.nix
index 7325c2b65dbc..8d6e7363cdbc 100644
--- a/pkgs/by-name/ra/radiance-vj/package.nix
+++ b/pkgs/by-name/ra/radiance-vj/package.nix
@@ -9,14 +9,14 @@
   stdenv,
   alsa-lib,
   wayland,
-  libX11,
-  libXcursor,
-  libXi,
-  libXrandr,
-  libXinerama,
-  libXpresent,
-  libXfixes,
-  libXext,
+  libx11,
+  libxcursor,
+  libxi,
+  libxrandr,
+  libxinerama,
+  libxpresent,
+  libxfixes,
+  libxext,
   libxcb,
   yt-dlp,
 }:
@@ -44,14 +44,14 @@ rustPlatform.buildRustPackage rec {
     libxkbcommon
     alsa-lib
     wayland
-    libX11
-    libXcursor
-    libXi
-    libXrandr
-    libXinerama
-    libXpresent
-    libXfixes
-    libXext
+    libx11
+    libxcursor
+    libxi
+    libxrandr
+    libxinerama
+    libxpresent
+    libxfixes
+    libxext
     libxcb
   ];
 
@@ -64,14 +64,14 @@ rustPlatform.buildRustPackage rec {
       --add-rpath "${
         lib.makeLibraryPath [
           libxkbcommon
-          libX11
-          libXcursor
-          libXi
-          libXrandr
-          libXinerama
-          libXpresent
-          libXfixes
-          libXext
+          libx11
+          libxcursor
+          libxi
+          libxrandr
+          libxinerama
+          libxpresent
+          libxfixes
+          libxext
         ]
       }:$out/lib" \
       $out/bin/radiance \
diff --git a/pkgs/by-name/ra/ragnarwm/package.nix b/pkgs/by-name/ra/ragnarwm/package.nix
index 3a77bb6193e6..dee88d1aa92d 100644
--- a/pkgs/by-name/ra/ragnarwm/package.nix
+++ b/pkgs/by-name/ra/ragnarwm/package.nix
@@ -4,10 +4,10 @@
   fetchFromGitHub,
   writeText,
   fontconfig,
-  libX11,
-  libXft,
-  libXcursor,
-  libXcomposite,
+  libx11,
+  libxft,
+  libxcursor,
+  libxcomposite,
   conf ? null,
   nixosTests,
 }:
@@ -38,10 +38,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     fontconfig
-    libX11
-    libXft
-    libXcursor
-    libXcomposite
+    libx11
+    libxft
+    libxcursor
+    libxcomposite
   ];
 
   makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
diff --git a/pkgs/by-name/ra/ratmen/package.nix b/pkgs/by-name/ra/ratmen/package.nix
index 22be3abf673b..04473a707379 100644
--- a/pkgs/by-name/ra/ratmen/package.nix
+++ b/pkgs/by-name/ra/ratmen/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   perl,
   xorgproto,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     perl
     xorgproto
-    libX11
+    libx11
   ];
   makeFlags = [
     "PREFIX=$(out)"
diff --git a/pkgs/by-name/ra/ratpoison/package.nix b/pkgs/by-name/ra/ratpoison/package.nix
index a410a79039ba..58916d67cf6f 100644
--- a/pkgs/by-name/ra/ratpoison/package.nix
+++ b/pkgs/by-name/ra/ratpoison/package.nix
@@ -5,13 +5,13 @@
   autoreconfHook,
   fontconfig,
   freetype,
-  libX11,
-  libXft,
-  libXi,
-  libXpm,
-  libXrandr,
-  libXt,
-  libXtst,
+  libx11,
+  libxft,
+  libxi,
+  libxpm,
+  libxrandr,
+  libxt,
+  libxtst,
   perl,
   pkg-config,
   readline,
@@ -37,13 +37,13 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     fontconfig
     freetype
-    libX11
-    libXft
-    libXi
-    libXpm
-    libXrandr
-    libXt
-    libXtst
+    libx11
+    libxft
+    libxi
+    libxpm
+    libxrandr
+    libxt
+    libxtst
     perl
     readline
     xorgproto
@@ -90,6 +90,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl2Plus;
     mainProgram = "ratpoison";
     maintainers = [ ];
-    inherit (libX11.meta) platforms;
+    inherit (libx11.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/ra/raylib/package.nix b/pkgs/by-name/ra/raylib/package.nix
index 93f993759b22..5fee6c4498df 100644
--- a/pkgs/by-name/ra/raylib/package.nix
+++ b/pkgs/by-name/ra/raylib/package.nix
@@ -10,7 +10,7 @@
   libpulseaudio,
   raylib-games,
   libGLU,
-  libX11,
+  libx11,
   platform ? "Desktop", # Note that "Web", "Android" and "Raspberry Pi" do not currently work
   pulseSupport ? stdenv.hostPlatform.isLinux,
   alsaSupport ? false,
@@ -55,7 +55,7 @@ lib.checkListOfEnum "raylib: platform"
 
       propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
         libGLU
-        libX11
+        libx11
       ];
 
       # https://github.com/raysan5/raylib/wiki/CMake-Build-Options
diff --git a/pkgs/by-name/rd/rdesktop/package.nix b/pkgs/by-name/rd/rdesktop/package.nix
index 4580913d5568..c50c8da55514 100644
--- a/pkgs/by-name/rd/rdesktop/package.nix
+++ b/pkgs/by-name/rd/rdesktop/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchFromGitHub,
   openssl,
-  libX11,
+  libx11,
   krb5,
-  libXcursor,
+  libxcursor,
   libtasn1,
   nettle,
   gnutls,
@@ -33,8 +33,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     openssl
-    libX11
-    libXcursor
+    libx11
+    libxcursor
     libtasn1
     nettle
     gnutls
diff --git a/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix b/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix
index 87152c4da86c..416b4aa55ee4 100644
--- a/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix
+++ b/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix
@@ -3,8 +3,8 @@
   fetchurl,
   autoPatchelfHook,
   rpmextract,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   pname,
   version,
   meta,
@@ -28,8 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
     rpmextract
   ];
   buildInputs = [
-    libX11
-    libXext
+    libx11
+    libxext
     stdenv.cc.cc.libgcc or null
   ];
 
diff --git a/pkgs/by-name/re/redeclipse/package.nix b/pkgs/by-name/re/redeclipse/package.nix
index d8fc4d1c33ae..df457eeb3d4c 100644
--- a/pkgs/by-name/re/redeclipse/package.nix
+++ b/pkgs/by-name/re/redeclipse/package.nix
@@ -8,7 +8,7 @@
   freetype,
   zlib,
   libGL,
-  libX11,
+  libx11,
   SDL2,
   SDL2_image,
   SDL2_mixer,
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libGL
-    libX11
+    libx11
     freetype
     zlib
     SDL2
diff --git a/pkgs/by-name/re/redux/package.nix b/pkgs/by-name/re/redux/package.nix
index b5d2a9c19265..71e3abdcaf30 100644
--- a/pkgs/by-name/re/redux/package.nix
+++ b/pkgs/by-name/re/redux/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchurl,
   writeScript,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   alsa-lib,
   autoPatchelfHook,
   releasePath ? null,
@@ -41,8 +41,8 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libX11
-    libXext
+    libx11
+    libxext
     alsa-lib
     (lib.getLib stdenv.cc.cc)
   ];
diff --git a/pkgs/by-name/re/reevr/package.nix b/pkgs/by-name/re/reevr/package.nix
index 33576e1ccabf..bf1a80125869 100644
--- a/pkgs/by-name/re/reevr/package.nix
+++ b/pkgs/by-name/re/reevr/package.nix
@@ -7,14 +7,14 @@
   alsa-lib,
   fontconfig,
   freetype,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXdmcp,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXtst,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxdmcp,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxtst,
   writableTmpDirAsHomeHook,
 
   buildVST3 ? true,
@@ -45,14 +45,14 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.isLinux [
     alsa-lib
-    libX11
-    libXcomposite
-    libXcursor
-    libXdmcp
-    libXext
-    libXinerama
-    libXrandr
-    libXtst
+    libx11
+    libxcomposite
+    libxcursor
+    libxdmcp
+    libxext
+    libxinerama
+    libxrandr
+    libxtst
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix
index a3724181fe3e..d6cad0aa9cc8 100644
--- a/pkgs/by-name/re/reindeer/package.nix
+++ b/pkgs/by-name/re/reindeer/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "reindeer";
-  version = "2026.01.26.00";
+  version = "2026.02.02.00";
 
   src = fetchFromGitHub {
     owner = "facebookincubator";
     repo = "reindeer";
     tag = "v${version}";
-    hash = "sha256-jUyb8fzzk1TzTe4pBXlZTByesdlDGJc2Q5L5pmHn9bw=";
+    hash = "sha256-NiS3TETnyGMGU+AxTNQIem3Cj2/c/VKSXSrcTX/5oME=";
   };
 
-  cargoHash = "sha256-CZcbEFZpZonp8iGI/DklPpAvaCoaS+LGMO8F/6NryBY=";
+  cargoHash = "sha256-aHAgb3IJVRaVBGd2voUoUblRGoepTjUFIR3WOmTEEVY=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/re/remark42/package.nix b/pkgs/by-name/re/remark42/package.nix
new file mode 100644
index 000000000000..77595ef28e4a
--- /dev/null
+++ b/pkgs/by-name/re/remark42/package.nix
@@ -0,0 +1,106 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  buildGoModule,
+  nodejs_22,
+  pnpm_8,
+  fetchPnpmDeps,
+  pnpmConfigHook,
+  testers,
+}:
+
+let
+  version = "1.15.0";
+
+  src = fetchFromGitHub {
+    owner = "umputun";
+    repo = "remark42";
+    tag = "v${version}";
+    hash = "sha256-yd/qTRSZj0nZpgK77xP+XHyHcVXlNpyMzdfj6EbVcXQ=";
+  };
+
+  remark42-web = stdenv.mkDerivation (finalAttrs: {
+    pname = "remark42-web";
+    inherit version src;
+
+    strictDeps = true;
+
+    pnpmRoot = "frontend";
+
+    nativeBuildInputs = [
+      nodejs_22
+      pnpm_8
+      pnpmConfigHook
+    ];
+
+    pnpmDeps = fetchPnpmDeps {
+      inherit (finalAttrs) pname version src;
+      sourceRoot = "${finalAttrs.src.name}/frontend";
+      pnpm = pnpm_8;
+      fetcherVersion = 3;
+      hash = "sha256-E2tUZXhcufuztXS+Z//uZk9omvaPrevNbGqVd41Lwhw=";
+    };
+
+    buildPhase = ''
+      runHook preBuild
+      pushd "$pnpmRoot"
+      pnpm --filter ./apps/remark42 --fail-if-no-match run build
+      popd
+      runHook postBuild
+    '';
+
+    installPhase = ''
+      runHook preInstall
+      mkdir -p $out/web
+      cp -r "$pnpmRoot/apps/remark42/public/." $out/web/
+      runHook postInstall
+    '';
+  });
+in
+buildGoModule (finalAttrs: {
+  pname = "remark42";
+  inherit version src;
+
+  strictDeps = true;
+
+  modRoot = "backend";
+
+  # build the main package in ./backend/app
+  subPackages = [ "app" ];
+
+  preBuild = ''
+    rm -rf app/cmd/web
+    mkdir -p app/cmd/web
+    cp -r ${remark42-web}/web/. app/cmd/web/
+  '';
+
+  vendorHash = null;
+
+  # set the version string in the built binary.
+  ldflags = [
+    "-s"
+    "-w"
+    "-X"
+    "main.revision=v${version}"
+  ];
+
+  postInstall = ''
+    mv "$out/bin/app" "$out/bin/remark42"
+  '';
+
+  passthru.tests.version = testers.testVersion {
+    package = finalAttrs.finalPackage;
+    command = "remark42 --help";
+    version = "v${finalAttrs.version}";
+  };
+
+  meta = with lib; {
+    description = "Self-hosted comment engine that embeds a statically built frontend";
+    homepage = "https://remark42.com/";
+    license = licenses.mit;
+    mainProgram = "remark42";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ janhencic ];
+  };
+})
diff --git a/pkgs/by-name/re/remmina/package.nix b/pkgs/by-name/re/remmina/package.nix
index 0c6e0e9dab7d..e11909347633 100644
--- a/pkgs/by-name/re/remmina/package.nix
+++ b/pkgs/by-name/re/remmina/package.nix
@@ -13,7 +13,7 @@
   gtk3,
   gettext,
   libxkbfile,
-  libX11,
+  libx11,
   python3,
   freerdp,
   libssh,
@@ -24,7 +24,7 @@
   libappindicator-gtk3,
   libvncserver,
   libpthread-stubs,
-  libXdmcp,
+  libxdmcp,
   libxkbcommon,
   libsecret,
   libsoup_3,
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     gettext
     libxkbfile
-    libX11
+    libx11
     freerdp
     libssh
     libgcrypt
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
     pcre2
     libvncserver
     libpthread-stubs
-    libXdmcp
+    libxdmcp
     libxkbcommon
     libsoup_3
     spice-protocol
@@ -133,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: {
   preFixup = ''
     gappsWrapperArgs+=(
       --set-default SSL_CERT_DIR "/etc/ssl/certs/"
-      --prefix LD_LIBRARY_PATH : "${libX11.out}/lib"
+      --prefix LD_LIBRARY_PATH : "${libx11.out}/lib"
       ${lib.optionalString stdenv.hostPlatform.isDarwin ''
         --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
       ''}
diff --git a/pkgs/by-name/re/remote-touchpad/package.nix b/pkgs/by-name/re/remote-touchpad/package.nix
index 5bc82b6f3844..62dcdff97d22 100644
--- a/pkgs/by-name/re/remote-touchpad/package.nix
+++ b/pkgs/by-name/re/remote-touchpad/package.nix
@@ -2,10 +2,10 @@
   buildGoModule,
   fetchFromGitHub,
   lib,
-  libXi,
-  libXrandr,
-  libXt,
-  libXtst,
+  libxi,
+  libxrandr,
+  libxt,
+  libxtst,
 }:
 
 buildGoModule rec {
@@ -20,10 +20,10 @@ buildGoModule rec {
   };
 
   buildInputs = [
-    libXi
-    libXrandr
-    libXt
-    libXtst
+    libxi
+    libxrandr
+    libxt
+    libxtst
   ];
   tags = [ "portal,x11" ];
 
diff --git a/pkgs/by-name/re/renderdoc/package.nix b/pkgs/by-name/re/renderdoc/package.nix
index 5eb038d83252..aba66916b67b 100644
--- a/pkgs/by-name/re/renderdoc/package.nix
+++ b/pkgs/by-name/re/renderdoc/package.nix
@@ -7,7 +7,7 @@
   cmake,
   fetchFromGitHub,
   fetchpatch,
-  libXdmcp,
+  libxdmcp,
   libglvnd,
   libpthread-stubs,
   makeWrapper,
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libXdmcp
+    libxdmcp
     libpthread-stubs
     python312Packages.pyside2
     python312Packages.pyside2-tools
diff --git a/pkgs/by-name/re/renoise/package.nix b/pkgs/by-name/re/renoise/package.nix
index 4a956006eb2b..7121f1e8d676 100644
--- a/pkgs/by-name/re/renoise/package.nix
+++ b/pkgs/by-name/re/renoise/package.nix
@@ -5,12 +5,12 @@
   alsa-lib,
   fetchurl,
   libjack2,
-  libX11,
-  libXcursor,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXtst,
+  libx11,
+  libxcursor,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxtst,
   mpg123,
   pipewire,
   releasePath ? null,
@@ -57,12 +57,12 @@ stdenv.mkDerivation rec {
   buildInputs = [
     alsa-lib
     libjack2
-    libX11
-    libXcursor
-    libXext
-    libXinerama
-    libXrandr
-    libXtst
+    libx11
+    libxcursor
+    libxext
+    libxinerama
+    libxrandr
+    libxtst
     pipewire
   ];
 
diff --git a/pkgs/by-name/re/resterm/package.nix b/pkgs/by-name/re/resterm/package.nix
index fd1b0e708ab7..fa0fc6955854 100644
--- a/pkgs/by-name/re/resterm/package.nix
+++ b/pkgs/by-name/re/resterm/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "resterm";
-  version = "0.20.2";
+  version = "0.21.3";
 
   src = fetchFromGitHub {
     owner = "unkn0wn-root";
     repo = "resterm";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-30iof50NA2wXMpRsgHbUhYyEx7Gzb/mPkKvLLf2yUQ8=";
+    sha256 = "sha256-ix+9TblklF0PKzuSsI/qTqOH0la9K9wE84j/wJYJIM0=";
   };
 
   vendorHash = "sha256-E/Y4kW5xy7YamUP5bxFmDCAK6RqiqGN7DpEPG1MaCHc=";
diff --git a/pkgs/by-name/re/retdec/package.nix b/pkgs/by-name/re/retdec/package.nix
index 4b0609cf87f9..a84e60854aaf 100644
--- a/pkgs/by-name/re/retdec/package.nix
+++ b/pkgs/by-name/re/retdec/package.nix
@@ -115,7 +115,7 @@ let
     subprocess.check_call(['chmod', '-R', 'u+w', support_dir])
   '';
 in
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "retdec";
 
   # If you update this you will also need to adjust the versions of the updated dependencies.
@@ -129,7 +129,7 @@ stdenv.mkDerivation (self: {
   src = fetchFromGitHub {
     owner = "avast";
     repo = "retdec";
-    tag = "v${self.version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-H4e+aSgdBBbG6X6DzHGiDEIASPwBVNVsfHyeBTQLAKI=";
   };
 
@@ -161,10 +161,10 @@ stdenv.mkDerivation (self: {
     libxml2
     zlib
   ]
-  ++ lib.optional self.doInstallCheck gtest;
+  ++ lib.optional finalAttrs.doInstallCheck gtest;
 
   cmakeFlags = [
-    (lib.cmakeBool "RETDEC_TESTS" self.doInstallCheck) # build tests
+    (lib.cmakeBool "RETDEC_TESTS" finalAttrs.doInstallCheck) # build tests
     (lib.cmakeBool "RETDEC_DEV_TOOLS" buildDevTools) # build tools e.g. capstone2llvmir, retdectool
     (lib.cmakeBool "RETDEC_COMPILE_YARA" compileYaraPatterns) # build and install compiled patterns
   ]
diff --git a/pkgs/by-name/re/retroarch-bare/package.nix b/pkgs/by-name/re/retroarch-bare/package.nix
index d7ec227c467e..6e957a924503 100644
--- a/pkgs/by-name/re/retroarch-bare/package.nix
+++ b/pkgs/by-name/re/retroarch-bare/package.nix
@@ -15,12 +15,12 @@
   libGLU,
   libpulseaudio,
   libv4l,
-  libX11,
-  libXdmcp,
-  libXext,
+  libx11,
+  libxdmcp,
+  libxext,
   libxkbcommon,
   libxml2,
-  libXxf86vm,
+  libxxf86vm,
   makeBinaryWrapper,
   mbedtls,
   libgbm,
@@ -99,10 +99,10 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
     dbus
-    libX11
-    libXdmcp
-    libXext
-    libXxf86vm
+    libx11
+    libxdmcp
+    libxext
+    libxxf86vm
     libdrm
     libpulseaudio
     libv4l
diff --git a/pkgs/by-name/ri/rigel-engine/package.nix b/pkgs/by-name/ri/rigel-engine/package.nix
index 7bf08c4574e3..090affbf8425 100644
--- a/pkgs/by-name/ri/rigel-engine/package.nix
+++ b/pkgs/by-name/ri/rigel-engine/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  libX11,
+  libx11,
   SDL2,
   SDL2_mixer,
   buildOpenGLES ? false,
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     SDL2
     SDL2_mixer
   ];
diff --git a/pkgs/by-name/ri/rigsofrods-bin/package.nix b/pkgs/by-name/ri/rigsofrods-bin/package.nix
index bae73c216e5f..d723d97c8903 100644
--- a/pkgs/by-name/ri/rigsofrods-bin/package.nix
+++ b/pkgs/by-name/ri/rigsofrods-bin/package.nix
@@ -8,8 +8,8 @@
   libGL,
   libice,
   libsm,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
   zlib,
   alsa-lib,
 }:
@@ -35,8 +35,8 @@ stdenv.mkDerivation {
     libGL
     libice
     libsm
-    libX11
-    libXrandr
+    libx11
+    libxrandr
     stdenv.cc.cc
     zlib
   ];
diff --git a/pkgs/by-name/ri/rio/package.nix b/pkgs/by-name/ri/rio/package.nix
index ffa6d33146ce..d0c44fffec29 100644
--- a/pkgs/by-name/ri/rio/package.nix
+++ b/pkgs/by-name/ri/rio/package.nix
@@ -18,10 +18,10 @@
   vulkan-loader,
   libxkbcommon,
   withX11 ? !stdenv.hostPlatform.isDarwin,
-  libX11,
-  libXcursor,
-  libXi,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxi,
+  libxrandr,
   libxcb,
   withWayland ? !stdenv.hostPlatform.isDarwin,
   wayland,
@@ -38,10 +38,10 @@ let
       vulkan-loader
     ]
     ++ lib.optionals withX11 [
-      libX11
-      libXcursor
-      libXi
-      libXrandr
+      libx11
+      libxcursor
+      libxi
+      libxrandr
       libxcb
     ]
     ++ lib.optionals withWayland [
diff --git a/pkgs/by-name/ri/ripplerx/package.nix b/pkgs/by-name/ri/ripplerx/package.nix
index edbc55fd9a41..78dac04e448b 100644
--- a/pkgs/by-name/ri/ripplerx/package.nix
+++ b/pkgs/by-name/ri/ripplerx/package.nix
@@ -9,11 +9,11 @@
   expat,
   fontconfig,
   freetype,
-  libX11,
-  libXcursor,
-  libXext,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxext,
+  libxinerama,
+  libxrandr,
   nix-update-script,
   makeDesktopItem,
   copyDesktopItems,
@@ -45,11 +45,11 @@ stdenv.mkDerivation (finalAttrs: {
     expat
     fontconfig
     freetype
-    libX11
-    libXcursor
-    libXext
-    libXinerama
-    libXrandr
+    libx11
+    libxcursor
+    libxext
+    libxinerama
+    libxrandr
   ];
 
   env = {
diff --git a/pkgs/by-name/ri/river-classic/package.nix b/pkgs/by-name/ri/river-classic/package.nix
index 989d07331e18..7385f480bd47 100644
--- a/pkgs/by-name/ri/river-classic/package.nix
+++ b/pkgs/by-name/ri/river-classic/package.nix
@@ -4,7 +4,7 @@
   callPackage,
   fetchFromCodeberg,
   libGL,
-  libX11,
+  libx11,
   libevdev,
   libinput,
   libxkbcommon,
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-protocols
     wlroots_0_19
   ]
-  ++ lib.optional xwaylandSupport libX11;
+  ++ lib.optional xwaylandSupport libx11;
 
   dontConfigure = true;
 
diff --git a/pkgs/by-name/rk/rkrlv2/package.nix b/pkgs/by-name/rk/rkrlv2/package.nix
index 8035b400dbfd..42f9a7a37f3a 100644
--- a/pkgs/by-name/rk/rkrlv2/package.nix
+++ b/pkgs/by-name/rk/rkrlv2/package.nix
@@ -6,8 +6,8 @@
   lv2,
   fftw,
   cmake,
-  libXpm,
-  libXft,
+  libxpm,
+  libxft,
   libjack2,
   libsamplerate,
   libsndfile,
@@ -38,8 +38,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libXft
-    libXpm
+    libxft
+    libxpm
     lv2
     fftw
     libjack2
diff --git a/pkgs/by-name/ro/roam-research/linux.nix b/pkgs/by-name/ro/roam-research/linux.nix
index 48a2f9aee6cc..775f412f3206 100644
--- a/pkgs/by-name/ro/roam-research/linux.nix
+++ b/pkgs/by-name/ro/roam-research/linux.nix
@@ -12,17 +12,17 @@
   gdk-pixbuf,
   glib,
   gtk3,
-  libX11,
-  libXScrnSaver,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXtst,
+  libx11,
+  libxscrnsaver,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxtst,
   libdrm,
   libpulseaudio,
   libxcb,
@@ -48,13 +48,13 @@ let
     gdk-pixbuf
     glib
     gtk3
-    libX11
-    libXcomposite
-    libXdamage
-    libXext
-    libXfixes
-    libXi
-    libXrandr
+    libx11
+    libxcomposite
+    libxdamage
+    libxext
+    libxfixes
+    libxi
+    libxrandr
     libdrm
     libxcb
     libxkbcommon
@@ -64,10 +64,10 @@ let
     nss
     pango
     stdenv.cc.cc
-    libXScrnSaver
-    libXcursor
-    libXrender
-    libXtst
+    libxscrnsaver
+    libxcursor
+    libxrender
+    libxtst
     libpulseaudio
     udev
   ];
diff --git a/pkgs/by-name/ro/rofi-emoji/package.nix b/pkgs/by-name/ro/rofi-emoji/package.nix
index 03ef3156716e..7a4b63576ef2 100644
--- a/pkgs/by-name/ro/rofi-emoji/package.nix
+++ b/pkgs/by-name/ro/rofi-emoji/package.nix
@@ -23,14 +23,14 @@
   nix-update-script,
 }:
 
-stdenv.mkDerivation (final: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "rofi-emoji";
   version = "4.1.0";
 
   src = fetchFromGitHub {
     owner = "Mange";
     repo = "rofi-emoji";
-    rev = "v${final.version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-Amaz+83mSPue+pjZq/pJiCxu5QczYvmJk6f96eraaK8=";
   };
 
diff --git a/pkgs/by-name/ro/roomarranger/package.nix b/pkgs/by-name/ro/roomarranger/package.nix
index f785bdacd41d..e4663f40f232 100644
--- a/pkgs/by-name/ro/roomarranger/package.nix
+++ b/pkgs/by-name/ro/roomarranger/package.nix
@@ -10,7 +10,7 @@
 }:
 
 let
-  version = "10.3.1";
+  version = "10.3.4";
 
   desktopItem = makeDesktopItem {
     type = "Application";
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://f000.backblazeb2.com/file/rooarr/rooarr${lib.versions.major version}${lib.versions.minor version}${lib.versions.patch version}-linux64.tar.gz";
-    hash = "sha256-J4/IsOH12CutjorGtZzKbL4uFYWd9SXmjNx32Vi5dr0=";
+    hash = "sha256-ck3te+arllKJW8j6ymgvckAtCPiQMkXNBoNkKspVwak=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ro/roslyn-ls/deps.json b/pkgs/by-name/ro/roslyn-ls/deps.json
index 33418dc5fc0d..a8f10b4a9fff 100644
--- a/pkgs/by-name/ro/roslyn-ls/deps.json
+++ b/pkgs/by-name/ro/roslyn-ls/deps.json
@@ -31,9 +31,9 @@
   },
   {
     "pname": "Microsoft.Bcl.AsyncInterfaces",
-    "version": "9.0.0",
-    "hash": "sha256-BsXNOWEgfFq3Yz7VTtK6m/ov4/erRqyBzieWSIpmc1U=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.bcl.asyncinterfaces/9.0.0/microsoft.bcl.asyncinterfaces.9.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-aHoslRGmAot/z1GCCqSzjAxT/hltxOOIZ1/oti4WbGY=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.bcl.asyncinterfaces/10.0.1/microsoft.bcl.asyncinterfaces.10.0.1.nupkg"
   },
   {
     "pname": "Microsoft.Build",
@@ -95,12 +95,6 @@
     "hash": "sha256-E/+PlegvWZ59e5Ti3TvKJBLa3qCnDKmi7+DcnOo1ufg=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.elfie/1.0.0/microsoft.codeanalysis.elfie.1.0.0.nupkg"
   },
-  {
-    "pname": "Microsoft.CodeAnalysis.NetAnalyzers",
-    "version": "10.0.0-preview.25375.1",
-    "hash": "sha256-1AmmAyGxYIazQQhA0bcOOccAfP+WUL0il31XQLyeYlc=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/microsoft.codeanalysis.netanalyzers/10.0.0-preview.25375.1/microsoft.codeanalysis.netanalyzers.10.0.0-preview.25375.1.nupkg"
-  },
   {
     "pname": "Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers",
     "version": "3.3.4-beta1.22504.1",
@@ -145,81 +139,81 @@
   },
   {
     "pname": "Microsoft.Extensions.Configuration",
-    "version": "9.0.0",
-    "hash": "sha256-uBLeb4z60y8z7NelHs9uT3cLD6wODkdwyfJm6/YZLDM=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration/9.0.0/microsoft.extensions.configuration.9.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-7xdHie4uHwoGZz5yUT4vWg2EWvkLvsSzItWCoqm4dTM=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration/10.0.1/microsoft.extensions.configuration.10.0.1.nupkg"
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "9.0.0",
-    "hash": "sha256-xtG2USC9Qm0f2Nn6jkcklpyEDT3hcEZOxOwTc0ep7uc=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration.abstractions/9.0.0/microsoft.extensions.configuration.abstractions.9.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-s4PDp+vtzdxKIxnOT3+dDRoTDopyl8kqmmw4KDnkOtQ=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration.abstractions/10.0.1/microsoft.extensions.configuration.abstractions.10.0.1.nupkg"
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Binder",
-    "version": "9.0.0",
-    "hash": "sha256-6ajYWcNOQX2WqftgnoUmVtyvC1kkPOtTCif4AiKEffU=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration.binder/9.0.0/microsoft.extensions.configuration.binder.9.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-fiqTHE6EfaUXICaVrWzQEU/K6GjQNac6yRNErig6wRk=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration.binder/10.0.1/microsoft.extensions.configuration.binder.10.0.1.nupkg"
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
-    "version": "9.0.0",
-    "hash": "sha256-dAH52PPlTLn7X+1aI/7npdrDzMEFPMXRv4isV1a+14k=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.dependencyinjection/9.0.0/microsoft.extensions.dependencyinjection.9.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-RKOB+zPrtQNUbJY/1jR54rKOM8KHPgynPExxugku3I8=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.dependencyinjection/10.0.1/microsoft.extensions.dependencyinjection.10.0.1.nupkg"
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "9.0.0",
-    "hash": "sha256-CncVwkKZ5CsIG2O0+OM9qXuYXh3p6UGyueTHSLDVL+c=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.dependencyinjection.abstractions/9.0.0/microsoft.extensions.dependencyinjection.abstractions.9.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-zNUpau51ds7iQTaSUTFtyTHIUoinYc129W50CnufMdQ=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.dependencyinjection.abstractions/10.0.1/microsoft.extensions.dependencyinjection.abstractions.10.0.1.nupkg"
   },
   {
     "pname": "Microsoft.Extensions.FileSystemGlobbing",
-    "version": "8.0.0",
-    "hash": "sha256-+Oz41JR5jdcJlCJOSpQIL5OMBNi+1Hl2d0JUHfES7sU=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.filesystemglobbing/8.0.0/microsoft.extensions.filesystemglobbing.8.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-R9f52Tn3DyktDD5UtWj80Ee3nEXMo0BR+66b/8NxaV8=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.filesystemglobbing/10.0.1/microsoft.extensions.filesystemglobbing.10.0.1.nupkg"
   },
   {
     "pname": "Microsoft.Extensions.Logging",
-    "version": "9.0.0",
-    "hash": "sha256-kR16c+N8nQrWeYLajqnXPg7RiXjZMSFLnKLEs4VfjcM=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging/9.0.0/microsoft.extensions.logging.9.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-zuLP3SIpCToMOlIPOEv3Kq8y/minecd8k8GSkxFo13E=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging/10.0.1/microsoft.extensions.logging.10.0.1.nupkg"
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "9.0.0",
-    "hash": "sha256-iBTs9twjWXFeERt4CErkIIcoJZU1jrd1RWCI8V5j7KU=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging.abstractions/9.0.0/microsoft.extensions.logging.abstractions.9.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-NRk0feNE1fgi/hyO0AVDbSGJQRT+9yte6Lpm4Hz/2Bs=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging.abstractions/10.0.1/microsoft.extensions.logging.abstractions.10.0.1.nupkg"
   },
   {
     "pname": "Microsoft.Extensions.Logging.Configuration",
-    "version": "9.0.0",
-    "hash": "sha256-ysPjBq64p6JM4EmeVndryXnhLWHYYszzlVpPxRWkUkw=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging.configuration/9.0.0/microsoft.extensions.logging.configuration.9.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-/7ywcFsEmmQzWEcIvxoGAYHF0oDSXV/LTDAiW/MNQtg=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging.configuration/10.0.1/microsoft.extensions.logging.configuration.10.0.1.nupkg"
   },
   {
     "pname": "Microsoft.Extensions.Logging.Console",
-    "version": "9.0.0",
-    "hash": "sha256-N2t9EUdlS6ippD4Z04qUUyBuQ4tKSR/8TpmKScb5zRw=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging.console/9.0.0/microsoft.extensions.logging.console.9.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-m/E02c5NSCYyH4THNKxpnsi3Kp8gqOi2aPrfXx7sQ9s=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging.console/10.0.1/microsoft.extensions.logging.console.10.0.1.nupkg"
   },
   {
     "pname": "Microsoft.Extensions.Options",
-    "version": "9.0.0",
-    "hash": "sha256-DT5euAQY/ItB5LPI8WIp6Dnd0lSvBRP35vFkOXC68ck=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.options/9.0.0/microsoft.extensions.options.9.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-vBiSS1vqAC7eDrpJNT4H3A9qLikCSAepnNRbry0mKnk=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.options/10.0.1/microsoft.extensions.options.10.0.1.nupkg"
   },
   {
     "pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
-    "version": "9.0.0",
-    "hash": "sha256-r1Z3sEVSIjeH2UKj+KMj86har68g/zybSqoSjESBcoA=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.options.configurationextensions/9.0.0/microsoft.extensions.options.configurationextensions.9.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-1CNSVXZ3RAH4vzbYDqcQHl9c/YBhuSfrFUXCLIx5/rY=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.options.configurationextensions/10.0.1/microsoft.extensions.options.configurationextensions.10.0.1.nupkg"
   },
   {
     "pname": "Microsoft.Extensions.Primitives",
-    "version": "9.0.0",
-    "hash": "sha256-ZNLusK1CRuq5BZYZMDqaz04PIKScE2Z7sS2tehU7EJs=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.primitives/9.0.0/microsoft.extensions.primitives.9.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-EXmukq09erT4s+miQpBSYy3IY4HxxKlwEPL43/KoyEc=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.primitives/10.0.1/microsoft.extensions.primitives.10.0.1.nupkg"
   },
   {
     "pname": "Microsoft.IO.Redist",
@@ -451,33 +445,33 @@
   },
   {
     "pname": "SQLitePCLRaw.bundle_green",
-    "version": "2.1.0",
-    "hash": "sha256-W14WMqNZndRmnySqLdFqmvfbH14kJxMV6+/4dIS0CwE=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/sqlitepclraw.bundle_green/2.1.0/sqlitepclraw.bundle_green.2.1.0.nupkg"
+    "version": "2.1.6",
+    "hash": "sha256-vn1ho90/o9mwK04dC4Jqs+GHXxFm0qMxRYIPMq00DC4=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/sqlitepclraw.bundle_green/2.1.6/sqlitepclraw.bundle_green.2.1.6.nupkg"
   },
   {
     "pname": "SQLitePCLRaw.core",
-    "version": "2.1.0",
-    "hash": "sha256-l1lfw114VmMprNFNn1fM/wzKEbDywXDlgdTQWWbqBU8=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/sqlitepclraw.core/2.1.0/sqlitepclraw.core.2.1.0.nupkg"
+    "version": "2.1.6",
+    "hash": "sha256-RxWjm52PdmMV98dgDy0BCpF988+BssRZUgALLv7TH/E=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/sqlitepclraw.core/2.1.6/sqlitepclraw.core.2.1.6.nupkg"
   },
   {
     "pname": "SQLitePCLRaw.lib.e_sqlite3",
-    "version": "2.1.0",
-    "hash": "sha256-XsObwf7Fza9G1JCZvQ+SqMqQUdZNU3WcJYYp3cqfc8U=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/sqlitepclraw.lib.e_sqlite3/2.1.0/sqlitepclraw.lib.e_sqlite3.2.1.0.nupkg"
+    "version": "2.1.6",
+    "hash": "sha256-uHt5d+SFUkSd6WD7Tg0J3e8eVoxy/FM/t4PAkc9PJT0=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/sqlitepclraw.lib.e_sqlite3/2.1.6/sqlitepclraw.lib.e_sqlite3.2.1.6.nupkg"
   },
   {
     "pname": "SQLitePCLRaw.provider.dynamic_cdecl",
-    "version": "2.1.0",
-    "hash": "sha256-2JLlOroGdfziGi+VpgBjtm9IHofG976T+9lZb+fQRok=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/sqlitepclraw.provider.dynamic_cdecl/2.1.0/sqlitepclraw.provider.dynamic_cdecl.2.1.0.nupkg"
+    "version": "2.1.6",
+    "hash": "sha256-KATX5eXy8zG1EVHzoQiOIbVyZuElV363+8tOUrYK2nA=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/sqlitepclraw.provider.dynamic_cdecl/2.1.6/sqlitepclraw.provider.dynamic_cdecl.2.1.6.nupkg"
   },
   {
     "pname": "SQLitePCLRaw.provider.e_sqlite3",
-    "version": "2.1.0",
-    "hash": "sha256-VkGdCCECj+0oaha/QsyfF9CQoaurC/KO2RHR2GaI77w=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/sqlitepclraw.provider.e_sqlite3/2.1.0/sqlitepclraw.provider.e_sqlite3.2.1.0.nupkg"
+    "version": "2.1.6",
+    "hash": "sha256-zHc/YZsd72eXlI8ba1tv58HZWUIiyjJaxq2CCP1hQe8=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/sqlitepclraw.provider.e_sqlite3/2.1.6/sqlitepclraw.provider.e_sqlite3.2.1.6.nupkg"
   },
   {
     "pname": "StreamJsonRpc",
@@ -487,9 +481,9 @@
   },
   {
     "pname": "System.Buffers",
-    "version": "4.6.0",
-    "hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.6.0/system.buffers.4.6.0.nupkg"
+    "version": "4.6.1",
+    "hash": "sha256-sARR6R0Bb77Aka0eNh86cBXh2R1AR/fkinRFWypnPXk=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.6.1/system.buffers.4.6.1.nupkg"
   },
   {
     "pname": "System.CodeDom",
@@ -499,15 +493,15 @@
   },
   {
     "pname": "System.Collections.Immutable",
-    "version": "8.0.0",
-    "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/8.0.0/system.collections.immutable.8.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-ODbNYiCAQHHvlEnKHqyBRDfR/g7Lh2LfSQ/Zb4fNSeg=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/10.0.1/system.collections.immutable.10.0.1.nupkg"
   },
   {
     "pname": "System.Collections.Immutable",
-    "version": "9.0.0",
-    "hash": "sha256-+6q5VMeoc5bm4WFsoV6nBXA9dV5pa/O4yW+gOdi8yac=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/9.0.0/system.collections.immutable.9.0.0.nupkg"
+    "version": "8.0.0",
+    "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/8.0.0/system.collections.immutable.8.0.0.nupkg"
   },
   {
     "pname": "System.CommandLine",
@@ -517,15 +511,21 @@
   },
   {
     "pname": "System.ComponentModel.Composition",
-    "version": "9.0.0",
-    "hash": "sha256-CsWwo/NLEAt36kE52cT4wud8uUjJ31vpHlAY6RkUbog=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.componentmodel.composition/9.0.0/system.componentmodel.composition.9.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-7EBJ8eJFnWezsn1q8+1/zG4hovpXwuhIDkCB1z7kBPU=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.componentmodel.composition/10.0.1/system.componentmodel.composition.10.0.1.nupkg"
   },
   {
     "pname": "System.Composition",
-    "version": "9.0.0",
-    "hash": "sha256-FehOkQ2u1p8mQ0/wn3cZ+24HjhTLdck8VZYWA1CcgbM=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition/9.0.0/system.composition.9.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-t6hzhdjJl8XBIAry9auOZEy8jkKy1qDRmrZxO+IsmXQ=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition/10.0.1/system.composition.10.0.1.nupkg"
+  },
+  {
+    "pname": "System.Composition.AttributedModel",
+    "version": "10.0.1",
+    "hash": "sha256-7jwCCz7Ajmpj26JPlMxU7YbwgxuIHuPvhhwWF2Nyhdw=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.attributedmodel/10.0.1/system.composition.attributedmodel.10.0.1.nupkg"
   },
   {
     "pname": "System.Composition.AttributedModel",
@@ -535,33 +535,33 @@
   },
   {
     "pname": "System.Composition.Convention",
-    "version": "9.0.0",
-    "hash": "sha256-tw4vE5JRQ60ubTZBbxoMPhtjOQCC3XoDFUH7NHO7o8U=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.convention/9.0.0/system.composition.convention.9.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-eWrZ0FvOnhhayxT193qjUy2f0cwhf01jJazpgfVb3Fk=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.convention/10.0.1/system.composition.convention.10.0.1.nupkg"
   },
   {
     "pname": "System.Composition.Hosting",
-    "version": "9.0.0",
-    "hash": "sha256-oOxU+DPEEfMCuNLgW6wSkZp0JY5gYt44FJNnWt+967s=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.hosting/9.0.0/system.composition.hosting.9.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-plHdjDS7vCYaP7Uasnx1J9arP9dzDFUl9EPelYj0f0Q=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.hosting/10.0.1/system.composition.hosting.10.0.1.nupkg"
   },
   {
     "pname": "System.Composition.Runtime",
-    "version": "9.0.0",
-    "hash": "sha256-AyIe+di1TqwUBbSJ/sJ8Q8tzsnTN+VBdJw4K8xZz43s=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.runtime/9.0.0/system.composition.runtime.9.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-mOQdwuSR9Akrbvgq0Ujr+uDN+vFjNbOi1ucOUspvEhU=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.runtime/10.0.1/system.composition.runtime.10.0.1.nupkg"
   },
   {
     "pname": "System.Composition.TypedParts",
-    "version": "9.0.0",
-    "hash": "sha256-F5fpTUs3Rr7yP/NyIzr+Xn5NdTXXp8rrjBnF9UBBUog=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.typedparts/9.0.0/system.composition.typedparts.9.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-5jBc/52m2MQxR5+AkauTEGhza4sNXr9An1IPQNkvffA=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.typedparts/10.0.1/system.composition.typedparts.10.0.1.nupkg"
   },
   {
     "pname": "System.Configuration.ConfigurationManager",
-    "version": "9.0.0",
-    "hash": "sha256-+pLnTC0YDP6Kjw5DVBiFrV/Q3x5is/+6N6vAtjvhVWk=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.configuration.configurationmanager/9.0.0/system.configuration.configurationmanager.9.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-XmXL//tniOp4RYiXs9HzNbwODjyGYW/bsWO0OuWXAxE=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.configuration.configurationmanager/10.0.1/system.configuration.configurationmanager.10.0.1.nupkg"
   },
   {
     "pname": "System.Data.DataSetExtensions",
@@ -571,15 +571,15 @@
   },
   {
     "pname": "System.Diagnostics.DiagnosticSource",
-    "version": "9.0.0",
-    "hash": "sha256-1VzO9i8Uq2KlTw1wnCCrEdABPZuB2JBD5gBsMTFTSvE=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.diagnosticsource/9.0.0/system.diagnostics.diagnosticsource.9.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-YxT94fUULFXIJ+hCM+4d156q50xDqxTev0S1MsIujwA=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.diagnosticsource/10.0.1/system.diagnostics.diagnosticsource.10.0.1.nupkg"
   },
   {
     "pname": "System.Diagnostics.EventLog",
-    "version": "9.0.0",
-    "hash": "sha256-tPvt6yoAp56sK/fe+/ei8M65eavY2UUhRnbrREj/Ems=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.eventlog/9.0.0/system.diagnostics.eventlog.9.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-Yn8jT9uKNnknLsSvtV9hyqfz/5x/aKnZt6XtfQOIdVM=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.eventlog/10.0.1/system.diagnostics.eventlog.10.0.1.nupkg"
   },
   {
     "pname": "System.Diagnostics.PerformanceCounter",
@@ -595,9 +595,9 @@
   },
   {
     "pname": "System.IO.Pipelines",
-    "version": "9.0.0",
-    "hash": "sha256-vb0NrPjfEao3kfZ0tavp2J/29XnsQTJgXv3/qaAwwz0=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.pipelines/9.0.0/system.io.pipelines.9.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-3NHQjvO1mSPo8Hq9vMM5QeKJeS9/y3UpznideAf5pJA=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.pipelines/10.0.1/system.io.pipelines.10.0.1.nupkg"
   },
   {
     "pname": "System.Management",
@@ -607,15 +607,15 @@
   },
   {
     "pname": "System.Memory",
-    "version": "4.6.0",
-    "hash": "sha256-OhAEKzUM6eEaH99DcGaMz2pFLG/q/N4KVWqqiBYUOFo=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.memory/4.6.0/system.memory.4.6.0.nupkg"
+    "version": "4.6.3",
+    "hash": "sha256-JgeK63WMmumF6L+FH5cwJgYdpqXrSDcgTQwtIgTHKVU=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.memory/4.6.3/system.memory.4.6.3.nupkg"
   },
   {
     "pname": "System.Numerics.Vectors",
-    "version": "4.6.0",
-    "hash": "sha256-fKS3uWQ2HmR69vNhDHqPLYNOt3qpjiWQOXZDHvRE1HU=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.6.0/system.numerics.vectors.4.6.0.nupkg"
+    "version": "4.6.1",
+    "hash": "sha256-K8UAqG3LAvIDLW2Hf54tbp5KeQgOVyObQZhnnUAx8sc=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.6.1/system.numerics.vectors.4.6.1.nupkg"
   },
   {
     "pname": "System.Reflection.Emit",
@@ -635,23 +635,23 @@
     "hash": "sha256-V0Wz/UUoNIHdTGS9e1TR89u58zJjo/wPUWw6VaVyclU=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.lightweight/4.7.0/system.reflection.emit.lightweight.4.7.0.nupkg"
   },
+  {
+    "pname": "System.Reflection.Metadata",
+    "version": "10.0.1",
+    "hash": "sha256-xjAyoQOjVuQUXSop9Uz7/lBHk5b7iukDriEpMpOQFTg=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/10.0.1/system.reflection.metadata.10.0.1.nupkg"
+  },
   {
     "pname": "System.Reflection.Metadata",
     "version": "8.0.0",
     "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/8.0.0/system.reflection.metadata.8.0.0.nupkg"
   },
-  {
-    "pname": "System.Reflection.Metadata",
-    "version": "9.0.0",
-    "hash": "sha256-avEWbcCh7XgpsSesnR3/SgxWi/6C5OxjR89Jf/SfRjQ=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/9.0.0/system.reflection.metadata.9.0.0.nupkg"
-  },
   {
     "pname": "System.Runtime.CompilerServices.Unsafe",
-    "version": "6.1.0",
-    "hash": "sha256-NyqqpRcHumzSxpsgRDguD5SGwdUNHBbo0OOdzLTIzCU=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.compilerservices.unsafe/6.1.0/system.runtime.compilerservices.unsafe.6.1.0.nupkg"
+    "version": "6.1.2",
+    "hash": "sha256-X2p/U680Zfkr622oc+vg5JYgbDEzE7mLre5DVaayWTc=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.compilerservices.unsafe/6.1.2/system.runtime.compilerservices.unsafe.6.1.2.nupkg"
   },
   {
     "pname": "System.Security.AccessControl",
@@ -673,15 +673,15 @@
   },
   {
     "pname": "System.Security.Cryptography.ProtectedData",
-    "version": "9.0.0",
-    "hash": "sha256-gPgPU7k/InTqmXoRzQfUMEKL3QuTnOKowFqmXTnWaBQ=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.protecteddata/9.0.0/system.security.cryptography.protecteddata.9.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-B2sQ5rfu4fROzUDbi0A2rHPq27QDmQa3k56MfpE1adA=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.protecteddata/10.0.1/system.security.cryptography.protecteddata.10.0.1.nupkg"
   },
   {
     "pname": "System.Security.Permissions",
-    "version": "9.0.0",
-    "hash": "sha256-BFrA9ottmQtLIAiKiGRbfSUpzNJwuaOCeFRDN4Z0ku0=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.permissions/9.0.0/system.security.permissions.9.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-PO+jgrvmm31MVt4REACSe6VQD2pfb2N2sqIfhCfl6oQ=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.permissions/10.0.1/system.security.permissions.10.0.1.nupkg"
   },
   {
     "pname": "System.Security.Principal.Windows",
@@ -697,15 +697,15 @@
   },
   {
     "pname": "System.Text.Encodings.Web",
-    "version": "9.0.0",
-    "hash": "sha256-WGaUklQEJywoGR2jtCEs5bxdvYu5SHaQchd6s4RE5x0=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encodings.web/9.0.0/system.text.encodings.web.9.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-dBN9Rpe+J1F8/cdzwNxLHYiqvzgSX1r9128YXyb2DKM=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encodings.web/10.0.1/system.text.encodings.web.10.0.1.nupkg"
   },
   {
     "pname": "System.Text.Json",
-    "version": "9.0.0",
-    "hash": "sha256-aM5Dh4okLnDv940zmoFAzRmqZre83uQBtGOImJpoIqk=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/9.0.0/system.text.json.9.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-WfSgOpRL4DKfIry/H+eHxJHHrj6ENZ3+P6Q2ol3R2XM=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/10.0.1/system.text.json.10.0.1.nupkg"
   },
   {
     "pname": "System.Threading.Channels",
@@ -715,26 +715,26 @@
   },
   {
     "pname": "System.Threading.Tasks.Dataflow",
-    "version": "9.0.0",
-    "hash": "sha256-nRzcFvLBpcOfyIJdCCZq5vDKZN0xHVuB8yCXoMrwZJA=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.dataflow/9.0.0/system.threading.tasks.dataflow.9.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-DNuL4wsPOIE3jCRyacBpYyptQTXo6NkUjsEEFbQ73mY=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.dataflow/10.0.1/system.threading.tasks.dataflow.10.0.1.nupkg"
   },
   {
     "pname": "System.Threading.Tasks.Extensions",
-    "version": "4.6.0",
-    "hash": "sha256-OwIB0dpcdnyfvTUUj6gQfKW2XF2pWsQhykwM1HNCHqY=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.6.0/system.threading.tasks.extensions.4.6.0.nupkg"
+    "version": "4.6.3",
+    "hash": "sha256-GrySx1F6Ah6tfnnQt/PHC+dbzg+sfP47OOFX0yJF/xo=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.6.3/system.threading.tasks.extensions.4.6.3.nupkg"
   },
   {
     "pname": "System.ValueTuple",
-    "version": "4.5.0",
-    "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.valuetuple/4.5.0/system.valuetuple.4.5.0.nupkg"
+    "version": "4.6.1",
+    "hash": "sha256-Hb87MPcNdHQRlREDzFEKU8ZqtKN26bjyAiimJmm6LWI=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.valuetuple/4.6.1/system.valuetuple.4.6.1.nupkg"
   },
   {
     "pname": "System.Windows.Extensions",
-    "version": "9.0.0",
-    "hash": "sha256-RErD+Ju15qtnwdwB7E0SjjJGAnhXwJyC7UPcl24Z3Vs=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.windows.extensions/9.0.0/system.windows.extensions.9.0.0.nupkg"
+    "version": "10.0.1",
+    "hash": "sha256-HQFi+6+3ZADAiGlGUh5S/gmgRyqJzT4ysHpEHamnjW8=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.windows.extensions/10.0.1/system.windows.extensions.10.0.1.nupkg"
   }
 ]
diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix
index 5777ebae4a9d..a850edd64e05 100644
--- a/pkgs/by-name/ro/roslyn-ls/package.nix
+++ b/pkgs/by-name/ro/roslyn-ls/package.nix
@@ -38,18 +38,18 @@ in
 buildDotnetModule (finalAttrs: rec {
   inherit pname dotnet-sdk dotnet-runtime;
 
-  vsVersion = "2.113.22-prerelease";
+  vsVersion = "2.121.32-prerelease";
   src = fetchFromGitHub {
     owner = "dotnet";
     repo = "roslyn";
     rev = "VSCode-CSharp-${vsVersion}";
-    hash = "sha256-rGkQfyKoRlEa7L7H9iFQkKTCD4dU3OP97XDtRFRAHnc=";
+    hash = "sha256-7rkrKoCk5QCRpD3ggMzyRJwJv0EPdbXpE05sainwCCw=";
   };
 
   # versioned independently from vscode-csharp
   # "roslyn" in here:
   # https://github.com/dotnet/vscode-csharp/blob/main/package.json
-  version = "5.4.0-2.26062.9";
+  version = "5.5.0-2.26080.10";
   projectFile = "src/LanguageServer/${project}/${project}.csproj";
   useDotnetFromEnv = true;
   nugetDeps = ./deps.json;
diff --git a/pkgs/by-name/ro/roxterm/package.nix b/pkgs/by-name/ro/roxterm/package.nix
index 0c0a7f281104..da20b9958e2f 100644
--- a/pkgs/by-name/ro/roxterm/package.nix
+++ b/pkgs/by-name/ro/roxterm/package.nix
@@ -9,8 +9,8 @@
   gtk3,
   harfbuzz,
   lib,
-  libXdmcp,
-  libXtst,
+  libxdmcp,
+  libxtst,
   libepoxy,
   libpthread-stubs,
   libselinux,
@@ -55,8 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     gtk3
     harfbuzz
-    libXdmcp
-    libXtst
+    libxdmcp
+    libxtst
     libepoxy
     libpthread-stubs
     libselinux
diff --git a/pkgs/by-name/rs/rss-glx/package.nix b/pkgs/by-name/rs/rss-glx/package.nix
index d59b6f3b2c61..251ee7607aa1 100644
--- a/pkgs/by-name/rs/rss-glx/package.nix
+++ b/pkgs/by-name/rs/rss-glx/package.nix
@@ -4,8 +4,8 @@
   fetchurl,
   autoconf,
   pkg-config,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   libGLU,
   libGL,
   imagemagick6,
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libGLU
     libGL
-    libX11
-    libXext
+    libx11
+    libxext
     imagemagick6
     libtiff
     bzip2
diff --git a/pkgs/by-name/rs/rsstail/package.nix b/pkgs/by-name/rs/rsstail/package.nix
index 0f1a76fd5401..50c6308796d3 100644
--- a/pkgs/by-name/rs/rsstail/package.nix
+++ b/pkgs/by-name/rs/rsstail/package.nix
@@ -5,14 +5,14 @@
   libmrss,
 }:
 
-stdenv.mkDerivation (final: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "rsstail";
   version = "2.2";
 
   src = fetchFromGitHub {
     owner = "folkertvanheusden";
     repo = "rsstail";
-    rev = "v${final.version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-wbdf9zhwMN7QhJ5WoJo1Csu0EcKUTON8Q2Ic5scbn7I=";
   };
 
diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix
index 2f0952354a48..a60b9ad05261 100644
--- a/pkgs/by-name/ru/ruffle/package.nix
+++ b/pkgs/by-name/ru/ruffle/package.nix
@@ -8,10 +8,10 @@
   autoPatchelfHook,
   alsa-lib,
   wayland,
-  libXcursor,
-  libXrandr,
-  libXi,
-  libX11,
+  libxcursor,
+  libxrandr,
+  libxi,
+  libx11,
   libxcb,
   vulkan-loader,
   udev,
@@ -87,10 +87,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
       openh264
     ]
     ++ lib.optionals withX11 [
-      libXcursor
-      libXrandr
-      libXi
-      libX11
+      libxcursor
+      libxrandr
+      libxi
+      libx11
       libxcb
     ]
   );
diff --git a/pkgs/by-name/ru/runescape/package.nix b/pkgs/by-name/ru/runescape/package.nix
index 8b357475ebf1..a566c6e6e964 100644
--- a/pkgs/by-name/ru/runescape/package.nix
+++ b/pkgs/by-name/ru/runescape/package.nix
@@ -13,7 +13,7 @@
   libGL,
   libpulseaudio,
   libsm,
-  libXxf86vm,
+  libxxf86vm,
   libx11,
   openssl_1_1,
   pango,
@@ -49,7 +49,7 @@ let
       glibc
       gtk2-x11
       libsm
-      libXxf86vm
+      libxxf86vm
       libx11
       openssl_1_1
       pango
@@ -124,7 +124,7 @@ buildFHSEnv {
     libGL
     libpulseaudio
     libsm
-    libXxf86vm
+    libxxf86vm
     libx11
     openssl_1_1
     pango
diff --git a/pkgs/by-name/ru/runn/package.nix b/pkgs/by-name/ru/runn/package.nix
index bb8bab72812c..ddba8128ee62 100644
--- a/pkgs/by-name/ru/runn/package.nix
+++ b/pkgs/by-name/ru/runn/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "runn";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "k1LoW";
     repo = "runn";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rwKz/jFkmB7F4CoeRPgCBCvls3ovEdp907G3NzcY9tY=";
+    hash = "sha256-hDPXYGKDTvVFyMU08OeIxp70w9gimgY9qp9j38Ea5bc=";
   };
 
-  vendorHash = "sha256-XFPiTyOoFfbfkhE/UekulsUc2lwoVJskO8ZxcBmiOU0=";
+  vendorHash = "sha256-gLemeaNAmFVm9Ld2b3QTjdlKMye0TpKVSuQHj0ToMN4=";
 
   subPackages = [ "cmd/runn" ];
 
diff --git a/pkgs/by-name/ru/runningx/package.nix b/pkgs/by-name/ru/runningx/package.nix
index 38fbc0c551cd..75e4faf331f6 100644
--- a/pkgs/by-name/ru/runningx/package.nix
+++ b/pkgs/by-name/ru/runningx/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   pkg-config,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation {
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   dontUnpack = true;
 
diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix
index 8a4c00874b38..05989c11182b 100644
--- a/pkgs/by-name/ru/rustdesk-flutter/package.nix
+++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix
@@ -8,7 +8,7 @@
   ffmpeg_7,
   gst_all_1,
   fuse3,
-  libXtst,
+  libxtst,
   libaom,
   libopus,
   libpulseaudio,
@@ -127,7 +127,7 @@ flutter329.buildFlutterApplication rec {
     fuse3
     gst_all_1.gst-plugins-base
     gst_all_1.gstreamer
-    libXtst
+    libxtst
     libaom
     libopus
     libpulseaudio
diff --git a/pkgs/by-name/ru/rustdesk/package.nix b/pkgs/by-name/ru/rustdesk/package.nix
index e523a6cfa9ed..040606c31e4d 100644
--- a/pkgs/by-name/ru/rustdesk/package.nix
+++ b/pkgs/by-name/ru/rustdesk/package.nix
@@ -16,7 +16,7 @@
   libgit2,
   libpulseaudio,
   libsodium,
-  libXtst,
+  libxtst,
   libvpx,
   libyuv,
   libopus,
@@ -93,7 +93,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     libgit2
     libpulseaudio
     libsodium
-    libXtst
+    libxtst
     libvpx
     libyuv
     libopus
diff --git a/pkgs/by-name/rv/rvvm/package.nix b/pkgs/by-name/rv/rvvm/package.nix
index 4ab1cdbb7cf8..bcc11a05f076 100644
--- a/pkgs/by-name/rv/rvvm/package.nix
+++ b/pkgs/by-name/rv/rvvm/package.nix
@@ -5,8 +5,8 @@
 
   SDL2,
 
-  libX11,
-  libXext,
+  libx11,
+  libxext,
 
   guiBackend ? "sdl",
 
@@ -39,8 +39,8 @@ stdenv.mkDerivation (finalAttrs: {
     [ ]
     ++ lib.optionals enableSDL [ SDL2 ]
     ++ lib.optionals enableX11 [
-      libX11
-      libXext
+      libx11
+      libxext
     ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/rx/rxvt/package.nix b/pkgs/by-name/rx/rxvt/package.nix
index 38f4bd66b926..409b3e4ffc45 100644
--- a/pkgs/by-name/rx/rxvt/package.nix
+++ b/pkgs/by-name/rx/rxvt/package.nix
@@ -4,9 +4,9 @@
   fetchurl,
   pkg-config,
   libtool,
-  libX11,
-  libXt,
-  libXpm,
+  libx11,
+  libxt,
+  libxpm,
 }:
 
 stdenv.mkDerivation rec {
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     libtool
-    libX11
-    libXt
-    libXpm
+    libx11
+    libxt
+    libxpm
   ];
 
   configurePhase = ''
diff --git a/pkgs/by-name/ry/rygel/package.nix b/pkgs/by-name/ry/rygel/package.nix
index 786575107ba7..53e2e425b73a 100644
--- a/pkgs/by-name/ry/rygel/package.nix
+++ b/pkgs/by-name/ry/rygel/package.nix
@@ -23,7 +23,7 @@
   gst_all_1,
   libgee,
   libsoup_3,
-  libX11,
+  libx11,
   withGtk ? true,
   gtk4,
   libmediaart,
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
     # Move this to withGtk when it's not unconditionally included
     # https://gitlab.gnome.org/GNOME/rygel/-/issues/221
     # https://gitlab.gnome.org/GNOME/rygel/-/merge_requests/27
-    libX11
+    libx11
     sqlite
     systemd
     tinysparql
diff --git a/pkgs/by-name/ry/ryubing/package.nix b/pkgs/by-name/ry/ryubing/package.nix
index b386c9aad439..1596cf56a0aa 100644
--- a/pkgs/by-name/ry/ryubing/package.nix
+++ b/pkgs/by-name/ry/ryubing/package.nix
@@ -5,7 +5,7 @@
   darwin,
   dotnetCorePackages,
   fetchFromGitLab,
-  libX11,
+  libx11,
   libgdiplus,
   moltenvk,
   ffmpeg,
@@ -19,10 +19,10 @@
   libGL,
   libice,
   libsm,
-  libXcursor,
-  libXext,
-  libXi,
-  libXrandr,
+  libxcursor,
+  libxext,
+  libxi,
+  libxrandr,
   udev,
   SDL2,
   SDL2_mixer,
@@ -59,7 +59,7 @@ buildDotnetModule rec {
   nugetDeps = ./deps.json;
 
   runtimeDeps = [
-    libX11
+    libx11
     libgdiplus
     SDL2_mixer
     openal
@@ -72,10 +72,10 @@ buildDotnetModule rec {
     glew
     libice
     libsm
-    libXcursor
-    libXext
-    libXi
-    libXrandr
+    libxcursor
+    libxext
+    libxi
+    libxrandr
     gtk3
 
     # Headless executable
diff --git a/pkgs/by-name/sa/saleae-logic/package.nix b/pkgs/by-name/sa/saleae-logic/package.nix
index a10d428f773c..6187c38a149d 100644
--- a/pkgs/by-name/sa/saleae-logic/package.nix
+++ b/pkgs/by-name/sa/saleae-logic/package.nix
@@ -15,17 +15,17 @@
   libsm,
   libice,
   gtk2,
-  libXext,
-  libXft,
+  libxext,
+  libxft,
   fontconfig,
-  libXrender,
-  libXfixes,
-  libX11,
-  libXi,
-  libXrandr,
-  libXcursor,
+  libxrender,
+  libxfixes,
+  libx11,
+  libxi,
+  libxrandr,
+  libxcursor,
   freetype,
-  libXinerama,
+  libxinerama,
   libxcb,
   zlib,
   pciutils,
@@ -43,17 +43,17 @@ let
     libsm
     libice
     gtk2
-    libXext
-    libXft
+    libxext
+    libxft
     fontconfig
-    libXrender
-    libXfixes
-    libX11
-    libXi
-    libXrandr
-    libXcursor
+    libxrender
+    libxfixes
+    libx11
+    libxi
+    libxrandr
+    libxcursor
     freetype
-    libXinerama
+    libxinerama
     libxcb
     zlib
     stdenv.cc.cc
diff --git a/pkgs/by-name/sa/satty/package.nix b/pkgs/by-name/sa/satty/package.nix
index 8d9a955064b7..6b2f51144e0c 100644
--- a/pkgs/by-name/sa/satty/package.nix
+++ b/pkgs/by-name/sa/satty/package.nix
@@ -17,16 +17,16 @@
 rustPlatform.buildRustPackage rec {
 
   pname = "satty";
-  version = "0.20.0";
+  version = "0.20.1";
 
   src = fetchFromGitHub {
     owner = "gabm";
     repo = "Satty";
     rev = "v${version}";
-    hash = "sha256-4RVah6yo4cJyE6qUbDJbcmFpi7xsKNpHJFrzSs1yJcg=";
+    hash = "sha256-pR3Mc5Eue4YcIMcrzkyDhZPpovRFa8TW1PjL/ysH/7s=";
   };
 
-  cargoHash = "sha256-RPj6ZVtDWPMt4jrmU750b7zLVHwqk+SWr2OskDAQFYI=";
+  cargoHash = "sha256-/WewpLpBmD4XnjwY7NmzbglYGNKmgMLjg1pvUdqEIwo=";
 
   nativeBuildInputs = [
     copyDesktopItems
diff --git a/pkgs/by-name/sa/sawfish/package.nix b/pkgs/by-name/sa/sawfish/package.nix
index 9f75c6fc2b0e..677a28140ec8 100644
--- a/pkgs/by-name/sa/sawfish/package.nix
+++ b/pkgs/by-name/sa/sawfish/package.nix
@@ -9,9 +9,9 @@
   libice,
   libsm,
   libxcrypt,
-  libXinerama,
-  libXrandr,
-  libXtst,
+  libxinerama,
+  libxrandr,
+  libxtst,
   librep,
   makeWrapper,
   pango,
@@ -49,9 +49,9 @@ stdenv.mkDerivation (finalAttrs: {
     libice
     libsm
     libxcrypt
-    libXinerama
-    libXrandr
-    libXtst
+    libxinerama
+    libxrandr
+    libxtst
     librep
     pango
     rep-gtk
diff --git a/pkgs/by-name/sb/sbs/package.nix b/pkgs/by-name/sb/sbs/package.nix
index 6351ad032b61..c4ff6ba1ab6b 100644
--- a/pkgs/by-name/sb/sbs/package.nix
+++ b/pkgs/by-name/sb/sbs/package.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
   imlib2,
-  libXinerama,
+  libxinerama,
   pkg-config,
 }:
 
@@ -23,8 +23,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     imlib2
-    libX11
-    libXinerama
+    libx11
+    libxinerama
   ];
 
   makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/by-name/sb/sby/package.nix b/pkgs/by-name/sb/sby/package.nix
index 462cdd581115..4f10c0c40747 100644
--- a/pkgs/by-name/sb/sby/package.nix
+++ b/pkgs/by-name/sb/sby/package.nix
@@ -18,13 +18,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sby";
-  version = "0.58";
+  version = "0.61";
 
   src = fetchFromGitHub {
     owner = "YosysHQ";
     repo = "sby";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-msQ+aqdp8i5KMLUABYU6vA5VBkI6G3zF06RrQzfJucY=";
+    hash = "sha256-pFtSXg8DiN//jkZJyAIJ/jpVvu1OwwfAAXSrrmCZ3SQ=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/sc/sc-controller/package.nix b/pkgs/by-name/sc/sc-controller/package.nix
index 8f4bff2936d2..372d4bb9a709 100644
--- a/pkgs/by-name/sc/sc-controller/package.nix
+++ b/pkgs/by-name/sc/sc-controller/package.nix
@@ -9,9 +9,9 @@
   librsvg,
   bluez,
   linuxHeaders,
-  libX11,
-  libXext,
-  libXfixes,
+  libx11,
+  libxext,
+  libxfixes,
   libusb1,
   udev,
   udevCheckHook,
@@ -71,9 +71,9 @@ python3Packages.buildPythonApplication rec {
   '';
 
   env.LD_LIBRARY_PATH = lib.makeLibraryPath [
-    libX11
-    libXext
-    libXfixes
+    libx11
+    libxext
+    libxfixes
     libusb1
     udev
     bluez
diff --git a/pkgs/by-name/sc/scala-cli/sources.json b/pkgs/by-name/sc/scala-cli/sources.json
index df2afca2a53d..87495f60d682 100644
--- a/pkgs/by-name/sc/scala-cli/sources.json
+++ b/pkgs/by-name/sc/scala-cli/sources.json
@@ -1,21 +1,21 @@
 {
-  "version": "1.12.1",
+  "version": "1.12.2",
   "assets": {
     "aarch64-darwin": {
       "asset": "scala-cli-aarch64-apple-darwin.gz",
-      "sha256": "10p8q6pf3yh286xlfw54mdsnydafm7fvzn64i7h9gn6avxkh5zc6"
+      "sha256": "1vr9gn70nisyiynglaq29l3rqfxn68lga5x3h5ycwl15ybkmv8wc"
     },
     "aarch64-linux": {
       "asset": "scala-cli-aarch64-pc-linux.gz",
-      "sha256": "096b2pzjww258xrdv5h2ni8p2jcal0y0n9j079pm7jlghsv1njw0"
+      "sha256": "14dmwmf5w7f58bi5hyb607ybjpajh2y37k3d6gw3kri2ww5lg1r6"
     },
     "x86_64-darwin": {
       "asset": "scala-cli-x86_64-apple-darwin.gz",
-      "sha256": "1g27vrm38nmn1pa6jc5b5a0r003cmsy2p99h891mihf92w0pplnw"
+      "sha256": "0yf81yd1a9mfyiikyrjqhc8nanr932b1inyxdfwqba9vhc6r29b3"
     },
     "x86_64-linux": {
       "asset": "scala-cli-x86_64-pc-linux.gz",
-      "sha256": "0vzl9l9xvf27h5c3320yg7rsab7cln8qjprjjwfba9qahl7jisjw"
+      "sha256": "00p8i6fb8czy1pfn8yjjzrl9mcn28mx5yjz0k3fc292ag2dly46q"
     }
   }
 }
diff --git a/pkgs/by-name/sc/schismtracker/package.nix b/pkgs/by-name/sc/schismtracker/package.nix
index 7d41e00cb0ac..209edd2a2af1 100644
--- a/pkgs/by-name/sc/schismtracker/package.nix
+++ b/pkgs/by-name/sc/schismtracker/package.nix
@@ -7,8 +7,8 @@
   perl,
   pkg-config,
   SDL2,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   utf8proc,
   nix-update-script,
 }:
@@ -55,12 +55,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     SDL2
-    libX11
+    libx11
     utf8proc
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
-    libXext
+    libxext
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/sc/scid-vs-pc/package.nix b/pkgs/by-name/sc/scid-vs-pc/package.nix
index 3790501a5580..6aa105841bd0 100644
--- a/pkgs/by-name/sc/scid-vs-pc/package.nix
+++ b/pkgs/by-name/sc/scid-vs-pc/package.nix
@@ -3,7 +3,7 @@
   fetchurl,
   tcl,
   tk,
-  libX11,
+  libx11,
   zlib,
   makeWrapper,
   which,
@@ -31,7 +31,7 @@ tcl.mkTclDerivation rec {
   ];
   buildInputs = [
     tk
-    libX11
+    libx11
     zlib
   ];
 
diff --git a/pkgs/by-name/sc/scid/package.nix b/pkgs/by-name/sc/scid/package.nix
index ed1d0049b5d3..c093366bf294 100644
--- a/pkgs/by-name/sc/scid/package.nix
+++ b/pkgs/by-name/sc/scid/package.nix
@@ -5,7 +5,7 @@
   makeWrapper,
   tcl,
   tk,
-  libX11,
+  libx11,
   zlib,
 }:
 
@@ -31,7 +31,7 @@ tcl.mkTclDerivation rec {
 
   buildInputs = [
     tk
-    libX11
+    libx11
     zlib
   ];
 
diff --git a/pkgs/by-name/sc/scom/package.nix b/pkgs/by-name/sc/scom/package.nix
index b17e053d819b..9e042b6056c5 100644
--- a/pkgs/by-name/sc/scom/package.nix
+++ b/pkgs/by-name/sc/scom/package.nix
@@ -3,14 +3,14 @@
   stdenv,
   fetchFromGitHub,
 }:
-stdenv.mkDerivation (finaAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "scom";
   version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "crash-systems";
     repo = "scom";
-    tag = finaAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-eFnCXMrks5V6o+0+vMjR8zaCdkc+hC3trSS+pOh4Y6U=";
   };
 
diff --git a/pkgs/by-name/sc/scope-lite/package.nix b/pkgs/by-name/sc/scope-lite/package.nix
index 130c5704ecab..de3b08056081 100644
--- a/pkgs/by-name/sc/scope-lite/package.nix
+++ b/pkgs/by-name/sc/scope-lite/package.nix
@@ -4,16 +4,15 @@
   fetchFromGitHub,
   lib,
 }:
-let
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "scope-lite";
   version = "0.2.0";
-in
-stdenv.mkDerivation {
-  name = "scope-lite-${version}";
 
   src = fetchFromGitHub {
     owner = "martinmoene";
     repo = "scope-lite";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-/Vu3blgyEOQRFqhQjuT/6ukV0iWA0TdPrLnt2Z/gd6E=";
   };
 
@@ -26,4 +25,4 @@ stdenv.mkDerivation {
     homepage = "https://github.com/martinmoene/scope-lite";
     platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/sc/scrolls/package.nix b/pkgs/by-name/sc/scrolls/package.nix
index 743da81e53d9..a30251275389 100644
--- a/pkgs/by-name/sc/scrolls/package.nix
+++ b/pkgs/by-name/sc/scrolls/package.nix
@@ -4,9 +4,9 @@
   fetchurl,
   gcc,
   libGLU,
-  libX11,
-  libXext,
-  libXcursor,
+  libx11,
+  libxext,
+  libxcursor,
   libpulseaudio,
 }:
 stdenv.mkDerivation {
@@ -31,9 +31,9 @@ stdenv.mkDerivation {
   libPath = lib.makeLibraryPath [
     gcc
     libGLU
-    libX11
-    libXext
-    libXcursor
+    libx11
+    libxext
+    libxcursor
     libpulseaudio
   ];
 
diff --git a/pkgs/by-name/sc/scrot/package.nix b/pkgs/by-name/sc/scrot/package.nix
index 581caa05678a..3fc1fccb4a66 100644
--- a/pkgs/by-name/sc/scrot/package.nix
+++ b/pkgs/by-name/sc/scrot/package.nix
@@ -5,11 +5,11 @@
   imlib2,
   autoreconfHook,
   autoconf-archive,
-  libX11,
-  libXext,
-  libXfixes,
-  libXcomposite,
-  libXinerama,
+  libx11,
+  libxext,
+  libxfixes,
+  libxcomposite,
+  libxinerama,
   pkg-config,
   libbsd,
 }:
@@ -33,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     imlib2
-    libX11
-    libXext
-    libXfixes
-    libXcomposite
-    libXinerama
+    libx11
+    libxext
+    libxfixes
+    libxcomposite
+    libxinerama
     libbsd
   ];
 
diff --git a/pkgs/by-name/sc/sct/package.nix b/pkgs/by-name/sc/sct/package.nix
index 610e06da919b..1006f73c571c 100644
--- a/pkgs/by-name/sc/sct/package.nix
+++ b/pkgs/by-name/sc/sct/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchzip,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
   xorgproto,
 }:
 
@@ -17,8 +17,8 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    libX11
-    libXrandr
+    libx11
+    libxrandr
     xorgproto
   ];
 
diff --git a/pkgs/by-name/sc/scummvm/package.nix b/pkgs/by-name/sc/scummvm/package.nix
index e1d96694b65e..ab8660f0a620 100644
--- a/pkgs/by-name/sc/scummvm/package.nix
+++ b/pkgs/by-name/sc/scummvm/package.nix
@@ -16,7 +16,7 @@
   libvorbis,
   libGLU,
   libGL,
-  libX11,
+  libx11,
   SDL2,
   zlib,
   cctools,
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
       libtheora
       libvorbis
       SDL2
-      libX11
+      libx11
       zlib
     ];
 
diff --git a/pkgs/by-name/sd/SDL_compat/package.nix b/pkgs/by-name/sd/SDL_compat/package.nix
index 1ee22a2e3e9b..08ac93585ab0 100644
--- a/pkgs/by-name/sd/SDL_compat/package.nix
+++ b/pkgs/by-name/sd/SDL_compat/package.nix
@@ -6,7 +6,7 @@
   fetchFromGitHub,
   libGLU,
   libiconv,
-  libX11,
+  libx11,
   mesa,
   pkg-config,
   pkg-config-unwrapped,
@@ -27,13 +27,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "SDL_compat";
-  version = "1.2.72";
+  version = "1.2.74";
 
   src = fetchFromGitHub {
     owner = "libsdl-org";
     repo = "sdl12-compat";
     rev = "release-" + finalAttrs.version;
-    hash = "sha256-dTBsbLJFQSaWWhn1+CCQopq7sBONxvlaAximmo3iYVM=";
+    hash = "sha256-nKEUCI6qPM2x8qPzPyZX9gDSjoWszsADSEQG65hSuA8=";
   };
 
   nativeBuildInputs = [
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
   propagatedNativeBuildInputs = [ pkg-config-unwrapped ];
 
   buildInputs = [
-    libX11
+    libx11
     sdl2-compat
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/by-name/sd/SDL_image/package.nix b/pkgs/by-name/sd/SDL_image/package.nix
index b1595498d106..9110ec50d236 100644
--- a/pkgs/by-name/sd/SDL_image/package.nix
+++ b/pkgs/by-name/sd/SDL_image/package.nix
@@ -3,7 +3,7 @@
   SDL,
   fetchFromGitHub,
   giflib,
-  libXpm,
+  libxpm,
   libjpeg,
   libpng,
   libtiff,
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     SDL
     giflib
-    libXpm
+    libxpm
     libjpeg
     libpng
     libtiff
diff --git a/pkgs/by-name/sd/sdl2-compat/package.nix b/pkgs/by-name/sd/sdl2-compat/package.nix
index c0af86c9088d..696786bd4dd9 100644
--- a/pkgs/by-name/sd/sdl2-compat/package.nix
+++ b/pkgs/by-name/sd/sdl2-compat/package.nix
@@ -6,7 +6,7 @@
   sdl3,
   stdenv,
   testers,
-  libX11,
+  libx11,
   libGL,
   nix-update-script,
 
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     sdl3'
   ]
-  ++ lib.optional x11Support libX11;
+  ++ lib.optional x11Support libx11;
 
   checkInputs = [ libGL ];
 
diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix
index 607380908ffd..b61ee3d47ba2 100644
--- a/pkgs/by-name/sd/sdl3/package.nix
+++ b/pkgs/by-name/sd/sdl3/package.nix
@@ -17,14 +17,14 @@
   libusb1,
   libxkbcommon,
   libgbm,
-  libX11,
+  libx11,
   libxcb,
-  libXScrnSaver,
-  libXcursor,
-  libXext,
-  libXfixes,
-  libXi,
-  libXrandr,
+  libxscrnsaver,
+  libxcursor,
+  libxext,
+  libxfixes,
+  libxi,
+  libxrandr,
   libxtst,
   ninja,
   nix-update-script,
@@ -50,13 +50,15 @@
   ibusSupport ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isDarwin,
   jackSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
   libdecorSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
+  libudevSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
+  libusbSupport ? stdenv.hostPlatform.isLinux,
   openglSupport ? lib.meta.availableOn stdenv.hostPlatform libGL,
   pipewireSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
   pulseaudioSupport ?
     config.pulseaudio or stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
-  libudevSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
   sndioSupport ? false,
   traySupport ? true,
+  vulkanSupport ? true,
   waylandSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
   x11Support ? !stdenv.hostPlatform.isAndroid && !stdenv.hostPlatform.isWindows,
 }:
@@ -97,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
         --replace-fail '"zenity"' '"${lib.getExe zenity}"'
     ''
     # https://github.com/libsdl-org/SDL/issues/14805
-    + ''
+    + lib.optionalString vulkanSupport ''
       substituteInPlace src/video/x11/SDL_x11vulkan.c \
                         src/video/wayland/SDL_waylandvulkan.c \
                         src/video/offscreen/SDL_offscreenvulkan.c \
@@ -108,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
     ''
     + lib.optionalString x11Support ''
       substituteInPlace src/video/x11/SDL_x11vulkan.c \
-        --replace-fail 'libX11-xcb.so' '${lib.getLib libX11}/lib/libX11-xcb.so'
+        --replace-fail 'libX11-xcb.so' '${lib.getLib libx11}/lib/libX11-xcb.so'
     '';
 
   strictDeps = true;
@@ -121,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional waylandSupport wayland-scanner;
 
   buildInputs =
-    lib.optionals stdenv.hostPlatform.isLinux [
+    lib.optionals libusbSupport [
       libusb1
     ]
     ++ lib.optional (
@@ -145,17 +147,17 @@ stdenv.mkDerivation (finalAttrs: {
       wayland
     ]
     ++ lib.optionals x11Support [
-      libX11
+      libx11
       libxcb
-      libXScrnSaver
-      libXcursor
-      libXext
-      libXfixes
-      libXi
-      libXrandr
+      libxscrnsaver
+      libxcursor
+      libxext
+      libxfixes
+      libxi
+      libxrandr
       libxtst
     ]
-    ++ [
+    ++ lib.optionals vulkanSupport [
       vulkan-headers
       vulkan-loader
     ]
@@ -196,7 +198,11 @@ stdenv.mkDerivation (finalAttrs: {
       && !(stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAndroid)
       && !(x11Support || waylandSupport)
     ))
-  ];
+  ]
+  ++ lib.optional (libusbSupport != stdenv.hostPlatform.isLinux) (
+    lib.cmakeBool "SDL_HIDAPI_LIBUSB" libusbSupport
+  )
+  ++ lib.optional (!vulkanSupport) (lib.cmakeBool "SDL_VULKAN" vulkanSupport);
 
   doCheck = true;
 
diff --git a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix
index 1ea626fb90d9..ab7cf2ea2731 100644
--- a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix
+++ b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sdl_gamecontrollerdb";
-  version = "0-unstable-2026-01-28";
+  version = "0-unstable-2026-02-02";
 
   src = fetchFromGitHub {
     owner = "mdqinc";
     repo = "SDL_GameControllerDB";
-    rev = "fc25a0299e8dcb7a8fc072864297c71f71d6f3d7";
-    hash = "sha256-lR/SBVLjb9KvXogd46hSEuKY5Z0NmhDdnLwhf1IWhQ0=";
+    rev = "95a35c7e65f7d71a3cc7d8e4d2dd9ffdac2bee28";
+    hash = "sha256-CdSAJ0QlJekOZDI4ZgRUBM9p0VDcGm7M+MAoBv9L3c4=";
   };
 
   dontBuild = true;
diff --git a/pkgs/by-name/sd/sdrpp/package.nix b/pkgs/by-name/sd/sdrpp/package.nix
index a23af7e65b96..894654a5cc98 100644
--- a/pkgs/by-name/sd/sdrpp/package.nix
+++ b/pkgs/by-name/sd/sdrpp/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  libX11,
+  libx11,
   glfw,
   glew,
   fftwFloat,
@@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: {
     volk
     zstd
   ]
-  ++ lib.optional stdenv.hostPlatform.isLinux libX11
+  ++ lib.optional stdenv.hostPlatform.isLinux libx11
   ++ lib.optional airspy_source airspy
   ++ lib.optional airspyhf_source airspyhf
   ++ lib.optional bladerf_source libbladeRF
diff --git a/pkgs/by-name/se/segger-ozone/package.nix b/pkgs/by-name/se/segger-ozone/package.nix
index 3eba28100d6d..915985444cbe 100644
--- a/pkgs/by-name/se/segger-ozone/package.nix
+++ b/pkgs/by-name/se/segger-ozone/package.nix
@@ -8,11 +8,11 @@
   freetype,
   libice,
   libsm,
-  libX11,
-  libXcursor,
-  libXfixes,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxcursor,
+  libxfixes,
+  libxrandr,
+  libxrender,
   makeDesktopItem,
 }:
 
@@ -37,11 +37,11 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
     libice
     libsm
-    libX11
-    libXcursor
-    libXfixes
-    libXrandr
-    libXrender
+    libx11
+    libxcursor
+    libxfixes
+    libxrandr
+    libxrender
     (lib.getLib stdenv.cc.cc)
   ];
 
diff --git a/pkgs/by-name/se/sent/package.nix b/pkgs/by-name/se/sent/package.nix
index ff3126ed55e9..7e5eb64ffb54 100644
--- a/pkgs/by-name/se/sent/package.nix
+++ b/pkgs/by-name/se/sent/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchurl,
   farbfeld,
-  libX11,
-  libXft,
+  libx11,
+  libxft,
   makeWrapper,
   patches ? [ ],
 }:
@@ -19,8 +19,8 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
-    libXft
+    libx11
+    libxft
   ];
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/by-name/se/setbfree/package.nix b/pkgs/by-name/se/setbfree/package.nix
index 7fcde202ab9f..f479d65f2f14 100644
--- a/pkgs/by-name/se/setbfree/package.nix
+++ b/pkgs/by-name/se/setbfree/package.nix
@@ -6,7 +6,7 @@
   freetype,
   ftgl,
   libjack2,
-  libX11,
+  libx11,
   lv2,
   libGLU,
   libGL,
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
     freetype
     ftgl
     libjack2
-    libX11
+    libx11
     lv2
     libGLU
     libGL
diff --git a/pkgs/by-name/se/setroot/package.nix b/pkgs/by-name/se/setroot/package.nix
index f259291d4346..211ae0e1a1a7 100644
--- a/pkgs/by-name/se/setroot/package.nix
+++ b/pkgs/by-name/se/setroot/package.nix
@@ -2,12 +2,12 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
   imlib2,
   pkg-config,
   fetchpatch,
   enableXinerama ? true,
-  libXinerama,
+  libxinerama,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -31,10 +31,10 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    libX11
+    libx11
     imlib2
   ]
-  ++ lib.optionals enableXinerama [ libXinerama ];
+  ++ lib.optionals enableXinerama [ libxinerama ];
 
   buildFlags = [ (if enableXinerama then "xinerama=1" else "xinerama=0") ];
 
diff --git a/pkgs/by-name/se/seturgent/package.nix b/pkgs/by-name/se/seturgent/package.nix
index a5fab4bf1366..1ef409efc256 100644
--- a/pkgs/by-name/se/seturgent/package.nix
+++ b/pkgs/by-name/se/seturgent/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchgit,
-  libX11,
+  libx11,
   xorgproto,
 }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
+    libx11
     xorgproto
   ];
 
diff --git a/pkgs/by-name/sf/sfml/package.nix b/pkgs/by-name/sf/sfml/package.nix
index 00ee98350a60..75172272f475 100644
--- a/pkgs/by-name/sf/sfml/package.nix
+++ b/pkgs/by-name/sf/sfml/package.nix
@@ -15,11 +15,11 @@
   libvorbis,
   miniaudio,
   udev,
-  libXi,
-  libX11,
-  libXcursor,
-  libXrandr,
-  libXrender,
+  libxi,
+  libx11,
+  libxcursor,
+  libxrandr,
+  libxrender,
   libxcb-image,
 }:
 
@@ -53,11 +53,11 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optional stdenv.hostPlatform.isLinux udev
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    libX11
-    libXi
-    libXcursor
-    libXrandr
-    libXrender
+    libx11
+    libxi
+    libxcursor
+    libxrandr
+    libxrender
     libxcb-image
   ];
 
diff --git a/pkgs/by-name/sf/sfml_2/package.nix b/pkgs/by-name/sf/sfml_2/package.nix
index 060cb935fcd0..d03771f27d6a 100644
--- a/pkgs/by-name/sf/sfml_2/package.nix
+++ b/pkgs/by-name/sf/sfml_2/package.nix
@@ -14,10 +14,10 @@
   libvorbis,
   openal,
   udev,
-  libX11,
-  libXcursor,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxcursor,
+  libxrandr,
+  libxrender,
   libxcb-image,
 }:
 stdenv.mkDerivation (finalAttrs: {
@@ -42,10 +42,10 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optional stdenv.hostPlatform.isLinux udev
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    libX11
-    libXcursor
-    libXrandr
-    libXrender
+    libx11
+    libxcursor
+    libxrandr
+    libxrender
     libxcb-image
   ];
 
diff --git a/pkgs/by-name/sg/sg-323/package.nix b/pkgs/by-name/sg/sg-323/package.nix
index 4bc66659bc2f..ec1fff454bf5 100644
--- a/pkgs/by-name/sg/sg-323/package.nix
+++ b/pkgs/by-name/sg/sg-323/package.nix
@@ -7,14 +7,14 @@
   alsa-lib,
   fontconfig,
   freetype,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXdmcp,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXtst,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxdmcp,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxtst,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -40,14 +40,14 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.isLinux [
     alsa-lib
-    libX11
-    libXcomposite
-    libXcursor
-    libXdmcp
-    libXext
-    libXinerama
-    libXrandr
-    libXtst
+    libx11
+    libxcomposite
+    libxcursor
+    libxdmcp
+    libxext
+    libxinerama
+    libxrandr
+    libxtst
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/sg/sgt-puzzles/package.nix b/pkgs/by-name/sg/sgt-puzzles/package.nix
index 7a56dee66356..725bf31799fb 100644
--- a/pkgs/by-name/sg/sgt-puzzles/package.nix
+++ b/pkgs/by-name/sg/sgt-puzzles/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   desktop-file-utils,
   gtk3,
-  libX11,
+  libx11,
   cmake,
   imagemagick,
   pkg-config,
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     gtk3
-    libX11
+    libx11
   ];
 
   postInstall = ''
diff --git a/pkgs/by-name/sh/shader-slang/package.nix b/pkgs/by-name/sh/shader-slang/package.nix
index 1f514fabc78b..46560cf77cdd 100644
--- a/pkgs/by-name/sh/shader-slang/package.nix
+++ b/pkgs/by-name/sh/shader-slang/package.nix
@@ -8,7 +8,7 @@
   miniz,
   lz4,
   libxml2,
-  libX11,
+  libx11,
   glslang,
   unordered_dense,
   versionCheckHook,
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     unordered_dense
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
+    libx11
   ]
   ++ lib.optionals withGlslang [
     # SPIRV-tools is included in glslang.
diff --git a/pkgs/by-name/sh/shipwright/package.nix b/pkgs/by-name/sh/shipwright/package.nix
index 86c5d68a0619..a02db407cb4c 100644
--- a/pkgs/by-name/sh/shipwright/package.nix
+++ b/pkgs/by-name/sh/shipwright/package.nix
@@ -34,7 +34,7 @@
   libogg,
   libvorbis,
   bzip2,
-  libX11,
+  libx11,
   sdl_gamecontrollerdb,
 }:
 
@@ -172,7 +172,7 @@ stdenv.mkDerivation (finalAttrs: {
     libogg
     libvorbis
     bzip2
-    libX11
+    libx11
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     libpulseaudio
diff --git a/pkgs/by-name/sh/shod/package.nix b/pkgs/by-name/sh/shod/package.nix
index 9e43feef04a0..e7b28d09d428 100644
--- a/pkgs/by-name/sh/shod/package.nix
+++ b/pkgs/by-name/sh/shod/package.nix
@@ -4,11 +4,11 @@
   fetchFromGitHub,
   writeText,
   fontconfig,
-  libX11,
-  libXft,
-  libXpm,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxft,
+  libxpm,
+  libxrandr,
+  libxrender,
   conf ? null,
 }:
 
@@ -25,11 +25,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     fontconfig
-    libX11
-    libXft
-    libXpm
-    libXrandr
-    libXrender
+    libx11
+    libxft
+    libxpm
+    libxrandr
+    libxrender
   ];
 
   postPatch =
diff --git a/pkgs/by-name/sh/shoko/package.nix b/pkgs/by-name/sh/shoko/package.nix
index ee87e1e50a0f..c82224abc85f 100644
--- a/pkgs/by-name/sh/shoko/package.nix
+++ b/pkgs/by-name/sh/shoko/package.nix
@@ -12,13 +12,13 @@
 
 buildDotnetModule (finalAttrs: {
   pname = "shoko";
-  version = "5.2.5";
+  version = "5.3.0";
 
   src = fetchFromGitHub {
     owner = "ShokoAnime";
     repo = "ShokoServer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NH7HCneYR0LP96jihz8aS8ifcxnCm7h5GnIYf1k5274=";
+    hash = "sha256-qEy+BmvPeog+AIPNlIjD7UMdaN3YxPRt/ZLkTumsfSc=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/sh/show-midi/package.nix b/pkgs/by-name/sh/show-midi/package.nix
index 188c40e5a1cb..cc1001fac017 100644
--- a/pkgs/by-name/sh/show-midi/package.nix
+++ b/pkgs/by-name/sh/show-midi/package.nix
@@ -5,11 +5,11 @@
   pkg-config,
   alsa-lib,
   freetype,
-  libX11,
-  libXrandr,
-  libXinerama,
-  libXext,
-  libXcursor,
+  libx11,
+  libxrandr,
+  libxinerama,
+  libxext,
+  libxcursor,
   makeDesktopItem,
   copyDesktopItems,
 }:
@@ -33,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     alsa-lib
     freetype
-    libX11
-    libXrandr
-    libXinerama
-    libXext
-    libXcursor
+    libx11
+    libxrandr
+    libxinerama
+    libxext
+    libxcursor
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/si/signal-desktop-bin/generic.nix b/pkgs/by-name/si/signal-desktop-bin/generic.nix
index 54b8400f40bf..d020f58a6e34 100644
--- a/pkgs/by-name/si/signal-desktop-bin/generic.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/generic.nix
@@ -22,19 +22,19 @@
   freetype,
   fontconfig,
   dbus,
-  libX11,
+  libx11,
   libxshmfence,
   libxcb,
-  libXi,
-  libXcursor,
-  libXdamage,
-  libXrandr,
-  libXcomposite,
-  libXext,
-  libXfixes,
-  libXrender,
-  libXtst,
-  libXScrnSaver,
+  libxi,
+  libxcursor,
+  libxdamage,
+  libxrandr,
+  libxcomposite,
+  libxext,
+  libxfixes,
+  libxrender,
+  libxtst,
+  libxscrnsaver,
   nss,
   nspr,
   alsa-lib,
@@ -168,17 +168,17 @@ stdenv.mkDerivation (finalAttrs: {
     gdk-pixbuf
     glib
     gtk3
-    libX11
-    libXScrnSaver
-    libXcomposite
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
-    libXrandr
-    libXrender
-    libXtst
+    libx11
+    libxscrnsaver
+    libxcomposite
+    libxcursor
+    libxdamage
+    libxext
+    libxfixes
+    libxi
+    libxrandr
+    libxrender
+    libxtst
     libappindicator-gtk3
     libpulseaudio
     libnotify
diff --git a/pkgs/by-name/si/sil-q/package.nix b/pkgs/by-name/si/sil-q/package.nix
index e9224b6ccbbe..98f88108758c 100644
--- a/pkgs/by-name/si/sil-q/package.nix
+++ b/pkgs/by-name/si/sil-q/package.nix
@@ -6,7 +6,7 @@
   writeScript,
   makeWrapper,
   ncurses,
-  libX11,
+  libx11,
 }:
 
 let
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [
     ncurses
-    libX11
+    libx11
   ];
 
   # Makefile(s) and config are not top-level
diff --git a/pkgs/by-name/si/sil/package.nix b/pkgs/by-name/si/sil/package.nix
index b9848cedb3b1..8e55947b9cbe 100644
--- a/pkgs/by-name/si/sil/package.nix
+++ b/pkgs/by-name/si/sil/package.nix
@@ -4,11 +4,11 @@
   stdenv,
   fetchzip,
   ncurses,
-  libX11,
-  libXaw,
-  libXt,
-  libXext,
-  libXmu,
+  libx11,
+  libxaw,
+  libxt,
+  libxext,
+  libxmu,
   makeWrapper,
   writeScript,
 }:
@@ -35,11 +35,11 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [
     ncurses
-    libX11
-    libXaw
-    libXt
-    libXext
-    libXmu
+    libx11
+    libxaw
+    libxt
+    libxext
+    libxmu
   ];
 
   sourceRoot = "${finalAttrs.src.name}/Sil/src";
diff --git a/pkgs/by-name/si/simgear/package.nix b/pkgs/by-name/si/simgear/package.nix
index 101230bf241d..15e3e81caa29 100644
--- a/pkgs/by-name/si/simgear/package.nix
+++ b/pkgs/by-name/si/simgear/package.nix
@@ -5,13 +5,13 @@
   plib,
   libglut,
   xorgproto,
-  libX11,
-  libXext,
-  libXi,
+  libx11,
+  libxext,
+  libxi,
   libice,
   libsm,
-  libXt,
-  libXmu,
+  libxt,
+  libxmu,
   libGLU,
   libGL,
   boost179,
@@ -46,13 +46,13 @@ stdenv.mkDerivation (finalAttrs: {
     plib
     libglut
     xorgproto
-    libX11
-    libXext
-    libXi
+    libx11
+    libxext
+    libxi
     libice
     libsm
-    libXt
-    libXmu
+    libxt
+    libxmu
     libGLU
     libGL
     boost179
diff --git a/pkgs/by-name/sk/skia-aseprite/package.nix b/pkgs/by-name/sk/skia-aseprite/package.nix
index 3379f6fef5c5..0bc5ccc3d725 100644
--- a/pkgs/by-name/sk/skia-aseprite/package.nix
+++ b/pkgs/by-name/sk/skia-aseprite/package.nix
@@ -13,7 +13,7 @@
   libjpeg,
   libpng,
   libwebp,
-  libX11,
+  libx11,
   libgbm,
   ninja,
   python3,
@@ -80,7 +80,7 @@ clangStdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals clangStdenv.hostPlatform.isLinux [
     libglvnd
-    libX11
+    libx11
     libgbm
   ];
 
diff --git a/pkgs/by-name/sk/skia/package.nix b/pkgs/by-name/sk/skia/package.nix
index d1395ac59e5e..69b04fc63b7c 100644
--- a/pkgs/by-name/sk/skia/package.nix
+++ b/pkgs/by-name/sk/skia/package.nix
@@ -11,7 +11,7 @@
   libGL,
   libjpeg,
   libwebp,
-  libX11,
+  libx11,
   ninja,
   python3,
   testers,
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
     libGL
     libjpeg
     libwebp
-    libX11
+    libx11
   ]
   ++ lib.optionals enableVulkan [
     vulkan-headers
diff --git a/pkgs/by-name/sk/skippy-xd/package.nix b/pkgs/by-name/sk/skippy-xd/package.nix
index fe32e56117e1..3289c5924183 100644
--- a/pkgs/by-name/sk/skippy-xd/package.nix
+++ b/pkgs/by-name/sk/skippy-xd/package.nix
@@ -3,12 +3,12 @@
   stdenv,
   fetchFromGitHub,
   xorgproto,
-  libX11,
-  libXft,
-  libXcomposite,
-  libXdamage,
-  libXext,
-  libXinerama,
+  libx11,
+  libxft,
+  libxcomposite,
+  libxdamage,
+  libxext,
+  libxinerama,
   libjpeg,
   giflib,
   pkg-config,
@@ -29,12 +29,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     xorgproto
-    libX11
-    libXft
-    libXcomposite
-    libXdamage
-    libXext
-    libXinerama
+    libx11
+    libxft
+    libxcomposite
+    libxdamage
+    libxext
+    libxinerama
     libjpeg
     giflib
   ];
diff --git a/pkgs/by-name/sk/skyemu/package.nix b/pkgs/by-name/sk/skyemu/package.nix
index 02c63ae1399d..e4d13f1a453b 100644
--- a/pkgs/by-name/sk/skyemu/package.nix
+++ b/pkgs/by-name/sk/skyemu/package.nix
@@ -11,9 +11,9 @@
   alsa-lib,
   libGL,
   libGLU,
-  libX11,
-  libXi,
-  libXcursor,
+  libx11,
+  libxi,
+  libxcursor,
   lua,
   makeDesktopItem,
   copyDesktopItems,
@@ -46,9 +46,9 @@ stdenv.mkDerivation (finalAttrs: {
     SDL2
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
-    libXi
-    libXcursor
+    libx11
+    libxi
+    libxcursor
     lua
   ];
 
diff --git a/pkgs/by-name/sl/slock/package.nix b/pkgs/by-name/sl/slock/package.nix
index 4cec5f07cd51..bf54026db1c5 100644
--- a/pkgs/by-name/sl/slock/package.nix
+++ b/pkgs/by-name/sl/slock/package.nix
@@ -4,9 +4,9 @@
   fetchzip,
   writeText,
   xorgproto,
-  libX11,
-  libXext,
-  libXrandr,
+  libx11,
+  libxext,
+  libxrandr,
   libxcrypt,
   config,
   conf ? config.slock.conf or null,
@@ -27,9 +27,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     xorgproto
-    libX11
-    libXext
-    libXrandr
+    libx11
+    libxext
+    libxrandr
     libxcrypt
   ]
   ++ extraLibs;
diff --git a/pkgs/by-name/sl/slop/package.nix b/pkgs/by-name/sl/slop/package.nix
index 1d4987633000..57cee507cef3 100644
--- a/pkgs/by-name/sl/slop/package.nix
+++ b/pkgs/by-name/sl/slop/package.nix
@@ -8,9 +8,9 @@
   glm,
   libGLU,
   libGL,
-  libX11,
-  libXext,
-  libXrender,
+  libx11,
+  libxext,
+  libxrender,
   icu74,
   libsm,
 }:
@@ -36,9 +36,9 @@ stdenv.mkDerivation (finalAttrs: {
     glm
     libGLU
     libGL
-    libX11
-    libXext
-    libXrender
+    libx11
+    libxext
+    libxrender
     icu74
     libsm
   ];
diff --git a/pkgs/by-name/sl/slstatus/package.nix b/pkgs/by-name/sl/slstatus/package.nix
index 1c66d88c4e1e..1bf9c9330cf1 100644
--- a/pkgs/by-name/sl/slstatus/package.nix
+++ b/pkgs/by-name/sl/slstatus/package.nix
@@ -4,10 +4,10 @@
   fetchzip,
   pkg-config,
   writeText,
-  libX11,
+  libx11,
   libxcb,
-  libXau,
-  libXdmcp,
+  libxau,
+  libxdmcp,
   config,
   conf ? config.slstatus.conf or null,
   patches ? config.slstatus.patches or [ ],
@@ -39,10 +39,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    libX11
+    libx11
     libxcb
-    libXau
-    libXdmcp
+    libxau
+    libxdmcp
   ]
   ++ extraLibs;
 
diff --git a/pkgs/by-name/sm/smallwm/package.nix b/pkgs/by-name/sm/smallwm/package.nix
index ecdc9678b322..225b42056917 100644
--- a/pkgs/by-name/sm/smallwm/package.nix
+++ b/pkgs/by-name/sm/smallwm/package.nix
@@ -4,8 +4,8 @@
   fetchFromGitHub,
   doxygen,
   graphviz,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -25,8 +25,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXrandr
+    libx11
+    libxrandr
   ];
 
   strictDeps = true;
@@ -59,6 +59,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.bsd2;
     mainProgram = "smallwm";
     maintainers = [ ];
-    inherit (libX11.meta) platforms;
+    inherit (libx11.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/sm/smartgit/package.nix b/pkgs/by-name/sm/smartgit/package.nix
index 85c153ae6c17..3de1113f331e 100644
--- a/pkgs/by-name/sm/smartgit/package.nix
+++ b/pkgs/by-name/sm/smartgit/package.nix
@@ -8,7 +8,7 @@
   glib,
   adwaita-icon-theme,
   wrapGAppsHook3,
-  libXtst,
+  libxtst,
   which,
 }:
 let
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
         lib.makeLibraryPath [
           gtk3
           glib
-          libXtst
+          libxtst
         ]
       } \
       --prefix SMARTGIT_JAVA_HOME : ${jre} \
diff --git a/pkgs/by-name/sm/smartsynchronize/package.nix b/pkgs/by-name/sm/smartsynchronize/package.nix
index 0b6fa30fc3a5..e0042ada9cbd 100644
--- a/pkgs/by-name/sm/smartsynchronize/package.nix
+++ b/pkgs/by-name/sm/smartsynchronize/package.nix
@@ -8,7 +8,7 @@
   glib,
   adwaita-icon-theme,
   wrapGAppsHook3,
-  libXtst,
+  libxtst,
   which,
 }:
 let
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
         lib.makeLibraryPath [
           gtk3
           glib
-          libXtst
+          libxtst
         ]
       } \
       --prefix JAVA_HOME : ${jre} \
diff --git a/pkgs/by-name/sn/snapmaker-luban/package.nix b/pkgs/by-name/sn/snapmaker-luban/package.nix
index d577d1b0391b..261f486f0727 100644
--- a/pkgs/by-name/sn/snapmaker-luban/package.nix
+++ b/pkgs/by-name/sn/snapmaker-luban/package.nix
@@ -19,17 +19,17 @@
   gdk-pixbuf,
   libdrm,
   libgbm,
-  libX11,
-  libXScrnSaver,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXtst,
+  libx11,
+  libxscrnsaver,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxtst,
   libxcb,
   libxshmfence,
   pango,
@@ -62,10 +62,10 @@ stdenv.mkDerivation rec {
     gcc-unwrapped
     gtk3
     libdrm
-    libXdamage
-    libX11
-    libXScrnSaver
-    libXtst
+    libxdamage
+    libx11
+    libxscrnsaver
+    libxtst
     libxcb
     libxshmfence
     libgbm
@@ -86,22 +86,22 @@ stdenv.mkDerivation rec {
     gdk-pixbuf
     glib
     gtk3
-    libX11
-    libXcomposite
+    libx11
+    libxcomposite
     libxshmfence
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
-    libXrandr
-    libXrender
-    libXtst
+    libxcursor
+    libxdamage
+    libxext
+    libxfixes
+    libxi
+    libxrandr
+    libxrender
+    libxtst
     nspr
     nss
     libxcb
     pango
-    libXScrnSaver
+    libxscrnsaver
     udev
   ];
 
diff --git a/pkgs/by-name/sn/sndpeek/package.nix b/pkgs/by-name/sn/sndpeek/package.nix
index 947e127f5323..ae6082b93820 100644
--- a/pkgs/by-name/sn/sndpeek/package.nix
+++ b/pkgs/by-name/sn/sndpeek/package.nix
@@ -7,10 +7,10 @@
   alsa-lib,
   libgbm,
   libGLU,
-  libX11,
-  libXmu,
-  libXext,
-  libXi,
+  libx11,
+  libxmu,
+  libxext,
+  libxi,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -33,10 +33,10 @@ stdenv.mkDerivation (finalAttrs: {
     libgbm
     libGLU
     libsndfile
-    libX11
-    libXmu
-    libXext
-    libXi
+    libx11
+    libxmu
+    libxext
+    libxi
   ];
   buildFlags = [ "linux-alsa" ];
 
diff --git a/pkgs/by-name/sn/snes9x/package.nix b/pkgs/by-name/sn/snes9x/package.nix
index 84951e4e3ac3..316d8a8dc1bd 100644
--- a/pkgs/by-name/sn/snes9x/package.nix
+++ b/pkgs/by-name/sn/snes9x/package.nix
@@ -6,12 +6,12 @@
   fetchFromGitHub,
   gtkmm3,
   libGLX,
-  libX11,
-  libXdmcp,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXv,
+  libx11,
+  libxdmcp,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxv,
   libepoxy,
   libpng,
   libselinux,
@@ -53,8 +53,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXv
+    libx11
+    libxv
     minizip
     zlib
   ]
@@ -66,14 +66,14 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals (!withGtk) [
     libpng
-    libXext
-    libXinerama
+    libxext
+    libxinerama
   ]
   ++ lib.optionals withGtk [
     gtkmm3
     libepoxy
-    libXdmcp
-    libXrandr
+    libxdmcp
+    libxrandr
     pcre2
     portaudio
     SDL2
diff --git a/pkgs/by-name/sn/snis-unwrapped/package.nix b/pkgs/by-name/sn/snis-unwrapped/package.nix
index 966e48993eeb..b2b7be915001 100644
--- a/pkgs/by-name/sn/snis-unwrapped/package.nix
+++ b/pkgs/by-name/sn/snis-unwrapped/package.nix
@@ -8,7 +8,7 @@
   libbsd,
   libpng,
   libvorbis,
-  libX11,
+  libx11,
   sdl2-compat,
   makeWrapper,
   lua5_2,
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
     libbsd
     libpng
     libvorbis
-    libX11
+    libx11
     sdl2-compat
     lua5_2
     glew
diff --git a/pkgs/by-name/so/socalabs-papu/package.nix b/pkgs/by-name/so/socalabs-papu/package.nix
index 70ca9f7137e3..b65f96418d21 100644
--- a/pkgs/by-name/so/socalabs-papu/package.nix
+++ b/pkgs/by-name/so/socalabs-papu/package.nix
@@ -7,14 +7,14 @@
   alsa-lib,
   copyDesktopItems,
   makeDesktopItem,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXinerama,
-  libXrandr,
-  libXtst,
-  libXdmcp,
-  libXext,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxinerama,
+  libxrandr,
+  libxtst,
+  libxdmcp,
+  libxext,
   xvfb,
   freetype,
   fontconfig,
@@ -65,14 +65,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     alsa-lib
-    libX11
-    libXcomposite
-    libXcursor
-    libXinerama
-    libXrandr
-    libXtst
-    libXdmcp
-    libXext
+    libx11
+    libxcomposite
+    libxcursor
+    libxinerama
+    libxrandr
+    libxtst
+    libxdmcp
+    libxext
     xvfb
     libGL
     libjack2
diff --git a/pkgs/by-name/so/socalabs-rp2a03/package.nix b/pkgs/by-name/so/socalabs-rp2a03/package.nix
index 7bee247d80ac..d7cbbcba8998 100644
--- a/pkgs/by-name/so/socalabs-rp2a03/package.nix
+++ b/pkgs/by-name/so/socalabs-rp2a03/package.nix
@@ -7,14 +7,14 @@
   alsa-lib,
   copyDesktopItems,
   makeDesktopItem,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXinerama,
-  libXrandr,
-  libXtst,
-  libXdmcp,
-  libXext,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxinerama,
+  libxrandr,
+  libxtst,
+  libxdmcp,
+  libxext,
   xvfb,
   freetype,
   fontconfig,
@@ -64,14 +64,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     alsa-lib
-    libX11
-    libXcomposite
-    libXcursor
-    libXinerama
-    libXrandr
-    libXtst
-    libXdmcp
-    libXext
+    libx11
+    libxcomposite
+    libxcursor
+    libxinerama
+    libxrandr
+    libxtst
+    libxdmcp
+    libxext
     xvfb
     libGL
     libjack2
diff --git a/pkgs/by-name/so/socalabs-sn76489/package.nix b/pkgs/by-name/so/socalabs-sn76489/package.nix
index a54c6b796bc2..85fed2b6f135 100644
--- a/pkgs/by-name/so/socalabs-sn76489/package.nix
+++ b/pkgs/by-name/so/socalabs-sn76489/package.nix
@@ -7,14 +7,14 @@
   alsa-lib,
   copyDesktopItems,
   makeDesktopItem,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXinerama,
-  libXrandr,
-  libXtst,
-  libXdmcp,
-  libXext,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxinerama,
+  libxrandr,
+  libxtst,
+  libxdmcp,
+  libxext,
   xvfb,
   freetype,
   fontconfig,
@@ -74,14 +74,14 @@ stdenv.mkDerivation {
 
   buildInputs = [
     alsa-lib
-    libX11
-    libXcomposite
-    libXcursor
-    libXinerama
-    libXrandr
-    libXtst
-    libXdmcp
-    libXext
+    libx11
+    libxcomposite
+    libxcursor
+    libxinerama
+    libxrandr
+    libxtst
+    libxdmcp
+    libxext
     xvfb
     libGL
     libjack2
diff --git a/pkgs/by-name/so/socalabs-voc/package.nix b/pkgs/by-name/so/socalabs-voc/package.nix
index 3be3fdd55677..d1f7e6501f43 100644
--- a/pkgs/by-name/so/socalabs-voc/package.nix
+++ b/pkgs/by-name/so/socalabs-voc/package.nix
@@ -7,14 +7,14 @@
   alsa-lib,
   copyDesktopItems,
   makeDesktopItem,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXinerama,
-  libXrandr,
-  libXtst,
-  libXdmcp,
-  libXext,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxinerama,
+  libxrandr,
+  libxtst,
+  libxdmcp,
+  libxext,
   xvfb,
   freetype,
   fontconfig,
@@ -71,14 +71,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     alsa-lib
-    libX11
-    libXcomposite
-    libXcursor
-    libXinerama
-    libXrandr
-    libXtst
-    libXdmcp
-    libXext
+    libx11
+    libxcomposite
+    libxcursor
+    libxinerama
+    libxrandr
+    libxtst
+    libxdmcp
+    libxext
     xvfb
     libGL
     libjack2
diff --git a/pkgs/by-name/so/soil/package.nix b/pkgs/by-name/so/soil/package.nix
index 183a1fec6e57..603665d3a364 100644
--- a/pkgs/by-name/so/soil/package.nix
+++ b/pkgs/by-name/so/soil/package.nix
@@ -3,7 +3,7 @@
   lib,
   fetchzip,
   libGL,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation {
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
     libGL
-    libX11
+    libx11
   ];
 
   buildPhase = ''
diff --git a/pkgs/by-name/so/sonic-visualiser/package.nix b/pkgs/by-name/so/sonic-visualiser/package.nix
index d78e3f0b1703..871f2893ca1f 100644
--- a/pkgs/by-name/so/sonic-visualiser/package.nix
+++ b/pkgs/by-name/so/sonic-visualiser/package.nix
@@ -8,7 +8,7 @@
   bzip2,
   fftw,
   libjack2,
-  libX11,
+  libx11,
   liblo,
   libmad,
   lrdf,
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
     libmad
     libfishsound
     liblo
-    libX11
+    libx11
     capnproto
     liboggz
     libid3tag
diff --git a/pkgs/by-name/so/sonobus/package.nix b/pkgs/by-name/so/sonobus/package.nix
index 416359bc5717..89c44f0326da 100644
--- a/pkgs/by-name/so/sonobus/package.nix
+++ b/pkgs/by-name/so/sonobus/package.nix
@@ -8,11 +8,11 @@
   cmake,
   freetype,
   libGL,
-  libX11,
-  libXcursor,
-  libXext,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxext,
+  libxinerama,
+  libxrandr,
   libjack2,
   libopus,
   curl,
@@ -66,11 +66,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   runtimeDependencies = [
     libGL
-    libX11
-    libXcursor
-    libXext
-    libXinerama
-    libXrandr
+    libx11
+    libxcursor
+    libxext
+    libxinerama
+    libxrandr
   ];
 
   env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux "-rpath ${lib.makeLibraryPath (finalAttrs.runtimeDependencies)}";
diff --git a/pkgs/by-name/so/sops/package.nix b/pkgs/by-name/so/sops/package.nix
index bdf11b100e4d..185ea8954669 100644
--- a/pkgs/by-name/so/sops/package.nix
+++ b/pkgs/by-name/so/sops/package.nix
@@ -10,14 +10,14 @@
   age,
 }:
 
-buildGoModule (final: {
+buildGoModule (finalAttrs: {
   pname = "sops";
   version = "3.11.0";
 
   src = fetchFromGitHub {
     owner = "getsops";
-    repo = final.pname;
-    tag = "v${final.version}";
+    repo = finalAttrs.pname;
+    tag = "v${finalAttrs.version}";
     hash = "sha256-AAnrZvNkBgliHdk1lAoFrJdISNWteFdBUorRycKsptU=";
   };
 
@@ -28,7 +28,7 @@ buildGoModule (final: {
   ldflags = [
     "-s"
     "-w"
-    "-X github.com/getsops/sops/v3/version.Version=${final.version}"
+    "-X github.com/getsops/sops/v3/version.Version=${finalAttrs.version}"
   ];
 
   nativeBuildInputs = [
@@ -49,19 +49,19 @@ buildGoModule (final: {
   # wrap sops with age plugins
   passthru.withAgePlugins =
     filter:
-    runCommand "sops-${final.version}-with-age-plugins"
+    runCommand "sops-${finalAttrs.version}-with-age-plugins"
       {
         nativeBuildInputs = [ makeWrapper ];
       }
       ''
-        makeWrapper ${lib.getBin final.finalPackage}/bin/sops $out/bin/sops \
+        makeWrapper ${lib.getBin finalAttrs.finalPackage}/bin/sops $out/bin/sops \
           --prefix PATH : "${lib.makeBinPath (filter age.passthru.plugins)}"
       '';
 
   meta = {
     homepage = "https://getsops.io/";
     description = "Simple and flexible tool for managing secrets";
-    changelog = "https://github.com/getsops/sops/blob/v${final.version}/CHANGELOG.rst";
+    changelog = "https://github.com/getsops/sops/blob/v${finalAttrs.version}/CHANGELOG.rst";
     mainProgram = "sops";
     maintainers = with lib.maintainers; [
       Scrumplex
diff --git a/pkgs/by-name/so/sourcegit/package.nix b/pkgs/by-name/so/sourcegit/package.nix
index 1686095e904f..e71bee15ac31 100644
--- a/pkgs/by-name/so/sourcegit/package.nix
+++ b/pkgs/by-name/so/sourcegit/package.nix
@@ -8,10 +8,10 @@
   makeDesktopItem,
   libicns,
 
-  libXcursor,
-  libXext,
-  libXi,
-  libXrandr,
+  libxcursor,
+  libxext,
+  libxi,
+  libxrandr,
 
   git,
   xdg-utils,
@@ -52,13 +52,13 @@ buildDotnetModule (finalAttrs: {
   ];
 
   # these are dlopen-ed at runtime
-  # libXi is needed for right-click support
+  # libxi is needed for right-click support
   # not sure about what the other ones are needed for, but I'll include them anyways
   runtimeDeps = [
-    libXcursor
-    libXext
-    libXi
-    libXrandr
+    libxcursor
+    libxext
+    libxi
+    libxrandr
   ];
 
   # Note: users can use `.overrideAttrs` to append to this list
diff --git a/pkgs/by-name/so/soxt/package.nix b/pkgs/by-name/so/soxt/package.nix
index 31fa46242c2f..65d201b010e3 100644
--- a/pkgs/by-name/so/soxt/package.nix
+++ b/pkgs/by-name/so/soxt/package.nix
@@ -5,8 +5,8 @@
   cmake,
   coin3d,
   motif,
-  libXext,
-  libXmu,
+  libxext,
+  libxmu,
   libGLU,
   libGL,
 }:
@@ -29,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
     motif
     libGLU
     libGL
-    libXext
-    libXmu
+    libxext
+    libxmu
   ];
 
   meta = {
diff --git a/pkgs/by-name/sp/space-station-14-launcher/package.nix b/pkgs/by-name/sp/space-station-14-launcher/package.nix
index 55b9cf96b391..5f419d4cc225 100644
--- a/pkgs/by-name/sp/space-station-14-launcher/package.nix
+++ b/pkgs/by-name/sp/space-station-14-launcher/package.nix
@@ -8,13 +8,13 @@
   iconConvTools,
   copyDesktopItems,
   makeDesktopItem,
-  libX11,
+  libx11,
   libice,
   libsm,
-  libXi,
-  libXcursor,
-  libXext,
-  libXrandr,
+  libxi,
+  libxcursor,
+  libxext,
+  libxrandr,
   libGL,
   freetype,
   glib,
@@ -86,13 +86,13 @@ buildDotnetModule rec {
     libGL
     freetype
     glib
-    libX11
+    libx11
     libice
     libsm
-    libXi
-    libXcursor
-    libXext
-    libXrandr
+    libxi
+    libxcursor
+    libxext
+    libxrandr
     at-spi2-atk
     at-spi2-core
     libxkbcommon
diff --git a/pkgs/by-name/sp/spacenav-cube-example/package.nix b/pkgs/by-name/sp/spacenav-cube-example/package.nix
index abcda7c2dc3f..b4613c3e3848 100644
--- a/pkgs/by-name/sp/spacenav-cube-example/package.nix
+++ b/pkgs/by-name/sp/spacenav-cube-example/package.nix
@@ -2,7 +2,7 @@
   stdenv,
   lib,
   libspnav,
-  libX11,
+  libx11,
   mesa_glu,
 }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   sourceRoot = "${libspnav.src.name}/examples/cube";
 
   buildInputs = [
-    libX11
+    libx11
     mesa_glu
     libspnav
   ];
diff --git a/pkgs/by-name/sp/spacenavd/package.nix b/pkgs/by-name/sp/spacenavd/package.nix
index 3adb51aac023..54da61707864 100644
--- a/pkgs/by-name/sp/spacenavd/package.nix
+++ b/pkgs/by-name/sp/spacenavd/package.nix
@@ -2,8 +2,8 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  libXext,
-  libX11,
+  libxext,
+  libx11,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "spacenavd";
@@ -17,8 +17,8 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
-    libXext
+    libx11
+    libxext
   ];
 
   configureFlags = [ "--disable-debug" ];
diff --git a/pkgs/by-name/sp/spaghettikart/package.nix b/pkgs/by-name/sp/spaghettikart/package.nix
index feaf3696cbb2..409e1758a667 100644
--- a/pkgs/by-name/sp/spaghettikart/package.nix
+++ b/pkgs/by-name/sp/spaghettikart/package.nix
@@ -18,7 +18,7 @@
   pkg-config,
   libGL,
   libvorbis,
-  libX11,
+  libx11,
   libzip,
   nlohmann_json,
   SDL2,
@@ -188,7 +188,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libGL
     libvorbis
-    libX11
+    libx11
     libzip
     nlohmann_json
     SDL2
diff --git a/pkgs/by-name/sp/spectrwm/package.nix b/pkgs/by-name/sp/spectrwm/package.nix
index c7cb34ce513c..b135c74d7d1e 100644
--- a/pkgs/by-name/sp/spectrwm/package.nix
+++ b/pkgs/by-name/sp/spectrwm/package.nix
@@ -4,10 +4,10 @@
   fetchFromGitHub,
   libbsd,
   pkg-config,
-  libXrandr,
-  libXcursor,
-  libXft,
-  libXt,
+  libxrandr,
+  libxcursor,
+  libxft,
+  libxt,
   libxcb-util,
   libxcb-keysyms,
   libxcb-wm,
@@ -30,10 +30,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    libXrandr
-    libXcursor
-    libXft
-    libXt
+    libxrandr
+    libxcursor
+    libxft
+    libxt
     libxcb-util
     libxcb-keysyms
     libxcb-wm
diff --git a/pkgs/by-name/sp/speed-dreams/package.nix b/pkgs/by-name/sp/speed-dreams/package.nix
index 936b3547b319..8db85914984d 100644
--- a/pkgs/by-name/sp/speed-dreams/package.nix
+++ b/pkgs/by-name/sp/speed-dreams/package.nix
@@ -4,19 +4,19 @@
   libGLU,
   libGL,
   libglut,
-  libX11,
+  libx11,
   plib,
   openal,
   freealut,
-  libXrandr,
+  libxrandr,
   xorgproto,
-  libXext,
+  libxext,
   libsm,
   libice,
-  libXi,
-  libXt,
-  libXrender,
-  libXxf86vm,
+  libxi,
+  libxt,
+  libxrender,
+  libxxf86vm,
   openscenegraph,
   expat,
   libpng12,
@@ -45,18 +45,18 @@ let
     libglut
   ];
   runtimeLibs = glLibs ++ [
-    libX11
+    libx11
     plib
     openal
     freealut
-    libXrandr
-    libXext
+    libxrandr
+    libxext
     libsm
     libice
-    libXi
-    libXt
-    libXrender
-    libXxf86vm
+    libxi
+    libxt
+    libxrender
+    libxxf86vm
     openscenegraph
     expat
     libpng12
@@ -133,19 +133,19 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libpng12
-    libX11
+    libx11
     plib
     openal
     freealut
-    libXrandr
+    libxrandr
     xorgproto
-    libXext
+    libxext
     libsm
     libice
-    libXi
-    libXt
-    libXrender
-    libXxf86vm
+    libxi
+    libxt
+    libxrender
+    libxxf86vm
     zlib
     bash
     expat
diff --git a/pkgs/by-name/sp/spice-autorandr/package.nix b/pkgs/by-name/sp/spice-autorandr/package.nix
index a4f50b8a4a05..c98aacf82971 100644
--- a/pkgs/by-name/sp/spice-autorandr/package.nix
+++ b/pkgs/by-name/sp/spice-autorandr/package.nix
@@ -4,8 +4,8 @@
   fetchFromGitHub,
   pkg-config,
   autoreconfHook,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
 }:
 
 stdenv.mkDerivation {
@@ -24,8 +24,8 @@ stdenv.mkDerivation {
     pkg-config
   ];
   buildInputs = [
-    libX11
-    libXrandr
+    libx11
+    libxrandr
   ];
 
   installPhase = ''
diff --git a/pkgs/by-name/sp/spice-vdagent/package.nix b/pkgs/by-name/sp/spice-vdagent/package.nix
index 9b8fa858f0fc..813fa2eb0fe9 100644
--- a/pkgs/by-name/sp/spice-vdagent/package.nix
+++ b/pkgs/by-name/sp/spice-vdagent/package.nix
@@ -8,9 +8,9 @@
   glib,
   libpciaccess,
   libxcb,
-  libXrandr,
-  libXinerama,
-  libXfixes,
+  libxrandr,
+  libxinerama,
+  libxfixes,
   dbus,
   libdrm,
   systemd,
@@ -34,9 +34,9 @@ stdenv.mkDerivation rec {
     libdrm
     libpciaccess
     libxcb
-    libXrandr
-    libXinerama
-    libXfixes
+    libxrandr
+    libxinerama
+    libxfixes
     dbus
     systemd
   ];
diff --git a/pkgs/by-name/sp/spice/package.nix b/pkgs/by-name/sp/spice/package.nix
index 9d7e20309ae2..48b778eaaf7e 100644
--- a/pkgs/by-name/sp/spice/package.nix
+++ b/pkgs/by-name/sp/spice/package.nix
@@ -8,11 +8,11 @@
   pixman,
   alsa-lib,
   openssl,
-  libXrandr,
-  libXfixes,
-  libXext,
-  libXrender,
-  libXinerama,
+  libxrandr,
+  libxfixes,
+  libxext,
+  libxrender,
+  libxinerama,
   libjpeg,
   zlib,
   spice-protocol,
@@ -53,11 +53,11 @@ stdenv.mkDerivation rec {
     cyrus_sasl
     glib
     gst_all_1.gst-plugins-base
-    libXext
-    libXfixes
-    libXinerama
-    libXrandr
-    libXrender
+    libxext
+    libxfixes
+    libxinerama
+    libxrandr
+    libxrender
     libcacard
     libjpeg
     libopus
diff --git a/pkgs/by-name/sp/spideroak/package.nix b/pkgs/by-name/sp/spideroak/package.nix
index 4cc19a53bc5d..3b1a1ae00413 100644
--- a/pkgs/by-name/sp/spideroak/package.nix
+++ b/pkgs/by-name/sp/spideroak/package.nix
@@ -9,9 +9,9 @@
   glib,
   libice,
   libsm,
-  libX11,
-  libXext,
-  libXrender,
+  libx11,
+  libxext,
+  libxrender,
   zlib,
 }:
 
@@ -24,9 +24,9 @@ let
     glib
     libice
     libsm
-    libX11
-    libXext
-    libXrender
+    libx11
+    libxext
+    libxrender
     zlib
   ];
 
diff --git a/pkgs/by-name/sp/spotifywm/package.nix b/pkgs/by-name/sp/spotifywm/package.nix
index a12a3f94b62b..98ba8867efb3 100644
--- a/pkgs/by-name/sp/spotifywm/package.nix
+++ b/pkgs/by-name/sp/spotifywm/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
   libxcb,
   lndir,
   makeBinaryWrapper,
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     libxcb
   ];
 
diff --git a/pkgs/by-name/sq/sqldef/package.nix b/pkgs/by-name/sq/sqldef/package.nix
index 2ff582d9d2bb..c10a5adeea5c 100644
--- a/pkgs/by-name/sq/sqldef/package.nix
+++ b/pkgs/by-name/sq/sqldef/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "sqldef";
-  version = "3.9.4";
+  version = "3.9.6";
 
   src = fetchFromGitHub {
     owner = "sqldef";
     repo = "sqldef";
     rev = "v${version}";
-    hash = "sha256-yPDff1ZDytXtXrCGaf0oCEeYo69MbMMkMbV4ryAlNXA=";
+    hash = "sha256-vC8aFIvhGSqeGQTwhPmQx9bXgoyDm3c3eLO025ZkudQ=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-Djltq/oWMyutNGI42EuOijoUBuhMSdoO/xL3yQQVSgg=";
+  vendorHash = "sha256-VlycZ2UyZJgotHUAj1nb77Svan8hyKJBNYX2ygQ2JIU=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/sr/srandrd/package.nix b/pkgs/by-name/sr/srandrd/package.nix
index 7f55e8df6558..652780b2e948 100644
--- a/pkgs/by-name/sr/srandrd/package.nix
+++ b/pkgs/by-name/sr/srandrd/package.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXrandr,
-  libXinerama,
+  libx11,
+  libxrandr,
+  libxinerama,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -19,9 +19,9 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
-    libXrandr
-    libXinerama
+    libx11
+    libxrandr
+    libxinerama
   ];
 
   makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/by-name/sr/srm-cuarzo/package.nix b/pkgs/by-name/sr/srm-cuarzo/package.nix
index 10aa962e5b2a..b0371a884da9 100644
--- a/pkgs/by-name/sr/srm-cuarzo/package.nix
+++ b/pkgs/by-name/sr/srm-cuarzo/package.nix
@@ -13,14 +13,14 @@
   seatd,
   udev,
 }:
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "srm-cuarzo";
   version = "0.13.0-1";
-  rev = "v${self.version}";
+  rev = "v${finalAttrs.version}";
   hash = "sha256-5BwLqAZdfO5vyEMPZImaxymvLoNuu6bOiOkvR8JERxg=";
 
   src = fetchFromGitHub {
-    inherit (self) rev hash;
+    inherit (finalAttrs) rev hash;
     owner = "CuarzoSoftware";
     repo = "SRM";
   };
diff --git a/pkgs/by-name/ss/sselp/package.nix b/pkgs/by-name/ss/sselp/package.nix
index faedce6e18c5..5a05be400c6a 100644
--- a/pkgs/by-name/ss/sselp/package.nix
+++ b/pkgs/by-name/ss/sselp/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation rec {
@@ -14,12 +14,12 @@ stdenv.mkDerivation rec {
     sha256 = "08mqp00lrh1chdrbs18qr0xv63h866lkmfj87kfscwdm1vn9a3yd";
   };
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   patchPhase = ''
     sed -i "s@/usr/local@$out@g" config.mk
-    sed -i "s@/usr/X11R6/include@${libX11}/include@g" config.mk
-    sed -i "s@/usr/X11R6/lib@${libX11}/lib@g" config.mk
+    sed -i "s@/usr/X11R6/include@${libx11}/include@g" config.mk
+    sed -i "s@/usr/X11R6/lib@${libx11}/lib@g" config.mk
   '';
 
   meta = {
diff --git a/pkgs/by-name/ss/ssocr/package.nix b/pkgs/by-name/ss/ssocr/package.nix
index bd4e8e2ce660..9c7a823d0831 100644
--- a/pkgs/by-name/ss/ssocr/package.nix
+++ b/pkgs/by-name/ss/ssocr/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   imlib2,
-  libX11,
+  libx11,
   pkg-config,
 }:
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     imlib2
-    libX11
+    libx11
   ];
 
   installFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/by-name/st/st-snazzy/package.nix b/pkgs/by-name/st/st-snazzy/package.nix
index e5521c63e293..23564c3eb836 100644
--- a/pkgs/by-name/st/st-snazzy/package.nix
+++ b/pkgs/by-name/st/st-snazzy/package.nix
@@ -4,8 +4,8 @@
   fetchFromGitHub,
   fontconfig,
   harfbuzz,
-  libX11,
-  libXft,
+  libx11,
+  libxft,
   ncurses,
   gd,
   glib,
@@ -27,8 +27,8 @@ stdenv.mkDerivation {
   buildInputs = [
     fontconfig
     harfbuzz
-    libX11
-    libXft
+    libx11
+    libxft
     ncurses
     gd
     glib
diff --git a/pkgs/by-name/st/st/package.nix b/pkgs/by-name/st/st/package.nix
index a9df8c908d67..60f17a610e82 100644
--- a/pkgs/by-name/st/st/package.nix
+++ b/pkgs/by-name/st/st/package.nix
@@ -5,8 +5,8 @@
   pkg-config,
   fontconfig,
   freetype,
-  libX11,
-  libXft,
+  libx11,
+  libxft,
   ncurses,
   writeText,
   config,
@@ -55,8 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
   ];
   buildInputs = [
-    libX11
-    libXft
+    libx11
+    libxft
   ]
   ++ extraLibs;
 
diff --git a/pkgs/by-name/st/stable-diffusion-cpp/package.nix b/pkgs/by-name/st/stable-diffusion-cpp/package.nix
index 8de7da8c94fe..0d5f9ddb7be2 100644
--- a/pkgs/by-name/st/stable-diffusion-cpp/package.nix
+++ b/pkgs/by-name/st/stable-diffusion-cpp/package.nix
@@ -42,7 +42,7 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "stable-diffusion-cpp";
-  version = "master-475-2efd199";
+  version = "master-492-f957fa3";
 
   outputs = [
     "out"
@@ -52,8 +52,8 @@ effectiveStdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "leejet";
     repo = "stable-diffusion.cpp";
-    rev = "master-475-2efd199";
-    hash = "sha256-ic0mnkKjgfL8k94ZCyqckjDR953NL7kBZ/tlIfLgZYo=";
+    rev = "master-492-f957fa3";
+    hash = "sha256-qY21TfU5t5KdD59Q9LoMHxD1AGQKhH/fr5NLRdyeF7k=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/st/stalin/package.nix b/pkgs/by-name/st/stalin/package.nix
index 1c341ca1166f..514e007db971 100644
--- a/pkgs/by-name/st/stalin/package.nix
+++ b/pkgs/by-name/st/stalin/package.nix
@@ -3,7 +3,7 @@
   lib,
   stdenv,
   ncompress,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     ncompress
-    libX11
+    libx11
   ];
 
   buildPhase = "./build ";
diff --git a/pkgs/by-name/st/stalonetray/package.nix b/pkgs/by-name/st/stalonetray/package.nix
index ef6638ad2b24..6222d910ed2a 100644
--- a/pkgs/by-name/st/stalonetray/package.nix
+++ b/pkgs/by-name/st/stalonetray/package.nix
@@ -4,8 +4,8 @@
   docbook-xsl-ns,
   fetchFromGitHub,
   lib,
-  libX11,
-  libXpm,
+  libx11,
+  libxpm,
   libxslt,
   stdenv,
 }:
@@ -35,8 +35,8 @@ stdenv.mkDerivation (finalAttrs: {
     autoreconfHook
     docbook-xsl-ns
     docbook_xml_dtd_44
-    libX11
-    libXpm
+    libx11
+    libxpm
     libxslt
   ];
 
diff --git a/pkgs/by-name/st/stardust/package.nix b/pkgs/by-name/st/stardust/package.nix
index 6e0a0cbd493e..2066ae3f68e2 100644
--- a/pkgs/by-name/st/stardust/package.nix
+++ b/pkgs/by-name/st/stardust/package.nix
@@ -6,10 +6,10 @@
   libtiff,
   libxml2,
   SDL_compat,
-  libX11,
-  libXi,
-  libXmu,
-  libXext,
+  libx11,
+  libxi,
+  libxmu,
+  libxext,
   libGLU,
   libGL,
 }:
@@ -35,10 +35,10 @@ stdenv.mkDerivation (finalAttrs: {
     libtiff
     libxml2
     SDL_compat
-    libX11
-    libXi
-    libXmu
-    libXext
+    libx11
+    libxi
+    libxmu
+    libxext
     libGLU
     libGL
   ];
diff --git a/pkgs/by-name/st/steam/package.nix b/pkgs/by-name/st/steam/package.nix
index 254bf591334d..910e4b5aadde 100644
--- a/pkgs/by-name/st/steam/package.nix
+++ b/pkgs/by-name/st/steam/package.nix
@@ -62,7 +62,7 @@ let
               ln -s /bin/ldconfig $out/sbin/ldconfig
             '')
 
-            # crashes on startup if it can't find libX11 locale files
+            # crashes on startup if it can't find libx11 locale files
             (pkgs.runCommand "xorg-locale" { } ''
               mkdir -p $out
               ln -s ${libx11}/share $out/share
@@ -168,7 +168,8 @@ buildRuntimeEnv {
       makeSteamRun =
         package:
         buildRuntimeEnv {
-          name = "steam-run";
+          inherit (steam-unwrapped) version;
+          pname = "steam-run";
 
           extraPkgs = pkgs: package ++ extraPkgs pkgs;
 
diff --git a/pkgs/by-name/st/stereotool/package.nix b/pkgs/by-name/st/stereotool/package.nix
index 62d80d9c3a0e..1a5ccb1e7446 100644
--- a/pkgs/by-name/st/stereotool/package.nix
+++ b/pkgs/by-name/st/stereotool/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchurl,
   autoPatchelfHook,
-  libX11,
-  libXpm,
+  libx11,
+  libxpm,
   alsa-lib,
   bzip2,
   zlib,
@@ -151,11 +151,11 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     alsa-lib
     bzip2
     zlib
-    libXpm
+    libxpm
     libgcc
   ];
 
diff --git a/pkgs/by-name/st/stochas/package.nix b/pkgs/by-name/st/stochas/package.nix
index e46871bdb4a1..ed98735d03d2 100644
--- a/pkgs/by-name/st/stochas/package.nix
+++ b/pkgs/by-name/st/stochas/package.nix
@@ -4,11 +4,11 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  libX11,
-  libXrandr,
-  libXinerama,
-  libXext,
-  libXcursor,
+  libx11,
+  libxrandr,
+  libxinerama,
+  libxext,
+  libxcursor,
   freetype,
   alsa-lib,
   libjack2,
@@ -37,11 +37,11 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXrandr
-    libXinerama
-    libXext
-    libXcursor
+    libx11
+    libxrandr
+    libxinerama
+    libxext
+    libxcursor
     freetype
     alsa-lib
     libjack2
diff --git a/pkgs/by-name/st/strawberry/package.nix b/pkgs/by-name/st/strawberry/package.nix
index fdb90a96947f..d315a82498fd 100644
--- a/pkgs/by-name/st/strawberry/package.nix
+++ b/pkgs/by-name/st/strawberry/package.nix
@@ -10,7 +10,7 @@
   gst_all_1,
   kdsingleapplication,
   lib,
-  libXdmcp,
+  libxdmcp,
   libcdio,
   libebur128,
   libidn2,
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     fftw
     gnutls
     kdsingleapplication
-    libXdmcp
+    libxdmcp
     libcdio
     libebur128
     libidn2
diff --git a/pkgs/by-name/st/strobealign/package.nix b/pkgs/by-name/st/strobealign/package.nix
index 239bb1c04974..54f6e6ab866b 100644
--- a/pkgs/by-name/st/strobealign/package.nix
+++ b/pkgs/by-name/st/strobealign/package.nix
@@ -7,14 +7,14 @@
   isa-l,
   zlib,
 }:
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "strobealign";
   version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "ksahlin";
     repo = "strobealign";
-    tag = "v${self.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-ah21ptyfZbgdJrtCCftYhGh1hfcJ9JpXNsXUp8pZDJw=";
   };
 
diff --git a/pkgs/by-name/st/stuntrally/mygui.nix b/pkgs/by-name/st/stuntrally/mygui.nix
index 111d3fe2266d..f3d323368b6d 100644
--- a/pkgs/by-name/st/stuntrally/mygui.nix
+++ b/pkgs/by-name/st/stuntrally/mygui.nix
@@ -10,7 +10,7 @@
   libuuid,
   ois,
   ogre-next,
-  libX11,
+  libx11,
 }:
 stdenv.mkDerivation {
   pname = "mygui";
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
     libuuid
     ois
     ogre-next
-    libX11
+    libx11
   ];
 
   cmakeFlags = [
diff --git a/pkgs/by-name/st/stuntrally/package.nix b/pkgs/by-name/st/stuntrally/package.nix
index 5bbe921d5529..d24d33ed54f2 100644
--- a/pkgs/by-name/st/stuntrally/package.nix
+++ b/pkgs/by-name/st/stuntrally/package.nix
@@ -16,7 +16,7 @@
   rapidjson,
   ogre-next,
   ninja,
-  libX11,
+  libx11,
 }:
 
 let
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
     bullet
     openal
     tinyxml-2
-    libX11
+    libx11
   ];
 
   installPhase = ''
diff --git a/pkgs/by-name/st/stw/package.nix b/pkgs/by-name/st/stw/package.nix
index fee513ab3afc..ace62888fa4e 100644
--- a/pkgs/by-name/st/stw/package.nix
+++ b/pkgs/by-name/st/stw/package.nix
@@ -2,10 +2,10 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
   fontconfig,
-  libXft,
-  libXrender,
+  libxft,
+  libxrender,
 }:
 
 stdenv.mkDerivation {
@@ -20,10 +20,10 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    libX11
+    libx11
     fontconfig
-    libXft
-    libXrender
+    libxft
+    libxrender
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/st/styluslabs-write-bin/package.nix b/pkgs/by-name/st/styluslabs-write-bin/package.nix
index c6aba59ae85d..f54141952fe9 100644
--- a/pkgs/by-name/st/styluslabs-write-bin/package.nix
+++ b/pkgs/by-name/st/styluslabs-write-bin/package.nix
@@ -3,8 +3,8 @@
   lib,
   libsForQt5,
   libglvnd,
-  libX11,
-  libXi,
+  libx11,
+  libxi,
   fetchurl,
   makeDesktopItem,
 }:
@@ -54,8 +54,8 @@ stdenv.mkDerivation rec {
         libsForQt5.qtsvg # libQt5Svg.so.5
         (lib.getLib stdenv.cc.cc) # libstdc++.so.6
         libglvnd # libGL.so.1
-        libX11 # libX11.so.6
-        libXi # libXi.so.6
+        libx11 # libX11.so.6
+        libxi # libXi.so.6
       ];
     in
     ''
diff --git a/pkgs/by-name/su/sumo/package.nix b/pkgs/by-name/su/sumo/package.nix
index 3fb78cb40ab7..07b36b793bb5 100644
--- a/pkgs/by-name/su/sumo/package.nix
+++ b/pkgs/by-name/su/sumo/package.nix
@@ -14,7 +14,7 @@
   jdk,
   libGL,
   libGLU,
-  libX11,
+  libx11,
   libjpeg,
   libpng,
   libtiff,
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
     xercesc
     zlib
     python3
-    libX11
+    libx11
     libxcursor
     libxext
     libxfixes
diff --git a/pkgs/by-name/su/sunvox/package.nix b/pkgs/by-name/su/sunvox/package.nix
index 78e1e0ad9382..56168f88a970 100644
--- a/pkgs/by-name/su/sunvox/package.nix
+++ b/pkgs/by-name/su/sunvox/package.nix
@@ -7,8 +7,8 @@
   copyDesktopItems,
   libglvnd,
   libjack2,
-  libX11,
-  libXi,
+  libx11,
+  libxi,
   makeDesktopItem,
   makeWrapper,
   SDL2,
@@ -59,8 +59,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
     libglvnd
-    libX11
-    libXi
+    libx11
+    libxi
     SDL2
   ];
 
diff --git a/pkgs/by-name/su/superTux/package.nix b/pkgs/by-name/su/superTux/package.nix
index 472ffd65ed0a..ad73a29dfeca 100644
--- a/pkgs/by-name/su/superTux/package.nix
+++ b/pkgs/by-name/su/superTux/package.nix
@@ -9,7 +9,7 @@
   SDL2,
   SDL2_image,
   libsm,
-  libXext,
+  libxext,
   libpng,
   freetype,
   libGLU,
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
     SDL2
     SDL2_image
     libsm
-    libXext
+    libxext
     libpng
     freetype
     libGL
diff --git a/pkgs/by-name/su/superTuxKart/package.nix b/pkgs/by-name/su/superTuxKart/package.nix
index 4b8ea5d46fdd..8ece4444bad2 100644
--- a/pkgs/by-name/su/superTuxKart/package.nix
+++ b/pkgs/by-name/su/superTuxKart/package.nix
@@ -15,7 +15,7 @@
   freetype,
   libjpeg,
   libpng,
-  libX11,
+  libx11,
   harfbuzz,
   mcpp,
   wiiuse,
@@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
     curl
     libjpeg
     libpng
-    libX11
+    libx11
     harfbuzz
     mcpp
     wiiuse
diff --git a/pkgs/by-name/su/surfer/package.nix b/pkgs/by-name/su/surfer/package.nix
index feb160382471..85cc79dfe20b 100644
--- a/pkgs/by-name/su/surfer/package.nix
+++ b/pkgs/by-name/su/surfer/package.nix
@@ -8,9 +8,9 @@
   autoPatchelfHook,
   libxkbcommon,
   libGL,
-  libX11,
-  libXcursor,
-  libXi,
+  libx11,
+  libxcursor,
+  libxi,
   stdenv,
   makeWrapper,
   zenity,
@@ -43,9 +43,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     wayland
     libxkbcommon
     libGL
-    libX11
-    libXcursor
-    libXi
+    libx11
+    libxcursor
+    libxi
   ];
 
   cargoHash = "sha256-E+9u7t6bLzORL2HiG4iT5pT4nGftyOgO2/eXHuQK4pQ=";
diff --git a/pkgs/by-name/su/surge-XT/package.nix b/pkgs/by-name/su/surge-XT/package.nix
index daee093f35c0..0b4ce473dbc9 100644
--- a/pkgs/by-name/su/surge-XT/package.nix
+++ b/pkgs/by-name/su/surge-XT/package.nix
@@ -9,11 +9,11 @@
   freetype,
   libjack2,
   lv2,
-  libX11,
-  libXcursor,
-  libXext,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxext,
+  libxinerama,
+  libxrandr,
 
   buildVST3 ? true,
   buildLV2 ? true,
@@ -59,11 +59,11 @@ stdenv.mkDerivation (finalAttrs: {
     alsa-lib
     freetype
     libjack2
-    libX11
-    libXcursor
-    libXext
-    libXinerama
-    libXrandr
+    libx11
+    libxcursor
+    libxext
+    libxinerama
+    libxrandr
   ]
   ++ lib.optionals buildLV2 [ lv2 ];
 
diff --git a/pkgs/by-name/su/surreal-engine/package.nix b/pkgs/by-name/su/surreal-engine/package.nix
index f12e5b6e2afc..4f3c2608f75f 100644
--- a/pkgs/by-name/su/surreal-engine/package.nix
+++ b/pkgs/by-name/su/surreal-engine/package.nix
@@ -9,7 +9,7 @@
   openal,
   pkg-config,
   SDL2,
-  libX11,
+  libx11,
   stdenv,
   vulkan-loader,
   wayland,
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     libffi
     openal
     SDL2
-    libX11
+    libx11
     vulkan-loader
     wayland
     waylandpp
diff --git a/pkgs/by-name/su/survex/package.nix b/pkgs/by-name/su/survex/package.nix
index e4609f1a1c36..99e1b459db76 100644
--- a/pkgs/by-name/su/survex/package.nix
+++ b/pkgs/by-name/su/survex/package.nix
@@ -6,7 +6,7 @@
   glib,
   libGLU,
   libice,
-  libX11,
+  libx11,
   libgbm,
   perl,
   pkg-config,
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     libGLU
     libgbm
     libice
-    libX11
+    libx11
   ];
 
   strictDeps = true;
diff --git a/pkgs/by-name/sv/sview/package.nix b/pkgs/by-name/sv/sview/package.nix
index 2604ba7ed0ce..2175f700478d 100644
--- a/pkgs/by-name/sv/sview/package.nix
+++ b/pkgs/by-name/sv/sview/package.nix
@@ -7,7 +7,7 @@
   lib,
   libconfig,
   libGL,
-  libXpm,
+  libxpm,
   makeFontsConf,
   makeWrapper,
   nanum,
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     gtk2
     libconfig
     libGL
-    libXpm
+    libxpm
     openal
   ];
 
diff --git a/pkgs/by-name/sv/svkbd/package.nix b/pkgs/by-name/sv/svkbd/package.nix
index f8385efacd74..1cfee22d3f74 100644
--- a/pkgs/by-name/sv/svkbd/package.nix
+++ b/pkgs/by-name/sv/svkbd/package.nix
@@ -4,11 +4,11 @@
   fetchurl,
   writeText,
   pkg-config,
-  libX11,
-  libXft,
-  libXi,
-  libXinerama,
-  libXtst,
+  libx11,
+  libxft,
+  libxi,
+  libxinerama,
+  libxtst,
   layout ? "mobile-intl",
   conf ? null,
   patches ? [ ],
@@ -39,11 +39,11 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXft
-    libXi
-    libXinerama
-    libXtst
+    libx11
+    libxft
+    libxi
+    libxinerama
+    libxtst
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/sw/swi-prolog/package.nix b/pkgs/by-name/sw/swi-prolog/package.nix
index 23fb6516d913..7f7b1aa295c6 100644
--- a/pkgs/by-name/sw/swi-prolog/package.nix
+++ b/pkgs/by-name/sw/swi-prolog/package.nix
@@ -34,12 +34,12 @@
   libyaml,
 
   withGui ? false,
-  libXpm,
-  libXext,
-  libXft,
-  libXinerama,
+  libxpm,
+  libxext,
+  libxft,
+  libxinerama,
   libjpeg,
-  libXt,
+  libxt,
   libsm,
   freetype,
   fontconfig,
@@ -102,11 +102,11 @@ let
     ++ (lib.optional withPython python3)
     ++ (lib.optional withYaml libyaml)
     ++ (lib.optionals withGui' [
-      libXt
-      libXext
-      libXpm
-      libXft
-      libXinerama
+      libxt
+      libxext
+      libxpm
+      libxft
+      libxinerama
       libjpeg
       libsm
       freetype
diff --git a/pkgs/by-name/sy/syncterm/package.nix b/pkgs/by-name/sy/syncterm/package.nix
index 830d0a78b4b2..09c4701290a6 100644
--- a/pkgs/by-name/sy/syncterm/package.nix
+++ b/pkgs/by-name/sy/syncterm/package.nix
@@ -8,7 +8,7 @@
   autoPatchelfHook,
   ncurses,
   SDL2,
-  libX11,
+  libx11,
   alsa-lib,
 }:
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     autoPatchelfHook
     pkg-config
     SDL2
-    libX11
+    libx11
     perl
     unzip
   ]; # SDL2 for `sdl2-config`.
diff --git a/pkgs/by-name/sy/synergy/package.nix b/pkgs/by-name/sy/synergy/package.nix
index c7ab360d0e81..37e95f1340e1 100644
--- a/pkgs/by-name/sy/synergy/package.nix
+++ b/pkgs/by-name/sy/synergy/package.nix
@@ -15,12 +15,12 @@
   libnotify,
   libice,
   libsm,
-  libX11,
+  libx11,
   libxkbfile,
-  libXi,
-  libXtst,
-  libXrandr,
-  libXinerama,
+  libxi,
+  libxtst,
+  libxrandr,
+  libxinerama,
   xkeyboard-config,
   xinput,
   avahi-compat,
@@ -73,11 +73,11 @@ stdenv.mkDerivation (finalAttrs: {
     libsepol
     libice
     libsm
-    libX11
-    libXi
-    libXtst
-    libXrandr
-    libXinerama
+    libx11
+    libxi
+    libxtst
+    libxrandr
+    libxinerama
     libxkbfile
     xinput
     avahi-compat
diff --git a/pkgs/by-name/ta/tana/package.nix b/pkgs/by-name/ta/tana/package.nix
index 6d6931dc458f..49dd3d0915f6 100644
--- a/pkgs/by-name/ta/tana/package.nix
+++ b/pkgs/by-name/ta/tana/package.nix
@@ -1,11 +1,11 @@
 {
-  libX11,
+  libx11,
   libxcb,
-  libXcomposite,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXrandr,
+  libxcomposite,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxrandr,
   stdenv,
   lib,
   alsa-lib,
@@ -45,14 +45,14 @@ let
     glib
     gtk3
     libdrm
-    libX11
+    libx11
     libxcb
-    libXcomposite
-    libXdamage
-    libXext
-    libXfixes
+    libxcomposite
+    libxdamage
+    libxext
+    libxfixes
     libxkbcommon
-    libXrandr
+    libxrandr
     nspr
     nss
     pango
diff --git a/pkgs/by-name/ta/tangerine/package.nix b/pkgs/by-name/ta/tangerine/package.nix
index 293382bd6031..97be2f3d3650 100644
--- a/pkgs/by-name/ta/tangerine/package.nix
+++ b/pkgs/by-name/ta/tangerine/package.nix
@@ -7,7 +7,7 @@
   ncurses,
   SDL2,
   libGL,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation {
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
     ncurses
     SDL2
     libGL
-    libX11
+    libx11
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/ta/targetcli-fb/package.nix b/pkgs/by-name/ta/targetcli-fb/package.nix
index a8db141a5e64..c5769c06843a 100644
--- a/pkgs/by-name/ta/targetcli-fb/package.nix
+++ b/pkgs/by-name/ta/targetcli-fb/package.nix
@@ -10,14 +10,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "targetcli-fb";
-  version = "3.0.1";
+  version = "3.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "open-iscsi";
     repo = "targetcli-fb";
     tag = "v${version}";
-    hash = "sha256-jRujBgUdeJY8ekVBDscitajDhYohlx/BS4wn+jFkZSg=";
+    hash = "sha256-ajBKlgnXeksvEkewo93PIeqwI9X90NvLNf6YxzC0824=";
   };
 
   build-system = with python3Packages; [
diff --git a/pkgs/by-name/ta/taterclient-ddnet/package.nix b/pkgs/by-name/ta/taterclient-ddnet/package.nix
index 5952923e7ad3..b5fc05ea29a3 100644
--- a/pkgs/by-name/ta/taterclient-ddnet/package.nix
+++ b/pkgs/by-name/ta/taterclient-ddnet/package.nix
@@ -13,7 +13,7 @@
   libGLU,
   libnotify,
   libogg,
-  libX11,
+  libx11,
   opusfile,
   pcre,
   python3,
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
     spirv-tools
     glew
   ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ];
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ libx11 ];
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/ta/tattoy/package.nix b/pkgs/by-name/ta/tattoy/package.nix
index c22678cb8163..56a5558d9ccc 100644
--- a/pkgs/by-name/ta/tattoy/package.nix
+++ b/pkgs/by-name/ta/tattoy/package.nix
@@ -11,14 +11,14 @@
   watch,
 }:
 
-rustPlatform.buildRustPackage (attrs: {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tattoy";
   version = "0.1.8";
 
   src = fetchFromGitHub {
     owner = "tattoy-org";
     repo = "tattoy";
-    tag = "tattoy-v${attrs.version}";
+    tag = "tattoy-v${finalAttrs.version}";
     hash = "sha256-44rXygZVbwwC/jOB69iHydsjYr/WeVU4Eky3BPqJzyc=";
   };
 
diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index 6a47d8fbad2a..2acab21f3851 100644
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -16,16 +16,16 @@
 
 buildNpmPackage rec {
   pname = "teams-for-linux";
-  version = "2.7.2";
+  version = "2.7.3";
 
   src = fetchFromGitHub {
     owner = "IsmaelMartinez";
     repo = "teams-for-linux";
     tag = "v${version}";
-    hash = "sha256-I9z61dbGBEw21WfU4oWFTbqHHMG634lKuO4UMm5+V+U=";
+    hash = "sha256-+DSgLKVvH9yTbUxkMAIzULSPU5ohAXAqFvIZzs7tju0=";
   };
 
-  npmDepsHash = "sha256-IVZmkBxbeVlQKNyXhbuUP1XMg/1chCTQK3wsKzwxXgA=";
+  npmDepsHash = "sha256-5cMok+eS+oFH66wUSZkJsHAxxb8lQw1yBavJS0QaEQI=";
 
   nativeBuildInputs = [
     makeWrapper
diff --git a/pkgs/by-name/te/ted/package.nix b/pkgs/by-name/te/ted/package.nix
index 2c91d5b065c5..643a53c86a23 100644
--- a/pkgs/by-name/te/ted/package.nix
+++ b/pkgs/by-name/te/ted/package.nix
@@ -16,7 +16,7 @@
   libpaper,
   makeWrapper,
   ghostscript,
-  libXft,
+  libxft,
 }:
 
 stdenv.mkDerivation rec {
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
     libpng
     gtk2-x11
     libpaper
-    libXft
+    libxft
   ];
 
   meta = {
diff --git a/pkgs/by-name/te/teeworlds/package.nix b/pkgs/by-name/te/teeworlds/package.nix
index 269690fdd9f7..4f69c4f9f014 100644
--- a/pkgs/by-name/te/teeworlds/package.nix
+++ b/pkgs/by-name/te/teeworlds/package.nix
@@ -7,7 +7,7 @@
   pkg-config,
   python3,
   alsa-lib,
-  libX11,
+  libx11,
   libGLU,
   SDL2,
   lua5_3,
@@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       libGLU
       alsa-lib
-      libX11
+      libx11
     ]
   );
 
diff --git a/pkgs/by-name/te/tenacity/package.nix b/pkgs/by-name/te/tenacity/package.nix
index b191502d57ec..be4b431566fc 100644
--- a/pkgs/by-name/te/tenacity/package.nix
+++ b/pkgs/by-name/te/tenacity/package.nix
@@ -39,8 +39,8 @@
   at-spi2-core,
   dbus,
   libepoxy,
-  libXdmcp,
-  libXtst,
+  libxdmcp,
+  libxtst,
   libpthread-stubs,
   libselinux,
   libsepol,
@@ -166,8 +166,8 @@ stdenv.mkDerivation (finalAttrs: {
     at-spi2-core
     dbus
     libepoxy
-    libXdmcp
-    libXtst
+    libxdmcp
+    libxtst
     libpthread-stubs
     libxkbcommon
     libselinux
diff --git a/pkgs/by-name/te/termpaint/package.nix b/pkgs/by-name/te/termpaint/package.nix
index cb2dc6335806..b9cc6217119d 100644
--- a/pkgs/by-name/te/termpaint/package.nix
+++ b/pkgs/by-name/te/termpaint/package.nix
@@ -7,14 +7,14 @@
   pkg-config,
   python3,
 }:
-stdenv.mkDerivation (final: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "termpaint";
   version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "termpaint";
     repo = "termpaint";
-    rev = final.version;
+    rev = finalAttrs.version;
     hash = "sha256-7mfGTC5vJ4806bDbrPMSVthtW05a+M3vgUlHGbtaI4Q=";
   };
 
diff --git a/pkgs/by-name/tg/tgpt/package.nix b/pkgs/by-name/tg/tgpt/package.nix
index 1ba0cd0f7a23..ea942ec4bd7c 100644
--- a/pkgs/by-name/tg/tgpt/package.nix
+++ b/pkgs/by-name/tg/tgpt/package.nix
@@ -2,7 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
-  libX11,
+  libx11,
 }:
 
 buildGoModule rec {
@@ -18,7 +18,7 @@ buildGoModule rec {
 
   vendorHash = "sha256-Xilu4wzDkwf15LmVH0Pkk91/nDisUu66aPP0JvT4ldo=";
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/th/the-powder-toy/package.nix b/pkgs/by-name/th/the-powder-toy/package.nix
index 8210feeae290..6c88a58767d1 100644
--- a/pkgs/by-name/th/the-powder-toy/package.nix
+++ b/pkgs/by-name/th/the-powder-toy/package.nix
@@ -7,7 +7,7 @@
   jsoncpp,
   lib,
   libpng,
-  libX11,
+  libx11,
   lua5_2,
   luajit,
   meson,
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     fftwFloat
     jsoncpp
     libpng
-    libX11
+    libx11
     lua5_2
     luajit
     SDL2
diff --git a/pkgs/by-name/th/theforceengine/package.nix b/pkgs/by-name/th/theforceengine/package.nix
index 1a9f13363f42..61577649905e 100644
--- a/pkgs/by-name/th/theforceengine/package.nix
+++ b/pkgs/by-name/th/theforceengine/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   SDL2,
   SDL2_image,
-  libX11,
+  libx11,
   rtaudio,
   rtmidi,
   glew,
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     SDL2
     SDL2_image
-    libX11
+    libx11
     rtaudio
     rtmidi
     glew
diff --git a/pkgs/by-name/th/thunar-unwrapped/package.nix b/pkgs/by-name/th/thunar-unwrapped/package.nix
index a417ad65ff47..a8fe92e72800 100644
--- a/pkgs/by-name/th/thunar-unwrapped/package.nix
+++ b/pkgs/by-name/th/thunar-unwrapped/package.nix
@@ -10,7 +10,7 @@
   libexif,
   libgudev,
   libnotify,
-  libX11,
+  libx11,
   libxfce4ui,
   libxfce4util,
   libxslt,
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     xfce4-exo
     gdk-pixbuf
     gtk3
-    libX11
+    libx11
     libexif # image properties page
     libgudev
     libnotify
diff --git a/pkgs/by-name/ti/tic-80/package.nix b/pkgs/by-name/ti/tic-80/package.nix
index 1c9cf9c3184c..76d7382ec097 100644
--- a/pkgs/by-name/ti/tic-80/package.nix
+++ b/pkgs/by-name/ti/tic-80/package.nix
@@ -10,7 +10,7 @@
   kubazip,
   libGL,
   libGLU,
-  libX11,
+  libx11,
   janet,
   lua5_3_compat,
   quickjs,
@@ -94,7 +94,7 @@ stdenv.mkDerivation {
     kubazip
     libGL
     libGLU
-    libX11
+    libx11
     janet
     (lua5_3_compat.withPackages (ps: [ ps.fennel ]))
     quickjs
diff --git a/pkgs/by-name/ti/tidal-hifi/package.nix b/pkgs/by-name/ti/tidal-hifi/package.nix
index b736f01cf8c3..f2a73b57b1b9 100644
--- a/pkgs/by-name/ti/tidal-hifi/package.nix
+++ b/pkgs/by-name/ti/tidal-hifi/package.nix
@@ -26,13 +26,13 @@
   gdk-pixbuf,
   nss,
   nspr,
-  libX11,
+  libx11,
   libxcb,
-  libXcomposite,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXrandr,
+  libxcomposite,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxrandr,
   libxkbfile,
   pango,
   systemd,
@@ -62,13 +62,13 @@ let
     gtk4
     nss
     nspr
-    libX11
+    libx11
     libxcb
-    libXcomposite
-    libXdamage
-    libXext
-    libXfixes
-    libXrandr
+    libxcomposite
+    libxdamage
+    libxext
+    libxfixes
+    libxrandr
     libxkbfile
     pango
     pciutils
@@ -87,7 +87,7 @@ let
     vulkan-loader
   ];
 in
-buildNpmPackage (self: {
+buildNpmPackage (finalAttrs: {
   pname = "tidal-hifi";
   inherit version;
 
@@ -125,12 +125,12 @@ buildNpmPackage (self: {
 
   desktopItems = [
     (makeDesktopItem {
-      name = self.pname;
+      name = finalAttrs.pname;
       desktopName = "TIDAL Hi-Fi";
       genericName = "Music Player";
-      comment = self.meta.description;
+      comment = finalAttrs.meta.description;
       icon = "tidal-hifi";
-      exec = self.meta.mainProgram;
+      exec = finalAttrs.meta.mainProgram;
       terminal = false;
       mimeTypes = [ "x-scheme-handler/tidal" ];
       categories = [
diff --git a/pkgs/by-name/ti/tideways-daemon/package.nix b/pkgs/by-name/ti/tideways-daemon/package.nix
index b8c8ea395b34..1b8a82c2940a 100644
--- a/pkgs/by-name/ti/tideways-daemon/package.nix
+++ b/pkgs/by-name/ti/tideways-daemon/package.nix
@@ -10,7 +10,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tideways-daemon";
-  version = "1.12.2";
+  version = "1.13.0";
 
   src =
     finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}
@@ -28,15 +28,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     sources = {
       "x86_64-linux" = fetchurl {
         url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-kSj65fZKcOwxnMMC6GZvoXhfHqeMGHJqiXnxyiktVf4=";
+        hash = "sha256-K2CnKoQwfe1pJ8bfJOFt/OvKqRzZ3gMU2UdOSboIKtY=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-STtg/CUrawQQCJSzp3ugx9eJ0gtBB+2EkQeSHJbOoAc=";
+        hash = "sha256-DpLa7w5iVB96jVJkBlmMR2RbeDxggErvdOoKoilXLyQ=";
       };
       "aarch64-darwin" = fetchurl {
         url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-1aPDdPUejrjG6z+PN3y5yCZi/yFKnxX5DR9yJdSD0n0=";
+        hash = "sha256-7kpgId/ok2R2Z2hOstr2fp1cOATbbb3nPWz+ELyQAe8=";
       };
     };
     updateScript = "${
diff --git a/pkgs/by-name/ti/time12/package.nix b/pkgs/by-name/ti/time12/package.nix
index e6f067ea2bb4..d8de9cb1b581 100644
--- a/pkgs/by-name/ti/time12/package.nix
+++ b/pkgs/by-name/ti/time12/package.nix
@@ -7,14 +7,14 @@
   alsa-lib,
   fontconfig,
   freetype,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXdmcp,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXtst,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxdmcp,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxtst,
   writableTmpDirAsHomeHook,
 
   buildVST3 ? true,
@@ -45,14 +45,14 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.isLinux [
     alsa-lib
-    libX11
-    libXcomposite
-    libXcursor
-    libXdmcp
-    libXext
-    libXinerama
-    libXrandr
-    libXtst
+    libx11
+    libxcomposite
+    libxcursor
+    libxdmcp
+    libxext
+    libxinerama
+    libxrandr
+    libxtst
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/ti/tint2/package.nix b/pkgs/by-name/ti/tint2/package.nix
index 127f53c1c5e2..448b92660f53 100644
--- a/pkgs/by-name/ti/tint2/package.nix
+++ b/pkgs/by-name/ti/tint2/package.nix
@@ -11,15 +11,15 @@
   glib,
   imlib2,
   gtk3,
-  libXinerama,
-  libXrender,
-  libXcomposite,
-  libXdamage,
-  libX11,
-  libXrandr,
+  libxinerama,
+  libxrender,
+  libxcomposite,
+  libxdamage,
+  libx11,
+  libxrandr,
   librsvg,
   libpthread-stubs,
-  libXdmcp,
+  libxdmcp,
   libstartup_notification,
   wrapGAppsHook3,
   versionCheckHook,
@@ -64,15 +64,15 @@ stdenv.mkDerivation rec {
     glib
     imlib2
     gtk3
-    libXinerama
-    libXrender
-    libXcomposite
-    libXdamage
-    libX11
-    libXrandr
+    libxinerama
+    libxrender
+    libxcomposite
+    libxdamage
+    libx11
+    libxrandr
     librsvg
     libpthread-stubs
-    libXdmcp
+    libxdmcp
     libstartup_notification
   ];
 
diff --git a/pkgs/by-name/ti/tinywm/package.nix b/pkgs/by-name/ti/tinywm/package.nix
index 08a2003c5995..845168daa3b6 100644
--- a/pkgs/by-name/ti/tinywm/package.nix
+++ b/pkgs/by-name/ti/tinywm/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-q2DEMTxIp/nwTBTGEZMHEAqQs99iJwQgimHS0YQj+eg=";
   };
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   strictDeps = true;
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildPhase = ''
     runHook preBuild
 
-    $CC -Wall -pedantic -I${libX11}/include tinywm.c -L${libX11}/lib -lX11 -o tinywm
+    $CC -Wall -pedantic -I${libx11}/include tinywm.c -L${libx11}/lib -lX11 -o tinywm
 
     runHook postBuild
   '';
@@ -61,6 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.publicDomain;
     mainProgram = "tinywm";
     maintainers = [ ];
-    inherit (libX11.meta) platforms;
+    inherit (libx11.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/tk/tkmm/package.nix b/pkgs/by-name/tk/tkmm/package.nix
index 83da8700efbb..ad63808190fb 100644
--- a/pkgs/by-name/tk/tkmm/package.nix
+++ b/pkgs/by-name/tk/tkmm/package.nix
@@ -5,15 +5,15 @@
   dotnetCorePackages,
   makeDesktopItem,
   copyDesktopItems,
-  libX11,
+  libx11,
   glew,
   libGL,
   libice,
   libsm,
-  libXcursor,
-  libXext,
-  libXi,
-  libXrandr,
+  libxcursor,
+  libxext,
+  libxi,
+  libxrandr,
 }:
 buildDotnetModule (finalAttrs: {
   pname = "Tkmm";
@@ -47,15 +47,15 @@ buildDotnetModule (finalAttrs: {
 
   runtimeDeps = [
     # Avalonia UI
-    libX11
+    libx11
     libGL
     glew
     libice
     libsm
-    libXcursor
-    libXext
-    libXi
-    libXrandr
+    libxcursor
+    libxext
+    libxi
+    libxrandr
   ];
 
   enableParallelBuilding = false;
diff --git a/pkgs/by-name/tl/tlaplus-toolbox/package.nix b/pkgs/by-name/tl/tlaplus-toolbox/package.nix
index 35fe2d8ab99d..91c37dbb1f8a 100644
--- a/pkgs/by-name/tl/tlaplus-toolbox/package.nix
+++ b/pkgs/by-name/tl/tlaplus-toolbox/package.nix
@@ -5,7 +5,7 @@
   makeDesktopItem,
   stdenv,
   gtk3,
-  libXtst,
+  libxtst,
   glib,
   zlib,
   wrapGAppsHook3,
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
       --prefix LD_LIBRARY_PATH : "${
         lib.makeLibraryPath [
           gtk3
-          libXtst
+          libxtst
           glib
           zlib
         ]
diff --git a/pkgs/by-name/tl/tlclient/package.nix b/pkgs/by-name/tl/tlclient/package.nix
index c6c8ec39864f..489fefcee246 100644
--- a/pkgs/by-name/tl/tlclient/package.nix
+++ b/pkgs/by-name/tl/tlclient/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   autoPatchelfHook,
   alsa-lib,
-  libX11,
+  libx11,
   pcsclite,
   testers,
 }:
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     alsa-lib
-    libX11
+    libx11
     pcsclite
   ];
 
diff --git a/pkgs/by-name/tm/tm/package.nix b/pkgs/by-name/tm/tm/package.nix
index c181cddd6f81..740e6e175892 100644
--- a/pkgs/by-name/tm/tm/package.nix
+++ b/pkgs/by-name/tm/tm/package.nix
@@ -4,12 +4,12 @@
   fetchurl,
 }:
 
-stdenv.mkDerivation (finalAtts: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "tm";
   version = "0.4.1";
 
   src = fetchurl {
-    url = "https://vicerveza.homeunix.net/~viric/soft/tm/tm-${finalAtts.version}.tar.gz";
+    url = "https://vicerveza.homeunix.net/~viric/soft/tm/tm-${finalAttrs.version}.tar.gz";
     hash = "sha256-OzibwDtpZK1f+lejRLiR/bz3ybJgSt2nI6hj+DZXxKA=";
   };
 
diff --git a/pkgs/by-name/to/todesk/package.nix b/pkgs/by-name/to/todesk/package.nix
index fdd21d78e122..af90b505eaae 100644
--- a/pkgs/by-name/to/todesk/package.nix
+++ b/pkgs/by-name/to/todesk/package.nix
@@ -11,23 +11,23 @@
   systemdMinimal,
   glib,
   pulseaudio,
-  libXext,
-  libX11,
-  libXrandr,
+  libxext,
+  libx11,
+  libxrandr,
   glibc,
   cairo,
   libva,
   libdrm,
   coreutils,
-  libXi,
+  libxi,
   libGL,
   bash,
-  libXcomposite,
-  libXdamage,
-  libXfixes,
-  libXtst,
+  libxcomposite,
+  libxdamage,
+  libxfixes,
+  libxtst,
   nss,
-  libXxf86vm,
+  libxxf86vm,
   gtk3,
   gdk-pixbuf,
   pango,
@@ -78,26 +78,26 @@ buildFHSEnv {
     pulseaudio
     nspr
     kmod
-    libXi
+    libxi
     systemdMinimal
     glib
     libz
     bash
     coreutils
-    libX11
-    libXext
-    libXrandr
+    libx11
+    libxext
+    libxrandr
     glibc
     libdrm
     libGL
     procps
     cairo
-    libXcomposite
-    libXdamage
-    libXfixes
-    libXtst
+    libxcomposite
+    libxdamage
+    libxfixes
+    libxtst
     nss
-    libXxf86vm
+    libxxf86vm
     gtk3
     gdk-pixbuf
     pango
diff --git a/pkgs/by-name/to/todoman/package.nix b/pkgs/by-name/to/todoman/package.nix
index f6cad8f38a0c..a2e5ae15c3f2 100644
--- a/pkgs/by-name/to/todoman/package.nix
+++ b/pkgs/by-name/to/todoman/package.nix
@@ -90,6 +90,8 @@ python3.pkgs.buildPythonApplication rec {
     "test_xdg_existant"
     # Tests are sensitive to performance
     "test_sorting_fields"
+    # Test fails with urwid 3.0.4, but should work with 3.0.5 again
+    "test_todo_editor_list"
   ];
 
   pythonImportsCheck = [
diff --git a/pkgs/by-name/to/tombi/package.nix b/pkgs/by-name/to/tombi/package.nix
index 2385f26bd20b..f9e3f494b503 100644
--- a/pkgs/by-name/to/tombi/package.nix
+++ b/pkgs/by-name/to/tombi/package.nix
@@ -9,19 +9,19 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tombi";
-  version = "0.7.25";
+  version = "0.7.27";
 
   src = fetchFromGitHub {
     owner = "tombi-toml";
     repo = "tombi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tZBQE1hyKF4osDQIiqwpnhT9dxDxCPrvrOhn+Yhr86w=";
+    hash = "sha256-5rRHaeUBbhYSZ6Fi6l330SLtpoqxTGErpVUxsaeeWug=";
   };
 
   # Tests relies on the presence of network
   doCheck = false;
   cargoBuildFlags = [ "--package tombi-cli" ];
-  cargoHash = "sha256-+Gs9+vAbYzbz/wcNApcxXahwdzCZay+vdJhFFGT5gjI=";
+  cargoHash = "sha256-B5af/Y8ysJ1NTOSsstAR9jS3k7hDbL7vcv+oNwy3HZU=";
 
   postPatch = ''
     substituteInPlace Cargo.toml \
diff --git a/pkgs/by-name/to/tome2/package.nix b/pkgs/by-name/to/tome2/package.nix
index 6686399c3d71..4b2ce79a258b 100644
--- a/pkgs/by-name/to/tome2/package.nix
+++ b/pkgs/by-name/to/tome2/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   makeDesktopItem,
   ncurses,
-  libX11,
+  libx11,
   boost,
   cmake,
 }:
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     ncurses
-    libX11
+    libx11
     boost
   ];
 
diff --git a/pkgs/by-name/to/tonelib-gfx/package.nix b/pkgs/by-name/to/tonelib-gfx/package.nix
index cdd5f2ed209f..75034309006b 100644
--- a/pkgs/by-name/to/tonelib-gfx/package.nix
+++ b/pkgs/by-name/to/tonelib-gfx/package.nix
@@ -8,10 +8,10 @@
   freetype,
   libglvnd,
   curl,
-  libXcursor,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libxcursor,
+  libxinerama,
+  libxrandr,
+  libxrender,
   libjack2,
 }:
 
@@ -49,10 +49,10 @@ stdenv.mkDerivation rec {
 
   runtimeDependencies = map lib.getLib [
     curl
-    libXcursor
-    libXinerama
-    libXrandr
-    libXrender
+    libxcursor
+    libxinerama
+    libxrandr
+    libxrender
     libjack2
   ];
 
diff --git a/pkgs/by-name/to/tonelib-jam/package.nix b/pkgs/by-name/to/tonelib-jam/package.nix
index d7b808e2ed81..5aad3d79c0f8 100644
--- a/pkgs/by-name/to/tonelib-jam/package.nix
+++ b/pkgs/by-name/to/tonelib-jam/package.nix
@@ -8,10 +8,10 @@
   freetype,
   libglvnd,
   curl,
-  libXcursor,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libxcursor,
+  libxinerama,
+  libxrandr,
+  libxrender,
   libjack2,
 }:
 
@@ -39,10 +39,10 @@ stdenv.mkDerivation rec {
 
   runtimeDependencies = map lib.getLib [
     curl
-    libXcursor
-    libXinerama
-    libXrandr
-    libXrender
+    libxcursor
+    libxinerama
+    libxrandr
+    libxrender
     libjack2
   ];
 
diff --git a/pkgs/by-name/to/tonelib-metal/package.nix b/pkgs/by-name/to/tonelib-metal/package.nix
index 981774091780..f61ec3a94142 100644
--- a/pkgs/by-name/to/tonelib-metal/package.nix
+++ b/pkgs/by-name/to/tonelib-metal/package.nix
@@ -9,10 +9,10 @@
   libglvnd,
   libgbm,
   curl,
-  libXcursor,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libxcursor,
+  libxinerama,
+  libxrandr,
+  libxrender,
   libjack2,
 }:
 stdenv.mkDerivation rec {
@@ -31,10 +31,10 @@ stdenv.mkDerivation rec {
 
   runtimeDependencies = map lib.getLib [
     curl
-    libXcursor
-    libXinerama
-    libXrandr
-    libXrender
+    libxcursor
+    libxinerama
+    libxrandr
+    libxrender
     libjack2
   ];
 
diff --git a/pkgs/by-name/to/tonelib-noisereducer/package.nix b/pkgs/by-name/to/tonelib-noisereducer/package.nix
index fc82137a34ad..2cf2a2ec67d7 100644
--- a/pkgs/by-name/to/tonelib-noisereducer/package.nix
+++ b/pkgs/by-name/to/tonelib-noisereducer/package.nix
@@ -9,10 +9,10 @@
   libglvnd,
   libgbm,
   curl,
-  libXcursor,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libxcursor,
+  libxinerama,
+  libxrandr,
+  libxrender,
   libjack2,
 }:
 stdenv.mkDerivation rec {
@@ -31,10 +31,10 @@ stdenv.mkDerivation rec {
 
   runtimeDependencies = map lib.getLib [
     curl
-    libXcursor
-    libXinerama
-    libXrandr
-    libXrender
+    libxcursor
+    libxinerama
+    libxrandr
+    libxrender
     libjack2
   ];
 
diff --git a/pkgs/by-name/to/tonelib-zoom/package.nix b/pkgs/by-name/to/tonelib-zoom/package.nix
index 69adb3fc012b..0779842bc772 100644
--- a/pkgs/by-name/to/tonelib-zoom/package.nix
+++ b/pkgs/by-name/to/tonelib-zoom/package.nix
@@ -8,10 +8,10 @@
   freetype,
   libglvnd,
   curl,
-  libXcursor,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libxcursor,
+  libxinerama,
+  libxrandr,
+  libxrender,
   libjack2,
 }:
 
@@ -40,10 +40,10 @@ stdenv.mkDerivation rec {
 
   runtimeDependencies = map lib.getLib [
     curl
-    libXcursor
-    libXinerama
-    libXrandr
-    libXrender
+    libxcursor
+    libxinerama
+    libxrandr
+    libxrender
     libjack2
   ];
 
diff --git a/pkgs/by-name/to/tony/package.nix b/pkgs/by-name/to/tony/package.nix
index c09b1809b988..ac7910d332f2 100644
--- a/pkgs/by-name/to/tony/package.nix
+++ b/pkgs/by-name/to/tony/package.nix
@@ -9,7 +9,7 @@
   bzip2,
   fftw,
   fftwFloat,
-  libX11,
+  libx11,
   libfishsound,
   libid3tag,
   libjack2,
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     bzip2
     fftw
     fftwFloat
-    libX11
+    libx11
     libfishsound
     libid3tag
     libjack2
diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix
index 2f986a00db31..1bd0c40c4688 100644
--- a/pkgs/by-name/to/tor-browser/package.nix
+++ b/pkgs/by-name/to/tor-browser/package.nix
@@ -21,11 +21,11 @@
   glib,
   gtk3,
   libxcb,
-  libX11,
-  libXext,
-  libXrender,
-  libXt,
-  libXtst,
+  libx11,
+  libxext,
+  libxrender,
+  libxt,
+  libxtst,
   libgbm,
   pango,
   pciutils,
@@ -78,11 +78,11 @@ let
       glib
       gtk3
       libxcb
-      libX11
-      libXext
-      libXrender
-      libXt
-      libXtst
+      libx11
+      libxext
+      libxrender
+      libxt
+      libxtst
       libgbm
       pango
       pciutils
@@ -162,7 +162,7 @@ stdenv.mkDerivation rec {
     gtk3
     alsa-lib
     dbus-glib
-    libXtst
+    libxtst
   ];
 
   # Firefox uses "relrhack" to manually process relocations from a fixed offset
diff --git a/pkgs/by-name/to/torcs/without-data.nix b/pkgs/by-name/to/torcs/without-data.nix
index 05634a1b7d71..fc33dbc6b556 100644
--- a/pkgs/by-name/to/torcs/without-data.nix
+++ b/pkgs/by-name/to/torcs/without-data.nix
@@ -5,19 +5,19 @@
   stdenv,
   libGLU,
   libglut,
-  libX11,
+  libx11,
   plib,
   openal,
   freealut,
-  libXrandr,
+  libxrandr,
   xorgproto,
-  libXext,
+  libxext,
   libsm,
   libice,
-  libXi,
-  libXt,
-  libXrender,
-  libXxf86vm,
+  libxi,
+  libxt,
+  libxrender,
+  libxxf86vm,
   libvorbis,
   libpng,
   zlib,
@@ -46,19 +46,19 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libGLU
     libglut
-    libX11
+    libx11
     plib
     openal
     freealut
-    libXrandr
+    libxrandr
     xorgproto
-    libXext
+    libxext
     libsm
     libice
-    libXi
-    libXt
-    libXrender
-    libXxf86vm
+    libxi
+    libxt
+    libxrender
+    libxxf86vm
     libpng
     zlib
     libvorbis
diff --git a/pkgs/by-name/to/touchosc/package.nix b/pkgs/by-name/to/touchosc/package.nix
index 6844b75d4341..1388e616bf40 100644
--- a/pkgs/by-name/to/touchosc/package.nix
+++ b/pkgs/by-name/to/touchosc/package.nix
@@ -10,14 +10,14 @@
   avahi,
   jack2,
   libxcb,
-  libX11,
-  libXcursor,
-  libXext,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXrender,
-  libXxf86vm,
+  libx11,
+  libxcursor,
+  libxext,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxrender,
+  libxxf86vm,
   libglvnd,
   zenity,
 }:
@@ -28,14 +28,14 @@ let
     avahi
     jack2
     libxcb
-    libX11
-    libXcursor
-    libXext
-    libXi
-    libXinerama
-    libXrandr
-    libXrender
-    libXxf86vm
+    libx11
+    libxcursor
+    libxext
+    libxi
+    libxinerama
+    libxrandr
+    libxrender
+    libxxf86vm
     libglvnd
   ];
 
diff --git a/pkgs/by-name/tr/transcribe/package.nix b/pkgs/by-name/tr/transcribe/package.nix
index ae8f70a66568..c891adb4768e 100644
--- a/pkgs/by-name/tr/transcribe/package.nix
+++ b/pkgs/by-name/tr/transcribe/package.nix
@@ -14,8 +14,8 @@
   gst_all_1,
   gtk3,
   libsm,
-  libX11,
-  libXtst,
+  libx11,
+  libxtst,
   libpng12,
   pango,
   zlib,
@@ -61,8 +61,8 @@ stdenv.mkDerivation rec {
       cairo
       gdk-pixbuf
       alsa-lib
-      libX11
-      libXtst
+      libx11
+      libxtst
       libsm
       libpng12
       gstreamer
diff --git a/pkgs/by-name/tr/transgui/package.nix b/pkgs/by-name/tr/transgui/package.nix
index d2dfc2078473..706d43f47009 100644
--- a/pkgs/by-name/tr/transgui/package.nix
+++ b/pkgs/by-name/tr/transgui/package.nix
@@ -7,7 +7,7 @@
   unzip,
   fpc,
   lazarus,
-  libX11,
+  libx11,
   glib,
   gtk2,
   gdk-pixbuf,
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     fpc
     lazarus
     stdenv.cc
-    libX11
+    libx11
     glib
     gtk2
     gdk-pixbuf
diff --git a/pkgs/by-name/tr/trexio/package.nix b/pkgs/by-name/tr/trexio/package.nix
index 6e052a59e1d2..aecda09b5085 100644
--- a/pkgs/by-name/tr/trexio/package.nix
+++ b/pkgs/by-name/tr/trexio/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "trexio";
-  version = "2.6.0";
+  version = "2.6.1";
 
   src = fetchFromGitHub {
     owner = "TREX-CoE";
     repo = "trexio";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-mTn/46oIvBbv7X0QwDxXQJH3QyH34u487QpLferC2Uc=";
+    hash = "sha256-iESt7dXta/Enpgb418js26y5+YvROsqgxvNhgAgXd/I=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/tr/trigger-control/package.nix b/pkgs/by-name/tr/trigger-control/package.nix
index 55ab0b1ddbd8..ec8ab7133de1 100644
--- a/pkgs/by-name/tr/trigger-control/package.nix
+++ b/pkgs/by-name/tr/trigger-control/package.nix
@@ -6,7 +6,7 @@
   makeWrapper,
   pkg-config,
   SDL2,
-  libX11,
+  libx11,
   dbus,
   libdecor,
   libnotify,
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     SDL2
-    libX11
+    libx11
     dbus
     libnotify
   ]
diff --git a/pkgs/by-name/tr/troubadix/package.nix b/pkgs/by-name/tr/troubadix/package.nix
index 1515f9a33a35..22b58f463213 100644
--- a/pkgs/by-name/tr/troubadix/package.nix
+++ b/pkgs/by-name/tr/troubadix/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "troubadix";
-  version = "26.1.0";
+  version = "26.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "troubadix";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FWauAvySks536KFdU/4X6ru2zr2nwIWzlfOG9OpZ9m4=";
+    hash = "sha256-FtpgilCPVnT3rswv2yHE9TGhC1ZC8YOjvwNmPM2MXlI=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/by-name/tt/ttdl/package.nix b/pkgs/by-name/tt/ttdl/package.nix
index 9018722956c7..e022f493705d 100644
--- a/pkgs/by-name/tt/ttdl/package.nix
+++ b/pkgs/by-name/tt/ttdl/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ttdl";
-  version = "4.21.0";
+  version = "4.22.0";
 
   src = fetchFromGitHub {
     owner = "VladimirMarkelov";
     repo = "ttdl";
     rev = "v${version}";
-    sha256 = "sha256-nRb3GHE+PTEkJ9WaMC6oCHlfLwLPzwfmOC3cEy2gCJY=";
+    sha256 = "sha256-7JOeLv4iswVZe0FYpIjMO8p+a4EIoA6n+anT8Imfg1w=";
   };
 
-  cargoHash = "sha256-fN396X7RVgmO/akzDCOkylnFvzfabR+gHBUAggo4IwY=";
+  cargoHash = "sha256-x235LDtqy8stKYYaPOcpgo7YDTOh2drIp91m8q4PFI8=";
 
   meta = {
     description = "CLI tool to manage todo lists in todo.txt format";
diff --git a/pkgs/by-name/tu/tunefish/package.nix b/pkgs/by-name/tu/tunefish/package.nix
index e3bb1b9fd606..f3144615ac35 100644
--- a/pkgs/by-name/tu/tunefish/package.nix
+++ b/pkgs/by-name/tu/tunefish/package.nix
@@ -8,11 +8,11 @@
   curl,
   freetype,
   libGL,
-  libX11,
-  libXcursor,
-  libXext,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxext,
+  libxinerama,
+  libxrandr,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -39,11 +39,11 @@ stdenv.mkDerivation (finalAttrs: {
     curl
     freetype
     libGL
-    libX11
-    libXcursor
-    libXext
-    libXinerama
-    libXrandr
+    libx11
+    libxcursor
+    libxext
+    libxinerama
+    libxrandr
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix b/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix
index 8e768064b786..40acfecf6688 100644
--- a/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix
+++ b/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix
@@ -1,8 +1,8 @@
 {
   stdenv,
   boost,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   linuxPackages,
   openssl,
   tuxclocker-plugins,
@@ -20,8 +20,8 @@ stdenv.mkDerivation {
 
   buildInputs = [
     boost
-    libX11
-    libXext
+    libx11
+    libxext
     linuxPackages.nvidia_x11
     linuxPackages.nvidia_x11.settings.libXNVCtrl
     openssl
diff --git a/pkgs/by-name/tz/tzpfms/package.nix b/pkgs/by-name/tz/tzpfms/package.nix
index 43461f674b3a..2367c855b671 100644
--- a/pkgs/by-name/tz/tzpfms/package.nix
+++ b/pkgs/by-name/tz/tzpfms/package.nix
@@ -15,19 +15,19 @@
   zlib,
 }:
 
-stdenv.mkDerivation (finalPackage: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "tzpfms";
   version = "0.4.1";
 
   src = fetchFromSourcehut {
     owner = "~nabijaczleweli";
     repo = "tzpfms";
-    rev = "v${finalPackage.version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-DHmJpfURyFPeOWxIkfwn4f0n2WeDYErevC1gY2oM3Vg=";
   };
 
   env = {
-    TZPFMS_VERSION = ''"${finalPackage.version}"'';
+    TZPFMS_VERSION = ''"${finalAttrs.version}"'';
     TZPFMS_DATE = "January 1, 1980";
   };
 
diff --git a/pkgs/by-name/ud/udig/package.nix b/pkgs/by-name/ud/udig/package.nix
index 11986834ee11..08ed305dd5fe 100644
--- a/pkgs/by-name/ud/udig/package.nix
+++ b/pkgs/by-name/ud/udig/package.nix
@@ -5,7 +5,7 @@
   unzip,
   makeWrapper,
   jre8,
-  libXtst,
+  libxtst,
   gdal,
 }:
 let
@@ -58,7 +58,7 @@ let
         --prefix PATH : ${jre8}/bin \
         --prefix LD_LIBRARY_PATH : ${
           lib.makeLibraryPath [
-            libXtst
+            libxtst
             gdal
           ]
         }
diff --git a/pkgs/by-name/ue/ueviewer/package.nix b/pkgs/by-name/ue/ueviewer/package.nix
index 4c2e0c29a6bf..c322b91254b6 100644
--- a/pkgs/by-name/ue/ueviewer/package.nix
+++ b/pkgs/by-name/ue/ueviewer/package.nix
@@ -6,7 +6,7 @@
   unstableGitUpdater,
   libGL,
   libpng,
-  libX11,
+  libx11,
   perl,
   SDL2,
   zlib,
@@ -64,7 +64,7 @@ gccStdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals (!gccStdenv.hostPlatform.isDarwin) [
     libGL
-    libX11
+    libx11
     SDL2
   ];
 
diff --git a/pkgs/by-name/uh/uhhyou-plugins-juce/package.nix b/pkgs/by-name/uh/uhhyou-plugins-juce/package.nix
index 57539ddbc467..5474f2b31caf 100644
--- a/pkgs/by-name/uh/uhhyou-plugins-juce/package.nix
+++ b/pkgs/by-name/uh/uhhyou-plugins-juce/package.nix
@@ -6,10 +6,10 @@
   freetype,
   lib,
   libGL,
-  libXcursor,
-  libXext,
-  libXinerama,
-  libXrandr,
+  libxcursor,
+  libxext,
+  libxinerama,
+  libxrandr,
   libjack2,
   pkg-config,
   stdenv,
@@ -33,10 +33,10 @@ stdenv.mkDerivation (finalAttrs: {
     curl
     freetype
     libGL
-    libXcursor
-    libXext
-    libXinerama
-    libXrandr
+    libxcursor
+    libxext
+    libxinerama
+    libxrandr
     libjack2
   ];
 
diff --git a/pkgs/by-name/uh/uhhyou-plugins/package.nix b/pkgs/by-name/uh/uhhyou-plugins/package.nix
index fbc7aa820fe3..ec5c3cd23faa 100644
--- a/pkgs/by-name/uh/uhhyou-plugins/package.nix
+++ b/pkgs/by-name/uh/uhhyou-plugins/package.nix
@@ -13,10 +13,10 @@
   libxcb-cursor,
   libxcb-keysyms,
   libxkbcommon,
-  libX11,
-  libXrandr,
-  libXinerama,
-  libXcursor,
+  libx11,
+  libxrandr,
+  libxinerama,
+  libxcursor,
   pango,
   gtkmm3,
   sqlite,
@@ -48,10 +48,10 @@ stdenv.mkDerivation (finalAttrs: {
     libxcb-cursor
     libxcb-keysyms
     libxkbcommon
-    libX11
-    libXrandr
-    libXinerama
-    libXcursor
+    libx11
+    libxrandr
+    libxinerama
+    libxcursor
     pango
     gtkmm3
     sqlite
diff --git a/pkgs/by-name/ui/uiua/stable.nix b/pkgs/by-name/ui/uiua/stable.nix
index 19917703bed0..4d20fce4691d 100644
--- a/pkgs/by-name/ui/uiua/stable.nix
+++ b/pkgs/by-name/ui/uiua/stable.nix
@@ -1,7 +1,7 @@
 rec {
-  version = "0.17.3";
+  version = "0.18.0";
   tag = version;
-  hash = "sha256-TiJAj+wBVb8Z9pnoscF65tB7flbk/XWW+7XrHlvIHeo=";
-  cargoHash = "sha256-smonKftOpGXy0WxI8Qqr0rTeI/pW6f+G4TxzoaEMsuc=";
+  hash = "sha256-049fEvLiRK2QfX6W0zCuL2QNACkBn0HmuGYjUGAWR1M=";
+  cargoHash = "sha256-rGWMhghlYaUupn2vqDxBEezgENH4GCXlf2RU3iRrmxo=";
   updateScript = ./update-stable.sh;
 }
diff --git a/pkgs/by-name/ui/uiua/unstable.nix b/pkgs/by-name/ui/uiua/unstable.nix
index 531b52fbd5d7..ce655cd5b93f 100644
--- a/pkgs/by-name/ui/uiua/unstable.nix
+++ b/pkgs/by-name/ui/uiua/unstable.nix
@@ -1,7 +1,7 @@
 rec {
-  version = "0.18.0-dev.4";
+  version = "0.18.0";
   tag = version;
-  hash = "sha256-/uM92x0jBgfbkBY5/NFPBDHgH+caISEtJiiXAFQj61A=";
-  cargoHash = "sha256-MsoLvwFlVBJnbWMA8Z7wCjQKJ9VHYhAV1HpNVmM+MEo=";
+  hash = "sha256-049fEvLiRK2QfX6W0zCuL2QNACkBn0HmuGYjUGAWR1M=";
+  cargoHash = "sha256-rGWMhghlYaUupn2vqDxBEezgENH4GCXlf2RU3iRrmxo=";
   updateScript = ./update-unstable.sh;
 }
diff --git a/pkgs/by-name/ui/uiua386/package.nix b/pkgs/by-name/ui/uiua386/package.nix
index f06d10f15635..56194ea1f892 100644
--- a/pkgs/by-name/ui/uiua386/package.nix
+++ b/pkgs/by-name/ui/uiua386/package.nix
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation {
   installPhase = ''
     runHook preInstall
 
-    install -Dm444 -t $out/share/fonts/truetype ./src/algorithm/Uiua386.ttf
+    install -Dm444 -t $out/share/fonts/truetype ./src/assets/Uiua386.ttf
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/ul/ulauncher/package.nix b/pkgs/by-name/ul/ulauncher/package.nix
index 921dbea50b16..8c1f67546f3f 100644
--- a/pkgs/by-name/ul/ulauncher/package.nix
+++ b/pkgs/by-name/ul/ulauncher/package.nix
@@ -18,7 +18,7 @@
   wmctrl,
   xvfb-run,
   librsvg,
-  libX11,
+  libx11,
   copyDesktopItems,
   makeDesktopItem,
 }:
@@ -123,7 +123,7 @@ python3Packages.buildPythonApplication rec {
     makeWrapperArgs+=(
      "''${gappsWrapperArgs[@]}"
      --prefix PATH : "${lib.makeBinPath [ wmctrl ]}"
-     --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libX11 ]}"
+     --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libx11 ]}"
      --prefix WEBKIT_DISABLE_COMPOSITING_MODE : "1"
     )
   '';
diff --git a/pkgs/by-name/ul/ultrastardx/package.nix b/pkgs/by-name/ul/ultrastardx/package.nix
index e0a1510b44c0..be8907a107e4 100644
--- a/pkgs/by-name/ul/ultrastardx/package.nix
+++ b/pkgs/by-name/ul/ultrastardx/package.nix
@@ -18,7 +18,7 @@
   ffmpeg,
   sqlite,
   zlib,
-  libX11,
+  libx11,
   libGLU,
   libGL,
 }:
@@ -36,7 +36,7 @@ let
     sqlite
     lua
     zlib
-    libX11
+    libx11
     libGLU
     libGL
     ffmpeg
diff --git a/pkgs/by-name/un/unciv/package.nix b/pkgs/by-name/un/unciv/package.nix
index 5c7fa33bb892..e99dd893ee80 100644
--- a/pkgs/by-name/un/unciv/package.nix
+++ b/pkgs/by-name/un/unciv/package.nix
@@ -8,11 +8,11 @@
   jre,
   libGL,
   libpulseaudio,
-  libXxf86vm,
+  libxxf86vm,
   nix-update-script,
 }:
 let
-  version = "4.19.10";
+  version = "4.19.11";
 
   desktopItem = makeDesktopItem {
     name = "unciv";
@@ -32,7 +32,7 @@ let
     lib.optionals stdenv.hostPlatform.isLinux [
       libGL
       libpulseaudio
-      libXxf86vm
+      libxxf86vm
     ]
   );
 in
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
-    hash = "sha256-4y1tsAyomjygJ+DwcCAG8fiEIljVm159qU/Y+kfkShc=";
+    hash = "sha256-GLIgiCx+bpBWKi+IewXUNIG6SDAKNvAjGie1XmFzF04=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/by-name/un/unclutter-xfixes/package.nix b/pkgs/by-name/un/unclutter-xfixes/package.nix
index a05c5f73e6a8..7d8940ef8154 100644
--- a/pkgs/by-name/un/unclutter-xfixes/package.nix
+++ b/pkgs/by-name/un/unclutter-xfixes/package.nix
@@ -3,10 +3,10 @@
   stdenv,
   fetchFromGitHub,
   libev,
-  libX11,
-  libXext,
-  libXi,
-  libXfixes,
+  libx11,
+  libxext,
+  libxi,
+  libxfixes,
   pkg-config,
   asciidoc,
   libxslt,
@@ -34,10 +34,10 @@ stdenv.mkDerivation {
   ];
   buildInputs = [
     libev
-    libX11
-    libXext
-    libXi
-    libXfixes
+    libx11
+    libxext
+    libxi
+    libxfixes
   ];
 
   prePatch = ''
diff --git a/pkgs/by-name/un/unclutter/package.nix b/pkgs/by-name/un/unclutter/package.nix
index e7e477233c6e..ec40a9a34201 100644
--- a/pkgs/by-name/un/unclutter/package.nix
+++ b/pkgs/by-name/un/unclutter/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "33a78949a7dedf2e8669ae7b5b2c72067896497820292c96afaa60bb71d1f2a6";
   };
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   buildFlags = [
     "CC=${stdenv.cc.targetPrefix}cc"
diff --git a/pkgs/by-name/un/unicon-lang/package.nix b/pkgs/by-name/un/unicon-lang/package.nix
index acfa781ad979..2981fe9324c0 100644
--- a/pkgs/by-name/un/unicon-lang/package.nix
+++ b/pkgs/by-name/un/unicon-lang/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  libX11,
+  libx11,
   libxcrypt,
   fetchFromGitHub,
   coreutils,
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     # compression
     zlib
     # graphics
-    libX11
+    libx11
     libjpeg
     libpng
     libxft
diff --git a/pkgs/by-name/un/unigine-heaven/package.nix b/pkgs/by-name/un/unigine-heaven/package.nix
index 86fac20ca258..f423f9a7455c 100644
--- a/pkgs/by-name/un/unigine-heaven/package.nix
+++ b/pkgs/by-name/un/unigine-heaven/package.nix
@@ -3,13 +3,13 @@
   stdenv,
   fetchurl,
   makeWrapper,
-  libX11,
-  libXext,
-  libXrandr,
+  libx11,
+  libxext,
+  libxrandr,
   freetype,
   fontconfig,
-  libXrender,
-  libXinerama,
+  libxrender,
+  libxinerama,
   autoPatchelfHook,
   libglvnd,
   openal,
@@ -81,14 +81,14 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     stdenv.cc.cc
-    libXext
-    libXrandr
+    libxext
+    libxrandr
     freetype
     fontconfig
-    libXrender
-    libXinerama
+    libxrender
+    libxinerama
   ];
 
   dontUnpack = true;
diff --git a/pkgs/by-name/un/unigine-valley/package.nix b/pkgs/by-name/un/unigine-valley/package.nix
index 4fc86d00920d..ceee9a8a9341 100644
--- a/pkgs/by-name/un/unigine-valley/package.nix
+++ b/pkgs/by-name/un/unigine-valley/package.nix
@@ -13,11 +13,11 @@
   # Runtime dependencies
   fontconfig,
   freetype,
-  libX11,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxext,
+  libxinerama,
+  libxrandr,
+  libxrender,
   libglvnd,
   openal,
 }:
@@ -57,11 +57,11 @@ stdenv.mkDerivation rec {
     stdenv.cc.cc # libstdc++.so.6
     fontconfig
     freetype
-    libX11
-    libXext
-    libXinerama
-    libXrandr
-    libXrender
+    libx11
+    libxext
+    libxinerama
+    libxrandr
+    libxrender
     libglvnd
     openal
   ];
diff --git a/pkgs/by-name/un/unityhub/package.nix b/pkgs/by-name/un/unityhub/package.nix
index 1836ab96b8af..8cca1d00f1c2 100644
--- a/pkgs/by-name/un/unityhub/package.nix
+++ b/pkgs/by-name/un/unityhub/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "unityhub";
-  version = "3.15.4";
+  version = "3.16.1";
 
   src = fetchurl {
     url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/UnityHubSetup-${version}-amd64.deb";
-    hash = "sha256-O8rR4gLToJgUe8EsTvsk1AShGAAsgU4cy1+UITXiVm8=";
+    hash = "sha256-C21G9bbm6z/JSPb9zqJRnpqlJB+W3Y33tbEGFZIIlTc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/un/unnamed-sdvx-clone/package.nix b/pkgs/by-name/un/unnamed-sdvx-clone/package.nix
index 5ae151e0cf69..20684058b43f 100644
--- a/pkgs/by-name/un/unnamed-sdvx-clone/package.nix
+++ b/pkgs/by-name/un/unnamed-sdvx-clone/package.nix
@@ -16,7 +16,7 @@
   curl,
   libcpr,
   rapidjson,
-  libX11,
+  libx11,
   libGL,
   writeShellScriptBin,
   makeDesktopItem,
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
     curl
     libcpr
     rapidjson
-    libX11
+    libx11
     libGL
   ];
 
diff --git a/pkgs/by-name/un/unvanquished/package.nix b/pkgs/by-name/un/unvanquished/package.nix
index 509412e7bb7e..5d0df2057ed9 100644
--- a/pkgs/by-name/un/unvanquished/package.nix
+++ b/pkgs/by-name/un/unvanquished/package.nix
@@ -20,7 +20,7 @@
   libpng,
   libvorbis,
   libwebp,
-  libX11,
+  libx11,
   lua5,
   makeDesktopItem,
   ncurses,
@@ -172,7 +172,7 @@ stdenv.mkDerivation rec {
     libvorbis
     libjpeg
     libwebp
-    libX11
+    libx11
     libpng
   ];
 
diff --git a/pkgs/by-name/up/upwork/package.nix b/pkgs/by-name/up/upwork/package.nix
index aaabeb07d765..1c2611612547 100644
--- a/pkgs/by-name/up/upwork/package.nix
+++ b/pkgs/by-name/up/upwork/package.nix
@@ -23,18 +23,18 @@
   libnotify,
   libpulseaudio,
   libuuid,
-  libX11,
+  libx11,
   libxcb,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXScrnSaver,
-  libXtst,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxscrnsaver,
+  libxtst,
   libgbm,
   nspr,
   nss,
@@ -80,18 +80,18 @@ stdenv.mkDerivation rec {
     libdrm
     libnotify
     libuuid
-    libX11
+    libx11
     libxcb
-    libXcomposite
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
-    libXrandr
-    libXrender
-    libXScrnSaver
-    libXtst
+    libxcomposite
+    libxcursor
+    libxdamage
+    libxext
+    libxfixes
+    libxi
+    libxrandr
+    libxrender
+    libxscrnsaver
+    libxtst
     libgbm
     nspr
     nss
diff --git a/pkgs/by-name/ur/urbanterror/package.nix b/pkgs/by-name/ur/urbanterror/package.nix
index c62e29c643ba..bb74f59058c3 100644
--- a/pkgs/by-name/ur/urbanterror/package.nix
+++ b/pkgs/by-name/ur/urbanterror/package.nix
@@ -10,7 +10,7 @@
   libGL,
   libGLU,
   openal,
-  libXxf86vm,
+  libxxf86vm,
   SDL,
   makeDesktopItem,
 }:
@@ -55,7 +55,7 @@ stdenv.mkDerivation {
     libGL
     libGLU
     openal
-    libXxf86vm
+    libxxf86vm
     SDL
   ];
 
diff --git a/pkgs/by-name/ur/urdfdom/package.nix b/pkgs/by-name/ur/urdfdom/package.nix
index b6adda9203ea..6d7d2088decc 100644
--- a/pkgs/by-name/ur/urdfdom/package.nix
+++ b/pkgs/by-name/ur/urdfdom/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "urdfdom";
-  version = "5.0.3";
+  version = "5.0.4";
 
   src = fetchFromGitHub {
     owner = "ros";
     repo = "urdfdom";
     tag = finalAttrs.version;
-    hash = "sha256-WZA3rzulPO1Si/kFqGF+8si2kRC8xOhlparoO8CvN0g=";
+    hash = "sha256-52Iv9ltYaGr6Ys3FreBSHOfJnVEp7kwjBpi8Cm6aC/g=";
   };
 
   patches = [
diff --git a/pkgs/by-name/ur/urserver/package.nix b/pkgs/by-name/ur/urserver/package.nix
index 93dde51e5590..0fbeb6c3b387 100644
--- a/pkgs/by-name/ur/urserver/package.nix
+++ b/pkgs/by-name/ur/urserver/package.nix
@@ -4,8 +4,8 @@
   fetchurl,
   autoPatchelfHook,
   bluez,
-  libX11,
-  libXtst,
+  libx11,
+  libxtst,
   makeWrapper,
   versionCheckHook,
 }:
@@ -49,8 +49,8 @@ stdenv.mkDerivation (
       install -m755 -D urserver $out/bin/urserver
       wrapProgram $out/bin/urserver --prefix LD_LIBRARY_PATH : "${
         lib.makeLibraryPath [
-          libX11
-          libXtst
+          libx11
+          libxtst
           bluez
         ]
       }"
diff --git a/pkgs/by-name/us/usbimager/package.nix b/pkgs/by-name/us/usbimager/package.nix
index 89f8183ff24b..8529626ef100 100644
--- a/pkgs/by-name/us/usbimager/package.nix
+++ b/pkgs/by-name/us/usbimager/package.nix
@@ -9,7 +9,7 @@
   withUdisks ? stdenv.hostPlatform.isLinux,
   udisks,
   glib,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
       udisks
       glib
     ]
-    ++ lib.optional (!withLibui) libX11
+    ++ lib.optional (!withLibui) libx11
     ++ lib.optional withLibui gtk3;
   # libui is bundled with the source of usbimager as a compiled static library
 
diff --git a/pkgs/by-name/ut/utox/package.nix b/pkgs/by-name/ut/utox/package.nix
index a345c3fd4be7..cd3b190fc216 100644
--- a/pkgs/by-name/ut/utox/package.nix
+++ b/pkgs/by-name/ut/utox/package.nix
@@ -9,14 +9,14 @@
   filter-audio,
   dbus,
   libvpx,
-  libX11,
+  libx11,
   openal,
   freetype,
   libv4l,
-  libXrender,
+  libxrender,
   fontconfig,
-  libXext,
-  libXft,
+  libxext,
+  libxft,
   libsodium,
   libopus,
 }:
@@ -38,14 +38,14 @@ stdenv.mkDerivation rec {
     libtoxcore
     dbus
     libvpx
-    libX11
+    libx11
     openal
     freetype
     libv4l
-    libXrender
+    libxrender
     fontconfig
-    libXext
-    libXft
+    libxext
+    libxft
     filter-audio
     libsodium
     libopus
diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index cfe54f6d559f..2b92f3957bc1 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.9.30";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-PDp7yktF2ek6KVlJvYsLn7VgV1ulgWnjAXKozJW3JKU=";
+    hash = "sha256-nD26zqKMK5LNkeYdqVYteeYL4mYaQQ/QlyjbMDDhLAY=";
   };
 
-  cargoHash = "sha256-KoVAUbVheq/x5e7scqf8ZSyC0ZAXlcZJ7svuiuT7NzQ=";
+  cargoHash = "sha256-lEynVemQHCI7ZKD2+1n4K/AtEYRld2+aRLkDMSX8ejM=";
 
   buildInputs = [
     rust-jemalloc-sys
diff --git a/pkgs/by-name/va/vaapi-intel-hybrid/package.nix b/pkgs/by-name/va/vaapi-intel-hybrid/package.nix
index b68eee97b3b5..7a70c78eeecd 100644
--- a/pkgs/by-name/va/vaapi-intel-hybrid/package.nix
+++ b/pkgs/by-name/va/vaapi-intel-hybrid/package.nix
@@ -8,7 +8,7 @@
   cmrt,
   libdrm,
   libva,
-  libX11,
+  libx11,
   libGL,
   wayland,
 }:
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     cmrt
     libdrm
     libva
-    libX11
+    libx11
     libGL
     wayland
   ];
diff --git a/pkgs/by-name/va/vale/package.nix b/pkgs/by-name/va/vale/package.nix
index f0f37dac49c9..eba0922d3bd1 100644
--- a/pkgs/by-name/va/vale/package.nix
+++ b/pkgs/by-name/va/vale/package.nix
@@ -11,7 +11,7 @@
 
 buildGoModule rec {
   pname = "vale";
-  version = "3.13.0";
+  version = "3.13.1";
 
   subPackages = [ "cmd/vale" ];
 
@@ -19,10 +19,10 @@ buildGoModule rec {
     owner = "errata-ai";
     repo = "vale";
     tag = "v${version}";
-    hash = "sha256-eaJSQMDHtX997pPCTCF+1s653ojm+SBj+cZ9sZWqQWE=";
+    hash = "sha256-fU36Rc1GL5eWYqeTP53PYXNZPji+ILAwueuJRuRcIoo=";
   };
 
-  vendorHash = "sha256-kGKrOmE3Qjh8JFWFJjAAH2Qc1e03p7x6/Bdf4+ItwOg=";
+  vendorHash = "sha256-7m67FpaGs4fQcwDxEq7XC83td5sazDnUAcBhg3Zkf0Q=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/va/vaporizer2/package.nix b/pkgs/by-name/va/vaporizer2/package.nix
index 6e4a34bfc4c5..9a55bf040731 100644
--- a/pkgs/by-name/va/vaporizer2/package.nix
+++ b/pkgs/by-name/va/vaporizer2/package.nix
@@ -10,11 +10,11 @@
   fontconfig,
   freetype,
   libGL,
-  libX11,
-  libXcursor,
-  libXext,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxext,
+  libxinerama,
+  libxrandr,
   libjack2,
 }:
 
@@ -49,11 +49,11 @@ stdenv.mkDerivation (finalAttrs: {
     fontconfig
     freetype
     libGL
-    libX11
-    libXcursor
-    libXext
-    libXinerama
-    libXrandr
+    libx11
+    libxcursor
+    libxext
+    libxinerama
+    libxrandr
     libjack2
   ];
 
diff --git a/pkgs/by-name/va/vatprism/package.nix b/pkgs/by-name/va/vatprism/package.nix
index fa5f38169374..dc8156624e77 100644
--- a/pkgs/by-name/va/vatprism/package.nix
+++ b/pkgs/by-name/va/vatprism/package.nix
@@ -9,12 +9,12 @@
   libxkbcommon,
   wayland,
   fontconfig,
-  libX11,
-  libXcursor,
-  libXi,
-  libXrandr,
-  libXxf86vm,
-  libXtst,
+  libx11,
+  libxcursor,
+  libxi,
+  libxrandr,
+  libxxf86vm,
+  libxtst,
   copyDesktopItems,
   makeDesktopItem,
 }:
@@ -23,12 +23,12 @@ let
     libGL
     libxkbcommon
     wayland
-    libX11
-    libXcursor
-    libXi
-    libXrandr
-    libXxf86vm
-    libXtst
+    libx11
+    libxcursor
+    libxi
+    libxrandr
+    libxxf86vm
+    libxtst
     fontconfig
   ];
   jdkWithFX = jdk.override { enableJavaFX = true; };
diff --git a/pkgs/by-name/vd/vdrift/package.nix b/pkgs/by-name/vd/vdrift/package.nix
index b4fe9e3022e4..fd067b02cf67 100644
--- a/pkgs/by-name/vd/vdrift/package.nix
+++ b/pkgs/by-name/vd/vdrift/package.nix
@@ -10,7 +10,7 @@
   SDL2,
   SDL2_image,
   libvorbis,
-  libX11,
+  libx11,
   bullet,
   curl,
   gettext,
@@ -50,7 +50,7 @@ let
       SDL2
       SDL2_image
       libvorbis
-      libX11
+      libx11
       bullet
       curl
       gettext
diff --git a/pkgs/by-name/ve/veloren/package.nix b/pkgs/by-name/ve/veloren/package.nix
index 0b45c268d75b..8de755084a98 100644
--- a/pkgs/by-name/ve/veloren/package.nix
+++ b/pkgs/by-name/ve/veloren/package.nix
@@ -10,10 +10,10 @@
   libxcb,
   libxkbcommon,
   autoPatchelfHook,
-  libX11,
-  libXi,
-  libXcursor,
-  libXrandr,
+  libx11,
+  libxi,
+  libxcursor,
+  libxrandr,
   wayland,
   stdenv,
 }:
@@ -95,10 +95,10 @@ rustPlatform.buildRustPackage {
   appendRunpaths = [
     (lib.makeLibraryPath (
       [
-        libX11
-        libXi
-        libXcursor
-        libXrandr
+        libx11
+        libxi
+        libxcursor
+        libxrandr
         vulkan-loader
       ]
       ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform wayland) [
diff --git a/pkgs/by-name/ve/vengi-tools/package.nix b/pkgs/by-name/ve/vengi-tools/package.nix
index 1efef3bad90c..4f81c29e1ffe 100644
--- a/pkgs/by-name/ve/vengi-tools/package.nix
+++ b/pkgs/by-name/ve/vengi-tools/package.nix
@@ -20,7 +20,7 @@
   libjpeg,
   libuuid,
   libuv,
-  libX11,
+  libx11,
   lua5_4,
   lzfse,
   opencl-headers,
@@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
     lua5_4
     lzfse
     SDL2
-    libX11
+    libx11
     SDL2_mixer
   ]
   ++ lib.optional stdenv.hostPlatform.isLinux wayland-protocols
diff --git a/pkgs/by-name/vi/vibrantlinux/package.nix b/pkgs/by-name/vi/vibrantlinux/package.nix
index 84be8c2ed8fb..829666b98960 100644
--- a/pkgs/by-name/vi/vibrantlinux/package.nix
+++ b/pkgs/by-name/vi/vibrantlinux/package.nix
@@ -5,7 +5,7 @@
   cmake,
   libvibrant,
   libxcb,
-  libXrandr,
+  libxrandr,
   pkg-config,
   qt6,
 }:
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libvibrant
     libxcb
-    libXrandr
+    libxrandr
     qt6.qtbase
     qt6.qttools
   ];
diff --git a/pkgs/by-name/vi/vifm/package.nix b/pkgs/by-name/vi/vifm/package.nix
index b92b6f240396..35b81960e4da 100644
--- a/pkgs/by-name/vi/vifm/package.nix
+++ b/pkgs/by-name/vi/vifm/package.nix
@@ -5,7 +5,7 @@
   perl, # used to generate help tags
   pkg-config,
   ncurses,
-  libX11,
+  libx11,
   file,
   which,
   groff,
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     ncurses
-    libX11
+    libx11
     file
     which
     groff
diff --git a/pkgs/by-name/vi/virglrenderer/package.nix b/pkgs/by-name/vi/virglrenderer/package.nix
index d66545cf1488..321c3fc7453d 100644
--- a/pkgs/by-name/vi/virglrenderer/package.nix
+++ b/pkgs/by-name/vi/virglrenderer/package.nix
@@ -8,7 +8,7 @@
   buildPackages,
   libGLU,
   libepoxy,
-  libX11,
+  libx11,
   libdrm,
   libgbm,
   libva,
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     libGLU
-    libX11
+    libx11
     libdrm
     libgbm
   ]
diff --git a/pkgs/by-name/vi/virtual-ans/package.nix b/pkgs/by-name/vi/virtual-ans/package.nix
index 47063e9cd9b0..4bf5860f28b2 100644
--- a/pkgs/by-name/vi/virtual-ans/package.nix
+++ b/pkgs/by-name/vi/virtual-ans/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchzip,
-  libX11,
-  libXi,
+  libx11,
+  libxi,
   libGL,
   alsa-lib,
   SDL2,
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     (lib.getLib stdenv.cc.cc)
-    libX11
-    libXi
+    libx11
+    libxi
     libGL
     alsa-lib
     SDL2
diff --git a/pkgs/by-name/vi/virtualglLib/package.nix b/pkgs/by-name/vi/virtualglLib/package.nix
index 3160ac60d939..5511583165c3 100644
--- a/pkgs/by-name/vi/virtualglLib/package.nix
+++ b/pkgs/by-name/vi/virtualglLib/package.nix
@@ -5,9 +5,9 @@
   cmake,
   libGL,
   libGLU,
-  libXv,
-  libXtst,
-  libXi,
+  libxv,
+  libxtst,
+  libxi,
   libjpeg_turbo,
   fltk_1_3,
   libxcb-keysyms,
@@ -47,9 +47,9 @@ stdenv.mkDerivation rec {
     libGL
     libGLU
     fltk_1_3
-    libXv
-    libXtst
-    libXi
+    libxv
+    libxtst
+    libxi
     libxcb-keysyms
     opencl-headers
     opencl-clhpp
diff --git a/pkgs/by-name/vi/visp/package.nix b/pkgs/by-name/vi/visp/package.nix
index 6cec848b1bc8..8975e006dc86 100644
--- a/pkgs/by-name/vi/visp/package.nix
+++ b/pkgs/by-name/vi/visp/package.nix
@@ -14,7 +14,7 @@
   libpng,
   librealsense,
   libxml2,
-  libX11,
+  libx11,
   nlohmann_json,
   #ogre,
   openblas,
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
     libjpeg
     libpng
     librealsense
-    libX11
+    libx11
     libxml2
     nlohmann_json
     #ogre
diff --git a/pkgs/by-name/vi/vivaldi/package.nix b/pkgs/by-name/vi/vivaldi/package.nix
index 22eda1bbf2cd..3f92c5b75827 100644
--- a/pkgs/by-name/vi/vivaldi/package.nix
+++ b/pkgs/by-name/vi/vivaldi/package.nix
@@ -4,21 +4,21 @@
   coreutils,
   fetchurl,
   zlib,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   libsm,
   libice,
   libxkbcommon,
   libxshmfence,
-  libXfixes,
-  libXt,
-  libXi,
-  libXcursor,
-  libXScrnSaver,
-  libXcomposite,
-  libXdamage,
-  libXtst,
-  libXrandr,
+  libxfixes,
+  libxt,
+  libxi,
+  libxcursor,
+  libxscrnsaver,
+  libxcomposite,
+  libxdamage,
+  libxtst,
+  libxrandr,
   alsa-lib,
   dbus,
   cups,
@@ -29,8 +29,8 @@
   libGL,
   freetype,
   fontconfig,
-  libXft,
-  libXrender,
+  libxft,
+  libxrender,
   libxcb,
   expat,
   libuuid,
@@ -104,23 +104,23 @@ stdenv.mkDerivation rec {
     stdenv.cc.cc
     stdenv.cc.libc
     zlib
-    libX11
-    libXt
-    libXext
+    libx11
+    libxt
+    libxext
     libsm
     libice
     libxcb
     libxkbcommon
     libxshmfence
-    libXi
-    libXft
-    libXcursor
-    libXfixes
-    libXScrnSaver
-    libXcomposite
-    libXdamage
-    libXtst
-    libXrandr
+    libxi
+    libxft
+    libxcursor
+    libxfixes
+    libxscrnsaver
+    libxcomposite
+    libxdamage
+    libxtst
+    libxrandr
     atk
     at-spi2-atk
     at-spi2-core
@@ -137,7 +137,7 @@ stdenv.mkDerivation rec {
     qt6.qtwayland
     freetype
     fontconfig
-    libXrender
+    libxrender
     libuuid
     expat
     glib
diff --git a/pkgs/by-name/vi/vivictpp/package.nix b/pkgs/by-name/vi/vivictpp/package.nix
index 4526c16e0c61..8a77dc8faf11 100644
--- a/pkgs/by-name/vi/vivictpp/package.nix
+++ b/pkgs/by-name/vi/vivictpp/package.nix
@@ -10,7 +10,7 @@
   git,
   SDL2,
   SDL2_ttf,
-  libX11,
+  libx11,
   freetype,
   harfbuzz,
   ffmpeg,
@@ -70,7 +70,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     SDL2
-    libX11
+    libx11
     SDL2_ttf
     freetype
     harfbuzz
diff --git a/pkgs/by-name/vk/vkeybd/package.nix b/pkgs/by-name/vk/vkeybd/package.nix
index a44cf7774087..c27e80df0311 100644
--- a/pkgs/by-name/vk/vkeybd/package.nix
+++ b/pkgs/by-name/vk/vkeybd/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   alsa-lib,
-  libX11,
+  libx11,
   makeWrapper,
   tcl,
   tk,
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [
     alsa-lib
-    libX11
+    libx11
     tcl
     tk
   ];
diff --git a/pkgs/by-name/vk/vkquake/package.nix b/pkgs/by-name/vk/vkquake/package.nix
index b71f9e69af97..dc9bc3ed1d37 100644
--- a/pkgs/by-name/vk/vkquake/package.nix
+++ b/pkgs/by-name/vk/vkquake/package.nix
@@ -9,7 +9,7 @@
   libmpg123,
   libopus,
   libvorbis,
-  libX11,
+  libx11,
   makeWrapper,
   meson,
   moltenvk,
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     libmpg123
     libopus
     libvorbis
-    libX11
+    libx11
     opusfile
     vulkan-loader
   ]
diff --git a/pkgs/by-name/vl/vlc/package.nix b/pkgs/by-name/vl/vlc/package.nix
index 2ad8eba462cc..595062e3cb95 100644
--- a/pkgs/by-name/vl/vlc/package.nix
+++ b/pkgs/by-name/vl/vlc/package.nix
@@ -22,9 +22,9 @@
   harfbuzz,
   libGL,
   libsm,
-  libXext,
-  libXinerama,
-  libXpm,
+  libxext,
+  libxinerama,
+  libxpm,
   libarchive,
   libass,
   libbluray-full,
@@ -203,9 +203,9 @@ stdenv.mkDerivation (finalAttrs: {
     protobuf
   ]
   ++ optionals skins2Support [
-    libXext
-    libXinerama
-    libXpm
+    libxext
+    libxinerama
+    libxpm
   ]
   ++ optionals waylandSupport [
     wayland
diff --git a/pkgs/by-name/vn/vncrec/package.nix b/pkgs/by-name/vn/vncrec/package.nix
index e5f8e60a236b..423d9d54acd1 100644
--- a/pkgs/by-name/vn/vncrec/package.nix
+++ b/pkgs/by-name/vn/vncrec/package.nix
@@ -2,18 +2,18 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
   xorgproto,
   imake,
   gccmakedep,
-  libXt,
-  libXmu,
-  libXaw,
-  libXext,
+  libxt,
+  libxmu,
+  libxaw,
+  libxext,
   libsm,
   libice,
-  libXpm,
-  libXp,
+  libxpm,
+  libxp,
 }:
 
 stdenv.mkDerivation {
@@ -41,16 +41,16 @@ stdenv.mkDerivation {
     gccmakedep
   ];
   buildInputs = [
-    libX11
+    libx11
     xorgproto
-    libXt
-    libXmu
-    libXaw
-    libXext
+    libxt
+    libxmu
+    libxaw
+    libxext
     libsm
     libice
-    libXpm
-    libXp
+    libxpm
+    libxp
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/vo/vokoscreen-ng/package.nix b/pkgs/by-name/vo/vokoscreen-ng/package.nix
index fe84e8ff612d..6bb7e40a4b83 100644
--- a/pkgs/by-name/vo/vokoscreen-ng/package.nix
+++ b/pkgs/by-name/vo/vokoscreen-ng/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   pkg-config,
   gst_all_1,
-  libX11,
+  libx11,
   pipewire,
   pulseaudio,
   qt6,
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     gst_all_1.gstreamer
-    libX11
+    libx11
     pulseaudio
     qt6.qtbase
     qt6.qtmultimedia
diff --git a/pkgs/by-name/vo/voms/package.nix b/pkgs/by-name/vo/voms/package.nix
index d35bc79892a8..44881b68eb0e 100644
--- a/pkgs/by-name/vo/voms/package.nix
+++ b/pkgs/by-name/vo/voms/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "voms";
-  version = "2.1.2";
+  version = "2.1.3";
 
   src = fetchFromGitHub {
     owner = "italiangrid";
     repo = "voms";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ipNgx87M/NNvAaeUf30nUDmf4Q9k5zakkgMk4/1N6VM=";
+    hash = "sha256-odwaIGaiJEnxNeysScYknOTimpvvx1vhuHf82VGPoVg=";
   };
 
   passthru = {
diff --git a/pkgs/by-name/vp/vpv/package.nix b/pkgs/by-name/vp/vpv/package.nix
index fdc6315d5364..583c87ab741d 100644
--- a/pkgs/by-name/vp/vpv/package.nix
+++ b/pkgs/by-name/vp/vpv/package.nix
@@ -8,7 +8,7 @@
   libpng,
   libtiff,
   libjpeg,
-  libX11,
+  libx11,
   SDL2,
   gdal,
   octave,
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
     libtiff
     libjpeg
-    libX11
+    libx11
     SDL2
     gdal
     octave
diff --git a/pkgs/by-name/vu/vulkan-cts/package.nix b/pkgs/by-name/vu/vulkan-cts/package.nix
index 91f4d7393b16..ab390744efa4 100644
--- a/pkgs/by-name/vu/vulkan-cts/package.nix
+++ b/pkgs/by-name/vu/vulkan-cts/package.nix
@@ -11,9 +11,9 @@
   libglvnd,
   libffi,
   libpng,
-  libX11,
-  libXau,
-  libXdmcp,
+  libx11,
+  libxau,
+  libxdmcp,
   libxcb,
   makeWrapper,
   mesa,
@@ -78,9 +78,9 @@ stdenv.mkDerivation (finalAttrs: {
     libffi
     libglvnd
     libpng
-    libX11
-    libXau
-    libXdmcp
+    libx11
+    libxau
+    libxdmcp
     libxcb
     vulkan-headers
     vulkan-utility-libraries
diff --git a/pkgs/by-name/vu/vulkan-extension-layer/package.nix b/pkgs/by-name/vu/vulkan-extension-layer/package.nix
index faa9a469c5a7..31ffe26e9f2d 100644
--- a/pkgs/by-name/vu/vulkan-extension-layer/package.nix
+++ b/pkgs/by-name/vu/vulkan-extension-layer/package.nix
@@ -8,8 +8,8 @@
   vulkan-headers,
   vulkan-utility-libraries,
   jq,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
   libxcb,
   wayland,
 }:
@@ -34,8 +34,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     vulkan-headers
     vulkan-utility-libraries
-    libX11
-    libXrandr
+    libx11
+    libxrandr
     libxcb
     wayland
   ];
diff --git a/pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix b/pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix
index a2353225f015..05a0ad593043 100644
--- a/pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix
+++ b/pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   cmake,
   fetchFromGitHub,
-  libX11,
+  libx11,
   meson,
   ninja,
   pkg-config,
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
   buildInputs = [
     vulkan-headers
     vulkan-loader
-    libX11
+    libx11
     wayland
   ];
 
diff --git a/pkgs/by-name/vu/vulkan-loader/package.nix b/pkgs/by-name/vu/vulkan-loader/package.nix
index 558ea79570d2..cd1eae906799 100644
--- a/pkgs/by-name/vu/vulkan-loader/package.nix
+++ b/pkgs/by-name/vu/vulkan-loader/package.nix
@@ -4,9 +4,9 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  libX11,
+  libx11,
   libxcb,
-  libXrandr,
+  libxrandr,
   wayland,
   moltenvk,
   vulkan-headers,
@@ -36,9 +36,9 @@ stdenv.mkDerivation (finalAttrs: {
     vulkan-headers
   ]
   ++ lib.optionals enableX11 [
-    libX11
+    libx11
     libxcb
-    libXrandr
+    libxrandr
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     wayland
diff --git a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
index 9e37fe8a0099..eb93c4f4395b 100644
--- a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
+++ b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
@@ -7,9 +7,9 @@
   jq,
   expat,
   jsoncpp,
-  libX11,
-  libXdmcp,
-  libXrandr,
+  libx11,
+  libxdmcp,
+  libxrandr,
   libffi,
   libxcb,
   pkg-config,
@@ -48,9 +48,9 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     expat
     jsoncpp
-    libX11
-    libXdmcp
-    libXrandr
+    libx11
+    libxdmcp
+    libxrandr
     libffi
     libxcb
     valijson
diff --git a/pkgs/by-name/vu/vulkan-tools/package.nix b/pkgs/by-name/vu/vulkan-tools/package.nix
index e625496ae164..c8b0574c0a40 100644
--- a/pkgs/by-name/vu/vulkan-tools/package.nix
+++ b/pkgs/by-name/vu/vulkan-tools/package.nix
@@ -8,11 +8,11 @@
   python3,
   glslang,
   libffi,
-  libX11,
-  libXau,
+  libx11,
+  libxau,
   libxcb,
-  libXdmcp,
-  libXrandr,
+  libxdmcp,
+  libxrandr,
   vulkan-headers,
   vulkan-loader,
   vulkan-volk,
@@ -50,11 +50,11 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
     libffi
-    libX11
-    libXau
+    libx11
+    libxau
     libxcb
-    libXdmcp
-    libXrandr
+    libxdmcp
+    libxrandr
     wayland
     wayland-protocols
   ]
diff --git a/pkgs/by-name/vu/vulkan-validation-layers/package.nix b/pkgs/by-name/vu/vulkan-validation-layers/package.nix
index 4d4bb47138dd..5cf659e9f551 100644
--- a/pkgs/by-name/vu/vulkan-validation-layers/package.nix
+++ b/pkgs/by-name/vu/vulkan-validation-layers/package.nix
@@ -9,11 +9,11 @@
   jq,
   glslang,
   libffi,
-  libX11,
-  libXau,
+  libx11,
+  libxau,
   libxcb,
-  libXdmcp,
-  libXrandr,
+  libxdmcp,
+  libxrandr,
   spirv-headers,
   spirv-tools,
   vulkan-headers,
@@ -53,10 +53,10 @@ stdenv.mkDerivation (finalAttrs: {
     vulkan-utility-libraries
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
-    libXau
-    libXdmcp
-    libXrandr
+    libx11
+    libxau
+    libxdmcp
+    libxrandr
     libffi
     libxcb
     wayland
diff --git a/pkgs/by-name/w3/w3m/package.nix b/pkgs/by-name/w3/w3m/package.nix
index 73e82859bf63..9bc737d13b4b 100644
--- a/pkgs/by-name/w3/w3m/package.nix
+++ b/pkgs/by-name/w3/w3m/package.nix
@@ -11,7 +11,7 @@
   graphicsSupport ? !stdenv.hostPlatform.isDarwin,
   imlib2,
   x11Support ? graphicsSupport,
-  libX11,
+  libx11,
   mouseSupport ? !stdenv.hostPlatform.isDarwin,
   gpm-ncurses,
   perl,
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional sslSupport openssl
   ++ lib.optional mouseSupport gpm-ncurses
   ++ lib.optional graphicsSupport imlib2
-  ++ lib.optional x11Support libX11;
+  ++ lib.optional x11Support libx11;
 
   postInstall = lib.optionalString graphicsSupport ''
     ln -s $out/libexec/w3m/w3mimgdisplay $out/bin
diff --git a/pkgs/by-name/wa/waffle/package.nix b/pkgs/by-name/wa/waffle/package.nix
index 342acb401faa..4ca8a12233fe 100644
--- a/pkgs/by-name/wa/waffle/package.nix
+++ b/pkgs/by-name/wa/waffle/package.nix
@@ -13,7 +13,7 @@
   python3,
   x11Support ? true,
   libxcb,
-  libX11,
+  libx11,
   waylandSupport ? true,
   wayland,
   wayland-protocols,
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     libglvnd
   ]
   ++ lib.optionals x11Support [
-    libX11
+    libx11
     libxcb
   ]
   ++ lib.optionals waylandSupport [
diff --git a/pkgs/by-name/wa/wallutils/package.nix b/pkgs/by-name/wa/wallutils/package.nix
index 5e27d5ce4727..05d52847eac5 100644
--- a/pkgs/by-name/wa/wallutils/package.nix
+++ b/pkgs/by-name/wa/wallutils/package.nix
@@ -2,10 +2,10 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
-  libX11,
-  libXcursor,
-  libXmu,
-  libXpm,
+  libx11,
+  libxcursor,
+  libxmu,
+  libxpm,
   libheif,
   pkg-config,
   wayland,
@@ -38,10 +38,10 @@ buildGoModule (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXcursor
-    libXmu
-    libXpm
+    libx11
+    libxcursor
+    libxmu
+    libxpm
     libheif
     wayland
     xbitmaps
diff --git a/pkgs/by-name/wa/wargus/stratagus.nix b/pkgs/by-name/wa/wargus/stratagus.nix
index 2d30f69e808d..563b36c14961 100644
--- a/pkgs/by-name/wa/wargus/stratagus.nix
+++ b/pkgs/by-name/wa/wargus/stratagus.nix
@@ -7,7 +7,7 @@
   zlib,
   bzip2,
   libpng,
-  libX11,
+  libx11,
   lua5_1,
   toluapp,
   SDL2,
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     SDL2_image
     SDL2_mixer
     libGL
-    libX11
+    libx11
   ];
   cmakeFlags = [
     "-DCMAKE_CXX_FLAGS=-Wno-error=format-overflow"
diff --git a/pkgs/by-name/wa/warpd/package.nix b/pkgs/by-name/wa/warpd/package.nix
index 4399deb01d2c..2fff926f9ce7 100644
--- a/pkgs/by-name/wa/warpd/package.nix
+++ b/pkgs/by-name/wa/warpd/package.nix
@@ -8,13 +8,13 @@
   libxkbcommon,
   wayland,
   withX ? true,
-  libXi,
-  libXinerama,
-  libXft,
-  libXfixes,
-  libXtst,
-  libX11,
-  libXext,
+  libxi,
+  libxinerama,
+  libxft,
+  libxfixes,
+  libxtst,
+  libx11,
+  libxext,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -38,13 +38,13 @@ stdenv.mkDerivation (finalAttrs: {
       wayland
     ]
     ++ lib.optionals withX [
-      libXi
-      libXinerama
-      libXft
-      libXfixes
-      libXtst
-      libX11
-      libXext
+      libxi
+      libxinerama
+      libxft
+      libxfixes
+      libxtst
+      libx11
+      libxext
     ];
 
   makeFlags = [
diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix
index 52882ba5eb85..5fa0b5fc964e 100644
--- a/pkgs/by-name/wa/waveterm/package.nix
+++ b/pkgs/by-name/wa/waveterm/package.nix
@@ -11,12 +11,12 @@
   gtk3,
   pango,
   cairo,
-  libX11,
-  libXcomposite,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXrandr,
+  libx11,
+  libxcomposite,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxrandr,
   libgbm,
   expat,
   libxcb,
@@ -80,12 +80,12 @@ let
       gtk3
       pango
       cairo
-      libX11
-      libXcomposite
-      libXdamage
-      libXext
-      libXfixes
-      libXrandr
+      libx11
+      libxcomposite
+      libxdamage
+      libxext
+      libxfixes
+      libxrandr
       libgbm
       expat
       libxcb
diff --git a/pkgs/by-name/wa/wayst/package.nix b/pkgs/by-name/wa/wayst/package.nix
index 05e73c7c2913..73d75c4b7e36 100644
--- a/pkgs/by-name/wa/wayst/package.nix
+++ b/pkgs/by-name/wa/wayst/package.nix
@@ -7,8 +7,8 @@
   freetype,
   fontconfig,
   libGL,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
   libxcb,
   libxkbcommon,
   utf8proc,
@@ -54,12 +54,12 @@ stdenv.mkDerivation {
 
   buildInputs = [
     fontconfig
-    libX11
+    libx11
     freetype
     libGL
     libxcb
     libxkbcommon
-    libXrandr
+    libxrandr
     utf8proc
     wayland
   ];
diff --git a/pkgs/by-name/wa/wayv/package.nix b/pkgs/by-name/wa/wayv/package.nix
index 9fd3516d8f88..95fc56a6c183 100644
--- a/pkgs/by-name/wa/wayv/package.nix
+++ b/pkgs/by-name/wa/wayv/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   fetchpatch,
-  libX11,
+  libx11,
 }:
 stdenv.mkDerivation {
   pname = "wayv";
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
     })
   ];
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   postInstall = ''
     make -C doc install
diff --git a/pkgs/by-name/wa/wayvr/package.nix b/pkgs/by-name/wa/wayvr/package.nix
index 60cac3211124..9bb8e1bbcf27 100644
--- a/pkgs/by-name/wa/wayvr/package.nix
+++ b/pkgs/by-name/wa/wayvr/package.nix
@@ -3,9 +3,9 @@
   dbus,
   fetchFromGitHub,
   lib,
-  libX11,
-  libXext,
-  libXrandr,
+  libx11,
+  libxext,
+  libxrandr,
   libxcb,
   libxkbcommon,
   nix-update-script,
@@ -44,9 +44,9 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [
     alsa-lib
     dbus
-    libX11
-    libXext
-    libXrandr
+    libx11
+    libxext
+    libxrandr
     libxcb
     libxkbcommon
     openssl
diff --git a/pkgs/by-name/we/webex/package.nix b/pkgs/by-name/we/webex/package.nix
index 3834e5e1db41..aa6bdf928fc4 100644
--- a/pkgs/by-name/we/webex/package.nix
+++ b/pkgs/by-name/we/webex/package.nix
@@ -33,16 +33,16 @@
   nss,
   pango,
   zlib,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXdamage,
-  libXext,
-  libXfixes,
-  libXi,
-  libXrandr,
-  libXrender,
-  libXtst,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxtst,
   libxshmfence,
   libxcb-util,
   libxcb-image,
@@ -52,7 +52,7 @@
   p7zip,
   onetbb,
   wayland,
-  libXScrnSaver,
+  libxscrnsaver,
 }:
 
 stdenv.mkDerivation rec {
@@ -99,20 +99,20 @@ stdenv.mkDerivation rec {
     libxcb
     libxkbcommon
     libxcrypt-legacy
-    libX11
-    libXcomposite
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
-    libXrandr
-    libXrender
-    libXtst
+    libx11
+    libxcomposite
+    libxcursor
+    libxdamage
+    libxext
+    libxfixes
+    libxi
+    libxrandr
+    libxrender
+    libxtst
     libxshmfence
     libxcb-util
     libxcb-image
-    libXScrnSaver
+    libxscrnsaver
     libxcb-keysyms
     libxcb-render-util
     libxcb-wm
diff --git a/pkgs/by-name/we/weston/package.nix b/pkgs/by-name/we/weston/package.nix
index fe1c81ce22a2..5e5af35f1809 100644
--- a/pkgs/by-name/we/weston/package.nix
+++ b/pkgs/by-name/we/weston/package.nix
@@ -43,7 +43,7 @@
   webpSupport ? true,
   libwebp,
   xwaylandSupport ? true,
-  libXcursor,
+  libxcursor,
   xwayland,
 }:
 
@@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optional webpSupport libwebp
   ++ lib.optionals xwaylandSupport [
-    libXcursor
+    libxcursor
     libxcb-cursor
     xwayland
   ];
diff --git a/pkgs/by-name/we/wezterm/package.nix b/pkgs/by-name/we/wezterm/package.nix
index f025c6940b10..dc80579ddf0b 100644
--- a/pkgs/by-name/we/wezterm/package.nix
+++ b/pkgs/by-name/we/wezterm/package.nix
@@ -5,7 +5,7 @@
   fontconfig,
   installShellFiles,
   libGL,
-  libX11,
+  libx11,
   libxcb,
   libxkbcommon,
   ncurses,
@@ -74,7 +74,7 @@ rustPlatform.buildRustPackage rec {
     zlib
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
+    libx11
     libxcb
     libxkbcommon
     wayland
diff --git a/pkgs/by-name/wh/whatsie/package.nix b/pkgs/by-name/wh/whatsie/package.nix
index a03610ff5c6e..2e1bc381e9dc 100644
--- a/pkgs/by-name/wh/whatsie/package.nix
+++ b/pkgs/by-name/wh/whatsie/package.nix
@@ -4,7 +4,7 @@
   stdenv,
   makeDesktopItem,
   copyDesktopItems,
-  libX11,
+  libx11,
   libxcb,
   qt5,
 }:
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     libxcb
     qt5.qtwebengine
   ];
diff --git a/pkgs/by-name/wi/widelands/package.nix b/pkgs/by-name/wi/widelands/package.nix
index f22d0c7a9614..dd96258bb042 100644
--- a/pkgs/by-name/wi/widelands/package.nix
+++ b/pkgs/by-name/wi/widelands/package.nix
@@ -25,7 +25,7 @@
   asio,
   libsm,
   libice,
-  libXext,
+  libxext,
 }:
 
 stdenv.mkDerivation rec {
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
     libsm # XXX: these should be propagated by SDL2?
     libice
   ]
-  ++ lib.optional stdenv.hostPlatform.isLinux libXext;
+  ++ lib.optional stdenv.hostPlatform.isLinux libxext;
 
   postInstall =
     lib.optionalString stdenv.hostPlatform.isLinux ''
diff --git a/pkgs/by-name/wi/wifi-qr/package.nix b/pkgs/by-name/wi/wifi-qr/package.nix
index 8871d0113e74..e85156efc646 100644
--- a/pkgs/by-name/wi/wifi-qr/package.nix
+++ b/pkgs/by-name/wi/wifi-qr/package.nix
@@ -17,7 +17,7 @@
   gnugrep,
   file,
 }:
-stdenvNoCC.mkDerivation (finalAttr: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "wifi-qr";
   version = "0.4";
 
@@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttr: {
   src = fetchFromGitHub {
     owner = "kokoye2007";
     repo = "wifi-qr";
-    tag = "v${finalAttr.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-tE+9bFDgiFS1Jj+AAwTMKjMh5wS5/gkRSQaCBR/riYQ=";
   };
 
diff --git a/pkgs/by-name/wi/wily/package.nix b/pkgs/by-name/wi/wily/package.nix
index dec22616c48f..fd23f70a641d 100644
--- a/pkgs/by-name/wi/wily/package.nix
+++ b/pkgs/by-name/wi/wily/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXt,
+  libx11,
+  libxt,
 }:
 
 stdenv.mkDerivation rec {
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    libX11
-    libXt
+    libx11
+    libxt
   ];
 
   patches = [ ./fix-gcc14-build.patch ];
diff --git a/pkgs/by-name/wi/winboat/package.nix b/pkgs/by-name/wi/winboat/package.nix
index 9a5725e2d263..838aa63d7790 100644
--- a/pkgs/by-name/wi/winboat/package.nix
+++ b/pkgs/by-name/wi/winboat/package.nix
@@ -17,14 +17,14 @@
   nix-update-script,
 }:
 
-buildNpmPackage (final: {
+buildNpmPackage (finalAttrs: {
   pname = "winboat";
   version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "TibixDev";
     repo = "winboat";
-    tag = "v${final.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-DgH6CAZf+XIgBav2xd2FF2MGRgGIyOs/98vqWHA3XYw=";
   };
 
@@ -48,7 +48,7 @@ buildNpmPackage (final: {
 
   guest-server = pkgsCross.mingwW64.callPackage ./guest-server.nix { };
   passthru = {
-    guest-server = final.guest-server;
+    guest-server = finalAttrs.guest-server;
     updateScript = nix-update-script {
       extraArgs = [
         "--subpackage"
@@ -76,7 +76,7 @@ buildNpmPackage (final: {
     install -Dm444 icons/winboat_logo.svg $out/share/icons/hicolor/256x256/apps/winboat.svg
 
     # copy the the winboat-guest-server executable and generate the zip
-    cp ${lib.getExe final.guest-server} $out/share/winboat/resources/guest_server/winboat_guest_server.exe
+    cp ${lib.getExe finalAttrs.guest-server} $out/share/winboat/resources/guest_server/winboat_guest_server.exe
     (cd $out/share/winboat/resources/guest_server/ && zip -r winboat_guest_server.zip .)
 
     # symlink data/ and guest_server/ into parent folder
@@ -114,7 +114,7 @@ buildNpmPackage (final: {
     mainProgram = "winboat";
     description = "Run Windows apps on Linux with seamless integration";
     homepage = "https://github.com/TibixDev/winboat";
-    changelog = "https://github.com/TibixDev/winboat/releases/tag/v${final.version}";
+    changelog = "https://github.com/TibixDev/winboat/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       rexies
diff --git a/pkgs/by-name/wi/windowchef/package.nix b/pkgs/by-name/wi/windowchef/package.nix
index 7d06b697c4a1..0fa99d80fa09 100644
--- a/pkgs/by-name/wi/windowchef/package.nix
+++ b/pkgs/by-name/wi/windowchef/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   libxcb,
-  libXrandr,
+  libxrandr,
   libxcb-util,
   libxcb-keysyms,
   libxcb-wm,
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libxcb
-    libXrandr
+    libxrandr
     libxcb-util
     libxcb-keysyms
     libxcb-wm
diff --git a/pkgs/by-name/wi/windowlab/package.nix b/pkgs/by-name/wi/windowlab/package.nix
index 1b5fc35d533b..8349fbc67139 100644
--- a/pkgs/by-name/wi/windowlab/package.nix
+++ b/pkgs/by-name/wi/windowlab/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchurl,
   pkg-config,
-  libX11,
-  libXext,
-  libXft,
+  libx11,
+  libxext,
+  libxft,
 }:
 
 let
@@ -22,9 +22,9 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    libX11
-    libXext
-    libXft
+    libx11
+    libxext
+    libxft
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/wi/windowmaker/dockapps/AlsaMixer-app.nix b/pkgs/by-name/wi/windowmaker/dockapps/AlsaMixer-app.nix
index f9f435b845b5..6de621633e44 100644
--- a/pkgs/by-name/wi/windowmaker/dockapps/AlsaMixer-app.nix
+++ b/pkgs/by-name/wi/windowmaker/dockapps/AlsaMixer-app.nix
@@ -3,9 +3,9 @@
   stdenv,
   alsa-lib,
   dockapps-sources,
-  libX11,
-  libXext,
-  libXpm,
+  libx11,
+  libxext,
+  libxpm,
   pkg-config,
 }:
 
@@ -22,9 +22,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     alsa-lib
-    libX11
-    libXpm
-    libXext
+    libx11
+    libxpm
+    libxext
   ];
 
   hardeningDisable = [ "fortify" ];
diff --git a/pkgs/by-name/wi/windowmaker/dockapps/cputnik.nix b/pkgs/by-name/wi/windowmaker/dockapps/cputnik.nix
index 206d3eba4d3a..7a6add268f52 100644
--- a/pkgs/by-name/wi/windowmaker/dockapps/cputnik.nix
+++ b/pkgs/by-name/wi/windowmaker/dockapps/cputnik.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   dockapps-sources,
-  libX11,
-  libXext,
-  libXpm,
+  libx11,
+  libxext,
+  libxpm,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -15,15 +15,15 @@ stdenv.mkDerivation (finalAttrs: {
   sourceRoot = "${finalAttrs.src.name}/cputnik/src";
 
   buildInputs = [
-    libX11
-    libXpm
-    libXext
+    libx11
+    libxpm
+    libxext
   ];
 
   preBuild = ''
     makeFlagsArray+=(
-      INCS="-I${libX11.dev}/include -I${libXext.dev}/include -I${libXpm.dev}/include"
-      LIBS="-L${libX11}/lib -L${libXext}/lib -L${libXpm}/lib -lX11 -lXpm -lXext"
+      INCS="-I${libx11.dev}/include -I${libxext.dev}/include -I${libxpm.dev}/include"
+      LIBS="-L${libx11}/lib -L${libxext}/lib -L${libxpm}/lib -lX11 -lXpm -lXext"
     )
   '';
 
diff --git a/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix b/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix
index 92a9b9d38ee5..3001bef81392 100644
--- a/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix
+++ b/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix
@@ -4,9 +4,9 @@
   autoreconfHook,
   dockapps-sources,
   font-util,
-  libX11,
-  libXext,
-  libXpm,
+  libx11,
+  libxext,
+  libxpm,
   mkfontdir,
   pkg-config,
 }:
@@ -24,9 +24,9 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXext
-    libXpm
+    libx11
+    libxext
+    libxpm
     font-util
     mkfontdir
   ];
diff --git a/pkgs/by-name/wi/windowmaker/dockapps/wmCalClock.nix b/pkgs/by-name/wi/windowmaker/dockapps/wmCalClock.nix
index de423fc01ff1..03671dd51353 100644
--- a/pkgs/by-name/wi/windowmaker/dockapps/wmCalClock.nix
+++ b/pkgs/by-name/wi/windowmaker/dockapps/wmCalClock.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   dockapps-sources,
-  libX11,
-  libXext,
-  libXpm,
+  libx11,
+  libxext,
+  libxpm,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -15,16 +15,16 @@ stdenv.mkDerivation (finalAttrs: {
   sourceRoot = "${finalAttrs.src.name}/wmCalClock";
 
   buildInputs = [
-    libX11
-    libXpm
-    libXext
+    libx11
+    libxpm
+    libxext
   ];
 
   preBuild = ''
     makeFlagsArray+=(
       CC="cc"
-      INCDIR="-I${libX11.dev}/include -I${libXext.dev}/include -I${libXpm.dev}/include"
-      LIBDIR="-I${libX11}/lib -I${libXext}/lib -I${libXpm}/lib"
+      INCDIR="-I${libx11.dev}/include -I${libxext.dev}/include -I${libxpm.dev}/include"
+      LIBDIR="-I${libx11}/lib -I${libxext}/lib -I${libxpm}/lib"
     )
   '';
 
diff --git a/pkgs/by-name/wi/windowmaker/dockapps/wmcube.nix b/pkgs/by-name/wi/windowmaker/dockapps/wmcube.nix
index 93bb86503226..67fc33d1ce4c 100644
--- a/pkgs/by-name/wi/windowmaker/dockapps/wmcube.nix
+++ b/pkgs/by-name/wi/windowmaker/dockapps/wmcube.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   dockapps-sources,
-  libX11,
-  libXpm,
-  libXext,
+  libx11,
+  libxpm,
+  libxext,
   libdockapp,
 }:
 
@@ -16,9 +16,9 @@ stdenv.mkDerivation (finalAttrs: {
   sourceRoot = "${finalAttrs.src.name}/wmcube/wmcube";
 
   buildInputs = [
-    libX11
-    libXext
-    libXpm
+    libx11
+    libxext
+    libxpm
     libdockapp
   ];
 
@@ -29,10 +29,10 @@ stdenv.mkDerivation (finalAttrs: {
           CC="${stdenv.cc.targetPrefix}cc"
           PREFIX="${placeholder "out"}"
           VERSION="${finalAttrs.version}"
-          LIBDIR="-L${lib.getLib libX11}/lib -L${lib.getLib libXext}/lib \
-    -L${lib.getLib libXpm}/lib -L${lib.getLib libdockapp}/lib"
-          INCDIR="-I${lib.getDev libX11}/lib -I${lib.getDev libXext}/lib \
-    -I${lib.getDev libXpm}/lib -I${lib.getDev libdockapp}/lib"
+          LIBDIR="-L${lib.getLib libx11}/lib -L${lib.getLib libxext}/lib \
+    -L${lib.getLib libxpm}/lib -L${lib.getLib libdockapp}/lib"
+          INCDIR="-I${lib.getDev libx11}/lib -I${lib.getDev libxext}/lib \
+    -I${lib.getDev libxpm}/lib -I${lib.getDev libdockapp}/lib"
           LIBS="-lm -lXpm -lXext -lX11 -ldockapp"
         )
   '';
diff --git a/pkgs/by-name/wi/windowmaker/dockapps/wmsm-app.nix b/pkgs/by-name/wi/windowmaker/dockapps/wmsm-app.nix
index 0782c4ffbbea..0bfeb962f4b4 100644
--- a/pkgs/by-name/wi/windowmaker/dockapps/wmsm-app.nix
+++ b/pkgs/by-name/wi/windowmaker/dockapps/wmsm-app.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   dockapps-sources,
-  libX11,
-  libXpm,
-  libXext,
+  libx11,
+  libxpm,
+  libxext,
   libdockapp,
 }:
 
@@ -16,9 +16,9 @@ stdenv.mkDerivation (finalAttrs: {
   sourceRoot = "${finalAttrs.src.name}/wmsm.app/wmsm";
 
   buildInputs = [
-    libX11
-    libXext
-    libXpm
+    libx11
+    libxext
+    libxpm
     libdockapp
   ];
 
diff --git a/pkgs/by-name/wi/windowmaker/dockapps/wmsystemtray.nix b/pkgs/by-name/wi/windowmaker/dockapps/wmsystemtray.nix
index 4d59166b2c8c..2adaac2d6944 100644
--- a/pkgs/by-name/wi/windowmaker/dockapps/wmsystemtray.nix
+++ b/pkgs/by-name/wi/windowmaker/dockapps/wmsystemtray.nix
@@ -2,11 +2,11 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXext,
-  libXfixes,
-  libXmu,
-  libXpm,
+  libx11,
+  libxext,
+  libxfixes,
+  libxmu,
+  libxpm,
   pkg-config,
 }:
 
@@ -24,11 +24,11 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXext
-    libXfixes
-    libXmu
-    libXpm
+    libx11
+    libxext
+    libxfixes
+    libxmu
+    libxpm
   ];
 
   meta = {
diff --git a/pkgs/by-name/wi/windowmaker/package.nix b/pkgs/by-name/wi/windowmaker/package.nix
index f5eef14cdf0e..3787e2d0c9e0 100644
--- a/pkgs/by-name/wi/windowmaker/package.nix
+++ b/pkgs/by-name/wi/windowmaker/package.nix
@@ -6,14 +6,14 @@
   callPackage,
   pkg-config,
   imagemagick,
-  libX11,
-  libXext,
-  libXft,
-  libXinerama,
-  libXmu,
-  libXpm,
-  libXrandr,
-  libXres,
+  libx11,
+  libxext,
+  libxft,
+  libxinerama,
+  libxmu,
+  libxpm,
+  libxrandr,
+  libxres,
   libexif,
   libjpeg,
   libpng,
@@ -41,14 +41,14 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     giflib
     imagemagick
-    libX11
-    libXext
-    libXft
-    libXinerama
-    libXmu
-    libXpm
-    libXrandr
-    libXres
+    libx11
+    libxext
+    libxft
+    libxinerama
+    libxmu
+    libxpm
+    libxrandr
+    libxres
     libexif
     libjpeg
     libpng
diff --git a/pkgs/by-name/wi/wireworld/package.nix b/pkgs/by-name/wi/wireworld/package.nix
index fb21db984a61..cbcececa93a0 100644
--- a/pkgs/by-name/wi/wireworld/package.nix
+++ b/pkgs/by-name/wi/wireworld/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
   desktopItems = [
     (makeDesktopItem {
       name = "Wireworld";
-      exec = "wireworld";
+      exec = "Wireworld";
       comment = "";
       desktopName = "Wireworld";
       genericName = "Wireworld";
diff --git a/pkgs/by-name/wi/wivrn/package.nix b/pkgs/by-name/wi/wivrn/package.nix
index ceae12fdae2d..8a0dac1d20f3 100644
--- a/pkgs/by-name/wi/wivrn/package.nix
+++ b/pkgs/by-name/wi/wivrn/package.nix
@@ -29,8 +29,8 @@
   libpulseaudio,
   librsvg,
   libva,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
   makeDesktopItem,
   nix-update-script,
   nlohmann_json,
@@ -115,8 +115,8 @@ stdenv.mkDerivation (finalAttrs: {
     glm
     harfbuzz
     libGL
-    libX11
-    libXrandr
+    libx11
+    libxrandr
     openxr-loader
     shaderc
     systemd
diff --git a/pkgs/by-name/wk/wkg/package.nix b/pkgs/by-name/wk/wkg/package.nix
index 7c9dccb8dd73..1b677d44571b 100644
--- a/pkgs/by-name/wk/wkg/package.nix
+++ b/pkgs/by-name/wk/wkg/package.nix
@@ -8,15 +8,15 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wkg";
-  version = "0.13.0";
+  version = "0.14.0";
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wasm-pkg-tools";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6adUBw3jtmEq1y+hdnE7EBMgF5KChXr2MtOiSEPi1Ao=";
+    hash = "sha256-nFPfDVs/C7GtmLKy4V+ECsZvsABNfaxR3iDbDrnlMek=";
   };
 
-  cargoHash = "sha256-BAHdOrLrSspSN1WsCtglCOQebI39zw6Byj9EgvU3onA=";
+  cargoHash = "sha256-KfF9VePqkWVdDU5C8b7x9u+uXPnrO5wVxQQZz8eJ4vM=";
 
   # A large number of tests require Internet access in order to function.
   doCheck = false;
diff --git a/pkgs/by-name/wl/wlay/package.nix b/pkgs/by-name/wl/wlay/package.nix
index 2a529a3c62a1..2bacf54729d9 100644
--- a/pkgs/by-name/wl/wlay/package.nix
+++ b/pkgs/by-name/wl/wlay/package.nix
@@ -5,9 +5,9 @@
   cmake,
   extra-cmake-modules,
   glfw3,
-  libX11,
-  libXau,
-  libXdmcp,
+  libx11,
+  libxau,
+  libxdmcp,
   libepoxy,
   libffi,
   libxcb,
@@ -37,9 +37,9 @@ stdenv.mkDerivation {
 
   buildInputs = [
     glfw3
-    libX11
-    libXau
-    libXdmcp
+    libx11
+    libxau
+    libxdmcp
     libepoxy
     libffi
     libxcb
diff --git a/pkgs/by-name/wl/wlopm/package.nix b/pkgs/by-name/wl/wlopm/package.nix
index 6025fb941dc7..c9f4a955d98c 100644
--- a/pkgs/by-name/wl/wlopm/package.nix
+++ b/pkgs/by-name/wl/wlopm/package.nix
@@ -6,14 +6,14 @@
   wayland-scanner,
 }:
 
-stdenv.mkDerivation (finalAttr: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "wlopm";
   version = "1.0.0";
 
   src = fetchFromSourcehut {
     owner = "~leon_plickat";
     repo = "wlopm";
-    rev = "v${finalAttr.version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-GrcV51mUZUaiiYhko8ysaTieJoZDcunLn1yG5k+TpQQ=";
   };
 
diff --git a/pkgs/by-name/wm/wmctrl/package.nix b/pkgs/by-name/wm/wmctrl/package.nix
index f6198c42e6f3..ae236690dc61 100644
--- a/pkgs/by-name/wm/wmctrl/package.nix
+++ b/pkgs/by-name/wm/wmctrl/package.nix
@@ -2,10 +2,10 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
   glib,
   pkg-config,
-  libXmu,
+  libxmu,
 }:
 
 stdenv.mkDerivation rec {
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
   depsBuildBuild = [ pkg-config ];
   nativeBuildInputs = [ glib.dev ];
   buildInputs = [
-    libX11
-    libXmu
+    libx11
+    libxmu
     glib
   ];
 
diff --git a/pkgs/by-name/wm/wmderland/package.nix b/pkgs/by-name/wm/wmderland/package.nix
index a875587b932f..d64c266b548f 100644
--- a/pkgs/by-name/wm/wmderland/package.nix
+++ b/pkgs/by-name/wm/wmderland/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   libnotify,
-  libX11,
+  libx11,
   xorgproto,
   nixosTests,
 }:
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
   '';
 
   buildInputs = [
-    libX11
+    libx11
     xorgproto
   ];
 
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
     description = "Modern and minimal X11 tiling window manager";
     homepage = "https://github.com/aesophor/wmderland";
     license = lib.licenses.mit;
-    platforms = libX11.meta.platforms;
+    platforms = libx11.meta.platforms;
     maintainers = with lib.maintainers; [ takagiy ];
     mainProgram = "wmderland";
   };
diff --git a/pkgs/by-name/wm/wmderlandc/package.nix b/pkgs/by-name/wm/wmderlandc/package.nix
index 87e63dec4199..ec3bb2c4e144 100644
--- a/pkgs/by-name/wm/wmderlandc/package.nix
+++ b/pkgs/by-name/wm/wmderlandc/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  libX11,
+  libx11,
   xorgproto,
 }:
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     xorgproto
   ];
 
diff --git a/pkgs/by-name/wm/wmfs/package.nix b/pkgs/by-name/wm/wmfs/package.nix
index 6f17819533f1..273c2c920d85 100644
--- a/pkgs/by-name/wm/wmfs/package.nix
+++ b/pkgs/by-name/wm/wmfs/package.nix
@@ -3,11 +3,11 @@
   stdenv,
   fetchFromGitHub,
   fetchpatch,
-  libX11,
-  libXinerama,
-  libXrandr,
-  libXpm,
-  libXft,
+  libx11,
+  libxinerama,
+  libxrandr,
+  libxpm,
+  libxft,
   imlib2,
 }:
 stdenv.mkDerivation {
@@ -35,11 +35,11 @@ stdenv.mkDerivation {
 
   buildInputs = [
     imlib2
-    libX11
-    libXinerama
-    libXrandr
-    libXpm
-    libXft
+    libx11
+    libxinerama
+    libxrandr
+    libxpm
+    libxft
   ];
 
   preConfigure = "substituteInPlace configure --replace '-lxft' '-lXft'";
diff --git a/pkgs/by-name/wm/wmii/package.nix b/pkgs/by-name/wm/wmii/package.nix
index ad9105498f73..bd43465c19a9 100644
--- a/pkgs/by-name/wm/wmii/package.nix
+++ b/pkgs/by-name/wm/wmii/package.nix
@@ -3,12 +3,12 @@
   stdenv,
   fetchFromGitHub,
   dash,
-  libX11,
-  libXext,
-  libXft,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxext,
+  libxft,
+  libxinerama,
+  libxrandr,
+  libxrender,
   libixp,
   pkg-config,
   txt2tags,
@@ -57,12 +57,12 @@ stdenv.mkDerivation {
   ];
   buildInputs = [
     dash
-    libX11
-    libXext
-    libXft
-    libXinerama
-    libXrandr
-    libXrender
+    libx11
+    libxext
+    libxft
+    libxinerama
+    libxrandr
+    libxrender
     libixp
     txt2tags
     which
diff --git a/pkgs/by-name/wm/wmname/package.nix b/pkgs/by-name/wm/wmname/package.nix
index 4ba2bd581c13..287934da6db5 100644
--- a/pkgs/by-name/wm/wmname/package.nix
+++ b/pkgs/by-name/wm/wmname/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace Makefile --replace "@strip" "#@strip"
   '';
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   makeFlags = [ "CC:=$(CC)" ];
 
diff --git a/pkgs/by-name/wo/wolf-shaper/package.nix b/pkgs/by-name/wo/wolf-shaper/package.nix
index 481a0e5f6998..7e78c4a877b4 100644
--- a/pkgs/by-name/wo/wolf-shaper/package.nix
+++ b/pkgs/by-name/wo/wolf-shaper/package.nix
@@ -7,7 +7,7 @@
   libx11,
   liblo,
   libGL,
-  libXcursor,
+  libxcursor,
   pkg-config,
 }:
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     libx11
     liblo
     libGL
-    libXcursor
+    libxcursor
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/wo/wordgrinder/package.nix b/pkgs/by-name/wo/wordgrinder/package.nix
index bea0b9bef9d2..3dbf8c2c0670 100644
--- a/pkgs/by-name/wo/wordgrinder/package.nix
+++ b/pkgs/by-name/wo/wordgrinder/package.nix
@@ -5,7 +5,7 @@
   pkg-config,
   makeWrapper,
   lua52Packages,
-  libXft,
+  libxft,
   ncurses,
   ninja,
   readline,
@@ -51,11 +51,11 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libXft
+    libxft
   ];
 
   # To be able to find <Xft.h>
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isLinux "-I${libXft.dev}/include/X11";
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isLinux "-I${libxft.dev}/include/X11";
 
   # Binaries look for LuaFileSystem library (lfs.so) at runtime
   postInstall = ''
diff --git a/pkgs/by-name/wo/worker/package.nix b/pkgs/by-name/wo/worker/package.nix
index 6f0f3100c10f..5122742e2e93 100644
--- a/pkgs/by-name/wo/worker/package.nix
+++ b/pkgs/by-name/wo/worker/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-xJxdOb6eEr8suf3u/vouYCGzTFugJpLtoKyCMeuoJv4=";
   };
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   outputs = [
     "out"
@@ -37,6 +37,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = with lib.licenses; [ gpl2Plus ];
     mainProgram = "worker";
     maintainers = [ ];
-    inherit (libX11.meta) platforms;
+    inherit (libx11.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/wo/workrave/package.nix b/pkgs/by-name/wo/workrave/package.nix
index 545b4f511f19..730c297d0f04 100644
--- a/pkgs/by-name/wo/workrave/package.nix
+++ b/pkgs/by-name/wo/workrave/package.nix
@@ -12,8 +12,8 @@
   pkg-config,
   libice,
   libsm,
-  libXScrnSaver,
-  libXtst,
+  libxscrnsaver,
+  libxtst,
   gobject-introspection,
   glib,
   glibmm,
@@ -58,8 +58,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libice
     libsm
-    libXScrnSaver
-    libXtst
+    libxscrnsaver
+    libxtst
     glib
     glibmm
     gtkmm3
diff --git a/pkgs/by-name/wx/wxGTK31/package.nix b/pkgs/by-name/wx/wxGTK31/package.nix
index 9fd4bf665814..96d93fe3e942 100644
--- a/pkgs/by-name/wx/wxGTK31/package.nix
+++ b/pkgs/by-name/wx/wxGTK31/package.nix
@@ -8,9 +8,9 @@
   libGL,
   libGLU,
   libsm,
-  libXinerama,
-  libXtst,
-  libXxf86vm,
+  libxinerama,
+  libxtst,
+  libxxf86vm,
   pkg-config,
   xorgproto,
   compat28 ? false,
@@ -54,9 +54,9 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
     gtk3
     libsm
-    libXinerama
-    libXtst
-    libXxf86vm
+    libxinerama
+    libxtst
+    libxxf86vm
     xorgproto
   ]
   ++ lib.optional withCurl curl
diff --git a/pkgs/by-name/wx/wxGTK32/package.nix b/pkgs/by-name/wx/wxGTK32/package.nix
index b7bf1124e034..2dfffacec6a9 100644
--- a/pkgs/by-name/wx/wxGTK32/package.nix
+++ b/pkgs/by-name/wx/wxGTK32/package.nix
@@ -10,9 +10,9 @@
   libGL,
   libGLU,
   libsm,
-  libXinerama,
-  libXtst,
-  libXxf86vm,
+  libxinerama,
+  libxtst,
+  libxxf86vm,
   libnotify,
   libpng,
   libsecret,
@@ -72,9 +72,9 @@ stdenv.mkDerivation (finalAttrs: {
     gspell # wxTextCtrl spell checking
     gtk3
     libsm
-    libXinerama
-    libXtst
-    libXxf86vm
+    libxinerama
+    libxtst
+    libxxf86vm
     libnotify # wxNotificationMessage backend
     libsecret # wxSecretStore backend
     libxkbcommon # proper key codes in key events
diff --git a/pkgs/by-name/wx/wxwidgets_3_3/package.nix b/pkgs/by-name/wx/wxwidgets_3_3/package.nix
index 973fd1d4a91c..10e67f63b2c4 100644
--- a/pkgs/by-name/wx/wxwidgets_3_3/package.nix
+++ b/pkgs/by-name/wx/wxwidgets_3_3/package.nix
@@ -10,9 +10,9 @@
   libGL,
   libGLU,
   libsm,
-  libXinerama,
-  libXtst,
-  libXxf86vm,
+  libxinerama,
+  libxtst,
+  libxxf86vm,
   libnotify,
   libpng,
   libsecret,
@@ -58,9 +58,9 @@ stdenv.mkDerivation (finalAttrs: {
     gspell # wxTextCtrl spell checking
     gtk3
     libsm
-    libXinerama
-    libXtst
-    libXxf86vm
+    libxinerama
+    libxtst
+    libxxf86vm
     libnotify # wxNotificationMessage backend
     libsecret # wxSecretStore backend
     libxkbcommon # proper key codes in key events
diff --git a/pkgs/by-name/x1/x11basic/package.nix b/pkgs/by-name/x1/x11basic/package.nix
index 5a9f4acfb32a..1e2d2956389e 100644
--- a/pkgs/by-name/x1/x11basic/package.nix
+++ b/pkgs/by-name/x1/x11basic/package.nix
@@ -5,7 +5,7 @@
   autoreconfHook,
   fig2dev,
   readline,
-  libX11,
+  libx11,
   bluez,
   SDL2,
 }:
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     readline
-    libX11
+    libx11
     SDL2
     bluez
   ];
diff --git a/pkgs/by-name/x2/x2goclient/package.nix b/pkgs/by-name/x2/x2goclient/package.nix
index 93d118d415a9..623e5aec9e0f 100644
--- a/pkgs/by-name/x2/x2goclient/package.nix
+++ b/pkgs/by-name/x2/x2goclient/package.nix
@@ -6,7 +6,7 @@
   pkg-config,
   bash,
   cups,
-  libXpm,
+  libxpm,
   libssh,
   nx-libs,
   openldap,
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     cups
-    libXpm
+    libxpm
     libssh
     libsForQt5.phonon
     libsForQt5.qtbase
diff --git a/pkgs/by-name/x2/x2x/package.nix b/pkgs/by-name/x2/x2x/package.nix
index 76c14aa14330..51466f358818 100644
--- a/pkgs/by-name/x2/x2x/package.nix
+++ b/pkgs/by-name/x2/x2x/package.nix
@@ -1,13 +1,13 @@
 {
   lib,
   stdenv,
-  libX11,
-  libXtst,
-  libXext,
+  libx11,
+  libxtst,
+  libxext,
   fetchFromGitHub,
   autoreconfHook,
   pkg-config,
-  libXi,
+  libxi,
 }:
 
 stdenv.mkDerivation {
@@ -26,10 +26,10 @@ stdenv.mkDerivation {
     pkg-config
   ];
   buildInputs = [
-    libX11
-    libXtst
-    libXext
-    libXi
+    libx11
+    libxtst
+    libxext
+    libxi
   ];
 
   meta = {
diff --git a/pkgs/by-name/x3/x3270/package.nix b/pkgs/by-name/x3/x3270/package.nix
index d3e9c89bbad3..9ea5e52faa47 100644
--- a/pkgs/by-name/x3/x3270/package.nix
+++ b/pkgs/by-name/x3/x3270/package.nix
@@ -5,10 +5,10 @@
   fetchurl,
   m4,
   expat,
-  libX11,
-  libXt,
-  libXaw,
-  libXmu,
+  libx11,
+  libxt,
+  libxaw,
+  libxmu,
   bdftopcf,
   mkfontdir,
   font-adobe-100dpi,
@@ -67,10 +67,10 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     expat
-    libX11
-    libXt
-    libXaw
-    libXmu
+    libx11
+    libxt
+    libxaw
+    libxmu
     bdftopcf
     mkfontdir
     font-adobe-100dpi
diff --git a/pkgs/by-name/xa/Xaw3d/package.nix b/pkgs/by-name/xa/Xaw3d/package.nix
index f9a2230c0d69..7ea6a8480e92 100644
--- a/pkgs/by-name/xa/Xaw3d/package.nix
+++ b/pkgs/by-name/xa/Xaw3d/package.nix
@@ -5,11 +5,11 @@
   bison,
   flex,
   pkg-config,
-  libXext,
-  libXmu,
-  libXpm,
-  libXp,
-  libXt,
+  libxext,
+  libxmu,
+  libxpm,
+  libxp,
+  libxt,
   xorgproto,
 }:
 
@@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: {
     flex
   ];
   buildInputs = [
-    libXext
-    libXpm
-    libXp
+    libxext
+    libxpm
+    libxp
   ];
   propagatedBuildInputs = [
-    libXmu
-    libXt
+    libxmu
+    libxt
     xorgproto
   ];
 
diff --git a/pkgs/by-name/xa/xannotate/package.nix b/pkgs/by-name/xa/xannotate/package.nix
index fc367100f01b..ddaecf7ddb4a 100644
--- a/pkgs/by-name/xa/xannotate/package.nix
+++ b/pkgs/by-name/xa/xannotate/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
 }:
 stdenv.mkDerivation {
   pname = "xannotate";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     sha256 = "sha256-BDRg29ojBOFfwD4hx3XbcabwrJn2nfgI9Ld27FaQoRw=";
   };
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   meta = {
     description = "Tool to scribble over X windows";
diff --git a/pkgs/by-name/xa/xarcan/package.nix b/pkgs/by-name/xa/xarcan/package.nix
index e662f887d8e2..953197d2a914 100644
--- a/pkgs/by-name/xa/xarcan/package.nix
+++ b/pkgs/by-name/xa/xarcan/package.nix
@@ -9,10 +9,10 @@
   libepoxy,
   font-util,
   libGL,
-  libX11,
-  libXau,
-  libXdmcp,
-  libXfont2,
+  libx11,
+  libxau,
+  libxdmcp,
+  libxfont_2,
   libdrm,
   libgcrypt,
   libmd,
@@ -65,10 +65,10 @@ stdenv.mkDerivation (finalPackages: rec {
     libepoxy
     font-util
     libGL
-    libX11
-    libXau
-    libXdmcp
-    libXfont2
+    libx11
+    libxau
+    libxdmcp
+    libxfont_2
     libdrm
     libgcrypt
     libmd
diff --git a/pkgs/by-name/xa/xautocfg/package.nix b/pkgs/by-name/xa/xautocfg/package.nix
index c03ac7c28ac2..836bcd4bafff 100644
--- a/pkgs/by-name/xa/xautocfg/package.nix
+++ b/pkgs/by-name/xa/xautocfg/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXi,
+  libx11,
+  libxi,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -18,8 +18,8 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
-    libXi
+    libx11
+    libxi
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/xa/xautolock/package.nix b/pkgs/by-name/xa/xautolock/package.nix
index b9f50f0a15f8..e2692cadf667 100644
--- a/pkgs/by-name/xa/xautolock/package.nix
+++ b/pkgs/by-name/xa/xautolock/package.nix
@@ -4,9 +4,9 @@
   fetchFromGitHub,
   imake,
   gccmakedep,
-  libX11,
-  libXext,
-  libXScrnSaver,
+  libx11,
+  libxext,
+  libxscrnsaver,
   xorgproto,
   nixosTests,
 }:
@@ -29,9 +29,9 @@ stdenv.mkDerivation (finalAttrs: {
     gccmakedep
   ];
   buildInputs = [
-    libX11
-    libXext
-    libXScrnSaver
+    libx11
+    libxext
+    libxscrnsaver
     xorgproto
   ];
 
diff --git a/pkgs/by-name/xa/xautomation/package.nix b/pkgs/by-name/xa/xautomation/package.nix
index dbcaf6f39798..682e8b41fc94 100644
--- a/pkgs/by-name/xa/xautomation/package.nix
+++ b/pkgs/by-name/xa/xautomation/package.nix
@@ -4,10 +4,10 @@
   fetchurl,
   pkg-config,
   libpng,
-  libX11,
-  libXext,
-  libXi,
-  libXtst,
+  libx11,
+  libxext,
+  libxi,
+  libxtst,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -21,10 +21,10 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     libpng
-    libX11
-    libXext
-    libXi
-    libXtst
+    libx11
+    libxext
+    libxi
+    libxtst
   ];
 
   meta = {
diff --git a/pkgs/by-name/xa/xawtv/package.nix b/pkgs/by-name/xa/xawtv/package.nix
index 6e9e1c0e6067..5daee7f40e87 100644
--- a/pkgs/by-name/xa/xawtv/package.nix
+++ b/pkgs/by-name/xa/xawtv/package.nix
@@ -4,17 +4,17 @@
   fetchurl,
   ncurses,
   libjpeg,
-  libX11,
-  libXt,
+  libx11,
+  libxt,
   alsa-lib,
   aalib,
-  libXft,
+  libxft,
   xorgproto,
   libv4l,
   libfs,
-  libXaw,
-  libXpm,
-  libXext,
+  libxaw,
+  libxpm,
+  libxext,
   libsm,
   libice,
   perl,
@@ -38,17 +38,17 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     ncurses
     libjpeg
-    libX11
-    libXt
-    libXft
+    libx11
+    libxt
+    libxft
     xorgproto
     libfs
     perl
     alsa-lib
     aalib
-    libXaw
-    libXpm
-    libXext
+    libxaw
+    libxpm
+    libxext
     libsm
     libice
     libv4l
diff --git a/pkgs/by-name/xb/xbanish/package.nix b/pkgs/by-name/xb/xbanish/package.nix
index e21b8cdf5137..572c7bb0778c 100644
--- a/pkgs/by-name/xb/xbanish/package.nix
+++ b/pkgs/by-name/xb/xbanish/package.nix
@@ -2,11 +2,11 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXi,
-  libXt,
-  libXfixes,
-  libXext,
+  libx11,
+  libxi,
+  libxt,
+  libxfixes,
+  libxext,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "xbanish";
 
   buildInputs = [
-    libX11
-    libXi
-    libXt
-    libXfixes
-    libXext
+    libx11
+    libxi
+    libxt
+    libxfixes
+    libxext
   ];
 
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/xb/xbattbar/package.nix b/pkgs/by-name/xb/xbattbar/package.nix
index 8ab71fa18b8e..88f82d032183 100644
--- a/pkgs/by-name/xb/xbattbar/package.nix
+++ b/pkgs/by-name/xb/xbattbar/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchgit,
-  libX11,
+  libx11,
   perl,
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-ZrJAyDyvlUmNpxBC06yrzBJ7vhrZY4+GbfBDQoF+h4M=";
   };
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   # remove the APM checker binary, make the sys checker
   # script the default. Rationale: checking battery status by /proc/apm is
diff --git a/pkgs/by-name/xb/xbill/package.nix b/pkgs/by-name/xb/xbill/package.nix
index 71cf40ee90a4..bba06f21d954 100644
--- a/pkgs/by-name/xb/xbill/package.nix
+++ b/pkgs/by-name/xb/xbill/package.nix
@@ -6,9 +6,9 @@
   copyDesktopItems,
   fetchpatch,
   fetchurl,
-  libX11,
-  libXpm,
-  libXt,
+  libx11,
+  libxpm,
+  libxt,
   motif,
 }:
 
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libX11
-    libXpm
-    libXt
+    libx11
+    libxpm
+    libxt
     motif
   ];
 
diff --git a/pkgs/by-name/xb/xbindkeys/package.nix b/pkgs/by-name/xb/xbindkeys/package.nix
index 47bb0fa045c6..87e4974df50f 100644
--- a/pkgs/by-name/xb/xbindkeys/package.nix
+++ b/pkgs/by-name/xb/xbindkeys/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   autoreconfHook,
   pkg-config,
-  libX11,
+  libx11,
   guile,
 }:
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
   buildInputs = [
-    libX11
+    libx11
     guile
   ];
 
diff --git a/pkgs/by-name/xb/xboard/package.nix b/pkgs/by-name/xb/xboard/package.nix
index c0fb2a389fff..46a7a5660bb5 100644
--- a/pkgs/by-name/xb/xboard/package.nix
+++ b/pkgs/by-name/xb/xboard/package.nix
@@ -3,17 +3,17 @@
   stdenv,
   fetchurl,
   fetchpatch,
-  libX11,
+  libx11,
   xorgproto,
-  libXt,
-  libXaw,
+  libxt,
+  libxaw,
   libsm,
   libice,
-  libXmu,
-  libXext,
+  libxmu,
+  libxext,
   gnuchess,
   texinfo,
-  libXpm,
+  libxpm,
   pkg-config,
   librsvg,
   cairo,
@@ -42,17 +42,17 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    libX11
+    libx11
     xorgproto
-    libXt
-    libXaw
+    libxt
+    libxaw
     libsm
     libice
-    libXmu
-    libXext
+    libxmu
+    libxext
     gnuchess
     texinfo
-    libXpm
+    libxpm
     librsvg
     cairo
     pango
diff --git a/pkgs/by-name/xb/xbomb/package.nix b/pkgs/by-name/xb/xbomb/package.nix
index 8c640cd2b325..db4863dede5e 100644
--- a/pkgs/by-name/xb/xbomb/package.nix
+++ b/pkgs/by-name/xb/xbomb/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXaw,
+  libx11,
+  libxaw,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -15,8 +15,8 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
-    libXaw
+    libx11
+    libxaw
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/xc/xcalib/package.nix b/pkgs/by-name/xc/xcalib/package.nix
index 196a54bcc1d6..37b91a7dd9e3 100644
--- a/pkgs/by-name/xc/xcalib/package.nix
+++ b/pkgs/by-name/xc/xcalib/package.nix
@@ -4,9 +4,9 @@
   fetchFromCodeberg,
   cmake,
   ninja,
-  libX11,
-  libXxf86vm,
-  libXrandr,
+  libx11,
+  libxxf86vm,
+  libxrandr,
   samurai,
   fetchpatch,
 }:
@@ -36,9 +36,9 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXxf86vm
-    libXrandr
+    libx11
+    libxxf86vm
+    libxrandr
     samurai
   ];
 
diff --git a/pkgs/by-name/xc/xcape/package.nix b/pkgs/by-name/xc/xcape/package.nix
index fbcf5e6b4f58..b13d3d4e7779 100644
--- a/pkgs/by-name/xc/xcape/package.nix
+++ b/pkgs/by-name/xc/xcape/package.nix
@@ -3,10 +3,10 @@
   stdenv,
   fetchFromGitHub,
   pkg-config,
-  libX11,
-  libXtst,
+  libx11,
+  libxtst,
   xorgproto,
-  libXi,
+  libxi,
 }:
 
 stdenv.mkDerivation {
@@ -23,10 +23,10 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    libX11
-    libXtst
+    libx11
+    libxtst
     xorgproto
-    libXi
+    libxi
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/xc/xcbutilxrm/package.nix b/pkgs/by-name/xc/xcbutilxrm/package.nix
index a5ade77c1250..ab227c2a54fa 100644
--- a/pkgs/by-name/xc/xcbutilxrm/package.nix
+++ b/pkgs/by-name/xc/xcbutilxrm/package.nix
@@ -6,7 +6,7 @@
   m4,
   libxcb,
   libxcb-util,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation rec {
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libxcb
     libxcb-util
-    libX11
+    libx11
   ];
 
   meta = {
diff --git a/pkgs/by-name/xc/xchainkeys/package.nix b/pkgs/by-name/xc/xchainkeys/package.nix
index 4650b13cdc7a..84d9ba874de1 100644
--- a/pkgs/by-name/xc/xchainkeys/package.nix
+++ b/pkgs/by-name/xc/xchainkeys/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "1rpqs7h5krral08vqxwb0imy33z17v5llvrg5hy8hkl2ap7ya0mn";
   };
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   meta = {
     homepage = "http://henning-bekel.de/xchainkeys/";
diff --git a/pkgs/by-name/xc/xclicker/package.nix b/pkgs/by-name/xc/xclicker/package.nix
index 2a1e05350083..85281bd0d8c9 100644
--- a/pkgs/by-name/xc/xclicker/package.nix
+++ b/pkgs/by-name/xc/xclicker/package.nix
@@ -7,7 +7,7 @@
   pkg-config,
   wrapGAppsHook3,
   gtk3,
-  libXtst,
+  libxtst,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     gtk3
-    libXtst
+    libxtst
   ];
 
   mesonBuildType = "release";
diff --git a/pkgs/by-name/xc/xclip/package.nix b/pkgs/by-name/xc/xclip/package.nix
index 9ee63bd97221..058e28e314b6 100644
--- a/pkgs/by-name/xc/xclip/package.nix
+++ b/pkgs/by-name/xc/xclip/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   autoreconfHook,
-  libXmu,
+  libxmu,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  buildInputs = [ libXmu ];
+  buildInputs = [ libxmu ];
 
   meta = {
     description = "Tool to access the X clipboard from a console application";
diff --git a/pkgs/by-name/xc/xcolor/package.nix b/pkgs/by-name/xc/xcolor/package.nix
index 804c85f1bf5d..1f30e53039b2 100644
--- a/pkgs/by-name/xc/xcolor/package.nix
+++ b/pkgs/by-name/xc/xcolor/package.nix
@@ -3,8 +3,8 @@
   rustPlatform,
   fetchFromGitHub,
   pkg-config,
-  libX11,
-  libXcursor,
+  libx11,
+  libxcursor,
   libxcb,
   python3,
   installShellFiles,
@@ -33,8 +33,8 @@ rustPlatform.buildRustPackage rec {
   ];
 
   buildInputs = [
-    libX11
-    libXcursor
+    libx11
+    libxcursor
     libxcb
   ];
 
diff --git a/pkgs/by-name/xc/xconq/package.nix b/pkgs/by-name/xc/xconq/package.nix
index b96e22314b06..1bc52e5be5c0 100644
--- a/pkgs/by-name/xc/xconq/package.nix
+++ b/pkgs/by-name/xc/xconq/package.nix
@@ -4,13 +4,13 @@
   fetchurl,
   cpio,
   xorgproto,
-  libX11,
-  libXmu,
-  libXaw,
-  libXt,
+  libx11,
+  libxmu,
+  libxaw,
+  libxt,
   tcl,
   tk,
-  libXext,
+  libxext,
   fontconfig,
   makeWrapper,
 }:
@@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     cpio
     xorgproto
-    libX11
-    libXmu
-    libXaw
-    libXt
+    libx11
+    libxmu
+    libxaw
+    libxt
     tcl
     tk
-    libXext
+    libxext
     fontconfig
   ];
 
diff --git a/pkgs/by-name/xc/xcruiser/package.nix b/pkgs/by-name/xc/xcruiser/package.nix
index e37436dc7552..52b92812390e 100644
--- a/pkgs/by-name/xc/xcruiser/package.nix
+++ b/pkgs/by-name/xc/xcruiser/package.nix
@@ -4,10 +4,10 @@
   fetchurl,
   gccmakedep,
   imake,
-  libXt,
-  libXaw,
-  libXpm,
-  libXext,
+  libxt,
+  libxaw,
+  libxpm,
+  libxext,
   copyDesktopItems,
   makeDesktopItem,
 }:
@@ -27,10 +27,10 @@ stdenv.mkDerivation (finalAttrs: {
     copyDesktopItems
   ];
   buildInputs = [
-    libXt
-    libXaw
-    libXpm
-    libXext
+    libxt
+    libxaw
+    libxpm
+    libxext
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/xc/xcursor-themes/package.nix b/pkgs/by-name/xc/xcursor-themes/package.nix
index 628d9b71baf6..ca48f0f9a14b 100644
--- a/pkgs/by-name/xc/xcursor-themes/package.nix
+++ b/pkgs/by-name/xc/xcursor-themes/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    description = "Default set of cursor themes for use with libXcursor.";
+    description = "Default set of cursor themes for use with libxcursor.";
     homepage = "https://gitlab.freedesktop.org/xorg/data/cursors";
     license = lib.licenses.x11;
     maintainers = [ ];
diff --git a/pkgs/by-name/xc/xcursorgen/package.nix b/pkgs/by-name/xc/xcursorgen/package.nix
index 19f65724d1bf..42eca7ba4808 100644
--- a/pkgs/by-name/xc/xcursorgen/package.nix
+++ b/pkgs/by-name/xc/xcursorgen/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    description = "prepares X11 cursor sets for use with libXcursor";
+    description = "prepares X11 cursor sets for use with libxcursor";
     homepage = "https://gitlab.freedesktop.org/xorg/app/xcursorgen";
     license = lib.licenses.hpndSellVariant;
     mainProgram = "xcursorgen";
diff --git a/pkgs/by-name/xc/xcwd/package.nix b/pkgs/by-name/xc/xcwd/package.nix
index b206010dfbdb..f151a90827b2 100644
--- a/pkgs/by-name/xc/xcwd/package.nix
+++ b/pkgs/by-name/xc/xcwd/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-M6/1H6hI50Cvx40RTKzZXoUui0FGZfwe1IwdaxMJIQo=";
   };
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   makeFlags = [ "prefix=$(out)" ];
 
diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
index 034a0ed121d3..e817afe245de 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
@@ -17,14 +17,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "xdg-desktop-portal-cosmic";
-  version = "1.0.3";
+  version = "1.0.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "xdg-desktop-portal-cosmic";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-5U0xjVEGrOZzw7WnQRvoQe4VuWJ9drV3kNV/ogZQJio=";
+    hash = "sha256-ZTGQs3rPhl9tByqdwLWDUnQJczdAbK0FlohoRhd7afo=";
   };
 
   cargoHash = "sha256-99MGWfZrDOav77SRI7c5V21JTfkq7ejC7x+ZiQ5J0Yw=";
diff --git a/pkgs/by-name/xd/xdg-utils/package.nix b/pkgs/by-name/xd/xdg-utils/package.nix
index 442101475ab5..9e29b0c5a41e 100644
--- a/pkgs/by-name/xd/xdg-utils/package.nix
+++ b/pkgs/by-name/xd/xdg-utils/package.nix
@@ -297,7 +297,7 @@ let
   ];
 in
 
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "xdg-utils";
   version = "1.2.1";
 
@@ -305,7 +305,7 @@ stdenv.mkDerivation (self: {
     domain = "gitlab.freedesktop.org";
     owner = "xdg";
     repo = "xdg-utils";
-    rev = "v${self.version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-58ElbrVlk+13DUODSEHBPcDDt9H+Kuee8Rz9CIcoy0I=";
   };
 
@@ -336,7 +336,7 @@ stdenv.mkDerivation (self: {
   passthru.tests.xdg-mime =
     runCommand "xdg-mime-test"
       {
-        nativeBuildInputs = [ self.finalPackage ];
+        nativeBuildInputs = [ finalAttrs.finalPackage ];
         preferLocalBuild = true;
         xenias = lib.mapAttrsToList (hash: urls: fetchurl { inherit hash urls; }) {
           "sha256-SL95tM1AjOi7vDnCyT10s0tvQvc+ZSZBbkNOYXfbOy0=" = [
diff --git a/pkgs/by-name/xd/xdotool/package.nix b/pkgs/by-name/xd/xdotool/package.nix
index 780d424c17f9..818556389ec1 100644
--- a/pkgs/by-name/xd/xdotool/package.nix
+++ b/pkgs/by-name/xd/xdotool/package.nix
@@ -3,14 +3,14 @@
   stdenv,
   fetchFromGitHub,
   pkg-config,
-  libX11,
+  libx11,
   perl,
-  libXtst,
+  libxtst,
   xorgproto,
-  libXi,
-  libXinerama,
+  libxi,
+  libxinerama,
   libxkbcommon,
-  libXext,
+  libxext,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: {
     perl
   ];
   buildInputs = [
-    libX11
-    libXtst
+    libx11
+    libxtst
     xorgproto
-    libXi
-    libXinerama
+    libxi
+    libxinerama
     libxkbcommon
-    libXext
+    libxext
   ];
 
   preBuild = ''
diff --git a/pkgs/by-name/xe/xearth/package.nix b/pkgs/by-name/xe/xearth/package.nix
index ee54beb0e534..4b2c81eef0ff 100644
--- a/pkgs/by-name/xe/xearth/package.nix
+++ b/pkgs/by-name/xe/xearth/package.nix
@@ -4,8 +4,8 @@
   fetchurl,
   imake,
   gccmakedep,
-  libXt,
-  libXext,
+  libxt,
+  libxext,
 }:
 
 stdenv.mkDerivation rec {
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libXt
-    libXext
+    libxt
+    libxext
   ];
 
   installFlags = [
diff --git a/pkgs/by-name/xe/xedit/package.nix b/pkgs/by-name/xe/xedit/package.nix
index eae263bfe633..a311ad0681bc 100644
--- a/pkgs/by-name/xe/xedit/package.nix
+++ b/pkgs/by-name/xe/xedit/package.nix
@@ -5,10 +5,10 @@
   autoreconfHook,
   pkg-config,
   util-macros,
-  libX11,
-  libXaw,
-  libXmu,
-  libXt,
+  libx11,
+  libxaw,
+  libxmu,
+  libxt,
 }:
 
 stdenv.mkDerivation rec {
@@ -36,10 +36,10 @@ stdenv.mkDerivation rec {
     util-macros
   ];
   buildInputs = [
-    libX11
-    libXaw
-    libXmu
-    libXt
+    libx11
+    libxaw
+    libxmu
+    libxt
   ];
 
   configureFlags = [
diff --git a/pkgs/by-name/xf/xf86-input-wacom/package.nix b/pkgs/by-name/xf/xf86-input-wacom/package.nix
index 5b71936462a4..306e44f8765c 100644
--- a/pkgs/by-name/xf/xf86-input-wacom/package.nix
+++ b/pkgs/by-name/xf/xf86-input-wacom/package.nix
@@ -4,12 +4,12 @@
   autoreconfHook,
   fetchFromGitHub,
   xorgproto,
-  libX11,
-  libXext,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxext,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxrender,
   ncurses,
   pixman,
   pkg-config,
@@ -37,12 +37,12 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXext
-    libXi
-    libXinerama
-    libXrandr
-    libXrender
+    libx11
+    libxext
+    libxi
+    libxinerama
+    libxrandr
+    libxrender
     ncurses
     udev
     util-macros
diff --git a/pkgs/by-name/xf/xfce4-clipman-plugin/package.nix b/pkgs/by-name/xf/xfce4-clipman-plugin/package.nix
index 91228bf7e6ba..e00f688648c7 100644
--- a/pkgs/by-name/xf/xfce4-clipman-plugin/package.nix
+++ b/pkgs/by-name/xf/xfce4-clipman-plugin/package.nix
@@ -10,8 +10,8 @@
   wrapGAppsHook3,
   glib,
   gtk3,
-  libX11,
-  libXtst,
+  libx11,
+  libxtst,
   libxfce4ui,
   libxfce4util,
   qrencode,
@@ -52,8 +52,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     glib
     gtk3
-    libX11
-    libXtst
+    libx11
+    libxtst
     libxfce4ui
     libxfce4util
     qrencode
diff --git a/pkgs/by-name/xf/xfce4-docklike-plugin/package.nix b/pkgs/by-name/xf/xfce4-docklike-plugin/package.nix
index 3253513edaa9..f4b41cf177fc 100644
--- a/pkgs/by-name/xf/xfce4-docklike-plugin/package.nix
+++ b/pkgs/by-name/xf/xfce4-docklike-plugin/package.nix
@@ -10,8 +10,8 @@
   glib,
   gtk3,
   gtk-layer-shell,
-  libX11,
-  libXi,
+  libx11,
+  libxi,
   libxfce4ui,
   libxfce4util,
   libxfce4windowing,
@@ -50,8 +50,8 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     gtk3
     gtk-layer-shell
-    libX11
-    libXi
+    libx11
+    libxi
     libxfce4ui
     libxfce4util
     libxfce4windowing
diff --git a/pkgs/by-name/xf/xfce4-notifyd/package.nix b/pkgs/by-name/xf/xfce4-notifyd/package.nix
index d046c546c25d..8c06e8af00d3 100644
--- a/pkgs/by-name/xf/xfce4-notifyd/package.nix
+++ b/pkgs/by-name/xf/xfce4-notifyd/package.nix
@@ -13,7 +13,7 @@
   gtk-layer-shell,
   libcanberra-gtk3,
   libnotify,
-  libX11,
+  libx11,
   libxfce4ui,
   libxfce4util,
   sqlite,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     libcanberra-gtk3
     libnotify
-    libX11
+    libx11
     libxfce4ui
     libxfce4util
     sqlite
diff --git a/pkgs/by-name/xf/xfce4-screensaver/package.nix b/pkgs/by-name/xf/xfce4-screensaver/package.nix
index fb60ab05a706..a4cefb0fc5c2 100644
--- a/pkgs/by-name/xf/xfce4-screensaver/package.nix
+++ b/pkgs/by-name/xf/xfce4-screensaver/package.nix
@@ -14,9 +14,9 @@
   garcon,
   glib,
   gtk3,
-  libX11,
-  libXScrnSaver,
-  libXrandr,
+  libx11,
+  libxscrnsaver,
+  libxrandr,
   libwnck,
   libxfce4ui,
   libxfce4util,
@@ -64,9 +64,9 @@ stdenv.mkDerivation (finalAttrs: {
     garcon
     glib
     gtk3
-    libX11
-    libXScrnSaver
-    libXrandr
+    libx11
+    libxscrnsaver
+    libxrandr
     libwnck
     libxfce4ui
     libxfce4util
diff --git a/pkgs/by-name/xf/xfce4-screenshooter/package.nix b/pkgs/by-name/xf/xfce4-screenshooter/package.nix
index d539966335bd..c6165a7fc7d5 100644
--- a/pkgs/by-name/xf/xfce4-screenshooter/package.nix
+++ b/pkgs/by-name/xf/xfce4-screenshooter/package.nix
@@ -12,10 +12,10 @@
   xfce4-exo,
   gtk3,
   gtk-layer-shell,
-  libX11,
-  libXext,
-  libXfixes,
-  libXtst,
+  libx11,
+  libxext,
+  libxfixes,
+  libxtst,
   libxfce4ui,
   libxfce4util,
   wayland,
@@ -57,10 +57,10 @@ stdenv.mkDerivation (finalAttrs: {
     xfce4-exo
     gtk3
     gtk-layer-shell
-    libX11
-    libXext
-    libXfixes
-    libXtst
+    libx11
+    libxext
+    libxfixes
+    libxtst
     libxfce4ui
     libxfce4util
     wayland
diff --git a/pkgs/by-name/xf/xfce4-sensors-plugin/package.nix b/pkgs/by-name/xf/xfce4-sensors-plugin/package.nix
index 7a9a7e5689e1..68d1bee5b77a 100644
--- a/pkgs/by-name/xf/xfce4-sensors-plugin/package.nix
+++ b/pkgs/by-name/xf/xfce4-sensors-plugin/package.nix
@@ -9,8 +9,8 @@
   wrapGAppsHook3,
   glib,
   gtk3,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   libxfce4ui,
   libxfce4util,
   xfce4-panel,
@@ -43,8 +43,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     glib
     gtk3
-    libX11
-    libXext
+    libx11
+    libxext
     libxfce4ui
     libxfce4util
     xfce4-panel
diff --git a/pkgs/by-name/xf/xfce4-settings/package.nix b/pkgs/by-name/xf/xfce4-settings/package.nix
index 5e87e9d0be48..2b9cea1288ea 100644
--- a/pkgs/by-name/xf/xfce4-settings/package.nix
+++ b/pkgs/by-name/xf/xfce4-settings/package.nix
@@ -13,8 +13,8 @@
   gtk-layer-shell,
   glib,
   libnotify,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   libxfce4ui,
   libxfce4util,
   libxklavier,
@@ -59,8 +59,8 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     gtk-layer-shell
     libnotify
-    libX11
-    libXext
+    libx11
+    libxext
     libxfce4ui
     libxfce4util
     libxklavier
diff --git a/pkgs/by-name/xf/xfce4-taskmanager/package.nix b/pkgs/by-name/xf/xfce4-taskmanager/package.nix
index f6e5273c7282..01eccbfb52b8 100644
--- a/pkgs/by-name/xf/xfce4-taskmanager/package.nix
+++ b/pkgs/by-name/xf/xfce4-taskmanager/package.nix
@@ -13,8 +13,8 @@
   libxfce4util,
   xfconf,
   libwnck,
-  libX11,
-  libXmu,
+  libx11,
+  libxmu,
   gitUpdater,
 }:
 
@@ -48,8 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
     libxfce4util
     xfconf
     libwnck
-    libX11
-    libXmu
+    libx11
+    libxmu
   ];
 
   passthru.updateScript = gitUpdater { rev-prefix = "xfce4-taskmanager-"; };
diff --git a/pkgs/by-name/xf/xfce4-terminal/package.nix b/pkgs/by-name/xf/xfce4-terminal/package.nix
index 7eaf3d0cefc4..6ae02810edcf 100644
--- a/pkgs/by-name/xf/xfce4-terminal/package.nix
+++ b/pkgs/by-name/xf/xfce4-terminal/package.nix
@@ -13,7 +13,7 @@
   gtk3,
   gtk-layer-shell,
   libutempter,
-  libX11,
+  libx11,
   libxfce4ui,
   pcre2,
   vte,
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     gtk-layer-shell
     libutempter
-    libX11
+    libx11
     libxfce4ui
     pcre2
     vte
diff --git a/pkgs/by-name/xf/xfce4-time-out-plugin/package.nix b/pkgs/by-name/xf/xfce4-time-out-plugin/package.nix
index 317edc3bb139..f3c191904838 100644
--- a/pkgs/by-name/xf/xfce4-time-out-plugin/package.nix
+++ b/pkgs/by-name/xf/xfce4-time-out-plugin/package.nix
@@ -8,7 +8,7 @@
   pkg-config,
   glib,
   gtk3,
-  libX11,
+  libx11,
   libxfce4ui,
   libxfce4util,
   xfce4-panel,
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     glib
     gtk3
-    libX11
+    libx11
     libxfce4ui
     libxfce4util
     xfce4-panel
diff --git a/pkgs/by-name/xf/xfd/package.nix b/pkgs/by-name/xf/xfd/package.nix
index 8c570195f841..89457f93a8c7 100644
--- a/pkgs/by-name/xf/xfd/package.nix
+++ b/pkgs/by-name/xf/xfd/package.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=xfd-(.*)" ]; };
 
   meta = {
-    description = "X font display utility, using either the X11 core protocol or libXft2.";
+    description = "X font display utility, using either the X11 core protocol or libxft.";
     homepage = "https://gitlab.freedesktop.org/xorg/app/xfd";
     license = lib.licenses.mitOpenGroup;
     mainProgram = "xfd";
diff --git a/pkgs/by-name/xf/xfdashboard/package.nix b/pkgs/by-name/xf/xfdashboard/package.nix
index 29df0de640a1..0529e2325824 100644
--- a/pkgs/by-name/xf/xfdashboard/package.nix
+++ b/pkgs/by-name/xf/xfdashboard/package.nix
@@ -9,10 +9,10 @@
   wrapGAppsHook3,
   clutter,
   gettext,
-  libXcomposite,
-  libXinerama,
-  libXdamage,
-  libX11,
+  libxcomposite,
+  libxinerama,
+  libxdamage,
+  libx11,
   libwnck,
   libxfce4ui,
   libxfce4util,
@@ -65,10 +65,10 @@ stdenv.mkDerivation (finalAttrs: {
     garcon
     glib
     gtk3
-    libX11
-    libXcomposite
-    libXdamage
-    libXinerama
+    libx11
+    libxcomposite
+    libxdamage
+    libxinerama
     libwnck
     libxfce4ui
     libxfce4util
diff --git a/pkgs/by-name/xf/xfig/package.nix b/pkgs/by-name/xf/xfig/package.nix
index fd2e3ca1b263..0b9450e70ba2 100644
--- a/pkgs/by-name/xf/xfig/package.nix
+++ b/pkgs/by-name/xf/xfig/package.nix
@@ -5,13 +5,13 @@
   fetchpatch,
   makeWrapper,
   imagemagick,
-  libXpm,
-  libXmu,
-  libXi,
-  libXp,
+  libxpm,
+  libxmu,
+  libxi,
+  libxp,
   Xaw3d,
-  libXaw,
-  libXft,
+  libxaw,
+  libxft,
   fig2dev,
 }:
 
@@ -30,13 +30,13 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libXpm
-    libXmu
-    libXi
-    libXp
+    libxpm
+    libxmu
+    libxi
+    libxp
     Xaw3d
-    libXaw
-    libXft
+    libxaw
+    libxft
   ];
 
   # Upstream-accepted patches for C23 compatibility from Gentoo and Debian
diff --git a/pkgs/by-name/xf/xfractint/package.nix b/pkgs/by-name/xf/xfractint/package.nix
index 1c29c8b6bccd..0fc031909258 100644
--- a/pkgs/by-name/xf/xfractint/package.nix
+++ b/pkgs/by-name/xf/xfractint/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXft,
+  libx11,
+  libxft,
 }:
 stdenv.mkDerivation rec {
   pname = "xfractint";
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    libX11
-    libXft
+    libx11
+    libxft
   ];
 
   configurePhase = ''
diff --git a/pkgs/by-name/xf/xfwm4/package.nix b/pkgs/by-name/xf/xfwm4/package.nix
index ed8e2fa7632b..383d89c15353 100644
--- a/pkgs/by-name/xf/xfwm4/package.nix
+++ b/pkgs/by-name/xf/xfwm4/package.nix
@@ -10,12 +10,12 @@
   dbus-glib,
   libepoxy,
   gtk3,
-  libXdamage,
+  libxdamage,
   libstartup_notification,
   libxfce4ui,
   libxfce4util,
   libwnck,
-  libXpresent,
+  libxpresent,
   xfconf,
   gitUpdater,
 }:
@@ -44,12 +44,12 @@ stdenv.mkDerivation (finalAttrs: {
     dbus-glib
     libepoxy
     gtk3
-    libXdamage
+    libxdamage
     libstartup_notification
     libxfce4ui
     libxfce4util
     libwnck
-    libXpresent
+    libxpresent
     xfconf
   ];
 
diff --git a/pkgs/by-name/xg/xgalagapp/package.nix b/pkgs/by-name/xg/xgalagapp/package.nix
index 36535de44ad8..ff246a9dfc0c 100644
--- a/pkgs/by-name/xg/xgalagapp/package.nix
+++ b/pkgs/by-name/xg/xgalagapp/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXpm,
+  libx11,
+  libxpm,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -15,8 +15,8 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
-    libXpm
+    libx11
+    libxpm
   ];
 
   buildFlags = [
diff --git a/pkgs/by-name/xg/xgeometry-select/package.nix b/pkgs/by-name/xg/xgeometry-select/package.nix
index 9e9eac5cfbbc..3421e66a2bda 100644
--- a/pkgs/by-name/xg/xgeometry-select/package.nix
+++ b/pkgs/by-name/xg/xgeometry-select/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontUnpack = true;
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   buildPhase = ''
     gcc -Wall -lX11 ${finalAttrs.src} -o xgeometry-select
diff --git a/pkgs/by-name/xi/xiccd/package.nix b/pkgs/by-name/xi/xiccd/package.nix
index 72751da6d3b9..d5923698086b 100644
--- a/pkgs/by-name/xi/xiccd/package.nix
+++ b/pkgs/by-name/xi/xiccd/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   autoreconfHook,
   pkg-config,
-  libXrandr,
+  libxrandr,
   glib,
   colord,
 }:
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libXrandr
+    libxrandr
     glib
     colord
   ];
diff --git a/pkgs/by-name/xi/xine-lib/package.nix b/pkgs/by-name/xi/xine-lib/package.nix
index db5043e00776..9e3d9d07b6b4 100644
--- a/pkgs/by-name/xi/xine-lib/package.nix
+++ b/pkgs/by-name/xi/xine-lib/package.nix
@@ -8,10 +8,10 @@
   flac,
   libGL,
   libGLU,
-  libX11,
-  libXext,
-  libXinerama,
-  libXv,
+  libx11,
+  libxext,
+  libxinerama,
+  libxv,
   libcaca,
   libcdio,
   libmng,
@@ -59,14 +59,14 @@ stdenv.mkDerivation (finalAttrs: {
     flac
     libGL
     libGLU
-    libX11
-    libX11
-    libXext
-    libXext
-    libXinerama
-    libXinerama
-    libXv
-    libXv
+    libx11
+    libx11
+    libxext
+    libxext
+    libxinerama
+    libxinerama
+    libxv
+    libxv
     libcaca
     libcdio
     libmng
diff --git a/pkgs/by-name/xi/xine-ui/package.nix b/pkgs/by-name/xi/xine-ui/package.nix
index fa40ebbd5867..3efd0356c230 100644
--- a/pkgs/by-name/xi/xine-ui/package.nix
+++ b/pkgs/by-name/xi/xine-ui/package.nix
@@ -3,13 +3,13 @@
   autoreconfHook,
   curl,
   fetchhg,
-  libXext,
-  libXft,
-  libXi,
-  libXinerama,
-  libXtst,
-  libXv,
-  libXxf86vm,
+  libxext,
+  libxft,
+  libxi,
+  libxinerama,
+  libxtst,
+  libxv,
+  libxxf86vm,
   libjpeg,
   libpng,
   lirc,
@@ -49,13 +49,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     curl
-    libXext
-    libXft
-    libXi
-    libXinerama
-    libXtst
-    libXv
-    libXxf86vm
+    libxext
+    libxft
+    libxi
+    libxinerama
+    libxtst
+    libxv
+    libxxf86vm
     libjpeg
     libpng
     lirc
diff --git a/pkgs/by-name/xj/xjadeo/package.nix b/pkgs/by-name/xj/xjadeo/package.nix
index 5648c4366718..828ed719f2ad 100644
--- a/pkgs/by-name/xj/xjadeo/package.nix
+++ b/pkgs/by-name/xj/xjadeo/package.nix
@@ -8,8 +8,8 @@
   libGLU,
   libjack2,
   liblo,
-  libX11,
-  libXv,
+  libx11,
+  libxv,
   pkg-config,
   portmidi,
   libxpm,
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     ffmpeg
     libjack2
-    libX11
+    libx11
     libxext
     libxpm
     # The following are recommended in the README, but are seemingly
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
     libGLU
     liblo
-    libXv
+    libxv
     portmidi
   ];
 
diff --git a/pkgs/by-name/xk/xkb-switch-i3/package.nix b/pkgs/by-name/xk/xkb-switch-i3/package.nix
index 13427370089e..8c9c30807523 100644
--- a/pkgs/by-name/xk/xkb-switch-i3/package.nix
+++ b/pkgs/by-name/xk/xkb-switch-i3/package.nix
@@ -6,7 +6,7 @@
   i3,
   jsoncpp,
   libsigcxx,
-  libX11,
+  libx11,
   libxkbfile,
   pkg-config,
   fetchpatch,
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     i3
     jsoncpp
     libsigcxx
-    libX11
+    libx11
     libxkbfile
   ];
 
diff --git a/pkgs/by-name/xk/xkb-switch/package.nix b/pkgs/by-name/xk/xkb-switch/package.nix
index 969344600454..88cedbc0cb5d 100644
--- a/pkgs/by-name/xk/xkb-switch/package.nix
+++ b/pkgs/by-name/xk/xkb-switch/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  libX11,
+  libx11,
   libxkbfile,
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [
-    libX11
+    libx11
     libxkbfile
   ];
 
diff --git a/pkgs/by-name/xk/xkbd/package.nix b/pkgs/by-name/xk/xkbd/package.nix
index 5941c24070ba..d30c265223d2 100644
--- a/pkgs/by-name/xk/xkbd/package.nix
+++ b/pkgs/by-name/xk/xkbd/package.nix
@@ -3,15 +3,15 @@
   stdenv,
   fetchFromGitHub,
   freetype,
-  libXrender,
-  libXft,
+  libxrender,
+  libxft,
   xorgproto,
   xinput,
-  libXi,
-  libXext,
-  libXtst,
-  libXpm,
-  libX11,
+  libxi,
+  libxext,
+  libxtst,
+  libxpm,
+  libx11,
   autoreconfHook,
 }:
 
@@ -28,13 +28,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     freetype
-    libXrender
-    libXft
-    libXext
-    libXtst
-    libXpm
-    libX11
-    libXi
+    libxrender
+    libxft
+    libxext
+    libxtst
+    libxpm
+    libx11
+    libxi
     xorgproto
     xinput
   ];
diff --git a/pkgs/by-name/xk/xkblayout-state/package.nix b/pkgs/by-name/xk/xkblayout-state/package.nix
index 06e48c2c2a2e..c6274c52ae6b 100644
--- a/pkgs/by-name/xk/xkblayout-state/package.nix
+++ b/pkgs/by-name/xk/xkblayout-state/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "sha256-diorqwDEBdzcBteKvhRisQaY3bx5seaOaWSaPwBkWDo=";
   };
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/by-name/xk/xkbmon/package.nix b/pkgs/by-name/xk/xkbmon/package.nix
index 9ac85eeacb4b..112455193fe2 100644
--- a/pkgs/by-name/xk/xkbmon/package.nix
+++ b/pkgs/by-name/xk/xkbmon/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
   libxcb,
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
+    libx11
     libxcb
   ];
 
diff --git a/pkgs/by-name/xk/xkbset/package.nix b/pkgs/by-name/xk/xkbset/package.nix
index 408a47af1858..06c12cf73d24 100644
--- a/pkgs/by-name/xk/xkbset/package.nix
+++ b/pkgs/by-name/xk/xkbset/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   perl,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     perl
-    libX11
+    libx11
   ];
 
   makeFlags = [ "X11PREFIX=${placeholder "out"}" ];
diff --git a/pkgs/by-name/xl/xlibinput-calibrator/package.nix b/pkgs/by-name/xl/xlibinput-calibrator/package.nix
index 9f8b08240c65..cdd416124159 100644
--- a/pkgs/by-name/xl/xlibinput-calibrator/package.nix
+++ b/pkgs/by-name/xl/xlibinput-calibrator/package.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXi,
-  libXrandr,
+  libx11,
+  libxi,
+  libxrandr,
   txt2man,
 }:
 
@@ -24,9 +24,9 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXi
-    libXrandr
+    libx11
+    libxi
+    libxrandr
   ];
 
   installFlags = [ "prefix=$(out)" ];
diff --git a/pkgs/by-name/xl/xloadimage/package.nix b/pkgs/by-name/xl/xloadimage/package.nix
index f80017007a1c..945275de5126 100644
--- a/pkgs/by-name/xl/xloadimage/package.nix
+++ b/pkgs/by-name/xl/xloadimage/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchurl,
   fetchzip,
-  libX11,
-  libXt,
+  libx11,
+  libxt,
   autoreconfHook,
   quilt,
 
@@ -48,8 +48,8 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libX11
-    libXt
+    libx11
+    libxt
   ]
   ++ lib.optionals withJpegSupport [
     libjpeg
diff --git a/pkgs/by-name/xl/xlockmore/package.nix b/pkgs/by-name/xl/xlockmore/package.nix
index 6a18a63b3ba9..7355d6253f33 100644
--- a/pkgs/by-name/xl/xlockmore/package.nix
+++ b/pkgs/by-name/xl/xlockmore/package.nix
@@ -3,11 +3,11 @@
   lib,
   fetchurl,
   pam ? null,
-  libX11,
-  libXext,
-  libXinerama,
-  libXdmcp,
-  libXt,
+  libx11,
+  libxext,
+  libxinerama,
+  libxdmcp,
+  libxt,
   autoreconfHook,
 }:
 
@@ -24,11 +24,11 @@ stdenv.mkDerivation rec {
   # Optionally, it can use GTK.
   buildInputs = [
     pam
-    libX11
-    libXext.dev
-    libXinerama
-    libXdmcp
-    libXt
+    libx11
+    libxext.dev
+    libxinerama
+    libxdmcp
+    libxt
   ];
   nativeBuildInputs = [ autoreconfHook ];
 
diff --git a/pkgs/by-name/xm/xmacro/package.nix b/pkgs/by-name/xm/xmacro/package.nix
index d8ad84180708..edd56237b680 100644
--- a/pkgs/by-name/xm/xmacro/package.nix
+++ b/pkgs/by-name/xm/xmacro/package.nix
@@ -2,10 +2,10 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXtst,
+  libx11,
+  libxtst,
   xorgproto,
-  libXi,
+  libxi,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,10 +20,10 @@ stdenv.mkDerivation rec {
   preInstall = "echo -e 'install:\n	mkdir \${out}/bin;\n	cp xmacrorec2 xmacroplay \${out}/bin;' >>Makefile; ";
 
   buildInputs = [
-    libX11
-    libXtst
+    libx11
+    libxtst
     xorgproto
-    libXi
+    libxi
   ];
 
   meta = {
diff --git a/pkgs/by-name/xm/xmagnify/package.nix b/pkgs/by-name/xm/xmagnify/package.nix
index edeae3fbaec5..91cec22ef2a6 100644
--- a/pkgs/by-name/xm/xmagnify/package.nix
+++ b/pkgs/by-name/xm/xmagnify/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  libX11,
+  libx11,
   xorgproto,
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   prePatch = "substituteInPlace ./Makefile --replace /usr $out";
 
   buildInputs = [
-    libX11
+    libx11
     xorgproto
   ];
 
diff --git a/pkgs/by-name/xm/xmcp/package.nix b/pkgs/by-name/xm/xmcp/package.nix
index 86cd5b8fa10a..0a62705e6f91 100644
--- a/pkgs/by-name/xm/xmcp/package.nix
+++ b/pkgs/by-name/xm/xmcp/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation {
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     sha256 = "sha256-B3YkYrVEg6UJ2ApaVook4N2XvrCboxDMUG5CN9I79Sg=";
   };
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/xm/xmenu/package.nix b/pkgs/by-name/xm/xmenu/package.nix
index 301742c35acb..6763e8bc0dc3 100644
--- a/pkgs/by-name/xm/xmenu/package.nix
+++ b/pkgs/by-name/xm/xmenu/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchFromGitHub,
   imlib2,
-  libX11,
-  libXft,
-  libXinerama,
+  libx11,
+  libxft,
+  libxinerama,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -21,9 +21,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     imlib2
-    libX11
-    libXft
-    libXinerama
+    libx11
+    libxft
+    libxinerama
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/xm/xmoji/package.nix b/pkgs/by-name/xm/xmoji/package.nix
index c2e3f03afd51..377bed913c78 100644
--- a/pkgs/by-name/xm/xmoji/package.nix
+++ b/pkgs/by-name/xm/xmoji/package.nix
@@ -7,7 +7,7 @@
   harfbuzz,
   libpng,
   libxcb-util,
-  libXcursor,
+  libxcursor,
   libxcb-image,
   libxkbcommon,
   libxcb-cursor,
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     fontconfig
     harfbuzz
-    libXcursor
+    libxcursor
     libpng
     libxkbcommon
     libxcb-cursor
diff --git a/pkgs/by-name/xm/xmountains/package.nix b/pkgs/by-name/xm/xmountains/package.nix
index d005dbbba6dd..eb78769b7b99 100644
--- a/pkgs/by-name/xm/xmountains/package.nix
+++ b/pkgs/by-name/xm/xmountains/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   xbitmaps,
-  libX11,
+  libx11,
   imake,
   gccmakedep,
 }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     xbitmaps
-    libX11
+    libx11
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/xn/xnee/package.nix b/pkgs/by-name/xn/xnee/package.nix
index fbd35d936fb1..09ced2d262a8 100644
--- a/pkgs/by-name/xn/xnee/package.nix
+++ b/pkgs/by-name/xn/xnee/package.nix
@@ -7,10 +7,10 @@
   autoreconfHook,
   pkg-config,
   gtk2,
-  libX11,
-  libXext,
-  libXi,
-  libXtst,
+  libx11,
+  libxext,
+  libxi,
+  libxtst,
   texinfo,
   xorgproto,
 }:
@@ -62,10 +62,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     gtk2
-    libX11
-    libXext
-    libXi
-    libXtst
+    libx11
+    libxext
+    libxi
+    libxtst
     texinfo
     xorgproto
   ];
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   makeFlags = [
     # `cnee' is linked without `-lXi' and as a consequence has a RUNPATH that
-    # lacks libXi.
+    # lacks libxi.
     "LDFLAGS=-lXi"
   ];
 
diff --git a/pkgs/by-name/xn/xnotify/package.nix b/pkgs/by-name/xn/xnotify/package.nix
index f2a8d1a52a09..8fb402124502 100644
--- a/pkgs/by-name/xn/xnotify/package.nix
+++ b/pkgs/by-name/xn/xnotify/package.nix
@@ -5,9 +5,9 @@
   writeText,
   fontconfig,
   imlib2,
-  libX11,
-  libXft,
-  libXinerama,
+  libx11,
+  libxft,
+  libxinerama,
   conf ? null,
 }:
 
@@ -25,9 +25,9 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     fontconfig
     imlib2
-    libX11
-    libXft
-    libXinerama
+    libx11
+    libxft
+    libxinerama
   ];
 
   postPatch =
diff --git a/pkgs/by-name/xo/xorgproto/package.nix b/pkgs/by-name/xo/xorgproto/package.nix
index f75e6d51e44c..bd44d61263cc 100644
--- a/pkgs/by-name/xo/xorgproto/package.nix
+++ b/pkgs/by-name/xo/xorgproto/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
   ];
 
-  # adds support for printproto needed for libXp
+  # adds support for printproto needed for libxp
   mesonFlags = [ "-Dlegacy=true" ];
 
   passthru = {
diff --git a/pkgs/by-name/xo/xosd/package.nix b/pkgs/by-name/xo/xosd/package.nix
index c4680c348743..a1fb8c8e533e 100644
--- a/pkgs/by-name/xo/xosd/package.nix
+++ b/pkgs/by-name/xo/xosd/package.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXext,
-  libXt,
+  libx11,
+  libxext,
+  libxt,
   xorgproto,
 }:
 
@@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    libX11
-    libXext
-    libXt
+    libx11
+    libxext
+    libxt
     xorgproto
   ];
 
diff --git a/pkgs/by-name/xo/xosview/package.nix b/pkgs/by-name/xo/xosview/package.nix
index 7a5c28185257..a9fd41cf281d 100644
--- a/pkgs/by-name/xo/xosview/package.nix
+++ b/pkgs/by-name/xo/xosview/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXpm,
+  libx11,
+  libxpm,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -25,8 +25,8 @@ stdenv.mkDerivation (finalAttrs: {
   dontConfigure = true;
 
   buildInputs = [
-    libX11
-    libXpm
+    libx11
+    libxpm
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/xo/xosview2/package.nix b/pkgs/by-name/xo/xosview2/package.nix
index cac74ba42dce..3fba23da1fb1 100644
--- a/pkgs/by-name/xo/xosview2/package.nix
+++ b/pkgs/by-name/xo/xosview2/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
     "man"
   ];
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   meta = {
     homepage = "https://xosview.sourceforge.net/index.html";
@@ -47,6 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     mainProgram = "xosview2";
     maintainers = [ ];
-    inherit (libX11.meta) platforms;
+    inherit (libx11.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/xo/xournalpp/package.nix b/pkgs/by-name/xo/xournalpp/package.nix
index 07dbc6019dce..0440748876fe 100644
--- a/pkgs/by-name/xo/xournalpp/package.nix
+++ b/pkgs/by-name/xo/xournalpp/package.nix
@@ -33,13 +33,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xournalpp";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "xournalpp";
     repo = "xournalpp";
     rev = "v${version}";
-    hash = "sha256-yPuApAmhopMWKROUUsok9rULDVtqXC6WIfm2GEevQkw=";
+    hash = "sha256-adzL/2zQlG4hBPV0rQzkQrOyGROv73GyjIH8Debhhq8=";
   };
 
   nativeBuildInputs = [
@@ -86,7 +86,10 @@ stdenv.mkDerivation rec {
     homepage = "https://xournalpp.github.io/";
     changelog = "https://github.com/xournalpp/xournalpp/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ sikmir ];
+    maintainers = with lib.maintainers; [
+      iedame
+      sikmir
+    ];
     platforms = lib.platforms.unix;
     mainProgram = "xournalpp";
   };
diff --git a/pkgs/by-name/xp/xp-pen-g430-driver/package.nix b/pkgs/by-name/xp/xp-pen-g430-driver/package.nix
index db63315fd4a1..bb745306080a 100644
--- a/pkgs/by-name/xp/xp-pen-g430-driver/package.nix
+++ b/pkgs/by-name/xp/xp-pen-g430-driver/package.nix
@@ -4,8 +4,8 @@
   fetchzip,
   autoPatchelfHook,
   libusb1,
-  libX11,
-  libXtst,
+  libx11,
+  libxtst,
   qt5,
   libglvnd,
 }:
@@ -27,8 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libusb1
-    libX11
-    libXtst
+    libx11
+    libxtst
     qt5.qtbase
     libglvnd
     (lib.getLib stdenv.cc.cc)
diff --git a/pkgs/by-name/xp/xpilot-ng/package.nix b/pkgs/by-name/xp/xpilot-ng/package.nix
index 54d5facb3971..1b5513763f13 100644
--- a/pkgs/by-name/xp/xpilot-ng/package.nix
+++ b/pkgs/by-name/xp/xpilot-ng/package.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
   libsm,
-  libXext,
+  libxext,
   SDL,
   libGLU,
   libGL,
@@ -12,7 +12,7 @@
   SDL_ttf,
   SDL_image,
   zlib,
-  libXxf86misc,
+  libxxf86misc,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "xpilot-ng";
@@ -22,9 +22,9 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-8ocJPHV6cSMgAPIQ7kpO3szJ6K8IF9W+QwhOhK69Rwk=";
   };
   buildInputs = [
-    libX11
+    libx11
     libsm
-    libXext
+    libxext
     SDL
     SDL_ttf
     SDL_image
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     libGL
     expat
     zlib
-    libXxf86misc
+    libxxf86misc
   ];
 
   patches = [
diff --git a/pkgs/by-name/xp/xpipe/package.nix b/pkgs/by-name/xp/xpipe/package.nix
index 18b735c28bd5..4e07eec84197 100644
--- a/pkgs/by-name/xp/xpipe/package.nix
+++ b/pkgs/by-name/xp/xpipe/package.nix
@@ -11,17 +11,17 @@
   freetype,
   alsa-lib,
   makeShellWrapper,
-  libX11,
-  libXext,
-  libXdamage,
-  libXfixes,
+  libx11,
+  libxext,
+  libxdamage,
+  libxfixes,
   libxcb,
-  libXcomposite,
-  libXcursor,
-  libXi,
-  libXrender,
-  libXtst,
-  libXxf86vm,
+  libxcomposite,
+  libxcursor,
+  libxi,
+  libxrender,
+  libxtst,
+  libxxf86vm,
   util-linux,
   socat,
 }:
@@ -70,18 +70,18 @@ stdenvNoCC.mkDerivation rec {
     freetype
     gtk3
     alsa-lib
-    libX11
-    libX11
-    libXext
-    libXdamage
-    libXfixes
+    libx11
+    libx11
+    libxext
+    libxdamage
+    libxfixes
     libxcb
-    libXcomposite
-    libXcursor
-    libXi
-    libXrender
-    libXtst
-    libXxf86vm
+    libxcomposite
+    libxcursor
+    libxi
+    libxrender
+    libxtst
+    libxxf86vm
     util-linux
     socat
   ];
diff --git a/pkgs/by-name/xp/xpointerbarrier/package.nix b/pkgs/by-name/xp/xpointerbarrier/package.nix
index 6efcbf35803d..7266a42651b1 100644
--- a/pkgs/by-name/xp/xpointerbarrier/package.nix
+++ b/pkgs/by-name/xp/xpointerbarrier/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchurl,
   pkg-config,
-  libX11,
-  libXfixes,
-  libXrandr,
+  libx11,
+  libxfixes,
+  libxrandr,
   gitUpdater,
 }:
 
@@ -21,9 +21,9 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    libX11
-    libXfixes
-    libXrandr
+    libx11
+    libxfixes
+    libxrandr
   ];
 
   makeFlags = [ "prefix=$(out)" ];
diff --git a/pkgs/by-name/xp/xprintidle-ng/package.nix b/pkgs/by-name/xp/xprintidle-ng/package.nix
index 28644d574a7e..188bf4549515 100644
--- a/pkgs/by-name/xp/xprintidle-ng/package.nix
+++ b/pkgs/by-name/xp/xprintidle-ng/package.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXScrnSaver,
-  libXext,
+  libx11,
+  libxscrnsaver,
+  libxext,
   gnulib,
   autoconf,
   automake,
@@ -60,9 +60,9 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [
-    libX11
-    libXScrnSaver
-    libXext
+    libx11
+    libxscrnsaver
+    libxext
   ];
 
   meta = {
diff --git a/pkgs/by-name/xp/xprompt/package.nix b/pkgs/by-name/xp/xprompt/package.nix
index e36ee63af878..d000e8af03d1 100644
--- a/pkgs/by-name/xp/xprompt/package.nix
+++ b/pkgs/by-name/xp/xprompt/package.nix
@@ -4,9 +4,9 @@
   fetchFromGitHub,
   writeText,
   fontconfig,
-  libX11,
-  libXft,
-  libXinerama,
+  libx11,
+  libxft,
+  libxinerama,
   conf ? null,
   nix-update-script,
 }:
@@ -24,9 +24,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     fontconfig
-    libX11
-    libXft
-    libXinerama
+    libx11
+    libxft
+    libxinerama
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/xr/xrandr-invert-colors/package.nix b/pkgs/by-name/xr/xrandr-invert-colors/package.nix
index 8cbf313d8540..ec2d7afad27b 100644
--- a/pkgs/by-name/xr/xrandr-invert-colors/package.nix
+++ b/pkgs/by-name/xr/xrandr-invert-colors/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libXrandr,
+  libxrandr,
   libxcb,
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libXrandr
+    libxrandr
     libxcb
   ];
 
diff --git a/pkgs/by-name/xr/xrectsel/package.nix b/pkgs/by-name/xr/xrectsel/package.nix
index d02d0a086dd8..4bca0b0cc71e 100644
--- a/pkgs/by-name/xr/xrectsel/package.nix
+++ b/pkgs/by-name/xr/xrectsel/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   autoreconfHook,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   meta = {
     description = "Print the geometry of a rectangular screen region";
diff --git a/pkgs/by-name/xr/xrq/package.nix b/pkgs/by-name/xr/xrq/package.nix
index bfa8fd55832c..89b2eceb94cd 100644
--- a/pkgs/by-name/xr/xrq/package.nix
+++ b/pkgs/by-name/xr/xrq/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation {
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     "man"
   ];
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   meta = {
     description = "X utility for querying xrdb";
diff --git a/pkgs/by-name/xs/xsane/package.nix b/pkgs/by-name/xs/xsane/package.nix
index 26a580f0d76b..a34e6e3ad49e 100644
--- a/pkgs/by-name/xs/xsane/package.nix
+++ b/pkgs/by-name/xs/xsane/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitLab,
   sane-backends,
   sane-frontends,
-  libX11,
+  libx11,
   gtk2,
   pkg-config,
   libpng,
@@ -129,7 +129,7 @@ stdenv.mkDerivation (finalAttrs: {
     libusb-compat-0_1
     sane-backends
     sane-frontends
-    libX11
+    libx11
     gtk2
   ]
   ++ lib.optional gimpSupport gimp;
diff --git a/pkgs/by-name/xs/xschem/package.nix b/pkgs/by-name/xs/xschem/package.nix
index b0b569705770..e524c83017ca 100644
--- a/pkgs/by-name/xs/xschem/package.nix
+++ b/pkgs/by-name/xs/xschem/package.nix
@@ -5,8 +5,8 @@
   bison,
   cairo,
   flex,
-  libX11,
-  libXpm,
+  libx11,
+  libxpm,
   pkg-config,
   tcl,
   tk,
@@ -31,8 +31,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     cairo
-    libX11
-    libXpm
+    libx11
+    libxpm
     tcl
     tk
   ];
diff --git a/pkgs/by-name/xs/xscreensaver/package.nix b/pkgs/by-name/xs/xscreensaver/package.nix
index 048941672826..013ba64959b0 100644
--- a/pkgs/by-name/xs/xscreensaver/package.nix
+++ b/pkgs/by-name/xs/xscreensaver/package.nix
@@ -11,14 +11,14 @@
   intltool,
   libGL,
   libGLU,
-  libX11,
-  libXext,
-  libXft,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXt,
-  libXxf86vm,
+  libx11,
+  libxext,
+  libxft,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxt,
+  libxxf86vm,
   libxml2,
   makeWrapper,
   pam,
@@ -61,14 +61,14 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     libGL
     libGLU
-    libX11
-    libXext
-    libXft
-    libXi
-    libXinerama
-    libXrandr
-    libXt
-    libXxf86vm
+    libx11
+    libxext
+    libxft
+    libxi
+    libxinerama
+    libxrandr
+    libxt
+    libxxf86vm
     libxml2
     pam
     perlPackages.LWPProtocolHttps
diff --git a/pkgs/by-name/xs/xsct/package.nix b/pkgs/by-name/xs/xsct/package.nix
index 3a18c062e3ca..25c4705fa810 100644
--- a/pkgs/by-name/xs/xsct/package.nix
+++ b/pkgs/by-name/xs/xsct/package.nix
@@ -3,8 +3,8 @@
   lib,
   fetchFromGitHub,
   gitUpdater,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -19,8 +19,8 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
-    libXrandr
+    libx11
+    libxrandr
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/xs/xsecurelock/package.nix b/pkgs/by-name/xs/xsecurelock/package.nix
index 7a7c205d45f9..6b5953562769 100644
--- a/pkgs/by-name/xs/xsecurelock/package.nix
+++ b/pkgs/by-name/xs/xsecurelock/package.nix
@@ -4,13 +4,13 @@
   fetchFromGitHub,
   autoreconfHook,
   pkg-config,
-  libX11,
-  libXcomposite,
-  libXft,
-  libXmu,
-  libXrandr,
-  libXext,
-  libXScrnSaver,
+  libx11,
+  libxcomposite,
+  libxft,
+  libxmu,
+  libxrandr,
+  libxext,
+  libxscrnsaver,
   pam,
   apacheHttpd,
   pamtester,
@@ -37,13 +37,13 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXcomposite
-    libXft
-    libXmu
-    libXrandr
-    libXext
-    libXScrnSaver
+    libx11
+    libxcomposite
+    libxft
+    libxmu
+    libxrandr
+    libxext
+    libxscrnsaver
     pam
     apacheHttpd
     pamtester
diff --git a/pkgs/by-name/xs/xsel/package.nix b/pkgs/by-name/xs/xsel/package.nix
index a9f4b1604c34..894aad3ebd78 100644
--- a/pkgs/by-name/xs/xsel/package.nix
+++ b/pkgs/by-name/xs/xsel/package.nix
@@ -4,8 +4,8 @@
   fetchFromGitHub,
   pkg-config,
   autoreconfHook,
-  libX11,
-  libXt,
+  libx11,
+  libxt,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -24,8 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
     autoreconfHook
   ];
   buildInputs = [
-    libX11
-    libXt
+    libx11
+    libxt
   ];
 
   meta = {
diff --git a/pkgs/by-name/xs/xsettingsd/package.nix b/pkgs/by-name/xs/xsettingsd/package.nix
index 88564193e0cb..39129bad25f6 100644
--- a/pkgs/by-name/xs/xsettingsd/package.nix
+++ b/pkgs/by-name/xs/xsettingsd/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   # we end up with symlinked unit files if we don't move them around ourselves
   postFixup = ''
diff --git a/pkgs/by-name/xs/xskat/package.nix b/pkgs/by-name/xs/xskat/package.nix
index 6e8115c3a04a..4aadc81e238e 100644
--- a/pkgs/by-name/xs/xskat/package.nix
+++ b/pkgs/by-name/xs/xskat/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
   imake,
   gccmakedep,
 }:
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ gccmakedep ];
   buildInputs = [
-    libX11
+    libx11
     imake
   ];
 
diff --git a/pkgs/by-name/xs/xsok/package.nix b/pkgs/by-name/xs/xsok/package.nix
index 90f312db0990..eb180a87dd68 100644
--- a/pkgs/by-name/xs/xsok/package.nix
+++ b/pkgs/by-name/xs/xsok/package.nix
@@ -2,12 +2,12 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
   imake,
-  libXt,
-  libXaw,
-  libXpm,
-  libXext,
+  libxt,
+  libxaw,
+  libxpm,
+  libxext,
   withNethackLevels ? true,
 }:
 stdenv.mkDerivation rec {
@@ -25,15 +25,15 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    libX11
-    libXt
-    libXaw
-    libXpm
-    libXext
+    libx11
+    libxt
+    libxaw
+    libxpm
+    libxext
   ];
   nativeBuildInputs = [ imake ];
 
-  env.NIX_CFLAGS_COMPILE = " -isystem ${libXpm.dev}/include/X11 ";
+  env.NIX_CFLAGS_COMPILE = " -isystem ${libxpm.dev}/include/X11 ";
 
   preConfigure = ''
     sed -e "s@/usr/@$out/share/@g" -i src/Imakefile
diff --git a/pkgs/by-name/xs/xsokoban/package.nix b/pkgs/by-name/xs/xsokoban/package.nix
index 29d71878fde6..3bc9fad64975 100644
--- a/pkgs/by-name/xs/xsokoban/package.nix
+++ b/pkgs/by-name/xs/xsokoban/package.nix
@@ -2,10 +2,10 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
+  libx11,
   xorgproto,
-  libXpm,
-  libXt,
+  libxpm,
+  libxt,
 }:
 
 stdenv.mkDerivation rec {
@@ -18,13 +18,13 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    libX11
+    libx11
     xorgproto
-    libXpm
-    libXt
+    libxpm
+    libxt
   ];
 
-  env.NIX_CFLAGS_COMPILE = "-I${libXpm.dev}/include/X11 -Wno-error=implicit-int -Wno-error=implicit-function-declaration";
+  env.NIX_CFLAGS_COMPILE = "-I${libxpm.dev}/include/X11 -Wno-error=implicit-int -Wno-error=implicit-function-declaration";
 
   hardeningDisable = [ "format" ];
 
diff --git a/pkgs/by-name/xs/xss-lock/package.nix b/pkgs/by-name/xs/xss-lock/package.nix
index 24602a98cb13..d7bc6bb63951 100644
--- a/pkgs/by-name/xs/xss-lock/package.nix
+++ b/pkgs/by-name/xs/xss-lock/package.nix
@@ -7,8 +7,8 @@
   pkg-config,
   glib,
   libpthread-stubs,
-  libXau,
-  libXdmcp,
+  libxau,
+  libxdmcp,
   libxcb-util,
   nixosTests,
 }:
@@ -38,8 +38,8 @@ stdenv.mkDerivation {
   buildInputs = [
     glib
     libpthread-stubs
-    libXau
-    libXdmcp
+    libxau
+    libxdmcp
     libxcb-util
   ];
 
diff --git a/pkgs/by-name/xs/xssstate/package.nix b/pkgs/by-name/xs/xssstate/package.nix
index 779e1786ee6b..8572a6ecccf0 100644
--- a/pkgs/by-name/xs/xssstate/package.nix
+++ b/pkgs/by-name/xs/xssstate/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchgit,
-  libX11,
-  libXScrnSaver,
+  libx11,
+  libxscrnsaver,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "xssstate";
@@ -16,8 +16,8 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
-    libXScrnSaver
+    libx11
+    libxscrnsaver
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/xs/xst/package.nix b/pkgs/by-name/xs/xst/package.nix
index 826df612b4be..e63aefa4391f 100644
--- a/pkgs/by-name/xs/xst/package.nix
+++ b/pkgs/by-name/xs/xst/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchFromGitHub,
   fontconfig,
-  libX11,
-  libXext,
-  libXft,
+  libx11,
+  libxext,
+  libxft,
   ncurses,
   pkg-config,
   nix-update-script,
@@ -27,9 +27,9 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     fontconfig
-    libX11
-    libXext
-    libXft
+    libx11
+    libxext
+    libxft
     ncurses
   ];
 
diff --git a/pkgs/by-name/xt/xtrace/package.nix b/pkgs/by-name/xt/xtrace/package.nix
index 51af4adeead9..9ed1225b2a7d 100644
--- a/pkgs/by-name/xt/xtrace/package.nix
+++ b/pkgs/by-name/xt/xtrace/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   autoreconfHook,
   fetchFromGitLab,
-  libX11,
+  libx11,
   xauth,
   makeWrapper,
 }:
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     autoreconfHook
     makeWrapper
   ];
-  buildInputs = [ libX11 ];
+  buildInputs = [ libx11 ];
 
   postInstall = ''
     wrapProgram "$out/bin/xtrace" \
diff --git a/pkgs/by-name/xt/xtuner/package.nix b/pkgs/by-name/xt/xtuner/package.nix
index 0e3770b7285d..ed94f34e9a20 100644
--- a/pkgs/by-name/xt/xtuner/package.nix
+++ b/pkgs/by-name/xt/xtuner/package.nix
@@ -5,7 +5,7 @@
   fetchpatch,
   pkg-config,
   cairo,
-  libX11,
+  libx11,
   libjack2,
   liblo,
   libsigcxx,
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     cairo
-    libX11
+    libx11
     libjack2
     liblo
     libsigcxx
diff --git a/pkgs/by-name/xu/xunlei-uos/package.nix b/pkgs/by-name/xu/xunlei-uos/package.nix
index 02cc121439c3..d7b010ca453d 100644
--- a/pkgs/by-name/xu/xunlei-uos/package.nix
+++ b/pkgs/by-name/xu/xunlei-uos/package.nix
@@ -11,9 +11,9 @@
   gtk2,
   alsa-lib,
   dbus-glib,
-  libXtst,
-  libXdamage,
-  libXScrnSaver,
+  libxtst,
+  libxdamage,
+  libxscrnsaver,
 }:
 
 let
@@ -46,9 +46,9 @@ let
       gtk2
       alsa-lib
       dbus-glib
-      libXtst
-      libXdamage
-      libXScrnSaver
+      libxtst
+      libxdamage
+      libxscrnsaver
     ];
 
     nativeBuildInputs = [
diff --git a/pkgs/by-name/xv/xvfb/package.nix b/pkgs/by-name/xv/xvfb/package.nix
index afa62f072a22..df80cfbc9126 100644
--- a/pkgs/by-name/xv/xvfb/package.nix
+++ b/pkgs/by-name/xv/xvfb/package.nix
@@ -8,8 +8,8 @@
   dri-pkgconfig-stub,
   libdrm,
   libGL,
-  libX11,
-  libXau,
+  libx11,
+  libxau,
   libxcb,
   libxcvt,
   libxdmcp,
@@ -43,8 +43,8 @@ stdenv.mkDerivation (finalAttrs: {
     dri-pkgconfig-stub
     libdrm
     libGL
-    libX11
-    libXau
+    libx11
+    libxau
     libxcb
     libxcvt
     libxdmcp
diff --git a/pkgs/by-name/xv/xvkbd/package.nix b/pkgs/by-name/xv/xvkbd/package.nix
index 84c65b6f53e1..9dbea754baa8 100644
--- a/pkgs/by-name/xv/xvkbd/package.nix
+++ b/pkgs/by-name/xv/xvkbd/package.nix
@@ -2,11 +2,11 @@
   lib,
   stdenv,
   fetchurl,
-  libXt,
-  libXaw,
-  libXtst,
-  libXi,
-  libXpm,
+  libxt,
+  libxaw,
+  libxtst,
+  libxi,
+  libxpm,
   pkg-config,
   xorgproto,
   Xaw3d,
@@ -22,17 +22,17 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    libXt
-    libXaw
-    libXtst
+    libxt
+    libxaw
+    libxtst
     xorgproto
-    libXi
+    libxi
     Xaw3d
-    libXpm
+    libxpm
   ];
 
   makeFlags = [
-    # avoid default libXt location
+    # avoid default libxt location
     "appdefaultdir=${placeholder "out"}/share/X11/app-defaults"
     "datarootdir=${placeholder "out"}/share"
   ];
diff --git a/pkgs/by-name/xw/xwallpaper/package.nix b/pkgs/by-name/xw/xwallpaper/package.nix
index d7906269f86e..dbd0f710e5a9 100644
--- a/pkgs/by-name/xw/xwallpaper/package.nix
+++ b/pkgs/by-name/xw/xwallpaper/package.nix
@@ -11,7 +11,7 @@
   libseccomp,
   libjpeg,
   libpng,
-  libXpm,
+  libxpm,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     libseccomp
     libjpeg
     libpng
-    libXpm
+    libxpm
   ];
 
   postInstall = ''
diff --git a/pkgs/by-name/xw/xwayland/package.nix b/pkgs/by-name/xw/xwayland/package.nix
index b44173580179..4946d87e0846 100644
--- a/pkgs/by-name/xw/xwayland/package.nix
+++ b/pkgs/by-name/xw/xwayland/package.nix
@@ -11,18 +11,18 @@
   libei,
   libGL,
   libGLU,
-  libX11,
-  libXau,
-  libXaw,
-  libXdmcp,
-  libXext,
-  libXfixes,
-  libXfont2,
-  libXmu,
-  libXpm,
-  libXrender,
-  libXres,
-  libXt,
+  libx11,
+  libxau,
+  libxaw,
+  libxdmcp,
+  libxext,
+  libxfixes,
+  libxfont_2,
+  libxmu,
+  libxpm,
+  libxrender,
+  libxres,
+  libxt,
   libdrm,
   libtirpc,
   # Disable withLibunwind as LLVM's libunwind will conflict and does not support the right symbols.
@@ -85,18 +85,18 @@ stdenv.mkDerivation rec {
     font-util
     libGL
     libGLU
-    libX11
-    libXau
-    libXaw
-    libXdmcp
-    libXext
-    libXfixes
-    libXfont2
-    libXmu
-    libXpm
-    libXrender
-    libXres
-    libXt
+    libx11
+    libxau
+    libxaw
+    libxdmcp
+    libxext
+    libxfixes
+    libxfont_2
+    libxmu
+    libxpm
+    libxrender
+    libxres
+    libxt
     libdrm
     libtirpc
     libxcb
diff --git a/pkgs/by-name/xw/xwinmosaic/package.nix b/pkgs/by-name/xw/xwinmosaic/package.nix
index c8e67dbd17e5..0a45662bb9df 100644
--- a/pkgs/by-name/xw/xwinmosaic/package.nix
+++ b/pkgs/by-name/xw/xwinmosaic/package.nix
@@ -6,7 +6,7 @@
   gtk2,
   cmake,
   pkg-config,
-  libXdamage,
+  libxdamage,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     gtk2
-    libXdamage
+    libxdamage
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/xx/xxkb/package.nix b/pkgs/by-name/xx/xxkb/package.nix
index 4b5a00d9aba4..b631cefec49b 100644
--- a/pkgs/by-name/xx/xxkb/package.nix
+++ b/pkgs/by-name/xx/xxkb/package.nix
@@ -2,10 +2,10 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXt,
-  libXext,
-  libXpm,
+  libx11,
+  libxt,
+  libxext,
+  libxpm,
   imake,
   gccmakedep,
   svgSupport ? false,
@@ -31,10 +31,10 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libX11
-    libXt
-    libXext
-    libXpm
+    libx11
+    libxt
+    libxext
+    libxpm
   ]
   ++ lib.optionals svgSupport [
     librsvg
diff --git a/pkgs/by-name/xz/xzoom/package.nix b/pkgs/by-name/xz/xzoom/package.nix
index 1eca0f3e668d..3e722d3f7603 100644
--- a/pkgs/by-name/xz/xzoom/package.nix
+++ b/pkgs/by-name/xz/xzoom/package.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   fetchurl,
-  libX11,
-  libXext,
-  libXt,
+  libx11,
+  libxext,
+  libxt,
   imake,
   gccmakedep,
 }:
@@ -35,9 +35,9 @@ stdenv.mkDerivation rec {
     gccmakedep
   ];
   buildInputs = [
-    libX11
-    libXext
-    libXt
+    libx11
+    libxext
+    libxt
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/ya/yabasic/package.nix b/pkgs/by-name/ya/yabasic/package.nix
index 3213e98bc5fc..5be60c165135 100644
--- a/pkgs/by-name/ya/yabasic/package.nix
+++ b/pkgs/by-name/ya/yabasic/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchurl,
   libsm,
-  libX11,
-  libXt,
+  libx11,
+  libxt,
   libffi,
   ncurses,
 }:
@@ -20,8 +20,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libsm
-    libX11
-    libXt
+    libx11
+    libxt
     libffi
     ncurses
   ];
diff --git a/pkgs/by-name/ya/yarg/package.nix b/pkgs/by-name/ya/yarg/package.nix
index e626afdcac28..97349be2aac9 100644
--- a/pkgs/by-name/ya/yarg/package.nix
+++ b/pkgs/by-name/ya/yarg/package.nix
@@ -9,14 +9,14 @@
   dbus,
   hidapi,
   libGL,
-  libXcursor,
-  libXext,
-  libXi,
-  libXinerama,
+  libxcursor,
+  libxext,
+  libxi,
+  libxinerama,
   libxkbcommon,
-  libXrandr,
-  libXScrnSaver,
-  libXxf86vm,
+  libxrandr,
+  libxscrnsaver,
+  libxxf86vm,
   udev,
   vulkan-loader,
   wayland, # (not used by default, enable with SDL_VIDEODRIVER=wayland - doesn't support HiDPI)
@@ -47,14 +47,14 @@ stdenv.mkDerivation (finalAttrs: {
     dbus
     hidapi
     libGL
-    libXcursor
-    libXext
-    libXi
-    libXinerama
+    libxcursor
+    libxext
+    libxi
+    libxinerama
     libxkbcommon
-    libXrandr
-    libXScrnSaver
-    libXxf86vm
+    libxrandr
+    libxscrnsaver
+    libxxf86vm
     udev
     vulkan-loader
     wayland
diff --git a/pkgs/by-name/ya/yazi/plugins/drag/default.nix b/pkgs/by-name/ya/yazi/plugins/drag/default.nix
new file mode 100644
index 000000000000..372dbdc125b2
--- /dev/null
+++ b/pkgs/by-name/ya/yazi/plugins/drag/default.nix
@@ -0,0 +1,23 @@
+{
+  lib,
+  fetchFromGitHub,
+  mkYaziPlugin,
+}:
+mkYaziPlugin {
+  pname = "drag.yazi";
+  version = "0-unstable-2025-08-29";
+
+  src = fetchFromGitHub {
+    owner = "Joao-Queiroga";
+    repo = "drag.yazi";
+    rev = "27606689cb82c56a19c052a7b7935cd9b1466bab";
+    hash = "sha256-ITkZjpwWXni4tQpDhUiVvtPrEkAo6RISgCH594NgpYE=";
+  };
+
+  meta = {
+    description = "Yazi plugin to drag and drop files using ripdrag";
+    homepage = "https://github.com/Joao-Queiroga/drag.yazi";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ gibbert ];
+  };
+}
diff --git a/pkgs/by-name/ye/yeahconsole/package.nix b/pkgs/by-name/ye/yeahconsole/package.nix
index 31fb1d9da27f..d981eed07874 100644
--- a/pkgs/by-name/ye/yeahconsole/package.nix
+++ b/pkgs/by-name/ye/yeahconsole/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libX11,
-  libXrandr,
+  libx11,
+  libxrandr,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -18,8 +18,8 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libX11
-    libXrandr
+    libx11
+    libxrandr
   ];
 
   preConfigure = ''
diff --git a/pkgs/by-name/yk/ykush/package.nix b/pkgs/by-name/yk/ykush/package.nix
index f8507e20849f..7bc503d158c4 100644
--- a/pkgs/by-name/yk/ykush/package.nix
+++ b/pkgs/by-name/yk/ykush/package.nix
@@ -6,7 +6,7 @@
   runCommand,
   versionCheckHook,
 }:
-stdenv.mkDerivation (final: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ykushcmd";
   version = "1.4.0";
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation (final: {
   src = fetchFromGitHub {
     owner = "yepkit";
     repo = "ykush";
-    tag = "v${final.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-+ssr1QHKjEdK8pFkmyHYwG9tY7YHaYcIIJUqaEXixOg=";
   };
 
@@ -33,8 +33,8 @@ stdenv.mkDerivation (final: {
 
   passthru.tests = {
     # We can't run any actual tests without hardware, but we can at least check the binary.
-    run-only = runCommand "${final.pname}-test" ''
-      ${final}/bin/ykushcmd -h | grep YKUSHCMD
+    run-only = runCommand "${finalAttrs.pname}-test" ''
+      ${finalAttrs}/bin/ykushcmd -h | grep YKUSHCMD
     '';
   };
 
diff --git a/pkgs/by-name/yo/yoshimi/package.nix b/pkgs/by-name/yo/yoshimi/package.nix
index 74244f62f152..ce576317e30f 100644
--- a/pkgs/by-name/yo/yoshimi/package.nix
+++ b/pkgs/by-name/yo/yoshimi/package.nix
@@ -11,7 +11,7 @@
   libGLU,
   libjack2,
   libsndfile,
-  libXdmcp,
+  libxdmcp,
   lv2,
   minixml,
   pcre,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     libGLU
     libjack2
     libsndfile
-    libXdmcp
+    libxdmcp
     lv2
     minixml
     pcre
diff --git a/pkgs/by-name/yo/yosys/package.nix b/pkgs/by-name/yo/yosys/package.nix
index ee43be1a537a..915812d9f7d0 100644
--- a/pkgs/by-name/yo/yosys/package.nix
+++ b/pkgs/by-name/yo/yosys/package.nix
@@ -64,13 +64,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "yosys";
-  version = "0.61";
+  version = "0.62";
 
   src = fetchFromGitHub {
     owner = "YosysHQ";
     repo = "yosys";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-p7QewbeJtJRRkqYqWW1QzIe71OR5LD+0qsHHgl/cq2w=";
+    hash = "sha256-FzvdjdAURB5iCkGwsYY6A2wP/Je/IW4AOd4kVOEOeVc=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/ys/ysfx/package.nix b/pkgs/by-name/ys/ysfx/package.nix
index 1762440ad6c0..1b220e0eac10 100644
--- a/pkgs/by-name/ys/ysfx/package.nix
+++ b/pkgs/by-name/ys/ysfx/package.nix
@@ -6,11 +6,11 @@
   pkg-config,
   freetype,
   juce,
-  libX11,
-  libXcursor,
-  libXext,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxext,
+  libxinerama,
+  libxrandr,
   libglvnd,
 }:
 
@@ -46,11 +46,11 @@ stdenv.mkDerivation rec {
   buildInputs = [
     freetype
     juce
-    libX11
-    libXcursor
-    libXext
-    libXinerama
-    libXrandr
+    libx11
+    libxcursor
+    libxext
+    libxinerama
+    libxrandr
     libglvnd
   ];
 
diff --git a/pkgs/by-name/yu/yubihsm-setup/package.nix b/pkgs/by-name/yu/yubihsm-setup/package.nix
index 50fedb2c0213..d8f02b479988 100644
--- a/pkgs/by-name/yu/yubihsm-setup/package.nix
+++ b/pkgs/by-name/yu/yubihsm-setup/package.nix
@@ -7,14 +7,14 @@
   yubihsm-shell,
 }:
 
-rustPlatform.buildRustPackage (finalPackage: {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "yubihsm-setup";
   version = "2.3.3";
 
   src = fetchFromGitHub {
     owner = "Yubico";
     repo = "yubihsm-setup";
-    tag = finalPackage.version;
+    tag = finalAttrs.version;
     hash = "sha256-ScpcEDNWLhywtcPPG84vZyIAQ5lF07udmGsmsyc3+iU=";
   };
 
diff --git a/pkgs/by-name/za/zam-plugins/package.nix b/pkgs/by-name/za/zam-plugins/package.nix
index ef3bc26a2874..9427e2386a52 100644
--- a/pkgs/by-name/za/zam-plugins/package.nix
+++ b/pkgs/by-name/za/zam-plugins/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   boost,
-  libX11,
+  libx11,
   libGL,
   liblo,
   libjack2,
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     boost
-    libX11
+    libx11
     libGL
     liblo
     libjack2
diff --git a/pkgs/by-name/ze/zeal/package.nix b/pkgs/by-name/ze/zeal/package.nix
index 58c0f78ef04c..5a751dced519 100644
--- a/pkgs/by-name/ze/zeal/package.nix
+++ b/pkgs/by-name/ze/zeal/package.nix
@@ -7,7 +7,7 @@
   pkg-config,
   httplib,
   libarchive,
-  libXdmcp,
+  libxdmcp,
   libpthread-stubs,
   libxcb-keysyms,
   qt6,
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     httplib
-    libXdmcp
+    libxdmcp
     libarchive
     libpthread-stubs
     qt6.qtbase
diff --git a/pkgs/by-name/ze/zed-discord-presence/package.nix b/pkgs/by-name/ze/zed-discord-presence/package.nix
index b35a35688760..ec11acb63b1c 100644
--- a/pkgs/by-name/ze/zed-discord-presence/package.nix
+++ b/pkgs/by-name/ze/zed-discord-presence/package.nix
@@ -7,17 +7,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-discord-presence";
-  version = "0.9.2";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "xhyrom";
     repo = "zed-discord-presence";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BvhAt4tA3efu2XHQLEA0eTNInol0fWRiCtzBplLDzMo=";
+    hash = "sha256-lrOKX9KZFipbc6ubJr7TC+aIhpl7LQWTGS/KwPJy70g=";
   };
 
   cargoBuildFlags = [ "--package discord-presence-lsp" ];
-  cargoHash = "sha256-/25WO/zTgQPuctXowRtVF1GxXdmJzsL5HjhLaxcj0Ao=";
+  cargoHash = "sha256-61B1sk7D17eKkvmRr73tOKLRGqL4az/GE8wp8IViw84=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index f0c58f28b65e..7a87a841a22e 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -35,8 +35,8 @@
   makeBinaryWrapper,
   nodejs,
   libGL,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   livekit-libwebrtc,
   testers,
   writableTmpDirAsHomeHook,
@@ -173,8 +173,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     libxcb
     # required by livekit:
     libGL
-    libX11
-    libXext
+    libx11
+    libxext
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     apple-sdk_15
diff --git a/pkgs/by-name/ze/zeroad-unwrapped/package.nix b/pkgs/by-name/ze/zeroad-unwrapped/package.nix
index c673eec68bf8..6e4a62bbbb37 100644
--- a/pkgs/by-name/ze/zeroad-unwrapped/package.nix
+++ b/pkgs/by-name/ze/zeroad-unwrapped/package.nix
@@ -24,8 +24,8 @@
   libGLU,
   libGL,
   xorgproto,
-  libX11,
-  libXcursor,
+  libx11,
+  libxcursor,
   nspr,
   SDL2,
   gloox,
@@ -73,8 +73,8 @@ stdenv.mkDerivation (finalAttrs: {
     libGLU
     libGL
     xorgproto
-    libX11
-    libXcursor
+    libx11
+    libxcursor
     nspr
     SDL2
     gloox
@@ -89,8 +89,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   env.NIX_CFLAGS_COMPILE = toString [
     "-I${xorgproto}/include"
-    "-I${libX11.dev}/include"
-    "-I${libXcursor.dev}/include"
+    "-I${libx11.dev}/include"
+    "-I${libxcursor.dev}/include"
     "-I${SDL2}/include/SDL2"
     "-I${fmt_9.dev}/include"
     "-I${nvidia-texture-tools.dev}/include"
diff --git a/pkgs/by-name/ze/zesarux/package.nix b/pkgs/by-name/ze/zesarux/package.nix
index 8f0e273ee0e9..26d3f11b30f0 100644
--- a/pkgs/by-name/ze/zesarux/package.nix
+++ b/pkgs/by-name/ze/zesarux/package.nix
@@ -5,8 +5,8 @@
   SDL2,
   aalib,
   alsa-lib,
-  libXext,
-  libXxf86vm,
+  libxext,
+  libxxf86vm,
   libcaca,
   libpulseaudio,
   libsndfile,
@@ -34,8 +34,8 @@ stdenv.mkDerivation (finalAttrs: {
     SDL2
     aalib
     alsa-lib
-    libXxf86vm
-    libXext
+    libxxf86vm
+    libxext
     libcaca
     libpulseaudio
     libsndfile
diff --git a/pkgs/by-name/zi/zita-at1/package.nix b/pkgs/by-name/zi/zita-at1/package.nix
index a1fe6fdd6f6e..2a3b3073e490 100644
--- a/pkgs/by-name/zi/zita-at1/package.nix
+++ b/pkgs/by-name/zi/zita-at1/package.nix
@@ -4,8 +4,8 @@
   fetchurl,
   cairo,
   fftwSinglePrec,
-  libX11,
-  libXft,
+  libx11,
+  libxft,
   libclthreads,
   libclxclient,
   libjack2,
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     cairo
     fftwSinglePrec
-    libX11
-    libXft
+    libx11
+    libxft
     libclthreads
     libclxclient
     libjack2
diff --git a/pkgs/by-name/zl/zlcompressor/package.nix b/pkgs/by-name/zl/zlcompressor/package.nix
index 2ed0c224ed06..9b8ce4235eb3 100644
--- a/pkgs/by-name/zl/zlcompressor/package.nix
+++ b/pkgs/by-name/zl/zlcompressor/package.nix
@@ -17,10 +17,10 @@
   fontconfig,
   freetype,
   libGL,
-  libXcursor,
-  libXext,
-  libXinerama,
-  libXrandr,
+  libxcursor,
+  libxext,
+  libxinerama,
+  libxrandr,
   libepoxy,
   libjack2,
   libxkbcommon,
@@ -29,13 +29,13 @@
 
 clangStdenv.mkDerivation (finalAttrs: {
   pname = "zlcompressor";
-  version = "0.3.1";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "ZL-Audio";
     repo = "ZLCompressor";
     tag = finalAttrs.version;
-    hash = "sha256-G7tgRenRB6aYpi+BSiQzwSsekvCw4JPUuy1iXVj7HN0=";
+    hash = "sha256-u+2cfCNjMUXo+7/qBUU4BdDQcUyeQfd9kvARi3AAK48=";
     fetchSubmodules = true;
   };
 
@@ -57,10 +57,10 @@ clangStdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals clangStdenv.hostPlatform.isLinux [
     alsa-lib
     libGL
-    libXcursor
-    libXext
-    libXinerama
-    libXrandr
+    libxcursor
+    libxext
+    libxinerama
+    libxrandr
     libepoxy
     libjack2
     libxkbcommon
diff --git a/pkgs/by-name/zl/zlequalizer/package.nix b/pkgs/by-name/zl/zlequalizer/package.nix
index fd7ef5e529f1..91318d2abaa7 100644
--- a/pkgs/by-name/zl/zlequalizer/package.nix
+++ b/pkgs/by-name/zl/zlequalizer/package.nix
@@ -17,10 +17,10 @@
   fontconfig,
   freetype,
   libGL,
-  libXcursor,
-  libXext,
-  libXinerama,
-  libXrandr,
+  libxcursor,
+  libxext,
+  libxinerama,
+  libxrandr,
   libepoxy,
   libjack2,
   libxkbcommon,
@@ -57,10 +57,10 @@ clangStdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals clangStdenv.hostPlatform.isLinux [
     alsa-lib
     libGL
-    libXcursor
-    libXext
-    libXinerama
-    libXrandr
+    libxcursor
+    libxext
+    libxinerama
+    libxrandr
     libepoxy
     libjack2
     libxkbcommon
diff --git a/pkgs/by-name/zl/zlsplitter/package.nix b/pkgs/by-name/zl/zlsplitter/package.nix
index 64fa5d3e0aa0..fd2f7e4aa15f 100644
--- a/pkgs/by-name/zl/zlsplitter/package.nix
+++ b/pkgs/by-name/zl/zlsplitter/package.nix
@@ -17,10 +17,10 @@
   fontconfig,
   freetype,
   libGL,
-  libXcursor,
-  libXext,
-  libXinerama,
-  libXrandr,
+  libxcursor,
+  libxext,
+  libxinerama,
+  libxrandr,
   libepoxy,
   libjack2,
   libxkbcommon,
@@ -57,10 +57,10 @@ clangStdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals clangStdenv.hostPlatform.isLinux [
     alsa-lib
     libGL
-    libXcursor
-    libXext
-    libXinerama
-    libXrandr
+    libxcursor
+    libxext
+    libxinerama
+    libxrandr
     libepoxy
     libjack2
     libxkbcommon
diff --git a/pkgs/by-name/zu/zutty/package.nix b/pkgs/by-name/zu/zutty/package.nix
index 4c493483df57..06f975b68420 100644
--- a/pkgs/by-name/zu/zutty/package.nix
+++ b/pkgs/by-name/zu/zutty/package.nix
@@ -6,7 +6,7 @@
   freetype,
   wafHook,
   python3,
-  libXmu,
+  libxmu,
   glew,
   ucs-fonts,
   nixosTests,
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     freetype
-    libXmu
+    libxmu
     glew
   ];
 
diff --git a/pkgs/data/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix
index e2bb3289d9d6..86b2590685de 100644
--- a/pkgs/data/themes/qtcurve/default.nix
+++ b/pkgs/data/themes/qtcurve/default.nix
@@ -22,9 +22,9 @@
   kiconthemes,
   libpthread-stubs,
   pcre,
-  libXdmcp,
-  libX11,
-  libXau, # X11 dependencies
+  libxdmcp,
+  libx11,
+  libxau, # X11 dependencies
   fetchpatch,
 }:
 
@@ -78,9 +78,9 @@ mkDerivation rec {
     frameworkintegration
     libpthread-stubs
     pcre
-    libXdmcp
-    libX11
-    libXau
+    libxdmcp
+    libx11
+    libxau
   ]
   ++ lib.optional gtk2Support gtk2;
 
diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix
index 19e005ac9e1d..f0c2c46d9c87 100644
--- a/pkgs/desktops/lxqt/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/libfm-qt/default.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  libXdmcp,
+  libxdmcp,
   libexif,
   libfm,
   libpthread-stubs,
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libXdmcp
+    libxdmcp
     libexif
     libfm
     libpthread-stubs
diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix
index 830f8e5bc01e..662769fc4801 100644
--- a/pkgs/desktops/lxqt/liblxqt/default.nix
+++ b/pkgs/desktops/lxqt/liblxqt/default.nix
@@ -5,7 +5,7 @@
   cmake,
   gitUpdater,
   kwindowsystem,
-  libXScrnSaver,
+  libxscrnsaver,
   libqtxdg,
   lxqt-build-tools,
   polkit-qt-1,
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     kwindowsystem
-    libXScrnSaver
+    libxscrnsaver
     libqtxdg
     polkit-qt-1
     qtsvg
diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix
index b6d0eb7cfe1e..72030d8d5df8 100644
--- a/pkgs/desktops/lxqt/lximage-qt/default.nix
+++ b/pkgs/desktops/lxqt/lximage-qt/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  libXdmcp,
+  libxdmcp,
   libexif,
   libfm-qt,
   libpthread-stubs,
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libXdmcp
+    libxdmcp
     libexif
     libfm-qt
     libpthread-stubs
diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix
index 81477a03a7c5..f78d5f043c90 100644
--- a/pkgs/desktops/lxqt/lxqt-config/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-config/default.nix
@@ -5,9 +5,9 @@
   cmake,
   glib,
   kwindowsystem,
-  libXScrnSaver,
-  libXcursor,
-  libXdmcp,
+  libxscrnsaver,
+  libxcursor,
+  libxdmcp,
   libkscreen,
   liblxqt,
   libpthread-stubs,
@@ -48,9 +48,9 @@ stdenv.mkDerivation rec {
   buildInputs = [
     glib.bin
     kwindowsystem
-    libXScrnSaver
-    libXcursor
-    libXdmcp
+    libxscrnsaver
+    libxcursor
+    libxdmcp
     libkscreen
     liblxqt
     libpthread-stubs
diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix
index 77b627c97e3a..04a62049fd8d 100644
--- a/pkgs/desktops/lxqt/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix
@@ -9,9 +9,9 @@
   kguiaddons,
   kwindowsystem,
   layer-shell-qt,
-  libXdamage,
-  libXdmcp,
-  libXtst,
+  libxdamage,
+  libxdmcp,
+  libxtst,
   libdbusmenu,
   liblxqt,
   libpthread-stubs,
@@ -58,9 +58,9 @@ stdenv.mkDerivation (finalAttrs: {
     kguiaddons
     kwindowsystem
     layer-shell-qt
-    libXdamage
-    libXdmcp
-    libXtst
+    libxdamage
+    libxdmcp
+    libxtst
     libdbusmenu
     liblxqt
     libpthread-stubs
diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix
index e3f885ffcd1e..1026c8fbdb98 100644
--- a/pkgs/desktops/lxqt/lxqt-session/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-session/default.nix
@@ -5,7 +5,7 @@
   cmake,
   kwindowsystem,
   layer-shell-qt,
-  libXdmcp,
+  libxdmcp,
   liblxqt,
   libpthread-stubs,
   libqtxdg,
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     kwindowsystem
     layer-shell-qt
-    libXdmcp
+    libxdmcp
     liblxqt
     libpthread-stubs
     libqtxdg
diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix
index 8f77173f9c7a..31f2ef03909e 100644
--- a/pkgs/desktops/lxqt/obconf-qt/default.nix
+++ b/pkgs/desktops/lxqt/obconf-qt/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   libsm,
-  libXdmcp,
+  libxdmcp,
   libpthread-stubs,
   lxqt-build-tools,
   openbox,
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libsm
-    libXdmcp
+    libxdmcp
     libpthread-stubs
     openbox
     pcre
diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix
index 1414ed9973e4..caa8717adc43 100644
--- a/pkgs/desktops/lxqt/screengrab/default.nix
+++ b/pkgs/desktops/lxqt/screengrab/default.nix
@@ -7,7 +7,7 @@
   gitUpdater,
   kwindowsystem,
   layer-shell-qt,
-  libXdmcp,
+  libxdmcp,
   libpthread-stubs,
   libqtxdg,
   lxqt-build-tools,
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     kwindowsystem
     layer-shell-qt
-    libXdmcp
+    libxdmcp
     libpthread-stubs
     libqtxdg
     qtbase
diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix
index 276f473c9af0..296c681f6282 100644
--- a/pkgs/desktops/mate/marco/default.nix
+++ b/pkgs/desktops/mate/marco/default.nix
@@ -11,9 +11,9 @@
   libxml2,
   libcanberra-gtk3,
   libgtop,
-  libXdamage,
-  libXpresent,
-  libXres,
+  libxdamage,
+  libxpresent,
+  libxres,
   libstartup_notification,
   zenity,
   glib,
@@ -51,9 +51,9 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libcanberra-gtk3
     libgtop
-    libXdamage
-    libXpresent
-    libXres
+    libxdamage
+    libxpresent
+    libxres
     libstartup_notification
     gtk3
     zenity
diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix
index 61e8b2a2b9a5..19d330f53c6c 100644
--- a/pkgs/desktops/mate/mate-netbook/default.nix
+++ b/pkgs/desktops/mate/mate-netbook/default.nix
@@ -7,7 +7,7 @@
   gtk3,
   libwnck,
   libfakekey,
-  libXtst,
+  libxtst,
   mate,
   wrapGAppsHook3,
   gitUpdater,
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     libwnck
     libfakekey
-    libXtst
+    libxtst
     mate.mate-panel
   ];
 
diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix
index 450bdef5132c..31e8cc3eb96d 100644
--- a/pkgs/desktops/mate/mate-screensaver/default.nix
+++ b/pkgs/desktops/mate/mate-screensaver/default.nix
@@ -6,7 +6,7 @@
   gettext,
   gtk3,
   dbus-glib,
-  libXScrnSaver,
+  libxscrnsaver,
   libnotify,
   libxml2,
   mate-desktop,
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     gtk3
     dbus-glib
-    libXScrnSaver
+    libxscrnsaver
     libnotify
     mate-desktop
     mate-menus
diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix
index 06eed5cb86e9..ce3705193afb 100644
--- a/pkgs/desktops/mate/mate-session-manager/default.nix
+++ b/pkgs/desktops/mate/mate-session-manager/default.nix
@@ -8,7 +8,7 @@
   dbus-glib,
   systemd,
   libsm,
-  libXtst,
+  libxtst,
   glib,
   gtk3,
   libepoxy,
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
     dbus-glib
     systemd
     libsm
-    libXtst
+    libxtst
     gtk3
     mate-desktop
     mate-screensaver # for gsm_manager_init
diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix
index 2836a3598556..f5406df506f7 100644
--- a/pkgs/desktops/pantheon/apps/appcenter/default.nix
+++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation rec {
   pname = "appcenter";
-  version = "8.3.1";
+  version = "8.3.2";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "appcenter";
-    rev = version;
-    hash = "sha256-DFlPXsKLlBufOx/GgFAJovaRwCaFFHo2AlnvszdU7Go=";
+    tag = version;
+    hash = "sha256-K8XqWHR9TLkekPvx8VuigIWnqMRJcNf/rkfzUQAE0iU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
index d35fef152300..acb286050e66 100644
--- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-feedback";
-  version = "8.1.0";
+  version = "8.1.1";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "feedback";
     tag = version;
-    hash = "sha256-FvlSfcP/Qdo9zBFm2XiEqaxYGILe4BCNPyCELS43pew=";
+    hash = "sha256-vg692o0OkEQqtKSLZDLztL/D0YO5WUOBVKe4RDxSEFM=";
   };
 
   patches = [
diff --git a/pkgs/desktops/pantheon/apps/elementary-monitor/default.nix b/pkgs/desktops/pantheon/apps/elementary-monitor/default.nix
index b768abcd1008..169b4e28fde8 100644
--- a/pkgs/desktops/pantheon/apps/elementary-monitor/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-monitor/default.nix
@@ -18,7 +18,7 @@
   libadwaita,
   libgee,
   libgtop,
-  libX11,
+  libx11,
   linuxPackages,
   live-chart,
   pciutils,
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     libadwaita
     libgee
     libgtop
-    libX11
+    libx11
     linuxPackages.nvidia_x11.settings.libXNVCtrl
     live-chart
     pciutils
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
index b69f602fee34..65d68b372e24 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-applications";
-  version = "8.2.0";
+  version = "8.3.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "settings-applications";
     tag = version;
-    hash = "sha256-kmyAEm4MlyHfm2xC55qsFSk+aLEJMMCy7/Vi0dndaNU=";
+    hash = "sha256-2sa6D+vOQidFwBBiqFioOocN//3A3RLKX7w0U62K4oI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
index dba91d295408..1e2ee79dfba9 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-default-settings";
-  version = "8.1.0";
+  version = "8.1.1";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "default-settings";
-    rev = version;
-    sha256 = "sha256-GUq7kXaidzvqbyeVh4ihcxRqZXOzZO3WMXEe8lf477I=";
+    tag = version;
+    hash = "sha256-eH8bnfncyBMD7qPkdBy3zSBb79s1ALDLM58wae9hzPg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
index 345ebfa20fb3..1b9945ca77be 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
@@ -8,6 +8,7 @@
   gnome-settings-daemon,
   gtk3,
   elementary-dock,
+  evolution-data-server,
   gsettings-desktop-schemas,
   extraGSettingsOverrides ? "",
   extraGSettingsOverridePackages ? [ ],
@@ -19,6 +20,7 @@ let
 
   gsettingsOverridePackages = [
     elementary-dock
+    evolution-data-server
     gnome-settings-daemon
     gala
     gsettings-desktop-schemas
diff --git a/pkgs/development/compilers/fbc/default.nix b/pkgs/development/compilers/fbc/default.nix
index 0f98fd12bef4..0b99d8209d29 100644
--- a/pkgs/development/compilers/fbc/default.nix
+++ b/pkgs/development/compilers/fbc/default.nix
@@ -6,10 +6,10 @@
   gpm,
   libffi,
   libGL,
-  libX11,
-  libXext,
-  libXpm,
-  libXrandr,
+  libx11,
+  libxext,
+  libxpm,
+  libxrandr,
   ncurses,
 }:
 
@@ -42,10 +42,10 @@ stdenv.mkDerivation rec {
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     gpm
     libGL
-    libX11
-    libXext
-    libXpm
-    libXrandr
+    libx11
+    libxext
+    libxpm
+    libxrandr
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix
index 5a79e9f7b118..f9009186364f 100644
--- a/pkgs/development/compilers/flutter/wrapper.nix
+++ b/pkgs/development/compilers/flutter/wrapper.nix
@@ -35,7 +35,7 @@
   harfbuzz,
   libepoxy,
   pango,
-  libX11,
+  libx11,
   xorgproto,
   libdeflate,
   zlib,
@@ -93,7 +93,7 @@ let
     harfbuzz
     libepoxy
     pango
-    libX11
+    libx11
     libdeflate
   ];
 
@@ -120,7 +120,7 @@ let
   # They must be manually included.
   appStaticBuildDeps =
     (lib.optionals supportsLinuxDesktopTarget [
-      libX11
+      libx11
       xorgproto
       zlib
     ])
diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix
index 76507c48f3ef..884f0b4b82a0 100644
--- a/pkgs/development/compilers/fpc/lazarus.nix
+++ b/pkgs/development/compilers/fpc/lazarus.nix
@@ -10,10 +10,10 @@
   pango,
   atk,
   gdk-pixbuf,
-  libXi,
+  libxi,
   xorgproto,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   gdb,
   gnumake,
   binutils,
@@ -63,10 +63,10 @@ stdenv.mkDerivation rec {
     fpc
     gtk2
     glib
-    libXi
+    libxi
     xorgproto
-    libX11
-    libXext
+    libx11
+    libxext
     pango
     atk
     stdenv.cc
diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix
index e2cfe84edac4..bc5d1cd61122 100644
--- a/pkgs/development/compilers/gcl/default.nix
+++ b/pkgs/development/compilers/gcl/default.nix
@@ -9,14 +9,14 @@
   zlib,
   which,
   texinfo,
-  libX11,
+  libx11,
   xorgproto,
-  libXi,
+  libxi,
   gmp,
-  libXext,
-  libXt,
-  libXaw,
-  libXmu,
+  libxext,
+  libxt,
+  libxaw,
+  libxmu,
 }:
 
 stdenv.mkDerivation rec {
@@ -34,13 +34,13 @@ stdenv.mkDerivation rec {
     binutils
     emacs
     gmp
-    libX11
+    libx11
     xorgproto
-    libXi
-    libXext
-    libXt
-    libXaw
-    libXmu
+    libxi
+    libxext
+    libxt
+    libxaw
+    libxmu
     zlib
     which
     texinfo
diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix
index 921929b5a54c..33f6231aafbd 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -11,14 +11,14 @@
   debugBuild ? false,
   withJcef ? true,
 
-  libXdamage,
-  libXxf86vm,
-  libXrandr,
-  libXi,
-  libXcursor,
-  libXrender,
-  libX11,
-  libXext,
+  libxdamage,
+  libxxf86vm,
+  libxrandr,
+  libxi,
+  libxcursor,
+  libxrender,
+  libx11,
+  libxext,
   libxkbcommon,
   libxcb,
   nss,
@@ -135,14 +135,14 @@ jdk.overrideAttrs (oldAttrs: rec {
     # Build the set of output library directories to rpath against
     LIBDIRS="${
       lib.makeLibraryPath [
-        libXdamage
-        libXxf86vm
-        libXrandr
-        libXi
-        libXcursor
-        libXrender
-        libX11
-        libXext
+        libxdamage
+        libxxf86vm
+        libxrandr
+        libxi
+        libxcursor
+        libxrender
+        libx11
+        libxext
         libxkbcommon
         libxcb
         nss
diff --git a/pkgs/development/compilers/jetbrains-jdk/jcef.nix b/pkgs/development/compilers/jetbrains-jdk/jcef.nix
index 4dbf85637819..2bc5004691aa 100644
--- a/pkgs/development/compilers/jetbrains-jdk/jcef.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/jcef.nix
@@ -20,8 +20,8 @@
   nss,
   nspr,
   libGL,
-  libX11,
-  libXdamage,
+  libx11,
+  libxdamage,
   boost,
   thrift,
   cef-binary,
@@ -112,8 +112,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     boost
     libGL
-    libX11
-    libXdamage
+    libx11
+    libxdamage
     nss
     nspr
     thrift20
diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix
index dec07aee5742..379d6129c55d 100644
--- a/pkgs/development/compilers/mono/generic.nix
+++ b/pkgs/development/compilers/mono/generic.nix
@@ -7,7 +7,7 @@
   gettext,
   perl,
   libgdiplus,
-  libX11,
+  libx11,
   ncurses,
   zlib,
   bash,
@@ -48,15 +48,15 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     gettext
     libgdiplus
-    libX11
+    libx11
     ncurses
     zlib
     bash
   ];
 
   configureFlags = [
-    "--x-includes=${libX11.dev}/include"
-    "--x-libraries=${libX11.out}/lib"
+    "--x-includes=${libx11.dev}/include"
+    "--x-libraries=${libx11.out}/lib"
     "--with-libgdiplus=${libgdiplus}/lib/libgdiplus.so"
   ];
 
@@ -75,13 +75,13 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace mcs/class/corlib/System/Environment.cs --replace-fail /usr/share "$out/share"
   '';
 
-  # Fix mono DLLMap so it can find libX11 to run winforms apps
+  # Fix mono DLLMap so it can find libx11 to run winforms apps
   # libgdiplus is correctly handled by the --with-libgdiplus configure flag
   # Other items in the DLLMap may need to be pointed to their store locations, I don't think this is exhaustive
   # https://www.mono-project.com/Config_DllMap
   postBuild = ''
     find . -name 'config' -type f | xargs \
-    sed -i -e "s@libX11.so.6@${libX11.out}/lib/libX11.so.6@g"
+    sed -i -e "s@libX11.so.6@${libx11.out}/lib/libX11.so.6@g"
   '';
 
   # Without this, any Mono application attempting to open an SSL connection will throw with
diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml.nix b/pkgs/development/compilers/ocaml/ber-metaocaml.nix
index aba0450ab115..3110e7172a07 100644
--- a/pkgs/development/compilers/ocaml/ber-metaocaml.nix
+++ b/pkgs/development/compilers/ocaml/ber-metaocaml.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   ncurses,
-  libX11,
+  libx11,
   xorgproto,
   buildEnv,
   useX11 ? stdenv.hostPlatform.isx86,
@@ -11,7 +11,7 @@
 
 let
   x11deps = [
-    libX11
+    libx11
     xorgproto
   ];
   inherit (lib) optionals;
diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
index 681acc6f6002..3dd5bf932160 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@@ -22,7 +22,7 @@ in
   buildEnv,
   libunwind,
   fetchpatch,
-  libX11,
+  libx11,
   xorgproto,
   useX11 ? safeX11 stdenv && lib.versionOlder version "4.09",
   aflSupport ? false,
@@ -72,7 +72,7 @@ let
   x11env = buildEnv {
     name = "x11env";
     paths = [
-      libX11
+      libx11
       xorgproto
     ];
   };
@@ -167,7 +167,7 @@ stdenv.mkDerivation (
     buildInputs =
       optional (lib.versionOlder version "4.07") ncurses
       ++ optionals useX11 [
-        libX11
+        libx11
         xorgproto
       ];
     depsBuildBuild = lib.optionals (!stdenv.hostPlatform.isDarwin) [ binutils ];
diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix
index 0282b52d3c0f..a193c6360f58 100644
--- a/pkgs/development/compilers/openjdk/generic.nix
+++ b/pkgs/development/compilers/openjdk/generic.nix
@@ -29,16 +29,16 @@
   giflib,
   libpng,
   lcms2,
-  libX11,
+  libx11,
   libice,
-  libXext,
-  libXrender,
-  libXtst,
-  libXt,
-  libXi,
-  libXinerama,
-  libXcursor,
-  libXrandr,
+  libxext,
+  libxrender,
+  libxtst,
+  libxt,
+  libxi,
+  libxinerama,
+  libxcursor,
+  libxrandr,
   fontconfig,
 
   setJavaClassPath,
@@ -276,16 +276,16 @@ stdenv.mkDerivation (finalAttrs: {
     alsa-lib
     libjpeg
     giflib
-    libX11
+    libx11
     libice
-    libXext
-    libXrender
-    libXtst
-    libXt
-    libXi
-    libXinerama
-    libXcursor
-    libXrandr
+    libxext
+    libxrender
+    libxtst
+    libxt
+    libxi
+    libxinerama
+    libxcursor
+    libxrandr
     fontconfig
   ]
   ++ lib.optionals (atLeast11 && !atLeast21) [
diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix
index 47f6518395df..5d1450f00102 100644
--- a/pkgs/development/compilers/osl/default.nix
+++ b/pkgs/development/compilers/osl/default.nix
@@ -25,13 +25,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "openshadinglanguage";
-  version = "1.14.7.0";
+  version = "1.15.1.0";
 
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "OpenShadingLanguage";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-w78x0e9T0lYCAPDPkx6T/4TzAs/mpJ/24uQ+yH5gB5I=";
+    hash = "sha256-+PNh4xFdH8onxK0OTnQHbdupTaB2hTgDumY0krJiWUE=";
   };
 
   cmakeFlags = [
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 8e487dc37416..6bcf350ffc22 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -74,7 +74,7 @@ let
 
 in
 
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sbcl";
   inherit version;
 
@@ -88,7 +88,7 @@ stdenv.mkDerivation (self: {
   nativeBuildInputs = [
     texinfo
   ]
-  ++ lib.optionals self.doCheck (
+  ++ lib.optionals finalAttrs.doCheck (
     [
       which
       writableTmpDirAsHomeHook
@@ -96,14 +96,14 @@ stdenv.mkDerivation (self: {
     ++ lib.optionals (builtins.elem stdenv.system strace.meta.platforms) [
       strace
     ]
-    ++ lib.optionals (lib.versionOlder "2.4.10" self.version) [
+    ++ lib.optionals (lib.versionOlder "2.4.10" finalAttrs.version) [
       ps
     ]
   );
-  buildInputs = lib.optionals self.coreCompression (
+  buildInputs = lib.optionals finalAttrs.coreCompression (
     # Declare at the point of actual use in case the caller wants to override
     # buildInputs to sidestep this.
-    assert lib.assertMsg (!self.purgeNixReferences) ''
+    assert lib.assertMsg (!finalAttrs.purgeNixReferences) ''
       Cannot enable coreCompression when purging Nix references, because compression requires linking in zstd
     '';
     [ zstd ]
@@ -119,7 +119,7 @@ stdenv.mkDerivation (self: {
   # to get rid of ${glibc} dependency.
   purgeNixReferences = false;
   coreCompression = true;
-  markRegionGC = self.threadSupport;
+  markRegionGC = finalAttrs.threadSupport;
   disableImmobileSpace = false;
   linkableRuntime = stdenv.hostPlatform.isx86;
 
@@ -128,7 +128,7 @@ stdenv.mkDerivation (self: {
   # altogether. One by one hopefully we can fix these (on ofBorg,
   # upstream--somehow some way) in due time.
   disabledTestFiles =
-    lib.optionals (lib.versionOlder "2.5.2" self.version) [ "debug.impure.lisp" ]
+    lib.optionals (lib.versionOlder "2.5.2" finalAttrs.version) [ "debug.impure.lisp" ]
     ++
       lib.optionals
         (builtins.elem stdenv.hostPlatform.system [
@@ -182,7 +182,7 @@ stdenv.mkDerivation (self: {
     # "https://sourceforge.net/p/sbcl/mailman/sbcl-devel/thread/2cf20df7-01d0-44f2-8551-0df01fe55f1a%400brg.net/"),
     # but for Nix envvars are sufficiently useful that it’s worth maintaining
     # this functionality downstream.
-    if lib.versionOlder "2.5.2" self.version then
+    if lib.versionOlder "2.5.2" finalAttrs.version then
       [
         ./dynamic-space-size-envvar-2.5.3-feature.patch
         ./dynamic-space-size-envvar-2.5.3-tests.patch
@@ -194,10 +194,10 @@ stdenv.mkDerivation (self: {
       ];
 
   sbclPatchPhase =
-    lib.optionalString (self.disabledTestFiles != [ ]) ''
-      (cd tests ; rm -f ${lib.concatStringsSep " " self.disabledTestFiles})
+    lib.optionalString (finalAttrs.disabledTestFiles != [ ]) ''
+      (cd tests ; rm -f ${lib.concatStringsSep " " finalAttrs.disabledTestFiles})
     ''
-    + lib.optionalString self.purgeNixReferences ''
+    + lib.optionalString finalAttrs.purgeNixReferences ''
       # This is the default location to look for the core; by default in $out/lib/sbcl
       sed 's@^\(#define SBCL_HOME\) .*$@\1 "/no-such-path"@' \
           -i src/runtime/runtime.c
@@ -209,7 +209,9 @@ stdenv.mkDerivation (self: {
         # binary. There are some tricky files in nested directories which should
         # definitely NOT be patched this way, hence just a single * (and no
         # globstar).
-        substituteInPlace ${if self.purgeNixReferences then "tests" else "{tests,src/code}"}/*.{lisp,sh} \
+        substituteInPlace ${
+          if finalAttrs.purgeNixReferences then "tests" else "{tests,src/code}"
+        }/*.{lisp,sh} \
           --replace-quiet /usr/bin/env "${posixUtils}/bin/env" \
           --replace-quiet /bin/uname "${posixUtils}/bin/uname" \
           --replace-quiet /bin/sh "${stdenv.shell}"
@@ -218,7 +220,7 @@ stdenv.mkDerivation (self: {
       # want to override { src = ... } it might not exist. It’s required for
       # building, so create a mock version as a backup.
       if [[ ! -a version.lisp-expr ]]; then
-        echo '"${self.version}.nixos"' > version.lisp-expr
+        echo '"${finalAttrs.version}.nixos"' > version.lisp-expr
       fi
     '';
 
@@ -226,17 +228,17 @@ stdenv.mkDerivation (self: {
 
   enableFeatures =
     assert lib.assertMsg (
-      self.markRegionGC -> self.threadSupport
+      finalAttrs.markRegionGC -> finalAttrs.threadSupport
     ) "SBCL mark region GC requires thread support";
-    lib.optional self.threadSupport "sb-thread"
-    ++ lib.optional self.linkableRuntime "sb-linkable-runtime"
-    ++ lib.optional self.coreCompression "sb-core-compression"
+    lib.optional finalAttrs.threadSupport "sb-thread"
+    ++ lib.optional finalAttrs.linkableRuntime "sb-linkable-runtime"
+    ++ lib.optional finalAttrs.coreCompression "sb-core-compression"
     ++ lib.optional stdenv.hostPlatform.isAarch32 "arm"
-    ++ lib.optional self.markRegionGC "mark-region-gc";
+    ++ lib.optional finalAttrs.markRegionGC "mark-region-gc";
 
   disableFeatures =
-    lib.optional (!self.threadSupport) "sb-thread"
-    ++ lib.optionals self.disableImmobileSpace [
+    lib.optional (!finalAttrs.threadSupport) "sb-thread"
+    ++ lib.optionals finalAttrs.disableImmobileSpace [
       "immobile-space"
       "immobile-code"
       "compact-instance-header"
@@ -246,8 +248,8 @@ stdenv.mkDerivation (self: {
     "--prefix=$out"
     "--xc-host=${lib.escapeShellArg bootstrapLisp'}"
   ]
-  ++ map (x: "--with-${x}") self.enableFeatures
-  ++ map (x: "--without-${x}") self.disableFeatures
+  ++ map (x: "--with-${x}") finalAttrs.enableFeatures
+  ++ map (x: "--without-${x}") finalAttrs.disableFeatures
   ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [
     "--arch=arm64"
   ];
@@ -264,7 +266,7 @@ stdenv.mkDerivation (self: {
     runHook preBuild
 
     export INSTALL_ROOT=$out
-    sh make.sh ${lib.concatStringsSep " " self.buildArgs}
+    sh make.sh ${lib.concatStringsSep " " finalAttrs.buildArgs}
     (cd doc/manual ; make info)
 
     runHook postBuild
@@ -291,7 +293,7 @@ stdenv.mkDerivation (self: {
     sh install.sh
 
   ''
-  + lib.optionalString (!self.purgeNixReferences) ''
+  + lib.optionalString (!finalAttrs.purgeNixReferences) ''
     cp -r src $out/lib/sbcl
     cp -r contrib $out/lib/sbcl
     cat >$out/lib/sbcl/sbclrc <<EOF
@@ -304,7 +306,7 @@ stdenv.mkDerivation (self: {
     runHook postInstall
   '';
 
-  setupHook = lib.optional self.purgeNixReferences (
+  setupHook = lib.optional finalAttrs.purgeNixReferences (
     writeText "setupHook.sh" ''
       addEnvHooks "$targetOffset" _setSbclHome
       _setSbclHome() {
diff --git a/pkgs/development/emilua-plugins/beast/default.nix b/pkgs/development/emilua-plugins/beast/default.nix
index 74a4222b28e2..7b93a3e68def 100644
--- a/pkgs/development/emilua-plugins/beast/default.nix
+++ b/pkgs/development/emilua-plugins/beast/default.nix
@@ -11,14 +11,14 @@
   gitUpdater,
 }:
 
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "emilua_beast";
   version = "1.1.2";
 
   src = fetchFromGitLab {
     owner = "emilua";
     repo = "beast";
-    rev = "v${self.version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-MASaZvhIVKmeBUcn/NjlBZ+xh+2RgwHBH2o08lklGa0=";
   };
 
diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix
index 1a09cdef7895..31282db8d289 100644
--- a/pkgs/development/interpreters/clisp/default.nix
+++ b/pkgs/development/interpreters/clisp/default.nix
@@ -19,11 +19,11 @@
   readline,
   libffi,
   libffcall,
-  libX11,
-  libXau,
-  libXt,
-  libXpm,
-  libXext,
+  libx11,
+  libxau,
+  libxt,
+  libxpm,
+  libxext,
   xorgproto,
   coreutils,
   # build options
@@ -45,12 +45,12 @@
 assert
   x11Support
   -> (
-    libX11 != null
-    && libXau != null
-    && libXt != null
-    && libXpm != null
+    libx11 != null
+    && libxau != null
+    && libxt != null
+    && libxpm != null
     && xorgproto != null
-    && libXext != null
+    && libxext != null
   );
 
 let
@@ -86,12 +86,12 @@ stdenv.mkDerivation {
   ++ lib.optional (ffcallAvailable && (libffi != null)) libffi
   ++ lib.optional ffcallAvailable libffcall
   ++ lib.optionals x11Support [
-    libX11
-    libXau
-    libXt
-    libXpm
+    libx11
+    libxau
+    libxt
+    libxpm
     xorgproto
-    libXext
+    libxext
   ];
 
   # First, replace port 9090 (rather low, can be used)
diff --git a/pkgs/development/interpreters/erlang/27.nix b/pkgs/development/interpreters/erlang/27.nix
index 96487d748c01..c00e351a7dcb 100644
--- a/pkgs/development/interpreters/erlang/27.nix
+++ b/pkgs/development/interpreters/erlang/27.nix
@@ -1,6 +1,6 @@
 genericBuilder:
 
 genericBuilder {
-  version = "27.3.4.6";
-  hash = "sha256-QC8C7rOpRXFriZtmVc48Se7IQ61p4DSAXVobnDeEkAE=";
+  version = "27.3.4.7";
+  hash = "sha256-3D+j36vNio0REx02bJ/dYey/nTojZuQSnzIWBIOch1U=";
 }
diff --git a/pkgs/development/interpreters/gnudatalanguage/default.nix b/pkgs/development/interpreters/gnudatalanguage/default.nix
index 328ecd9dfe02..ce3d127517ae 100644
--- a/pkgs/development/interpreters/gnudatalanguage/default.nix
+++ b/pkgs/development/interpreters/gnudatalanguage/default.nix
@@ -167,7 +167,7 @@ stdenv.mkDerivation (finalAttrs: {
     netcdf-custom
     plplot-with-drivers
   ]
-  ++ lib.optional enableXWin plplot-with-drivers.libX11
+  ++ lib.optional enableXWin plplot-with-drivers.libx11
   ++ lib.optional enableGRIB eccodes
   ++ lib.optional enableGLPK glpk
   ++ lib.optional enableWX wxGTK32
@@ -190,7 +190,7 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional enableSzip "-DSZIPDIR=${szip}"
     ++ lib.optionals enableXWin [
       "-DX11=ON"
-      "-DX11DIR=${plplot-with-drivers.libX11}"
+      "-DX11DIR=${plplot-with-drivers.libx11}"
     ]
     ++ lib.optionals enableMPI [
       "-DMPI=ON"
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index a1add4055af5..1dfa19956730 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -12,7 +12,7 @@
   qhull,
   libsndfile,
   portaudio,
-  libX11,
+  libx11,
   graphicsmagick,
   pcre2,
   pkg-config,
@@ -150,7 +150,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
     libGL
     libGLU
-    libX11
+    libx11
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     libiconv
diff --git a/pkgs/development/interpreters/perl/interpreter.nix b/pkgs/development/interpreters/perl/interpreter.nix
index a501b9996725..06bfeee4cd71 100644
--- a/pkgs/development/interpreters/perl/interpreter.nix
+++ b/pkgs/development/interpreters/perl/interpreter.nix
@@ -363,6 +363,7 @@ stdenv.mkDerivation (
       platforms = lib.platforms.all;
       priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl`
       mainProgram = "perl";
+      identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "perl" finalAttrs.version;
     };
   }
   // lib.optionalAttrs crossCompiling rec {
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 5f735c1dc4ea..9f3d064ceeb1 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -15,7 +15,7 @@
   tcl ? null,
   tk ? null,
   tclPackages,
-  libX11 ? null,
+  libx11 ? null,
   x11Support ? false,
   zlib,
   self,
@@ -46,7 +46,7 @@
   pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}",
 }:
 
-assert x11Support -> tcl != null && tk != null && libX11 != null;
+assert x11Support -> tcl != null && tk != null && libx11 != null;
 
 assert lib.assertMsg (enableOptimizations -> (!stdenv.cc.isClang))
   "Optimizations with clang are not supported. configure: error: llvm-profdata is required for a --enable-optimizations build but could not be found.";
@@ -279,7 +279,7 @@ let
     ++ lib.optionals x11Support [
       tcl
       tk
-      libX11
+      libx11
     ];
   nativeBuildInputs = [
     autoreconfHook
diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix
index bfe766fc2917..41240a3decc3 100644
--- a/pkgs/development/interpreters/python/pypy/default.nix
+++ b/pkgs/development/interpreters/python/pypy/default.nix
@@ -18,7 +18,7 @@
   tcl,
   tk,
   tclPackages,
-  libX11,
+  libx11,
   gdbm,
   db,
   xz,
@@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
     sqlite
     tk
     tcl
-    libX11
+    libx11
     gdbm
     db
   ]
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index a72d4f4c4c80..d963a31ea02f 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -13,7 +13,7 @@
   curl,
   gcc,
   libsForQt5,
-  libXt,
+  libxt,
   qtbase,
   qttools,
   qtwebengine,
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
     libsndfile
     fftw
     curl
-    libXt
+    libxt
     qtbase
     qtwebsockets
     qtwayland
diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index 33109f4656af..fa50aef21339 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -19,17 +19,17 @@
   libtheora,
   libvorbis,
   libwebp,
-  libX11,
-  libXcursor,
-  libXdmcp,
-  libXext,
-  libXfixes,
-  libXi,
-  libXpm,
-  libXt,
-  libXxf86dga,
-  libXxf86misc,
-  libXxf86vm,
+  libx11,
+  libxcursor,
+  libxdmcp,
+  libxext,
+  libxfixes,
+  libxi,
+  libxpm,
+  libxt,
+  libxxf86dga,
+  libxxf86misc,
+  libxxf86vm,
   openal,
   physfs,
   pkg-config,
@@ -92,17 +92,17 @@ stdenv.mkDerivation rec {
     alsa-lib
     libpthread-stubs
     libpulseaudio
-    libX11
-    libXcursor
-    libXdmcp
-    libXext
-    libXfixes
-    libXi
-    libXpm
-    libXt
-    libXxf86dga
-    libXxf86misc
-    libXxf86vm
+    libx11
+    libxcursor
+    libxdmcp
+    libxext
+    libxfixes
+    libxi
+    libxpm
+    libxt
+    libxxf86dga
+    libxxf86misc
+    libxxf86vm
     xorgproto
   ]
   ++ lib.optionals useSDL [
diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix
index 846982028885..8453364a447f 100644
--- a/pkgs/development/libraries/allegro/default.nix
+++ b/pkgs/development/libraries/allegro/default.nix
@@ -3,21 +3,21 @@
   stdenv,
   fetchurl,
   texinfo,
-  libXext,
+  libxext,
   xorgproto,
-  libX11,
-  libXpm,
-  libXt,
-  libXcursor,
+  libx11,
+  libxpm,
+  libxt,
+  libxcursor,
   alsa-lib,
   cmake,
   pkg-config,
   zlib,
   libpng,
   libvorbis,
-  libXxf86dga,
-  libXxf86misc,
-  libXxf86vm,
+  libxxf86dga,
+  libxxf86misc,
+  libxxf86vm,
   openal,
   libGLU,
   libGL,
@@ -43,19 +43,19 @@ stdenv.mkDerivation rec {
   ];
   buildInputs = [
     texinfo
-    libXext
+    libxext
     xorgproto
-    libX11
-    libXpm
-    libXt
-    libXcursor
+    libx11
+    libxpm
+    libxt
+    libxcursor
     alsa-lib
     zlib
     libpng
     libvorbis
-    libXxf86dga
-    libXxf86misc
-    libXxf86vm
+    libxxf86dga
+    libxxf86misc
+    libxxf86vm
     openal
     libGLU
     libGL
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 82dd5c31381c..203052505e5e 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -310,11 +310,11 @@
   libvpl,
   libvpx,
   libwebp,
-  libX11,
+  libx11,
   libxcb,
-  libXext,
+  libxext,
   libxml2,
-  libXv,
+  libxv,
   nv-codec-headers,
   nv-codec-headers-12,
   ocl-icd, # OpenCL ICD
@@ -971,9 +971,9 @@ stdenv.mkDerivation (
       ++ optionals withXevd [ xevd ]
       ++ optionals withXeve [ xeve ]
       ++ optionals withXlib [
-        libX11
-        libXv
-        libXext
+        libx11
+        libxv
+        libxext
       ]
       ++ optionals withXml2 [ libxml2 ]
       ++ optionals withXvid [ xvidcore ]
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index 4a9c8c4e75f3..a8c80341210f 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -25,9 +25,9 @@
   buildPackages,
   gobject-introspection,
   enableX11 ? stdenv.hostPlatform.isLinux,
-  libXext,
-  libXi,
-  libXv,
+  libxext,
+  libxi,
+  libxv,
   libdrm,
   enableWayland ? stdenv.hostPlatform.isLinux,
   wayland-scanner,
@@ -111,9 +111,9 @@ stdenv.mkDerivation (finalAttrs: {
     alsa-lib
   ]
   ++ lib.optionals enableX11 [
-    libXext
-    libXi
-    libXv
+    libxext
+    libxi
+    libxv
   ]
   ++ lib.optionals enableWayland [
     wayland
diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix
index 5215d7d78947..b494459c245a 100644
--- a/pkgs/development/libraries/irrlicht/default.nix
+++ b/pkgs/development/libraries/irrlicht/default.nix
@@ -4,9 +4,9 @@
   fetchzip,
   libGLU,
   libGL,
-  libXrandr,
-  libX11,
-  libXxf86vm,
+  libxrandr,
+  libx11,
+  libxxf86vm,
   zlib,
 }:
 
@@ -46,9 +46,9 @@ stdenv.mkDerivation {
   buildInputs = [
     libGLU
     libGL
-    libXrandr
-    libX11
-    libXxf86vm
+    libxrandr
+    libx11
+    libxxf86vm
   ]
   ++ lib.optional stdenv.hostPlatform.isAarch64 zlib;
 
diff --git a/pkgs/development/libraries/itk/generic.nix b/pkgs/development/libraries/itk/generic.nix
index 44b971d50ad6..adfb5719c876 100644
--- a/pkgs/development/libraries/itk/generic.nix
+++ b/pkgs/development/libraries/itk/generic.nix
@@ -21,7 +21,7 @@
   libminc,
   libtiff,
   libpng,
-  libX11,
+  libx11,
   libuuid,
   patchelf,
   python ? null,
@@ -150,14 +150,14 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     libuuid
   ]
   ++ lib.optionals (lib.versionAtLeast version "5.4") [ eigen ]
   ++ lib.optionals enablePython [ python ]
   ++ lib.optionals withVtk [ vtk ];
   # Due to ITKVtkGlue=ON and the additional dependencies needed to configure VTK 9
-  # (specifically libGL and libX11 on Linux),
+  # (specifically libGL and libx11 on Linux),
   # it's now seemingly necessary for packages that configure ITK to
   # also include configuration deps of VTK, even if VTK is not required or available.
   # These deps were propagated from VTK 9 in https://github.com/NixOS/nixpkgs/pull/206935,
diff --git a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
index 0fd204a75c70..bda5fe20d868 100644
--- a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
+++ b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
@@ -12,7 +12,7 @@
   knotifications,
   kpackage,
   kwidgetsaddons,
-  libXcursor,
+  libxcursor,
   qtx11extras,
 }:
 
@@ -29,7 +29,7 @@ mkDerivation {
     knotifications
     kpackage
     kwidgetsaddons
-    libXcursor
+    libxcursor
     qtx11extras
   ];
   propagatedBuildInputs = [
diff --git a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
index 147dd2ebd0aa..766bc3dec3ed 100644
--- a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
+++ b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
@@ -10,7 +10,7 @@
   qtbase,
   qttools,
   qtx11extras,
-  libXdmcp,
+  libxdmcp,
 }:
 
 mkDerivation {
@@ -25,7 +25,7 @@ mkDerivation {
     kwindowsystem
     qttools
     qtx11extras
-    libXdmcp
+    libxdmcp
   ];
   outputs = [
     "out"
diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
index ff5da40077aa..dd94f7131e7c 100644
--- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
@@ -2,7 +2,7 @@
   mkDerivation,
   extra-cmake-modules,
   libpthread-stubs,
-  libXdmcp,
+  libxdmcp,
   qtbase,
   qttools,
   qtx11extras,
@@ -13,7 +13,7 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     libpthread-stubs
-    libXdmcp
+    libxdmcp
     qttools
     qtx11extras
   ];
diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix
index 067eee12bbef..3d06a7410c5e 100644
--- a/pkgs/development/libraries/libidn2/default.nix
+++ b/pkgs/development/libraries/libidn2/default.nix
@@ -65,5 +65,6 @@ stdenv.mkDerivation rec {
     ];
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [ fpletz ];
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "gnu" version;
   };
 }
diff --git a/pkgs/development/libraries/libopenshot-audio/default.nix b/pkgs/development/libraries/libopenshot-audio/default.nix
index 9c6d2858b16b..9d2cae53e425 100644
--- a/pkgs/development/libraries/libopenshot-audio/default.nix
+++ b/pkgs/development/libraries/libopenshot-audio/default.nix
@@ -5,12 +5,12 @@
   alsa-lib,
   cmake,
   doxygen,
-  libX11,
-  libXcursor,
-  libXext,
-  libXft,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxext,
+  libxft,
+  libxinerama,
+  libxrandr,
   pkg-config,
   zlib,
 }:
@@ -43,12 +43,12 @@ stdenv.mkDerivation (finalAttrs: {
         ]
       else
         [
-          libX11
-          libXcursor
-          libXext
-          libXft
-          libXinerama
-          libXrandr
+          libx11
+          libxcursor
+          libxext
+          libxft
+          libxinerama
+          libxrandr
         ]
     );
 
diff --git a/pkgs/development/libraries/libva/1.nix b/pkgs/development/libraries/libva/1.nix
index fac14e26ec44..95f6bcf688b7 100644
--- a/pkgs/development/libraries/libva/1.nix
+++ b/pkgs/development/libraries/libva/1.nix
@@ -3,11 +3,11 @@
   lib,
   fetchFromGitHub,
   autoreconfHook,
-  libX11,
+  libx11,
   pkg-config,
-  libXext,
+  libxext,
   libdrm,
-  libXfixes,
+  libxfixes,
   wayland,
   wayland-scanner,
   libffi,
@@ -45,9 +45,9 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals (!minimal) [
     libva1-minimal
-    libX11
-    libXext
-    libXfixes
+    libx11
+    libxext
+    libxfixes
     wayland
     libffi
     libGL
diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index f27c5bb59eb1..7e383fa49352 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -8,10 +8,10 @@
   wayland-scanner,
   libdrm,
   minimal ? false,
-  libX11,
+  libx11,
   libxcb,
-  libXext,
-  libXfixes,
+  libxext,
+  libxfixes,
   wayland,
   libffi,
   libGL,
@@ -54,10 +54,10 @@ stdenv.mkDerivation (finalAttrs: {
     libdrm
   ]
   ++ lib.optionals (!minimal) [
-    libX11
+    libx11
     libxcb
-    libXext
-    libXfixes
+    libxext
+    libxfixes
     wayland
     libffi
     libGL
diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/development/libraries/libva/utils.nix
index f511599899d3..8b828e33d26e 100644
--- a/pkgs/development/libraries/libva/utils.nix
+++ b/pkgs/development/libraries/libva/utils.nix
@@ -7,9 +7,9 @@
   pkg-config,
   libdrm,
   libva,
-  libX11,
-  libXext,
-  libXfixes,
+  libx11,
+  libxext,
+  libxfixes,
   wayland,
 }:
 
@@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libdrm
     libva
-    libX11
-    libXext
-    libXfixes
+    libx11
+    libxext
+    libxfixes
     wayland
   ];
 
diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix
index 6ae615dad5da..dbb478e62aba 100644
--- a/pkgs/development/libraries/libwnck/default.nix
+++ b/pkgs/development/libraries/libwnck/default.nix
@@ -9,13 +9,13 @@
   gtk-doc,
   docbook_xsl,
   docbook_xml_dtd_412,
-  libX11,
+  libx11,
   glib,
   gtk3,
   pango,
   cairo,
-  libXres,
-  libXi,
+  libxres,
+  libxi,
   libstartup_notification,
   gettext,
   gobject-introspection,
@@ -53,12 +53,12 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libX11
+    libx11
     libstartup_notification
     pango
     cairo
-    libXres
-    libXi
+    libxres
+    libxi
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/libraries/libwpe/default.nix b/pkgs/development/libraries/libwpe/default.nix
index a2b1af8024e3..c2c9d50f2bf7 100644
--- a/pkgs/development/libraries/libwpe/default.nix
+++ b/pkgs/development/libraries/libwpe/default.nix
@@ -7,7 +7,7 @@
   libxkbcommon,
   libGL,
   ninja,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation rec {
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libxkbcommon
     libGL
-    libX11
+    libx11
   ];
 
   meta = {
diff --git a/pkgs/development/libraries/libwpe/fdo.nix b/pkgs/development/libraries/libwpe/fdo.nix
index 1552e5caaee2..9c662b02c71d 100644
--- a/pkgs/development/libraries/libwpe/fdo.nix
+++ b/pkgs/development/libraries/libwpe/fdo.nix
@@ -12,7 +12,7 @@
   libwpe,
   libxkbcommon,
   libGL,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation rec {
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     libwpe
     libxkbcommon
     libGL
-    libX11
+    libx11
   ];
 
   meta = {
diff --git a/pkgs/development/libraries/libxml2/common.nix b/pkgs/development/libraries/libxml2/common.nix
index bc43cfd9d6e3..61c40a95ffe3 100644
--- a/pkgs/development/libraries/libxml2/common.nix
+++ b/pkgs/development/libraries/libxml2/common.nix
@@ -159,6 +159,7 @@ stdenv'.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     platforms = lib.platforms.all;
     pkgConfigModules = [ "libxml-2.0" ];
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "xmlsoft" finalAttrs.version;
     # Python limits cross-compilation to an allowlist of host OSes.
     # https://github.com/python/cpython/blob/dfad678d7024ab86d265d84ed45999e031a03691/configure.ac#L534-L562
     broken =
diff --git a/pkgs/development/libraries/mapbox-gl-native/default.nix b/pkgs/development/libraries/mapbox-gl-native/default.nix
deleted file mode 100644
index c4e2c1ef09a8..000000000000
--- a/pkgs/development/libraries/mapbox-gl-native/default.nix
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  fetchFromGitHub,
-  fetchpatch,
-  cmake,
-  pkg-config,
-  qtbase,
-  curl,
-  libuv,
-  glfw3,
-  rapidjson,
-}:
-
-mkDerivation rec {
-  pname = "mapbox-gl-native";
-  version = "1.6.0";
-
-  src = fetchFromGitHub {
-    owner = "mapbox";
-    repo = "mapbox-gl-native";
-    rev = "maps-v${version}";
-    sha256 = "027rw23yvd5a6nl9b5hsanddc44nyb17l2whdcq9fxb9n6vcda4c";
-    fetchSubmodules = true;
-  };
-
-  patches = [
-    # https://github.com/mapbox/mapbox-gl-native/pull/16591
-    (fetchpatch {
-      name = "add-support-for-qmapboxgl-installation.patch";
-      url = "https://github.com/mapbox/mapbox-gl-native/commit/e18467d755f470b26f61f6893eddd76ecf0816e6.patch";
-      sha256 = "0gs7wmkvyhf2db4cwbsq31sprsh1avi70ggvi32bk0wn3cw4d79b";
-    })
-    (fetchpatch {
-      name = "add-support-for-using-qmapboxgl-as-a-proper-cmake-dependency.patch";
-      url = "https://github.com/mapbox/mapbox-gl-native/commit/ab27b9b8207754ef731b588d187c470ffb084455.patch";
-      sha256 = "1lr5p1g4qaizs57vjqry9aq8k1ki59ks0y975chlnrm2sffp140r";
-    })
-    (fetchpatch {
-      name = "skip-license-check.patch";
-      url = "https://git.alpinelinux.org/aports/plain/testing/mapbox-gl-native/0002-skip-license-check.patch?id=6751a93dca26b0b3ceec9eb151272253a2fe497e";
-      sha256 = "1yybwzxbvn0lqb1br1fyg7763p2h117s6mkmywkl4l7qg9daa7ba";
-    })
-    (fetchpatch {
-      name = "fix-compilation.patch";
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-compilation.patch?h=mapbox-gl-native";
-      hash = "sha256-KgJHyoIdKdnQo+gedns3C+mEXlaTH/UtyQsaYR1T3iI=";
-    })
-    (fetchpatch {
-      name = "fix-narrowing-conversion.patch";
-      url = "https://github.com/mapbox/mapbox-gl-native/commit/2955d0e479f57a39a0af4a0fa7ca7683455cca58.patch";
-      hash = "sha256-Jk7OLb9/mVtc2mm0AL1h9zcSiQ54jogNI+q6ojY0HEo=";
-    })
-  ];
-
-  postPatch = ''
-    # don't use vendored rapidjson
-    rm -r vendor/mapbox-base/extras/rapidjson
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-  buildInputs = [
-    curl
-    libuv
-    glfw3
-    qtbase
-    rapidjson
-  ];
-
-  cmakeFlags = [
-    "-DMBGL_WITH_QT=ON"
-    "-DMBGL_WITH_QT_LIB_ONLY=ON"
-    "-DMBGL_WITH_QT_HEADLESS=OFF"
-  ];
-  env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=type-limits";
-
-  meta = {
-    # Does not build against gcc-13, the repository is archived upstream.
-    broken = true;
-    description = "Interactive, thoroughly customizable maps in native Android, iOS, macOS, Node.js, and Qt applications, powered by vector tiles and OpenGL";
-    homepage = "https://mapbox.com/mobile";
-    license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [
-      Thra11
-      dotlambda
-    ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 42f603449222..bee518b5a758 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -276,6 +276,7 @@ stdenv.mkDerivation (finalAttrs: {
       in
       base ++ lib.optionals unicodeSupport (map (p: p + "w") base);
     platforms = lib.platforms.all;
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "ncurses_project" finalAttrs.version;
   };
 
   passthru = {
diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix
index 86414d5ac356..b626e137c427 100644
--- a/pkgs/development/libraries/nettle/generic.nix
+++ b/pkgs/development/libraries/nettle/generic.nix
@@ -72,5 +72,6 @@ stdenv.mkDerivation {
 
     platforms = lib.platforms.all;
     maintainers = [ lib.maintainers.vcunat ];
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "nettle_project" version;
   };
 }
diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix
index 137857b8c1df..00a1ef96000e 100644
--- a/pkgs/development/libraries/ogre/default.nix
+++ b/pkgs/development/libraries/ogre/default.nix
@@ -18,13 +18,13 @@
   libGLU,
   libice,
   libsm,
-  libX11,
-  libXaw,
-  libXmu,
-  libXrandr,
-  libXrender,
-  libXt,
-  libXxf86vm,
+  libx11,
+  libxaw,
+  libxmu,
+  libxrandr,
+  libxrender,
+  libxt,
+  libxxf86vm,
   xorgproto,
   # optional
   withNvidiaCg ? false,
@@ -86,13 +86,13 @@ let
         libGLU
         libice
         libsm
-        libX11
-        libXaw
-        libXmu
-        libXrandr
-        libXrender
-        libXt
-        libXxf86vm
+        libx11
+        libxaw
+        libxmu
+        libxrandr
+        libxrender
+        libxt
+        libxxf86vm
         xorgproto
       ]
       ++ lib.optionals withNvidiaCg [
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index c89360283e10..25a046309a54 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -391,6 +391,7 @@ let
           "openssl"
         ];
         platforms = lib.platforms.all;
+        identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "openssl" finalAttrs.version;
       }
       // extraMeta;
     });
diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix
index 2c56ea3a7cc4..88d6cedb39f5 100644
--- a/pkgs/development/libraries/pcre2/default.nix
+++ b/pkgs/development/libraries/pcre2/default.nix
@@ -53,5 +53,6 @@ stdenv.mkDerivation rec {
       "libpcre2-16"
       "libpcre2-32"
     ];
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "pcre" version;
   };
 }
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 8b83ec4d8c08..5e39b035877e 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -26,12 +26,12 @@
   harfbuzz,
   icu,
   libdrm,
-  libX11,
-  libXcomposite,
-  libXcursor,
-  libXext,
-  libXi,
-  libXrender,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxext,
+  libxi,
+  libxrender,
   libjpeg,
   libpng,
   libxcb,
@@ -124,11 +124,11 @@ stdenv.mkDerivation (
           libdrm
 
           # X11 libs
-          libX11
-          libXcomposite
-          libXext
-          libXi
-          libXrender
+          libx11
+          libxcomposite
+          libxext
+          libxi
+          libxrender
           libxcb
           libxkbcommon
           libxcb-util
@@ -318,9 +318,9 @@ stdenv.mkDerivation (
             "-w"
           ]
           ++ [
-            ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"''
+            ''-DNIXPKGS_QTCOMPOSE="${libx11.out}/share/X11/locale"''
             ''-DLIBRESOLV_SO="${stdenv.cc.libc.out}/lib/libresolv"''
-            ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
+            ''-DNIXPKGS_LIBXCURSOR="${libxcursor.out}/lib/libXcursor"''
           ]
           ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"''
           ++ lib.optional stdenv.hostPlatform.isLinux "-DUSE_X11"
@@ -459,17 +459,17 @@ stdenv.mkDerivation (
             "-xcb"
             "-qpa xcb"
             "-L"
-            "${libX11.out}/lib"
+            "${libx11.out}/lib"
             "-I"
-            "${libX11.out}/include"
+            "${libx11.out}/include"
             "-L"
-            "${libXext.out}/lib"
+            "${libxext.out}/lib"
             "-I"
-            "${libXext.out}/include"
+            "${libxext.out}/include"
             "-L"
-            "${libXrender.out}/lib"
+            "${libxrender.out}/lib"
             "-I"
-            "${libXrender.out}/include"
+            "${libxrender.out}/include"
 
             "-${lib.optionalString (cups == null) "no-"}cups"
             "-dbus-linked"
diff --git a/pkgs/development/libraries/qt-5/modules/qtsystems.nix b/pkgs/development/libraries/qt-5/modules/qtsystems.nix
index 0c9557606156..12a1552d4767 100644
--- a/pkgs/development/libraries/qt-5/modules/qtsystems.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtsystems.nix
@@ -4,7 +4,7 @@
   lib,
   bluez,
   libevdev,
-  libX11,
+  libx11,
   pkg-config,
   qtbase,
   udev,
@@ -34,7 +34,7 @@ qtModule {
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     bluez
     libevdev
-    libX11
+    libx11
     udev
   ];
 
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index 61aac879b93f..7e59defa4f05 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -25,10 +25,10 @@
   xrandr,
   libxkbfile,
   libpciaccess,
-  libXcursor,
-  libXScrnSaver,
-  libXrandr,
-  libXtst,
+  libxcursor,
+  libxscrnsaver,
+  libxrandr,
+  libxtst,
   fontconfig,
   freetype,
   harfbuzz,
@@ -382,11 +382,11 @@ qtModule (
 
       # X11 libs
       xrandr
-      libXScrnSaver
-      libXcursor
-      libXrandr
+      libxscrnsaver
+      libxcursor
+      libxrandr
       libpciaccess
-      libXtst
+      libxtst
       libxcomposite
       libxdamage
       libdrm
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
index 03b455aa67ac..400d503240fc 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
@@ -41,11 +41,11 @@
   glib,
   harfbuzz,
   icu,
-  libX11,
-  libXcomposite,
-  libXext,
-  libXi,
-  libXrender,
+  libx11,
+  libxcomposite,
+  libxext,
+  libxi,
+  libxrender,
   libjpeg,
   libpng,
   libxcb,
@@ -146,11 +146,11 @@ stdenv.mkDerivation rec {
     fontconfig
     freetype
     # X11 libs
-    libX11
-    libXcomposite
-    libXext
-    libXi
-    libXrender
+    libx11
+    libxcomposite
+    libxext
+    libxi
+    libxrender
     libxcb
     libxkbcommon
     libxcb-util
diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix
index 16c9f4d501a6..0b29cd3b5e4e 100644
--- a/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix
@@ -20,7 +20,7 @@
   libpulseaudio,
   pipewire,
   wayland,
-  libXrandr,
+  libxrandr,
   elfutils,
   libunwind,
   orc,
@@ -42,7 +42,7 @@ qtModule {
     pipewire
     alsa-lib
     wayland
-    libXrandr
+    libxrandr
     libva
   ]
   ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils ];
diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
index 659812c57b63..ac01102f18b2 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
@@ -21,12 +21,12 @@
   xrandr,
   libxkbfile,
   libpciaccess,
-  libXcursor,
-  libXScrnSaver,
-  libXrandr,
-  libXtst,
+  libxcursor,
+  libxscrnsaver,
+  libxrandr,
+  libxtst,
   libxshmfence,
-  libXi,
+  libxi,
   cups,
   fontconfig,
   freetype,
@@ -260,17 +260,17 @@ qtModule {
 
     # X11 libs
     xrandr
-    libXScrnSaver
-    libXcursor
-    libXrandr
+    libxscrnsaver
+    libxcursor
+    libxrandr
     libpciaccess
-    libXtst
+    libxtst
     libxcomposite
     libxdamage
     libdrm
     libxkbfile
     libxshmfence
-    libXi
+    libxi
     libxext
 
     # Pipewire
diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
index 54ab47e2db21..f27ae2919f7a 100644
--- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
+++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
@@ -10,8 +10,8 @@
   qtx11extras ? null, # Qt 5 only
   kwindowsystem,
   qtwayland,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
   qttools,
   wrapQtAppsHook,
   gitUpdater,
@@ -42,8 +42,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     qtbase
     qtsvg
-    libX11
-    libXext
+    libx11
+    libxext
   ]
   ++ lib.optionals isQt5 [ qtx11extras ]
   ++ lib.optionals (!isQt5) [
diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix
index a74a48f3a7aa..0c02fad98be4 100644
--- a/pkgs/development/libraries/quarto/default.nix
+++ b/pkgs/development/libraries/quarto/default.nix
@@ -37,12 +37,12 @@ let
     ++ (extraPythonPackages ps)
   );
 in
-stdenv.mkDerivation (final: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "quarto";
   version = "1.8.26";
 
   src = fetchurl {
-    url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz";
+    url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${finalAttrs.version}/quarto-${finalAttrs.version}-linux-amd64.tar.gz";
     hash = "sha256-rYyqbTrsw/K2pKj7gpZnfvLvlBCkij7rp7H5ockQAPA=";
   };
 
@@ -103,7 +103,7 @@ stdenv.mkDerivation (final: {
       Quarto documents are authored using markdown, an easy to write plain text format.
     '';
     homepage = "https://quarto.org/";
-    changelog = "https://github.com/quarto-dev/quarto-cli/releases/tag/v${final.version}";
+    changelog = "https://github.com/quarto-dev/quarto-cli/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
       minijackson
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index ff46657680fd..51afd948b2ac 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -154,5 +154,6 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ np ];
     platforms = lib.platforms.unix ++ lib.platforms.windows;
     pkgConfigModules = [ "sqlite3" ];
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "sqlite" version;
   };
 }
diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix
index 77b459ac56a9..65270be3e345 100644
--- a/pkgs/development/libraries/tk/generic.nix
+++ b/pkgs/development/libraries/tk/generic.nix
@@ -4,7 +4,7 @@
   src,
   pkg-config,
   tcl,
-  libXft,
+  libxft,
   zip,
   zlib,
   patches ? [ ],
@@ -80,7 +80,7 @@ tcl.mkTclDerivation {
   ];
 
   propagatedBuildInputs = [
-    libXft
+    libxft
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix
index 3593e438f794..09df550969a4 100644
--- a/pkgs/development/libraries/vtk/generic.nix
+++ b/pkgs/development/libraries/vtk/generic.nix
@@ -74,10 +74,10 @@
   viskores,
   freetype,
   fontconfig,
-  libX11,
-  libXfixes,
-  libXrender,
-  libXcursor,
+  libx11,
+  libxfixes,
+  libxrender,
+  libxcursor,
   gl2ps,
   libGL,
   qt6,
@@ -156,9 +156,9 @@ stdenv.mkDerivation (finalAttrs: {
     vtkPackages.pdal
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libXfixes
-    libXrender
-    libXcursor
+    libxfixes
+    libxrender
+    libxcursor
   ]
   ++ lib.optional withQt6 qt6.qttools
   ++ lib.optional mpiSupport mpi
@@ -203,7 +203,7 @@ stdenv.mkDerivation (finalAttrs: {
     llvmPackages.openmp
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
+    libx11
     gl2ps
   ]
   # create meta package providing dist-info for python3Pacakges.vtk that common cmake build does not do
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index ce66108b70a6..c13c293fc806 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -171,5 +171,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.zlib;
     platforms = lib.platforms.all;
     pkgConfigModules = [ "zlib" ];
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "zlib" finalAttrs.version;
   };
 })
diff --git a/pkgs/development/ocaml-modules/graphics/default.nix b/pkgs/development/ocaml-modules/graphics/default.nix
index f95f2bef0b11..8600b6082c89 100644
--- a/pkgs/development/ocaml-modules/graphics/default.nix
+++ b/pkgs/development/ocaml-modules/graphics/default.nix
@@ -3,8 +3,8 @@
   fetchFromGitHub,
   buildDunePackage,
   dune-configurator,
-  libX11,
-  libXft,
+  libx11,
+  libxft,
 }:
 
 buildDunePackage (finalAttrs: {
@@ -20,8 +20,8 @@ buildDunePackage (finalAttrs: {
 
   buildInputs = [ dune-configurator ];
   propagatedBuildInputs = [
-    libX11
-    libXft
+    libx11
+    libxft
   ];
 
   meta = {
diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
index 6a5a696aa20e..beaea2284c37 100644
--- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
@@ -17,15 +17,13 @@
   pango,
 }:
 
-let
+stdenv.mkDerivation (finalAttrs: {
+  name = "ocaml${ocaml.version}-${finalAttrs.pname}-${finalAttrs.version}";
   pname = "ocaml-cairo";
-in
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   version = "1.2.0";
 
   src = fetchurl {
-    url = "http://cgit.freedesktop.org/cairo-ocaml/snapshot/cairo-ocaml-${version}.zip";
+    url = "http://cgit.freedesktop.org/cairo-ocaml/snapshot/cairo-ocaml-${finalAttrs.version}.zip";
     sha256 = "0l4p9bp6kclr570mxma8wafibr1g5fsjj8h10yr4b507g0hmlh0l";
   };
 
@@ -75,4 +73,4 @@ stdenv.mkDerivation rec {
     broken = lib.versionAtLeast ocaml.version "4.06";
     inherit (ocaml.meta) platforms;
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/raylib/default.nix b/pkgs/development/ocaml-modules/raylib/default.nix
index 17708d871d2c..ec95db2aa769 100644
--- a/pkgs/development/ocaml-modules/raylib/default.nix
+++ b/pkgs/development/ocaml-modules/raylib/default.nix
@@ -8,11 +8,11 @@
   integers,
   patch,
   libGL,
-  libX11,
-  libXcursor,
-  libXi,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxcursor,
+  libxi,
+  libxinerama,
+  libxrandr,
 }:
 
 buildDunePackage rec {
@@ -45,11 +45,11 @@ buildDunePackage rec {
     ctypes
     integers
     libGL
-    libX11
-    libXcursor
-    libXi
-    libXinerama
-    libXrandr
+    libx11
+    libxcursor
+    libxi
+    libxinerama
+    libxrandr
   ];
 
   meta = {
diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix
index 3c674459cd1e..24e06ba09c35 100644
--- a/pkgs/development/ocaml-modules/uuseg/default.nix
+++ b/pkgs/development/ocaml-modules/uuseg/default.nix
@@ -13,24 +13,19 @@
   cmdlinerSupport ? lib.versionAtLeast cmdliner.version "1.1",
 }:
 
-let
+stdenv.mkDerivation (finalAttrs: {
+  name = "ocaml${ocaml.version}-${finalAttrs.pname}-${finalAttrs.version}";
   pname = "uuseg";
-  webpage = "https://erratique.ch/software/${pname}";
-in
-
-stdenv.mkDerivation rec {
-
-  name = "ocaml${ocaml.version}-${pname}-${version}";
   inherit version;
 
   src = fetchurl {
-    url = "${webpage}/releases/${pname}-${version}.tbz";
+    url = "https://erratique.ch/software/uuseg/releases/uuseg-${finalAttrs.version}.tbz";
     hash =
       {
         "17.0.0" = "sha256-Fn41ajEFbMv3LLkD+zqy76217/kWFS7q9jm9ubc6TI4=";
         "15.0.0" = "sha256-q8x3bia1QaKpzrWFxUmLWIraKqby7TuPNGvbSjkY4eM=";
       }
-      ."${version}";
+      ."${finalAttrs.version}";
   };
 
   nativeBuildInputs = [
@@ -60,10 +55,10 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "OCaml library for segmenting Unicode text";
-    homepage = webpage;
+    homepage = "https://erratique.ch/software/uuseg";
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.vbgl ];
     mainProgram = "usegtrip";
     inherit (ocaml.meta) platforms;
   };
-}
+})
diff --git a/pkgs/development/python-modules/aioamazondevices/default.nix b/pkgs/development/python-modules/aioamazondevices/default.nix
index 184b4c486d4b..05bfadc29661 100644
--- a/pkgs/development/python-modules/aioamazondevices/default.nix
+++ b/pkgs/development/python-modules/aioamazondevices/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "aioamazondevices";
-  version = "11.1.1";
+  version = "11.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "chemelli74";
     repo = "aioamazondevices";
     tag = "v${version}";
-    hash = "sha256-D0QxCnwyXtHvcx+BaO4mzGuZxLZtgogQpHXvFckX9f8=";
+    hash = "sha256-9WZ8GlnlI1Coyvi1Aqtk0iVoREyohCLBnjg2kusP1cE=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/aioslimproto/default.nix b/pkgs/development/python-modules/aioslimproto/default.nix
index 9c91609aeacd..5ca2a02a6435 100644
--- a/pkgs/development/python-modules/aioslimproto/default.nix
+++ b/pkgs/development/python-modules/aioslimproto/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "aioslimproto";
-  version = "3.1.4";
+  version = "3.1.5";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "home-assistant-libs";
     repo = "aioslimproto";
     tag = version;
-    hash = "sha256-9WPlVAj/Bo7k/oWHI3xDkn07OrQdvNruou2s/zxB61Q=";
+    hash = "sha256-A5BAMEtyyDoQzl+eRt4XMo1vOyyNZ2D+YLQ64xHfYkk=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix
index eb179169f6f5..e53bc2239dc4 100644
--- a/pkgs/development/python-modules/apycula/default.nix
+++ b/pkgs/development/python-modules/apycula/default.nix
@@ -6,14 +6,14 @@
   setuptools-scm,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "apycula";
-  version = "0.28";
+  version = "0.29";
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-AfNjHQkDrZ9oULuEmgXhqr063NWDZCpVW5pE6chnnFI=";
+    inherit (finalAttrs) pname version;
+    hash = "sha256-awhGSmGQDQ0Pi+4y9KoR1Yw6UZjM/CTxAV0jdfen6Qw=";
   };
 
   build-system = [ setuptools-scm ];
@@ -28,8 +28,8 @@ buildPythonPackage rec {
   meta = {
     description = "Open Source tools for Gowin FPGAs";
     homepage = "https://github.com/YosysHQ/apicula";
-    changelog = "https://github.com/YosysHQ/apicula/releases/tag/${version}";
+    changelog = "https://github.com/YosysHQ/apicula/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ newam ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/bibtexparser/2.nix b/pkgs/development/python-modules/bibtexparser/2.nix
index 8b776e551c13..4625c0f0246b 100644
--- a/pkgs/development/python-modules/bibtexparser/2.nix
+++ b/pkgs/development/python-modules/bibtexparser/2.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "bibtexparser";
-  version = "2.0.0b8";
+  version = "2.0.0b9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sciunto-org";
     repo = "python-bibtexparser";
     tag = "v${version}";
-    hash = "sha256-531Mh/5DUYayXm1H0v4dPX0P9mRcqcQcU/A+f4wwqxg=";
+    hash = "sha256-viBY2hZXsXsfjpi7zMFh3CwQFOKL41F3x0IKULelo/o=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/cobs/default.nix b/pkgs/development/python-modules/cobs/default.nix
index 1c7aa960017e..d96d4e15fa2d 100644
--- a/pkgs/development/python-modules/cobs/default.nix
+++ b/pkgs/development/python-modules/cobs/default.nix
@@ -36,5 +36,6 @@ buildPythonPackage rec {
     '';
     homepage = "https://github.com/cmcqueen/cobs-python/";
     license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kip93 ];
   };
 }
diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix
index 0390dd429a3c..b84bd6581cdd 100644
--- a/pkgs/development/python-modules/denonavr/default.nix
+++ b/pkgs/development/python-modules/denonavr/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "denonavr";
-  version = "1.3.1";
+  version = "1.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ol-iver";
     repo = "denonavr";
     tag = finalAttrs.version;
-    hash = "sha256-GrcTNnGanyYwcRIqzh5gToe2Z0E5KM2V7Ph/eBFoljA=";
+    hash = "sha256-nuxTZA4kGSaRp6qqOG8XjqjYxiCwmAraetVD4LFd0Qc=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/dronecan/default.nix b/pkgs/development/python-modules/dronecan/default.nix
index 19cd14017d5f..d03003425523 100644
--- a/pkgs/development/python-modules/dronecan/default.nix
+++ b/pkgs/development/python-modules/dronecan/default.nix
@@ -27,5 +27,6 @@ buildPythonPackage rec {
     '';
     homepage = "https://dronecan.github.io/";
     license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kip93 ];
   };
 }
diff --git a/pkgs/development/python-modules/entsoe-apy/default.nix b/pkgs/development/python-modules/entsoe-apy/default.nix
index 45db4bdf9b17..1dda8e12c8e7 100644
--- a/pkgs/development/python-modules/entsoe-apy/default.nix
+++ b/pkgs/development/python-modules/entsoe-apy/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "entsoe-apy";
-  version = "0.8.1";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "berrij";
     repo = "entsoe-apy";
     tag = "v${version}";
-    hash = "sha256-9bfGEBOXILO+bwkyFgnVFSY1k9gA6RmzWv9mEmJGOeM=";
+    hash = "sha256-tHduOA3huBuCm/ygFcgmtYQ2AZkco9oy7yVRnYpB/K0=";
   };
 
   pyproject = true;
diff --git a/pkgs/development/python-modules/fastapi-sso/default.nix b/pkgs/development/python-modules/fastapi-sso/default.nix
index d0abe2265f7c..73598fa3fc10 100644
--- a/pkgs/development/python-modules/fastapi-sso/default.nix
+++ b/pkgs/development/python-modules/fastapi-sso/default.nix
@@ -13,21 +13,18 @@
   pytest-asyncio,
   pytest-xdist,
   pytestCheckHook,
-  pythonOlder,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "fastapi-sso";
-  version = "0.19.0";
+  version = "0.20.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "tomasvotava";
     repo = "fastapi-sso";
-    tag = version;
-    hash = "sha256-ve1xeJjAfE6b5NBJJZuDUdE58RjDmIq3KI3xC5ScCco=";
+    tag = finalAttrs.version;
+    hash = "sha256-bj6csovJSVhzVaPfktJ68cOgULVifT1Ql14SL+paVG0=";
   };
 
   build-system = [ poetry-core ];
@@ -54,8 +51,8 @@ buildPythonPackage rec {
   meta = {
     description = "FastAPI plugin to enable SSO to most common providers (such as Facebook login, Google login and login via Microsoft Office 365 Account";
     homepage = "https://github.com/tomasvotava/fastapi-sso";
-    changelog = "https://github.com/tomasvotava/fastapi-sso/releases/tag/${version}";
+    changelog = "https://github.com/tomasvotava/fastapi-sso/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/flask-marshmallow/default.nix b/pkgs/development/python-modules/flask-marshmallow/default.nix
index 0c3b4b83ed51..8c6360c50eac 100644
--- a/pkgs/development/python-modules/flask-marshmallow/default.nix
+++ b/pkgs/development/python-modules/flask-marshmallow/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "flask-marshmallow";
-  version = "1.3.0";
+  version = "1.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "marshmallow-code";
     repo = "flask-marshmallow";
     tag = version;
-    hash = "sha256-dK2bE5mZiFh0nAN2yRpABT+SGG/UGWJ1oDtnD6bgyXk=";
+    hash = "sha256-YyXsCyIJmXb1p1J5wvGg57bGbsAbz83vW6hxpnbpOSw=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/gbinder-python/default.nix b/pkgs/development/python-modules/gbinder-python/default.nix
index 9ede6d2c28fa..6bbc44067e27 100644
--- a/pkgs/development/python-modules/gbinder-python/default.nix
+++ b/pkgs/development/python-modules/gbinder-python/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "gbinder-python";
-  version = "1.3.0";
+  version = "1.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "waydroid";
     repo = "gbinder-python";
     tag = version;
-    hash = "sha256-z0hMAvwB+uttPcP+in+C3o1ujhFSiDXKktOajnsXhPI=";
+    hash = "sha256-bXuvGTzYifiCPDkcNvkgh+RAZfckcyR8weaRkgbfCyA=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/glcontext/default.nix b/pkgs/development/python-modules/glcontext/default.nix
index 9d66911b0f98..39cde68b8c6b 100644
--- a/pkgs/development/python-modules/glcontext/default.nix
+++ b/pkgs/development/python-modules/glcontext/default.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
   setuptools,
   libGL,
-  libX11,
+  libx11,
 }:
 
 buildPythonPackage rec {
@@ -24,13 +24,13 @@ buildPythonPackage rec {
 
   buildInputs = [
     libGL
-    libX11
+    libx11
   ];
 
   postPatch = lib.optionalString (stdenv.hostPlatform.isLinux) ''
     substituteInPlace glcontext/x11.cpp \
       --replace-fail '"libGL.so"' '"${libGL}/lib/libGL.so"' \
-      --replace-fail '"libX11.so"' '"${libX11}/lib/libX11.so"'
+      --replace-fail '"libX11.so"' '"${libx11}/lib/libX11.so"'
     substituteInPlace glcontext/egl.cpp \
       --replace-fail '"libGL.so"' '"${libGL}/lib/libGL.so"' \
       --replace-fail '"libEGL.so"' '"${libGL}/lib/libEGL.so"'
diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index 624269e4e172..6b21040c306e 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.202602051";
+  version = "0.1.202602061";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XdgvVaxUuHjWALQZ60dPCZJZhifCUcqnWVCt7LdLxe0=";
+    hash = "sha256-bsfzOI2CUzmYJF2jbgTmEd6TktbkXbkezqWgmBNu8So=";
   };
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/icmplib/default.nix b/pkgs/development/python-modules/icmplib/default.nix
index 6348db3593ef..73214a18040a 100644
--- a/pkgs/development/python-modules/icmplib/default.nix
+++ b/pkgs/development/python-modules/icmplib/default.nix
@@ -2,8 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pbr,
-  requests,
 }:
 
 buildPythonPackage rec {
@@ -18,11 +16,6 @@ buildPythonPackage rec {
     hash = "sha256-PnBcGiUvftz/KYg9Qd2GaIcF3OW4lYH301uI5/M5CBI=";
   };
 
-  propagatedBuildInputs = [
-    pbr
-    requests
-  ];
-
   # Project has no tests
   doCheck = false;
   pythonImportsCheck = [ "icmplib" ];
diff --git a/pkgs/development/python-modules/kivy/default.nix b/pkgs/development/python-modules/kivy/default.nix
index 3eff452ef759..710985352263 100644
--- a/pkgs/development/python-modules/kivy/default.nix
+++ b/pkgs/development/python-modules/kivy/default.nix
@@ -10,7 +10,7 @@
   setuptools,
   kivy-garden,
   libGL,
-  libX11,
+  libx11,
   mtdev,
   SDL2,
   SDL2_image,
@@ -73,7 +73,7 @@ buildPythonPackage rec {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     libGL
-    libX11
+    libx11
     mtdev
   ]
   ++ lib.optionals withGstreamer (
diff --git a/pkgs/development/python-modules/lancedb/default.nix b/pkgs/development/python-modules/lancedb/default.nix
index 0726bc273cb7..b93c9c035f6d 100644
--- a/pkgs/development/python-modules/lancedb/default.nix
+++ b/pkgs/development/python-modules/lancedb/default.nix
@@ -42,21 +42,21 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "lancedb";
-  version = "0.26.1";
+  version = "0.27.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lancedb";
     repo = "lancedb";
     tag = "python-v${finalAttrs.version}";
-    hash = "sha256-yx4cwO7qRH9/1rW0UFz17HkvJ8utJynYoAHnN+wPpKw=";
+    hash = "sha256-pWrwv3VtfkfOKnkiiu26yRDrDrsNxb+0r/kcNHwzmhU=";
   };
 
   buildAndTestSubdir = "python";
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-ymoA/KKL7oLgp5u/NcXxbYfOueiKH+bpLxLcO+mn0Eo=";
+    hash = "sha256-U1Od4lhaaGdYF3TISfRWY7sRmyyniZqLofBCnYAo1ew=";
   };
 
   build-system = [ rustPlatform.maturinBuildHook ];
@@ -106,18 +106,26 @@ buildPythonPackage (finalAttrs: {
 
   disabledTestMarks = [ "slow" ];
 
-  disabledTests =
-    lib.optionals (pythonAtLeast "3.14") [
-      # TypeError: Converting Pydantic type to Arrow Type: unsupported type
-      # <class 'test_pydantic.test_optional_nested_model.<locals>.WALocation'>.
-      "test_optional_nested_model"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Flaky (even when the sandbox is disabled):
-      # FileNotFoundError: [Errno 2] Cannot delete directory '/nix/var/nix/builds/nix-41395-654732360/.../test.lance/_indices/fts':
-      # Cannot get information for path '/nix/var/nix/builds/nix-41395-654732360/.../test.lance/_indices/fts/.tmppyKXfw'
-      "test_create_index_from_table"
-    ];
+  disabledTests = [
+    # Requires internet access
+    # RuntimeError: lance error: LanceError(IO): Generic S3 error
+    "test_bucket_without_dots_passes"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.14") [
+    # TypeError: Converting Pydantic type to Arrow Type: unsupported type
+    # <class 'test_pydantic.test_optional_nested_model.<locals>.WALocation'>.
+    "test_optional_nested_model"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Flaky (even when the sandbox is disabled):
+    # FileNotFoundError: [Errno 2] Cannot delete directory '/nix/var/nix/builds/nix-41395-654732360/.../test.lance/_indices/fts':
+    # Cannot get information for path '/nix/var/nix/builds/nix-41395-654732360/.../test.lance/_indices/fts/.tmppyKXfw'
+    "test_create_index_from_table"
+  ]
+  ++ lib.optionals ((pythonAtLeast "3.14") && stdenv.hostPlatform.isDarwin) [
+    # Failed: DID NOT RAISE <class 'Exception'>
+    "test_merge_insert"
+  ];
 
   disabledTestPaths = [
     # touch the network
diff --git a/pkgs/development/python-modules/libpcap/default.nix b/pkgs/development/python-modules/libpcap/default.nix
index 05f448396531..7d34225c2df7 100644
--- a/pkgs/development/python-modules/libpcap/default.nix
+++ b/pkgs/development/python-modules/libpcap/default.nix
@@ -62,5 +62,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/karpierz/libpcap/";
     changelog = "https://github.com/karpierz/libpcap/blob/${version}/CHANGES.rst";
     license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ kip93 ];
   };
 }
diff --git a/pkgs/development/python-modules/llama-stack-client/default.nix b/pkgs/development/python-modules/llama-stack-client/default.nix
index 0f9039870244..f29f29e52817 100644
--- a/pkgs/development/python-modules/llama-stack-client/default.nix
+++ b/pkgs/development/python-modules/llama-stack-client/default.nix
@@ -32,13 +32,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "llama-stack-client";
-  version = "0.4.3";
+  version = "0.5.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "llama_stack_client";
     inherit (finalAttrs) version;
-    hash = "sha256-y4B74lggbo/t615c66e+cQjTutsx10GZQGgIw9FnnDU=";
+    hash = "sha256-4AWunZdc2jCzuGJhBX8ijXABB+Jj4St5a5IM0fubqWg=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/materialx/default.nix b/pkgs/development/python-modules/materialx/default.nix
index 4fb823a2a2dd..21db4a4f35bc 100644
--- a/pkgs/development/python-modules/materialx/default.nix
+++ b/pkgs/development/python-modules/materialx/default.nix
@@ -5,8 +5,8 @@
   fetchFromGitHub,
   cmake,
   setuptools,
-  libX11,
-  libXt,
+  libx11,
+  libxt,
   libGL,
   openimageio,
   imath,
@@ -36,8 +36,8 @@ buildPythonPackage rec {
     imath
   ]
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    libX11
-    libXt
+    libx11
+    libxt
     libGL
   ];
 
diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index ceb0c0c1349c..c733274ab686 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -64,7 +64,7 @@
   ipykernel,
 
   # required for headless detection
-  libX11,
+  libx11,
   wayland,
 
   # Reverse dependency
@@ -107,7 +107,7 @@ buildPythonPackage rec {
     + lib.optionalString (stdenv.hostPlatform.isLinux && interactive) ''
       # fix paths to libraries in dlopen calls (headless detection)
       substituteInPlace src/_c_internal_utils.cpp \
-        --replace-fail libX11.so.6 ${libX11}/lib/libX11.so.6 \
+        --replace-fail libX11.so.6 ${libx11}/lib/libX11.so.6 \
         --replace-fail libwayland-client.so.0 ${wayland}/lib/libwayland-client.so.0
     '';
 
diff --git a/pkgs/development/python-modules/mistralai/default.nix b/pkgs/development/python-modules/mistralai/default.nix
index 35c8abc0e840..116c783435c4 100644
--- a/pkgs/development/python-modules/mistralai/default.nix
+++ b/pkgs/development/python-modules/mistralai/default.nix
@@ -33,14 +33,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "mistralai";
-  version = "1.11.1";
+  version = "1.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mistralai";
     repo = "client-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KpZCUaitc5Gz5ZI7vEK0CEe4Eo+H6gS9FuKlqhyQDes=";
+    hash = "sha256-6OAMNlOLaa1GYkdA4zX/cUc3lX2T1VbuMZ6f9SshEt8=";
   };
 
   preBuild = ''
diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix
index 018ac6209de4..18986c0ad7c0 100644
--- a/pkgs/development/python-modules/mitmproxy/default.nix
+++ b/pkgs/development/python-modules/mitmproxy/default.nix
@@ -50,6 +50,7 @@ buildPythonPackage rec {
   };
 
   pythonRelaxDeps = [
+    "urwid"
     "zstandard"
 
     # requested by maintainer
diff --git a/pkgs/development/python-modules/moderngl/default.nix b/pkgs/development/python-modules/moderngl/default.nix
index 91628b9cd51c..1c5dc9239a49 100644
--- a/pkgs/development/python-modules/moderngl/default.nix
+++ b/pkgs/development/python-modules/moderngl/default.nix
@@ -4,7 +4,7 @@
   buildPythonPackage,
   fetchPypi,
   libGL,
-  libX11,
+  libx11,
   setuptools,
   glcontext,
   pkgs,
@@ -30,7 +30,7 @@ buildPythonPackage rec {
 
   buildInputs = lib.optionals (stdenv.hostPlatform.isLinux) [
     libGL
-    libX11
+    libx11
   ];
 
   dependencies = [ glcontext ];
diff --git a/pkgs/development/python-modules/oelint-data/default.nix b/pkgs/development/python-modules/oelint-data/default.nix
index fad32ba6fc29..0dd7db856b8d 100644
--- a/pkgs/development/python-modules/oelint-data/default.nix
+++ b/pkgs/development/python-modules/oelint-data/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "oelint-data";
-  version = "1.3.5";
+  version = "1.3.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "priv-kweihmann";
     repo = "oelint-data";
     tag = finalAttrs.version;
-    hash = "sha256-Gn8iddrZj6dRv5Lz68Qq375zKAf2uOSMX2l35WkdQ9k=";
+    hash = "sha256-l7UJ5pHhHI22dLOJD4kj40gW7EZFwBn5krTDVYY08Dw=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/omemo/default.nix b/pkgs/development/python-modules/omemo/default.nix
index 8f4fa6a957df..56cd2ea8ead6 100644
--- a/pkgs/development/python-modules/omemo/default.nix
+++ b/pkgs/development/python-modules/omemo/default.nix
@@ -19,14 +19,14 @@
 }:
 buildPythonPackage rec {
   pname = "omemo";
-  version = "2.0.0";
+  version = "2.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Syndace";
     repo = "python-omemo";
     tag = "v${version}";
-    hash = "sha256-uA8Nv8xT6ROlE9eM/Oz2j5HsYtvWzKEu7DSd/ws+WZY=";
+    hash = "sha256-h1L/DdzssCwQzQDY32ACNcn/zmDsCz16x74+Qdyv6x4=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix
index 7b7a8cf09168..301ad84fa7d2 100644
--- a/pkgs/development/python-modules/openusd/default.nix
+++ b/pkgs/development/python-modules/openusd/default.nix
@@ -17,8 +17,8 @@
   jinja2,
   lib,
   libGL,
-  libX11,
-  libXt,
+  libx11,
+  libxt,
   materialx,
   ninja,
   numpy,
@@ -128,8 +128,8 @@ buildPythonPackage rec {
     onetbb
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    libX11
-    libXt
+    libx11
+    libxt
   ]
   ++ lib.optionals withOsl [ osl ]
   ++ lib.optionals withUsdView [ qt6.qtbase ]
diff --git a/pkgs/development/python-modules/outspin/default.nix b/pkgs/development/python-modules/outspin/default.nix
index bddf1efb92ca..5908863e5456 100644
--- a/pkgs/development/python-modules/outspin/default.nix
+++ b/pkgs/development/python-modules/outspin/default.nix
@@ -6,7 +6,7 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage (finaAttrs: {
+buildPythonPackage (finalAttrs: {
   pname = "outspin";
   version = "0.3.2";
   pyproject = true;
@@ -14,7 +14,7 @@ buildPythonPackage (finaAttrs: {
   src = fetchFromGitHub {
     owner = "trag1c";
     repo = "outspin";
-    tag = "v${finaAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-j+J3n/p+DcfnhGfC4/NDBDl5bF39L5kIPeGJW0Zm7ls=";
   };
 
@@ -24,7 +24,7 @@ buildPythonPackage (finaAttrs: {
   nativeCheckInputs = [ pytestCheckHook ];
 
   meta = {
-    changelog = "https://github.com/trag1c/outspin/blob/${finaAttrs.src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/trag1c/outspin/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     description = "Conveniently read single char inputs in the console";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sigmanificient ];
diff --git a/pkgs/development/python-modules/patool/default.nix b/pkgs/development/python-modules/patool/default.nix
index 7313917da289..0c355ca6c799 100644
--- a/pkgs/development/python-modules/patool/default.nix
+++ b/pkgs/development/python-modules/patool/default.nix
@@ -41,7 +41,7 @@ let
 in
 buildPythonPackage rec {
   pname = "patool";
-  version = "4.0.1";
+  version = "4.0.4";
   format = "setuptools";
 
   #pypi doesn't have test data
@@ -49,7 +49,7 @@ buildPythonPackage rec {
     owner = "wummel";
     repo = "patool";
     tag = version;
-    hash = "sha256-KAOJi8vUP9kPa++dLEXf3mwrv1kmV7uDZmtvngPxQ90=";
+    hash = "sha256-65pOIVr18vxl20lp61yrVq2oNNnZdhXOHBddaDn7G2c=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pkg-about/default.nix b/pkgs/development/python-modules/pkg-about/default.nix
index 25dea6cce199..e6eb6e04bb7a 100644
--- a/pkgs/development/python-modules/pkg-about/default.nix
+++ b/pkgs/development/python-modules/pkg-about/default.nix
@@ -52,5 +52,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/karpierz/pkg_about/";
     changelog = "https://github.com/karpierz/pkg_about/blob/${version}/CHANGES.rst";
     license = lib.licenses.zlib;
+    maintainers = with lib.maintainers; [ kip93 ];
   };
 }
diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix
index bdd9e72e8290..b4bb2b5ab9cb 100644
--- a/pkgs/development/python-modules/polars/default.nix
+++ b/pkgs/development/python-modules/polars/default.nix
@@ -97,7 +97,7 @@ buildPythonPackage rec {
 
     RUSTFLAGS = lib.concatStringsSep " " (
       lib.optionals (polarsMemoryAllocator.pname == "mimalloc") [
-        "--cfg use_mimalloc"
+        "--cfg allocator=\"mimalloc\""
       ]
     );
     RUST_BACKTRACE = true;
diff --git a/pkgs/development/python-modules/protobuf/5.nix b/pkgs/development/python-modules/protobuf/5.nix
index f714303f2099..05f9ba66f81a 100644
--- a/pkgs/development/python-modules/protobuf/5.nix
+++ b/pkgs/development/python-modules/protobuf/5.nix
@@ -10,6 +10,7 @@ buildPythonPackage rec {
   pname = "protobuf";
   version = "5.29.6";
   pyproject = true;
+  # nixpkgs-update: no auto update
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock
index ea6acc23c54d..364fdbc1a4d4 100644
--- a/pkgs/development/python-modules/pycrdt/Cargo.lock
+++ b/pkgs/development/python-modules/pycrdt/Cargo.lock
@@ -4,9 +4,9 @@ version = 4
 
 [[package]]
 name = "arc-swap"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d03449bb8ca2cc2ef70869af31463d1ae5ccc8fa3e334b307203fbf815207e"
+checksum = "9ded5f9a03ac8f24d1b8a25101ee812cd32cdc8c50a4c50237de2c4915850e73"
 dependencies = [
  "rustversion",
 ]
@@ -33,12 +33,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "autocfg"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
-
 [[package]]
 name = "bitflags"
 version = "2.10.0"
@@ -141,15 +135,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
-[[package]]
-name = "indoc"
-version = "2.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706"
-dependencies = [
- "rustversion",
-]
-
 [[package]]
 name = "itoa"
 version = "1.0.17"
@@ -187,15 +172,6 @@ version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 
-[[package]]
-name = "memoffset"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.21.3"
@@ -229,9 +205,9 @@ checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "portable-atomic"
-version = "1.13.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950"
+checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
 
 [[package]]
 name = "proc-macro2"
@@ -244,7 +220,7 @@ dependencies = [
 
 [[package]]
 name = "pycrdt"
-version = "0.12.45"
+version = "0.12.46"
 dependencies = [
  "pyo3",
  "serde_json",
@@ -253,35 +229,32 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.27.2"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab53c047fcd1a1d2a8820fe84f05d6be69e9526be40cb03b73f86b6b03e6d87d"
+checksum = "fcf3ccafdf54c050be48a3a086d372f77ba6615f5057211607cd30e5ac5cec6d"
 dependencies = [
- "indoc",
  "libc",
- "memoffset",
  "once_cell",
  "portable-atomic",
  "pyo3-build-config",
  "pyo3-ffi",
  "pyo3-macros",
- "unindent",
 ]
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.27.2"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b455933107de8642b4487ed26d912c2d899dec6114884214a0b3bb3be9261ea6"
+checksum = "972720a441c91fd9c49f212a1d2d74c6e3803b231ebc8d66c51efbd7ccab11c8"
 dependencies = [
  "target-lexicon",
 ]
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.27.2"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c85c9cbfaddf651b1221594209aed57e9e5cff63c4d11d1feead529b872a089"
+checksum = "5994456d9dab8934d600d3867571b6410f24fbd6002570ad56356733eb54859b"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -289,9 +262,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.27.2"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a5b10c9bf9888125d917fb4d2ca2d25c8df94c7ab5a52e13313a07e050a3b02"
+checksum = "11ce9cc8d81b3c4969748807604d92b4eef363c5bb82b1a1bdb34ec6f1093a18"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -301,9 +274,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.27.2"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03b51720d314836e53327f5871d4c0cfb4fb37cc2c4a11cc71907a86342c40f9"
+checksum = "eaf4b60036a154d23282679b658e3cc7d88d3b8c9a40b43824785f232d2e1b98"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -443,12 +416,6 @@ version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
 
-[[package]]
-name = "unindent"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
-
 [[package]]
 name = "wasi"
 version = "0.11.1+wasi-snapshot-preview1"
@@ -526,6 +493,6 @@ dependencies = [
 
 [[package]]
 name = "zmij"
-version = "1.0.17"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02aae0f83f69aafc94776e879363e9771d7ecbffe2c7fbb6c14c5e00dfe88439"
+checksum = "3ff05f8caa9038894637571ae6b9e29466c1f4f829d26c9b28f869a29cbe3445"
diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix
index 425148e72879..01f3033dd36c 100644
--- a/pkgs/development/python-modules/pycrdt/default.nix
+++ b/pkgs/development/python-modules/pycrdt/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pycrdt";
-  version = "0.12.45";
+  version = "0.12.46";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "y-crdt";
     repo = "pycrdt";
     tag = finalAttrs.version;
-    hash = "sha256-4J8aEjpO4kTXSOYI9JcFmu4kz8c2Mk3AZB6tTy8I2fM=";
+    hash = "sha256-rL6heeHg5uhLFt3qY+NKIEA4FLIR/MtwEqleq29DPA8=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pycyphal/default.nix b/pkgs/development/python-modules/pycyphal/default.nix
index 2fe0735a56f4..787f04c413c9 100644
--- a/pkgs/development/python-modules/pycyphal/default.nix
+++ b/pkgs/development/python-modules/pycyphal/default.nix
@@ -101,5 +101,6 @@ buildPythonPackage rec {
     homepage = "https://opencyphal.org/";
     changelog = "https://github.com/OpenCyphal/pycyphal/blob/${version}/CHANGELOG.rst";
     license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kip93 ];
   };
 }
diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix
index d8e6b4cb297f..06715a760afb 100644
--- a/pkgs/development/python-modules/pyenphase/default.nix
+++ b/pkgs/development/python-modules/pyenphase/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pyenphase";
-  version = "2.4.3";
+  version = "2.4.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyenphase";
     repo = "pyenphase";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JJtkfN3udslcNYMXGGRXjyPqP3hjix9bg7GcGNOoMbM=";
+    hash = "sha256-BMzYo6KrgJII/30TJndYRGOjRS2ufWJirQd5X8D0bbo=";
   };
 
   pythonRelaxDeps = [ "tenacity" ];
diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix
index 6b02afb75f38..76810dad5f8c 100644
--- a/pkgs/development/python-modules/pygame-ce/default.nix
+++ b/pkgs/development/python-modules/pygame-ce/default.nix
@@ -17,7 +17,7 @@
   freetype,
   libjpeg,
   libpng,
-  libX11,
+  libx11,
   portmidi,
   SDL2,
   SDL2_image,
@@ -100,7 +100,7 @@ buildPythonPackage rec {
 
   buildInputs = [
     freetype
-    libX11
+    libx11
     libjpeg
     libpng
     portmidi
diff --git a/pkgs/development/python-modules/pygame-original/default.nix b/pkgs/development/python-modules/pygame-original/default.nix
index 8cff86b55344..f3c18549dfc7 100644
--- a/pkgs/development/python-modules/pygame-original/default.nix
+++ b/pkgs/development/python-modules/pygame-original/default.nix
@@ -20,7 +20,7 @@
   freetype,
   libjpeg,
   libpng,
-  libX11,
+  libx11,
   portmidi,
   SDL2_image,
   SDL2_mixer,
@@ -97,7 +97,7 @@ buildPythonPackage rec {
     freetype
     libjpeg
     libpng
-    libX11
+    libx11
     portmidi
     SDL2
     (SDL2_image.override { enableSTB = false; })
diff --git a/pkgs/development/python-modules/pyiskra/default.nix b/pkgs/development/python-modules/pyiskra/default.nix
index 1cac801430c7..d46a0c5bd6ca 100644
--- a/pkgs/development/python-modules/pyiskra/default.nix
+++ b/pkgs/development/python-modules/pyiskra/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pyiskra";
-  version = "0.1.27";
+  version = "0.1.29";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Iskramis";
     repo = "pyiskra";
     tag = "v${version}";
-    hash = "sha256-qPyspRYXolndNMLHG2Ln6eL0emRCYYr/00WhrX876k0=";
+    hash = "sha256-aDS9chlbSvcZL4LaE5P+JXxREhlqLjOnlqIYc8yagkQ=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pykalman/default.nix b/pkgs/development/python-modules/pykalman/default.nix
index 54da3ba315de..30c15c89f973 100644
--- a/pkgs/development/python-modules/pykalman/default.nix
+++ b/pkgs/development/python-modules/pykalman/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pykalman";
-  version = "0.11.1";
+  version = "0.11.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pykalman";
     repo = "pykalman";
     tag = "v${version}";
-    hash = "sha256-8VPSz2pdK5jrVAYgZv64nCKC0E7JtQ1iKFEN0ko4fQE=";
+    hash = "sha256-F5p0li1ZKDd9gDwkL318hlL3QzD2MA3SyEtIB68UOFg=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix
index 18740fd5cb22..94a0efcc46ff 100644
--- a/pkgs/development/python-modules/pylance/default.nix
+++ b/pkgs/development/python-modules/pylance/default.nix
@@ -34,14 +34,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pylance";
-  version = "1.0.4";
+  version = "2.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lancedb";
     repo = "lance";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SAV4mowG8wcK22ZXJUT9UffKz8lcICipSDC5FR0Z2lY=";
+    hash = "sha256-VxhRdyPhVVRRiYu2h7ospxLSpXCz0a6LgjJCGcqJVcU=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/python";
@@ -53,7 +53,7 @@ buildPythonPackage (finalAttrs: {
       src
       sourceRoot
       ;
-    hash = "sha256-qDfN4iH/FSqklUC58O4ot7SxBRSKWebYkh1X1T5JXUs=";
+    hash = "sha256-toIyApf/v0h45rZjfJRAStU9TZGmB+cCChObzjVr1Hs=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pynintendoparental/default.nix b/pkgs/development/python-modules/pynintendoparental/default.nix
index 998613d17b42..917524e83b92 100644
--- a/pkgs/development/python-modules/pynintendoparental/default.nix
+++ b/pkgs/development/python-modules/pynintendoparental/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pynintendoparental";
-  version = "2.3.2";
+  version = "2.3.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pantherale0";
     repo = "pynintendoparental";
     tag = finalAttrs.version;
-    hash = "sha256-jF1hoGNDwbbacJuLiFAdtaXOykzioUt++RQrYO1skkA=";
+    hash = "sha256-dQoYollXElYU1j/O5D6kt3d1lpbVyhAtekA9o5eV0Ws=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix
index 443945c7d3d6..9a993a1a4ce6 100644
--- a/pkgs/development/python-modules/pypck/default.nix
+++ b/pkgs/development/python-modules/pypck/default.nix
@@ -9,20 +9,20 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pypck";
-  version = "0.9.9";
+  version = "0.9.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "alengwenus";
     repo = "pypck";
-    tag = version;
-    hash = "sha256-EsPfPRYp75GML9JMoFPf5U8obh51LjIkg/FFRNkrEOY=";
+    tag = finalAttrs.version;
+    hash = "sha256-UTUYYnXY+Wak4cd0fH1V5rdkJ/Aet0DSCHfd+PL+SBo=";
   };
 
   postPatch = ''
-    echo "${version}" > VERSION
+    echo "${finalAttrs.version}" > VERSION
   '';
 
   build-system = [ setuptools ];
@@ -42,8 +42,8 @@ buildPythonPackage rec {
   meta = {
     description = "LCN-PCK library written in Python";
     homepage = "https://github.com/alengwenus/pypck";
-    changelog = "https://github.com/alengwenus/pypck/releases/tag/${src.tag}";
+    changelog = "https://github.com/alengwenus/pypck/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.epl20;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/pytaglib/default.nix b/pkgs/development/python-modules/pytaglib/default.nix
index cc684505ac49..d4d198b2d1d0 100644
--- a/pkgs/development/python-modules/pytaglib/default.nix
+++ b/pkgs/development/python-modules/pytaglib/default.nix
@@ -5,20 +5,28 @@
   taglib,
   cython,
   pytestCheckHook,
+  setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pytaglib";
-  version = "3.1.0";
-  format = "setuptools";
+  version = "3.2.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "supermihi";
     repo = "pytaglib";
-    tag = "v${version}";
-    hash = "sha256-A+RH9mWwtvhBDqTfvOK1RbsPP+0srF9h4mIknAHbG50=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-529U71Lvs6QufcG3yBeywyGc2ukYYfFHIf6TFjt+k3U=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "cython==3.2.4" "cython"
+  '';
+
+  build-system = [ setuptools ];
+
   buildInputs = [
     cython
     taglib
@@ -30,10 +38,10 @@ buildPythonPackage rec {
 
   meta = {
     description = "Python bindings for the Taglib audio metadata library";
-    mainProgram = "pyprinttags";
     homepage = "https://github.com/supermihi/pytaglib";
-    changelog = "https://github.com/supermihi/pytaglib/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/supermihi/pytaglib/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ mrkkrp ];
+    mainProgram = "pyprinttags";
   };
-}
+})
diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix
index 20821b5d597c..dedcdcbc8cac 100644
--- a/pkgs/development/python-modules/python-roborock/default.nix
+++ b/pkgs/development/python-modules/python-roborock/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "python-roborock";
-  version = "4.8.0";
+  version = "4.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Python-roborock";
     repo = "python-roborock";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eOvadiJ0zLwCJDK22qb/ZPsNi+d6lI5+lzn05EHWB7I=";
+    hash = "sha256-H47NKOGKUCJs9LolVcTg6R8W6Fuq+YWBgrwJUB08JVA=";
   };
 
   pythonRelaxDeps = [ "pycryptodome" ];
diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix
index 93684b2441c7..9b441a73b899 100644
--- a/pkgs/development/python-modules/pythonocc-core/default.nix
+++ b/pkgs/development/python-modules/pythonocc-core/default.nix
@@ -17,16 +17,16 @@
   rapidjson,
   swig,
 }:
-
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pythonocc-core";
-  version = "7.8.1.1";
+  # To avoid overriding opencascade-occt from 7.9.3 to 7.9.0. Go back to regular release next version.
+  version = "7.9.0-unstable-2025-12-31";
 
   src = fetchFromGitHub {
     owner = "tpaviot";
     repo = "pythonocc-core";
-    tag = version;
-    hash = "sha256-0o2PQEN0/Z7FUPZEo2HxFFa+mN2bZnYI++HVu4ONpNA=";
+    rev = "2f8f1a7d99312e8b3e81d0bb2adab9b1e717d37b";
+    hash = "sha256-fni6crPs58e8MUr2SfVHVD5nPFIEQcOfuAMLXJlWg88=";
   };
 
   nativeBuildInputs = [
@@ -63,9 +63,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Python wrapper for the OpenCASCADE 3D modeling kernel";
     homepage = "https://github.com/tpaviot/pythonocc-core";
-    changelog = "https://github.com/tpaviot/pythonocc-core/releases/tag/${version}";
+    changelog = "https://github.com/tpaviot/pythonocc-core/releases/tag/${finalAttrs.version}";
     license = lib.licenses.lgpl3;
     platforms = lib.platforms.unix;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix
index ea8bdccee52b..71886657bda6 100644
--- a/pkgs/development/python-modules/screeninfo/default.nix
+++ b/pkgs/development/python-modules/screeninfo/default.nix
@@ -3,9 +3,9 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  libX11,
-  libXinerama,
-  libXrandr,
+  libx11,
+  libxinerama,
+  libxrandr,
   poetry-core,
   pyobjc-framework-Cocoa,
   cython,
@@ -33,11 +33,11 @@ buildPythonPackage rec {
 
   postPatch = lib.optionalString (stdenv.isLinux) ''
     substituteInPlace screeninfo/enumerators/xinerama.py \
-      --replace 'load_library("X11")' 'ctypes.cdll.LoadLibrary("${libX11}/lib/libX11.so")' \
-      --replace 'load_library("Xinerama")' 'ctypes.cdll.LoadLibrary("${libXinerama}/lib/libXinerama.so")'
+      --replace 'load_library("X11")' 'ctypes.cdll.LoadLibrary("${libx11}/lib/libX11.so")' \
+      --replace 'load_library("Xinerama")' 'ctypes.cdll.LoadLibrary("${libxinerama}/lib/libXinerama.so")'
     substituteInPlace screeninfo/enumerators/xrandr.py \
-      --replace 'load_library("X11")' 'ctypes.cdll.LoadLibrary("${libX11}/lib/libX11.so")' \
-      --replace 'load_library("Xrandr")' 'ctypes.cdll.LoadLibrary("${libXrandr}/lib/libXrandr.so")'
+      --replace 'load_library("X11")' 'ctypes.cdll.LoadLibrary("${libx11}/lib/libX11.so")' \
+      --replace 'load_library("Xrandr")' 'ctypes.cdll.LoadLibrary("${libxrandr}/lib/libXrandr.so")'
   '';
 
   nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/solaredge-web/default.nix b/pkgs/development/python-modules/solaredge-web/default.nix
index 71f0e29d018f..9bddf00e7cdb 100644
--- a/pkgs/development/python-modules/solaredge-web/default.nix
+++ b/pkgs/development/python-modules/solaredge-web/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "solaredge-web";
-  version = "0.1.0";
+  version = "0.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Solarlibs";
     repo = "solaredge-web";
     tag = "v${version}";
-    hash = "sha256-kVjhXW+MPIh41IIaTHCKXz+SOfZ0w61fCBsutNszrAY=";
+    hash = "sha256-bONCD7dE8U0Y55UuQ0VYQE5r/q7ihtki33ZkPssiIJ4=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 150643725f7a..793c81f65451 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "tencentcloud-sdk-python";
-  version = "3.1.44";
+  version = "3.1.45";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = finalAttrs.version;
-    hash = "sha256-Vr91io2yHJrfYGu6rZypI7IeNSVZb+iwLtfbVADLdxQ=";
+    hash = "sha256-sfvRrI8MFvX56qBjp7f8hmQQDg/3weGwL+6Kx5rcRao=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix
index 03a9dbaab902..81f6bf4b83b3 100644
--- a/pkgs/development/python-modules/urwid/default.nix
+++ b/pkgs/development/python-modules/urwid/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "urwid";
-  version = "3.0.3";
+  version = "3.0.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "urwid";
     repo = "urwid";
     tag = version;
-    hash = "sha256-+bvtIjSKWhu1JzyIgM60YZtrzNEaAvVqJrhq8PnkXk0=";
+    hash = "sha256-mKBLAoEBiqr//1Gl8DAmpUJ9woq6Zf2HhbYEirAoi2M=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/webcolors/default.nix b/pkgs/development/python-modules/webcolors/default.nix
index 54c745dfb0e1..c02701b7a528 100644
--- a/pkgs/development/python-modules/webcolors/default.nix
+++ b/pkgs/development/python-modules/webcolors/default.nix
@@ -2,28 +2,23 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  unittestCheckHook,
+  pytestCheckHook,
   pdm-backend,
 }:
 
 buildPythonPackage rec {
   pname = "webcolors";
-  version = "24.11.1";
+  version = "25.10.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-7LPXaPMiAq93BHe4tl8xj6T1ZsIpSGc6l3sA1YndgPY=";
+    hash = "sha256-YquuhlBPZtD2NkwqhSDeSgxHuAwD/DpfGBX+2+98Gb8=";
   };
 
   build-system = [ pdm-backend ];
 
-  nativeCheckInputs = [ unittestCheckHook ];
-
-  unittestFlagsArray = [
-    "-s"
-    "tests"
-  ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "webcolors" ];
 
@@ -31,6 +26,6 @@ buildPythonPackage rec {
     description = "Library for working with color names/values defined by the HTML and CSS specifications";
     homepage = "https://github.com/ubernostrum/webcolors";
     license = lib.licenses.bsd3;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ sigmanificient ];
   };
 }
diff --git a/pkgs/development/python-modules/wxpython/4.2.nix b/pkgs/development/python-modules/wxpython/4.2.nix
index 8802cb45a94b..e33e4e871716 100644
--- a/pkgs/development/python-modules/wxpython/4.2.nix
+++ b/pkgs/development/python-modules/wxpython/4.2.nix
@@ -26,9 +26,9 @@
   libGL,
   libGLU,
   libsm,
-  libXinerama,
-  libXtst,
-  libXxf86vm,
+  libxinerama,
+  libxtst,
+  libxxf86vm,
   libglvnd,
   libgbm,
   pango,
@@ -103,9 +103,9 @@ buildPythonPackage rec {
     libGL
     libGLU
     libsm
-    libXinerama
-    libXtst
-    libXxf86vm
+    libxinerama
+    libxtst
+    libxxf86vm
     libglvnd
     libgbm
     webkitgtk_4_1
diff --git a/pkgs/development/rocm-modules/clr/default.nix b/pkgs/development/rocm-modules/clr/default.nix
index 41bc146a0300..1a0aec24a8d3 100644
--- a/pkgs/development/rocm-modules/clr/default.nix
+++ b/pkgs/development/rocm-modules/clr/default.nix
@@ -25,7 +25,7 @@
   zlib,
   libGL,
   libxml2,
-  libX11,
+  libx11,
   python3Packages,
   llvm,
   khronos-ocl-icd-loader,
@@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
     numactl
     libGL
     libxml2
-    libX11
+    libx11
     khronos-ocl-icd-loader
     hipClang
     libffi
diff --git a/pkgs/development/rocm-modules/llvm/default.nix b/pkgs/development/rocm-modules/llvm/default.nix
index 548d928f2179..77be091e4c62 100644
--- a/pkgs/development/rocm-modules/llvm/default.nix
+++ b/pkgs/development/rocm-modules/llvm/default.nix
@@ -174,6 +174,7 @@ let
     in
     runCommand name
       {
+        pname = name;
         # If this is erroring, try why-depends --precise on the symlinkJoin of inputs to look for the problem
         # nix why-depends --precise .#rocmPackages.llvm.rocm-toolchain.linked /store/path/its/not/allowed
         disallowedRequisites = disallowedRefsForToolchain;
diff --git a/pkgs/development/tools/godot/3/default.nix b/pkgs/development/tools/godot/3/default.nix
index e822ccb73999..4e5fdcc04a2d 100644
--- a/pkgs/development/tools/godot/3/default.nix
+++ b/pkgs/development/tools/godot/3/default.nix
@@ -9,14 +9,14 @@
   installShellFiles,
   libGLU,
   libpulseaudio,
-  libX11,
-  libXcursor,
-  libXext,
-  libXfixes,
-  libXi,
-  libXinerama,
-  libXrandr,
-  libXrender,
+  libx11,
+  libxcursor,
+  libxext,
+  libxfixes,
+  libxi,
+  libxinerama,
+  libxrandr,
+  libxrender,
   makeWrapper,
   openssl,
   pkg-config,
@@ -26,7 +26,7 @@
   zlib,
 }:
 
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "godot3";
   version = "3.6.2";
   godotBuildDescription = "X11 tools";
@@ -34,7 +34,7 @@ stdenv.mkDerivation (self: {
   src = fetchFromGitHub {
     owner = "godotengine";
     repo = "godot";
-    rev = "${self.version}-stable";
+    rev = "${finalAttrs.version}-stable";
     hash = "sha256-loNjE+NmHniZ827Eb9MHSNo27F2LrURhWURjUq4d8xw=";
   };
 
@@ -57,14 +57,14 @@ stdenv.mkDerivation (self: {
     freetype
     libGLU
     libpulseaudio
-    libX11
-    libXcursor
-    libXext
-    libXfixes
-    libXi
-    libXinerama
-    libXrandr
-    libXrender
+    libx11
+    libxcursor
+    libxext
+    libxfixes
+    libxi
+    libxinerama
+    libxrandr
+    libxrender
     openssl
     udev
     yasm
@@ -90,34 +90,34 @@ stdenv.mkDerivation (self: {
   shouldBuildTools = true;
   godotBuildTarget = "release_debug";
 
-  lto = if self.godotBuildTarget == "release" then "full" else "none";
+  lto = if finalAttrs.godotBuildTarget == "release" then "full" else "none";
 
   sconsFlags = [
     "arch=${stdenv.hostPlatform.linuxArch}"
-    "platform=${self.godotBuildPlatform}"
-    "tools=${lib.boolToString self.shouldBuildTools}"
-    "target=${self.godotBuildTarget}"
+    "platform=${finalAttrs.godotBuildPlatform}"
+    "tools=${lib.boolToString finalAttrs.shouldBuildTools}"
+    "target=${finalAttrs.godotBuildTarget}"
     "bits=${toString stdenv.hostPlatform.parsed.cpu.bits}"
-    "lto=${self.lto}"
+    "lto=${finalAttrs.lto}"
   ];
 
-  shouldWrapBinary = self.shouldBuildTools;
-  shouldInstallManual = self.shouldBuildTools;
-  shouldPatchBinary = self.shouldBuildTools;
-  shouldInstallHeaders = self.shouldBuildTools;
-  shouldInstallShortcut = self.shouldBuildTools && self.godotBuildPlatform != "server";
+  shouldWrapBinary = finalAttrs.shouldBuildTools;
+  shouldInstallManual = finalAttrs.shouldBuildTools;
+  shouldPatchBinary = finalAttrs.shouldBuildTools;
+  shouldInstallHeaders = finalAttrs.shouldBuildTools;
+  shouldInstallShortcut = finalAttrs.shouldBuildTools && finalAttrs.godotBuildPlatform != "server";
 
   outputs = [
     "out"
   ]
-  ++ lib.optional self.shouldInstallManual "man"
-  ++ lib.optional self.shouldBuildTools "dev";
+  ++ lib.optional finalAttrs.shouldInstallManual "man"
+  ++ lib.optional finalAttrs.shouldBuildTools "dev";
 
   builtGodotBinNamePattern =
-    if self.godotBuildPlatform == "server" then "godot_server.*" else "godot.*";
+    if finalAttrs.godotBuildPlatform == "server" then "godot_server.*" else "godot.*";
 
   godotBinInstallPath = "bin";
-  installedGodotBinName = self.pname;
+  installedGodotBinName = finalAttrs.pname;
   installedGodotShortcutFileName = "org.godotengine.Godot3.desktop";
   installedGodotShortcutDisplayName = "Godot Engine 3";
 
@@ -162,7 +162,7 @@ stdenv.mkDerivation (self: {
     runHook postInstall
   '';
 
-  runtimeDependencies = lib.optionals self.shouldPatchBinary (
+  runtimeDependencies = lib.optionals finalAttrs.shouldPatchBinary (
     map lib.getLib [
       alsa-lib
       libpulseaudio
@@ -172,7 +172,8 @@ stdenv.mkDerivation (self: {
 
   meta = {
     homepage = "https://godotengine.org";
-    description = "Free and Open Source 2D and 3D game engine (" + self.godotBuildDescription + ")";
+    description =
+      "Free and Open Source 2D and 3D game engine (" + finalAttrs.godotBuildDescription + ")";
     license = lib.licenses.mit;
     platforms = [
       "i686-linux"
diff --git a/pkgs/development/tools/godot/common.nix b/pkgs/development/tools/godot/common.nix
index dc31e5036957..4c712a6feab1 100644
--- a/pkgs/development/tools/godot/common.nix
+++ b/pkgs/development/tools/godot/common.nix
@@ -29,15 +29,15 @@
   libpulseaudio,
   libtheora,
   libwebp,
-  libX11,
-  libXcursor,
-  libXext,
-  libXfixes,
-  libXi,
-  libXinerama,
+  libx11,
+  libxcursor,
+  libxext,
+  libxfixes,
+  libxi,
+  libxinerama,
   libxkbcommon,
-  libXrandr,
-  libXrender,
+  libxrandr,
+  libxrender,
   makeWrapper,
   mbedtls,
   miniupnpc,
@@ -323,11 +323,11 @@ let
                       prev.runtimeDependencies or [ ]
                       ++ map lib.getLib [
                         libpulseaudio
-                        libX11
-                        libXcursor
-                        libXext
-                        libXi
-                        libXrandr
+                        libx11
+                        libxcursor
+                        libxext
+                        libxi
+                        libxrandr
                         vulkan-loader
                       ]
                       ++ lib.optionals stdenv.hostPlatform.isLinux [
@@ -587,14 +587,14 @@ let
           ++ lib.optional withAlsa alsa-lib
           ++ lib.optional (withX11 || withWayland) libxkbcommon
           ++ lib.optionals withX11 [
-            libX11
-            libXcursor
-            libXext
-            libXfixes
-            libXi
-            libXinerama
-            libXrandr
-            libXrender
+            libx11
+            libxcursor
+            libxext
+            libxfixes
+            libxi
+            libxinerama
+            libxrandr
+            libxrender
           ]
           ++ lib.optionals withWayland [
             libdecor
diff --git a/pkgs/development/tools/misc/yakut/default.nix b/pkgs/development/tools/misc/yakut/default.nix
index b4dcd5ef7dd5..4a3da8714817 100644
--- a/pkgs/development/tools/misc/yakut/default.nix
+++ b/pkgs/development/tools/misc/yakut/default.nix
@@ -55,5 +55,6 @@ buildPythonApplication rec {
     '';
     homepage = "https://github.com/OpenCyphal/yakut/";
     license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kip93 ];
   };
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix
index 61516c342af2..55b712640b80 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -101,14 +101,14 @@ let
   allGrammars = lib.filter (p: !(p.meta.broken or false)) (lib.attrValues builtGrammars);
 
 in
-rustPlatform.buildRustPackage (final: {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tree-sitter";
   version = "0.25.10";
 
   src = fetchFromGitHub {
     owner = "tree-sitter";
     repo = "tree-sitter";
-    tag = "v${final.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-aHszbvLCLqCwAS4F4UmM3wbSb81QuG9FM7BDHTu1ZvM=";
     fetchSubmodules = true;
   };
@@ -202,7 +202,7 @@ rustPlatform.buildRustPackage (final: {
     homepage = "https://github.com/tree-sitter/tree-sitter";
     description = "Parser generator tool and an incremental parsing library";
     mainProgram = "tree-sitter";
-    changelog = "https://github.com/tree-sitter/tree-sitter/releases/tag/v${final.version}";
+    changelog = "https://github.com/tree-sitter/tree-sitter/releases/tag/v${finalAttrs.version}";
     longDescription = ''
       Tree-sitter is a parser generator tool and an incremental parsing library.
       It can build a concrete syntax tree for a source file and efficiently update the syntax tree as the source file is edited.
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
index 706ab7544351..eb0dfd430f97 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
@@ -1092,7 +1092,7 @@
   };
 
   turtle = {
-    version = "0-unstable-2024-07-02";
+    version = "0.1.0-unstable-2024-07-02";
     url = "github:GordianDziwis/tree-sitter-turtle/7f789ea7ef765080f71a298fc96b7c957fa24422";
     hash = "sha256-z6f73euFAG9du5owz7V9WLbWK81Jg0DwxN1metKPbTA=";
     meta = {
diff --git a/pkgs/development/tools/replay-io/default.nix b/pkgs/development/tools/replay-io/default.nix
index 0bf3e5160526..1dec67697ee7 100644
--- a/pkgs/development/tools/replay-io/default.nix
+++ b/pkgs/development/tools/replay-io/default.nix
@@ -6,9 +6,9 @@
   autoPatchelfHook,
   makeWrapper,
   libcxx,
-  libX11,
-  libXt,
-  libXdamage,
+  libx11,
+  libxt,
+  libxdamage,
   glib,
   gtk3,
   dbus-glib,
@@ -62,9 +62,9 @@ rec {
       dbus-glib
       glib
       gtk3
-      libX11
-      libXdamage
-      libXt
+      libx11
+      libxdamage
+      libxt
     ];
     installPhase = ''
       runHook preInstall
diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/development/tools/rgp/default.nix
index 12f751a208b3..e88d88f234ce 100644
--- a/pkgs/development/tools/rgp/default.nix
+++ b/pkgs/development/tools/rgp/default.nix
@@ -15,9 +15,9 @@
   libice,
   libkrb5,
   libsm,
-  libX11,
+  libx11,
   libxcb,
-  libXi,
+  libxi,
   libxkbcommon,
   libxml2_13,
   ncurses,
@@ -56,9 +56,9 @@ stdenv.mkDerivation {
     libice
     libkrb5
     libsm
-    libX11
+    libx11
     libxcb
-    libXi
+    libxi
     libxkbcommon
     libxml2_13
     ncurses
diff --git a/pkgs/development/tools/selenium/chromedriver/source.nix b/pkgs/development/tools/selenium/chromedriver/source.nix
index a1bece1dea87..4b07041f4129 100644
--- a/pkgs/development/tools/selenium/chromedriver/source.nix
+++ b/pkgs/development/tools/selenium/chromedriver/source.nix
@@ -3,7 +3,7 @@
   testers,
   chromedriver,
 }:
-chromium.mkDerivation (_: {
+chromium.mkDerivation (finalAttrs: {
   name = "chromedriver";
   packageName = "chromedriver";
 
diff --git a/pkgs/development/web/playwright/chromium-headless-shell.nix b/pkgs/development/web/playwright/chromium-headless-shell.nix
index 5c76ef66c874..d691b7676181 100644
--- a/pkgs/development/web/playwright/chromium-headless-shell.nix
+++ b/pkgs/development/web/playwright/chromium-headless-shell.nix
@@ -11,10 +11,10 @@
   alsa-lib,
   at-spi2-atk,
   glib,
-  libXcomposite,
-  libXdamage,
-  libXfixes,
-  libXrandr,
+  libxcomposite,
+  libxdamage,
+  libxfixes,
+  libxrandr,
   libgbm,
   libgcc,
   libxkbcommon,
@@ -45,10 +45,10 @@ let
       alsa-lib
       at-spi2-atk
       glib
-      libXcomposite
-      libXdamage
-      libXfixes
-      libXrandr
+      libxcomposite
+      libxdamage
+      libxfixes
+      libxrandr
       libgbm
       libgcc.lib
       libxkbcommon
diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix
index 19eaf0f97f79..a970fc7a0fd2 100644
--- a/pkgs/games/cataclysm-dda/common.nix
+++ b/pkgs/games/cataclysm-dda/common.nix
@@ -10,7 +10,7 @@
   SDL2_image,
   SDL2_mixer,
   SDL2_ttf,
-  libX11,
+  libx11,
   freetype,
   zlib,
   debug,
@@ -32,7 +32,7 @@ let
     SDL2_image
     SDL2_mixer
     SDL2_ttf
-    libX11
+    libx11
     freetype
   ];
 
diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index e957a80bbd0e..3b5fe45441b0 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -9,7 +9,7 @@
   curl,
   libtorrent-rasterbar,
   libpng,
-  libX11,
+  libx11,
   gettext,
   boost,
   libnotify,
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     jsoncpp
     boost
     libpng
-    libX11
+    libx11
     libnotify
     gtk3
     glib
diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix
index 4855f9339003..04acf2b5fb5d 100644
--- a/pkgs/games/tibia/default.nix
+++ b/pkgs/games/tibia/default.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   glibc,
-  libX11,
+  libx11,
   runtimeShell,
   libGLU,
   libGL,
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
              --set-rpath ${
                lib.makeLibraryPath [
                  stdenv.cc.cc
-                 libX11
+                 libx11
                  libGLU
                  libGL
                ]
diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix
index 7632190672b7..a0de27407762 100644
--- a/pkgs/games/xonotic/default.nix
+++ b/pkgs/games/xonotic/default.nix
@@ -17,13 +17,13 @@
   freetype,
   libpng,
   libtheora,
-  libX11,
+  libx11,
   # glx
   libGLU,
   libGL,
-  libXpm,
-  libXext,
-  libXxf86vm,
+  libxpm,
+  libxext,
+  libxxf86vm,
   alsa-lib,
   # sdl
   SDL2,
@@ -100,14 +100,14 @@ let
       libvorbis
       curl
       gmp
-      libX11
+      libx11
     ]
     ++ lib.optionals withGLX [
       libGLU
       libGL
-      libXpm
-      libXext
-      libXxf86vm
+      libxpm
+      libxext
+      libxxf86vm
       alsa-lib
     ]
     ++ lib.optionals withSDL [ SDL2 ];
diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index 201c318f24a5..4148f77b408c 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -43,6 +43,8 @@ let
           // {
             pname = namePrefix + pluginName;
 
+            strictDeps = true;
+
             inherit
               pluginName
               unpackPhase
diff --git a/pkgs/misc/tmux-plugins/tmux-fingers/default.nix b/pkgs/misc/tmux-plugins/tmux-fingers/default.nix
index 97a665c3b04a..352ec9b22685 100644
--- a/pkgs/misc/tmux-plugins/tmux-fingers/default.nix
+++ b/pkgs/misc/tmux-plugins/tmux-fingers/default.nix
@@ -7,13 +7,13 @@
 let
   fingers = crystal.buildCrystalPackage rec {
     format = "shards";
-    version = "2.5.1";
+    version = "2.6.1";
     pname = "fingers";
     src = fetchFromGitHub {
       owner = "Morantron";
       repo = "tmux-fingers";
       rev = "${version}";
-      sha256 = "sha256-O5CfboFnl51OeOgqI2NB3MmELDeKykd5NO2d5FGXkII=";
+      sha256 = "sha256-f18y4Jq5Ab/5KZKv8woMTkFGEY2/f5KeRH0sf6R1l1U=";
     };
 
     shardsFile = ./shards.nix;
diff --git a/pkgs/misc/tmux-plugins/tmux-fingers/fix.patch b/pkgs/misc/tmux-plugins/tmux-fingers/fix.patch
index 34014441ebf9..2cad0ea1ed67 100644
--- a/pkgs/misc/tmux-plugins/tmux-fingers/fix.patch
+++ b/pkgs/misc/tmux-plugins/tmux-fingers/fix.patch
@@ -1,8 +1,8 @@
 diff --git a/tmux-fingers.tmux b/tmux-fingers.tmux
-index f15b509..a14e312 100755
+index c62915a..eb065e7 100755
 --- a/tmux-fingers.tmux
 +++ b/tmux-fingers.tmux
-@@ -1,35 +1,4 @@
+@@ -1,36 +1,5 @@
  #!/usr/bin/env bash
  
 -CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -36,6 +36,13 @@ index f15b509..a14e312 100755
 -  fi
 -fi
 -
--tmux run "$FINGERS_BINARY load-config"
-+tmux run "@tmuxFingersDir@/tmux-fingers load-config"
+ if [[ "$TERM" == "dumb" ]]; then
+   # force term value to get proper colors in systemd and tmux 3.6a
+   # https://github.com/Morantron/tmux-fingers/issues/143
+@@ -39,5 +8,5 @@ else
+   FINGERS_TERM="$TERM"
+ fi
+ 
+-tmux run "TERM=$FINGERS_TERM $FINGERS_BINARY load-config"
++tmux run "TERM=$FINGERS_TERM @tmuxFingersDir@/tmux-fingers load-config"
  exit $?
diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix
index 873d0d4c97a6..597d9bf7cbd2 100644
--- a/pkgs/os-specific/darwin/xcode/default.nix
+++ b/pkgs/os-specific/darwin/xcode/default.nix
@@ -53,7 +53,15 @@ let
       };
 
     in
-    app.overrideAttrs (oldAttrs: oldAttrs // { inherit meta; });
+    app.overrideAttrs (
+      oldAttrs:
+      oldAttrs
+      // {
+        pname = "xcode";
+        inherit version;
+        inherit meta;
+      }
+    );
 
 in
 lib.makeExtensible (self: {
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index c9ba00d790b0..c792d6e51724 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -10,7 +10,7 @@
   # dependencies
   glib,
   libxfixes,
-  libXinerama,
+  libxinerama,
   catch2,
   gperf,
 
@@ -40,7 +40,7 @@
   wayland-protocols,
   wayland-scanner,
   xdamageSupport ? x11Support,
-  libXdamage ? null,
+  libxdamage ? null,
   doubleBufferSupport ? x11Support,
   imlib2Support ? x11Support,
   imlib2 ? null,
@@ -76,7 +76,7 @@ assert docsSupport -> pandoc != null && python3 != null;
 
 assert ncursesSupport -> ncurses != null;
 
-assert xdamageSupport -> x11Support && libXdamage != null;
+assert xdamageSupport -> x11Support && libxdamage != null;
 assert imlib2Support -> x11Support && imlib2 != null;
 assert luaSupport -> lua != null;
 assert luaImlib2Support -> luaSupport && imlib2Support && toluapp != null;
@@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     glib
-    libXinerama
+    libxinerama
   ]
   ++ lib.optional ncursesSupport ncurses
   ++ lib.optionals x11Support [
@@ -149,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: {
     wayland
     wayland-protocols
   ]
-  ++ lib.optional xdamageSupport libXdamage
+  ++ lib.optional xdamageSupport libxdamage
   ++ lib.optional imlib2Support imlib2
   ++ lib.optional luaSupport lua
   ++ lib.optional luaImlib2Support imlib2
diff --git a/pkgs/os-specific/linux/hid-tmff2/default.nix b/pkgs/os-specific/linux/hid-tmff2/default.nix
index ce3fa8536b42..199f3352f4cb 100644
--- a/pkgs/os-specific/linux/hid-tmff2/default.nix
+++ b/pkgs/os-specific/linux/hid-tmff2/default.nix
@@ -9,13 +9,13 @@
 stdenv.mkDerivation {
   pname = "hid-tmff2";
   # https://github.com/Kimplul/hid-tmff2/blob/ca168637fbfb085ebc9ade0c47fa0653dac5d25b/dkms/dkms-install.sh#L12
-  version = "0-unstable-2025-12-01";
+  version = "0-unstable-2026-01-26";
 
   src = fetchFromGitHub {
     owner = "Kimplul";
     repo = "hid-tmff2";
-    rev = "c4b70d4ec36404c9454199bec208eaf3116ef453";
-    hash = "sha256-IYfDlKfd4OL7s+MJPNYJ/tpyTiKHy1DQGQaIR7qfzZU=";
+    rev = "66e522e26549afab26d032e900ae9f6576c83b9d";
+    hash = "sha256-CVzfkDOzxbjDYE6BaEBglJL68EUY4DkLeDUSlKrN6oU=";
     # For hid-tminit. Source: https://github.com/scarburato/hid-tminit
     fetchSubmodules = true;
   };
diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix
index dca0b6a80826..6251fe9a8460 100644
--- a/pkgs/os-specific/linux/iptables/default.nix
+++ b/pkgs/os-specific/linux/iptables/default.nix
@@ -172,5 +172,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ fpletz ];
     license = lib.licenses.gpl2Plus;
     downloadPage = "https://www.netfilter.org/projects/iptables/files/";
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "netfilter" finalAttrs.version;
   };
 })
diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index ddb925e9d5b7..f086165ae3e8 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -1,37 +1,37 @@
 {
     "testing": {
-        "version": "6.19-rc7",
-        "hash": "sha256:03isv8zwasq8shq06wryyzii1zvf1kqzs310mvyqbq22iifm71f7",
+        "version": "6.19-rc8",
+        "hash": "sha256:1vwlhsk3cry48p9v2kqqxkmrsw2sjgspfylv3c7r5430yk7fhyg1",
         "lts": false
     },
     "6.1": {
-        "version": "6.1.161",
-        "hash": "sha256:0aasgrq6mv5nj7b8ashzx0pxlaah5y0f3sq7d8w00di2lyync5ml",
+        "version": "6.1.162",
+        "hash": "sha256:12fhqsz61g64wdx3hx637fx4zn7ks7kv9h7b26llx8mr94m44rlp",
         "lts": true
     },
     "5.15": {
-        "version": "5.15.198",
-        "hash": "sha256:0hwpwbvjh6y4dhbpp34x9j25nc6x48fbiz65zzavplqdb2a0jk2x",
+        "version": "5.15.199",
+        "hash": "sha256:0bmx5y10mbn05qv0cvh7w6zhgzar88vj2kdm3j4m32hk9jpd7h01",
         "lts": true
     },
     "5.10": {
-        "version": "5.10.248",
-        "hash": "sha256:01g05n856c9q7m46dmn48pq7hfph4b1kpvrjvrykg8q4z7qy9rmm",
+        "version": "5.10.249",
+        "hash": "sha256:0ihh9pjnaz3lq9my6yhlikacadc5lldsypifjcpm8j8i4qsfv45r",
         "lts": true
     },
     "6.6": {
-        "version": "6.6.122",
-        "hash": "sha256:1mlrna10449cf7whz86wgj3bijlbahj03nqbfjwjzvsbw2fhv3nl",
+        "version": "6.6.123",
+        "hash": "sha256:1ca5x6ri5i8xcm4dc5hv6b0xyv9npb9dy0wfvzi9g44al6sx85m6",
         "lts": true
     },
     "6.12": {
-        "version": "6.12.68",
-        "hash": "sha256:1dr58bfp883g4dnxak5gr25hib6hs8jq3c0ys06m5nnl9d8cfryk",
+        "version": "6.12.69",
+        "hash": "sha256:0rbnbynhm7w4ig8snq97px4ljr5k4zq1a97jqhwk4w0qy9bkcjab",
         "lts": true
     },
     "6.18": {
-        "version": "6.18.8",
-        "hash": "sha256:1zwczw98ylqa3nhlqnvjbylaaqg8jn3z0j3xx02ddha2qbawbw1p",
+        "version": "6.18.9",
+        "hash": "sha256:0y05jg6126h946pac5mkl5myh573qgml1p29hinm7jxlizzia083",
         "lts": false
     }
 }
diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix
index f539ceca14e3..5924b1567a40 100644
--- a/pkgs/os-specific/linux/kmod/default.nix
+++ b/pkgs/os-specific/linux/kmod/default.nix
@@ -127,5 +127,6 @@ stdenv.mkDerivation rec {
     ]; # GPLv2+ for tools
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ artturin ];
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "kernel" version;
   };
 }
diff --git a/pkgs/os-specific/linux/libbpf/0.x.nix b/pkgs/os-specific/linux/libbpf/0.x.nix
index d5203c070c07..7d5676be8c0a 100644
--- a/pkgs/os-specific/linux/libbpf/0.x.nix
+++ b/pkgs/os-specific/linux/libbpf/0.x.nix
@@ -65,5 +65,6 @@ stdenv.mkDerivation rec {
       martinetd
     ];
     platforms = lib.platforms.linux;
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "libbpf_project" version;
   };
 }
diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix
index 9d0befcd7330..7bf2759bea04 100644
--- a/pkgs/os-specific/linux/libbpf/default.nix
+++ b/pkgs/os-specific/linux/libbpf/default.nix
@@ -75,5 +75,6 @@ stdenv.mkDerivation rec {
       martinetd
     ];
     platforms = lib.platforms.linux;
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "libbpf_project" version;
   };
 }
diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix
index 8f38cffa1faf..e47dc3cb4e61 100644
--- a/pkgs/os-specific/linux/nvidia-x11/settings.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix
@@ -12,10 +12,10 @@ nvidia_x11: sha256:
   dbus,
   vulkan-headers,
   gtk3,
-  libXv,
-  libXrandr,
-  libXext,
-  libXxf86vm,
+  libxv,
+  libxrandr,
+  libxext,
+  libxxf86vm,
   libvdpau,
   librsvg,
   libglvnd,
@@ -44,8 +44,8 @@ let
     inherit src;
 
     buildInputs = [
-      libXrandr
-      libXext
+      libxrandr
+      libxext
     ];
 
     preBuild = ''
@@ -87,8 +87,8 @@ let
 
   runtimeDependencies = [
     libglvnd
-    libXrandr
-    libXv
+    libxrandr
+    libxv
   ];
 
   runtimeLibraryPath = lib.makeLibraryPath runtimeDependencies;
@@ -143,10 +143,10 @@ stdenv.mkDerivation {
 
   buildInputs = [
     jansson
-    libXv
-    libXrandr
-    libXext
-    libXxf86vm
+    libxv
+    libxrandr
+    libxext
+    libxxf86vm
     libvdpau
     nvidia_x11
     dbus
diff --git a/pkgs/os-specific/linux/rtw88/default.nix b/pkgs/os-specific/linux/rtw88/default.nix
index 4eb1dede5df4..d3f8d6cea807 100644
--- a/pkgs/os-specific/linux/rtw88/default.nix
+++ b/pkgs/os-specific/linux/rtw88/default.nix
@@ -12,13 +12,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "rtw88";
-  version = "0-unstable-2025-11-30";
+  version = "0-unstable-2025-12-28";
 
   src = fetchFromGitHub {
     owner = "lwfinger";
     repo = "rtw88";
-    rev = "3309c45c283cbd996e1e05eeddf90c4fa589b90b";
-    hash = "sha256-AtDAzguL71hvgh/xvbBKWmza05n2D5Q+W3YkHQXdup8=";
+    rev = "2dd31d98c8a26e156f06bbcfb7a957fb452e2f83";
+    hash = "sha256-vqOBRfbzMtQ27T9Bmeop8KDw7c83scM4c/n3VjKKHSI=";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix
index e90a485c6e79..0eba0aae426d 100644
--- a/pkgs/os-specific/linux/sssd/default.nix
+++ b/pkgs/os-specific/linux/sssd/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  replaceVars,
   autoreconfHook,
   makeWrapper,
   glibc,
@@ -64,30 +63,23 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "sssd";
-  version = "2.11.1";
+  version = "2.12.0";
 
   src = fetchFromGitHub {
     owner = "SSSD";
     repo = "sssd";
     tag = finalAttrs.version;
-    hash = "sha256-JN4GVx5rBfNBLaMpLcKgyd+CyNDafz85BXUcfg5kDXQ=";
+    hash = "sha256-9F+D7qZKwnP1U0zJbvzy0f7dQSKkfgJrewDJ4p+Svgk=";
   };
 
   patches = [
+    # Keep in mind to check /src/external/pac_responder.m4 for Kerberos compatibility before update Kerberos !!!
     # Fix Kerberos Support version for PAC responder
-    ./fix-kerberos-version.patch
-
-    (replaceVars ./fix-ldb-modules-path.patch {
-      inherit ldb;
-      out = null; # will be replaced in postPatch https://github.com/NixOS/nixpkgs/pull/446589#discussion_r2384899857
-    })
+    #./fix-kerberos-version.patch
   ];
 
   postPatch = ''
     patchShebangs ./sbus_generate.sh.in
-
-    substituteInPlace src/confdb/confdb.c \
-      --replace-fail "@out@" "${placeholder "out"}"
   '';
 
   # Something is looking for <libxml/foo.h> instead of <libxml2/libxml/foo.h>
@@ -116,6 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
       --with-ldb-lib-dir=$out/modules/ldb
       --with-nscd=${glibc.bin}/sbin/nscd
       --with-sssd-user=root
+      --with-ldb-modules-path="${placeholder "out"}/modules/ldb:${ldb}/modules/ldb"
     )
   ''
   + lib.optionalString withSudo ''
diff --git a/pkgs/os-specific/linux/sssd/fix-ldb-modules-path.patch b/pkgs/os-specific/linux/sssd/fix-ldb-modules-path.patch
deleted file mode 100644
index 8324804a53e6..000000000000
--- a/pkgs/os-specific/linux/sssd/fix-ldb-modules-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/confdb/confdb.c b/src/confdb/confdb.c
-index 8c19142..7865684 100644
---- a/src/confdb/confdb.c
-+++ b/src/confdb/confdb.c
-@@ -775,6 +775,8 @@ int confdb_init(TALLOC_CTX *mem_ctx,
-     int ret = EOK;
-     mode_t old_umask;
- 
-+    setenv("LDB_MODULES_PATH", "@out@/modules/ldb:@ldb@/modules/ldb", 1);
-+
-     if (cdb_ctx == NULL) {
-         DEBUG(SSSDBG_FATAL_FAILURE, "Bad argument\n");
-         return EFAULT;
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index f6510f5a783f..d454e6d5beb4 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1061,5 +1061,6 @@ stdenv.mkDerivation (finalAttrs: {
       # https://github.com/systemd/systemd/issues/20600#issuecomment-912338965
       lib.systems.inspect.platformPatterns.isStatic
     ];
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "systemd_project" finalAttrs.version;
   };
 })
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index a5805a6404dc..b89c9ab5f3d1 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -179,5 +179,6 @@ stdenv.mkDerivation rec {
       marcweber
     ];
     platforms = lib.platforms.linux;
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "w1.fi" version;
   };
 }
diff --git a/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix b/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix
index 7cf7075a1500..05c4bfee3ce4 100644
--- a/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix
+++ b/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix
@@ -9,11 +9,11 @@
   qtx11extras,
   wrapQtAppsHook,
   autoPatchelfHook,
-  libX11,
-  libXtst,
-  libXi,
-  libXrandr,
-  libXinerama,
+  libx11,
+  libxtst,
+  libxi,
+  libxrandr,
+  libxinerama,
 }:
 
 let
@@ -41,11 +41,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libusb1
-    libX11
-    libXtst
-    libXi
-    libXrandr
-    libXinerama
+    libx11
+    libxtst
+    libxi
+    libxrandr
+    libxinerama
     glibc
     libGL
     (lib.getLib stdenv.cc.cc)
diff --git a/pkgs/os-specific/linux/xpad-noone/default.nix b/pkgs/os-specific/linux/xpad-noone/default.nix
index a135da524779..709ba8b0e4e6 100644
--- a/pkgs/os-specific/linux/xpad-noone/default.nix
+++ b/pkgs/os-specific/linux/xpad-noone/default.nix
@@ -7,13 +7,13 @@
   kernelModuleMakeFlags,
 }:
 
-stdenv.mkDerivation (finalAttr: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "xpad-noone";
   version = "0-unstable-2024-01-10";
 
   src = fetchFromGitHub {
     owner = "medusalix";
-    repo = finalAttr.pname;
+    repo = finalAttrs.pname;
     tag = "c3d1610";
     hash = "sha256-jDRyvbU9GsnM1ARTuwnoD7ZXlfBxne13UpSKRo7HHSY=";
   };
diff --git a/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix b/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix
index 089af51745a0..b29bab484b8f 100644
--- a/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix
@@ -11,13 +11,13 @@
 buildHomeAssistantComponent rec {
   owner = "pymitsubishi";
   domain = "mitsubishi";
-  version = "0.5.4";
+  version = "0.5.5";
 
   src = fetchFromGitHub {
     owner = "pymitsubishi";
     repo = "homeassistant-mitsubishi";
     tag = "v${version}";
-    hash = "sha256-IGzOoayqJIURQ2f5h5jNiV7C6Xna0JwWJyxHmO2qu9s=";
+    hash = "sha256-qP2jLkDeiNMdTlHg0G8AryRb2v0ohGnkIoQWIWvbTbs=";
   };
 
   dependencies = [
diff --git a/pkgs/servers/home-assistant/custom-components/scene_presets/package.nix b/pkgs/servers/home-assistant/custom-components/scene_presets/package.nix
index 96a63b8ddb50..cfe76b89fa11 100644
--- a/pkgs/servers/home-assistant/custom-components/scene_presets/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/scene_presets/package.nix
@@ -11,13 +11,13 @@
 buildHomeAssistantComponent rec {
   owner = "Hypfer";
   domain = "scene_presets";
-  version = "2.3.1";
+  version = "2.3.2";
 
   src = fetchFromGitHub {
     owner = "Hypfer";
     repo = "hass-scene_presets";
     tag = version;
-    hash = "sha256-ESu7+65IeXYZLLqlkRlJA7+Ggo+X+YoWcpmMQiNzOTM=";
+    hash = "sha256-Vhowtosxgx7yDprm2ziBe3fSUqNxfP3ULmhP7ETsbzY=";
   };
 
   npmDeps = fetchNpmDeps {
diff --git a/pkgs/servers/http/couchdb/3.nix b/pkgs/servers/http/couchdb/3.nix
index a8cb95fd82e6..a83ce7727d5b 100644
--- a/pkgs/servers/http/couchdb/3.nix
+++ b/pkgs/servers/http/couchdb/3.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "couchdb";
-  version = "3.5.0";
+  version = "3.5.1";
 
   src = fetchurl {
     url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz";
-    hash = "sha256-api5CpqYC77yw1tJlqjnGi8a5SJ1RshfBMQ2EBvfeL8=";
+    hash = "sha256-wizzHW2Ro/WqBPDK1JO6vccjITSUy15hcKUH01nFATY=";
   };
 
   postPatch = ''
@@ -48,6 +48,12 @@ stdenv.mkDerivation rec {
     "release"
   ];
 
+  env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " (
+    lib.optionals stdenv.cc.isClang [
+      "-Wno-error=implicit-function-declaration"
+    ]
+  );
+
   installPhase = ''
     runHook preInstall
     mkdir -p $out
@@ -65,6 +71,5 @@ stdenv.mkDerivation rec {
     license = lib.licenses.asl20;
     platforms = lib.platforms.all;
     maintainers = [ ];
-    broken = stdenv.isDarwin && stdenv.isAarch64;
   };
 }
diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix
index cd7ae4697d43..4fa7ad34af49 100644
--- a/pkgs/servers/http/jetty/default.nix
+++ b/pkgs/servers/http/jetty/default.nix
@@ -57,7 +57,7 @@ in
   };
 
   jetty_12 = common {
-    version = "12.1.5";
-    hash = "sha256-tjZO7OtQ7FZQAGA9lI4YIKwm+ZW0eJgGTaNd+ZasDY4=";
+    version = "12.1.6";
+    hash = "sha256-a23PR+6Qy32/evrEO7Nur8Y8KQnrfVyTV/qFi4ttG+Q=";
   };
 }
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix
index f83a5c99949e..107395d20df1 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "grafana-lokiexplore-app";
-  version = "1.0.34";
-  zipHash = "sha256-koWDaYT9LLBSTieRl1ODdGQrU6n+72diWQRfiGFmPvQ=";
+  version = "1.0.35";
+  zipHash = "sha256-9iK0h1LRl3PNvu70Aa0cQb8nhqezOKu3PAE2GsRR11s=";
   meta = {
     description = "Browse Loki logs without the need for writing complex queries";
     license = lib.licenses.agpl3Only;
diff --git a/pkgs/servers/monitoring/prometheus/pve-exporter.nix b/pkgs/servers/monitoring/prometheus/pve-exporter.nix
index 9b7a5cea267e..86c943ba44f3 100644
--- a/pkgs/servers/monitoring/prometheus/pve-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/pve-exporter.nix
@@ -7,12 +7,12 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "prometheus_pve_exporter";
-  version = "3.5.5";
+  version = "3.8.0";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-QFo/gnRF6+mk/xs6vJCxbR64LI3JwrLVwXib6tcEN8g=";
+    hash = "sha256-tTEuyLKGIG0uvOMLnpT31YNkOeGM82lzFHwHjLfnOj0=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [
@@ -22,6 +22,7 @@ python3.pkgs.buildPythonApplication rec {
     requests
     werkzeug
     gunicorn
+    wrapt
   ];
 
   doCheck = false;
diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix
index 137be8f9ef71..1da0f478b46c 100644
--- a/pkgs/servers/nosql/apache-jena/binary.nix
+++ b/pkgs/servers/nosql/apache-jena/binary.nix
@@ -8,10 +8,10 @@
 
 stdenv.mkDerivation rec {
   pname = "apache-jena";
-  version = "5.6.0";
+  version = "6.0.0";
   src = fetchurl {
     url = "mirror://apache/jena/binaries/apache-jena-${version}.tar.gz";
-    hash = "sha256-s5qmzKBrED7U1Qm0Lu5RI5QIiFnfK1NnqFiSe/H85yg=";
+    hash = "sha256-N8TPKExwUNdlrPB23/qQm08io/JHq3bDzVoCd8ot6VQ=";
   };
   nativeBuildInputs = [
     makeWrapper
diff --git a/pkgs/servers/roundcube/plugins/roundcube-plugin.nix b/pkgs/servers/roundcube/plugins/roundcube-plugin.nix
index 404481c601f1..e5e5ed150f54 100644
--- a/pkgs/servers/roundcube/plugins/roundcube-plugin.nix
+++ b/pkgs/servers/roundcube/plugins/roundcube-plugin.nix
@@ -5,7 +5,7 @@
   src,
 }:
 
-runCommand "roundcube-plugin-${pname}-${version}" { } ''
+runCommand "roundcube-plugin-${pname}-${version}" { inherit pname version; } ''
   mkdir -p $out/plugins/
   cp -r ${src} $out/plugins/${pname}
 ''
diff --git a/pkgs/servers/sql/postgresql/ext.nix b/pkgs/servers/sql/postgresql/ext.nix
index 1be386255117..4593540d2e71 100644
--- a/pkgs/servers/sql/postgresql/ext.nix
+++ b/pkgs/servers/sql/postgresql/ext.nix
@@ -21,5 +21,6 @@ in
   pltcl = throw "PostgreSQL extension `pltcl` is not available, because `postgresql` was built without Tcl support. Override with `tclSupport = true` to enable the extension.";
 }
 // lib.optionalAttrs config.allowAliases {
+  cstore_fdw = throw "PostgreSQL extension `cstore_fdw` has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05
   pg_embedding = throw "PostgreSQL extension `pg_embedding` has been removed since the project has been abandoned. Upstream's recommendation is to use pgvector instead (https://neon.tech/docs/extensions/pg_embedding#migrate-from-pg_embedding-to-pgvector)";
 }
diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
deleted file mode 100644
index 918f446081de..000000000000
--- a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  fetchFromGitHub,
-  lib,
-  postgresql,
-  postgresqlBuildExtension,
-  protobufc,
-}:
-
-postgresqlBuildExtension {
-  pname = "cstore_fdw";
-  version = "1.7.0-unstable-2021-03-08";
-
-  buildInputs = [ protobufc ];
-  nativeBuildInputs = [ protobufc ];
-
-  src = fetchFromGitHub {
-    owner = "citusdata";
-    repo = "cstore_fdw";
-    rev = "90e22b62fbee6852529104fdd463f532cf7a3311";
-    hash = "sha256-02wcCqs8A5ZOZX080fgcNJTQrYQctnlwnA8+YPaRTZc=";
-  };
-
-  meta = {
-    broken = lib.versionAtLeast postgresql.version "14";
-    description = "Columnar storage for PostgreSQL";
-    homepage = "https://github.com/citusdata/cstore_fdw";
-    maintainers = with lib.maintainers; [ thoughtpolice ];
-    platforms = postgresql.meta.platforms;
-    license = lib.licenses.asl20;
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix
index aff9abc5820d..c3d68f588251 100644
--- a/pkgs/servers/web-apps/discourse/default.nix
+++ b/pkgs/servers/web-apps/discourse/default.nix
@@ -53,13 +53,13 @@
 }:
 
 let
-  version = "2025.12.0";
+  version = "2025.12.1";
 
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse";
     rev = "v${version}";
-    sha256 = "sha256-zURRueaYWl1FqOI12H+S/ssMhN38nDuWRBqb579w6HQ=";
+    sha256 = "sha256-1s6ixKLlNd9osdG+qGIpo6kjEv3c/yDfJ6+APj6QQvM=";
   };
 
   ruby = ruby_3_3;
diff --git a/pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix b/pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix
index 1c1c68379677..78bad9ad165f 100644
--- a/pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix
+++ b/pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix
@@ -6,13 +6,13 @@
 }:
 buildFishPlugin {
   pname = "exercism-cli-fish-wrapper";
-  version = "0-unstable-2025-09-28";
+  version = "0-unstable-2026-01-06";
 
   src = fetchFromGitHub {
     owner = "glennj";
     repo = "exercism-cli-fish-wrapper";
-    rev = "f6627c00324b2599239e3835af39adce04e1091c";
-    hash = "sha256-bS1NN6oWi5j9uPwhuMApDRZlVYwOwlIC9NcdBZ9noL8=";
+    rev = "2b154d6363e16b60a3132ef93d5e1a2311209fa5";
+    hash = "sha256-k0escPVR+5FqnxYzZPSsY7y927GhtWAEEOdURqN8aSk=";
   };
 
   passthru.updateScript = unstableGitUpdater { };
diff --git a/pkgs/shells/fish/plugins/pure.nix b/pkgs/shells/fish/plugins/pure.nix
index e4ce0bba041c..438f30145a0a 100644
--- a/pkgs/shells/fish/plugins/pure.nix
+++ b/pkgs/shells/fish/plugins/pure.nix
@@ -8,13 +8,13 @@
 
 buildFishPlugin rec {
   pname = "pure";
-  version = "4.12.0";
+  version = "4.15.0";
 
   src = fetchFromGitHub {
     owner = "pure-fish";
     repo = "pure";
     rev = "v${version}";
-    hash = "sha256-QG/saZReqpYiSXTG+nPmkJ5ETAAdo0mVrUqyepu7Pvs=";
+    hash = "sha256-fqcIfst9YnkOi50pIUMoJJQ7s1w1Vr6hRdEFo+FWIZY=";
   };
 
   nativeCheckInputs = [ git ];
diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix
index ed8fc7a0bab6..76df636416ac 100644
--- a/pkgs/tools/compression/xz/default.nix
+++ b/pkgs/tools/compression/xz/default.nix
@@ -100,5 +100,6 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     platforms = lib.platforms.all;
     pkgConfigModules = [ "liblzma" ];
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "tukaani" finalAttrs.version;
   };
 })
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix
index 6eb02d6947d8..254a29aea333 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -17,10 +17,10 @@
   lua,
   withCaca ? false,
   libcaca,
-  libX11,
-  libXt,
-  libXpm,
-  libXaw,
+  libx11,
+  libxt,
+  libxpm,
+  libxaw,
   aquaterm ? false,
   withWxGTK ? false,
   wxGTK32,
@@ -68,10 +68,10 @@ stdenv.mkDerivation rec {
   ++ lib.optional withLua lua
   ++ lib.optional withCaca libcaca
   ++ lib.optionals withX [
-    libX11
-    libXpm
-    libXt
-    libXaw
+    libx11
+    libxpm
+    libxt
+    libxaw
   ]
   ++ lib.optionals withQt [
     qtbase
diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix
index 767c95770940..aab550797ac2 100644
--- a/pkgs/tools/graphics/mangohud/default.nix
+++ b/pkgs/tools/graphics/mangohud/default.nix
@@ -11,7 +11,7 @@
   xdg-utils,
   dbus,
   libGL,
-  libX11,
+  libx11,
   hwdata,
   mangohud32,
   addDriverRunpath,
@@ -27,7 +27,7 @@
   spdlog,
   libxkbcommon,
   glfw,
-  libXrandr,
+  libxrandr,
   x11Support ? true,
   waylandSupport ? true,
   nvidiaSupport ? lib.meta.availableOn stdenv.hostPlatform libXNVCtrl,
@@ -138,7 +138,7 @@ stdenv.mkDerivation (finalAttrs: {
 
       libdbus = dbus.lib;
       libGL = libGL;
-      libX11 = libX11;
+      libX11 = libx11;
       inherit hwdata;
     })
   ];
@@ -191,12 +191,12 @@ stdenv.mkDerivation (finalAttrs: {
     spdlog
   ]
   ++ lib.optional waylandSupport wayland
-  ++ lib.optional x11Support libX11
+  ++ lib.optional x11Support libx11
   ++ lib.optional nvidiaSupport libXNVCtrl
   ++ lib.optional (x11Support || waylandSupport) libxkbcommon
   ++ lib.optionals mangoappSupport [
     glfw
-    libXrandr
+    libxrandr
   ];
 
   doCheck = true;
diff --git a/pkgs/tools/graphics/twilight/default.nix b/pkgs/tools/graphics/twilight/default.nix
index 1542834e4a70..37ea60c03057 100644
--- a/pkgs/tools/graphics/twilight/default.nix
+++ b/pkgs/tools/graphics/twilight/default.nix
@@ -5,7 +5,7 @@
   libGL,
   libGLU,
   libglut,
-  libX11,
+  libx11,
 }:
 
 stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     libGL
     libGLU
     libglut
-    libX11
+    libx11
   ];
 
   installPhase = ''
diff --git a/pkgs/tools/graphics/vkbasalt/default.nix b/pkgs/tools/graphics/vkbasalt/default.nix
index 053a43006461..5b7257b24903 100644
--- a/pkgs/tools/graphics/vkbasalt/default.nix
+++ b/pkgs/tools/graphics/vkbasalt/default.nix
@@ -6,7 +6,7 @@
   meson,
   ninja,
   pkg-config,
-  libX11,
+  libx11,
   spirv-headers,
   vulkan-headers,
   vkbasalt32,
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
   buildInputs = [
-    libX11
+    libx11
     spirv-headers
     vulkan-headers
   ];
diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix
index 44b360e28d15..88f7d8193c78 100644
--- a/pkgs/tools/graphics/zbar/default.nix
+++ b/pkgs/tools/graphics/zbar/default.nix
@@ -6,7 +6,7 @@
   imagemagickBig,
   pkg-config,
   withXorg ? true,
-  libX11,
+  libx11,
   libv4l,
   qtbase,
   qtwayland,
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
     dbus
   ]
   ++ lib.optionals withXorg [
-    libX11
+    libx11
   ]
   ++ lib.optionals enableVideo [
     libv4l
diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix
index 9eb8b05a05fa..236be8942ad3 100644
--- a/pkgs/tools/inputmethods/fcitx5/default.nix
+++ b/pkgs/tools/inputmethods/fcitx5/default.nix
@@ -23,7 +23,7 @@
   libGL,
   libuuid,
   libselinux,
-  libXdmcp,
+  libxdmcp,
   libsepol,
   libxkbcommon,
   libthai,
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
     libuuid
     libselinux
     libsepol
-    libXdmcp
+    libxdmcp
     libxkbcommon
     libxcb-util
     libxcb-wm
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
index 3d7725904916..25fde5ca0b40 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
@@ -17,12 +17,12 @@
   libsepol,
   libthai,
   libdatrie,
-  libXdmcp,
+  libxdmcp,
   libxkbcommon,
   libepoxy,
   dbus,
   at-spi2-core,
-  libXtst,
+  libxtst,
   withGTK2 ? false,
 }:
 
@@ -60,12 +60,12 @@ stdenv.mkDerivation rec {
     libsepol
     libthai
     libdatrie
-    libXdmcp
+    libxdmcp
     libxkbcommon
     libepoxy
     dbus
     at-spi2-core
-    libXtst
+    libxtst
   ]
   ++ lib.optional withGTK2 gtk2;
 
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index 74df7eefb93d..4437b30dc434 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -38,7 +38,7 @@
   nixosTests,
   versionCheckHook,
   nix-update-script,
-  libX11,
+  libx11,
   libOnly ? false,
 }:
 
@@ -184,7 +184,7 @@ stdenv.mkDerivation (finalAttrs: {
     python3.pkgs.pygobject3 # for pygobject overrides
     isocodes
     json-glib
-    libX11
+    libx11
     vala # for share/vala/Makefile.vapigen (PKG_CONFIG_VAPIGEN_VAPIGEN)
   ]
   ++ lib.optionals (!libOnly) [
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 998050399cda..c17395874edc 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -267,5 +267,6 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     platforms = with lib.platforms; unix ++ windows;
     priority = 10;
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "gnu" finalAttrs.version;
   };
 })
diff --git a/pkgs/tools/misc/nvfancontrol/default.nix b/pkgs/tools/misc/nvfancontrol/default.nix
index 89149abffb32..48b7872c9c84 100644
--- a/pkgs/tools/misc/nvfancontrol/default.nix
+++ b/pkgs/tools/misc/nvfancontrol/default.nix
@@ -3,8 +3,8 @@
   rustPlatform,
   fetchFromGitHub,
   libXNVCtrl,
-  libX11,
-  libXext,
+  libx11,
+  libxext,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -22,13 +22,13 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [
     libXNVCtrl
-    libX11
-    libXext
+    libx11
+    libxext
   ];
 
   # Needed for static linking
   preConfigure = ''
-    export LIBRARY_PATH=${libXNVCtrl}/lib:${libX11}/lib:${libXext}/lib
+    export LIBRARY_PATH=${libXNVCtrl}/lib:${libx11}/lib:${libxext}/lib
   '';
 
   meta = {
diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix
index 084944001c48..fc02f9e2a040 100644
--- a/pkgs/tools/misc/pipelight/default.nix
+++ b/pkgs/tools/misc/pipelight/default.nix
@@ -6,7 +6,7 @@
   cabextract,
   curl,
   gnupg,
-  libX11,
+  libx11,
   libGLU,
   libGL,
   wine-staging,
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     wine_custom
-    libX11
+    libx11
     libGLU
     libGL
     curl
diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix
index 23861b295af7..917aef1ce2bb 100644
--- a/pkgs/tools/misc/qjoypad/default.nix
+++ b/pkgs/tools/misc/qjoypad/default.nix
@@ -6,8 +6,8 @@
   cmake,
   qttools,
   wrapQtAppsHook,
-  libX11,
-  libXtst,
+  libx11,
+  libxtst,
   qtbase,
   qtx11extras,
 }:
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
     wrapQtAppsHook
   ];
   buildInputs = [
-    libX11
-    libXtst
+    libx11
+    libxtst
     qtbase
     qtx11extras
   ];
diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/tools/misc/radeon-profile/default.nix
index f1d2c7470477..5299fde25113 100644
--- a/pkgs/tools/misc/radeon-profile/default.nix
+++ b/pkgs/tools/misc/radeon-profile/default.nix
@@ -6,7 +6,7 @@
   wrapQtAppsHook,
   qtbase,
   qtcharts,
-  libXrandr,
+  libxrandr,
   libdrm,
 }:
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     qtbase
     qtcharts
-    libXrandr
+    libxrandr
     libdrm
   ];
 
diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix
index bafb82fa5090..ce0145524812 100644
--- a/pkgs/tools/networking/openssh/common.nix
+++ b/pkgs/tools/networking/openssh/common.nix
@@ -312,6 +312,7 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.unix ++ lib.platforms.windows;
     maintainers = extraMeta.maintainers or [ ];
     mainProgram = "ssh";
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "openbsd" finalAttrs.version;
   }
   // extraMeta;
 })
diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
index e9c692d57f8e..64a94eb494d3 100644
--- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
+++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
@@ -10,6 +10,7 @@
   cvs,
   darcs,
   findutils,
+  fossil,
   gawk,
   gitMinimal,
   git-lfs,
@@ -65,6 +66,11 @@ rec {
     gawk
     jq
   ];
+  nix-prefetch-fossil =
+    mkPrefetchScript "fossil" ../../../build-support/fetchfossil/nix-prefetch-fossil
+      [
+        fossil
+      ];
   nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [
     findutils
     gawk
@@ -94,6 +100,7 @@ rec {
       nix-prefetch-bzr
       nix-prefetch-cvs
       nix-prefetch-darcs
+      nix-prefetch-fossil
       nix-prefetch-git
       nix-prefetch-hg
       nix-prefetch-svn
diff --git a/pkgs/tools/security/gnupg/24.nix b/pkgs/tools/security/gnupg/24.nix
index ddca7735483a..ce2e7553deac 100644
--- a/pkgs/tools/security/gnupg/24.nix
+++ b/pkgs/tools/security/gnupg/24.nix
@@ -216,5 +216,6 @@ stdenv.mkDerivation rec {
     ];
     platforms = lib.platforms.all;
     mainProgram = "gpg";
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "gnupg" version;
   };
 }
diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix
index aa8cdeb74f26..cea81636451e 100644
--- a/pkgs/tools/system/plan9port/default.nix
+++ b/pkgs/tools/system/plan9port/default.nix
@@ -4,9 +4,9 @@
   fetchFromGitHub,
   fontconfig,
   freetype,
-  libX11,
-  libXext,
-  libXt,
+  libx11,
+  libxext,
+  libxt,
   xorgproto,
   perl, # For building web manuals
   which,
@@ -53,9 +53,9 @@ stdenv.mkDerivation {
       [
         fontconfig
         freetype # fontsrv uses these
-        libX11
-        libXext
-        libXt
+        libx11
+        libxext
+        libxt
         xorgproto
       ]
     else
@@ -70,7 +70,7 @@ stdenv.mkDerivation {
     CC9='$(command -v $CC)'
     CFLAGS='$NIX_CFLAGS_COMPILE'
     LDFLAGS='$(for f in $NIX_LDFLAGS; do echo "-Wl,$f"; done | xargs echo)'
-    ${lib.optionalString (!stdenv.hostPlatform.isDarwin) "X11='${libXt.dev}/include'"}
+    ${lib.optionalString (!stdenv.hostPlatform.isDarwin) "X11='${libxt.dev}/include'"}
     EOF
 
     # make '9' available in the path so there's some way to find out $PLAN9
diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix
index a0ff8ecf4706..8ced4e84e293 100644
--- a/pkgs/tools/text/highlight/default.nix
+++ b/pkgs/tools/text/highlight/default.nix
@@ -15,13 +15,13 @@
 let
   self = stdenv.mkDerivation rec {
     pname = "highlight";
-    version = "4.17";
+    version = "4.18";
 
     src = fetchFromGitLab {
       owner = "saalen";
       repo = "highlight";
       rev = "v${version}";
-      hash = "sha256-XSfiQGMd7GtewyZ72VK/0D9Z9sYzVBWeO1CQXVk63Zc=";
+      hash = "sha256-QYW6kj5cp+TVLXwj7kxbgj0kpN0n5qXYU3xZ5UW66vc=";
     };
 
     enableParallelBuilding = true;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e22b79149c0e..581697253578 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -841,6 +841,7 @@ mapAliases {
   gxneur = throw "'gxneur' has been removed due to lack of maintenance and reliance on gnome2 and 2to3."; # Added 2025-08-17
   hacpack = throw "hacpack has been removed from nixpkgs, as it has been taken down upstream"; # Added 2025-09-26
   harmony-music = throw "harmony-music is unmaintained and has been removed"; # Added 2025-08-26
+  helix-gpt = throw "helix-gpt was deprecated in January 2026 and has been since removed"; # Added 2026-02-05
   HentaiAtHome = throw "'HentaiAtHome' has been renamed to/replaced by 'hentai-at-home'"; # Converted to throw 2025-10-27
   hiawatha = throw "hiawatha has been removed, since it is no longer actively supported upstream, nor well maintained in nixpkgs"; # Added 2025-09-10
   hibernate = throw "hibernate has been removed due to lack of maintenance"; # Added 2025-09-10
@@ -1017,8 +1018,36 @@ mapAliases {
   libviper = throw "'libviper' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
   libWindowsWM = libwindowswm; # Added 2026-01-19
   libwnck3 = throw "'libwnck3' has been renamed to/replaced by 'libwnck'"; # Converted to throw 2025-10-27
+  libX11 = libx11; # Added 2026-02-06
+  libXau = libxau; # Added 2026-02-06
+  libXaw = libxaw; # Added 2026-02-06
+  libXcomposite = libxcomposite; # Added 2026-02-06
+  libXcursor = libxcursor; # Added 2026-02-06
+  libXdamage = libxdamage; # Added 2026-02-06
+  libXdmcp = libxdmcp; # Added 2026-02-06
+  libXext = libxext; # Added 2026-02-06
+  libXfixes = libxfixes; # Added 2026-02-06
+  libXfont2 = libxfont_2; # Added 2026-02-06
   libXfont = libxfont_1; # Added 2026-01-19
+  libXft = libxft; # Added 2026-02-06
+  libXi = libxi; # Added 2026-02-06
+  libXinerama = libxinerama; # Added 2026-02-06
+  libXmu = libxmu; # Added 2026-02-06
+  libXp = libxp; # Added 2026-02-06
+  libXpm = libxpm; # Added 2026-02-06
+  libXpresent = libxpresent; # Added 2026-02-06
+  libXrandr = libxrandr; # Added 2026-02-06
+  libXrender = libxrender; # Added 2026-02-06
+  libXres = libxres; # Added 2026-02-06
+  libXScrnSaver = libxscrnsaver; # Added 2026-02-06
+  libXt = libxt; # Added 2026-02-06
   libXtrap = throw "XTrap was a proposed X11 extension that hasn't been in Xorg since X11R6 in 1994, it is deprecated and archived upstream."; # added 2025-12-13
+  libXtst = libxtst; # Added 2026-02-06
+  libXv = libxv; # Added 2026-02-06
+  libXvMC = libxvmc; # Added 2026-02-06
+  libXxf86dga = libxxf86dga; # Added 2026-02-06
+  libXxf86misc = libxxf86misc; # Added 2026-02-06
+  libXxf86vm = libxxf86vm; # Added 2026-02-06
   lightdm_gtk_greeter = throw "'lightdm_gtk_greeter' has been renamed to/replaced by 'lightdm-gtk-greeter'"; # Converted to throw 2025-10-27
   lightly-boehs = throw "'lightly-boehs' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   lightly-qt = throw "'lightly-qt' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a94717248bc..c11592b9c0c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1519,10 +1519,6 @@ with pkgs;
     stdenv = clangStdenv;
   };
 
-  plausible = callPackage ../by-name/pl/plausible/package.nix {
-    beamPackages = beam27Packages.extend (self: super: { elixir = elixir_1_18; });
-  };
-
   reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace { };
 
   xcodeenv = callPackage ../development/mobile/xcodeenv { };
@@ -7291,13 +7287,6 @@ with pkgs;
       url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz";
       hash = "sha256-n3KFrN/mN1SVXfuhEUAQ1fJzrCvhiclxfEIouyj9Z18=";
     };
-    patches = [
-      # Backport GCC 14 build fix
-      (fetchpatch {
-        url = "https://github.com/Open-Cascade-SAS/OCCT/commit/7236e83dcc1e7284e66dc61e612154617ef715d6.patch";
-        hash = "sha256-NoC2mE3DG78Y0c9UWonx1vmXoU4g5XxFUT3eVXqLU60=";
-      })
-    ];
   };
 
   opencascade-occt_7_6_1 = opencascade-occt.overrideAttrs {
@@ -8822,34 +8811,6 @@ with pkgs;
 
   virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone;
 
-  libX11 = libx11;
-  libXau = libxau;
-  libXaw = libxaw;
-  libXcomposite = libxcomposite;
-  libXcursor = libxcursor;
-  libXdamage = libxdamage;
-  libXdmcp = libxdmcp;
-  libXext = libxext;
-  libXfixes = libxfixes;
-  libXfont2 = libxfont_2;
-  libXft = libxft;
-  libXi = libxi;
-  libXinerama = libxinerama;
-  libXmu = libxmu;
-  libXp = libxp;
-  libXpm = libxpm;
-  libXpresent = libxpresent;
-  libXrandr = libxrandr;
-  libXrender = libxrender;
-  libXres = libxres;
-  libXScrnSaver = libxscrnsaver;
-  libXt = libxt;
-  libXtst = libxtst;
-  libXv = libxv;
-  libXvMC = libxvmc;
-  libXxf86dga = libxxf86dga;
-  libXxf86misc = libxxf86misc;
-  libXxf86vm = libxxf86vm;
   mkfontdir = mkfontscale;
   xcbproto = xcb-proto;
 
@@ -9984,16 +9945,6 @@ with pkgs;
     pname = "firefox-bin";
   };
 
-  librewolf-unwrapped = import ../applications/networking/browsers/librewolf {
-    inherit
-      stdenv
-      lib
-      callPackage
-      buildMozillaMach
-      nixosTests
-      ;
-  };
-
   librewolf = wrapFirefox librewolf-unwrapped {
     inherit (librewolf-unwrapped) extraPrefsFiles extraPoliciesFiles;
     libName = "librewolf";
@@ -12824,8 +12775,6 @@ with pkgs;
     waylandSupport = true;
   };
 
-  qmake2cmake = python3Packages.callPackage ../tools/misc/qmake2cmake { };
-
   sail-riscv = callPackage ../applications/virtualization/sail-riscv {
     inherit (ocamlPackages) sail;
   };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1791abfe97d8..dafe08eda5f4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -16623,6 +16623,52 @@ with self;
     };
   };
 
+  HTTPDaemonSSL = buildPerlPackage {
+    pname = "HTTP-Daemon-SSL";
+    version = "1.05-01-5";
+    src = fetchurl {
+      url = "https://salsa.debian.org/perl-team/modules/packages/libhttp-daemon-ssl-perl/-/archive/debian/1.05-01-5/libhttp-daemon-ssl-perl-debian-1.05-01-5.tar.gz";
+      hash = "sha256-2J4W3SAPgktQ8N+CTSm9fddaUlfzq074sj14fe5zHVc=";
+    };
+    patches = [
+      # Several Debian patches to fix test suite
+      # https://sources.debian.org/patches/libhttp-daemon-ssl-perl/1.05-01-5/
+      (fetchpatch2 {
+        name = "testmodule.diff";
+        url = "https://sources.debian.org/data/main/libh/libhttp-daemon-ssl-perl/1.05-01-5/debian/patches/testmodule.diff";
+        hash = "sha256-pVPtQLlMYr7Bm8QprJbCyfY+6SyZ/v7uuqvX3k/GnGs=";
+      })
+      (fetchpatch2 {
+        name = "testpost.diff";
+        url = "https://sources.debian.org/data/main/libh/libhttp-daemon-ssl-perl/1.05-01-5/debian/patches/testpost.diff";
+        hash = "sha256-clI4u2uYGPow8k3YjnjQFam5IK/xlW8SsJvJ/pwMm4o=";
+      })
+      (fetchpatch2 {
+        name = "IO-Socket-SSL_2.078.patch";
+        url = "https://sources.debian.org/data/main/libh/libhttp-daemon-ssl-perl/1.05-01-5/debian/patches/IO-Socket-SSL_2.078.patch";
+        hash = "sha256-EoZPj7mlDm+KKAuXTdIhlyWAFjG9H8tqeZj42ZwV4no=";
+      })
+      (fetchpatch2 {
+        name = "IO-Socket-SSL_2.079.patch";
+        url = "https://sources.debian.org/data/main/libh/libhttp-daemon-ssl-perl/1.05-01-5/debian/patches/IO-Socket-SSL_2.079.patch";
+        hash = "sha256-xT533707i+ZCn1/qDZJU/oW8j+Sk8WWbIPulddJPb1w=";
+      })
+    ];
+    propagatedBuildInputs = [
+      HTTPDaemon
+      IOSocketSSL
+    ];
+    __darwinAllowLocalNetworking = true;
+    meta = {
+      description = "Simple http server class with SSL support";
+      homepage = "https://github.com/aufflick/p5-http-daemon-ssl";
+      license = with lib.licenses; [
+        artistic1
+        gpl1Plus
+      ];
+    };
+  };
+
   HTTPDate = buildPerlPackage {
     pname = "HTTP-Date";
     version = "6.06";
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index c6e9bab6d11d..e7bc54d06c14 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -122,8 +122,6 @@ makeScopeWithSplicing' {
 
         libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { };
 
-        mapbox-gl-native = libsForQt5.callPackage ../development/libraries/mapbox-gl-native { };
-
         mapbox-gl-qml = libsForQt5.callPackage ../development/libraries/mapbox-gl-qml { };
 
         maplibre-gl-native = callPackage ../development/libraries/maplibre-gl-native { };
@@ -228,6 +226,7 @@ makeScopeWithSplicing' {
           'libsForQt5.kf5gpgmepp' has been removed because it has been unmaintained upstream since 2017.
           Consider switching to the gpgmepp included in gpgme (gpgme <2), or to the GnuPG fork of gpgmepp (gpgme 2+), instead.
         ''; # Added 2025-10-25
+        mapbox-gl-native = throw "libsForQt5.mapbox-gl-native has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05
       }
     ))
   );